PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement TObj*/IObj; finish matching CStringTable 

Former-commit-id: e98f62c3a6
This commit is contained in:
Luke Street 2022-07-14 12:24:26 -04:00
parent 9bc9bf7eb2
commit ffd6ba5818
51 changed files with 437 additions and 436 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
env:
WINEPREFIX: ${{github.workspace}}/.wine
steps:
- name: Install devkitPro
- name: Install dependencies
run: |
sudo dpkg --add-architecture i386
sudo apt-get update
@ -24,4 +24,4 @@ jobs:
| bsdtar -xvf- -C tools --exclude Wii
mv tools/GC tools/mwcc_compiler
- name: make
run: make -j
run: make -j$(nproc)

16
asm/GuiSys/CGuiGroup.s
View File

@ -1038,12 +1038,12 @@ lbl_802C1EB8:
lbl_802C1F14:
/* 802C1F14 002BEE74 28 1E 00 00 */ cmplwi r30, 0
/* 802C1F18 002BEE78 41 82 00 20 */ beq lbl_802C1F38
/* 802C1F1C 002BEE7C 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802C1F20 002BEE80 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802C1F1C 002BEE7C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802C1F20 002BEE80 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802C1F24 002BEE84 90 1E 00 00 */ stw r0, 0(r30)
/* 802C1F28 002BEE88 41 82 00 10 */ beq lbl_802C1F38
/* 802C1F2C 002BEE8C 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802C1F30 002BEE90 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802C1F2C 002BEE8C 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802C1F30 002BEE90 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802C1F34 002BEE94 90 1E 00 00 */ stw r0, 0(r30)
lbl_802C1F38:
/* 802C1F38 002BEE98 7F E0 07 35 */ extsh. r0, r31
@ -1090,12 +1090,12 @@ lbl_802C1F48:
/* 802C1FC0 002BEF20 48 05 38 AD */ bl __nw__FUlPCcPCc
/* 802C1FC4 002BEF24 28 03 00 00 */ cmplwi r3, 0
/* 802C1FC8 002BEF28 41 82 00 38 */ beq lbl_802C2000
/* 802C1FCC 002BEF2C 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802C1FD0 002BEF30 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802C1FD4 002BEF34 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802C1FCC 002BEF2C 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802C1FD0 002BEF30 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802C1FD4 002BEF34 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802C1FD8 002BEF38 3C 80 80 3F */ lis r4, lbl_803EC7B8@ha
/* 802C1FDC 002BEF3C 90 03 00 00 */ stw r0, 0(r3)
/* 802C1FE0 002BEF40 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802C1FE0 002BEF40 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802C1FE4 002BEF44 38 A0 00 00 */ li r5, 0
/* 802C1FE8 002BEF48 38 04 C7 B8 */ addi r0, r4, lbl_803EC7B8@l
/* 802C1FEC 002BEF4C 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Animation/CAllFormatsAnimSource.s
View File

@ -287,12 +287,12 @@ lbl_802FE298:
lbl_802FE300:
/* 802FE300 002FB260 28 1E 00 00 */ cmplwi r30, 0
/* 802FE304 002FB264 41 82 00 20 */ beq lbl_802FE324
/* 802FE308 002FB268 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802FE30C 002FB26C 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802FE308 002FB268 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802FE30C 002FB26C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802FE310 002FB270 90 1E 00 00 */ stw r0, 0(r30)
/* 802FE314 002FB274 41 82 00 10 */ beq lbl_802FE324
/* 802FE318 002FB278 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802FE31C 002FB27C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802FE318 002FB278 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802FE31C 002FB27C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802FE320 002FB280 90 1E 00 00 */ stw r0, 0(r30)
lbl_802FE324:
/* 802FE324 002FB284 7F E0 07 35 */ extsh. r0, r31
@ -339,12 +339,12 @@ lbl_802FE334:
/* 802FE3AC 002FB30C 48 01 74 C1 */ bl __nw__FUlPCcPCc
/* 802FE3B0 002FB310 28 03 00 00 */ cmplwi r3, 0
/* 802FE3B4 002FB314 41 82 00 38 */ beq lbl_802FE3EC
/* 802FE3B8 002FB318 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802FE3BC 002FB31C 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802FE3C0 002FB320 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802FE3B8 002FB318 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802FE3BC 002FB31C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802FE3C0 002FB320 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802FE3C4 002FB324 3C 80 80 3F */ lis r4, lbl_803ED568@ha
/* 802FE3C8 002FB328 90 03 00 00 */ stw r0, 0(r3)
/* 802FE3CC 002FB32C 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802FE3CC 002FB32C 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802FE3D0 002FB330 38 A0 00 00 */ li r5, 0
/* 802FE3D4 002FB334 38 04 D5 68 */ addi r0, r4, lbl_803ED568@l
/* 802FE3D8 002FB338 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Animation/CAnimCharacterSet.s
View File

@ -107,12 +107,12 @@ sub_802d81c0:
lbl_802D8200:
/* 802D8200 002D5160 28 1E 00 00 */ cmplwi r30, 0
/* 802D8204 002D5164 41 82 00 20 */ beq lbl_802D8224
/* 802D8208 002D5168 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802D820C 002D516C 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802D8208 002D5168 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802D820C 002D516C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802D8210 002D5170 90 1E 00 00 */ stw r0, 0(r30)
/* 802D8214 002D5174 41 82 00 10 */ beq lbl_802D8224
/* 802D8218 002D5178 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802D821C 002D517C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802D8218 002D5178 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802D821C 002D517C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802D8220 002D5180 90 1E 00 00 */ stw r0, 0(r30)
lbl_802D8224:
/* 802D8224 002D5184 7F E0 07 35 */ extsh. r0, r31
@ -396,12 +396,12 @@ sub_802d85a0:
/* 802D85D0 002D5530 48 03 D2 9D */ bl __nw__FUlPCcPCc
/* 802D85D4 002D5534 28 03 00 00 */ cmplwi r3, 0
/* 802D85D8 002D5538 41 82 00 38 */ beq lbl_802D8610
/* 802D85DC 002D553C 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802D85E0 002D5540 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802D85E4 002D5544 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802D85DC 002D553C 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802D85E0 002D5540 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802D85E4 002D5544 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802D85E8 002D5548 3C 80 80 3F */ lis r4, lbl_803ECBD0@ha
/* 802D85EC 002D554C 90 03 00 00 */ stw r0, 0(r3)
/* 802D85F0 002D5550 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802D85F0 002D5550 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802D85F4 002D5554 38 A0 00 00 */ li r5, 0
/* 802D85F8 002D5558 38 04 CB D0 */ addi r0, r4, lbl_803ECBD0@l
/* 802D85FC 002D555C 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Animation/CAnimPOIData.s
View File

@ -134,12 +134,12 @@ sub_802ebbf8:
lbl_802EBC38:
/* 802EBC38 002E8B98 28 1E 00 00 */ cmplwi r30, 0
/* 802EBC3C 002E8B9C 41 82 00 20 */ beq lbl_802EBC5C
/* 802EBC40 002E8BA0 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802EBC44 002E8BA4 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802EBC40 002E8BA0 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802EBC44 002E8BA4 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802EBC48 002E8BA8 90 1E 00 00 */ stw r0, 0(r30)
/* 802EBC4C 002E8BAC 41 82 00 10 */ beq lbl_802EBC5C
/* 802EBC50 002E8BB0 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802EBC54 002E8BB4 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802EBC50 002E8BB0 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802EBC54 002E8BB4 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802EBC58 002E8BB8 90 1E 00 00 */ stw r0, 0(r30)
lbl_802EBC5C:
/* 802EBC5C 002E8BBC 7F E0 07 35 */ extsh. r0, r31
@ -321,12 +321,12 @@ lbl_802EBE40:
/* 802EBEC0 002E8E20 48 02 99 AD */ bl __nw__FUlPCcPCc
/* 802EBEC4 002E8E24 28 03 00 00 */ cmplwi r3, 0
/* 802EBEC8 002E8E28 41 82 00 38 */ beq lbl_802EBF00
/* 802EBECC 002E8E2C 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802EBED0 002E8E30 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802EBED4 002E8E34 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802EBECC 002E8E2C 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802EBED0 002E8E30 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802EBED4 002E8E34 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802EBED8 002E8E38 3C 80 80 3F */ lis r4, lbl_803ECF48@ha
/* 802EBEDC 002E8E3C 90 03 00 00 */ stw r0, 0(r3)
/* 802EBEE0 002E8E40 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802EBEE0 002E8E40 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802EBEE4 002E8E44 38 A0 00 00 */ li r5, 0
/* 802EBEE8 002E8E48 38 04 CF 48 */ addi r0, r4, lbl_803ECF48@l
/* 802EBEEC 002E8E4C 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Animation/CCharLayoutInfo.s
View File

@ -532,12 +532,12 @@ sub_802f8294:
lbl_802F82D4:
/* 802F82D4 002F5234 28 1E 00 00 */ cmplwi r30, 0
/* 802F82D8 002F5238 41 82 00 20 */ beq lbl_802F82F8
/* 802F82DC 002F523C 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802F82E0 002F5240 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802F82DC 002F523C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802F82E0 002F5240 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802F82E4 002F5244 90 1E 00 00 */ stw r0, 0(r30)
/* 802F82E8 002F5248 41 82 00 10 */ beq lbl_802F82F8
/* 802F82EC 002F524C 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802F82F0 002F5250 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802F82EC 002F524C 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802F82F0 002F5250 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802F82F4 002F5254 90 1E 00 00 */ stw r0, 0(r30)
lbl_802F82F8:
/* 802F82F8 002F5258 7F E0 07 35 */ extsh. r0, r31
@ -632,12 +632,12 @@ sub_802f83f4:
/* 802F8424 002F5384 48 01 D4 49 */ bl __nw__FUlPCcPCc
/* 802F8428 002F5388 28 03 00 00 */ cmplwi r3, 0
/* 802F842C 002F538C 41 82 00 38 */ beq lbl_802F8464
/* 802F8430 002F5390 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802F8434 002F5394 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802F8438 002F5398 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802F8430 002F5390 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802F8434 002F5394 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802F8438 002F5398 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802F843C 002F539C 3C 80 80 3F */ lis r4, lbl_803ED420@ha
/* 802F8440 002F53A0 90 03 00 00 */ stw r0, 0(r3)
/* 802F8444 002F53A4 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802F8444 002F53A4 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802F8448 002F53A8 38 A0 00 00 */ li r5, 0
/* 802F844C 002F53AC 38 04 D4 20 */ addi r0, r4, lbl_803ED420@l
/* 802F8450 002F53B0 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Animation/DolphinCSkinRules.s
View File

@ -408,12 +408,12 @@ lbl_80353D2C:
lbl_80353D84:
/* 80353D84 00350CE4 28 1E 00 00 */ cmplwi r30, 0
/* 80353D88 00350CE8 41 82 00 20 */ beq lbl_80353DA8
/* 80353D8C 00350CEC 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80353D90 00350CF0 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80353D8C 00350CEC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80353D90 00350CF0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80353D94 00350CF4 90 1E 00 00 */ stw r0, 0(r30)
/* 80353D98 00350CF8 41 82 00 10 */ beq lbl_80353DA8
/* 80353D9C 00350CFC 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80353DA0 00350D00 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80353D9C 00350CFC 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80353DA0 00350D00 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80353DA4 00350D04 90 1E 00 00 */ stw r0, 0(r30)
lbl_80353DA8:
/* 80353DA8 00350D08 7F E0 07 35 */ extsh. r0, r31
@ -460,12 +460,12 @@ lbl_80353DB8:
/* 80353E30 00350D90 4B FC 1A 3D */ bl __nw__FUlPCcPCc
/* 80353E34 00350D94 28 03 00 00 */ cmplwi r3, 0
/* 80353E38 00350D98 41 82 00 38 */ beq lbl_80353E70
/* 80353E3C 00350D9C 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80353E40 00350DA0 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80353E44 00350DA4 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80353E3C 00350D9C 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80353E40 00350DA0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80353E44 00350DA4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80353E48 00350DA8 3C 80 80 3F */ lis r4, lbl_803EF728@ha
/* 80353E4C 00350DAC 90 03 00 00 */ stw r0, 0(r3)
/* 80353E50 00350DB0 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80353E50 00350DB0 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80353E54 00350DB4 38 A0 00 00 */ li r5, 0
/* 80353E58 00350DB8 38 04 F7 28 */ addi r0, r4, lbl_803EF728@l
/* 80353E5C 00350DBC 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Audio/CMidiManager.s
View File

@ -133,12 +133,12 @@ lbl_80358D00:
lbl_80358D08:
/* 80358D08 00355C68 28 1D 00 00 */ cmplwi r29, 0
/* 80358D0C 00355C6C 41 82 00 20 */ beq lbl_80358D2C
/* 80358D10 00355C70 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80358D14 00355C74 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80358D10 00355C70 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80358D14 00355C74 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80358D18 00355C78 90 1D 00 00 */ stw r0, 0(r29)
/* 80358D1C 00355C7C 41 82 00 10 */ beq lbl_80358D2C
/* 80358D20 00355C80 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80358D24 00355C84 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80358D20 00355C80 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80358D24 00355C84 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80358D28 00355C88 90 1D 00 00 */ stw r0, 0(r29)
lbl_80358D2C:
/* 80358D2C 00355C8C 7F C0 07 35 */ extsh. r0, r30
@ -186,12 +186,12 @@ lbl_80358D3C:
/* 80358DB8 00355D18 4B FB CA B5 */ bl __nw__FUlPCcPCc
/* 80358DBC 00355D1C 28 03 00 00 */ cmplwi r3, 0
/* 80358DC0 00355D20 41 82 00 38 */ beq lbl_80358DF8
/* 80358DC4 00355D24 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80358DC8 00355D28 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80358DCC 00355D2C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80358DC4 00355D24 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80358DC8 00355D28 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80358DCC 00355D2C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80358DD0 00355D30 3C 80 80 3F */ lis r4, lbl_803EF788@ha
/* 80358DD4 00355D34 90 03 00 00 */ stw r0, 0(r3)
/* 80358DD8 00355D38 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80358DD8 00355D38 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80358DDC 00355D3C 38 A0 00 00 */ li r5, 0
/* 80358DE0 00355D40 38 04 F7 88 */ addi r0, r4, lbl_803EF788@l
/* 80358DE4 00355D44 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Audio/CSfxManager.s
View File

@ -366,12 +366,12 @@ lbl_802E7B4C:
lbl_802E7B54:
/* 802E7B54 002E4AB4 28 1D 00 00 */ cmplwi r29, 0
/* 802E7B58 002E4AB8 41 82 00 20 */ beq lbl_802E7B78
/* 802E7B5C 002E4ABC 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802E7B60 002E4AC0 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802E7B5C 002E4ABC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802E7B60 002E4AC0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802E7B64 002E4AC4 90 1D 00 00 */ stw r0, 0(r29)
/* 802E7B68 002E4AC8 41 82 00 10 */ beq lbl_802E7B78
/* 802E7B6C 002E4ACC 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802E7B70 002E4AD0 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802E7B6C 002E4ACC 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802E7B70 002E4AD0 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802E7B74 002E4AD4 90 1D 00 00 */ stw r0, 0(r29)
lbl_802E7B78:
/* 802E7B78 002E4AD8 7F C0 07 35 */ extsh. r0, r30
@ -419,12 +419,12 @@ lbl_802E7B88:
/* 802E7C04 002E4B64 48 02 DC 69 */ bl __nw__FUlPCcPCc
/* 802E7C08 002E4B68 28 03 00 00 */ cmplwi r3, 0
/* 802E7C0C 002E4B6C 41 82 00 38 */ beq lbl_802E7C44
/* 802E7C10 002E4B70 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802E7C14 002E4B74 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802E7C18 002E4B78 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802E7C10 002E4B70 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802E7C14 002E4B74 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802E7C18 002E4B78 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802E7C1C 002E4B7C 3C 80 80 3F */ lis r4, lbl_803ECE74@ha
/* 802E7C20 002E4B80 90 03 00 00 */ stw r0, 0(r3)
/* 802E7C24 002E4B84 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802E7C24 002E4B84 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802E7C28 002E4B88 38 A0 00 00 */ li r5, 0
/* 802E7C2C 002E4B8C 38 04 CE 74 */ addi r0, r4, lbl_803ECE74@l
/* 802E7C30 002E4B90 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Audio/DolphinCAudioGroupSet.s
View File

@ -173,12 +173,12 @@ lbl_8034A248:
lbl_8034A250:
/* 8034A250 003471B0 28 1D 00 00 */ cmplwi r29, 0
/* 8034A254 003471B4 41 82 00 20 */ beq lbl_8034A274
/* 8034A258 003471B8 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 8034A25C 003471BC 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 8034A258 003471B8 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8034A25C 003471BC 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8034A260 003471C0 90 1D 00 00 */ stw r0, 0(r29)
/* 8034A264 003471C4 41 82 00 10 */ beq lbl_8034A274
/* 8034A268 003471C8 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 8034A26C 003471CC 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8034A268 003471C8 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 8034A26C 003471CC 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 8034A270 003471D0 90 1D 00 00 */ stw r0, 0(r29)
lbl_8034A274:
/* 8034A274 003471D4 7F C0 07 35 */ extsh. r0, r30
@ -226,12 +226,12 @@ sub_8034a2d0:
/* 8034A300 00347260 4B FC B5 6D */ bl __nw__FUlPCcPCc
/* 8034A304 00347264 28 03 00 00 */ cmplwi r3, 0
/* 8034A308 00347268 41 82 00 38 */ beq lbl_8034A340
/* 8034A30C 0034726C 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8034A310 00347270 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8034A314 00347274 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8034A30C 0034726C 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8034A310 00347270 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8034A314 00347274 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8034A318 00347278 3C 80 80 3F */ lis r4, lbl_803EF670@ha
/* 8034A31C 0034727C 90 03 00 00 */ stw r0, 0(r3)
/* 8034A320 00347280 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 8034A320 00347280 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8034A324 00347284 38 A0 00 00 */ li r5, 0
/* 8034A328 00347288 38 04 F6 70 */ addi r0, r4, lbl_803EF670@l
/* 8034A32C 0034728C 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/CDependencyGroup.s
View File

@ -129,12 +129,12 @@ lbl_803650E0:
lbl_803650E8:
/* 803650E8 00362048 28 1D 00 00 */ cmplwi r29, 0
/* 803650EC 0036204C 41 82 00 20 */ beq lbl_8036510C
/* 803650F0 00362050 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 803650F4 00362054 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 803650F0 00362050 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 803650F4 00362054 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 803650F8 00362058 90 1D 00 00 */ stw r0, 0(r29)
/* 803650FC 0036205C 41 82 00 10 */ beq lbl_8036510C
/* 80365100 00362060 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80365104 00362064 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80365100 00362060 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80365104 00362064 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80365108 00362068 90 1D 00 00 */ stw r0, 0(r29)
lbl_8036510C:
/* 8036510C 0036206C 7F C0 07 35 */ extsh. r0, r30
@ -182,12 +182,12 @@ sub_80365168:
/* 80365198 003620F8 4B FB 06 D5 */ bl __nw__FUlPCcPCc
/* 8036519C 003620FC 28 03 00 00 */ cmplwi r3, 0
/* 803651A0 00362100 41 82 00 38 */ beq lbl_803651D8
/* 803651A4 00362104 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 803651A8 00362108 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 803651AC 0036210C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 803651A4 00362104 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 803651A8 00362108 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 803651AC 0036210C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 803651B0 00362110 3C 80 80 3F */ lis r4, lbl_803EF830@ha
/* 803651B4 00362114 90 03 00 00 */ stw r0, 0(r3)
/* 803651B8 00362118 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 803651B8 00362118 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 803651BC 0036211C 38 A0 00 00 */ li r5, 0
/* 803651C0 00362120 38 04 F8 30 */ addi r0, r4, lbl_803EF830@l
/* 803651C4 00362124 90 C3 00 00 */ stw r6, 0(r3)

4
asm/Kyoto/CFactoryStore.s
View File

@ -27,8 +27,8 @@ lbl_803EE3D8:
/* 8033FA74 0033C9D4 38 03 9C 44 */ addi r0, r3, lbl_803D9C44@l
/* 8033FA78 0033C9D8 90 1F 00 00 */ stw r0, 0(r31)
/* 8033FA7C 0033C9DC 41 82 00 10 */ beq lbl_8033FA8C
/* 8033FA80 0033C9E0 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 8033FA84 0033C9E4 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8033FA80 0033C9E0 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 8033FA84 0033C9E4 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 8033FA88 0033C9E8 90 1F 00 00 */ stw r0, 0(r31)
lbl_8033FA8C:
/* 8033FA8C 0033C9EC 7C 80 07 35 */ extsh. r0, r4

4
asm/Kyoto/CSimplePool.s
View File

@ -709,9 +709,9 @@ __ct__11CSimplePoolFR8IFactory:
/* 80340868 0033D7C8 4B FD 50 05 */ bl __nw__FUlPCcPCc
/* 8034086C 0033D7CC 7C 7E 1B 79 */ or. r30, r3, r3
/* 80340870 0033D7D0 41 82 00 2C */ beq lbl_8034089C
/* 80340874 0033D7D4 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80340874 0033D7D4 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80340878 0033D7D8 3C 80 80 3E */ lis r4, lbl_803D9C44@ha
/* 8034087C 0033D7DC 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8034087C 0033D7DC 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80340880 0033D7E0 3C 60 80 3F */ lis r3, lbl_803EE3D8@ha
/* 80340884 0033D7E4 90 1E 00 00 */ stw r0, 0(r30)
/* 80340888 0033D7E8 38 84 9C 44 */ addi r4, r4, lbl_803D9C44@l

16
asm/Kyoto/Graphics/DolphinCModel.s
View File

@ -584,12 +584,12 @@ lbl_803557DC:
lbl_80355844:
/* 80355844 003527A4 28 1E 00 00 */ cmplwi r30, 0
/* 80355848 003527A8 41 82 00 20 */ beq lbl_80355868
/* 8035584C 003527AC 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80355850 003527B0 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 8035584C 003527AC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80355850 003527B0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80355854 003527B4 90 1E 00 00 */ stw r0, 0(r30)
/* 80355858 003527B8 41 82 00 10 */ beq lbl_80355868
/* 8035585C 003527BC 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80355860 003527C0 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8035585C 003527BC 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80355860 003527C0 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80355864 003527C4 90 1E 00 00 */ stw r0, 0(r30)
lbl_80355868:
/* 80355868 003527C8 7F E0 07 35 */ extsh. r0, r31
@ -636,12 +636,12 @@ lbl_80355878:
/* 803558F0 00352850 4B FB FF 7D */ bl __nw__FUlPCcPCc
/* 803558F4 00352854 28 03 00 00 */ cmplwi r3, 0
/* 803558F8 00352858 41 82 00 38 */ beq lbl_80355930
/* 803558FC 0035285C 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80355900 00352860 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80355904 00352864 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 803558FC 0035285C 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80355900 00352860 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80355904 00352864 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80355908 00352868 3C 80 80 3F */ lis r4, lbl_803EF738@ha
/* 8035590C 0035286C 90 03 00 00 */ stw r0, 0(r3)
/* 80355910 00352870 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80355910 00352870 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80355914 00352874 38 A0 00 00 */ li r5, 0
/* 80355918 00352878 38 04 F7 38 */ addi r0, r4, lbl_803EF738@l
/* 8035591C 0035287C 90 C3 00 00 */ stw r6, 0(r3)

8
asm/Kyoto/Graphics/DolphinCTexture.s
View File

@ -603,12 +603,12 @@ lbl_8030E83C:
/* 8030E8B0 0030B810 48 00 6F BD */ bl __nw__FUlPCcPCc
/* 8030E8B4 0030B814 28 03 00 00 */ cmplwi r3, 0
/* 8030E8B8 0030B818 41 82 00 38 */ beq lbl_8030E8F0
/* 8030E8BC 0030B81C 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8030E8C0 0030B820 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8030E8C4 0030B824 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8030E8BC 0030B81C 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8030E8C0 0030B820 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8030E8C4 0030B824 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8030E8C8 0030B828 3C 80 80 3E */ lis r4, lbl_803D8D84@ha
/* 8030E8CC 0030B82C 90 03 00 00 */ stw r0, 0(r3)
/* 8030E8D0 0030B830 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 8030E8D0 0030B830 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8030E8D4 0030B834 38 A0 00 00 */ li r5, 0
/* 8030E8D8 0030B838 38 04 8D 84 */ addi r0, r4, lbl_803D8D84@l
/* 8030E8DC 0030B83C 90 C3 00 00 */ stw r6, 0(r3)

8
asm/Kyoto/Particles/CElementGen.s
View File

@ -21464,12 +21464,12 @@ lbl_8032A0D0:
/* 8032A148 003270A8 4B FE B7 25 */ bl __nw__FUlPCcPCc
/* 8032A14C 003270AC 28 03 00 00 */ cmplwi r3, 0
/* 8032A150 003270B0 41 82 00 38 */ beq lbl_8032A188
/* 8032A154 003270B4 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8032A158 003270B8 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8032A15C 003270BC 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8032A154 003270B4 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8032A158 003270B8 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8032A15C 003270BC 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8032A160 003270C0 3C 80 80 3E */ lis r4, lbl_803DACB0@ha
/* 8032A164 003270C4 90 03 00 00 */ stw r0, 0(r3)
/* 8032A168 003270C8 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 8032A168 003270C8 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8032A16C 003270CC 38 A0 00 00 */ li r5, 0
/* 8032A170 003270D0 38 04 AC B0 */ addi r0, r4, lbl_803DACB0@l
/* 8032A174 003270D4 90 C3 00 00 */ stw r6, 0(r3)

8
asm/Kyoto/Particles/CParticleElectricDataFactory.s
View File

@ -698,12 +698,12 @@ lbl_8035E7F4:
/* 8035E86C 0035B7CC 4B FB 70 01 */ bl __nw__FUlPCcPCc
/* 8035E870 0035B7D0 28 03 00 00 */ cmplwi r3, 0
/* 8035E874 0035B7D4 41 82 00 38 */ beq lbl_8035E8AC
/* 8035E878 0035B7D8 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8035E87C 0035B7DC 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8035E880 0035B7E0 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8035E878 0035B7D8 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8035E87C 0035B7DC 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8035E880 0035B7E0 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8035E884 0035B7E4 3C 80 80 3E */ lis r4, lbl_803DACA4@ha
/* 8035E888 0035B7E8 90 03 00 00 */ stw r0, 0(r3)
/* 8035E88C 0035B7EC 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 8035E88C 0035B7EC 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8035E890 0035B7F0 38 A0 00 00 */ li r5, 0
/* 8035E894 0035B7F4 38 04 AC A4 */ addi r0, r4, lbl_803DACA4@l
/* 8035E898 0035B7F8 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Kyoto/Particles/CParticleSwooshDataFactory.s
View File

@ -474,12 +474,12 @@ lbl_8032FF38:
lbl_8032FF90:
/* 8032FF90 0032CEF0 28 1E 00 00 */ cmplwi r30, 0
/* 8032FF94 0032CEF4 41 82 00 20 */ beq lbl_8032FFB4
/* 8032FF98 0032CEF8 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 8032FF9C 0032CEFC 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 8032FF98 0032CEF8 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8032FF9C 0032CEFC 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8032FFA0 0032CF00 90 1E 00 00 */ stw r0, 0(r30)
/* 8032FFA4 0032CF04 41 82 00 10 */ beq lbl_8032FFB4
/* 8032FFA8 0032CF08 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 8032FFAC 0032CF0C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8032FFA8 0032CF08 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 8032FFAC 0032CF0C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 8032FFB0 0032CF10 90 1E 00 00 */ stw r0, 0(r30)
lbl_8032FFB4:
/* 8032FFB4 0032CF14 7F E0 07 35 */ extsh. r0, r31
@ -586,12 +586,12 @@ sub_803300e8:
/* 80330118 0032D078 4B FE 57 55 */ bl __nw__FUlPCcPCc
/* 8033011C 0032D07C 28 03 00 00 */ cmplwi r3, 0
/* 80330120 0032D080 41 82 00 38 */ beq lbl_80330158
/* 80330124 0032D084 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80330128 0032D088 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8033012C 0032D08C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80330124 0032D084 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80330128 0032D088 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8033012C 0032D08C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80330130 0032D090 3C 80 80 3F */ lis r4, lbl_803EDDF8@ha
/* 80330134 0032D094 90 03 00 00 */ stw r0, 0(r3)
/* 80330138 0032D098 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80330138 0032D098 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8033013C 0032D09C 38 A0 00 00 */ li r5, 0
/* 80330140 0032D0A0 38 04 DD F8 */ addi r0, r4, lbl_803EDDF8@l
/* 80330144 0032D0A4 90 C3 00 00 */ stw r6, 0(r3)

8
asm/Kyoto/Text/CRasterFont.s
View File

@ -246,12 +246,12 @@ sub_803001e8:
/* 80300218 002FD178 48 01 56 55 */ bl __nw__FUlPCcPCc
/* 8030021C 002FD17C 28 03 00 00 */ cmplwi r3, 0
/* 80300220 002FD180 41 82 00 38 */ beq lbl_80300258
/* 80300224 002FD184 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80300228 002FD188 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8030022C 002FD18C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80300224 002FD184 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80300228 002FD188 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8030022C 002FD18C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80300230 002FD190 3C 80 80 3E */ lis r4, lbl_803D8D60@ha
/* 80300234 002FD194 90 03 00 00 */ stw r0, 0(r3)
/* 80300238 002FD198 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80300238 002FD198 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8030023C 002FD19C 38 A0 00 00 */ li r5, 0
/* 80300240 002FD1A0 38 04 8D 60 */ addi r0, r4, lbl_803D8D60@l
/* 80300244 002FD1A4 90 C3 00 00 */ stw r6, 0(r3)

30
asm/Kyoto/Text/CStringTable.s
View File

@ -31,7 +31,7 @@ FStringTableFactory__FRC10SObjectTagR12CInputStreamRC15CVParamTransfer:
/* 80356540 003534A0 7C 64 1B 78 */ mr r4, r3
lbl_80356544:
/* 80356544 003534A4 7F C3 F3 78 */ mr r3, r30
/* 80356548 003534A8 48 00 00 1D */ bl sub_80356564
/* 80356548 003534A8 48 00 00 1D */ bl "__ct<12CStringTable>__16CFactoryFnReturnFP12CStringTable"
/* 8035654C 003534AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80356550 003534B0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80356554 003534B4 83 C1 00 08 */ lwz r30, 8(r1)
@ -39,8 +39,8 @@ lbl_80356544:
/* 8035655C 003534BC 38 21 00 10 */ addi r1, r1, 0x10
/* 80356560 003534C0 4E 80 00 20 */ blr
.global sub_80356564
sub_80356564:
.global "__ct<12CStringTable>__16CFactoryFnReturnFP12CStringTable"
"__ct<12CStringTable>__16CFactoryFnReturnFP12CStringTable":
/* 80356564 003534C4 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80356568 003534C8 7C 08 02 A6 */ mflr r0
/* 8035656C 003534CC 90 01 00 24 */ stw r0, 0x24(r1)
@ -54,7 +54,7 @@ sub_80356564:
/* 8035658C 003534EC 90 81 00 14 */ stw r4, 0x14(r1)
/* 80356590 003534F0 38 81 00 10 */ addi r4, r1, 0x10
/* 80356594 003534F4 98 01 00 10 */ stb r0, 0x10(r1)
/* 80356598 003534F8 48 00 00 9D */ bl sub_80356634
/* 80356598 003534F8 48 00 00 9D */ bl "GetIObjObjectFor__22TToken<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable>"
/* 8035659C 003534FC 80 61 00 0C */ lwz r3, 0xc(r1)
/* 803565A0 00353500 38 00 00 00 */ li r0, 0
/* 803565A4 00353504 98 01 00 08 */ stb r0, 8(r1)
@ -97,22 +97,22 @@ lbl_80356618:
/* 8035662C 0035358C 38 21 00 20 */ addi r1, r1, 0x20
/* 80356630 00353590 4E 80 00 20 */ blr
.global sub_80356634
sub_80356634:
.global "GetIObjObjectFor__22TToken<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable>"
"GetIObjObjectFor__22TToken<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable>":
/* 80356634 00353594 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80356638 00353598 7C 08 02 A6 */ mflr r0
/* 8035663C 0035359C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80356640 003535A0 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80356644 003535A4 7C 7F 1B 78 */ mr r31, r3
/* 80356648 003535A8 48 00 00 19 */ bl sub_80356660
/* 80356648 003535A8 48 00 00 19 */ bl "GetNewDerivedObject__40TObjOwnerDerivedFromIObj<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable>"
/* 8035664C 003535AC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80356650 003535B0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80356654 003535B4 7C 08 03 A6 */ mtlr r0
/* 80356658 003535B8 38 21 00 10 */ addi r1, r1, 0x10
/* 8035665C 003535BC 4E 80 00 20 */ blr
.global sub_80356660
sub_80356660:
.global "GetNewDerivedObject__40TObjOwnerDerivedFromIObj<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable>"
"GetNewDerivedObject__40TObjOwnerDerivedFromIObj<12CStringTable>FRCQ24rstl24auto_ptr<12CStringTable>":
/* 80356660 003535C0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80356664 003535C4 7C 08 02 A6 */ mflr r0
/* 80356668 003535C8 3C A0 80 3E */ lis r5, lbl_803D8320@ha
@ -128,14 +128,14 @@ sub_80356660:
/* 80356690 003535F0 4B FB F1 DD */ bl __nw__FUlPCcPCc
/* 80356694 003535F4 28 03 00 00 */ cmplwi r3, 0
/* 80356698 003535F8 41 82 00 38 */ beq lbl_803566D0
/* 8035669C 003535FC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 803566A0 00353600 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 803566A4 00353604 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 803566A8 00353608 3C 80 80 3E */ lis r4, lbl_803D9A0C@ha
/* 8035669C 003535FC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 803566A0 00353600 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 803566A4 00353604 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 803566A8 00353608 3C 80 80 3E */ lis r4, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@ha
/* 803566AC 0035360C 90 03 00 00 */ stw r0, 0(r3)
/* 803566B0 00353610 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 803566B0 00353610 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 803566B4 00353614 38 A0 00 00 */ li r5, 0
/* 803566B8 00353618 38 04 9A 0C */ addi r0, r4, lbl_803D9A0C@l
/* 803566B8 00353618 38 04 9A 0C */ addi r0, r4, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@l
/* 803566BC 0035361C 90 C3 00 00 */ stw r6, 0(r3)
/* 803566C0 00353620 98 BF 00 00 */ stb r5, 0(r31)
/* 803566C4 00353624 80 9F 00 04 */ lwz r4, 4(r31)

16
asm/MetroidPrime/CMapArea.s
View File

@ -122,12 +122,12 @@ lbl_80080284:
lbl_800802E4:
/* 800802E4 0007D244 28 1E 00 00 */ cmplwi r30, 0
/* 800802E8 0007D248 41 82 00 20 */ beq lbl_80080308
/* 800802EC 0007D24C 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 800802F0 0007D250 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 800802EC 0007D24C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 800802F0 0007D250 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 800802F4 0007D254 90 1E 00 00 */ stw r0, 0(r30)
/* 800802F8 0007D258 41 82 00 10 */ beq lbl_80080308
/* 800802FC 0007D25C 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80080300 0007D260 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 800802FC 0007D25C 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80080300 0007D260 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80080304 0007D264 90 1E 00 00 */ stw r0, 0(r30)
lbl_80080308:
/* 80080308 0007D268 7F E0 07 35 */ extsh. r0, r31
@ -174,12 +174,12 @@ lbl_80080318:
/* 80080390 0007D2F0 48 29 54 DD */ bl __nw__FUlPCcPCc
/* 80080394 0007D2F4 28 03 00 00 */ cmplwi r3, 0
/* 80080398 0007D2F8 41 82 00 38 */ beq lbl_800803D0
/* 8008039C 0007D2FC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 800803A0 0007D300 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 800803A4 0007D304 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8008039C 0007D2FC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 800803A0 0007D300 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 800803A4 0007D304 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 800803A8 0007D308 3C 80 80 3E */ lis r4, lbl_803DAB80@ha
/* 800803AC 0007D30C 90 03 00 00 */ stw r0, 0(r3)
/* 800803B0 0007D310 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 800803B0 0007D310 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 800803B4 0007D314 38 A0 00 00 */ li r5, 0
/* 800803B8 0007D318 38 04 AB 80 */ addi r0, r4, lbl_803DAB80@l
/* 800803BC 0007D31C 90 C3 00 00 */ stw r6, 0(r3)

16
asm/MetroidPrime/CMapUniverse.s
View File

@ -111,12 +111,12 @@ lbl_80201DF4:
lbl_80201E50:
/* 80201E50 001FEDB0 28 1E 00 00 */ cmplwi r30, 0
/* 80201E54 001FEDB4 41 82 00 20 */ beq lbl_80201E74
/* 80201E58 001FEDB8 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80201E5C 001FEDBC 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80201E58 001FEDB8 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80201E5C 001FEDBC 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80201E60 001FEDC0 90 1E 00 00 */ stw r0, 0(r30)
/* 80201E64 001FEDC4 41 82 00 10 */ beq lbl_80201E74
/* 80201E68 001FEDC8 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80201E6C 001FEDCC 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80201E68 001FEDC8 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80201E6C 001FEDCC 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80201E70 001FEDD0 90 1E 00 00 */ stw r0, 0(r30)
lbl_80201E74:
/* 80201E74 001FEDD4 7F E0 07 35 */ extsh. r0, r31
@ -163,12 +163,12 @@ lbl_80201E84:
/* 80201EFC 001FEE5C 48 11 39 71 */ bl __nw__FUlPCcPCc
/* 80201F00 001FEE60 28 03 00 00 */ cmplwi r3, 0
/* 80201F04 001FEE64 41 82 00 38 */ beq lbl_80201F3C
/* 80201F08 001FEE68 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80201F0C 001FEE6C 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80201F10 001FEE70 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80201F08 001FEE68 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80201F0C 001FEE6C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80201F10 001FEE70 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80201F14 001FEE74 3C 80 80 3E */ lis r4, lbl_803E6BD0@ha
/* 80201F18 001FEE78 90 03 00 00 */ stw r0, 0(r3)
/* 80201F1C 001FEE7C 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80201F1C 001FEE7C 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80201F20 001FEE80 38 A0 00 00 */ li r5, 0
/* 80201F24 001FEE84 38 04 6B D0 */ addi r0, r4, lbl_803E6BD0@l
/* 80201F28 001FEE88 90 C3 00 00 */ stw r6, 0(r3)

16
asm/MetroidPrime/CMapWorld.s
View File

@ -1030,12 +1030,12 @@ lbl_8009F4BC:
lbl_8009F514:
/* 8009F514 0009C474 28 1E 00 00 */ cmplwi r30, 0
/* 8009F518 0009C478 41 82 00 20 */ beq lbl_8009F538
/* 8009F51C 0009C47C 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 8009F520 0009C480 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 8009F51C 0009C47C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8009F520 0009C480 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8009F524 0009C484 90 1E 00 00 */ stw r0, 0(r30)
/* 8009F528 0009C488 41 82 00 10 */ beq lbl_8009F538
/* 8009F52C 0009C48C 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 8009F530 0009C490 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8009F52C 0009C48C 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 8009F530 0009C490 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 8009F534 0009C494 90 1E 00 00 */ stw r0, 0(r30)
lbl_8009F538:
/* 8009F538 0009C498 7F E0 07 35 */ extsh. r0, r31
@ -1082,12 +1082,12 @@ lbl_8009F548:
/* 8009F5C0 0009C520 48 27 62 AD */ bl __nw__FUlPCcPCc
/* 8009F5C4 0009C524 28 03 00 00 */ cmplwi r3, 0
/* 8009F5C8 0009C528 41 82 00 38 */ beq lbl_8009F600
/* 8009F5CC 0009C52C 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8009F5D0 0009C530 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8009F5D4 0009C534 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8009F5CC 0009C52C 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8009F5D0 0009C530 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8009F5D4 0009C534 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8009F5D8 0009C538 3C 80 80 3E */ lis r4, lbl_803DAF48@ha
/* 8009F5DC 0009C53C 90 03 00 00 */ stw r0, 0(r3)
/* 8009F5E0 0009C540 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 8009F5E0 0009C540 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8009F5E4 0009C544 38 A0 00 00 */ li r5, 0
/* 8009F5E8 0009C548 38 04 AF 48 */ addi r0, r4, lbl_803DAF48@l
/* 8009F5EC 0009C54C 90 C3 00 00 */ stw r6, 0(r3)

34
asm/MetroidPrime/CPlayMovie.s
View File

@ -2,12 +2,12 @@
.section .data
.global lbl_803D9A0C
lbl_803D9A0C:
.global "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"
"__vt__40TObjOwnerDerivedFromIObj<12CStringTable>":
# ROM: 0x3D6A0C
.4byte 0
.4byte 0
.4byte sub_80027c20
.4byte "__dt__40TObjOwnerDerivedFromIObj<12CStringTable>Fv"
.global lbl_803D9A18
lbl_803D9A18:
@ -2868,8 +2868,8 @@ lbl_80027C08:
/* 80027C18 00024B78 38 21 00 80 */ addi r1, r1, 0x80
/* 80027C1C 00024B7C 4E 80 00 20 */ blr
.global sub_80027c20
sub_80027c20:
.global "__dt__40TObjOwnerDerivedFromIObj<12CStringTable>Fv"
"__dt__40TObjOwnerDerivedFromIObj<12CStringTable>Fv":
/* 80027C20 00024B80 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80027C24 00024B84 7C 08 02 A6 */ mflr r0
/* 80027C28 00024B88 90 01 00 24 */ stw r0, 0x24(r1)
@ -2879,8 +2879,8 @@ sub_80027c20:
/* 80027C38 00024B98 93 A1 00 14 */ stw r29, 0x14(r1)
/* 80027C3C 00024B9C 7C 7D 1B 79 */ or. r29, r3, r3
/* 80027C40 00024BA0 41 82 00 6C */ beq lbl_80027CAC
/* 80027C44 00024BA4 3C 60 80 3E */ lis r3, lbl_803D9A0C@ha
/* 80027C48 00024BA8 38 03 9A 0C */ addi r0, r3, lbl_803D9A0C@l
/* 80027C44 00024BA4 3C 60 80 3E */ lis r3, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@ha
/* 80027C48 00024BA8 38 03 9A 0C */ addi r0, r3, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@l
/* 80027C4C 00024BAC 90 1D 00 00 */ stw r0, 0(r29)
/* 80027C50 00024BB0 83 FD 00 04 */ lwz r31, 4(r29)
/* 80027C54 00024BB4 28 1F 00 00 */ cmplwi r31, 0
@ -2896,12 +2896,12 @@ lbl_80027C70:
lbl_80027C78:
/* 80027C78 00024BD8 28 1D 00 00 */ cmplwi r29, 0
/* 80027C7C 00024BDC 41 82 00 20 */ beq lbl_80027C9C
/* 80027C80 00024BE0 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80027C84 00024BE4 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80027C80 00024BE0 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80027C84 00024BE4 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80027C88 00024BE8 90 1D 00 00 */ stw r0, 0(r29)
/* 80027C8C 00024BEC 41 82 00 10 */ beq lbl_80027C9C
/* 80027C90 00024BF0 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80027C94 00024BF4 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80027C90 00024BF0 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80027C94 00024BF4 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80027C98 00024BF8 90 1D 00 00 */ stw r0, 0(r29)
lbl_80027C9C:
/* 80027C9C 00024BFC 7F C0 07 35 */ extsh. r0, r30
@ -2935,13 +2935,13 @@ sub_80027ccc:
/* 80027CFC 00024C5C 48 2E DB 71 */ bl __nw__FUlPCcPCc
/* 80027D00 00024C60 28 03 00 00 */ cmplwi r3, 0
/* 80027D04 00024C64 41 82 00 2C */ beq lbl_80027D30
/* 80027D08 00024C68 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80027D0C 00024C6C 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80027D10 00024C70 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80027D14 00024C74 3C 80 80 3E */ lis r4, lbl_803D9A0C@ha
/* 80027D08 00024C68 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80027D0C 00024C6C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80027D10 00024C70 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80027D14 00024C74 3C 80 80 3E */ lis r4, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@ha
/* 80027D18 00024C78 90 03 00 00 */ stw r0, 0(r3)
/* 80027D1C 00024C7C 38 A5 8D 78 */ addi r5, r5, lbl_803D8D78@l
/* 80027D20 00024C80 38 04 9A 0C */ addi r0, r4, lbl_803D9A0C@l
/* 80027D1C 00024C7C 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80027D20 00024C80 38 04 9A 0C */ addi r0, r4, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@l
/* 80027D24 00024C84 90 A3 00 00 */ stw r5, 0(r3)
/* 80027D28 00024C88 93 E3 00 04 */ stw r31, 4(r3)
/* 80027D2C 00024C8C 90 03 00 00 */ stw r0, 0(r3)

90
asm/MetroidPrime/CSWDataDolphin.s
View File

@ -1,90 +0,0 @@
.include "macros.inc"
.section .sdata2, "a"
.global lbl_805AE290
lbl_805AE290:
# ROM: 0x3FAB30
.float 1.0
.4byte 0
.global lbl_805AE298
lbl_805AE298:
# ROM: 0x3FAB38
.double 4.503599627370496E15
.section .text, "ax"
.global Initialize__Q210CStopwatch7CSWDataFv
Initialize__Q210CStopwatch7CSWDataFv:
/* 802D671C 002D367C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802D6720 002D3680 7C 08 02 A6 */ mflr r0
/* 802D6724 002D3684 3C 80 00 0F */ lis r4, 0x000F4240@ha
/* 802D6728 002D3688 3C A0 80 00 */ lis r5, 0x800000F8@ha
/* 802D672C 002D368C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802D6730 002D3690 38 00 00 00 */ li r0, 0
/* 802D6734 002D3694 38 C4 42 40 */ addi r6, r4, 0x000F4240@l
/* 802D6738 002D3698 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802D673C 002D369C 7C 7F 1B 78 */ mr r31, r3
/* 802D6740 002D36A0 80 A5 00 F8 */ lwz r5, 0x800000F8@l(r5)
/* 802D6744 002D36A4 54 A3 F0 BE */ srwi r3, r5, 2
/* 802D6748 002D36A8 38 A0 00 00 */ li r5, 0
/* 802D674C 002D36AC 90 7F 00 04 */ stw r3, 4(r31)
/* 802D6750 002D36B0 90 1F 00 00 */ stw r0, 0(r31)
/* 802D6754 002D36B4 80 7F 00 00 */ lwz r3, 0(r31)
/* 802D6758 002D36B8 80 9F 00 04 */ lwz r4, 4(r31)
/* 802D675C 002D36BC 48 0B 34 71 */ bl __div2i
/* 802D6760 002D36C0 90 9F 00 0C */ stw r4, 0xc(r31)
/* 802D6764 002D36C4 90 7F 00 08 */ stw r3, 8(r31)
/* 802D6768 002D36C8 80 7F 00 00 */ lwz r3, 0(r31)
/* 802D676C 002D36CC 80 9F 00 04 */ lwz r4, 4(r31)
/* 802D6770 002D36D0 48 0B 37 F5 */ bl __cvt_sll_flt
/* 802D6774 002D36D4 C0 02 C5 70 */ lfs f0, lbl_805AE290@sda21(r2)
/* 802D6778 002D36D8 38 60 00 01 */ li r3, 1
/* 802D677C 002D36DC EC 00 08 24 */ fdivs f0, f0, f1
/* 802D6780 002D36E0 D0 1F 00 10 */ stfs f0, 0x10(r31)
/* 802D6784 002D36E4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802D6788 002D36E8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802D678C 002D36EC 7C 08 03 A6 */ mtlr r0
/* 802D6790 002D36F0 38 21 00 10 */ addi r1, r1, 0x10
/* 802D6794 002D36F4 4E 80 00 20 */ blr
.global Wait__Q210CStopwatch7CSWDataCFf
Wait__Q210CStopwatch7CSWDataCFf:
/* 802D6798 002D36F8 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 802D679C 002D36FC 7C 08 02 A6 */ mflr r0
/* 802D67A0 002D3700 3C 60 80 00 */ lis r3, 0x800000F8@ha
/* 802D67A4 002D3704 C8 42 C5 78 */ lfd f2, lbl_805AE298@sda21(r2)
/* 802D67A8 002D3708 90 01 00 34 */ stw r0, 0x34(r1)
/* 802D67AC 002D370C 3C 00 43 30 */ lis r0, 0x4330
/* 802D67B0 002D3710 93 E1 00 2C */ stw r31, 0x2c(r1)
/* 802D67B4 002D3714 93 C1 00 28 */ stw r30, 0x28(r1)
/* 802D67B8 002D3718 80 63 00 F8 */ lwz r3, 0x800000F8@l(r3)
/* 802D67BC 002D371C 90 01 00 18 */ stw r0, 0x18(r1)
/* 802D67C0 002D3720 54 60 F0 BE */ srwi r0, r3, 2
/* 802D67C4 002D3724 90 01 00 1C */ stw r0, 0x1c(r1)
/* 802D67C8 002D3728 C8 01 00 18 */ lfd f0, 0x18(r1)
/* 802D67CC 002D372C EC 00 10 28 */ fsubs f0, f0, f2
/* 802D67D0 002D3730 EC 21 00 32 */ fmuls f1, f1, f0
/* 802D67D4 002D3734 48 0B 38 45 */ bl __cvt_dbl_usll
/* 802D67D8 002D3738 7C 9E 23 78 */ mr r30, r4
/* 802D67DC 002D373C 7C 7F 1B 78 */ mr r31, r3
/* 802D67E0 002D3740 48 0A EB C9 */ bl OSGetTime
/* 802D67E4 002D3744 7F DE 20 14 */ addc r30, r30, r4
/* 802D67E8 002D3748 7F FF 19 14 */ adde r31, r31, r3
lbl_802D67EC:
/* 802D67EC 002D374C 48 0A EB BD */ bl OSGetTime
/* 802D67F0 002D3750 90 81 00 14 */ stw r4, 0x14(r1)
/* 802D67F4 002D3754 90 61 00 10 */ stw r3, 0x10(r1)
/* 802D67F8 002D3758 80 61 00 10 */ lwz r3, 0x10(r1)
/* 802D67FC 002D375C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802D6800 002D3760 7C 1E 00 10 */ subfc r0, r30, r0
/* 802D6804 002D3764 90 01 00 08 */ stw r0, 8(r1)
/* 802D6808 002D3768 80 01 00 08 */ lwz r0, 8(r1)
/* 802D680C 002D376C 2C 00 00 00 */ cmpwi r0, 0
/* 802D6810 002D3770 41 80 FF DC */ blt lbl_802D67EC
/* 802D6814 002D3774 80 01 00 34 */ lwz r0, 0x34(r1)
/* 802D6818 002D3778 83 E1 00 2C */ lwz r31, 0x2c(r1)
/* 802D681C 002D377C 83 C1 00 28 */ lwz r30, 0x28(r1)
/* 802D6820 002D3780 7C 08 03 A6 */ mtlr r0
/* 802D6824 002D3784 38 21 00 30 */ addi r1, r1, 0x30
/* 802D6828 002D3788 4E 80 00 20 */ blr

8
asm/MetroidPrime/Enemies/CParasite.s
View File

@ -4893,12 +4893,12 @@ sub_8015abb8:
/* 8015ABE8 00157B48 48 1B AC 85 */ bl __nw__FUlPCcPCc
/* 8015ABEC 00157B4C 28 03 00 00 */ cmplwi r3, 0
/* 8015ABF0 00157B50 41 82 00 2C */ beq lbl_8015AC1C
/* 8015ABF4 00157B54 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8015ABF8 00157B58 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8015ABFC 00157B5C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8015ABF4 00157B54 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8015ABF8 00157B58 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8015ABFC 00157B5C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8015AC00 00157B60 3C 80 80 3E */ lis r4, lbl_803D9BC8@ha
/* 8015AC04 00157B64 90 03 00 00 */ stw r0, 0(r3)
/* 8015AC08 00157B68 38 A5 8D 78 */ addi r5, r5, lbl_803D8D78@l
/* 8015AC08 00157B68 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8015AC0C 00157B6C 38 04 9B C8 */ addi r0, r4, lbl_803D9BC8@l
/* 8015AC10 00157B70 90 A3 00 00 */ stw r5, 0(r3)
/* 8015AC14 00157B74 93 E3 00 04 */ stw r31, 4(r3)

16
asm/MetroidPrime/Factories/CAssetFactory.s
View File

@ -347,12 +347,12 @@ sub_80034c54:
lbl_80034CA4:
/* 80034CA4 00031C04 28 1E 00 00 */ cmplwi r30, 0
/* 80034CA8 00031C08 41 82 00 20 */ beq lbl_80034CC8
/* 80034CAC 00031C0C 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80034CB0 00031C10 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80034CAC 00031C0C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80034CB0 00031C10 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80034CB4 00031C14 90 1E 00 00 */ stw r0, 0(r30)
/* 80034CB8 00031C18 41 82 00 10 */ beq lbl_80034CC8
/* 80034CBC 00031C1C 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80034CC0 00031C20 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80034CBC 00031C1C 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80034CC0 00031C20 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80034CC4 00031C24 90 1E 00 00 */ stw r0, 0(r30)
lbl_80034CC8:
/* 80034CC8 00031C28 7F E0 07 35 */ extsh. r0, r31
@ -399,12 +399,12 @@ sub_80034d20:
/* 80034D50 00031CB0 48 2E 0B 1D */ bl __nw__FUlPCcPCc
/* 80034D54 00031CB4 28 03 00 00 */ cmplwi r3, 0
/* 80034D58 00031CB8 41 82 00 38 */ beq lbl_80034D90
/* 80034D5C 00031CBC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80034D60 00031CC0 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80034D64 00031CC4 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80034D5C 00031CBC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80034D60 00031CC0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80034D64 00031CC4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80034D68 00031CC8 3C 80 80 3E */ lis r4, lbl_803D9CA8@ha
/* 80034D6C 00031CCC 90 03 00 00 */ stw r0, 0(r3)
/* 80034D70 00031CD0 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80034D70 00031CD0 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80034D74 00031CD4 38 A0 00 00 */ li r5, 0
/* 80034D78 00031CD8 38 04 9C A8 */ addi r0, r4, lbl_803D9CA8@l
/* 80034D7C 00031CDC 90 C3 00 00 */ stw r6, 0(r3)

80
asm/MetroidPrime/Factories/CCharacterFactory.s
View File

@ -827,9 +827,9 @@ sub_80032344:
/* 800323A8 0002F308 48 2E 34 C5 */ bl __nw__FUlPCcPCc
/* 800323AC 0002F30C 7C 7F 1B 79 */ or. r31, r3, r3
/* 800323B0 0002F310 41 82 00 2C */ beq lbl_800323DC
/* 800323B4 0002F314 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 800323B4 0002F314 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 800323B8 0002F318 3C 80 80 3E */ lis r4, lbl_803D9C44@ha
/* 800323BC 0002F31C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 800323BC 0002F31C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 800323C0 0002F320 3C 60 80 3E */ lis r3, lbl_803D9C38@ha
/* 800323C4 0002F324 90 1F 00 00 */ stw r0, 0(r31)
/* 800323C8 0002F328 38 84 9C 44 */ addi r4, r4, lbl_803D9C44@l
@ -884,9 +884,9 @@ lbl_80032404:
/* 80032484 0002F3E4 48 2E 33 E9 */ bl __nw__FUlPCcPCc
/* 80032488 0002F3E8 7C 7F 1B 79 */ or. r31, r3, r3
/* 8003248C 0002F3EC 41 82 00 2C */ beq lbl_800324B8
/* 80032490 0002F3F0 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80032490 0002F3F0 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80032494 0002F3F4 3C 80 80 3E */ lis r4, lbl_803D9C44@ha
/* 80032498 0002F3F8 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80032498 0002F3F8 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 8003249C 0002F3FC 3C 60 80 3E */ lis r3, lbl_803D9C38@ha
/* 800324A0 0002F400 90 1F 00 00 */ stw r0, 0(r31)
/* 800324A4 0002F404 38 84 9C 44 */ addi r4, r4, lbl_803D9C44@l
@ -1038,8 +1038,8 @@ sub_800326a0:
/* 800326BC 0002F61C 38 03 9C 44 */ addi r0, r3, lbl_803D9C44@l
/* 800326C0 0002F620 90 1F 00 00 */ stw r0, 0(r31)
/* 800326C4 0002F624 41 82 00 10 */ beq lbl_800326D4
/* 800326C8 0002F628 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 800326CC 0002F62C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 800326C8 0002F628 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 800326CC 0002F62C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 800326D0 0002F630 90 1F 00 00 */ stw r0, 0(r31)
lbl_800326D4:
/* 800326D4 0002F634 7C 80 07 35 */ extsh. r0, r4
@ -1738,12 +1738,12 @@ sub_80033068:
lbl_800330A8:
/* 800330A8 00030008 28 1E 00 00 */ cmplwi r30, 0
/* 800330AC 0003000C 41 82 00 20 */ beq lbl_800330CC
/* 800330B0 00030010 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 800330B4 00030014 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 800330B0 00030010 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 800330B4 00030014 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 800330B8 00030018 90 1E 00 00 */ stw r0, 0(r30)
/* 800330BC 0003001C 41 82 00 10 */ beq lbl_800330CC
/* 800330C0 00030020 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 800330C4 00030024 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 800330C0 00030020 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 800330C4 00030024 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 800330C8 00030028 90 1E 00 00 */ stw r0, 0(r30)
lbl_800330CC:
/* 800330CC 0003002C 7F E0 07 35 */ extsh. r0, r31
@ -1937,12 +1937,12 @@ sub_80033320:
/* 80033350 000302B0 48 2E 25 1D */ bl __nw__FUlPCcPCc
/* 80033354 000302B4 28 03 00 00 */ cmplwi r3, 0
/* 80033358 000302B8 41 82 00 2C */ beq lbl_80033384
/* 8003335C 000302BC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80033360 000302C0 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80033364 000302C4 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8003335C 000302BC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80033360 000302C0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80033364 000302C4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80033368 000302C8 3C 80 80 3E */ lis r4, lbl_803D9C14@ha
/* 8003336C 000302CC 90 03 00 00 */ stw r0, 0(r3)
/* 80033370 000302D0 38 A5 8D 78 */ addi r5, r5, lbl_803D8D78@l
/* 80033370 000302D0 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80033374 000302D4 38 04 9C 14 */ addi r0, r4, lbl_803D9C14@l
/* 80033378 000302D8 90 A3 00 00 */ stw r5, 0(r3)
/* 8003337C 000302DC 93 E3 00 04 */ stw r31, 4(r3)
@ -1981,12 +1981,12 @@ sub_800333b0:
lbl_800333F0:
/* 800333F0 00030350 28 1E 00 00 */ cmplwi r30, 0
/* 800333F4 00030354 41 82 00 20 */ beq lbl_80033414
/* 800333F8 00030358 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 800333FC 0003035C 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 800333F8 00030358 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 800333FC 0003035C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80033400 00030360 90 1E 00 00 */ stw r0, 0(r30)
/* 80033404 00030364 41 82 00 10 */ beq lbl_80033414
/* 80033408 00030368 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 8003340C 0003036C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80033408 00030368 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 8003340C 0003036C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80033410 00030370 90 1E 00 00 */ stw r0, 0(r30)
lbl_80033414:
/* 80033414 00030374 7F E0 07 35 */ extsh. r0, r31
@ -2093,12 +2093,12 @@ lbl_8003351C:
/* 80033570 000304D0 48 2E 22 FD */ bl __nw__FUlPCcPCc
/* 80033574 000304D4 28 03 00 00 */ cmplwi r3, 0
/* 80033578 000304D8 41 82 00 2C */ beq lbl_800335A4
/* 8003357C 000304DC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80033580 000304E0 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80033584 000304E4 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8003357C 000304DC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80033580 000304E0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80033584 000304E4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80033588 000304E8 3C 80 80 3E */ lis r4, lbl_803D9BFC@ha
/* 8003358C 000304EC 90 03 00 00 */ stw r0, 0(r3)
/* 80033590 000304F0 38 A5 8D 78 */ addi r5, r5, lbl_803D8D78@l
/* 80033590 000304F0 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80033594 000304F4 38 04 9B FC */ addi r0, r4, lbl_803D9BFC@l
/* 80033598 000304F8 90 A3 00 00 */ stw r5, 0(r3)
/* 8003359C 000304FC 93 E3 00 04 */ stw r31, 4(r3)
@ -2677,12 +2677,12 @@ lbl_80033DAC:
lbl_80033DC0:
/* 80033DC0 00030D20 28 1D 00 00 */ cmplwi r29, 0
/* 80033DC4 00030D24 41 82 00 20 */ beq lbl_80033DE4
/* 80033DC8 00030D28 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80033DCC 00030D2C 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80033DC8 00030D28 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80033DCC 00030D2C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80033DD0 00030D30 90 1D 00 00 */ stw r0, 0(r29)
/* 80033DD4 00030D34 41 82 00 10 */ beq lbl_80033DE4
/* 80033DD8 00030D38 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80033DDC 00030D3C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80033DD8 00030D38 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80033DDC 00030D3C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80033DE0 00030D40 90 1D 00 00 */ stw r0, 0(r29)
lbl_80033DE4:
/* 80033DE4 00030D44 7F C0 07 35 */ extsh. r0, r30
@ -2730,12 +2730,12 @@ sub_80033e40:
/* 80033E70 00030DD0 48 2E 19 FD */ bl __nw__FUlPCcPCc
/* 80033E74 00030DD4 28 03 00 00 */ cmplwi r3, 0
/* 80033E78 00030DD8 41 82 00 38 */ beq lbl_80033EB0
/* 80033E7C 00030DDC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80033E80 00030DE0 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80033E84 00030DE4 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80033E7C 00030DDC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80033E80 00030DE0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80033E84 00030DE4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80033E88 00030DE8 3C 80 80 3E */ lis r4, lbl_803D9BD4@ha
/* 80033E8C 00030DEC 90 03 00 00 */ stw r0, 0(r3)
/* 80033E90 00030DF0 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80033E90 00030DF0 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80033E94 00030DF4 38 A0 00 00 */ li r5, 0
/* 80033E98 00030DF8 38 04 9B D4 */ addi r0, r4, lbl_803D9BD4@l
/* 80033E9C 00030DFC 90 C3 00 00 */ stw r6, 0(r3)
@ -2781,12 +2781,12 @@ sub_80033edc:
lbl_80033F2C:
/* 80033F2C 00030E8C 28 1E 00 00 */ cmplwi r30, 0
/* 80033F30 00030E90 41 82 00 20 */ beq lbl_80033F50
/* 80033F34 00030E94 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80033F38 00030E98 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80033F34 00030E94 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80033F38 00030E98 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80033F3C 00030E9C 90 1E 00 00 */ stw r0, 0(r30)
/* 80033F40 00030EA0 41 82 00 10 */ beq lbl_80033F50
/* 80033F44 00030EA4 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80033F48 00030EA8 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80033F44 00030EA4 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80033F48 00030EA8 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80033F4C 00030EAC 90 1E 00 00 */ stw r0, 0(r30)
lbl_80033F50:
/* 80033F50 00030EB0 7F E0 07 35 */ extsh. r0, r31
@ -2833,12 +2833,12 @@ sub_80033fa8:
/* 80033FD8 00030F38 48 2E 18 95 */ bl __nw__FUlPCcPCc
/* 80033FDC 00030F3C 28 03 00 00 */ cmplwi r3, 0
/* 80033FE0 00030F40 41 82 00 38 */ beq lbl_80034018
/* 80033FE4 00030F44 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80033FE8 00030F48 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80033FEC 00030F4C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80033FE4 00030F44 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80033FE8 00030F48 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80033FEC 00030F4C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80033FF0 00030F50 3C 80 80 3E */ lis r4, lbl_803D9BC8@ha
/* 80033FF4 00030F54 90 03 00 00 */ stw r0, 0(r3)
/* 80033FF8 00030F58 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80033FF8 00030F58 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80033FFC 00030F5C 38 A0 00 00 */ li r5, 0
/* 80034000 00030F60 38 04 9B C8 */ addi r0, r4, lbl_803D9BC8@l
/* 80034004 00030F64 90 C3 00 00 */ stw r6, 0(r3)
@ -3014,8 +3014,8 @@ sub_80034228:
/* 80034254 000311B4 38 03 9C 44 */ addi r0, r3, lbl_803D9C44@l
/* 80034258 000311B8 90 1F 00 00 */ stw r0, 0(r31)
/* 8003425C 000311BC 41 82 00 10 */ beq lbl_8003426C
/* 80034260 000311C0 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80034264 000311C4 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80034260 000311C0 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80034264 000311C4 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80034268 000311C8 90 1F 00 00 */ stw r0, 0(r31)
lbl_8003426C:
/* 8003426C 000311CC 7C 80 07 35 */ extsh. r0, r4

16
asm/MetroidPrime/Factories/CSaveWorldFactory.s
View File

@ -97,12 +97,12 @@ sub_8026ae68:
lbl_8026AEA8:
/* 8026AEA8 00267E08 28 1E 00 00 */ cmplwi r30, 0
/* 8026AEAC 00267E0C 41 82 00 20 */ beq lbl_8026AECC
/* 8026AEB0 00267E10 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 8026AEB4 00267E14 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 8026AEB0 00267E10 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8026AEB4 00267E14 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8026AEB8 00267E18 90 1E 00 00 */ stw r0, 0(r30)
/* 8026AEBC 00267E1C 41 82 00 10 */ beq lbl_8026AECC
/* 8026AEC0 00267E20 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 8026AEC4 00267E24 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8026AEC0 00267E20 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 8026AEC4 00267E24 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 8026AEC8 00267E28 90 1E 00 00 */ stw r0, 0(r30)
lbl_8026AECC:
/* 8026AECC 00267E2C 7F E0 07 35 */ extsh. r0, r31
@ -277,12 +277,12 @@ sub_8026b0d8:
/* 8026B108 00268068 48 0A A7 65 */ bl __nw__FUlPCcPCc
/* 8026B10C 0026806C 28 03 00 00 */ cmplwi r3, 0
/* 8026B110 00268070 41 82 00 38 */ beq lbl_8026B148
/* 8026B114 00268074 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8026B118 00268078 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8026B11C 0026807C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8026B114 00268074 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8026B118 00268078 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8026B11C 0026807C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8026B120 00268080 3C 80 80 3F */ lis r4, lbl_803EA790@ha
/* 8026B124 00268084 90 03 00 00 */ stw r0, 0(r3)
/* 8026B128 00268088 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 8026B128 00268088 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8026B12C 0026808C 38 A0 00 00 */ li r5, 0
/* 8026B130 00268090 38 04 A7 90 */ addi r0, r4, lbl_803EA790@l
/* 8026B134 00268094 90 C3 00 00 */ stw r6, 0(r3)

16
asm/MetroidPrime/Factories/CScannableObjectInfo.s
View File

@ -157,12 +157,12 @@ lbl_80169B08:
lbl_80169B0C:
/* 80169B0C 00166A6C 28 1E 00 00 */ cmplwi r30, 0
/* 80169B10 00166A70 41 82 00 20 */ beq lbl_80169B30
/* 80169B14 00166A74 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80169B18 00166A78 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80169B14 00166A74 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80169B18 00166A78 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80169B1C 00166A7C 90 1E 00 00 */ stw r0, 0(r30)
/* 80169B20 00166A80 41 82 00 10 */ beq lbl_80169B30
/* 80169B24 00166A84 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80169B28 00166A88 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80169B24 00166A84 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80169B28 00166A88 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80169B2C 00166A8C 90 1E 00 00 */ stw r0, 0(r30)
lbl_80169B30:
/* 80169B30 00166A90 7F E0 07 35 */ extsh. r0, r31
@ -209,12 +209,12 @@ sub_80169b88:
/* 80169BB8 00166B18 48 1A BC B5 */ bl __nw__FUlPCcPCc
/* 80169BBC 00166B1C 28 03 00 00 */ cmplwi r3, 0
/* 80169BC0 00166B20 41 82 00 38 */ beq lbl_80169BF8
/* 80169BC4 00166B24 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80169BC8 00166B28 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80169BCC 00166B2C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80169BC4 00166B24 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80169BC8 00166B28 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80169BCC 00166B2C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80169BD0 00166B30 3C 80 80 3E */ lis r4, lbl_803E3AC8@ha
/* 80169BD4 00166B34 90 03 00 00 */ stw r0, 0(r3)
/* 80169BD8 00166B38 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80169BD8 00166B38 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80169BDC 00166B3C 38 A0 00 00 */ li r5, 0
/* 80169BE0 00166B40 38 04 3A C8 */ addi r0, r4, lbl_803E3AC8@l
/* 80169BE4 00166B44 90 C3 00 00 */ stw r6, 0(r3)

16
asm/MetroidPrime/Factories/CStateMachineFactory.s
View File

@ -107,12 +107,12 @@ sub_800de904:
lbl_800DE944:
/* 800DE944 000DB8A4 28 1E 00 00 */ cmplwi r30, 0
/* 800DE948 000DB8A8 41 82 00 20 */ beq lbl_800DE968
/* 800DE94C 000DB8AC 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 800DE950 000DB8B0 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 800DE94C 000DB8AC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 800DE950 000DB8B0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 800DE954 000DB8B4 90 1E 00 00 */ stw r0, 0(r30)
/* 800DE958 000DB8B8 41 82 00 10 */ beq lbl_800DE968
/* 800DE95C 000DB8BC 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 800DE960 000DB8C0 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 800DE95C 000DB8BC 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 800DE960 000DB8C0 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 800DE964 000DB8C4 90 1E 00 00 */ stw r0, 0(r30)
lbl_800DE968:
/* 800DE968 000DB8C8 7F E0 07 35 */ extsh. r0, r31
@ -224,12 +224,12 @@ lbl_800DEA54:
/* 800DEACC 000DBA2C 48 23 6D A1 */ bl __nw__FUlPCcPCc
/* 800DEAD0 000DBA30 28 03 00 00 */ cmplwi r3, 0
/* 800DEAD4 000DBA34 41 82 00 38 */ beq lbl_800DEB0C
/* 800DEAD8 000DBA38 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 800DEADC 000DBA3C 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 800DEAE0 000DBA40 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 800DEAD8 000DBA38 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 800DEADC 000DBA3C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 800DEAE0 000DBA40 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 800DEAE4 000DBA44 3C 80 80 3E */ lis r4, lbl_803DF700@ha
/* 800DEAE8 000DBA48 90 03 00 00 */ stw r0, 0(r3)
/* 800DEAEC 000DBA4C 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 800DEAEC 000DBA4C 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 800DEAF0 000DBA50 38 A0 00 00 */ li r5, 0
/* 800DEAF4 000DBA54 38 04 F7 00 */ addi r0, r4, lbl_803DF700@l
/* 800DEAF8 000DBA58 90 C3 00 00 */ stw r6, 0(r3)

16
asm/MetroidPrime/PathFinding/CPathFindArea.s
View File

@ -111,12 +111,12 @@ sub_801ca284:
lbl_801CA2C4:
/* 801CA2C4 001C7224 28 1E 00 00 */ cmplwi r30, 0
/* 801CA2C8 001C7228 41 82 00 20 */ beq lbl_801CA2E8
/* 801CA2CC 001C722C 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 801CA2D0 001C7230 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 801CA2CC 001C722C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 801CA2D0 001C7230 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 801CA2D4 001C7234 90 1E 00 00 */ stw r0, 0(r30)
/* 801CA2D8 001C7238 41 82 00 10 */ beq lbl_801CA2E8
/* 801CA2DC 001C723C 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 801CA2E0 001C7240 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 801CA2DC 001C723C 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 801CA2E0 001C7240 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 801CA2E4 001C7244 90 1E 00 00 */ stw r0, 0(r30)
lbl_801CA2E8:
/* 801CA2E8 001C7248 7F E0 07 35 */ extsh. r0, r31
@ -233,12 +233,12 @@ lbl_801CA3E4:
/* 801CA45C 001C73BC 48 14 B4 11 */ bl __nw__FUlPCcPCc
/* 801CA460 001C73C0 28 03 00 00 */ cmplwi r3, 0
/* 801CA464 001C73C4 41 82 00 38 */ beq lbl_801CA49C
/* 801CA468 001C73C8 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 801CA46C 001C73CC 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 801CA470 001C73D0 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 801CA468 001C73C8 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 801CA46C 001C73CC 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 801CA470 001C73D0 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 801CA474 001C73D4 3C 80 80 3E */ lis r4, lbl_803E5718@ha
/* 801CA478 001C73D8 90 03 00 00 */ stw r0, 0(r3)
/* 801CA47C 001C73DC 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 801CA47C 001C73DC 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 801CA480 001C73E0 38 A0 00 00 */ li r5, 0
/* 801CA484 001C73E4 38 04 57 18 */ addi r0, r4, lbl_803E5718@l
/* 801CA488 001C73E8 90 C3 00 00 */ stw r6, 0(r3)

16
asm/MetroidPrime/Player/CGameHintInfo.s
View File

@ -123,12 +123,12 @@ sub_8026726c:
lbl_802672AC:
/* 802672AC 0026420C 28 1E 00 00 */ cmplwi r30, 0
/* 802672B0 00264210 41 82 00 20 */ beq lbl_802672D0
/* 802672B4 00264214 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802672B8 00264218 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802672B4 00264214 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802672B8 00264218 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802672BC 0026421C 90 1E 00 00 */ stw r0, 0(r30)
/* 802672C0 00264220 41 82 00 10 */ beq lbl_802672D0
/* 802672C4 00264224 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802672C8 00264228 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802672C4 00264224 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802672C8 00264228 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802672CC 0026422C 90 1E 00 00 */ stw r0, 0(r30)
lbl_802672D0:
/* 802672D0 00264230 7F E0 07 35 */ extsh. r0, r31
@ -326,12 +326,12 @@ sub_80267520:
/* 80267550 002644B0 48 0A E3 1D */ bl __nw__FUlPCcPCc
/* 80267554 002644B4 28 03 00 00 */ cmplwi r3, 0
/* 80267558 002644B8 41 82 00 38 */ beq lbl_80267590
/* 8026755C 002644BC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80267560 002644C0 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80267564 002644C4 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8026755C 002644BC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80267560 002644C0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80267564 002644C4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80267568 002644C8 3C 80 80 3F */ lis r4, lbl_803EA0E0@ha
/* 8026756C 002644CC 90 03 00 00 */ stw r0, 0(r3)
/* 80267570 002644D0 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 80267570 002644D0 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80267574 002644D4 38 A0 00 00 */ li r5, 0
/* 80267578 002644D8 38 04 A0 E0 */ addi r0, r4, lbl_803EA0E0@l
/* 8026757C 002644DC 90 C3 00 00 */ stw r6, 0(r3)

32
asm/MetroidPrime/ScriptObjects/CScriptEffect.s
View File

@ -2206,12 +2206,12 @@ lbl_8008F850:
lbl_8008F8F0:
/* 8008F8F0 0008C850 28 1E 00 00 */ cmplwi r30, 0
/* 8008F8F4 0008C854 41 82 00 20 */ beq lbl_8008F914
/* 8008F8F8 0008C858 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 8008F8FC 0008C85C 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 8008F8F8 0008C858 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8008F8FC 0008C85C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8008F900 0008C860 90 1E 00 00 */ stw r0, 0(r30)
/* 8008F904 0008C864 41 82 00 10 */ beq lbl_8008F914
/* 8008F908 0008C868 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 8008F90C 0008C86C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8008F908 0008C868 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 8008F90C 0008C86C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 8008F910 0008C870 90 1E 00 00 */ stw r0, 0(r30)
lbl_8008F914:
/* 8008F914 0008C874 7F E0 07 35 */ extsh. r0, r31
@ -2244,12 +2244,12 @@ lbl_8008F924:
/* 8008F970 0008C8D0 48 28 5E FD */ bl __nw__FUlPCcPCc
/* 8008F974 0008C8D4 28 03 00 00 */ cmplwi r3, 0
/* 8008F978 0008C8D8 41 82 00 2C */ beq lbl_8008F9A4
/* 8008F97C 0008C8DC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8008F980 0008C8E0 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8008F984 0008C8E4 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8008F97C 0008C8DC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8008F980 0008C8E0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8008F984 0008C8E4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8008F988 0008C8E8 3C 80 80 3E */ lis r4, lbl_803DACB0@ha
/* 8008F98C 0008C8EC 90 03 00 00 */ stw r0, 0(r3)
/* 8008F990 0008C8F0 38 A5 8D 78 */ addi r5, r5, lbl_803D8D78@l
/* 8008F990 0008C8F0 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8008F994 0008C8F4 38 04 AC B0 */ addi r0, r4, lbl_803DACB0@l
/* 8008F998 0008C8F8 90 A3 00 00 */ stw r5, 0(r3)
/* 8008F99C 0008C8FC 93 E3 00 04 */ stw r31, 4(r3)
@ -2288,12 +2288,12 @@ lbl_8008F9A4:
lbl_8008FA10:
/* 8008FA10 0008C970 28 1E 00 00 */ cmplwi r30, 0
/* 8008FA14 0008C974 41 82 00 20 */ beq lbl_8008FA34
/* 8008FA18 0008C978 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 8008FA1C 0008C97C 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 8008FA18 0008C978 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8008FA1C 0008C97C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8008FA20 0008C980 90 1E 00 00 */ stw r0, 0(r30)
/* 8008FA24 0008C984 41 82 00 10 */ beq lbl_8008FA34
/* 8008FA28 0008C988 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 8008FA2C 0008C98C 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 8008FA28 0008C988 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 8008FA2C 0008C98C 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 8008FA30 0008C990 90 1E 00 00 */ stw r0, 0(r30)
lbl_8008FA34:
/* 8008FA34 0008C994 7F E0 07 35 */ extsh. r0, r31
@ -2326,12 +2326,12 @@ lbl_8008FA44:
/* 8008FA90 0008C9F0 48 28 5D DD */ bl __nw__FUlPCcPCc
/* 8008FA94 0008C9F4 28 03 00 00 */ cmplwi r3, 0
/* 8008FA98 0008C9F8 41 82 00 2C */ beq lbl_8008FAC4
/* 8008FA9C 0008C9FC 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 8008FAA0 0008CA00 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 8008FAA4 0008CA04 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 8008FA9C 0008C9FC 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 8008FAA0 0008CA00 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 8008FAA4 0008CA04 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 8008FAA8 0008CA08 3C 80 80 3E */ lis r4, lbl_803DACA4@ha
/* 8008FAAC 0008CA0C 90 03 00 00 */ stw r0, 0(r3)
/* 8008FAB0 0008CA10 38 A5 8D 78 */ addi r5, r5, lbl_803D8D78@l
/* 8008FAB0 0008CA10 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 8008FAB4 0008CA14 38 04 AC A4 */ addi r0, r4, lbl_803DACA4@l
/* 8008FAB8 0008CA18 90 A3 00 00 */ stw r5, 0(r3)
/* 8008FABC 0008CA1C 93 E3 00 04 */ stw r31, 4(r3)

40
asm/MetroidPrime/main.s
View File

@ -25,15 +25,15 @@ lbl_803D8D60:
.4byte 0
.4byte sub_80007c30
.global lbl_803D8D6C
lbl_803D8D6C:
.global __vt__4IObj
__vt__4IObj:
# ROM: 0x3D5D6C
.4byte 0
.4byte 0
.4byte 0
.global lbl_803D8D78
lbl_803D8D78:
.global __vt__31TObjOwnerDerivedFromIObjUntyped
__vt__31TObjOwnerDerivedFromIObjUntyped:
# ROM: 0x3D5D78
.4byte 0
.4byte 0
@ -5824,12 +5824,12 @@ sub_8000799c:
lbl_800079DC:
/* 800079DC 0000493C 28 1E 00 00 */ cmplwi r30, 0
/* 800079E0 00004940 41 82 00 20 */ beq lbl_80007A00
/* 800079E4 00004944 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 800079E8 00004948 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 800079E4 00004944 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 800079E8 00004948 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 800079EC 0000494C 90 1E 00 00 */ stw r0, 0(r30)
/* 800079F0 00004950 41 82 00 10 */ beq lbl_80007A00
/* 800079F4 00004954 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 800079F8 00004958 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 800079F4 00004954 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 800079F8 00004958 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 800079FC 0000495C 90 1E 00 00 */ stw r0, 0(r30)
lbl_80007A00:
/* 80007A00 00004960 7F E0 07 35 */ extsh. r0, r31
@ -5862,12 +5862,12 @@ lbl_80007A10:
/* 80007A5C 000049BC 48 30 DE 11 */ bl __nw__FUlPCcPCc
/* 80007A60 000049C0 28 03 00 00 */ cmplwi r3, 0
/* 80007A64 000049C4 41 82 00 2C */ beq lbl_80007A90
/* 80007A68 000049C8 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80007A6C 000049CC 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80007A70 000049D0 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80007A68 000049C8 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80007A6C 000049CC 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80007A70 000049D0 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80007A74 000049D4 3C 80 80 3E */ lis r4, lbl_803D8D84@ha
/* 80007A78 000049D8 90 03 00 00 */ stw r0, 0(r3)
/* 80007A7C 000049DC 38 A5 8D 78 */ addi r5, r5, lbl_803D8D78@l
/* 80007A7C 000049DC 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80007A80 000049E0 38 04 8D 84 */ addi r0, r4, lbl_803D8D84@l
/* 80007A84 000049E4 90 A3 00 00 */ stw r5, 0(r3)
/* 80007A88 000049E8 93 E3 00 04 */ stw r31, 4(r3)
@ -6005,12 +6005,12 @@ sub_80007c30:
lbl_80007C70:
/* 80007C70 00004BD0 28 1E 00 00 */ cmplwi r30, 0
/* 80007C74 00004BD4 41 82 00 20 */ beq lbl_80007C94
/* 80007C78 00004BD8 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 80007C7C 00004BDC 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 80007C78 00004BD8 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80007C7C 00004BDC 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80007C80 00004BE0 90 1E 00 00 */ stw r0, 0(r30)
/* 80007C84 00004BE4 41 82 00 10 */ beq lbl_80007C94
/* 80007C88 00004BE8 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 80007C8C 00004BEC 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 80007C88 00004BE8 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 80007C8C 00004BEC 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 80007C90 00004BF0 90 1E 00 00 */ stw r0, 0(r30)
lbl_80007C94:
/* 80007C94 00004BF4 7F E0 07 35 */ extsh. r0, r31
@ -6126,12 +6126,12 @@ sub_80007dd8:
/* 80007E08 00004D68 48 30 DA 65 */ bl __nw__FUlPCcPCc
/* 80007E0C 00004D6C 28 03 00 00 */ cmplwi r3, 0
/* 80007E10 00004D70 41 82 00 2C */ beq lbl_80007E3C
/* 80007E14 00004D74 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 80007E18 00004D78 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 80007E1C 00004D7C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 80007E14 00004D74 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 80007E18 00004D78 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 80007E1C 00004D7C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 80007E20 00004D80 3C 80 80 3E */ lis r4, lbl_803D8D60@ha
/* 80007E24 00004D84 90 03 00 00 */ stw r0, 0(r3)
/* 80007E28 00004D88 38 A5 8D 78 */ addi r5, r5, lbl_803D8D78@l
/* 80007E28 00004D88 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 80007E2C 00004D8C 38 04 8D 60 */ addi r0, r4, lbl_803D8D60@l
/* 80007E30 00004D90 90 A3 00 00 */ stw r5, 0(r3)
/* 80007E34 00004D94 93 E3 00 04 */ stw r31, 4(r3)

16
asm/Weapons/CCollisionResponseData.s
View File

@ -108,12 +108,12 @@ lbl_802B2248:
lbl_802B22AC:
/* 802B22AC 002AF20C 28 1E 00 00 */ cmplwi r30, 0
/* 802B22B0 002AF210 41 82 00 20 */ beq lbl_802B22D0
/* 802B22B4 002AF214 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802B22B8 002AF218 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802B22B4 002AF214 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802B22B8 002AF218 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802B22BC 002AF21C 90 1E 00 00 */ stw r0, 0(r30)
/* 802B22C0 002AF220 41 82 00 10 */ beq lbl_802B22D0
/* 802B22C4 002AF224 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802B22C8 002AF228 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802B22C4 002AF224 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802B22C8 002AF228 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802B22CC 002AF22C 90 1E 00 00 */ stw r0, 0(r30)
lbl_802B22D0:
/* 802B22D0 002AF230 7F E0 07 35 */ extsh. r0, r31
@ -160,12 +160,12 @@ lbl_802B22E0:
/* 802B2358 002AF2B8 48 06 35 15 */ bl __nw__FUlPCcPCc
/* 802B235C 002AF2BC 28 03 00 00 */ cmplwi r3, 0
/* 802B2360 002AF2C0 41 82 00 38 */ beq lbl_802B2398
/* 802B2364 002AF2C4 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802B2368 002AF2C8 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802B236C 002AF2CC 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802B2364 002AF2C4 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802B2368 002AF2C8 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802B236C 002AF2CC 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802B2370 002AF2D0 3C 80 80 3F */ lis r4, lbl_803EC518@ha
/* 802B2374 002AF2D4 90 03 00 00 */ stw r0, 0(r3)
/* 802B2378 002AF2D8 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802B2378 002AF2D8 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802B237C 002AF2DC 38 A0 00 00 */ li r5, 0
/* 802B2380 002AF2E0 38 04 C5 18 */ addi r0, r4, lbl_803EC518@l
/* 802B2384 002AF2E4 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Weapons/CDecalDataFactory.s
View File

@ -867,12 +867,12 @@ sub_802b4218:
lbl_802B4258:
/* 802B4258 002B11B8 28 1E 00 00 */ cmplwi r30, 0
/* 802B425C 002B11BC 41 82 00 20 */ beq lbl_802B427C
/* 802B4260 002B11C0 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802B4264 002B11C4 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802B4260 002B11C0 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802B4264 002B11C4 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802B4268 002B11C8 90 1E 00 00 */ stw r0, 0(r30)
/* 802B426C 002B11CC 41 82 00 10 */ beq lbl_802B427C
/* 802B4270 002B11D0 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802B4274 002B11D4 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802B4270 002B11D0 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802B4274 002B11D4 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802B4278 002B11D8 90 1E 00 00 */ stw r0, 0(r30)
lbl_802B427C:
/* 802B427C 002B11DC 7F E0 07 35 */ extsh. r0, r31
@ -1222,12 +1222,12 @@ lbl_802B46C8:
/* 802B4748 002B16A8 48 06 11 25 */ bl __nw__FUlPCcPCc
/* 802B474C 002B16AC 28 03 00 00 */ cmplwi r3, 0
/* 802B4750 002B16B0 41 82 00 38 */ beq lbl_802B4788
/* 802B4754 002B16B4 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802B4758 002B16B8 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802B475C 002B16BC 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802B4754 002B16B4 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802B4758 002B16B8 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802B475C 002B16BC 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802B4760 002B16C0 3C 80 80 3F */ lis r4, lbl_803EC548@ha
/* 802B4764 002B16C4 90 03 00 00 */ stw r0, 0(r3)
/* 802B4768 002B16C8 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802B4768 002B16C8 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802B476C 002B16CC 38 A0 00 00 */ li r5, 0
/* 802B4770 002B16D0 38 04 C5 48 */ addi r0, r4, lbl_803EC548@l
/* 802B4774 002B16D4 90 C3 00 00 */ stw r6, 0(r3)

16
asm/Weapons/CProjectileWeaponDataFactory.s
View File

@ -1034,12 +1034,12 @@ lbl_802B1F0C:
lbl_802B1F64:
/* 802B1F64 002AEEC4 28 1E 00 00 */ cmplwi r30, 0
/* 802B1F68 002AEEC8 41 82 00 20 */ beq lbl_802B1F88
/* 802B1F6C 002AEECC 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802B1F70 002AEED0 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802B1F6C 002AEECC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802B1F70 002AEED0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802B1F74 002AEED4 90 1E 00 00 */ stw r0, 0(r30)
/* 802B1F78 002AEED8 41 82 00 10 */ beq lbl_802B1F88
/* 802B1F7C 002AEEDC 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802B1F80 002AEEE0 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802B1F7C 002AEEDC 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802B1F80 002AEEE0 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802B1F84 002AEEE4 90 1E 00 00 */ stw r0, 0(r30)
lbl_802B1F88:
/* 802B1F88 002AEEE8 7F E0 07 35 */ extsh. r0, r31
@ -1146,12 +1146,12 @@ lbl_802B2074:
/* 802B20EC 002AF04C 48 06 37 81 */ bl __nw__FUlPCcPCc
/* 802B20F0 002AF050 28 03 00 00 */ cmplwi r3, 0
/* 802B20F4 002AF054 41 82 00 38 */ beq lbl_802B212C
/* 802B20F8 002AF058 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802B20FC 002AF05C 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802B2100 002AF060 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802B20F8 002AF058 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802B20FC 002AF05C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802B2100 002AF060 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802B2104 002AF064 3C 80 80 3F */ lis r4, lbl_803EC508@ha
/* 802B2108 002AF068 90 03 00 00 */ stw r0, 0(r3)
/* 802B210C 002AF06C 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802B210C 002AF06C 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802B2110 002AF070 38 A0 00 00 */ li r5, 0
/* 802B2114 002AF074 38 04 C5 08 */ addi r0, r4, lbl_803EC508@l
/* 802B2118 002AF078 90 C3 00 00 */ stw r6, 0(r3)

16
asm/WorldFormat/CCollidableOBBTreeGroup.s
View File

@ -1754,12 +1754,12 @@ lbl_802ADFD8:
lbl_802AE03C:
/* 802AE03C 002AAF9C 28 1E 00 00 */ cmplwi r30, 0
/* 802AE040 002AAFA0 41 82 00 20 */ beq lbl_802AE060
/* 802AE044 002AAFA4 3C 60 80 3E */ lis r3, lbl_803D8D78@ha
/* 802AE048 002AAFA8 38 03 8D 78 */ addi r0, r3, lbl_803D8D78@l
/* 802AE044 002AAFA4 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802AE048 002AAFA8 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802AE04C 002AAFAC 90 1E 00 00 */ stw r0, 0(r30)
/* 802AE050 002AAFB0 41 82 00 10 */ beq lbl_802AE060
/* 802AE054 002AAFB4 3C 60 80 3E */ lis r3, lbl_803D8D6C@ha
/* 802AE058 002AAFB8 38 03 8D 6C */ addi r0, r3, lbl_803D8D6C@l
/* 802AE054 002AAFB4 3C 60 80 3E */ lis r3, __vt__4IObj@ha
/* 802AE058 002AAFB8 38 03 8D 6C */ addi r0, r3, __vt__4IObj@l
/* 802AE05C 002AAFBC 90 1E 00 00 */ stw r0, 0(r30)
lbl_802AE060:
/* 802AE060 002AAFC0 7F E0 07 35 */ extsh. r0, r31
@ -1806,12 +1806,12 @@ lbl_802AE070:
/* 802AE0E8 002AB048 48 06 77 85 */ bl __nw__FUlPCcPCc
/* 802AE0EC 002AB04C 28 03 00 00 */ cmplwi r3, 0
/* 802AE0F0 002AB050 41 82 00 38 */ beq lbl_802AE128
/* 802AE0F4 002AB054 3C 80 80 3E */ lis r4, lbl_803D8D6C@ha
/* 802AE0F8 002AB058 3C A0 80 3E */ lis r5, lbl_803D8D78@ha
/* 802AE0FC 002AB05C 38 04 8D 6C */ addi r0, r4, lbl_803D8D6C@l
/* 802AE0F4 002AB054 3C 80 80 3E */ lis r4, __vt__4IObj@ha
/* 802AE0F8 002AB058 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha
/* 802AE0FC 002AB05C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l
/* 802AE100 002AB060 3C 80 80 3F */ lis r4, lbl_803EC498@ha
/* 802AE104 002AB064 90 03 00 00 */ stw r0, 0(r3)
/* 802AE108 002AB068 38 C5 8D 78 */ addi r6, r5, lbl_803D8D78@l
/* 802AE108 002AB068 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l
/* 802AE10C 002AB06C 38 A0 00 00 */ li r5, 0
/* 802AE110 002AB070 38 04 C4 98 */ addi r0, r4, lbl_803EC498@l
/* 802AE114 002AB074 90 C3 00 00 */ stw r6, 0(r3)

17
include/Kyoto_CWD/CFactoryMgr.hpp
View File

@ -3,10 +3,27 @@
#include "types.h"
#include "CToken.hpp"
#include "IObjectStore.hpp"
#include "TGameTypes.hpp"
class CFactoryMgr {
public:
private:
u8 pad[0x38];
};
class CFactoryFnReturn {
public:
template < typename T >
CFactoryFnReturn(T* ptr);
// TODO this forces inlining, were they really manually specialized?
// : obj(TToken< T >::GetIObjObjectFor(ptr).release()) {}
private:
rstl::auto_ptr< TObjOwnerDerivedFromIObjUntyped > obj;
};
CFactoryFnReturn FStringTableFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& xfer);
#endif

8
include/Kyoto_CWD/CInputStream.hpp
View File

@ -44,10 +44,10 @@ template <>
inline u32 cinput_stream_helper(TType< u32 > type, CInputStream& in) {
return in.ReadLong();
}
// template <>
// inline unsigned long cinput_stream_helper(TType< unsigned long > type, CInputStream& in) {
// return in.ReadLong();
// }
template <>
inline unsigned long cinput_stream_helper(TType< unsigned long > type, CInputStream& in) {
return in.ReadLong();
}
// rstl
#include "rstl/pair.hpp"

2
include/Kyoto_CWD/CStopwatch.hpp
View File

@ -10,7 +10,7 @@ public:
class CSWData {
public:
bool Initialize();
void Wait(float);
void Wait(float) const;
s64 GetTimerFreq() const { return x0_timerFreq; }
s64 GetTimerFreqO1M() const { return x8_timerFreqO1M; }

1
include/Kyoto_CWD/CStringTable.hpp
View File

@ -13,6 +13,7 @@ class CStringTable {
public:
CStringTable(CInputStream& in);
const wchar_t* GetString(int idx) const;
};
extern CStringTable* gpStringTable;

37
include/Kyoto_CWD/CToken.hpp
View File

@ -3,6 +3,8 @@
#include "types.h"
#include "rstl/auto_ptr.hpp"
#include "IObjectStore.hpp"
class CToken {
@ -14,13 +16,46 @@ private:
bool x4_lockHeld;
};
class IObj {
public:
virtual ~IObj() {}
};
class TObjOwnerDerivedFromIObjUntyped : public IObj {
public:
template < typename T >
TObjOwnerDerivedFromIObjUntyped(const rstl::auto_ptr< T >& obj) : m_objPtr(obj.release()) {}
protected:
void* m_objPtr;
};
template < typename T >
class TToken : public CToken {};
class TObjOwnerDerivedFromIObj : public TObjOwnerDerivedFromIObjUntyped {
TObjOwnerDerivedFromIObj(const rstl::auto_ptr< T >& obj) : TObjOwnerDerivedFromIObjUntyped(obj) {}
public:
static rstl::auto_ptr< TObjOwnerDerivedFromIObj< T > > GetNewDerivedObject(const rstl::auto_ptr< T >& obj) {
return new TObjOwnerDerivedFromIObj< T >(obj);
}
~TObjOwnerDerivedFromIObj() override { delete Owned(); }
T* Owned() { return static_cast< T* >(m_objPtr); }
};
template < typename T >
class TToken : public CToken {
public:
static rstl::auto_ptr< TObjOwnerDerivedFromIObj< T > > GetIObjObjectFor(const rstl::auto_ptr< T >& obj) {
return TObjOwnerDerivedFromIObj< T >::GetNewDerivedObject(obj);
}
};
template < typename T >
class TCachedToken : public TToken< T > {
private:
T* x8_item;
};
template < typename T >
class TLockedToken : public TCachedToken< T > {};

24
include/rstl/auto_ptr.hpp
View File

@ -6,13 +6,33 @@
namespace rstl {
template < typename T >
class auto_ptr {
bool x0_has;
T* x4_item;
mutable bool x0_has;
mutable T* x4_item;
public:
auto_ptr() : x0_has(false), x4_item(nullptr) {}
auto_ptr(T* ptr) : x0_has(ptr != nullptr), x4_item(ptr) {}
~auto_ptr() {
if (x0_has) {
delete x4_item;
}
}
// TODO check
// auto_ptr(const auto_ptr& other) : x0_has(other.x0_has), x4_item(other.x4_item) {
// other.x0_has = false;
// }
// TODO check
// auto_ptr& operator=(const auto_ptr& other) {
// x0_has = other.x4_item != nullptr;
// x4_item = other.x4_item;
// other.x0_has = false;
// }
T* get() { return x4_item; }
T* operator->() { return get(); }
T* release() const {
x0_has = false;
return x4_item;
}
};
} // namespace rstl

1
include/rstl/single_ptr.hpp
View File

@ -13,6 +13,7 @@ public:
single_ptr(T* ptr) : x0_ptr(ptr) {}
~single_ptr() { delete x0_ptr; }
T* get() { return x0_ptr; }
const T* get() const { return x0_ptr; }
T* operator->() { return x0_ptr; }
void operator=(T* ptr) {
delete x0_ptr;

3
include/types.h
View File

@ -46,6 +46,9 @@ typedef void* unkptr;
#ifndef nullptr
#define nullptr 0
#endif
#ifndef override
#define override
#endif
#ifndef BOOL
#ifdef __cplusplus

6
src/MetroidPrime/CSWDataDolphin.cpp → src/Kyoto/Basics/CSWDataDolphin.cpp
View File

@ -4,12 +4,12 @@
bool CStopwatch::CSWData::Initialize() {
x0_timerFreq = OS_TIMER_CLOCK;
x8_timerFreqO1M = x0_timerFreq / 1000000;
x10_timerPeriod = 1.f / x0_timerFreq;
x8_timerFreqO1M = x0_timerFreq / 1000000ull;
x10_timerPeriod = 1.f / static_cast<float>(x0_timerFreq);
return true;
}
void CStopwatch::CSWData::Wait(float v) {
void CStopwatch::CSWData::Wait(float v) const {
OSTime duration = OSSecondsToTicks(v);
OSTime end = OSGetTime() + duration;
volatile OSTime current;

14
src/MetroidPrime/CStringTable.cpp → src/Kyoto/Text/CStringTable.cpp
View File

@ -3,10 +3,24 @@
#include "rstl/pair.hpp"
#include "rstl/vector.hpp"
#include "Kyoto_CWD/CFactoryMgr.hpp"
#include "Kyoto_CWD/TGameTypes.hpp"
static FourCC mCurrentLanguage = 'ENGL';
CFactoryFnReturn FStringTableFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& xfer) { return new CStringTable(in); }
template <>
CFactoryFnReturn::CFactoryFnReturn(CStringTable* ptr) : obj(TToken< CStringTable >::GetIObjObjectFor(ptr).release()) {}
const wchar_t* CStringTable::GetString(s32 idx) const {
if (idx < 0 || idx > x0_stringCount) {
return L"Invalid";
}
s32 offset = *(reinterpret_cast< const s32* >(x4_data.get()) + idx);
return reinterpret_cast< const wchar_t* >(x4_data.get() + offset);
}
CStringTable::CStringTable(CInputStream& in) : x0_stringCount(0), x4_data(NULL) {
in.ReadLong();
in.ReadLong();

0
src/MetroidPrime/CCameraFilterPass.cpp → src/MetroidPrime/Cameras/CCameraFilter.cpp
View File

2
tools/diff-obj.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash -e
../asm_differ/diff.py -mwo -f build/mp1.0/src/"$1" "$2" --width 100 -U 20
../asm_differ/diff.py -mwo -f build/mp1.0/src/"$1" "$2" --width 100 -U 20