diff --git a/asm/Collision/CCollidableAABox.s b/asm/Collision/CCollidableAABox.s index 8f4b30ad..b39a7e08 100644 --- a/asm/Collision/CCollidableAABox.s +++ b/asm/Collision/CCollidableAABox.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CCollidableAABox_cpp .section .data +.balign 8 .global lbl_803ECAD0 lbl_803ECAD0: @@ -21,6 +22,7 @@ lbl_803ECAD0: .4byte CastRayInternal__16CCollidableAABoxCFRC25CInternalRayCastStructure .section .sdata +.balign 8 .global sTableIndex__16CCollidableAABox sTableIndex__16CCollidableAABox: @@ -29,6 +31,7 @@ sTableIndex__16CCollidableAABox: .4byte 0 .section .bss +.balign 8 .global lbl_80479498 lbl_80479498: @@ -843,6 +846,7 @@ __sinit_CCollidableAABox_cpp: /* 802CE090 002CAFF0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE1A0 lbl_805AE1A0: # ROM: 0x3FAA40 @@ -867,6 +871,7 @@ lbl_805AE1B0: .section .rodata +.balign 8 .global lbl_803D69E8 lbl_803D69E8: # ROM: 0x3D39E8 diff --git a/asm/Collision/CCollidableCollisionSurface.s b/asm/Collision/CCollidableCollisionSurface.s index ee7ae3cd..c0ff9446 100644 --- a/asm/Collision/CCollidableCollisionSurface.s +++ b/asm/Collision/CCollidableCollisionSurface.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A86F0 lbl_805A86F0: @@ -26,6 +27,7 @@ SetStaticTableIndex__27CCollidableCollisionSurfaceFUi: /* 802CE0B4 002CB014 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6A00 lbl_803D6A00: # ROM: 0x3D3A00 diff --git a/asm/Collision/CCollidableSphere.s b/asm/Collision/CCollidableSphere.s index bf714def..0e9b42e5 100644 --- a/asm/Collision/CCollidableSphere.s +++ b/asm/Collision/CCollidableSphere.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CCollidableSphere_cpp .section .data +.balign 8 .global lbl_803ECAF8 lbl_803ECAF8: @@ -69,6 +70,7 @@ lbl_803ECB20: .4byte 0 .section .sdata +.balign 8 .global lbl_805A86F8 lbl_805A86F8: @@ -78,6 +80,7 @@ lbl_805A86F8: .section .bss +.balign 8 .global lbl_80479558 lbl_80479558: @@ -1550,6 +1553,7 @@ __sinit_CCollidableSphere_cpp: /* 802D5348 002D22A8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE248 lbl_805AE248: # ROM: 0x3FAAE8 @@ -1578,6 +1582,7 @@ lbl_805AE25C: .section .rodata +.balign 8 .global lbl_803D6A90 lbl_803D6A90: # ROM: 0x3D3A90 diff --git a/asm/Collision/CCollisionInfo.s b/asm/Collision/CCollisionInfo.s index 62438ff6..3fb037f4 100644 --- a/asm/Collision/CCollisionInfo.s +++ b/asm/Collision/CCollisionInfo.s @@ -306,6 +306,7 @@ __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3 /* 802CE51C 002CB47C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE1B8 lbl_805AE1B8: # ROM: 0x3FAA58 diff --git a/asm/Collision/CCollisionPrimitive.s b/asm/Collision/CCollisionPrimitive.s index 1a688e7c..13c1361b 100644 --- a/asm/Collision/CCollisionPrimitive.s +++ b/asm/Collision/CCollisionPrimitive.s @@ -5,12 +5,14 @@ lbl_ctor: .4byte __sinit_CCollisionPrimitive_cpp .section .bss +.balign 8 .global lbl_804794E0 lbl_804794E0: .skip 0x30 .section .sbss, "wa" +.balign 8 .global lbl_805A9210 lbl_805A9210: @@ -1642,6 +1644,7 @@ lbl_802CFBE8: /* 802CFC04 002CCB64 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6A48 lbl_803D6A48: # ROM: 0x3D3A48 diff --git a/asm/Collision/CMRay.s b/asm/Collision/CMRay.s index 30ce4f98..1fba96cb 100644 --- a/asm/Collision/CMRay.s +++ b/asm/Collision/CMRay.s @@ -126,6 +126,7 @@ __ct__5CMRayFRC9CVector3fRC9CVector3fff: /* 802D61AC 002D310C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE270 lbl_805AE270: # ROM: 0x3FAB10 diff --git a/asm/Collision/COBBox.s b/asm/Collision/COBBox.s index 4249e6c4..034d1706 100644 --- a/asm/Collision/COBBox.s +++ b/asm/Collision/COBBox.s @@ -769,6 +769,7 @@ __ct__6COBBoxFRC12CTransform4fRC9CVector3f: /* 802D5FE4 002D2F44 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE260 lbl_805AE260: # ROM: 0x3FAB00 diff --git a/asm/Collision/CollisionUtil.s b/asm/Collision/CollisionUtil.s index cf459ea1..91c4657b 100644 --- a/asm/Collision/CollisionUtil.s +++ b/asm/Collision/CollisionUtil.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CollisionUtil_cpp .section .bss +.balign 8 .global lbl_80479510 lbl_80479510: @@ -4618,6 +4619,7 @@ __sinit_CollisionUtil_cpp: /* 802D3E6C 002D0DCC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE1C0 lbl_805AE1C0: # ROM: 0x3FAA60 @@ -4744,6 +4746,7 @@ lbl_805AE240: .section .rodata +.balign 8 .global lbl_803D6A50 lbl_803D6A50: # ROM: 0x3D3A50 diff --git a/asm/Collision/InternalColliders.s b/asm/Collision/InternalColliders.s index 843e68e1..b09f1400 100644 --- a/asm/Collision/InternalColliders.s +++ b/asm/Collision/InternalColliders.s @@ -98,6 +98,7 @@ AddTypes__17InternalCollidersFv: /* 802CE680 002CB5E0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6A20 lbl_803D6A20: # ROM: 0x3D3A20 diff --git a/asm/Dolphin/GBA/GBA.s b/asm/Dolphin/GBA/GBA.s index dfdb4bca..eb784409 100644 --- a/asm/Dolphin/GBA/GBA.s +++ b/asm/Dolphin/GBA/GBA.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .balign 4 .global lbl_8056A0A0 @@ -11,12 +12,14 @@ __GBA: .skip 0x400 .section .sbss, "wa" +.balign 8 .balign 4 .global __GBAReset __GBAReset: .skip 0x4 .section .data, "wa" +.balign 8 lbl_803F7160: .4byte OnReset diff --git a/asm/Dolphin/GBA/GBAKey.s b/asm/Dolphin/GBA/GBAKey.s index 184d389e..9a71955b 100644 --- a/asm/Dolphin/GBA/GBAKey.s +++ b/asm/Dolphin/GBA/GBAKey.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data, "wa" +.balign 8 lbl_803F71A0: .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/asm/Dolphin/ai.s b/asm/Dolphin/ai.s index 70ac6bb3..ff0c5f6a 100644 --- a/asm/Dolphin/ai.s +++ b/asm/Dolphin/ai.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global AIVersion AIVersion: @@ -8,12 +9,14 @@ AIVersion: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8A68 lbl_805A8A68: .4byte AIVersion .4byte 0 .section .sbss +.balign 8 __AIS_Callback: .skip 0x4 __AID_Callback: diff --git a/asm/Dolphin/ar/ar.s b/asm/Dolphin/ar/ar.s index 1d1da760..141e69a5 100644 --- a/asm/Dolphin/ar/ar.s +++ b/asm/Dolphin/ar/ar.s @@ -8,12 +8,14 @@ ARVersionString: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8A70 lbl_805A8A70: .4byte ARVersionString .4byte 0 .section .sbss +.balign 8 .global lbl_805A96F8 lbl_805A96F8: .skip 0x4 diff --git a/asm/Dolphin/ar/arq.s b/asm/Dolphin/ar/arq.s index 722b6d27..bb2e6078 100644 --- a/asm/Dolphin/ar/arq.s +++ b/asm/Dolphin/ar/arq.s @@ -1,12 +1,14 @@ .include "macros.inc" .section .data +.balign 8 .global ARQVersionString ARQVersionString: .asciz "<< Dolphin SDK - ARQ\trelease build: Sep 5 2002 05:34:29 (0x2301) >>" .balign 4 .section .sdata +.balign 8 .global lbl_805A8A78 lbl_805A8A78: @@ -14,6 +16,7 @@ lbl_805A8A78: .4byte 0 .section .sbss +.balign 8 .global lbl_805A9718 lbl_805A9718: .skip 0x4 diff --git a/asm/Dolphin/card/CARDBios.s b/asm/Dolphin/card/CARDBios.s index e264aa09..6573908b 100644 --- a/asm/Dolphin/card/CARDBios.s +++ b/asm/Dolphin/card/CARDBios.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .bss +.balign 8 .global __CARDBlock __CARDBlock: .skip 0x220 .section .data, "wa" +.balign 8 lbl_803F6C90: .asciz "<< Dolphin SDK - CARD\trelease build: Sep 5 2002 05:35:20 (0x2301) >>" .balign 4 @@ -18,6 +20,7 @@ lbl_803F6CD8: .skip 32 .section .sdata, "wa" +.balign 8 .global lbl_805A8BF0 lbl_805A8BF0: @@ -25,6 +28,7 @@ lbl_805A8BF0: .skip 4 .section .sbss, "wa" +.balign 8 .balign 4 .global __CARDEncode __CARDEncode: diff --git a/asm/Dolphin/card/CARDMount.s b/asm/Dolphin/card/CARDMount.s index 5656a2d5..ca860439 100644 --- a/asm/Dolphin/card/CARDMount.s +++ b/asm/Dolphin/card/CARDMount.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data, "wa" +.balign 8 .global lbl_803F6E60 lbl_803F6E60: @@ -25,6 +26,7 @@ lbl_803F6E80: .4byte 0x00000200 .section .sdata, "wa" +.balign 8 .global lbl_805A8C00 lbl_805A8C00: .2byte 0xFFFF diff --git a/asm/Dolphin/card/CARDOpen.s b/asm/Dolphin/card/CARDOpen.s index c83a901f..8e8d8405 100644 --- a/asm/Dolphin/card/CARDOpen.s +++ b/asm/Dolphin/card/CARDOpen.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 lbl_80569C78: .skip 0x20 diff --git a/asm/Dolphin/card/CARDUnlock.s b/asm/Dolphin/card/CARDUnlock.s index 8d4b34fc..c82528ae 100644 --- a/asm/Dolphin/card/CARDUnlock.s +++ b/asm/Dolphin/card/CARDUnlock.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data, "wa" +.balign 8 .global lbl_803F6D00 lbl_803F6D00: @@ -96,6 +97,7 @@ lbl_803F6D00: .section .sdata, "wa" +.balign 8 .global lbl_805A8BF8 lbl_805A8BF8: .4byte 1 diff --git a/asm/Dolphin/db.s b/asm/Dolphin/db.s index 8651d4d5..361bb178 100644 --- a/asm/Dolphin/db.s +++ b/asm/Dolphin/db.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 __DBInterface: .skip 0x4 DBVerbose: @@ -8,6 +9,7 @@ DBVerbose: .section .data +.balign 8 .global lbl_803EF9B8 lbl_803EF9B8: .asciz "DBExceptionDestination\n" diff --git a/asm/Dolphin/dsp/dsp.s b/asm/Dolphin/dsp/dsp.s index 0e649f0d..0d2748ec 100644 --- a/asm/Dolphin/dsp/dsp.s +++ b/asm/Dolphin/dsp/dsp.s @@ -1,17 +1,20 @@ .include "macros.inc" .section .sdata +.balign 8 .global __DSPVersion __DSPVersion: .4byte __DSPVersionString .balign 8 .section .sbss +.balign 8 .global __DSP_init_flag __DSP_init_flag: .skip 0x8 .section .data +.balign 8 __DSPVersionString: .asciz "<< Dolphin SDK - DSP\trelease build: Sep 5 2002 05:35:13 (0x2301) >>" .balign 4 diff --git a/asm/Dolphin/dsp/dsp_task.s b/asm/Dolphin/dsp/dsp_task.s index 655e6b4b..c1157e8b 100644 --- a/asm/Dolphin/dsp/dsp_task.s +++ b/asm/Dolphin/dsp/dsp_task.s @@ -18,6 +18,7 @@ lbl_803EFA50: .asciz "__DSP_add_task() : Added task : 0x%08X\n" .section .sbss +.balign 8 .global __DSP_rude_task_pending __DSP_rude_task_pending: diff --git a/asm/Dolphin/dtk.s b/asm/Dolphin/dtk.s index 9d46bd93..95897580 100644 --- a/asm/Dolphin/dtk.s +++ b/asm/Dolphin/dtk.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_80569908 lbl_80569908: .skip 0x30 @@ -24,6 +25,7 @@ lbl_80569A28: .skip 0x30 .section .sbss, "wa" +.balign 8 .balign 4 .global lbl_805A9B98 lbl_805A9B98: diff --git a/asm/Dolphin/dvd/dvd.s b/asm/Dolphin/dvd/dvd.s index 3061c986..c757ff01 100644 --- a/asm/Dolphin/dvd/dvd.s +++ b/asm/Dolphin/dvd/dvd.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8A98 lbl_805A8A98: @@ -30,6 +31,7 @@ lbl_805A8AAC: .section .bss +.balign 8 .global lbl_80540B60 lbl_80540B60: .skip 0x20 @@ -40,6 +42,7 @@ lbl_80540B80: lbl_80540BA0: .skip 0x58 .section .sbss +.balign 8 lbl_805A97C8: .skip 0x8 lbl_805A97D0: diff --git a/asm/Dolphin/dvd/dvderror.s b/asm/Dolphin/dvd/dvderror.s index 85f36584..cc618f80 100644 --- a/asm/Dolphin/dvd/dvderror.s +++ b/asm/Dolphin/dvd/dvderror.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803F0100 lbl_803F0100: # ROM: 0x3ED100 diff --git a/asm/Dolphin/dvd/dvdfatal.s b/asm/Dolphin/dvd/dvdfatal.s index 85b7d4d2..411cd5bd 100644 --- a/asm/Dolphin/dvd/dvdfatal.s +++ b/asm/Dolphin/dvd/dvdfatal.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8AB0 lbl_805A8AB0: # ROM: 0x3F6450 @@ -13,11 +14,13 @@ lbl_805A8AB4: .section .sbss +.balign 8 .global lbl_805A9820 lbl_805A9820: .skip 0x8 .section .sdata2 +.balign 8 .global lbl_805AEB20 lbl_805AEB20: # ROM: 0x3FB3C0 @@ -30,6 +33,7 @@ lbl_805AEB24: .section .rodata +.balign 8 lbl_803D8570: # ROM: 0x3D5570 .4byte 0x803F0238 diff --git a/asm/Dolphin/dvd/dvdfs.s b/asm/Dolphin/dvd/dvdfs.s index 9e94fe4a..eca9e738 100644 --- a/asm/Dolphin/dvd/dvdfs.s +++ b/asm/Dolphin/dvd/dvdfs.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .global lbl_805A97B0 lbl_805A97B0: .skip 0x4 @@ -21,6 +22,7 @@ lbl_805A97C4: .skip 0x4 .section .sdata +.balign 8 .global lbl_805A8A90 lbl_805A8A90: # ROM: 0x3F6430 diff --git a/asm/Dolphin/dvd/dvdlow.s b/asm/Dolphin/dvd/dvdlow.s index 85e74ad5..bdfff1f3 100644 --- a/asm/Dolphin/dvd/dvdlow.s +++ b/asm/Dolphin/dvd/dvdlow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8A88 lbl_805A8A88: @@ -10,6 +11,7 @@ lbl_805A8A88: .section .bss +.balign 8 lbl_80540A80: .skip 0x68 @@ -17,6 +19,7 @@ lbl_80540AE8: .skip 0x78 .section .sbss +.balign 8 .global lbl_805A9768 lbl_805A9768: diff --git a/asm/Dolphin/dvd/dvdqueue.s b/asm/Dolphin/dvd/dvdqueue.s index 37e0a5f1..f872996e 100644 --- a/asm/Dolphin/dvd/dvdqueue.s +++ b/asm/Dolphin/dvd/dvdqueue.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_80540BF8 lbl_80540BF8: .skip 0x20 diff --git a/asm/Dolphin/dvd/fstload.s b/asm/Dolphin/dvd/fstload.s index 4ff66850..95b664b1 100644 --- a/asm/Dolphin/dvd/fstload.s +++ b/asm/Dolphin/dvd/fstload.s @@ -1,11 +1,14 @@ .include "macros.inc" .section .bss +.balign 8 lbl_80540C18: .skip 0x40 lbl_80540C58: .skip 0x30 + .section .sbss +.balign 8 lbl_805A9828: .skip 0x4 lbl_805A982C: @@ -14,6 +17,7 @@ lbl_805A9830: .skip 0x8 .section .sdata +.balign 8 .global lbl_805A8AB8 lbl_805A8AB8: @@ -43,7 +47,6 @@ lbl_803F0578: .asciz " Disk # ...... %d\n" .asciz " Game ver .... %d\n" .asciz " Streaming ... %s\n" - .asciz "<< Dolphin SDK - GX\trelease build: Sep 5 2002 05:33:28 (0x2301) >>" .section .text, "ax" diff --git a/asm/Dolphin/exi/EXIBios.s b/asm/Dolphin/exi/EXIBios.s index 707cceeb..c4198001 100644 --- a/asm/Dolphin/exi/EXIBios.s +++ b/asm/Dolphin/exi/EXIBios.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_80569E98 lbl_80569E98: .skip 0xC8 .section .sdata, "wa" +.balign 8 .global lbl_805A8C10 lbl_805A8C10: diff --git a/asm/Dolphin/gx/GXAttr.s b/asm/Dolphin/gx/GXAttr.s index 984bf264..328b4cfc 100644 --- a/asm/Dolphin/gx/GXAttr.s +++ b/asm/Dolphin/gx/GXAttr.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8AD0 lbl_805A8AD0: # ROM: 0x3F6470 diff --git a/asm/Dolphin/gx/GXBump.s b/asm/Dolphin/gx/GXBump.s index 6f9ebd48..2bf67286 100644 --- a/asm/Dolphin/gx/GXBump.s +++ b/asm/Dolphin/gx/GXBump.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AEBB0 lbl_805AEBB0: # ROM: 0x3FB450 diff --git a/asm/Dolphin/gx/GXFifo.s b/asm/Dolphin/gx/GXFifo.s index 43bc5664..287dc8fc 100644 --- a/asm/Dolphin/gx/GXFifo.s +++ b/asm/Dolphin/gx/GXFifo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 lbl_805A9848: .skip 0x4 lbl_805A984C: diff --git a/asm/Dolphin/gx/GXFrameBuf.s b/asm/Dolphin/gx/GXFrameBuf.s index 1c58ace2..7efff2b0 100644 --- a/asm/Dolphin/gx/GXFrameBuf.s +++ b/asm/Dolphin/gx/GXFrameBuf.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AEB50 lbl_805AEB50: # ROM: 0x3FB3F0 diff --git a/asm/Dolphin/gx/GXInit.s b/asm/Dolphin/gx/GXInit.s index 7c7b9c04..bdc7cb0a 100644 --- a/asm/Dolphin/gx/GXInit.s +++ b/asm/Dolphin/gx/GXInit.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_80540C88 lbl_80540C88: .skip 0x578 .section .sbss +.balign 8 .global lbl_805A9838 lbl_805A9838: .skip 0x4 @@ -20,6 +22,7 @@ lbl_805A9844: .skip 0x4 .section .sdata +.balign 8 .global lbl_805A8AC8 lbl_805A8AC8: # ROM: 0x3F6468 @@ -28,6 +31,7 @@ lbl_805A8AC8: .section .sdata2 +.balign 8 .global lbl_805AEB28 lbl_805AEB28: @@ -73,6 +77,12 @@ lbl_805AEB48: .section .data +.balign 8 + +.global lbl_803F05E8 +lbl_803F05E8: + .asciz "<< Dolphin SDK - GX\trelease build: Sep 5 2002 05:33:28 (0x2301) >>" + .global lbl_803F062C lbl_803F062C: # ROM: 0x3ED62C diff --git a/asm/Dolphin/gx/GXLight.s b/asm/Dolphin/gx/GXLight.s index a59880fb..eaeadff5 100644 --- a/asm/Dolphin/gx/GXLight.s +++ b/asm/Dolphin/gx/GXLight.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AEB58 lbl_805AEB58: # ROM: 0x3FB3F8 @@ -59,6 +60,7 @@ lbl_805AEB80: .section .data +.balign 8 .global lbl_803F09D0 lbl_803F09D0: # ROM: 0x3ED9D0 diff --git a/asm/Dolphin/gx/GXMisc.s b/asm/Dolphin/gx/GXMisc.s index d17c2b79..c5c7439d 100644 --- a/asm/Dolphin/gx/GXMisc.s +++ b/asm/Dolphin/gx/GXMisc.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .global lbl_805A9868 lbl_805A9868: .skip 0x4 diff --git a/asm/Dolphin/gx/GXPerf.s b/asm/Dolphin/gx/GXPerf.s index 11927808..b57cf950 100644 --- a/asm/Dolphin/gx/GXPerf.s +++ b/asm/Dolphin/gx/GXPerf.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 lbl_803F0CB0: # ROM: 0x3EDCB0 .4byte 0x8037CD4C diff --git a/asm/Dolphin/gx/GXPixel.s b/asm/Dolphin/gx/GXPixel.s index 4aec64d3..0b56b75e 100644 --- a/asm/Dolphin/gx/GXPixel.s +++ b/asm/Dolphin/gx/GXPixel.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AEBB8 lbl_805AEBB8: # ROM: 0x3FB458 @@ -41,6 +42,7 @@ lbl_805AEBE0: .section .data +.balign 8 .global lbl_803F0C90 lbl_803F0C90: # ROM: 0x3EDC90 diff --git a/asm/Dolphin/gx/GXTev.s b/asm/Dolphin/gx/GXTev.s index 1b80a3ca..661a4cd3 100644 --- a/asm/Dolphin/gx/GXTev.s +++ b/asm/Dolphin/gx/GXTev.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803F0C18 lbl_803F0C18: # ROM: 0x3EDC18 diff --git a/asm/Dolphin/gx/GXTexture.s b/asm/Dolphin/gx/GXTexture.s index 9d3b278f..a64aea51 100644 --- a/asm/Dolphin/gx/GXTexture.s +++ b/asm/Dolphin/gx/GXTexture.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8AE0 lbl_805A8AE0: # ROM: 0x3F6480 @@ -51,6 +52,7 @@ lbl_805A8B18: .section .sdata2 +.balign 8 .global lbl_805AEB88 lbl_805AEB88: # ROM: 0x3FB428 @@ -96,6 +98,7 @@ lbl_805AEBAC: .section .data +.balign 8 .global lbl_803F09F0 lbl_803F09F0: # ROM: 0x3ED9F0 diff --git a/asm/Dolphin/gx/GXTransform.s b/asm/Dolphin/gx/GXTransform.s index ea3360aa..a512465a 100644 --- a/asm/Dolphin/gx/GXTransform.s +++ b/asm/Dolphin/gx/GXTransform.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AEBE8 lbl_805AEBE8: # ROM: 0x3FB488 diff --git a/asm/Dolphin/mtx/mtx.s b/asm/Dolphin/mtx/mtx.s index e89667be..532064bf 100644 --- a/asm/Dolphin/mtx/mtx.s +++ b/asm/Dolphin/mtx/mtx.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8B20 lbl_805A8B20: @@ -10,6 +11,7 @@ lbl_805A8B20: .section .sdata2 +.balign 8 .global lbl_805AEBF8 lbl_805AEBF8: # ROM: 0x3FB498 diff --git a/asm/Dolphin/mtx/mtx44.s b/asm/Dolphin/mtx/mtx44.s index 1b355d0e..50c85969 100644 --- a/asm/Dolphin/mtx/mtx44.s +++ b/asm/Dolphin/mtx/mtx44.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AEC00 lbl_805AEC00: # ROM: 0x3FB4A0 diff --git a/asm/Dolphin/mtx/vec.s b/asm/Dolphin/mtx/vec.s index a7b72033..a5f0f5a0 100644 --- a/asm/Dolphin/mtx/vec.s +++ b/asm/Dolphin/mtx/vec.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AEC10 lbl_805AEC10: # ROM: 0x3FB4B0 diff --git a/asm/Dolphin/os/OS.s b/asm/Dolphin/os/OS.s index 615c9db4..c83bb423 100644 --- a/asm/Dolphin/os/OS.s +++ b/asm/Dolphin/os/OS.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .bss +.balign 8 .global DriveInfo DriveInfo: .skip 0x50 .section .sbss +.balign 8 .global BootInfo BootInfo: .skip 0x4 @@ -38,6 +40,7 @@ __OSStartTime: .skip 0x8 .section .data +.balign 8 .global lbl_803F0DA0 lbl_803F0DA0: .asciz "<< Dolphin SDK - OS\trelease build: Sep 5 2002 05:32:39 (0x2301) >>" @@ -96,6 +99,7 @@ __OSExceptionLocations: .balign 4 .section .sdata +.balign 8 .global lbl_805A8B28 lbl_805A8B28: diff --git a/asm/Dolphin/os/OSAlarm.s b/asm/Dolphin/os/OSAlarm.s index 124cb4d0..f8476dff 100644 --- a/asm/Dolphin/os/OSAlarm.s +++ b/asm/Dolphin/os/OSAlarm.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .global lbl_805A98B0 lbl_805A98B0: .skip 0x8 diff --git a/asm/Dolphin/os/OSArena.s b/asm/Dolphin/os/OSArena.s index a851d844..fc9e6169 100644 --- a/asm/Dolphin/os/OSArena.s +++ b/asm/Dolphin/os/OSArena.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8B30 lbl_805A8B30: # ROM: 0x3F64D0 @@ -9,6 +10,7 @@ lbl_805A8B30: .section .sbss +.balign 8 .global lbl_805A98B8 lbl_805A98B8: .skip 0x8 diff --git a/asm/Dolphin/os/OSError.s b/asm/Dolphin/os/OSError.s index c4398aed..6b8b2a93 100644 --- a/asm/Dolphin/os/OSError.s +++ b/asm/Dolphin/os/OSError.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_80541250 lbl_80541250: .skip 0x48 @@ -59,6 +60,7 @@ lbl_803F170C: .4byte lbl_80380024 .4byte lbl_8037FFD8 .section .sdata +.balign 8 .global lbl_805A8B38 lbl_805A8B38: # ROM: 0x3F64D8 diff --git a/asm/Dolphin/os/OSFatal.s b/asm/Dolphin/os/OSFatal.s index 583baabd..a1d2a045 100644 --- a/asm/Dolphin/os/OSFatal.s +++ b/asm/Dolphin/os/OSFatal.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_80541298 lbl_80541298: .skip 0x2E8 .section .sdata +.balign 8 .global lbl_805A8B40 lbl_805A8B40: @@ -15,6 +17,7 @@ lbl_805A8B40: .section .sdata2 +.balign 8 .global lbl_805AEC18 lbl_805AEC18: diff --git a/asm/Dolphin/os/OSFont.s b/asm/Dolphin/os/OSFont.s index cdadc30c..7852ffd3 100644 --- a/asm/Dolphin/os/OSFont.s +++ b/asm/Dolphin/os/OSFont.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8B48 lbl_805A8B48: # ROM: 0x3F64E8 @@ -9,6 +10,7 @@ lbl_805A8B48: .section .sbss +.balign 8 lbl_805A98C0: .skip 0x4 lbl_805A98C4: @@ -736,6 +738,7 @@ Zenkaku2Code: .4byte 0x00000000 .section .sdata2 +.balign 8 .global lbl_805AEC48 lbl_805AEC48: # ROM: 0x3FB4E8 diff --git a/asm/Dolphin/os/OSInterrupt.s b/asm/Dolphin/os/OSInterrupt.s index 4c74e584..d0d04d2a 100644 --- a/asm/Dolphin/os/OSInterrupt.s +++ b/asm/Dolphin/os/OSInterrupt.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .global lbl_805A98D0 lbl_805A98D0: .skip 0x4 diff --git a/asm/Dolphin/os/OSLink.s b/asm/Dolphin/os/OSLink.s index 8fb7d648..ae9b964b 100644 --- a/asm/Dolphin/os/OSLink.s +++ b/asm/Dolphin/os/OSLink.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803F2290 lbl_803F2290: .asciz "OSLink: unknown relocation type %3d\n" diff --git a/asm/Dolphin/os/OSMemory.s b/asm/Dolphin/os/OSMemory.s index 67ef0866..d681592f 100644 --- a/asm/Dolphin/os/OSMemory.s +++ b/asm/Dolphin/os/OSMemory.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 lbl_803F22E0: .4byte OnReset .4byte 0x7f diff --git a/asm/Dolphin/os/OSReboot.s b/asm/Dolphin/os/OSReboot.s index 1b62c22a..15830780 100644 --- a/asm/Dolphin/os/OSReboot.s +++ b/asm/Dolphin/os/OSReboot.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .bss +.balign 8 .global Header Header: .skip 0x20 .section .sbss +.balign 8 SaveStart: .skip 0x4 SaveEnd: diff --git a/asm/Dolphin/os/OSReset.s b/asm/Dolphin/os/OSReset.s index 36fe075e..63699b79 100644 --- a/asm/Dolphin/os/OSReset.s +++ b/asm/Dolphin/os/OSReset.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 ResetFunctionQueue: .skip 0x8 diff --git a/asm/Dolphin/os/OSResetSW.s b/asm/Dolphin/os/OSResetSW.s index 0a58f138..dc665d7e 100644 --- a/asm/Dolphin/os/OSResetSW.s +++ b/asm/Dolphin/os/OSResetSW.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .global lbl_805A9900 lbl_805A9900: .skip 0x4 diff --git a/asm/Dolphin/os/OSRtc.s b/asm/Dolphin/os/OSRtc.s index d7eb5b72..7b02f6a4 100644 --- a/asm/Dolphin/os/OSRtc.s +++ b/asm/Dolphin/os/OSRtc.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 Scb: .skip 0x58 diff --git a/asm/Dolphin/os/OSThread.s b/asm/Dolphin/os/OSThread.s index 2dc92366..cd198ebf 100644 --- a/asm/Dolphin/os/OSThread.s +++ b/asm/Dolphin/os/OSThread.s @@ -1,10 +1,12 @@ .include "macros.inc" .section .bss +.balign 8 lbl_805415F8: .skip 0x9F8 .section .sbss +.balign 8 lbl_805A9920: .skip 0x4 lbl_805A9924: @@ -13,6 +15,7 @@ lbl_805A9928: .skip 0x8 .section .sdata +.balign 8 .global lbl_805A8B50 lbl_805A8B50: diff --git a/asm/Dolphin/pad/PadClamp.s b/asm/Dolphin/pad/PadClamp.s index 79e8b72d..5b624f97 100644 --- a/asm/Dolphin/pad/PadClamp.s +++ b/asm/Dolphin/pad/PadClamp.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 lbl_803D8588: # ROM: 0x3D5588 diff --git a/asm/Dolphin/pad/pad.s b/asm/Dolphin/pad/pad.s index 1aa840e6..ea60b245 100644 --- a/asm/Dolphin/pad/pad.s +++ b/asm/Dolphin/pad/pad.s @@ -1,12 +1,14 @@ .include "macros.inc" .section .bss +.balign 8 lbl_80541FF0: .skip 0x10 lbl_80542000: .skip 0x40 .section .sbss +.balign 8 .balign 4 @@ -42,6 +44,7 @@ __PADSpec: .skip 0x4 .section .data, "wa" +.balign 8 PAD_VERSION_STR: .asciz "<< Dolphin SDK - PAD\trelease build: Sep 5 2002 05:34:02 (0x2301) >>" @@ -54,6 +57,7 @@ lbl_803F2398: .4byte 0 .section .sdata +.balign 8 __PADVersion: .4byte PAD_VERSION_STR diff --git a/asm/Dolphin/si/SIBios.s b/asm/Dolphin/si/SIBios.s index 5ade674a..80a07706 100644 --- a/asm/Dolphin/si/SIBios.s +++ b/asm/Dolphin/si/SIBios.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global Packet Packet: .skip 0x80 @@ -22,6 +23,7 @@ lbl_80569E38: .section .data, "wa" +.balign 8 .global lbl_803F6EA0 lbl_803F6EA0: @@ -68,12 +70,14 @@ Type: .section .sdata, "wa" +.balign 8 .global __SIVersion __SIVersion: .4byte lbl_803F6EA0 .skip 4 .section .sbss, "wa" +.balign 8 .balign 4 .global lbl_805A9BD0 lbl_805A9BD0: diff --git a/asm/Dolphin/si/SISamplingRate.s b/asm/Dolphin/si/SISamplingRate.s index 84489fe9..cec89964 100644 --- a/asm/Dolphin/si/SISamplingRate.s +++ b/asm/Dolphin/si/SISamplingRate.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data, "wa" +.balign 8 .global lbl_803F6FB8 lbl_803F6FB8: diff --git a/asm/Dolphin/thp/THPDec.s b/asm/Dolphin/thp/THPDec.s index 0d4f5d80..33aa4ddb 100644 --- a/asm/Dolphin/thp/THPDec.s +++ b/asm/Dolphin/thp/THPDec.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_80569F60 lbl_80569F60: .skip 0x118 @@ -9,6 +10,7 @@ __THPMCUBuffer: .skip 0x28 .section .rodata, "a" # 0x803CB3A0 - 0x803D8D60 +.balign 8 __THPJpegNaturalOrder: # local object .4byte 0x00010810 .4byte 0x0902030A @@ -42,6 +44,7 @@ __THPAANScaleFactor: # local object .section .sdata2, "wa" +.balign 8 .global lbl_805AF440 lbl_805AF440: .double 4.503599627370496E15 @@ -63,6 +66,7 @@ lbl_805AF458: .float 1024.0 .section .sbss, "wa" +.balign 8 .balign 32 Ydchuff: .skip 4 @@ -108,11 +112,13 @@ __THPInitFlag: .skip 4 .section .data, "wa" +.balign 8 THPVersionStr: .asciz "<< Dolphin SDK - THP\trelease build: Aug 27 2002 20:42:01 >>" .skip 4 .section .sdata, "wa" +.balign 8 THPVersion: .4byte THPVersionStr diff --git a/asm/Dolphin/vi.s b/asm/Dolphin/vi.s index cb83f82d..6a797c21 100644 --- a/asm/Dolphin/vi.s +++ b/asm/Dolphin/vi.s @@ -1,12 +1,14 @@ .include "macros.inc" .section .bss +.balign 8 lbl_80542040: .skip 0xF0 lbl_80542130: .skip 0x58 .section .data, "wa" +.balign 8 .global lbl_803F23A8 lbl_803F23A8: # ROM: 0x3EF3A8 @@ -178,6 +180,7 @@ lbl_803F275C: .section .sdata +.balign 8 .global lbl_805A8B78 lbl_805A8B78: @@ -193,6 +196,7 @@ lbl_805A8B7C: .section .sbss, "wa" +.balign 8 .balign 4 lbl_805A9958: .skip 0x4 diff --git a/asm/GuiSys/CAuiEnergyBarT01.s b/asm/GuiSys/CAuiEnergyBarT01.s index 1a8144c7..ad1b15d1 100644 --- a/asm/GuiSys/CAuiEnergyBarT01.s +++ b/asm/GuiSys/CAuiEnergyBarT01.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECA50 lbl_803ECA50: @@ -23,6 +24,7 @@ lbl_803ECA50: .4byte 0 .section .sdata +.balign 8 .global lbl_805A86D8 lbl_805A86D8: @@ -833,6 +835,7 @@ lbl_802CBCBC: /* 802CBCE4 002C8C44 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE140 lbl_805AE140: # ROM: 0x3FA9E0 @@ -877,6 +880,7 @@ lbl_805AE160: .section .rodata +.balign 8 .global lbl_803D69B0 lbl_803D69B0: # ROM: 0x3D39B0 diff --git a/asm/GuiSys/CAuiImagePane.s b/asm/GuiSys/CAuiImagePane.s index 9ddb63f8..c7ce5cbe 100644 --- a/asm/GuiSys/CAuiImagePane.s +++ b/asm/GuiSys/CAuiImagePane.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECA90 lbl_803ECA90: @@ -23,6 +24,7 @@ lbl_803ECA90: .4byte WriteData__13CAuiImagePaneCFR13COutputStreamb .section .sdata +.balign 8 .global lbl_805A86E0 lbl_805A86E0: @@ -1667,6 +1669,7 @@ lbl_802CD42C: /* 802CD450 002CA3B0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE168 lbl_805AE168: # ROM: 0x3FAA08 @@ -1705,6 +1708,7 @@ lbl_805AE188: .section .rodata +.balign 8 .global lbl_803D69C8 lbl_803D69C8: # ROM: 0x3D39C8 diff --git a/asm/GuiSys/CAuiMeter.s b/asm/GuiSys/CAuiMeter.s index cb03a989..bf87e611 100644 --- a/asm/GuiSys/CAuiMeter.s +++ b/asm/GuiSys/CAuiMeter.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC6F8 lbl_803EC6F8: @@ -23,6 +24,7 @@ lbl_803EC6F8: .4byte GetWorkerWidget__9CAuiMeterFi .section .sdata +.balign 8 .global lbl_805A86B0 lbl_805A86B0: @@ -493,6 +495,7 @@ __ct__9CAuiMeterFRCQ210CGuiWidget15CGuiWidgetParmsbii: /* 802C11E4 002BE144 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE080 lbl_805AE080: # ROM: 0x3FA920 @@ -506,6 +509,7 @@ lbl_805AE088: .section .rodata +.balign 8 .global lbl_803D6878 lbl_803D6878: # ROM: 0x3D3878 diff --git a/asm/GuiSys/CGuiGroup.s b/asm/GuiSys/CGuiGroup.s index f404cb04..e6545a41 100644 --- a/asm/GuiSys/CGuiGroup.s +++ b/asm/GuiSys/CGuiGroup.s @@ -7,12 +7,14 @@ lbl_ctor: .4byte __sinit_CGuiFeeHelper_cpp .section .sbss, "wa" +.balign 8 .global lbl_805A91F8 lbl_805A91F8: .skip 0x8 .section .data +.balign 8 .global lbl_803EC738 lbl_803EC738: @@ -2709,6 +2711,7 @@ lbl_802C358C: /* 802C35B4 002C0514 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE090 lbl_805AE090: # ROM: 0x3FA930 @@ -2727,6 +2730,7 @@ lbl_805AE098: .section .rodata +.balign 8 .global lbl_803D6880 lbl_803D6880: # ROM: 0x3D3880 diff --git a/asm/GuiSys/CGuiHeadWidget.s b/asm/GuiSys/CGuiHeadWidget.s index 37268d6b..b4c0c403 100644 --- a/asm/GuiSys/CGuiHeadWidget.s +++ b/asm/GuiSys/CGuiHeadWidget.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC808 lbl_803EC808: @@ -137,6 +138,7 @@ GetWidgetTypeID__14CGuiHeadWidgetCFv: /* 802C373C 002C069C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D68A0 lbl_803D68A0: # ROM: 0x3D38A0 diff --git a/asm/GuiSys/CGuiLight.s b/asm/GuiSys/CGuiLight.s index 9b1ef5fc..296c144b 100644 --- a/asm/GuiSys/CGuiLight.s +++ b/asm/GuiSys/CGuiLight.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC848 lbl_803EC848: @@ -581,6 +582,7 @@ lbl_802C3F24: /* 802C3F60 002C0EC0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE0A0 lbl_805AE0A0: # ROM: 0x3FA940 @@ -593,6 +595,7 @@ lbl_805AE0A4: .section .rodata +.balign 8 .global lbl_803D68A8 lbl_803D68A8: # ROM: 0x3D38A8 diff --git a/asm/GuiSys/CGuiModel.s b/asm/GuiSys/CGuiModel.s index 4279da81..945c1c24 100644 --- a/asm/GuiSys/CGuiModel.s +++ b/asm/GuiSys/CGuiModel.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC888 lbl_803EC888: @@ -582,6 +583,7 @@ lbl_802C470C: /* 802C4734 002C1694 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE0A8 lbl_805AE0A8: # ROM: 0x3FA948 @@ -596,6 +598,7 @@ lbl_805AE0B0: .section .rodata +.balign 8 .global lbl_803D68B0 lbl_803D68B0: # ROM: 0x3D38B0 diff --git a/asm/GuiSys/CGuiObject.s b/asm/GuiSys/CGuiObject.s index 51d6255b..15f647ac 100644 --- a/asm/GuiSys/CGuiObject.s +++ b/asm/GuiSys/CGuiObject.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC8C8 lbl_803EC8C8: @@ -1013,6 +1014,7 @@ __ct__10CGuiObjectFv: /* 802C54E0 002C2440 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE0B8 lbl_805AE0B8: # ROM: 0x3FA958 diff --git a/asm/GuiSys/CGuiPane.s b/asm/GuiSys/CGuiPane.s index e487c9d2..e7c68bab 100644 --- a/asm/GuiSys/CGuiPane.s +++ b/asm/GuiSys/CGuiPane.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC8E0 lbl_803EC8E0: @@ -495,6 +496,7 @@ lbl_802C5B58: /* 802C5B90 002C2AF0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE0C0 lbl_805AE0C0: # ROM: 0x3FA960 @@ -519,6 +521,7 @@ lbl_805AE0D0: .section .rodata +.balign 8 .global lbl_803D68B8 lbl_803D68B8: # ROM: 0x3D38B8 diff --git a/asm/GuiSys/CGuiSliderGroup.s b/asm/GuiSys/CGuiSliderGroup.s index c816c5dd..feb264de 100644 --- a/asm/GuiSys/CGuiSliderGroup.s +++ b/asm/GuiSys/CGuiSliderGroup.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC930 lbl_803EC930: @@ -651,6 +652,7 @@ lbl_802C63AC: /* 802C63DC 002C333C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE0D8 lbl_805AE0D8: # ROM: 0x3FA978 @@ -673,6 +675,7 @@ lbl_805AE0E4: .section .rodata +.balign 8 .global lbl_803D68C0 lbl_803D68C0: # ROM: 0x3D38C0 diff --git a/asm/GuiSys/CGuiSys.s b/asm/GuiSys/CGuiSys.s index de2dc89f..5eff3cc2 100644 --- a/asm/GuiSys/CGuiSys.s +++ b/asm/GuiSys/CGuiSys.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9200 lbl_805A9200: @@ -162,6 +163,7 @@ sub_802c65a0: /* 802C65E4 002C3544 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D68C8 lbl_803D68C8: # ROM: 0x3D38C8 diff --git a/asm/GuiSys/CGuiTableGroup.s b/asm/GuiSys/CGuiTableGroup.s index 460654f9..8aea4207 100644 --- a/asm/GuiSys/CGuiTableGroup.s +++ b/asm/GuiSys/CGuiTableGroup.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC970 lbl_803EC970: @@ -25,6 +26,7 @@ lbl_803EC970: .4byte 0 .section .sdata +.balign 8 .global lbl_805A86C0 lbl_805A86C0: @@ -1230,6 +1232,7 @@ lbl_802C75A4: /* 802C75C0 002C4520 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D68D0 lbl_803D68D0: # ROM: 0x3D38D0 diff --git a/asm/GuiSys/CGuiTextPane.s b/asm/GuiSys/CGuiTextPane.s index 8b696b98..41ed476e 100644 --- a/asm/GuiSys/CGuiTextPane.s +++ b/asm/GuiSys/CGuiTextPane.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC9B8 lbl_803EC9B8: @@ -539,6 +540,7 @@ lbl_802C7C88: /* 802C7CF8 002C4C58 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE0E8 lbl_805AE0E8: # ROM: 0x3FA988 @@ -562,6 +564,7 @@ lbl_805AE0F8: .section .rodata +.balign 8 .global lbl_803D68D8 lbl_803D68D8: # ROM: 0x3D38D8 diff --git a/asm/GuiSys/CGuiTextSupport.s b/asm/GuiSys/CGuiTextSupport.s index 74114925..35f32534 100644 --- a/asm/GuiSys/CGuiTextSupport.s +++ b/asm/GuiSys/CGuiTextSupport.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A86C8 lbl_805A86C8: @@ -23,6 +24,7 @@ lbl_805A86D4: .float 1.0 .section .sbss, "wa" +.balign 8 .global lbl_805A9208 lbl_805A9208: @@ -3088,6 +3090,7 @@ lbl_802CA5C0: /* 802CA5D8 002C7538 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE100 lbl_805AE100: # ROM: 0x3FA9A0 @@ -3137,6 +3140,7 @@ lbl_805AE12C: .section .rodata +.balign 8 .global lbl_803D68E0 lbl_803D68E0: # ROM: 0x3D38E0 diff --git a/asm/GuiSys/CGuiWidget.s b/asm/GuiSys/CGuiWidget.s index be86cbdd..402e4d10 100644 --- a/asm/GuiSys/CGuiWidget.s +++ b/asm/GuiSys/CGuiWidget.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECA10 lbl_803ECA10: @@ -731,6 +732,7 @@ __ct__Q210CGuiWidget15CGuiWidgetParmsFP9CGuiFramebssbbbRC6CColorQ210CGuiWidget18 /* 802CAF70 002C7ED0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D68F8 lbl_803D68F8: # ROM: 0x3D38F8 diff --git a/asm/GuiSys/CGuiWidgetDrawParms.s b/asm/GuiSys/CGuiWidgetDrawParms.s index d2c19b47..4d1d32a2 100644 --- a/asm/GuiSys/CGuiWidgetDrawParms.s +++ b/asm/GuiSys/CGuiWidgetDrawParms.s @@ -18,6 +18,7 @@ __sinit_CGuiWidgetDrawParms_cpp: /* 802CB1CC 002C812C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE138 lbl_805AE138: # ROM: 0x3FA9D8 diff --git a/asm/GuiSys/CGuiWidgetIdDB.s b/asm/GuiSys/CGuiWidgetIdDB.s index c69f863b..9393f60b 100644 --- a/asm/GuiSys/CGuiWidgetIdDB.s +++ b/asm/GuiSys/CGuiWidgetIdDB.s @@ -166,6 +166,7 @@ __ct__14CGuiWidgetIdDBFv: /* 802CB1AC 002C810C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE130 lbl_805AE130: # ROM: 0x3FA9D0 @@ -179,6 +180,7 @@ lbl_805AE132: .section .rodata +.balign 8 .global lbl_803D6948 lbl_803D6948: # ROM: 0x3D3948 diff --git a/asm/GuiSys/CRepeatState.s b/asm/GuiSys/CRepeatState.s index aa94df9a..dc14896c 100644 --- a/asm/GuiSys/CRepeatState.s +++ b/asm/GuiSys/CRepeatState.s @@ -41,6 +41,7 @@ sub_802cd4bc: /* 802CD4C4 002CA424 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE190 lbl_805AE190: # ROM: 0x3FAA30 diff --git a/asm/Kyoto/Alloc/CGameAllocator.s b/asm/Kyoto/Alloc/CGameAllocator.s index 7e40e49c..45288222 100644 --- a/asm/Kyoto/Alloc/CGameAllocator.s +++ b/asm/Kyoto/Alloc/CGameAllocator.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF6D8 lbl_803EF6D8: @@ -23,6 +24,7 @@ lbl_803EF6D8: .4byte GetMetrics__14CGameAllocatorCFv .section .sbss, "wa" +.balign 8 .global lbl_805A95D8 lbl_805A95D8: @@ -1575,6 +1577,7 @@ GetMemInfoFromBlockPtr__14CGameAllocatorCFPCv: /* 80352664 0034F5C4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE9B8 lbl_805AE9B8: # ROM: 0x3FB258 @@ -1583,6 +1586,7 @@ lbl_805AE9B8: .section .rodata +.balign 8 .global lbl_803D8248 lbl_803D8248: # ROM: 0x3D5248 diff --git a/asm/Kyoto/Alloc/CMediumAllocPool.s b/asm/Kyoto/Alloc/CMediumAllocPool.s index d0721d63..a0f08356 100644 --- a/asm/Kyoto/Alloc/CMediumAllocPool.s +++ b/asm/Kyoto/Alloc/CMediumAllocPool.s @@ -685,6 +685,7 @@ lbl_80350DF8: /* 80350E20 0034DD80 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8240 lbl_803D8240: # ROM: 0x3D5240 diff --git a/asm/Kyoto/Alloc/CMemory.s b/asm/Kyoto/Alloc/CMemory.s index 83d9b776..38edccf7 100644 --- a/asm/Kyoto/Alloc/CMemory.s +++ b/asm/Kyoto/Alloc/CMemory.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMemory_cpp .section .bss +.balign 8 .global lbl_804BFD58 lbl_804BFD58: @@ -14,6 +15,7 @@ lbl_804BFD64: .skip 0xC4 .section .sdata +.balign 8 .global lbl_805A8868 lbl_805A8868: @@ -22,6 +24,7 @@ lbl_805A8868: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9460 lbl_805A9460: @@ -373,6 +376,7 @@ __sinit_CMemory_cpp: /* 80315C94 00312BF4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7808 lbl_803D7808: # ROM: 0x3D4808 diff --git a/asm/Kyoto/Alloc/IAllocator.s b/asm/Kyoto/Alloc/IAllocator.s index f7c36bd0..81f00345 100644 --- a/asm/Kyoto/Alloc/IAllocator.s +++ b/asm/Kyoto/Alloc/IAllocator.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global __vt__10IAllocator __vt__10IAllocator: diff --git a/asm/Kyoto/Animation/CAdditiveAnimPlayback.s b/asm/Kyoto/Animation/CAdditiveAnimPlayback.s index c93e32ba..d58207db 100644 --- a/asm/Kyoto/Animation/CAdditiveAnimPlayback.s +++ b/asm/Kyoto/Animation/CAdditiveAnimPlayback.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A89F8 lbl_805A89F8: @@ -324,6 +325,7 @@ lbl_8035DEE0: /* 8035DEE8 0035AE48 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEA60 lbl_805AEA60: # ROM: 0x3FB300 diff --git a/asm/Kyoto/Animation/CAdvancementDeltas.s b/asm/Kyoto/Animation/CAdvancementDeltas.s index abaaf925..6c436b5d 100644 --- a/asm/Kyoto/Animation/CAdvancementDeltas.s +++ b/asm/Kyoto/Animation/CAdvancementDeltas.s @@ -121,6 +121,7 @@ Interpolate__18CAdvancementDeltasFRC18CAdvancementDeltasRC18CAdvancementDeltasff /* 802EB6B8 002E8618 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE348 lbl_805AE348: # ROM: 0x3FABE8 diff --git a/asm/Kyoto/Animation/CAllFormatsAnimSource.s b/asm/Kyoto/Animation/CAllFormatsAnimSource.s index dab45edf..99decda5 100644 --- a/asm/Kyoto/Animation/CAllFormatsAnimSource.s +++ b/asm/Kyoto/Animation/CAllFormatsAnimSource.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED568 lbl_803ED568: @@ -498,6 +499,7 @@ __ct__16CAnimFormatUnionFR12CInputStreamR12IObjectStore: /* 802FE5D0 002FB530 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE450 lbl_805AE450: # ROM: 0x3FACF0 @@ -506,6 +508,7 @@ lbl_805AE450: .section .rodata +.balign 8 .global lbl_803D6E58 lbl_803D6E58: # ROM: 0x3D3E58 diff --git a/asm/Kyoto/Animation/CAnimCharacterSet.s b/asm/Kyoto/Animation/CAnimCharacterSet.s index a2dbbc2c..e5291f84 100644 --- a/asm/Kyoto/Animation/CAnimCharacterSet.s +++ b/asm/Kyoto/Animation/CAnimCharacterSet.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECBD0 lbl_803ECBD0: @@ -479,6 +480,7 @@ __ct__17CAnimCharacterSetFR12CInputStream: /* 802D86F8 002D5658 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D30 lbl_803D6D30: # ROM: 0x3D3D30 diff --git a/asm/Kyoto/Animation/CAnimMathUtils.s b/asm/Kyoto/Animation/CAnimMathUtils.s index 8f7a44a5..31c078ff 100644 --- a/asm/Kyoto/Animation/CAnimMathUtils.s +++ b/asm/Kyoto/Animation/CAnimMathUtils.s @@ -293,6 +293,7 @@ lbl_802EBAC4: /* 802EBAEC 002E8A4C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE358 lbl_805AE358: # ROM: 0x3FABF8 diff --git a/asm/Kyoto/Animation/CAnimPOIData.s b/asm/Kyoto/Animation/CAnimPOIData.s index 94525cbb..70e6fadf 100644 --- a/asm/Kyoto/Animation/CAnimPOIData.s +++ b/asm/Kyoto/Animation/CAnimPOIData.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECF48 lbl_803ECF48: @@ -11,6 +12,7 @@ lbl_803ECF48: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A92E0 lbl_805A92E0: @@ -917,6 +919,7 @@ lbl_802EC684: /* 802EC700 002E9660 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6DD0 lbl_803D6DD0: # ROM: 0x3D3DD0 diff --git a/asm/Kyoto/Animation/CAnimSource.s b/asm/Kyoto/Animation/CAnimSource.s index 56fb3787..d4303303 100644 --- a/asm/Kyoto/Animation/CAnimSource.s +++ b/asm/Kyoto/Animation/CAnimSource.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8780 lbl_805A8780: @@ -2010,6 +2011,7 @@ lbl_802EE2D4: /* 802EE2F4 002EB254 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE370 lbl_805AE370: # ROM: 0x3FAC10 @@ -2041,6 +2043,7 @@ lbl_805AE390: .section .rodata +.balign 8 .global lbl_803D6DD8 lbl_803D6DD8: # ROM: 0x3D3DD8 diff --git a/asm/Kyoto/Animation/CAnimSourceReader.s b/asm/Kyoto/Animation/CAnimSourceReader.s index 3acbb1f7..c07d302c 100644 --- a/asm/Kyoto/Animation/CAnimSourceReader.s +++ b/asm/Kyoto/Animation/CAnimSourceReader.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECF58 lbl_803ECF58: @@ -59,6 +60,7 @@ lbl_803ECFE4: .4byte sub_802ee0a0 .section .sdata +.balign 8 .global lbl_805A8788 lbl_805A8788: @@ -1582,6 +1584,7 @@ GetAnimationDuration__15CAnimSourceInfoCFv: /* 802EF8AC 002EC80C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE398 lbl_805AE398: # ROM: 0x3FAC38 @@ -1590,6 +1593,7 @@ lbl_805AE398: .section .rodata +.balign 8 .global lbl_803D6DE0 lbl_803D6DE0: # ROM: 0x3D3DE0 diff --git a/asm/Kyoto/Animation/CAnimSourceReaderBase.s b/asm/Kyoto/Animation/CAnimSourceReaderBase.s index f6d304b2..10b1dd9e 100644 --- a/asm/Kyoto/Animation/CAnimSourceReaderBase.s +++ b/asm/Kyoto/Animation/CAnimSourceReaderBase.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED008 lbl_803ED008: @@ -31,6 +32,7 @@ lbl_803ED008: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8790 lbl_805A8790: @@ -2342,6 +2344,7 @@ lbl_802F1824: /* 802F1834 002EE794 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6DE8 lbl_803D6DE8: # ROM: 0x3D3DE8 diff --git a/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s b/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s index d1395cd7..4303e868 100644 --- a/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s +++ b/asm/Kyoto/Animation/CAnimTreeAnimReaderContainer.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED068 lbl_803ED068: @@ -512,6 +513,7 @@ VAdvanceView__28CAnimTreeAnimReaderContainerFRC13CCharAnimTime: /* 802F1E58 002EEDB8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE3A0 lbl_805AE3A0: # ROM: 0x3FAC40 @@ -520,6 +522,7 @@ lbl_805AE3A0: .section .rodata +.balign 8 .global lbl_803D6DF0 lbl_803D6DF0: # ROM: 0x3D3DF0 diff --git a/asm/Kyoto/Animation/CAnimTreeBlend.s b/asm/Kyoto/Animation/CAnimTreeBlend.s index 91ab6da2..13ef32c7 100644 --- a/asm/Kyoto/Animation/CAnimTreeBlend.s +++ b/asm/Kyoto/Animation/CAnimTreeBlend.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED0D8 lbl_803ED0D8: @@ -620,6 +621,7 @@ lbl_802F269C: /* 802F26B4 002EF614 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE3A8 lbl_805AE3A8: # ROM: 0x3FAC48 @@ -632,6 +634,7 @@ lbl_805AE3AC: .section .rodata +.balign 8 .global lbl_803D6DF8 lbl_803D6DF8: # ROM: 0x3D3DF8 diff --git a/asm/Kyoto/Animation/CAnimTreeDoubleChild.s b/asm/Kyoto/Animation/CAnimTreeDoubleChild.s index c7241437..e5962245 100644 --- a/asm/Kyoto/Animation/CAnimTreeDoubleChild.s +++ b/asm/Kyoto/Animation/CAnimTreeDoubleChild.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED158 lbl_803ED158: @@ -37,6 +38,7 @@ lbl_803ED158: .4byte 0 .section .sdata +.balign 8 .global lbl_805A87A8 lbl_805A87A8: @@ -1465,6 +1467,7 @@ lbl_802F3AF8: /* 802F3BEC 002F0B4C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE3B0 lbl_805AE3B0: # ROM: 0x3FAC50 diff --git a/asm/Kyoto/Animation/CAnimTreeLoopIn.s b/asm/Kyoto/Animation/CAnimTreeLoopIn.s index c301d946..fb2dc46d 100644 --- a/asm/Kyoto/Animation/CAnimTreeLoopIn.s +++ b/asm/Kyoto/Animation/CAnimTreeLoopIn.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECBE0 lbl_803ECBE0: @@ -2573,6 +2574,7 @@ CopyNodeMinusStartTime__13CSoundPOINodeFRC13CSoundPOINodeRC13CCharAnimTime: /* 802DAB30 002D7A90 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE2B8 lbl_805AE2B8: # ROM: 0x3FAB58 @@ -2585,6 +2587,7 @@ lbl_805AE2BC: .section .rodata +.balign 8 .global lbl_803D6D38 lbl_803D6D38: # ROM: 0x3D3D38 diff --git a/asm/Kyoto/Animation/CAnimTreeNode.s b/asm/Kyoto/Animation/CAnimTreeNode.s index 484bf821..5ccfca51 100644 --- a/asm/Kyoto/Animation/CAnimTreeNode.s +++ b/asm/Kyoto/Animation/CAnimTreeNode.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED1D0 lbl_803ED1D0: @@ -124,6 +125,7 @@ lbl_802F3CB8: /* 802F3D18 002F0C78 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6E00 lbl_803D6E00: # ROM: 0x3D3E00 diff --git a/asm/Kyoto/Animation/CAnimTreeSequence.s b/asm/Kyoto/Animation/CAnimTreeSequence.s index 60a5e814..ea08a7de 100644 --- a/asm/Kyoto/Animation/CAnimTreeSequence.s +++ b/asm/Kyoto/Animation/CAnimTreeSequence.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECC58 lbl_803ECC58: @@ -37,6 +38,7 @@ lbl_803ECC58: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8700 lbl_805A8700: @@ -3229,6 +3231,7 @@ lbl_802DD870: /* 802DD898 002DA7F8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE2C0 lbl_805AE2C0: # ROM: 0x3FAB60 @@ -3237,6 +3240,7 @@ lbl_805AE2C0: .section .rodata +.balign 8 .global lbl_803D6D40 lbl_803D6D40: # ROM: 0x3D3D40 diff --git a/asm/Kyoto/Animation/CAnimTreeSingleChild.s b/asm/Kyoto/Animation/CAnimTreeSingleChild.s index 3879053c..17690154 100644 --- a/asm/Kyoto/Animation/CAnimTreeSingleChild.s +++ b/asm/Kyoto/Animation/CAnimTreeSingleChild.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED240 lbl_803ED240: diff --git a/asm/Kyoto/Animation/CAnimTreeTimeScale.s b/asm/Kyoto/Animation/CAnimTreeTimeScale.s index 484cc014..0fa8f83c 100644 --- a/asm/Kyoto/Animation/CAnimTreeTimeScale.s +++ b/asm/Kyoto/Animation/CAnimTreeTimeScale.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED2B0 lbl_803ED2B0: @@ -35,6 +36,7 @@ lbl_803ED2B0: .4byte "VGetWeightedReaders__20CAnimTreeSingleChildFfRQ24rstl48reserved_vector>" .section .sdata +.balign 8 .global lbl_805A87B8 lbl_805A87B8: @@ -1767,6 +1769,7 @@ lbl_802F5954: /* 802F59A4 002F2904 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE3C0 lbl_805AE3C0: # ROM: 0x3FAC60 @@ -1775,6 +1778,7 @@ lbl_805AE3C0: .section .rodata +.balign 8 .global lbl_803D6E08 lbl_803D6E08: # ROM: 0x3D3E08 diff --git a/asm/Kyoto/Animation/CAnimTreeTransition.s b/asm/Kyoto/Animation/CAnimTreeTransition.s index 67e106c0..43ce3484 100644 --- a/asm/Kyoto/Animation/CAnimTreeTransition.s +++ b/asm/Kyoto/Animation/CAnimTreeTransition.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED320 lbl_803ED320: @@ -39,6 +40,7 @@ lbl_803ED320: .4byte VGetBlendingWeight__19CAnimTreeTransitionCFv .section .sdata +.balign 8 .global lbl_805A87C8 lbl_805A87C8: @@ -1171,6 +1173,7 @@ lbl_802F685C: /* 802F69D0 002F3930 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE3C8 lbl_805AE3C8: # ROM: 0x3FAC68 @@ -1203,6 +1206,7 @@ lbl_805AE3DC: .section .rodata +.balign 8 .global lbl_803D6E10 lbl_803D6E10: # ROM: 0x3D3E10 diff --git a/asm/Kyoto/Animation/CAnimTreeTweenBase.s b/asm/Kyoto/Animation/CAnimTreeTweenBase.s index 32774e1e..ee0a8291 100644 --- a/asm/Kyoto/Animation/CAnimTreeTweenBase.s +++ b/asm/Kyoto/Animation/CAnimTreeTweenBase.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED3A0 lbl_803ED3A0: @@ -39,6 +40,7 @@ lbl_803ED3A0: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9300 lbl_805A9300: @@ -1232,6 +1234,7 @@ lbl_802F7A0C: /* 802F7AB0 002F4A10 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE3E0 lbl_805AE3E0: # ROM: 0x3FAC80 @@ -1251,6 +1254,7 @@ lbl_805AE3F0: .section .rodata +.balign 8 .global lbl_803D6E20 lbl_803D6E20: # ROM: 0x3D3E20 diff --git a/asm/Kyoto/Animation/CAnimationSet.s b/asm/Kyoto/Animation/CAnimationSet.s index 6b7fd871..362606a2 100644 --- a/asm/Kyoto/Animation/CAnimationSet.s +++ b/asm/Kyoto/Animation/CAnimationSet.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9250 lbl_805A9250: @@ -1336,6 +1337,7 @@ lbl_802D809C: .section .sdata2, "a" +.balign 8 .global lbl_805AE2B0 lbl_805AE2B0: # ROM: 0x3FAB50 @@ -1344,6 +1346,7 @@ lbl_805AE2B0: .section .rodata +.balign 8 .global lbl_803D6D28 lbl_803D6D28: # ROM: 0x3D3D28 diff --git a/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s b/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s index 46bd70af..f2e0769b 100644 --- a/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s +++ b/asm/Kyoto/Animation/CCharAnimMemoryMetrics.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9318 lbl_805A9318: diff --git a/asm/Kyoto/Animation/CCharAnimTime.s b/asm/Kyoto/Animation/CCharAnimTime.s index 0ca2ec67..4e49726e 100644 --- a/asm/Kyoto/Animation/CCharAnimTime.s +++ b/asm/Kyoto/Animation/CCharAnimTime.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8938 lbl_805A8938: @@ -897,6 +898,7 @@ __ct__13CCharAnimTimeFR12CInputStream: /* 80348E60 00345DC0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE940 lbl_805AE940: # ROM: 0x3FB1E0 diff --git a/asm/Kyoto/Animation/CCharLayoutInfo.s b/asm/Kyoto/Animation/CCharLayoutInfo.s index d3cec039..a3ae82d6 100644 --- a/asm/Kyoto/Animation/CCharLayoutInfo.s +++ b/asm/Kyoto/Animation/CCharLayoutInfo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED420 lbl_803ED420: @@ -11,6 +12,7 @@ lbl_803ED420: .4byte 0 .section .sdata +.balign 8 .global lbl_805A87D0 lbl_805A87D0: @@ -38,6 +40,7 @@ lbl_805A87D4: .4byte 0x01000000 .section .sbss, "wa" +.balign 8 .global lbl_805A9320 lbl_805A9320: @@ -1302,6 +1305,7 @@ lbl_802F8D28: /* 802F8D48 002F5CA8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6E28 lbl_803D6E28: # ROM: 0x3D3E28 diff --git a/asm/Kyoto/Animation/CCharacterInfo.s b/asm/Kyoto/Animation/CCharacterInfo.s index 53c1901a..1341e81d 100644 --- a/asm/Kyoto/Animation/CCharacterInfo.s +++ b/asm/Kyoto/Animation/CCharacterInfo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8708 lbl_805A8708: @@ -19,6 +20,7 @@ lbl_805A870A: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9270 lbl_805A9270: @@ -2160,6 +2162,7 @@ lbl_802DF4C0: /* 802DF4D0 002DC430 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D48 lbl_803D6D48: # ROM: 0x3D3D48 diff --git a/asm/Kyoto/Animation/CCharacterSet.s b/asm/Kyoto/Animation/CCharacterSet.s index cdc2485e..6ebd6ff0 100644 --- a/asm/Kyoto/Animation/CCharacterSet.s +++ b/asm/Kyoto/Animation/CCharacterSet.s @@ -310,6 +310,7 @@ lbl_802DF8BC: /* 802DF8E4 002DC844 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D50 lbl_803D6D50: # ROM: 0x3D3D50 diff --git a/asm/Kyoto/Animation/CFBStreamedAnimReader.s b/asm/Kyoto/Animation/CFBStreamedAnimReader.s index f4391e1f..7d390842 100644 --- a/asm/Kyoto/Animation/CFBStreamedAnimReader.s +++ b/asm/Kyoto/Animation/CFBStreamedAnimReader.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED430 @@ -46,6 +47,7 @@ lbl_803ED494: .4byte "__dt__41TAnimSourceInfo<22CFBStreamedCompression>Fv" .section .sdata +.balign 8 .global lbl_805A87D8 lbl_805A87D8: @@ -3241,6 +3243,7 @@ lbl_802FB870: /* 802FB920 002F8880 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE3F8 lbl_805AE3F8: # ROM: 0x3FAC98 @@ -3274,6 +3277,7 @@ lbl_805AE410: .section .rodata +.balign 8 .global lbl_803D6E30 lbl_803D6E30: # ROM: 0x3D3E30 diff --git a/asm/Kyoto/Animation/CFBStreamedCompression.s b/asm/Kyoto/Animation/CFBStreamedCompression.s index afc78ac3..0d8385ad 100644 --- a/asm/Kyoto/Animation/CFBStreamedCompression.s +++ b/asm/Kyoto/Animation/CFBStreamedCompression.s @@ -760,6 +760,7 @@ __ct__26CStandardMultiFormatHeaderFR12CInputStream: /* 802FC354 002F92B4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE418 lbl_805AE418: # ROM: 0x3FACB8 @@ -784,6 +785,7 @@ lbl_805AE428: .section .rodata +.balign 8 .global lbl_803D6E38 lbl_803D6E38: # ROM: 0x3D3E38 diff --git a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s index 49cb953b..9359ee2c 100644 --- a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s +++ b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A87F0 lbl_805A87F0: @@ -821,6 +822,7 @@ lbl_802FCE7C: /* 802FCEA4 002F9E04 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE430 lbl_805AE430: # ROM: 0x3FACD0 @@ -833,6 +835,7 @@ lbl_805AE434: .section .rodata +.balign 8 .global lbl_803D6E40 lbl_803D6E40: # ROM: 0x3D3E40 diff --git a/asm/Kyoto/Animation/CMetaAnimBlend.s b/asm/Kyoto/Animation/CMetaAnimBlend.s index c8f09fab..b369ba71 100644 --- a/asm/Kyoto/Animation/CMetaAnimBlend.s +++ b/asm/Kyoto/Animation/CMetaAnimBlend.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECCD0 lbl_803ECCD0: @@ -497,6 +498,7 @@ __ct__14CMetaAnimBlendFR12CInputStream: /* 802DFFD8 002DCF38 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D58 lbl_803D6D58: # ROM: 0x3D3D58 diff --git a/asm/Kyoto/Animation/CMetaAnimFactory.s b/asm/Kyoto/Animation/CMetaAnimFactory.s index 443245aa..4d28a682 100644 --- a/asm/Kyoto/Animation/CMetaAnimFactory.s +++ b/asm/Kyoto/Animation/CMetaAnimFactory.s @@ -177,6 +177,7 @@ lbl_802E0224: /* 802E023C 002DD19C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D60 lbl_803D6D60: # ROM: 0x3D3D60 diff --git a/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s b/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s index 349d3d4b..c398a35d 100644 --- a/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s +++ b/asm/Kyoto/Animation/CMetaAnimPhaseBlend.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECCF0 lbl_803ECCF0: @@ -27,6 +28,7 @@ lbl_803ECD10: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8710 lbl_805A8710: @@ -581,13 +583,20 @@ __ct__19CMetaAnimPhaseBlendFR12CInputStream: /* 802E09E4 002DD944 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE2C8 lbl_805AE2C8: # ROM: 0x3FAB68 .float -1.0 +.global lbl_805AE2CC +lbl_805AE2CC: + # ROM: 0x3FAB6C + .4byte 0 + .section .rodata +.balign 8 .global lbl_803D6D68 lbl_803D6D68: # ROM: 0x3D3D68 diff --git a/asm/Kyoto/Animation/CMetaAnimPlay.s b/asm/Kyoto/Animation/CMetaAnimPlay.s index 708686fc..22320533 100644 --- a/asm/Kyoto/Animation/CMetaAnimPlay.s +++ b/asm/Kyoto/Animation/CMetaAnimPlay.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECD30 lbl_803ECD30: @@ -15,6 +16,7 @@ lbl_803ECD30: .4byte VGetAnimationTree__13CMetaAnimPlayCFRC15CAnimSysContextRC24CMetaAnimTreeBuildOrders .section .sdata +.balign 8 .global lbl_805A8720 lbl_805A8720: @@ -411,6 +413,7 @@ lbl_802E0F1C: /* 802E0F2C 002DDE8C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D70 lbl_803D6D70: # ROM: 0x3D3D70 diff --git a/asm/Kyoto/Animation/CMetaAnimRandom.s b/asm/Kyoto/Animation/CMetaAnimRandom.s index c09ae3c8..d9806116 100644 --- a/asm/Kyoto/Animation/CMetaAnimRandom.s +++ b/asm/Kyoto/Animation/CMetaAnimRandom.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECD50 lbl_803ECD50: @@ -549,6 +550,7 @@ lbl_802E165C: /* 802E166C 002DE5CC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D78 lbl_803D6D78: # ROM: 0x3D3D78 diff --git a/asm/Kyoto/Animation/CMetaAnimSequence.s b/asm/Kyoto/Animation/CMetaAnimSequence.s index d623e5c6..9076a703 100644 --- a/asm/Kyoto/Animation/CMetaAnimSequence.s +++ b/asm/Kyoto/Animation/CMetaAnimSequence.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECD70 lbl_803ECD70: @@ -565,6 +566,7 @@ lbl_802E1DCC: /* 802E1DE8 002DED48 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D80 lbl_803D6D80: # ROM: 0x3D3D80 diff --git a/asm/Kyoto/Animation/CMetaTransFactory.s b/asm/Kyoto/Animation/CMetaTransFactory.s index cfb2ed29..686ce069 100644 --- a/asm/Kyoto/Animation/CMetaTransFactory.s +++ b/asm/Kyoto/Animation/CMetaTransFactory.s @@ -145,6 +145,7 @@ lbl_802E1FC0: /* 802E1FD8 002DEF38 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D88 lbl_803D6D88: # ROM: 0x3D3D88 diff --git a/asm/Kyoto/Animation/CMetaTransMetaAnim.s b/asm/Kyoto/Animation/CMetaTransMetaAnim.s index ec1eb61c..1fe99ff2 100644 --- a/asm/Kyoto/Animation/CMetaTransMetaAnim.s +++ b/asm/Kyoto/Animation/CMetaTransMetaAnim.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECD90 lbl_803ECD90: @@ -180,6 +181,7 @@ __ct__18CMetaTransMetaAnimFR12CInputStream: /* 802E2218 002DF178 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6D90 lbl_803D6D90: # ROM: 0x3D3D90 diff --git a/asm/Kyoto/Animation/CMetaTransPhaseTrans.s b/asm/Kyoto/Animation/CMetaTransPhaseTrans.s index e91e99d2..b3201521 100644 --- a/asm/Kyoto/Animation/CMetaTransPhaseTrans.s +++ b/asm/Kyoto/Animation/CMetaTransPhaseTrans.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECDA8 lbl_803ECDA8: @@ -13,6 +14,7 @@ lbl_803ECDA8: .4byte WriteTransData__20CMetaTransPhaseTransCFR13COutputStream .section .sdata +.balign 8 .global lbl_805A8728 lbl_805A8728: @@ -652,10 +654,7 @@ __ct__20CMetaTransPhaseTransFR12CInputStream: /* 802E2B08 002DFA68 4E 80 00 20 */ blr .section .sdata2, "a" -.global lbl_805AE2CC -lbl_805AE2CC: - # ROM: 0x3FAB6C - .4byte 0 +.balign 8 .global lbl_805AE2D0 lbl_805AE2D0: @@ -669,6 +668,7 @@ lbl_805AE2D4: .section .rodata +.balign 8 .global lbl_803D6D98 lbl_803D6D98: # ROM: 0x3D3D98 diff --git a/asm/Kyoto/Animation/CMetaTransSnap.s b/asm/Kyoto/Animation/CMetaTransSnap.s index 14996a99..ef6064f5 100644 --- a/asm/Kyoto/Animation/CMetaTransSnap.s +++ b/asm/Kyoto/Animation/CMetaTransSnap.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECDC0 lbl_803ECDC0: diff --git a/asm/Kyoto/Animation/CMetaTransTrans.s b/asm/Kyoto/Animation/CMetaTransTrans.s index 00f5cfb4..c1e49e66 100644 --- a/asm/Kyoto/Animation/CMetaTransTrans.s +++ b/asm/Kyoto/Animation/CMetaTransTrans.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECDD8 lbl_803ECDD8: @@ -215,6 +216,7 @@ __ct__15CMetaTransTransFR12CInputStream: /* 802E2E54 002DFDB4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6DA0 lbl_803D6DA0: # ROM: 0x3D3DA0 diff --git a/asm/Kyoto/Animation/CPASAnimState.s b/asm/Kyoto/Animation/CPASAnimState.s index 646d9580..598f8bbe 100644 --- a/asm/Kyoto/Animation/CPASAnimState.s +++ b/asm/Kyoto/Animation/CPASAnimState.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8738 lbl_805A8738: @@ -1930,6 +1931,7 @@ lbl_802E492C: /* 802E4A9C 002E19FC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE2D8 lbl_805AE2D8: # ROM: 0x3FAB78 @@ -1969,6 +1971,7 @@ lbl_805AE2F8: .section .rodata +.balign 8 .global lbl_803D6DA8 lbl_803D6DA8: # ROM: 0x3D3DA8 diff --git a/asm/Kyoto/Animation/CPASDatabase.s b/asm/Kyoto/Animation/CPASDatabase.s index 81c6bdef..ccf2e2a9 100644 --- a/asm/Kyoto/Animation/CPASDatabase.s +++ b/asm/Kyoto/Animation/CPASDatabase.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8740 lbl_805A8740: @@ -963,6 +964,7 @@ lbl_802E55CC: /* 802E574C 002E26AC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6DB0 lbl_803D6DB0: # ROM: 0x3D3DB0 diff --git a/asm/Kyoto/Animation/CPASParmInfo.s b/asm/Kyoto/Animation/CPASParmInfo.s index 16ee6a25..3c264075 100644 --- a/asm/Kyoto/Animation/CPASParmInfo.s +++ b/asm/Kyoto/Animation/CPASParmInfo.s @@ -134,6 +134,7 @@ PutTo__10CPrimitiveCFR13COutputStream: /* 802E5924 002E2884 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE300 lbl_805AE300: # ROM: 0x3FABA0 diff --git a/asm/Kyoto/Animation/CPoseAsTransforms.s b/asm/Kyoto/Animation/CPoseAsTransforms.s index 89715d9a..33712821 100644 --- a/asm/Kyoto/Animation/CPoseAsTransforms.s +++ b/asm/Kyoto/Animation/CPoseAsTransforms.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8A58 lbl_805A8A58: @@ -316,6 +317,7 @@ lbl_80369238: /* 8036924C 003661AC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8538 lbl_803D8538: # ROM: 0x3D5538 diff --git a/asm/Kyoto/Animation/CSegStatementSet.s b/asm/Kyoto/Animation/CSegStatementSet.s index 4cfca06b..12013c11 100644 --- a/asm/Kyoto/Animation/CSegStatementSet.s +++ b/asm/Kyoto/Animation/CSegStatementSet.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED4B8 lbl_803ED4B8: @@ -17,6 +18,7 @@ lbl_803ED4C4: .4byte 0 .section .sdata +.balign 8 .global lbl_805A87F8 lbl_805A87F8: @@ -329,6 +331,7 @@ lbl_802FD6CC: /* 802FD6D8 002FA638 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6E48 lbl_803D6E48: # ROM: 0x3D3E48 diff --git a/asm/Kyoto/Animation/CSequenceHelper.s b/asm/Kyoto/Animation/CSequenceHelper.s index 87c44966..f8c56c36 100644 --- a/asm/Kyoto/Animation/CSequenceHelper.s +++ b/asm/Kyoto/Animation/CSequenceHelper.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8750 lbl_805A8750: @@ -1447,6 +1448,7 @@ lbl_802E6E10: /* 802E6E20 002E3D80 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE308 lbl_805AE308: # ROM: 0x3FABA8 @@ -1465,6 +1467,7 @@ lbl_805AE310: .section .rodata +.balign 8 .global lbl_803D6DB8 lbl_803D6DB8: # ROM: 0x3D3DB8 diff --git a/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s b/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s index fa62fe41..ca6c421e 100644 --- a/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s +++ b/asm/Kyoto/Animation/CSkinnedModelWithAvgNormals.s @@ -647,6 +647,7 @@ lbl_80358230: /* 80358258 003551B8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE9F8 lbl_805AE9F8: # ROM: 0x3FB298 @@ -659,6 +660,7 @@ lbl_805AE9FC: .section .rodata +.balign 8 .global lbl_803D8330 lbl_803D8330: # ROM: 0x3D5330 diff --git a/asm/Kyoto/Animation/CTimeScaleFunctions.s b/asm/Kyoto/Animation/CTimeScaleFunctions.s index 8e6c95d3..63ad6693 100644 --- a/asm/Kyoto/Animation/CTimeScaleFunctions.s +++ b/asm/Kyoto/Animation/CTimeScaleFunctions.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED4D0 lbl_803ED4D0: @@ -430,6 +431,7 @@ GetType__27CConstantAnimationTimeScaleCFv: /* 802FDC78 002FABD8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE438 lbl_805AE438: # ROM: 0x3FACD8 @@ -453,6 +455,7 @@ lbl_805AE448: .section .rodata +.balign 8 .global lbl_803D6E50 lbl_803D6E50: # ROM: 0x3D3E50 diff --git a/asm/Kyoto/Animation/CVertexMorphEffect.s b/asm/Kyoto/Animation/CVertexMorphEffect.s index 60f53657..f072d2b5 100644 --- a/asm/Kyoto/Animation/CVertexMorphEffect.s +++ b/asm/Kyoto/Animation/CVertexMorphEffect.s @@ -337,6 +337,7 @@ lbl_80357994: /* 803579A0 00354900 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE9E0 lbl_805AE9E0: # ROM: 0x3FB280 @@ -360,6 +361,7 @@ lbl_805AE9F0: .section .rodata +.balign 8 .global lbl_803D8328 lbl_803D8328: # ROM: 0x3D5328 diff --git a/asm/Kyoto/Animation/DolphinCSkinRules.s b/asm/Kyoto/Animation/DolphinCSkinRules.s index 66d3a86c..cb29499d 100644 --- a/asm/Kyoto/Animation/DolphinCSkinRules.s +++ b/asm/Kyoto/Animation/DolphinCSkinRules.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A89C0 lbl_805A89C0: @@ -23,6 +24,7 @@ lbl_805A89CC: .4byte 0x00000150 .section .data +.balign 8 .global lbl_803EF728 lbl_803EF728: @@ -33,6 +35,7 @@ lbl_803EF728: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9608 lbl_805A9608: @@ -1117,6 +1120,7 @@ lbl_803546F0: /* 80354708 00351668 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8300 lbl_803D8300: # ROM: 0x3D5300 diff --git a/asm/Kyoto/Animation/DolphinCSkinnedModel.s b/asm/Kyoto/Animation/DolphinCSkinnedModel.s index bae3514a..71bae3d8 100644 --- a/asm/Kyoto/Animation/DolphinCSkinnedModel.s +++ b/asm/Kyoto/Animation/DolphinCSkinnedModel.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_DolphinCSkinnedModel_cpp .section .data +.balign 8 .global lbl_803EF718 lbl_803EF718: @@ -15,6 +16,7 @@ lbl_803EF718: .4byte 0 .section .bss +.balign 8 .global lbl_804BFFC0 lbl_804BFFC0: @@ -25,8 +27,12 @@ lbl_8053FFCC: .global lbl_8053FFF4 lbl_8053FFF4: .skip 0x10 +.global lbl_80540004 +lbl_80540004: + .skip 0xC .section .sbss, "wa" +.balign 8 .global lbl_805A95F0 lbl_805A95F0: @@ -1392,6 +1398,7 @@ lbl_803538D8: /* 803538F0 00350850 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D82F8 lbl_803D82F8: # ROM: 0x3D52F8 diff --git a/asm/Kyoto/Animation/DolphinCVirtualBone.s b/asm/Kyoto/Animation/DolphinCVirtualBone.s index ccb36f93..1ed17f0d 100644 --- a/asm/Kyoto/Animation/DolphinCVirtualBone.s +++ b/asm/Kyoto/Animation/DolphinCVirtualBone.s @@ -732,6 +732,7 @@ lbl_80355104: /* 8035511C 0035207C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE9C0 lbl_805AE9C0: # ROM: 0x3FB260 diff --git a/asm/Kyoto/Animation/IAnimReader.s b/asm/Kyoto/Animation/IAnimReader.s index f0ed92ea..3b7d27ed 100644 --- a/asm/Kyoto/Animation/IAnimReader.s +++ b/asm/Kyoto/Animation/IAnimReader.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED508 lbl_803ED508: diff --git a/asm/Kyoto/Animation/IMetaAnim.s b/asm/Kyoto/Animation/IMetaAnim.s index 891c5816..3ab0a568 100644 --- a/asm/Kyoto/Animation/IMetaAnim.s +++ b/asm/Kyoto/Animation/IMetaAnim.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ECDF0 lbl_803ECDF0: @@ -15,6 +16,7 @@ lbl_803ECDF0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8760 lbl_805A8760: diff --git a/asm/Kyoto/Audio/CDSPStreamManager.s b/asm/Kyoto/Audio/CDSPStreamManager.s index 419001c8..ff3f0124 100644 --- a/asm/Kyoto/Audio/CDSPStreamManager.s +++ b/asm/Kyoto/Audio/CDSPStreamManager.s @@ -5,12 +5,10 @@ lbl_ctor: .4byte __sinit_CDSPStreamManager_cpp .section .bss +.balign 8 #TODO: Figure out what's going on with these, they're referenced in various locations -.global lbl_80540004 -lbl_80540004: - .skip 0xC .global lbl_80540010 lbl_80540010: .skip 0x10 @@ -40,6 +38,7 @@ lbl_80540A2C: .skip 0x14 .section .sbss, "wa" +.balign 8 .global lbl_805A9678 lbl_805A9678: @@ -1920,6 +1919,7 @@ lbl_80364F3C: /* 80364F50 00361EB0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8400 lbl_803D8400: # ROM: 0x3D5400 diff --git a/asm/Kyoto/Audio/CMidiManager.s b/asm/Kyoto/Audio/CMidiManager.s index be953de9..e3ea1b57 100644 --- a/asm/Kyoto/Audio/CMidiManager.s +++ b/asm/Kyoto/Audio/CMidiManager.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMidiManager_cpp .section .data +.balign 8 .global lbl_803EF788 lbl_803EF788: @@ -685,6 +686,7 @@ lbl_80359424: /* 80359438 00356398 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8340 lbl_803D8340: # ROM: 0x3D5340 diff --git a/asm/Kyoto/Audio/CSfxHandle.s b/asm/Kyoto/Audio/CSfxHandle.s index b5a0e4ee..a162af22 100644 --- a/asm/Kyoto/Audio/CSfxHandle.s +++ b/asm/Kyoto/Audio/CSfxHandle.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A92B8 lbl_805A92B8: @@ -19,6 +20,7 @@ __ct__10CSfxHandleFUi: /* 802E7884 002E47E4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE318 lbl_805AE318: # ROM: 0x3FABB8 diff --git a/asm/Kyoto/Audio/CSfxManager.s b/asm/Kyoto/Audio/CSfxManager.s index 4464e93c..3ae4ae28 100644 --- a/asm/Kyoto/Audio/CSfxManager.s +++ b/asm/Kyoto/Audio/CSfxManager.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CSfxManager_cpp .section .data +.balign 8 .global lbl_803ECE10 lbl_803ECE10: @@ -101,6 +102,7 @@ lbl_803ECEE4: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8768 lbl_805A8768: @@ -133,12 +135,14 @@ lbl_805A877C: .4byte 0 .section .bss +.balign 8 .global lbl_80479BA0 lbl_80479BA0: .skip 0x30 .section .sbss, "wa" +.balign 8 .global lbl_805A92C0 lbl_805A92C0: @@ -4586,6 +4590,7 @@ __ct__Q211CSfxManager11CSfxChannelFv: /* 802EB4F8 002E8458 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE320 lbl_805AE320: # ROM: 0x3FABC0 @@ -4638,6 +4643,7 @@ lbl_805AE344: .section .rodata +.balign 8 .global lbl_803D6DC8 lbl_803D6DC8: # ROM: 0x3D3DC8 diff --git a/asm/Kyoto/Audio/CStaticAudioPlayer.s b/asm/Kyoto/Audio/CStaticAudioPlayer.s index a287b4b5..b01f9a2e 100644 --- a/asm/Kyoto/Audio/CStaticAudioPlayer.s +++ b/asm/Kyoto/Audio/CStaticAudioPlayer.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CStaticAudioPlayer_cpp .section .sbss, "wa" +.balign 8 .global lbl_805A96A0 lbl_805A96A0: @@ -1057,6 +1058,7 @@ lbl_8036CA4C: /* 8036CA60 003699C0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8560 lbl_803D8560: # ROM: 0x3D5560 diff --git a/asm/Kyoto/Audio/CStreamAudioManager.s b/asm/Kyoto/Audio/CStreamAudioManager.s index e5c0ef67..dbf311c5 100644 --- a/asm/Kyoto/Audio/CStreamAudioManager.s +++ b/asm/Kyoto/Audio/CStreamAudioManager.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CStreamAudioManager_cpp .section .sdata +.balign 8 .global lbl_805A8A30 lbl_805A8A30: @@ -38,6 +39,7 @@ lbl_805A8A41: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9680 lbl_805A9680: @@ -1448,6 +1450,7 @@ sub_80366710: /* 80366744 003636A4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEAD0 lbl_805AEAD0: # ROM: 0x3FB370 @@ -1491,6 +1494,7 @@ lbl_805AEAF4: .section .rodata +.balign 8 .global lbl_803D8410 lbl_803D8410: # ROM: 0x3D5410 diff --git a/asm/Kyoto/Audio/DolphinCAudioGroupSet.s b/asm/Kyoto/Audio/DolphinCAudioGroupSet.s index 13a3ab4e..9ae4460b 100644 --- a/asm/Kyoto/Audio/DolphinCAudioGroupSet.s +++ b/asm/Kyoto/Audio/DolphinCAudioGroupSet.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF670 lbl_803EF670: @@ -553,6 +554,7 @@ lbl_8034A784: /* 8034A7A0 00347700 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8108 lbl_803D8108: # ROM: 0x3D5108 diff --git a/asm/Kyoto/Audio/DolphinCAudioSys.s b/asm/Kyoto/Audio/DolphinCAudioSys.s index c59e9a4c..98af14d0 100644 --- a/asm/Kyoto/Audio/DolphinCAudioSys.s +++ b/asm/Kyoto/Audio/DolphinCAudioSys.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_DolphinCAudioSys_cpp .section .sdata +.balign 8 .global lbl_805A8998 lbl_805A8998: @@ -72,12 +73,14 @@ lbl_805A89A7: .byte 0x01 .section .bss +.balign 8 .global lbl_804BFF90 lbl_804BFF90: .skip 0x10 .section .sbss, "wa" +.balign 8 .global lbl_805A9590 lbl_805A9590: @@ -3466,6 +3469,7 @@ __sinit_DolphinCAudioSys_cpp: /* 8034D4D8 0034A438 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE960 lbl_805AE960: # ROM: 0x3FB200 @@ -3489,6 +3493,7 @@ lbl_805AE968: .section .rodata +.balign 8 .global lbl_803D8210 lbl_803D8210: # ROM: 0x3D5210 diff --git a/asm/Kyoto/Audio/SDSPStream.s b/asm/Kyoto/Audio/SDSPStream.s index 077b909f..9d8a9ca4 100644 --- a/asm/Kyoto/Audio/SDSPStream.s +++ b/asm/Kyoto/Audio/SDSPStream.s @@ -1218,6 +1218,7 @@ OpenFiles__10SDSPStreamFPCc: /* 8036B2B4 00368214 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8558 lbl_803D8558: # ROM: 0x3D5558 diff --git a/asm/Kyoto/Audio/g721.s b/asm/Kyoto/Audio/g721.s index 3a659c22..ae2e7d6f 100644 --- a/asm/Kyoto/Audio/g721.s +++ b/asm/Kyoto/Audio/g721.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF840 lbl_803EF840: diff --git a/asm/Kyoto/Basics/CBasics.s b/asm/Kyoto/Basics/CBasics.s index 813a1e3c..5a7b59b0 100644 --- a/asm/Kyoto/Basics/CBasics.s +++ b/asm/Kyoto/Basics/CBasics.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_804795A0 lbl_804795A0: diff --git a/asm/Kyoto/Basics/CBasicsDolphin.s b/asm/Kyoto/Basics/CBasicsDolphin.s index 098ada40..4ab77771 100644 --- a/asm/Kyoto/Basics/CBasicsDolphin.s +++ b/asm/Kyoto/Basics/CBasicsDolphin.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9240 lbl_805A9240: diff --git a/asm/Kyoto/Basics/CCallStackDolphin.s b/asm/Kyoto/Basics/CCallStackDolphin.s index f9c77f94..b9e5925b 100644 --- a/asm/Kyoto/Basics/CCallStackDolphin.s +++ b/asm/Kyoto/Basics/CCallStackDolphin.s @@ -19,6 +19,7 @@ __ct__10CCallStackFUiPCcPCc: /* 802D63DC 002D333C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6AA8 lbl_803D6AA8: # ROM: 0x3D3AA8 diff --git a/asm/Kyoto/Basics/COsContextDolphin.s b/asm/Kyoto/Basics/COsContextDolphin.s index 5d4d91d2..9cad0986 100644 --- a/asm/Kyoto/Basics/COsContextDolphin.s +++ b/asm/Kyoto/Basics/COsContextDolphin.s @@ -243,6 +243,7 @@ lbl_802D6704: /* 802D6718 002D3678 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE288 lbl_805AE288: # ROM: 0x3FAB28 diff --git a/asm/Kyoto/Basics/CSWDataDolphin.s b/asm/Kyoto/Basics/CSWDataDolphin.s index 48d54c4d..c2705bf7 100644 --- a/asm/Kyoto/Basics/CSWDataDolphin.s +++ b/asm/Kyoto/Basics/CSWDataDolphin.s @@ -78,6 +78,7 @@ lbl_802D67EC: /* 802D6828 002D3788 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE290 lbl_805AE290: # ROM: 0x3FAB30 diff --git a/asm/Kyoto/Basics/CStopwatch.s b/asm/Kyoto/Basics/CStopwatch.s index 562024f5..f0989b86 100644 --- a/asm/Kyoto/Basics/CStopwatch.s +++ b/asm/Kyoto/Basics/CStopwatch.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CStopwatch_cpp .section .sbss, "wa" +.balign 8 .global lbl_805A9238 lbl_805A9238: @@ -91,6 +92,7 @@ __sinit_CStopwatch_cpp: /* 802D6350 002D32B0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE278 lbl_805AE278: # ROM: 0x3FAB18 diff --git a/asm/Kyoto/Basics/RAssertDolphin.s b/asm/Kyoto/Basics/RAssertDolphin.s index dd1fa110..1225cd21 100644 --- a/asm/Kyoto/Basics/RAssertDolphin.s +++ b/asm/Kyoto/Basics/RAssertDolphin.s @@ -1,12 +1,14 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_804797A0 lbl_804797A0: .skip 0x400 .section .sbss, "wa" +.balign 8 .global lbl_805A9248 lbl_805A9248: @@ -385,6 +387,7 @@ lbl_802D6D70: /* 802D6D80 002D3CE0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE2A0 lbl_805AE2A0: # ROM: 0x3FAB40 @@ -403,6 +406,7 @@ lbl_805AE2A8: .section .rodata +.balign 8 .global lbl_803D6AB8 lbl_803D6AB8: # ROM: 0x3D3AB8 diff --git a/asm/Kyoto/CARAMManager.s b/asm/Kyoto/CARAMManager.s index 76af4c91..ec186e85 100644 --- a/asm/Kyoto/CARAMManager.s +++ b/asm/Kyoto/CARAMManager.s @@ -21,6 +21,7 @@ lbl_804BFF40: .skip 0x10 .section .sbss, "wa" +.balign 8 .global lbl_805A9520 lbl_805A9520: diff --git a/asm/Kyoto/CARAMToken.s b/asm/Kyoto/CARAMToken.s index 851d2c89..c2777e59 100644 --- a/asm/Kyoto/CARAMToken.s +++ b/asm/Kyoto/CARAMToken.s @@ -620,6 +620,7 @@ __ct__10CARAMTokenFv: /* 80358B60 00355AC0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8338 lbl_803D8338: # ROM: 0x3D5338 diff --git a/asm/Kyoto/CCrc32.s b/asm/Kyoto/CCrc32.s index 1717387d..786a6962 100644 --- a/asm/Kyoto/CCrc32.s +++ b/asm/Kyoto/CCrc32.s @@ -62,6 +62,7 @@ lbl_80315658: /* 8031565C 003125BC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global gkCRC32Table gkCRC32Table: # ROM: 0x3D4408 diff --git a/asm/Kyoto/CDependencyGroup.s b/asm/Kyoto/CDependencyGroup.s index 32a0fb52..d8f3616c 100644 --- a/asm/Kyoto/CDependencyGroup.s +++ b/asm/Kyoto/CDependencyGroup.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF830 lbl_803EF830: @@ -359,6 +360,7 @@ __ct__16CDependencyGroupFR12CInputStream: /* 803653F4 00362354 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8408 lbl_803D8408: # ROM: 0x3D5408 diff --git a/asm/Kyoto/CDvdRequest.s b/asm/Kyoto/CDvdRequest.s index 479abeee..053a4ed9 100644 --- a/asm/Kyoto/CDvdRequest.s +++ b/asm/Kyoto/CDvdRequest.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED578 lbl_803ED578: @@ -25,6 +26,7 @@ lbl_803ED594: .4byte GetMediaType__15CRealDvdRequestCFv .section .sbss, "wa" +.balign 8 .global lbl_805A9330 lbl_805A9330: diff --git a/asm/Kyoto/CFactoryMgr.s b/asm/Kyoto/CFactoryMgr.s index 437216b7..fba72cbb 100644 --- a/asm/Kyoto/CFactoryMgr.s +++ b/asm/Kyoto/CFactoryMgr.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8900 lbl_805A8900: @@ -32,11 +33,6 @@ lbl_805A8905: # ROM: 0x3F62A5 .byte 0x01, 0x00, 0x00 -.global lbl_805A8908 -lbl_805A8908: - # ROM: 0x3F62A8 - .4byte 0x00000002 - .section .text, "ax" .global FourCCToTypeIdx__11CFactoryMgrFUi @@ -1135,6 +1131,7 @@ lbl_80339494: /* 803394A4 00336404 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7988 lbl_803D7988: # ROM: 0x3D4988 diff --git a/asm/Kyoto/CFactoryStore.s b/asm/Kyoto/CFactoryStore.s deleted file mode 100644 index de1569ff..00000000 --- a/asm/Kyoto/CFactoryStore.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macros.inc" - -.section .data - -.global lbl_803EE3D8 -lbl_803EE3D8: - # ROM: 0x3EB3D8 - .4byte 0 - .4byte 0 - .4byte "__dt__31TObjOwnerParamFv" - -.section .text, "ax" - -.global "__dt__31TObjOwnerParamFv" -"__dt__31TObjOwnerParamFv": -/* 8033FA48 0033C9A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FA4C 0033C9AC 7C 08 02 A6 */ mflr r0 -/* 8033FA50 0033C9B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FA54 0033C9B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FA58 0033C9B8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8033FA5C 0033C9BC 41 82 00 40 */ beq lbl_8033FA9C -/* 8033FA60 0033C9C0 3C 60 80 3F */ lis r3, lbl_803EE3D8@ha -/* 8033FA64 0033C9C4 38 03 E3 D8 */ addi r0, r3, lbl_803EE3D8@l -/* 8033FA68 0033C9C8 90 1F 00 00 */ stw r0, 0(r31) -/* 8033FA6C 0033C9CC 41 82 00 20 */ beq lbl_8033FA8C -/* 8033FA70 0033C9D0 3C 60 80 3E */ lis r3, lbl_803D9C44@ha -/* 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, __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 -/* 8033FA90 0033C9F0 40 81 00 0C */ ble lbl_8033FA9C -/* 8033FA94 0033C9F4 7F E3 FB 78 */ mr r3, r31 -/* 8033FA98 0033C9F8 4B FD 5E 99 */ bl Free__7CMemoryFPCv -lbl_8033FA9C: -/* 8033FA9C 0033C9FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FAA0 0033CA00 7F E3 FB 78 */ mr r3, r31 -/* 8033FAA4 0033CA04 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FAA8 0033CA08 7C 08 03 A6 */ mtlr r0 -/* 8033FAAC 0033CA0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FAB0 0033CA10 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CFinalInput.s b/asm/Kyoto/CFinalInput.s index bd63f34f..39dc9b56 100644 --- a/asm/Kyoto/CFinalInput.s +++ b/asm/Kyoto/CFinalInput.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF660 lbl_803EF660: @@ -11,6 +12,7 @@ lbl_803EF660: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8958 lbl_805A8958: @@ -1222,6 +1224,7 @@ __ct__11CFinalInputFv: /* 80349F80 00346EE0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE948 lbl_805AE948: # ROM: 0x3FB1E8 diff --git a/asm/Kyoto/CFrameDelayedKiller.s b/asm/Kyoto/CFrameDelayedKiller.s index 9ba4057b..de0b8352 100644 --- a/asm/Kyoto/CFrameDelayedKiller.s +++ b/asm/Kyoto/CFrameDelayedKiller.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CFrameDelayedKiller_cpp .section .bss +.balign 8 .global lbl_80540A40 lbl_80540A40: @@ -14,6 +15,7 @@ lbl_80540A4C: .skip 0x34 .section .sbss, "wa" +.balign 8 .global lbl_805A96B0 lbl_805A96B0: @@ -411,6 +413,7 @@ sub_8036cf1c: .section .rodata +.balign 8 .global lbl_803D8568 lbl_803D8568: # ROM: 0x3D5568 diff --git a/asm/Kyoto/CObjectReference.s b/asm/Kyoto/CObjectReference.s deleted file mode 100644 index 449272cf..00000000 --- a/asm/Kyoto/CObjectReference.s +++ /dev/null @@ -1,378 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" - -.global IsLoading__16CObjectReferenceCFv -IsLoading__16CObjectReferenceCFv: -/* 8033FAB4 0033CA14 88 03 00 03 */ lbz r0, 3(r3) -/* 8033FAB8 0033CA18 38 80 00 00 */ li r4, 0 -/* 8033FABC 0033CA1C 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 -/* 8033FAC0 0033CA20 7C 00 FE 70 */ srawi r0, r0, 0x1f -/* 8033FAC4 0033CA24 7C 00 07 75 */ extsb. r0, r0 -/* 8033FAC8 0033CA28 41 82 00 14 */ beq lbl_8033FADC -/* 8033FACC 0033CA2C 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8033FAD0 0033CA30 28 00 00 00 */ cmplwi r0, 0 -/* 8033FAD4 0033CA34 40 82 00 08 */ bne lbl_8033FADC -/* 8033FAD8 0033CA38 38 80 00 01 */ li r4, 1 -lbl_8033FADC: -/* 8033FADC 0033CA3C 7C 83 23 78 */ mr r3, r4 -/* 8033FAE0 0033CA40 4E 80 00 20 */ blr - -.global Unlock__16CObjectReferenceFv -Unlock__16CObjectReferenceFv: -/* 8033FAE4 0033CA44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FAE8 0033CA48 7C 08 02 A6 */ mflr r0 -/* 8033FAEC 0033CA4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FAF0 0033CA50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FAF4 0033CA54 7C 7F 1B 78 */ mr r31, r3 -/* 8033FAF8 0033CA58 A8 A3 00 02 */ lha r5, 2(r3) -/* 8033FAFC 0033CA5C 54 A0 80 1E */ slwi r0, r5, 0x10 -/* 8033FB00 0033CA60 7C 04 8E 70 */ srawi r4, r0, 0x11 -/* 8033FB04 0033CA64 38 04 FF FF */ addi r0, r4, -1 -/* 8033FB08 0033CA68 50 05 0C 3C */ rlwimi r5, r0, 1, 0x10, 0x1e -/* 8033FB0C 0033CA6C B0 A3 00 02 */ sth r5, 2(r3) -/* 8033FB10 0033CA70 A8 03 00 02 */ lha r0, 2(r3) -/* 8033FB14 0033CA74 54 00 80 1E */ slwi r0, r0, 0x10 -/* 8033FB18 0033CA78 7C 00 8E 70 */ srawi r0, r0, 0x11 -/* 8033FB1C 0033CA7C 7C 00 07 35 */ extsh. r0, r0 -/* 8033FB20 0033CA80 40 82 00 3C */ bne lbl_8033FB5C -/* 8033FB24 0033CA84 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 8033FB28 0033CA88 28 00 00 00 */ cmplwi r0, 0 -/* 8033FB2C 0033CA8C 41 82 00 18 */ beq lbl_8033FB44 -/* 8033FB30 0033CA90 80 1F 00 0C */ lwz r0, 0xc(r31) -/* 8033FB34 0033CA94 28 00 00 00 */ cmplwi r0, 0 -/* 8033FB38 0033CA98 41 82 00 0C */ beq lbl_8033FB44 -/* 8033FB3C 0033CA9C 48 00 01 39 */ bl Unload__16CObjectReferenceFv -/* 8033FB40 0033CAA0 48 00 00 1C */ b lbl_8033FB5C -lbl_8033FB44: -/* 8033FB44 0033CAA4 7F E3 FB 78 */ mr r3, r31 -/* 8033FB48 0033CAA8 4B FF FF 6D */ bl IsLoading__16CObjectReferenceCFv -/* 8033FB4C 0033CAAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8033FB50 0033CAB0 41 82 00 0C */ beq lbl_8033FB5C -/* 8033FB54 0033CAB4 7F E3 FB 78 */ mr r3, r31 -/* 8033FB58 0033CAB8 48 00 00 A5 */ bl CancelLoad__16CObjectReferenceFv -lbl_8033FB5C: -/* 8033FB5C 0033CABC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FB60 0033CAC0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FB64 0033CAC4 7C 08 03 A6 */ mtlr r0 -/* 8033FB68 0033CAC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FB6C 0033CACC 4E 80 00 20 */ blr - -.global RemoveReference__16CObjectReferenceFv -RemoveReference__16CObjectReferenceFv: -/* 8033FB70 0033CAD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FB74 0033CAD4 7C 08 02 A6 */ mflr r0 -/* 8033FB78 0033CAD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FB7C 0033CADC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FB80 0033CAE0 7C 7F 1B 78 */ mr r31, r3 -/* 8033FB84 0033CAE4 A8 83 00 00 */ lha r4, 0(r3) -/* 8033FB88 0033CAE8 38 04 FF FF */ addi r0, r4, -1 -/* 8033FB8C 0033CAEC B0 03 00 00 */ sth r0, 0(r3) -/* 8033FB90 0033CAF0 A8 03 00 00 */ lha r0, 0(r3) -/* 8033FB94 0033CAF4 2C 00 00 00 */ cmpwi r0, 0 -/* 8033FB98 0033CAF8 40 82 00 4C */ bne lbl_8033FBE4 -/* 8033FB9C 0033CAFC 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 8033FBA0 0033CB00 28 00 00 00 */ cmplwi r0, 0 -/* 8033FBA4 0033CB04 41 82 00 0C */ beq lbl_8033FBB0 -/* 8033FBA8 0033CB08 48 00 00 CD */ bl Unload__16CObjectReferenceFv -/* 8033FBAC 0033CB0C 48 00 00 18 */ b lbl_8033FBC4 -lbl_8033FBB0: -/* 8033FBB0 0033CB10 4B FF FF 05 */ bl IsLoading__16CObjectReferenceCFv -/* 8033FBB4 0033CB14 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8033FBB8 0033CB18 41 82 00 0C */ beq lbl_8033FBC4 -/* 8033FBBC 0033CB1C 7F E3 FB 78 */ mr r3, r31 -/* 8033FBC0 0033CB20 48 00 00 3D */ bl CancelLoad__16CObjectReferenceFv -lbl_8033FBC4: -/* 8033FBC4 0033CB24 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8033FBC8 0033CB28 28 03 00 00 */ cmplwi r3, 0 -/* 8033FBCC 0033CB2C 41 82 00 18 */ beq lbl_8033FBE4 -/* 8033FBD0 0033CB30 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FBD4 0033CB34 38 9F 00 04 */ addi r4, r31, 4 -/* 8033FBD8 0033CB38 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 8033FBDC 0033CB3C 7D 89 03 A6 */ mtctr r12 -/* 8033FBE0 0033CB40 4E 80 04 21 */ bctrl -lbl_8033FBE4: -/* 8033FBE4 0033CB44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FBE8 0033CB48 A8 7F 00 00 */ lha r3, 0(r31) -/* 8033FBEC 0033CB4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FBF0 0033CB50 7C 08 03 A6 */ mtlr r0 -/* 8033FBF4 0033CB54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FBF8 0033CB58 4E 80 00 20 */ blr - -.global CancelLoad__16CObjectReferenceFv -CancelLoad__16CObjectReferenceFv: -/* 8033FBFC 0033CB5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FC00 0033CB60 7C 08 02 A6 */ mflr r0 -/* 8033FC04 0033CB64 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FC08 0033CB68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FC0C 0033CB6C 7C 7F 1B 78 */ mr r31, r3 -/* 8033FC10 0033CB70 80 03 00 0C */ lwz r0, 0xc(r3) -/* 8033FC14 0033CB74 28 00 00 00 */ cmplwi r0, 0 -/* 8033FC18 0033CB78 41 82 00 48 */ beq lbl_8033FC60 -/* 8033FC1C 0033CB7C 4B FF FE 99 */ bl IsLoading__16CObjectReferenceCFv -/* 8033FC20 0033CB80 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8033FC24 0033CB84 41 82 00 3C */ beq lbl_8033FC60 -/* 8033FC28 0033CB88 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8033FC2C 0033CB8C 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FC30 0033CB90 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8033FC34 0033CB94 7D 89 03 A6 */ mtctr r12 -/* 8033FC38 0033CB98 4E 80 04 21 */ bctrl -/* 8033FC3C 0033CB9C 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FC40 0033CBA0 38 9F 00 04 */ addi r4, r31, 4 -/* 8033FC44 0033CBA4 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8033FC48 0033CBA8 7D 89 03 A6 */ mtctr r12 -/* 8033FC4C 0033CBAC 4E 80 04 21 */ bctrl -/* 8033FC50 0033CBB0 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FC54 0033CBB4 38 60 00 00 */ li r3, 0 -/* 8033FC58 0033CBB8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 8033FC5C 0033CBBC 98 1F 00 03 */ stb r0, 3(r31) -lbl_8033FC60: -/* 8033FC60 0033CBC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FC64 0033CBC4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FC68 0033CBC8 7C 08 03 A6 */ mtlr r0 -/* 8033FC6C 0033CBCC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FC70 0033CBD0 4E 80 00 20 */ blr - -.global Unload__16CObjectReferenceFv -Unload__16CObjectReferenceFv: -/* 8033FC74 0033CBD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FC78 0033CBD8 7C 08 02 A6 */ mflr r0 -/* 8033FC7C 0033CBDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FC80 0033CBE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FC84 0033CBE4 7C 7F 1B 78 */ mr r31, r3 -/* 8033FC88 0033CBE8 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8033FC8C 0033CBEC 28 03 00 00 */ cmplwi r3, 0 -/* 8033FC90 0033CBF0 41 82 00 18 */ beq lbl_8033FCA8 -/* 8033FC94 0033CBF4 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FC98 0033CBF8 38 80 00 01 */ li r4, 1 -/* 8033FC9C 0033CBFC 81 8C 00 08 */ lwz r12, 8(r12) -/* 8033FCA0 0033CC00 7D 89 03 A6 */ mtctr r12 -/* 8033FCA4 0033CC04 4E 80 04 21 */ bctrl -lbl_8033FCA8: -/* 8033FCA8 0033CC08 38 60 00 00 */ li r3, 0 -/* 8033FCAC 0033CC0C 90 7F 00 10 */ stw r3, 0x10(r31) -/* 8033FCB0 0033CC10 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FCB4 0033CC14 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 8033FCB8 0033CC18 98 1F 00 03 */ stb r0, 3(r31) -/* 8033FCBC 0033CC1C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FCC0 0033CC20 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FCC4 0033CC24 7C 08 03 A6 */ mtlr r0 -/* 8033FCC8 0033CC28 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FCCC 0033CC2C 4E 80 00 20 */ blr - -.global GetObject__16CObjectReferenceFv -GetObject__16CObjectReferenceFv: -/* 8033FCD0 0033CC30 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8033FCD4 0033CC34 7C 08 02 A6 */ mflr r0 -/* 8033FCD8 0033CC38 90 01 00 24 */ stw r0, 0x24(r1) -/* 8033FCDC 0033CC3C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8033FCE0 0033CC40 7C 7F 1B 78 */ mr r31, r3 -/* 8033FCE4 0033CC44 80 03 00 10 */ lwz r0, 0x10(r3) -/* 8033FCE8 0033CC48 28 00 00 00 */ cmplwi r0, 0 -/* 8033FCEC 0033CC4C 40 82 00 74 */ bne lbl_8033FD60 -/* 8033FCF0 0033CC50 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8033FCF4 0033CC54 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FCF8 0033CC58 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8033FCFC 0033CC5C 7D 89 03 A6 */ mtctr r12 -/* 8033FD00 0033CC60 4E 80 04 21 */ bctrl -/* 8033FD04 0033CC64 7C 64 1B 78 */ mr r4, r3 -/* 8033FD08 0033CC68 38 61 00 08 */ addi r3, r1, 8 -/* 8033FD0C 0033CC6C 81 84 00 00 */ lwz r12, 0(r4) -/* 8033FD10 0033CC70 38 BF 00 04 */ addi r5, r31, 4 -/* 8033FD14 0033CC74 38 DF 00 14 */ addi r6, r31, 0x14 -/* 8033FD18 0033CC78 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8033FD1C 0033CC7C 7D 89 03 A6 */ mtctr r12 -/* 8033FD20 0033CC80 4E 80 04 21 */ bctrl -/* 8033FD24 0033CC84 38 00 00 00 */ li r0, 0 -/* 8033FD28 0033CC88 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8033FD2C 0033CC8C 98 01 00 08 */ stb r0, 8(r1) -/* 8033FD30 0033CC90 90 7F 00 10 */ stw r3, 0x10(r31) -/* 8033FD34 0033CC94 88 01 00 08 */ lbz r0, 8(r1) -/* 8033FD38 0033CC98 28 00 00 00 */ cmplwi r0, 0 -/* 8033FD3C 0033CC9C 41 82 00 24 */ beq lbl_8033FD60 -/* 8033FD40 0033CCA0 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8033FD44 0033CCA4 28 03 00 00 */ cmplwi r3, 0 -/* 8033FD48 0033CCA8 41 82 00 18 */ beq lbl_8033FD60 -/* 8033FD4C 0033CCAC 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FD50 0033CCB0 38 80 00 01 */ li r4, 1 -/* 8033FD54 0033CCB4 81 8C 00 08 */ lwz r12, 8(r12) -/* 8033FD58 0033CCB8 7D 89 03 A6 */ mtctr r12 -/* 8033FD5C 0033CCBC 4E 80 04 21 */ bctrl -lbl_8033FD60: -/* 8033FD60 0033CCC0 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FD64 0033CCC4 38 60 00 00 */ li r3, 0 -/* 8033FD68 0033CCC8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 8033FD6C 0033CCCC 98 1F 00 03 */ stb r0, 3(r31) -/* 8033FD70 0033CCD0 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 8033FD74 0033CCD4 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8033FD78 0033CCD8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8033FD7C 0033CCDC 7C 08 03 A6 */ mtlr r0 -/* 8033FD80 0033CCE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033FD84 0033CCE4 4E 80 00 20 */ blr - -.global Lock__16CObjectReferenceFv -Lock__16CObjectReferenceFv: -/* 8033FD88 0033CCE8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FD8C 0033CCEC 7C 08 02 A6 */ mflr r0 -/* 8033FD90 0033CCF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FD94 0033CCF4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FD98 0033CCF8 7C 7F 1B 78 */ mr r31, r3 -/* 8033FD9C 0033CCFC A8 83 00 02 */ lha r4, 2(r3) -/* 8033FDA0 0033CD00 54 80 80 1E */ slwi r0, r4, 0x10 -/* 8033FDA4 0033CD04 7C 03 8E 70 */ srawi r3, r0, 0x11 -/* 8033FDA8 0033CD08 38 03 00 01 */ addi r0, r3, 1 -/* 8033FDAC 0033CD0C 50 04 0C 3C */ rlwimi r4, r0, 1, 0x10, 0x1e -/* 8033FDB0 0033CD10 B0 9F 00 02 */ sth r4, 2(r31) -/* 8033FDB4 0033CD14 80 1F 00 10 */ lwz r0, 0x10(r31) -/* 8033FDB8 0033CD18 28 00 00 00 */ cmplwi r0, 0 -/* 8033FDBC 0033CD1C 40 82 00 58 */ bne lbl_8033FE14 -/* 8033FDC0 0033CD20 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FDC4 0033CD24 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 -/* 8033FDC8 0033CD28 7C 00 FE 70 */ srawi r0, r0, 0x1f -/* 8033FDCC 0033CD2C 7C 00 07 75 */ extsb. r0, r0 -/* 8033FDD0 0033CD30 40 82 00 44 */ bne lbl_8033FE14 -/* 8033FDD4 0033CD34 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8033FDD8 0033CD38 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FDDC 0033CD3C 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8033FDE0 0033CD40 7D 89 03 A6 */ mtctr r12 -/* 8033FDE4 0033CD44 4E 80 04 21 */ bctrl -/* 8033FDE8 0033CD48 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FDEC 0033CD4C 38 9F 00 04 */ addi r4, r31, 4 -/* 8033FDF0 0033CD50 38 BF 00 14 */ addi r5, r31, 0x14 -/* 8033FDF4 0033CD54 38 DF 00 10 */ addi r6, r31, 0x10 -/* 8033FDF8 0033CD58 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8033FDFC 0033CD5C 7D 89 03 A6 */ mtctr r12 -/* 8033FE00 0033CD60 4E 80 04 21 */ bctrl -/* 8033FE04 0033CD64 88 1F 00 03 */ lbz r0, 3(r31) -/* 8033FE08 0033CD68 38 60 00 01 */ li r3, 1 -/* 8033FE0C 0033CD6C 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f -/* 8033FE10 0033CD70 98 1F 00 03 */ stb r0, 3(r31) -lbl_8033FE14: -/* 8033FE14 0033CD74 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FE18 0033CD78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FE1C 0033CD7C 7C 08 03 A6 */ mtlr r0 -/* 8033FE20 0033CD80 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FE24 0033CD84 4E 80 00 20 */ blr - -.global __dt__16CObjectReferenceFv -__dt__16CObjectReferenceFv: -/* 8033FE28 0033CD88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8033FE2C 0033CD8C 7C 08 02 A6 */ mflr r0 -/* 8033FE30 0033CD90 90 01 00 14 */ stw r0, 0x14(r1) -/* 8033FE34 0033CD94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8033FE38 0033CD98 7C 9F 23 78 */ mr r31, r4 -/* 8033FE3C 0033CD9C 93 C1 00 08 */ stw r30, 8(r1) -/* 8033FE40 0033CDA0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8033FE44 0033CDA4 41 82 00 90 */ beq lbl_8033FED4 -/* 8033FE48 0033CDA8 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8033FE4C 0033CDAC 28 03 00 00 */ cmplwi r3, 0 -/* 8033FE50 0033CDB0 41 82 00 20 */ beq lbl_8033FE70 -/* 8033FE54 0033CDB4 41 82 00 58 */ beq lbl_8033FEAC -/* 8033FE58 0033CDB8 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FE5C 0033CDBC 38 80 00 01 */ li r4, 1 -/* 8033FE60 0033CDC0 81 8C 00 08 */ lwz r12, 8(r12) -/* 8033FE64 0033CDC4 7D 89 03 A6 */ mtctr r12 -/* 8033FE68 0033CDC8 4E 80 04 21 */ bctrl -/* 8033FE6C 0033CDCC 48 00 00 40 */ b lbl_8033FEAC -lbl_8033FE70: -/* 8033FE70 0033CDD0 88 1E 00 03 */ lbz r0, 3(r30) -/* 8033FE74 0033CDD4 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 -/* 8033FE78 0033CDD8 7C 00 FE 70 */ srawi r0, r0, 0x1f -/* 8033FE7C 0033CDDC 7C 00 07 75 */ extsb. r0, r0 -/* 8033FE80 0033CDE0 41 82 00 2C */ beq lbl_8033FEAC -/* 8033FE84 0033CDE4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8033FE88 0033CDE8 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FE8C 0033CDEC 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8033FE90 0033CDF0 7D 89 03 A6 */ mtctr r12 -/* 8033FE94 0033CDF4 4E 80 04 21 */ bctrl -/* 8033FE98 0033CDF8 81 83 00 00 */ lwz r12, 0(r3) -/* 8033FE9C 0033CDFC 38 9E 00 04 */ addi r4, r30, 4 -/* 8033FEA0 0033CE00 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8033FEA4 0033CE04 7D 89 03 A6 */ mtctr r12 -/* 8033FEA8 0033CE08 4E 80 04 21 */ bctrl -lbl_8033FEAC: -/* 8033FEAC 0033CE0C 34 1E 00 14 */ addic. r0, r30, 0x14 -/* 8033FEB0 0033CE10 41 82 00 14 */ beq lbl_8033FEC4 -/* 8033FEB4 0033CE14 34 1E 00 14 */ addic. r0, r30, 0x14 -/* 8033FEB8 0033CE18 41 82 00 0C */ beq lbl_8033FEC4 -/* 8033FEBC 0033CE1C 38 7E 00 14 */ addi r3, r30, 0x14 -/* 8033FEC0 0033CE20 4B CF 44 45 */ bl sub_80034304 -lbl_8033FEC4: -/* 8033FEC4 0033CE24 7F E0 07 35 */ extsh. r0, r31 -/* 8033FEC8 0033CE28 40 81 00 0C */ ble lbl_8033FED4 -/* 8033FECC 0033CE2C 7F C3 F3 78 */ mr r3, r30 -/* 8033FED0 0033CE30 4B FD 5A 61 */ bl Free__7CMemoryFPCv -lbl_8033FED4: -/* 8033FED4 0033CE34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8033FED8 0033CE38 7F C3 F3 78 */ mr r3, r30 -/* 8033FEDC 0033CE3C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8033FEE0 0033CE40 83 C1 00 08 */ lwz r30, 8(r1) -/* 8033FEE4 0033CE44 7C 08 03 A6 */ mtlr r0 -/* 8033FEE8 0033CE48 38 21 00 10 */ addi r1, r1, 0x10 -/* 8033FEEC 0033CE4C 4E 80 00 20 */ blr - -.global "__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>" -"__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>": -/* 8033FEF0 0033CE50 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8033FEF4 0033CE54 7C 08 02 A6 */ mflr r0 -/* 8033FEF8 0033CE58 38 A0 00 00 */ li r5, 0 -/* 8033FEFC 0033CE5C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8033FF00 0033CE60 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8033FF04 0033CE64 7C 7F 1B 78 */ mr r31, r3 -/* 8033FF08 0033CE68 A8 03 00 00 */ lha r0, 0(r3) -/* 8033FF0C 0033CE6C 50 A0 04 3E */ rlwimi r0, r5, 0, 0x10, 0x1f -/* 8033FF10 0033CE70 38 61 00 08 */ addi r3, r1, 8 -/* 8033FF14 0033CE74 B0 1F 00 00 */ sth r0, 0(r31) -/* 8033FF18 0033CE78 A8 1F 00 02 */ lha r0, 2(r31) -/* 8033FF1C 0033CE7C 50 A0 0C 3C */ rlwimi r0, r5, 1, 0x10, 0x1e -/* 8033FF20 0033CE80 B0 1F 00 02 */ sth r0, 2(r31) -/* 8033FF24 0033CE84 A8 1F 00 02 */ lha r0, 2(r31) -/* 8033FF28 0033CE88 50 A0 07 FE */ rlwimi r0, r5, 0, 0x1f, 0x1f -/* 8033FF2C 0033CE8C B0 1F 00 02 */ sth r0, 2(r31) -/* 8033FF30 0033CE90 90 BF 00 0C */ stw r5, 0xc(r31) -/* 8033FF34 0033CE94 98 A4 00 00 */ stb r5, 0(r4) -/* 8033FF38 0033CE98 80 04 00 04 */ lwz r0, 4(r4) -/* 8033FF3C 0033CE9C 90 1F 00 10 */ stw r0, 0x10(r31) -/* 8033FF40 0033CEA0 4B CF 4A 15 */ bl Null__15CVParamTransferFv -/* 8033FF44 0033CEA4 80 01 00 08 */ lwz r0, 8(r1) -/* 8033FF48 0033CEA8 38 61 00 08 */ addi r3, r1, 8 -/* 8033FF4C 0033CEAC 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8033FF50 0033CEB0 80 BF 00 14 */ lwz r5, 0x14(r31) -/* 8033FF54 0033CEB4 80 85 00 04 */ lwz r4, 4(r5) -/* 8033FF58 0033CEB8 38 04 00 01 */ addi r0, r4, 1 -/* 8033FF5C 0033CEBC 90 05 00 04 */ stw r0, 4(r5) -/* 8033FF60 0033CEC0 4B CF 43 A5 */ bl sub_80034304 -/* 8033FF64 0033CEC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8033FF68 0033CEC8 7F E3 FB 78 */ mr r3, r31 -/* 8033FF6C 0033CECC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8033FF70 0033CED0 7C 08 03 A6 */ mtlr r0 -/* 8033FF74 0033CED4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8033FF78 0033CED8 4E 80 00 20 */ blr - -.global "__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer" -"__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer": -/* 8033FF7C 0033CEDC 39 00 00 00 */ li r8, 0 -/* 8033FF80 0033CEE0 A8 03 00 00 */ lha r0, 0(r3) -/* 8033FF84 0033CEE4 51 00 04 3E */ rlwimi r0, r8, 0, 0x10, 0x1f -/* 8033FF88 0033CEE8 B0 03 00 00 */ sth r0, 0(r3) -/* 8033FF8C 0033CEEC A8 03 00 02 */ lha r0, 2(r3) -/* 8033FF90 0033CEF0 51 00 0C 3C */ rlwimi r0, r8, 1, 0x10, 0x1e -/* 8033FF94 0033CEF4 B0 03 00 02 */ sth r0, 2(r3) -/* 8033FF98 0033CEF8 A8 03 00 02 */ lha r0, 2(r3) -/* 8033FF9C 0033CEFC 51 00 07 FE */ rlwimi r0, r8, 0, 0x1f, 0x1f -/* 8033FFA0 0033CF00 B0 03 00 02 */ sth r0, 2(r3) -/* 8033FFA4 0033CF04 80 06 00 00 */ lwz r0, 0(r6) -/* 8033FFA8 0033CF08 90 03 00 04 */ stw r0, 4(r3) -/* 8033FFAC 0033CF0C 80 06 00 04 */ lwz r0, 4(r6) -/* 8033FFB0 0033CF10 90 03 00 08 */ stw r0, 8(r3) -/* 8033FFB4 0033CF14 90 83 00 0C */ stw r4, 0xc(r3) -/* 8033FFB8 0033CF18 99 05 00 00 */ stb r8, 0(r5) -/* 8033FFBC 0033CF1C 80 05 00 04 */ lwz r0, 4(r5) -/* 8033FFC0 0033CF20 90 03 00 10 */ stw r0, 0x10(r3) -/* 8033FFC4 0033CF24 80 07 00 00 */ lwz r0, 0(r7) -/* 8033FFC8 0033CF28 90 03 00 14 */ stw r0, 0x14(r3) -/* 8033FFCC 0033CF2C 80 A3 00 14 */ lwz r5, 0x14(r3) -/* 8033FFD0 0033CF30 80 85 00 04 */ lwz r4, 4(r5) -/* 8033FFD4 0033CF34 38 04 00 01 */ addi r0, r4, 1 -/* 8033FFD8 0033CF38 90 05 00 04 */ stw r0, 4(r5) -/* 8033FFDC 0033CF3C 4E 80 00 20 */ blr diff --git a/asm/Kyoto/CPakFile.s b/asm/Kyoto/CPakFile.s index 643c9381..d2426a78 100644 --- a/asm/Kyoto/CPakFile.s +++ b/asm/Kyoto/CPakFile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8A48 lbl_805A8A48: @@ -28,6 +29,7 @@ lbl_805A8A54: .4byte 0x00000040 .section .sbss, "wa" +.balign 8 .global lbl_805A9690 lbl_805A9690: @@ -2118,6 +2120,7 @@ lbl_80368E90: /* 80368EA0 00365E00 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D84E0 lbl_803D84E0: # ROM: 0x3D54E0 diff --git a/asm/Kyoto/CRandom16.s b/asm/Kyoto/CRandom16.s index 4ce6f847..dda3952a 100644 --- a/asm/Kyoto/CRandom16.s +++ b/asm/Kyoto/CRandom16.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global gRandomNumber__9CRandom16 gRandomNumber__9CRandom16: @@ -175,6 +176,7 @@ lbl_803126BC: /* 803126DC 0030F63C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE5E0 lbl_805AE5E0: # ROM: 0x3FAE80 diff --git a/asm/Kyoto/CResFactory.s b/asm/Kyoto/CResFactory.s index ac0371bb..996a72f5 100644 --- a/asm/Kyoto/CResFactory.s +++ b/asm/Kyoto/CResFactory.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE368 lbl_803EE368: @@ -14,23 +15,6 @@ lbl_803EE368: .4byte CanBuild__11CResFactoryFRC10SObjectTag .4byte GetResourceIdByName__11CResFactoryCFPCc -.section .sdata - -.global lbl_805A890C -lbl_805A890C: - # ROM: 0x3F62AC - .byte 0x01 - -.global lbl_805A890D -lbl_805A890D: - # ROM: 0x3F62AD - .byte 0x00 - -.global lbl_805A890E -lbl_805A890E: - # ROM: 0x3F62AE - .2byte 0x00000100 - .section .text, "ax" .global sub_803394a8 @@ -1766,6 +1750,7 @@ lbl_8033AC9C: /* 8033ACAC 00337C0C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE8C0 lbl_805AE8C0: # ROM: 0x3FB160 @@ -1774,6 +1759,7 @@ lbl_805AE8C0: .section .rodata +.balign 8 .global lbl_803D7A28 lbl_803D7A28: # ROM: 0x3D4A28 diff --git a/asm/Kyoto/CResLoader.s b/asm/Kyoto/CResLoader.s index 9aa199f0..70c6bada 100644 --- a/asm/Kyoto/CResLoader.s +++ b/asm/Kyoto/CResLoader.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss2, "", @nobits +.balign 8 # CResLoader .global lbl_805AF4B0 lbl_805AF4B0: @@ -1891,6 +1892,7 @@ lbl_8033C5BC: /* 8033C5DC 0033953C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE8C8 lbl_805AE8C8: # ROM: 0x3FB168 @@ -1903,6 +1905,7 @@ lbl_805AE8CC: .section .rodata +.balign 8 .global lbl_803D7A38 lbl_803D7A38: # ROM: 0x3D4A38 diff --git a/asm/Kyoto/CSimplePool.s b/asm/Kyoto/CSimplePool.s index fe2da2a7..b9bb81d5 100644 --- a/asm/Kyoto/CSimplePool.s +++ b/asm/Kyoto/CSimplePool.s @@ -1,6 +1,14 @@ .include "macros.inc" .section .data +.balign 8 + +.global lbl_803EE3D8 +lbl_803EE3D8: + # ROM: 0x3EB3D8 + .4byte 0 + .4byte 0 + .4byte "__dt__31TObjOwnerParamFv" .global lbl_803EE3E4 lbl_803EE3E4: @@ -34,6 +42,27 @@ lbl_803EE410: .4byte 0 .section .sdata +.balign 8 + +.global lbl_805A8908 +lbl_805A8908: + # ROM: 0x3F62A8 + .4byte 0x00000002 + +.global lbl_805A890C +lbl_805A890C: + # ROM: 0x3F62AC + .byte 0x01 + +.global lbl_805A890D +lbl_805A890D: + # ROM: 0x3F62AD + .byte 0x00 + +.global lbl_805A890E +lbl_805A890E: + # ROM: 0x3F62AE + .2byte 0x00000100 .global lbl_805A8910 lbl_805A8910: @@ -52,6 +81,7 @@ lbl_805A8912: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9508 lbl_805A9508: @@ -59,6 +89,413 @@ lbl_805A9508: .section .text, "ax" +.global "__dt__31TObjOwnerParamFv" +"__dt__31TObjOwnerParamFv": +/* 8033FA48 0033C9A8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FA4C 0033C9AC 7C 08 02 A6 */ mflr r0 +/* 8033FA50 0033C9B0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FA54 0033C9B4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FA58 0033C9B8 7C 7F 1B 79 */ or. r31, r3, r3 +/* 8033FA5C 0033C9BC 41 82 00 40 */ beq lbl_8033FA9C +/* 8033FA60 0033C9C0 3C 60 80 3F */ lis r3, lbl_803EE3D8@ha +/* 8033FA64 0033C9C4 38 03 E3 D8 */ addi r0, r3, lbl_803EE3D8@l +/* 8033FA68 0033C9C8 90 1F 00 00 */ stw r0, 0(r31) +/* 8033FA6C 0033C9CC 41 82 00 20 */ beq lbl_8033FA8C +/* 8033FA70 0033C9D0 3C 60 80 3E */ lis r3, lbl_803D9C44@ha +/* 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, __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 +/* 8033FA90 0033C9F0 40 81 00 0C */ ble lbl_8033FA9C +/* 8033FA94 0033C9F4 7F E3 FB 78 */ mr r3, r31 +/* 8033FA98 0033C9F8 4B FD 5E 99 */ bl Free__7CMemoryFPCv +lbl_8033FA9C: +/* 8033FA9C 0033C9FC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FAA0 0033CA00 7F E3 FB 78 */ mr r3, r31 +/* 8033FAA4 0033CA04 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FAA8 0033CA08 7C 08 03 A6 */ mtlr r0 +/* 8033FAAC 0033CA0C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FAB0 0033CA10 4E 80 00 20 */ blr + +.global IsLoading__16CObjectReferenceCFv +IsLoading__16CObjectReferenceCFv: +/* 8033FAB4 0033CA14 88 03 00 03 */ lbz r0, 3(r3) +/* 8033FAB8 0033CA18 38 80 00 00 */ li r4, 0 +/* 8033FABC 0033CA1C 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 +/* 8033FAC0 0033CA20 7C 00 FE 70 */ srawi r0, r0, 0x1f +/* 8033FAC4 0033CA24 7C 00 07 75 */ extsb. r0, r0 +/* 8033FAC8 0033CA28 41 82 00 14 */ beq lbl_8033FADC +/* 8033FACC 0033CA2C 80 03 00 10 */ lwz r0, 0x10(r3) +/* 8033FAD0 0033CA30 28 00 00 00 */ cmplwi r0, 0 +/* 8033FAD4 0033CA34 40 82 00 08 */ bne lbl_8033FADC +/* 8033FAD8 0033CA38 38 80 00 01 */ li r4, 1 +lbl_8033FADC: +/* 8033FADC 0033CA3C 7C 83 23 78 */ mr r3, r4 +/* 8033FAE0 0033CA40 4E 80 00 20 */ blr + +.global Unlock__16CObjectReferenceFv +Unlock__16CObjectReferenceFv: +/* 8033FAE4 0033CA44 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FAE8 0033CA48 7C 08 02 A6 */ mflr r0 +/* 8033FAEC 0033CA4C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FAF0 0033CA50 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FAF4 0033CA54 7C 7F 1B 78 */ mr r31, r3 +/* 8033FAF8 0033CA58 A8 A3 00 02 */ lha r5, 2(r3) +/* 8033FAFC 0033CA5C 54 A0 80 1E */ slwi r0, r5, 0x10 +/* 8033FB00 0033CA60 7C 04 8E 70 */ srawi r4, r0, 0x11 +/* 8033FB04 0033CA64 38 04 FF FF */ addi r0, r4, -1 +/* 8033FB08 0033CA68 50 05 0C 3C */ rlwimi r5, r0, 1, 0x10, 0x1e +/* 8033FB0C 0033CA6C B0 A3 00 02 */ sth r5, 2(r3) +/* 8033FB10 0033CA70 A8 03 00 02 */ lha r0, 2(r3) +/* 8033FB14 0033CA74 54 00 80 1E */ slwi r0, r0, 0x10 +/* 8033FB18 0033CA78 7C 00 8E 70 */ srawi r0, r0, 0x11 +/* 8033FB1C 0033CA7C 7C 00 07 35 */ extsh. r0, r0 +/* 8033FB20 0033CA80 40 82 00 3C */ bne lbl_8033FB5C +/* 8033FB24 0033CA84 80 1F 00 10 */ lwz r0, 0x10(r31) +/* 8033FB28 0033CA88 28 00 00 00 */ cmplwi r0, 0 +/* 8033FB2C 0033CA8C 41 82 00 18 */ beq lbl_8033FB44 +/* 8033FB30 0033CA90 80 1F 00 0C */ lwz r0, 0xc(r31) +/* 8033FB34 0033CA94 28 00 00 00 */ cmplwi r0, 0 +/* 8033FB38 0033CA98 41 82 00 0C */ beq lbl_8033FB44 +/* 8033FB3C 0033CA9C 48 00 01 39 */ bl Unload__16CObjectReferenceFv +/* 8033FB40 0033CAA0 48 00 00 1C */ b lbl_8033FB5C +lbl_8033FB44: +/* 8033FB44 0033CAA4 7F E3 FB 78 */ mr r3, r31 +/* 8033FB48 0033CAA8 4B FF FF 6D */ bl IsLoading__16CObjectReferenceCFv +/* 8033FB4C 0033CAAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8033FB50 0033CAB0 41 82 00 0C */ beq lbl_8033FB5C +/* 8033FB54 0033CAB4 7F E3 FB 78 */ mr r3, r31 +/* 8033FB58 0033CAB8 48 00 00 A5 */ bl CancelLoad__16CObjectReferenceFv +lbl_8033FB5C: +/* 8033FB5C 0033CABC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FB60 0033CAC0 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FB64 0033CAC4 7C 08 03 A6 */ mtlr r0 +/* 8033FB68 0033CAC8 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FB6C 0033CACC 4E 80 00 20 */ blr + +.global RemoveReference__16CObjectReferenceFv +RemoveReference__16CObjectReferenceFv: +/* 8033FB70 0033CAD0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FB74 0033CAD4 7C 08 02 A6 */ mflr r0 +/* 8033FB78 0033CAD8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FB7C 0033CADC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FB80 0033CAE0 7C 7F 1B 78 */ mr r31, r3 +/* 8033FB84 0033CAE4 A8 83 00 00 */ lha r4, 0(r3) +/* 8033FB88 0033CAE8 38 04 FF FF */ addi r0, r4, -1 +/* 8033FB8C 0033CAEC B0 03 00 00 */ sth r0, 0(r3) +/* 8033FB90 0033CAF0 A8 03 00 00 */ lha r0, 0(r3) +/* 8033FB94 0033CAF4 2C 00 00 00 */ cmpwi r0, 0 +/* 8033FB98 0033CAF8 40 82 00 4C */ bne lbl_8033FBE4 +/* 8033FB9C 0033CAFC 80 1F 00 10 */ lwz r0, 0x10(r31) +/* 8033FBA0 0033CB00 28 00 00 00 */ cmplwi r0, 0 +/* 8033FBA4 0033CB04 41 82 00 0C */ beq lbl_8033FBB0 +/* 8033FBA8 0033CB08 48 00 00 CD */ bl Unload__16CObjectReferenceFv +/* 8033FBAC 0033CB0C 48 00 00 18 */ b lbl_8033FBC4 +lbl_8033FBB0: +/* 8033FBB0 0033CB10 4B FF FF 05 */ bl IsLoading__16CObjectReferenceCFv +/* 8033FBB4 0033CB14 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8033FBB8 0033CB18 41 82 00 0C */ beq lbl_8033FBC4 +/* 8033FBBC 0033CB1C 7F E3 FB 78 */ mr r3, r31 +/* 8033FBC0 0033CB20 48 00 00 3D */ bl CancelLoad__16CObjectReferenceFv +lbl_8033FBC4: +/* 8033FBC4 0033CB24 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8033FBC8 0033CB28 28 03 00 00 */ cmplwi r3, 0 +/* 8033FBCC 0033CB2C 41 82 00 18 */ beq lbl_8033FBE4 +/* 8033FBD0 0033CB30 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FBD4 0033CB34 38 9F 00 04 */ addi r4, r31, 4 +/* 8033FBD8 0033CB38 81 8C 00 28 */ lwz r12, 0x28(r12) +/* 8033FBDC 0033CB3C 7D 89 03 A6 */ mtctr r12 +/* 8033FBE0 0033CB40 4E 80 04 21 */ bctrl +lbl_8033FBE4: +/* 8033FBE4 0033CB44 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FBE8 0033CB48 A8 7F 00 00 */ lha r3, 0(r31) +/* 8033FBEC 0033CB4C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FBF0 0033CB50 7C 08 03 A6 */ mtlr r0 +/* 8033FBF4 0033CB54 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FBF8 0033CB58 4E 80 00 20 */ blr + +.global CancelLoad__16CObjectReferenceFv +CancelLoad__16CObjectReferenceFv: +/* 8033FBFC 0033CB5C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FC00 0033CB60 7C 08 02 A6 */ mflr r0 +/* 8033FC04 0033CB64 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FC08 0033CB68 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FC0C 0033CB6C 7C 7F 1B 78 */ mr r31, r3 +/* 8033FC10 0033CB70 80 03 00 0C */ lwz r0, 0xc(r3) +/* 8033FC14 0033CB74 28 00 00 00 */ cmplwi r0, 0 +/* 8033FC18 0033CB78 41 82 00 48 */ beq lbl_8033FC60 +/* 8033FC1C 0033CB7C 4B FF FE 99 */ bl IsLoading__16CObjectReferenceCFv +/* 8033FC20 0033CB80 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8033FC24 0033CB84 41 82 00 3C */ beq lbl_8033FC60 +/* 8033FC28 0033CB88 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8033FC2C 0033CB8C 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FC30 0033CB90 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 8033FC34 0033CB94 7D 89 03 A6 */ mtctr r12 +/* 8033FC38 0033CB98 4E 80 04 21 */ bctrl +/* 8033FC3C 0033CB9C 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FC40 0033CBA0 38 9F 00 04 */ addi r4, r31, 4 +/* 8033FC44 0033CBA4 81 8C 00 14 */ lwz r12, 0x14(r12) +/* 8033FC48 0033CBA8 7D 89 03 A6 */ mtctr r12 +/* 8033FC4C 0033CBAC 4E 80 04 21 */ bctrl +/* 8033FC50 0033CBB0 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FC54 0033CBB4 38 60 00 00 */ li r3, 0 +/* 8033FC58 0033CBB8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f +/* 8033FC5C 0033CBBC 98 1F 00 03 */ stb r0, 3(r31) +lbl_8033FC60: +/* 8033FC60 0033CBC0 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FC64 0033CBC4 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FC68 0033CBC8 7C 08 03 A6 */ mtlr r0 +/* 8033FC6C 0033CBCC 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FC70 0033CBD0 4E 80 00 20 */ blr + +.global Unload__16CObjectReferenceFv +Unload__16CObjectReferenceFv: +/* 8033FC74 0033CBD4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FC78 0033CBD8 7C 08 02 A6 */ mflr r0 +/* 8033FC7C 0033CBDC 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FC80 0033CBE0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FC84 0033CBE4 7C 7F 1B 78 */ mr r31, r3 +/* 8033FC88 0033CBE8 80 63 00 10 */ lwz r3, 0x10(r3) +/* 8033FC8C 0033CBEC 28 03 00 00 */ cmplwi r3, 0 +/* 8033FC90 0033CBF0 41 82 00 18 */ beq lbl_8033FCA8 +/* 8033FC94 0033CBF4 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FC98 0033CBF8 38 80 00 01 */ li r4, 1 +/* 8033FC9C 0033CBFC 81 8C 00 08 */ lwz r12, 8(r12) +/* 8033FCA0 0033CC00 7D 89 03 A6 */ mtctr r12 +/* 8033FCA4 0033CC04 4E 80 04 21 */ bctrl +lbl_8033FCA8: +/* 8033FCA8 0033CC08 38 60 00 00 */ li r3, 0 +/* 8033FCAC 0033CC0C 90 7F 00 10 */ stw r3, 0x10(r31) +/* 8033FCB0 0033CC10 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FCB4 0033CC14 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f +/* 8033FCB8 0033CC18 98 1F 00 03 */ stb r0, 3(r31) +/* 8033FCBC 0033CC1C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FCC0 0033CC20 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FCC4 0033CC24 7C 08 03 A6 */ mtlr r0 +/* 8033FCC8 0033CC28 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FCCC 0033CC2C 4E 80 00 20 */ blr + +.global GetObject__16CObjectReferenceFv +GetObject__16CObjectReferenceFv: +/* 8033FCD0 0033CC30 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8033FCD4 0033CC34 7C 08 02 A6 */ mflr r0 +/* 8033FCD8 0033CC38 90 01 00 24 */ stw r0, 0x24(r1) +/* 8033FCDC 0033CC3C 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8033FCE0 0033CC40 7C 7F 1B 78 */ mr r31, r3 +/* 8033FCE4 0033CC44 80 03 00 10 */ lwz r0, 0x10(r3) +/* 8033FCE8 0033CC48 28 00 00 00 */ cmplwi r0, 0 +/* 8033FCEC 0033CC4C 40 82 00 74 */ bne lbl_8033FD60 +/* 8033FCF0 0033CC50 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8033FCF4 0033CC54 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FCF8 0033CC58 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 8033FCFC 0033CC5C 7D 89 03 A6 */ mtctr r12 +/* 8033FD00 0033CC60 4E 80 04 21 */ bctrl +/* 8033FD04 0033CC64 7C 64 1B 78 */ mr r4, r3 +/* 8033FD08 0033CC68 38 61 00 08 */ addi r3, r1, 8 +/* 8033FD0C 0033CC6C 81 84 00 00 */ lwz r12, 0(r4) +/* 8033FD10 0033CC70 38 BF 00 04 */ addi r5, r31, 4 +/* 8033FD14 0033CC74 38 DF 00 14 */ addi r6, r31, 0x14 +/* 8033FD18 0033CC78 81 8C 00 0C */ lwz r12, 0xc(r12) +/* 8033FD1C 0033CC7C 7D 89 03 A6 */ mtctr r12 +/* 8033FD20 0033CC80 4E 80 04 21 */ bctrl +/* 8033FD24 0033CC84 38 00 00 00 */ li r0, 0 +/* 8033FD28 0033CC88 80 61 00 0C */ lwz r3, 0xc(r1) +/* 8033FD2C 0033CC8C 98 01 00 08 */ stb r0, 8(r1) +/* 8033FD30 0033CC90 90 7F 00 10 */ stw r3, 0x10(r31) +/* 8033FD34 0033CC94 88 01 00 08 */ lbz r0, 8(r1) +/* 8033FD38 0033CC98 28 00 00 00 */ cmplwi r0, 0 +/* 8033FD3C 0033CC9C 41 82 00 24 */ beq lbl_8033FD60 +/* 8033FD40 0033CCA0 80 61 00 0C */ lwz r3, 0xc(r1) +/* 8033FD44 0033CCA4 28 03 00 00 */ cmplwi r3, 0 +/* 8033FD48 0033CCA8 41 82 00 18 */ beq lbl_8033FD60 +/* 8033FD4C 0033CCAC 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FD50 0033CCB0 38 80 00 01 */ li r4, 1 +/* 8033FD54 0033CCB4 81 8C 00 08 */ lwz r12, 8(r12) +/* 8033FD58 0033CCB8 7D 89 03 A6 */ mtctr r12 +/* 8033FD5C 0033CCBC 4E 80 04 21 */ bctrl +lbl_8033FD60: +/* 8033FD60 0033CCC0 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FD64 0033CCC4 38 60 00 00 */ li r3, 0 +/* 8033FD68 0033CCC8 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f +/* 8033FD6C 0033CCCC 98 1F 00 03 */ stb r0, 3(r31) +/* 8033FD70 0033CCD0 80 7F 00 10 */ lwz r3, 0x10(r31) +/* 8033FD74 0033CCD4 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8033FD78 0033CCD8 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8033FD7C 0033CCDC 7C 08 03 A6 */ mtlr r0 +/* 8033FD80 0033CCE0 38 21 00 20 */ addi r1, r1, 0x20 +/* 8033FD84 0033CCE4 4E 80 00 20 */ blr + +.global Lock__16CObjectReferenceFv +Lock__16CObjectReferenceFv: +/* 8033FD88 0033CCE8 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FD8C 0033CCEC 7C 08 02 A6 */ mflr r0 +/* 8033FD90 0033CCF0 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FD94 0033CCF4 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FD98 0033CCF8 7C 7F 1B 78 */ mr r31, r3 +/* 8033FD9C 0033CCFC A8 83 00 02 */ lha r4, 2(r3) +/* 8033FDA0 0033CD00 54 80 80 1E */ slwi r0, r4, 0x10 +/* 8033FDA4 0033CD04 7C 03 8E 70 */ srawi r3, r0, 0x11 +/* 8033FDA8 0033CD08 38 03 00 01 */ addi r0, r3, 1 +/* 8033FDAC 0033CD0C 50 04 0C 3C */ rlwimi r4, r0, 1, 0x10, 0x1e +/* 8033FDB0 0033CD10 B0 9F 00 02 */ sth r4, 2(r31) +/* 8033FDB4 0033CD14 80 1F 00 10 */ lwz r0, 0x10(r31) +/* 8033FDB8 0033CD18 28 00 00 00 */ cmplwi r0, 0 +/* 8033FDBC 0033CD1C 40 82 00 58 */ bne lbl_8033FE14 +/* 8033FDC0 0033CD20 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FDC4 0033CD24 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 +/* 8033FDC8 0033CD28 7C 00 FE 70 */ srawi r0, r0, 0x1f +/* 8033FDCC 0033CD2C 7C 00 07 75 */ extsb. r0, r0 +/* 8033FDD0 0033CD30 40 82 00 44 */ bne lbl_8033FE14 +/* 8033FDD4 0033CD34 80 7F 00 0C */ lwz r3, 0xc(r31) +/* 8033FDD8 0033CD38 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FDDC 0033CD3C 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 8033FDE0 0033CD40 7D 89 03 A6 */ mtctr r12 +/* 8033FDE4 0033CD44 4E 80 04 21 */ bctrl +/* 8033FDE8 0033CD48 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FDEC 0033CD4C 38 9F 00 04 */ addi r4, r31, 4 +/* 8033FDF0 0033CD50 38 BF 00 14 */ addi r5, r31, 0x14 +/* 8033FDF4 0033CD54 38 DF 00 10 */ addi r6, r31, 0x10 +/* 8033FDF8 0033CD58 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 8033FDFC 0033CD5C 7D 89 03 A6 */ mtctr r12 +/* 8033FE00 0033CD60 4E 80 04 21 */ bctrl +/* 8033FE04 0033CD64 88 1F 00 03 */ lbz r0, 3(r31) +/* 8033FE08 0033CD68 38 60 00 01 */ li r3, 1 +/* 8033FE0C 0033CD6C 50 60 07 FE */ rlwimi r0, r3, 0, 0x1f, 0x1f +/* 8033FE10 0033CD70 98 1F 00 03 */ stb r0, 3(r31) +lbl_8033FE14: +/* 8033FE14 0033CD74 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FE18 0033CD78 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FE1C 0033CD7C 7C 08 03 A6 */ mtlr r0 +/* 8033FE20 0033CD80 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FE24 0033CD84 4E 80 00 20 */ blr + +.global __dt__16CObjectReferenceFv +__dt__16CObjectReferenceFv: +/* 8033FE28 0033CD88 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8033FE2C 0033CD8C 7C 08 02 A6 */ mflr r0 +/* 8033FE30 0033CD90 90 01 00 14 */ stw r0, 0x14(r1) +/* 8033FE34 0033CD94 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8033FE38 0033CD98 7C 9F 23 78 */ mr r31, r4 +/* 8033FE3C 0033CD9C 93 C1 00 08 */ stw r30, 8(r1) +/* 8033FE40 0033CDA0 7C 7E 1B 79 */ or. r30, r3, r3 +/* 8033FE44 0033CDA4 41 82 00 90 */ beq lbl_8033FED4 +/* 8033FE48 0033CDA8 80 7E 00 10 */ lwz r3, 0x10(r30) +/* 8033FE4C 0033CDAC 28 03 00 00 */ cmplwi r3, 0 +/* 8033FE50 0033CDB0 41 82 00 20 */ beq lbl_8033FE70 +/* 8033FE54 0033CDB4 41 82 00 58 */ beq lbl_8033FEAC +/* 8033FE58 0033CDB8 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FE5C 0033CDBC 38 80 00 01 */ li r4, 1 +/* 8033FE60 0033CDC0 81 8C 00 08 */ lwz r12, 8(r12) +/* 8033FE64 0033CDC4 7D 89 03 A6 */ mtctr r12 +/* 8033FE68 0033CDC8 4E 80 04 21 */ bctrl +/* 8033FE6C 0033CDCC 48 00 00 40 */ b lbl_8033FEAC +lbl_8033FE70: +/* 8033FE70 0033CDD0 88 1E 00 03 */ lbz r0, 3(r30) +/* 8033FE74 0033CDD4 54 00 F8 02 */ rlwinm r0, r0, 0x1f, 0, 1 +/* 8033FE78 0033CDD8 7C 00 FE 70 */ srawi r0, r0, 0x1f +/* 8033FE7C 0033CDDC 7C 00 07 75 */ extsb. r0, r0 +/* 8033FE80 0033CDE0 41 82 00 2C */ beq lbl_8033FEAC +/* 8033FE84 0033CDE4 80 7E 00 0C */ lwz r3, 0xc(r30) +/* 8033FE88 0033CDE8 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FE8C 0033CDEC 81 8C 00 20 */ lwz r12, 0x20(r12) +/* 8033FE90 0033CDF0 7D 89 03 A6 */ mtctr r12 +/* 8033FE94 0033CDF4 4E 80 04 21 */ bctrl +/* 8033FE98 0033CDF8 81 83 00 00 */ lwz r12, 0(r3) +/* 8033FE9C 0033CDFC 38 9E 00 04 */ addi r4, r30, 4 +/* 8033FEA0 0033CE00 81 8C 00 14 */ lwz r12, 0x14(r12) +/* 8033FEA4 0033CE04 7D 89 03 A6 */ mtctr r12 +/* 8033FEA8 0033CE08 4E 80 04 21 */ bctrl +lbl_8033FEAC: +/* 8033FEAC 0033CE0C 34 1E 00 14 */ addic. r0, r30, 0x14 +/* 8033FEB0 0033CE10 41 82 00 14 */ beq lbl_8033FEC4 +/* 8033FEB4 0033CE14 34 1E 00 14 */ addic. r0, r30, 0x14 +/* 8033FEB8 0033CE18 41 82 00 0C */ beq lbl_8033FEC4 +/* 8033FEBC 0033CE1C 38 7E 00 14 */ addi r3, r30, 0x14 +/* 8033FEC0 0033CE20 4B CF 44 45 */ bl sub_80034304 +lbl_8033FEC4: +/* 8033FEC4 0033CE24 7F E0 07 35 */ extsh. r0, r31 +/* 8033FEC8 0033CE28 40 81 00 0C */ ble lbl_8033FED4 +/* 8033FECC 0033CE2C 7F C3 F3 78 */ mr r3, r30 +/* 8033FED0 0033CE30 4B FD 5A 61 */ bl Free__7CMemoryFPCv +lbl_8033FED4: +/* 8033FED4 0033CE34 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8033FED8 0033CE38 7F C3 F3 78 */ mr r3, r30 +/* 8033FEDC 0033CE3C 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8033FEE0 0033CE40 83 C1 00 08 */ lwz r30, 8(r1) +/* 8033FEE4 0033CE44 7C 08 03 A6 */ mtlr r0 +/* 8033FEE8 0033CE48 38 21 00 10 */ addi r1, r1, 0x10 +/* 8033FEEC 0033CE4C 4E 80 00 20 */ blr + +.global "__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>" +"__ct__16CObjectReferenceFRCQ24rstl15auto_ptr<4IObj>": +/* 8033FEF0 0033CE50 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8033FEF4 0033CE54 7C 08 02 A6 */ mflr r0 +/* 8033FEF8 0033CE58 38 A0 00 00 */ li r5, 0 +/* 8033FEFC 0033CE5C 90 01 00 24 */ stw r0, 0x24(r1) +/* 8033FF00 0033CE60 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8033FF04 0033CE64 7C 7F 1B 78 */ mr r31, r3 +/* 8033FF08 0033CE68 A8 03 00 00 */ lha r0, 0(r3) +/* 8033FF0C 0033CE6C 50 A0 04 3E */ rlwimi r0, r5, 0, 0x10, 0x1f +/* 8033FF10 0033CE70 38 61 00 08 */ addi r3, r1, 8 +/* 8033FF14 0033CE74 B0 1F 00 00 */ sth r0, 0(r31) +/* 8033FF18 0033CE78 A8 1F 00 02 */ lha r0, 2(r31) +/* 8033FF1C 0033CE7C 50 A0 0C 3C */ rlwimi r0, r5, 1, 0x10, 0x1e +/* 8033FF20 0033CE80 B0 1F 00 02 */ sth r0, 2(r31) +/* 8033FF24 0033CE84 A8 1F 00 02 */ lha r0, 2(r31) +/* 8033FF28 0033CE88 50 A0 07 FE */ rlwimi r0, r5, 0, 0x1f, 0x1f +/* 8033FF2C 0033CE8C B0 1F 00 02 */ sth r0, 2(r31) +/* 8033FF30 0033CE90 90 BF 00 0C */ stw r5, 0xc(r31) +/* 8033FF34 0033CE94 98 A4 00 00 */ stb r5, 0(r4) +/* 8033FF38 0033CE98 80 04 00 04 */ lwz r0, 4(r4) +/* 8033FF3C 0033CE9C 90 1F 00 10 */ stw r0, 0x10(r31) +/* 8033FF40 0033CEA0 4B CF 4A 15 */ bl Null__15CVParamTransferFv +/* 8033FF44 0033CEA4 80 01 00 08 */ lwz r0, 8(r1) +/* 8033FF48 0033CEA8 38 61 00 08 */ addi r3, r1, 8 +/* 8033FF4C 0033CEAC 90 1F 00 14 */ stw r0, 0x14(r31) +/* 8033FF50 0033CEB0 80 BF 00 14 */ lwz r5, 0x14(r31) +/* 8033FF54 0033CEB4 80 85 00 04 */ lwz r4, 4(r5) +/* 8033FF58 0033CEB8 38 04 00 01 */ addi r0, r4, 1 +/* 8033FF5C 0033CEBC 90 05 00 04 */ stw r0, 4(r5) +/* 8033FF60 0033CEC0 4B CF 43 A5 */ bl sub_80034304 +/* 8033FF64 0033CEC4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8033FF68 0033CEC8 7F E3 FB 78 */ mr r3, r31 +/* 8033FF6C 0033CECC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8033FF70 0033CED0 7C 08 03 A6 */ mtlr r0 +/* 8033FF74 0033CED4 38 21 00 20 */ addi r1, r1, 0x20 +/* 8033FF78 0033CED8 4E 80 00 20 */ blr + +.global "__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer" +"__ct__16CObjectReferenceFR12IObjectStoreRCQ24rstl15auto_ptr<4IObj>RC10SObjectTag15CVParamTransfer": +/* 8033FF7C 0033CEDC 39 00 00 00 */ li r8, 0 +/* 8033FF80 0033CEE0 A8 03 00 00 */ lha r0, 0(r3) +/* 8033FF84 0033CEE4 51 00 04 3E */ rlwimi r0, r8, 0, 0x10, 0x1f +/* 8033FF88 0033CEE8 B0 03 00 00 */ sth r0, 0(r3) +/* 8033FF8C 0033CEEC A8 03 00 02 */ lha r0, 2(r3) +/* 8033FF90 0033CEF0 51 00 0C 3C */ rlwimi r0, r8, 1, 0x10, 0x1e +/* 8033FF94 0033CEF4 B0 03 00 02 */ sth r0, 2(r3) +/* 8033FF98 0033CEF8 A8 03 00 02 */ lha r0, 2(r3) +/* 8033FF9C 0033CEFC 51 00 07 FE */ rlwimi r0, r8, 0, 0x1f, 0x1f +/* 8033FFA0 0033CF00 B0 03 00 02 */ sth r0, 2(r3) +/* 8033FFA4 0033CF04 80 06 00 00 */ lwz r0, 0(r6) +/* 8033FFA8 0033CF08 90 03 00 04 */ stw r0, 4(r3) +/* 8033FFAC 0033CF0C 80 06 00 04 */ lwz r0, 4(r6) +/* 8033FFB0 0033CF10 90 03 00 08 */ stw r0, 8(r3) +/* 8033FFB4 0033CF14 90 83 00 0C */ stw r4, 0xc(r3) +/* 8033FFB8 0033CF18 99 05 00 00 */ stb r8, 0(r5) +/* 8033FFBC 0033CF1C 80 05 00 04 */ lwz r0, 4(r5) +/* 8033FFC0 0033CF20 90 03 00 10 */ stw r0, 0x10(r3) +/* 8033FFC4 0033CF24 80 07 00 00 */ lwz r0, 0(r7) +/* 8033FFC8 0033CF28 90 03 00 14 */ stw r0, 0x14(r3) +/* 8033FFCC 0033CF2C 80 A3 00 14 */ lwz r5, 0x14(r3) +/* 8033FFD0 0033CF30 80 85 00 04 */ lwz r4, 4(r5) +/* 8033FFD4 0033CF34 38 04 00 01 */ addi r0, r4, 1 +/* 8033FFD8 0033CF38 90 05 00 04 */ stw r0, 4(r5) +/* 8033FFDC 0033CF3C 4E 80 00 20 */ blr + .global GetFactory__11CSimplePoolCFv GetFactory__11CSimplePoolCFv: /* 8033FFE0 0033CF40 80 63 00 18 */ lwz r3, 0x18(r3) @@ -1022,6 +1459,7 @@ lbl_80340CB0: /* 80340CC0 0033DC20 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7A98 lbl_803D7A98: # ROM: 0x3D4A98 diff --git a/asm/Kyoto/CTimeProvider.s b/asm/Kyoto/CTimeProvider.s index 06f2690f..41a48f9e 100644 --- a/asm/Kyoto/CTimeProvider.s +++ b/asm/Kyoto/CTimeProvider.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9658 lbl_805A9658: diff --git a/asm/Kyoto/CToken.s b/asm/Kyoto/CToken.s index c0da470c..0756b12e 100644 --- a/asm/Kyoto/CToken.s +++ b/asm/Kyoto/CToken.s @@ -249,6 +249,7 @@ __ct__6CTokenFP16CObjectReference: /* 80341000 0033DF60 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7AA0 lbl_803D7AA0: # ROM: 0x3D4AA0 diff --git a/asm/Kyoto/DolphinCDvdFile.s b/asm/Kyoto/DolphinCDvdFile.s index fa0ec55a..a1ca583f 100644 --- a/asm/Kyoto/DolphinCDvdFile.s +++ b/asm/Kyoto/DolphinCDvdFile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A89B0 lbl_805A89B0: @@ -19,6 +20,7 @@ lbl_805A89B8: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A95D0 lbl_805A95D0: @@ -949,6 +951,7 @@ lbl_8035052C: /* 8035053C 0034D49C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8230 lbl_803D8230: # ROM: 0x3D5230 diff --git a/asm/Kyoto/DolphinCMemoryCardSys.s b/asm/Kyoto/DolphinCMemoryCardSys.s index 2073c618..1e958daf 100644 --- a/asm/Kyoto/DolphinCMemoryCardSys.s +++ b/asm/Kyoto/DolphinCMemoryCardSys.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_DolphinCMemoryCardSys_cpp .section .sdata +.balign 8 .global lbl_805A89A8 lbl_805A89A8: @@ -28,6 +29,7 @@ lbl_805A89AB: .4byte 0 .section .bss +.balign 8 .global lbl_804BFFA0 lbl_804BFFA0: @@ -37,6 +39,7 @@ lbl_804BFFAC: .skip 0x14 .section .sbss, "wa" +.balign 8 .global lbl_805A95C0 lbl_805A95C0: @@ -2078,6 +2081,7 @@ __sinit_DolphinCMemoryCardSys_cpp: /* 8034EFB0 0034BF10 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8220 lbl_803D8220: # ROM: 0x3D5220 diff --git a/asm/Kyoto/Graphics/CColor.s b/asm/Kyoto/Graphics/CColor.s index af43c6d7..81564b02 100644 --- a/asm/Kyoto/Graphics/CColor.s +++ b/asm/Kyoto/Graphics/CColor.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CColor_cpp .section .sbss, "wa" +.balign 8 .global lbl_805A9568 lbl_805A9568: diff --git a/asm/Kyoto/Graphics/CCubeMaterial.s b/asm/Kyoto/Graphics/CCubeMaterial.s index b4e0c65a..d10d88ca 100644 --- a/asm/Kyoto/Graphics/CCubeMaterial.s +++ b/asm/Kyoto/Graphics/CCubeMaterial.s @@ -3143,6 +3143,7 @@ __sinit_CCubeMaterial_cpp: /* 803482AC 0034520C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE8D8 lbl_805AE8D8: # ROM: 0x3FB178 @@ -3247,6 +3248,7 @@ lbl_805AE930: .section .rodata +.balign 8 .global lbl_803D7F58 lbl_803D7F58: # ROM: 0x3D4F58 diff --git a/asm/Kyoto/Graphics/CCubeModel.s b/asm/Kyoto/Graphics/CCubeModel.s index f7846f92..37c54747 100644 --- a/asm/Kyoto/Graphics/CCubeModel.s +++ b/asm/Kyoto/Graphics/CCubeModel.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9340 lbl_805A9340: @@ -1596,6 +1597,7 @@ lbl_80307BA8: /* 80307BB8 00304B18 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7388 lbl_803D7388: # ROM: 0x3D4388 diff --git a/asm/Kyoto/Graphics/CCubeMoviePlayer.s b/asm/Kyoto/Graphics/CCubeMoviePlayer.s index 20f89a49..8585772b 100644 --- a/asm/Kyoto/Graphics/CCubeMoviePlayer.s +++ b/asm/Kyoto/Graphics/CCubeMoviePlayer.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A89E8 lbl_805A89E8: @@ -24,6 +25,7 @@ lbl_805A89F0: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9660 lbl_805A9660: @@ -2691,6 +2693,7 @@ lbl_8035DAFC: /* 8035DB0C 0035AA6C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEA30 lbl_805AEA30: # ROM: 0x3FB2D0 @@ -2741,6 +2744,7 @@ lbl_805AEA58: .section .rodata +.balign 8 .global lbl_803D8380 lbl_803D8380: # ROM: 0x3D5380 diff --git a/asm/Kyoto/Graphics/CCubeSurface.s b/asm/Kyoto/Graphics/CCubeSurface.s index af6ec5a4..13a71fb2 100644 --- a/asm/Kyoto/Graphics/CCubeSurface.s +++ b/asm/Kyoto/Graphics/CCubeSurface.s @@ -48,6 +48,7 @@ __sinit_CCubeSurface_cpp: /* 80348330 00345290 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE938 lbl_805AE938: # ROM: 0x3FB1D8 diff --git a/asm/Kyoto/Graphics/CGX.s b/asm/Kyoto/Graphics/CGX.s index 47274cfa..ba5ed772 100644 --- a/asm/Kyoto/Graphics/CGX.s +++ b/asm/Kyoto/Graphics/CGX.s @@ -5,12 +5,14 @@ lbl_ctor: .4byte __sinit_CGX_cpp .section .bss +.balign 8 .global lbl_80479BD0 lbl_80479BD0: .skip 0xF0 .section .sbss2, "", @nobits +.balign 8 # CGX .global lbl_805AF4A0 lbl_805AF4A0: @@ -1423,6 +1425,7 @@ __sinit_CGX_cpp: /* 80308EA4 00305E04 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE4B8 lbl_805AE4B8: # ROM: 0x3FAD58 @@ -1445,6 +1448,7 @@ lbl_805AE4C4: .section .rodata +.balign 8 .global lbl_803D73A0 lbl_803D73A0: # ROM: 0x3D43A0 diff --git a/asm/Kyoto/Graphics/CLight.s b/asm/Kyoto/Graphics/CLight.s index 550a1099..2b673387 100644 --- a/asm/Kyoto/Graphics/CLight.s +++ b/asm/Kyoto/Graphics/CLight.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CLight_cpp .section .sdata +.balign 8 .global lbl_805A8810 lbl_805A8810: @@ -486,6 +487,7 @@ __sinit_CLight_cpp: /* 8030662C 0030358C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE498 lbl_805AE498: # ROM: 0x3FAD38 diff --git a/asm/Kyoto/Graphics/CTevCombiners.s b/asm/Kyoto/Graphics/CTevCombiners.s index 1276f07b..ac0f75b1 100644 --- a/asm/Kyoto/Graphics/CTevCombiners.s +++ b/asm/Kyoto/Graphics/CTevCombiners.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CTevCombiners_cpp .section .sdata +.balign 8 .global lbl_805A8820 lbl_805A8820: @@ -16,12 +17,8 @@ lbl_805A8824: # ROM: 0x3F61C4 .4byte 0xFFFFFFFF -.global lbl_805A8828 -lbl_805A8828: - # ROM: 0x3F61C8 - .4byte 0x805A564C - .section .sbss, "wa" +.balign 8 .global lbl_805A9358 lbl_805A9358: diff --git a/asm/Kyoto/Graphics/DolphinCColor.s b/asm/Kyoto/Graphics/DolphinCColor.s index c301f6b8..7ddaf6a6 100644 --- a/asm/Kyoto/Graphics/DolphinCColor.s +++ b/asm/Kyoto/Graphics/DolphinCColor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8A20 lbl_805A8A20: @@ -344,6 +345,7 @@ __ct__6CColorFR12CInputStream: /* 803634DC 0036043C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEAC0 lbl_805AEAC0: # ROM: 0x3FB360 diff --git a/asm/Kyoto/Graphics/DolphinCGraphics.s b/asm/Kyoto/Graphics/DolphinCGraphics.s index 00daefc1..772e4a19 100644 --- a/asm/Kyoto/Graphics/DolphinCGraphics.s +++ b/asm/Kyoto/Graphics/DolphinCGraphics.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_DolphinCGraphics_cpp .section .data +.balign 8 .global lbl_803ED910 lbl_803ED910: @@ -41,6 +42,12 @@ lbl_803ED948: .4byte lbl_8030AD80 .section .sdata +.balign 8 + +.global lbl_805A8828 +lbl_805A8828: + # ROM: 0x3F61C8 + .4byte 0x805A564C .global lbl_805A882C lbl_805A882C: @@ -98,6 +105,7 @@ lbl_805A884C: .float 2.0 .section .bss +.balign 8 .global lbl_80479CC0 lbl_80479CC0: @@ -107,6 +115,7 @@ lbl_804BFCC0: .skip 0x50 .section .sbss, "wa" +.balign 8 .global lbl_805A9368 lbl_805A9368: @@ -5569,6 +5578,7 @@ __ct__14CGXLightParamsFv: /* 8030DE58 0030ADB8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE4C8 lbl_805AE4C8: # ROM: 0x3FAD68 @@ -5748,6 +5758,7 @@ lbl_805AE554: .section .rodata +.balign 8 .global lbl_803D73C8 lbl_803D73C8: # ROM: 0x3D43C8 diff --git a/asm/Kyoto/Graphics/DolphinCModel.s b/asm/Kyoto/Graphics/DolphinCModel.s index b64e7526..05460f45 100644 --- a/asm/Kyoto/Graphics/DolphinCModel.s +++ b/asm/Kyoto/Graphics/DolphinCModel.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A89D0 lbl_805A89D0: @@ -9,6 +10,7 @@ lbl_805A89D0: .4byte 0 .section .data +.balign 8 .global lbl_803EF738 lbl_803EF738: @@ -19,6 +21,7 @@ lbl_803EF738: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9638 lbl_805A9638: @@ -1514,6 +1517,7 @@ lbl_803564D4: /* 803564FC 0035345C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8308 lbl_803D8308: # ROM: 0x3D5308 diff --git a/asm/Kyoto/Graphics/DolphinCPalette.s b/asm/Kyoto/Graphics/DolphinCPalette.s index a910fcd7..4af94180 100644 --- a/asm/Kyoto/Graphics/DolphinCPalette.s +++ b/asm/Kyoto/Graphics/DolphinCPalette.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9428 lbl_805A9428: @@ -199,6 +200,7 @@ __ct__16CGraphicsPaletteF14EPaletteFormati: /* 8030E108 0030B068 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D73E8 lbl_803D73E8: # ROM: 0x3D43E8 diff --git a/asm/Kyoto/Graphics/DolphinCTexture.s b/asm/Kyoto/Graphics/DolphinCTexture.s index 942cf958..04939a10 100644 --- a/asm/Kyoto/Graphics/DolphinCTexture.s +++ b/asm/Kyoto/Graphics/DolphinCTexture.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED968 lbl_803ED968: @@ -34,12 +35,14 @@ lbl_803ED994: .section .bss +.balign 8 .global lbl_804BFD10 lbl_804BFD10: .skip 0x20 .section .sbss, "wa" +.balign 8 .global lbl_805A9430 lbl_805A9430: @@ -2223,6 +2226,7 @@ __ct__8CTextureF12ETexelFormatssi: /* 8030FF20 0030CE80 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE558 lbl_805AE558: # ROM: 0x3FADF8 @@ -2240,6 +2244,7 @@ lbl_805AE560: .section .rodata +.balign 8 .global lbl_803D73F0 lbl_803D73F0: # ROM: 0x3D43F0 diff --git a/asm/Kyoto/IObj.s b/asm/Kyoto/IObj.s index 3bd57cf3..5aecfd50 100644 --- a/asm/Kyoto/IObj.s +++ b/asm/Kyoto/IObj.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_IObj_cpp .section .sbss, "wa" +.balign 8 .global lbl_805A9510 lbl_805A9510: diff --git a/asm/Kyoto/Input/CDolphinController.s b/asm/Kyoto/Input/CDolphinController.s index 93670649..d6e6ed30 100644 --- a/asm/Kyoto/Input/CDolphinController.s +++ b/asm/Kyoto/Input/CDolphinController.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF6A0 lbl_803EF6A0: @@ -654,6 +655,7 @@ __ct__15CControllerAxisFv: /* 8034F8CC 0034C82C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE970 lbl_805AE970: # ROM: 0x3FB210 diff --git a/asm/Kyoto/Input/CRumbleGenerator.s b/asm/Kyoto/Input/CRumbleGenerator.s index 35fd2908..41a96531 100644 --- a/asm/Kyoto/Input/CRumbleGenerator.s +++ b/asm/Kyoto/Input/CRumbleGenerator.s @@ -364,6 +364,7 @@ __ct__16CRumbleGeneratorFv: /* 8036A1F0 00367150 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEB10 lbl_805AEB10: # ROM: 0x3FB3B0 @@ -386,6 +387,7 @@ lbl_805AEB1C: .section .rodata +.balign 8 .global lbl_803D8548 lbl_803D8548: # ROM: 0x3D5548 diff --git a/asm/Kyoto/Input/CRumbleVoice.s b/asm/Kyoto/Input/CRumbleVoice.s index c74e9fda..21f8c2ca 100644 --- a/asm/Kyoto/Input/CRumbleVoice.s +++ b/asm/Kyoto/Input/CRumbleVoice.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8A60 lbl_805A8A60: @@ -702,6 +703,7 @@ lbl_80369BB4: /* 80369BD4 00366B34 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEAF8 lbl_805AEAF8: # ROM: 0x3FB398 @@ -724,6 +726,7 @@ lbl_805AEB04: .section .rodata +.balign 8 .global lbl_803D8540 lbl_803D8540: # ROM: 0x3D5540 diff --git a/asm/Kyoto/Input/DolphinIController.s b/asm/Kyoto/Input/DolphinIController.s index cb6a721a..cb8122ce 100644 --- a/asm/Kyoto/Input/DolphinIController.s +++ b/asm/Kyoto/Input/DolphinIController.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF680 lbl_803EF680: @@ -15,6 +16,7 @@ lbl_803EF680: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A95C8 lbl_805A95C8: @@ -80,6 +82,7 @@ __ct__11IControllerFv: /* 8034F05C 0034BFBC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8228 lbl_803D8228: # ROM: 0x3D5228 diff --git a/asm/Kyoto/Input/RumbleAdsr.s b/asm/Kyoto/Input/RumbleAdsr.s index 8c936a67..799cfb22 100644 --- a/asm/Kyoto/Input/RumbleAdsr.s +++ b/asm/Kyoto/Input/RumbleAdsr.s @@ -98,6 +98,7 @@ lbl_80369CEC: /* 80369CFC 00366C5C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEB08 lbl_805AEB08: # ROM: 0x3FB3A8 diff --git a/asm/Kyoto/Math/CAABox.s b/asm/Kyoto/Math/CAABox.s index f205ff98..d678641a 100644 --- a/asm/Kyoto/Math/CAABox.s +++ b/asm/Kyoto/Math/CAABox.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CAABox_cpp .section .data +.balign 8 .global lbl_803EE318 lbl_803EE318: @@ -35,6 +36,7 @@ lbl_803EE338: .4byte lbl_80338220 .section .sbss2, "", @nobits +.balign 8 # CAABox .global lbl_805AF4A8 lbl_805AF4A8: @@ -1478,6 +1480,7 @@ __sinit_CAABox_cpp: /* 803385C8 00335528 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE8A8 lbl_805AE8A8: # ROM: 0x3FB148 diff --git a/asm/Kyoto/Math/CMatrix3f.s b/asm/Kyoto/Math/CMatrix3f.s index 5a395ae7..0e3bed69 100644 --- a/asm/Kyoto/Math/CMatrix3f.s +++ b/asm/Kyoto/Math/CMatrix3f.s @@ -504,6 +504,7 @@ __sinit_CMatrix3f_cpp: /* 8031071C 0030D67C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE570 lbl_805AE570: # ROM: 0x3FAE10 diff --git a/asm/Kyoto/Math/CMatrix4f.s b/asm/Kyoto/Math/CMatrix4f.s index 904d21a3..1442008b 100644 --- a/asm/Kyoto/Math/CMatrix4f.s +++ b/asm/Kyoto/Math/CMatrix4f.s @@ -200,6 +200,7 @@ __sinit_CMatrix4f_cpp: /* 803109E4 0030D944 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE578 lbl_805AE578: # ROM: 0x3FAE18 diff --git a/asm/Kyoto/Math/CPlane.s b/asm/Kyoto/Math/CPlane.s index 65880051..b0bd1541 100644 --- a/asm/Kyoto/Math/CPlane.s +++ b/asm/Kyoto/Math/CPlane.s @@ -107,6 +107,7 @@ __ct__6CPlaneFRC9CVector3fRC9CVector3fRC9CVector3f: /* 80337184 003340E4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE8A0 lbl_805AE8A0: # ROM: 0x3FB140 diff --git a/asm/Kyoto/Math/CQuaternion.s b/asm/Kyoto/Math/CQuaternion.s index bff1a80d..498bd7f2 100644 --- a/asm/Kyoto/Math/CQuaternion.s +++ b/asm/Kyoto/Math/CQuaternion.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CQuaternion_cpp .section .bss +.balign 8 .global lbl_804BFD30 lbl_804BFD30: @@ -17,6 +18,7 @@ lbl_804BFD48: .skip 0x10 .section .sdata +.balign 8 .global lbl_805A8850 lbl_805A8850: @@ -49,6 +51,7 @@ lbl_805A8864: .float -1.0 .section .sbss, "wa" +.balign 8 .global lbl_805A9448 lbl_805A9448: @@ -1947,6 +1950,7 @@ __sinit_CQuaternion_cpp: /* 803124D8 0030F438 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE580 lbl_805AE580: # ROM: 0x3FAE20 diff --git a/asm/Kyoto/Math/CTransform4f.s b/asm/Kyoto/Math/CTransform4f.s index c7c07cd8..b0310199 100644 --- a/asm/Kyoto/Math/CTransform4f.s +++ b/asm/Kyoto/Math/CTransform4f.s @@ -1586,6 +1586,7 @@ __sinit_CTransform4f_cpp: /* 80313DCC 00310D2C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE5F0 lbl_805AE5F0: # ROM: 0x3FAE90 diff --git a/asm/Kyoto/Math/CUnitVector3f.s b/asm/Kyoto/Math/CUnitVector3f.s index 7830b9a2..06bf55dd 100644 --- a/asm/Kyoto/Math/CUnitVector3f.s +++ b/asm/Kyoto/Math/CUnitVector3f.s @@ -47,6 +47,7 @@ lbl_80313E34: /* 80313E60 00310DC0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE610 lbl_805AE610: # ROM: 0x3FAEB0 diff --git a/asm/Kyoto/Math/CVector2f.s b/asm/Kyoto/Math/CVector2f.s index b3f8f8a0..1453572c 100644 --- a/asm/Kyoto/Math/CVector2f.s +++ b/asm/Kyoto/Math/CVector2f.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CVector2f_cpp .section .sbss, "wa" +.balign 8 # skZero2f .global lbl_805A9458 lbl_805A9458: @@ -321,6 +322,7 @@ __sinit_CVector2f_cpp: /* 80314248 003111A8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE618 lbl_805AE618: # ROM: 0x3FAEB8 diff --git a/asm/Kyoto/Math/CVector3d.s b/asm/Kyoto/Math/CVector3d.s index 5fc1b970..bcfc8074 100644 --- a/asm/Kyoto/Math/CVector3d.s +++ b/asm/Kyoto/Math/CVector3d.s @@ -186,6 +186,7 @@ __ct__9CVector3dFddd: /* 803145AC 0031150C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE628 lbl_805AE628: # ROM: 0x3FAEC8 diff --git a/asm/Kyoto/Math/CVector3f.s b/asm/Kyoto/Math/CVector3f.s index 28941bc2..b02278e1 100644 --- a/asm/Kyoto/Math/CVector3f.s +++ b/asm/Kyoto/Math/CVector3f.s @@ -483,6 +483,7 @@ __ct__9CVector3iFiii: /* 80314C54 00311BB4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE630 lbl_805AE630: # ROM: 0x3FAED0 diff --git a/asm/Kyoto/Math/CloseEnough.s b/asm/Kyoto/Math/CloseEnough.s index e441b78f..36f13092 100644 --- a/asm/Kyoto/Math/CloseEnough.s +++ b/asm/Kyoto/Math/CloseEnough.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CloseEnough_cpp .section .sbss, "wa" +.balign 8 .global lbl_805A9440 lbl_805A9440: @@ -78,6 +79,7 @@ __sinit_CloseEnough_cpp: /* 8030FFF4 0030CF54 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE568 lbl_805AE568: # ROM: 0x3FAE08 diff --git a/asm/Kyoto/Math/RMathUtils.s b/asm/Kyoto/Math/RMathUtils.s index 18de3b9e..599728a4 100644 --- a/asm/Kyoto/Math/RMathUtils.s +++ b/asm/Kyoto/Math/RMathUtils.s @@ -679,6 +679,7 @@ lbl_80315588: /* 8031558C 003124EC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE648 lbl_805AE648: # ROM: 0x3FAEE8 diff --git a/asm/Kyoto/PVS/CPVSVisOctree.s b/asm/Kyoto/PVS/CPVSVisOctree.s index ec4aea5d..accb5919 100644 --- a/asm/Kyoto/PVS/CPVSVisOctree.s +++ b/asm/Kyoto/PVS/CPVSVisOctree.s @@ -159,6 +159,7 @@ lbl_80315F6C: /* 80315F74 00312ED4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE6F0 lbl_805AE6F0: # ROM: 0x3FAF90 @@ -167,6 +168,7 @@ lbl_805AE6F0: .section .rodata +.balign 8 .global lbl_803D7820 lbl_803D7820: # ROM: 0x3D4820 diff --git a/asm/Kyoto/Particles/CColorElement.s b/asm/Kyoto/Particles/CColorElement.s index 97a1530b..a643d2b5 100644 --- a/asm/Kyoto/Particles/CColorElement.s +++ b/asm/Kyoto/Particles/CColorElement.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EDA00 lbl_803EDA00: @@ -67,6 +68,7 @@ lbl_803EDA70: .4byte GetValue__11CCEConstantCFiR6CColor .section .sdata +.balign 8 .global lbl_805A8870 lbl_805A8870: @@ -1470,6 +1472,7 @@ lbl_80317610: /* 80317628 00314588 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE6F8 lbl_805AE6F8: # ROM: 0x3FAF98 @@ -1483,6 +1486,7 @@ lbl_805AE700: .section .rodata +.balign 8 .global lbl_803D7840 lbl_803D7840: # ROM: 0x3D4840 diff --git a/asm/Kyoto/Particles/CElementGen.s b/asm/Kyoto/Particles/CElementGen.s index 65587b54..66dda2c7 100644 --- a/asm/Kyoto/Particles/CElementGen.s +++ b/asm/Kyoto/Particles/CElementGen.s @@ -7,6 +7,7 @@ lbl_ctor: .4byte __sinit_CElementGen_cpp .section .data +.balign 8 .global lbl_803EDA80 lbl_803EDA80: @@ -341,6 +342,7 @@ lbl_803EDD08: .4byte 0 .section .sdata +.balign 8 .global lbl_805A88B0 lbl_805A88B0: @@ -377,6 +379,7 @@ lbl_805A88D0: .4byte 0 .section .bss +.balign 8 .global lbl_804BFE28 lbl_804BFE28: @@ -395,6 +398,7 @@ lbl_804BFF00: .skip 0x10 .section .sbss, "wa" +.balign 8 # TODO this probably isn't split properly .global lbl_805A9470 lbl_805A9470: @@ -21806,6 +21810,7 @@ lbl_8032A5B0: /* 8032A5CC 0032752C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE708 lbl_805AE708: # ROM: 0x3FAFA8 @@ -21949,6 +21954,7 @@ lbl_805AE790: .section .rodata +.balign 8 .global lbl_803D7848 lbl_803D7848: # ROM: 0x3D4848 diff --git a/asm/Kyoto/Particles/CEmitterElement.s b/asm/Kyoto/Particles/CEmitterElement.s index d0c7c93a..4dcc9f34 100644 --- a/asm/Kyoto/Particles/CEmitterElement.s +++ b/asm/Kyoto/Particles/CEmitterElement.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF748 lbl_803EF748: @@ -737,6 +738,7 @@ __ct__16CEESimpleEmitterFP14CVectorElementP14CVectorElement: /* 80357314 00354274 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE9C8 lbl_805AE9C8: # ROM: 0x3FB268 diff --git a/asm/Kyoto/Particles/CGenDescription.s b/asm/Kyoto/Particles/CGenDescription.s index 20af0d18..8795218b 100644 --- a/asm/Kyoto/Particles/CGenDescription.s +++ b/asm/Kyoto/Particles/CGenDescription.s @@ -288,6 +288,7 @@ element_from_desc__FP15CGenDescriptioni: /* 80367238 00364198 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8418 lbl_803D8418: # ROM: 0x3D5418 diff --git a/asm/Kyoto/Particles/CParticleData.s b/asm/Kyoto/Particles/CParticleData.s index 5ff2d3e0..82bc8dd3 100644 --- a/asm/Kyoto/Particles/CParticleData.s +++ b/asm/Kyoto/Particles/CParticleData.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9650 lbl_805A9650: diff --git a/asm/Kyoto/Particles/CParticleElectric.s b/asm/Kyoto/Particles/CParticleElectric.s index 5586a960..30c0c1b6 100644 --- a/asm/Kyoto/Particles/CParticleElectric.s +++ b/asm/Kyoto/Particles/CParticleElectric.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF7B8 lbl_803EF7B8: @@ -37,6 +38,7 @@ lbl_803EF7B8: .4byte Get4CharId__17CParticleElectricFv .section .sdata +.balign 8 .global lbl_805A8A10 lbl_805A8A10: @@ -5171,6 +5173,7 @@ lbl_80363058: /* 80363068 0035FFC8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEA68 lbl_805AEA68: # ROM: 0x3FB308 @@ -5262,6 +5265,7 @@ lbl_805AEAB8: .section .rodata +.balign 8 .global lbl_803D83E8 lbl_803D83E8: # ROM: 0x3D53E8 diff --git a/asm/Kyoto/Particles/CParticleElectricDataFactory.s b/asm/Kyoto/Particles/CParticleElectricDataFactory.s index ea1eb4f7..a3a41d25 100644 --- a/asm/Kyoto/Particles/CParticleElectricDataFactory.s +++ b/asm/Kyoto/Particles/CParticleElectricDataFactory.s @@ -725,6 +725,7 @@ lbl_8035E8AC: /* 8035E8D4 0035B834 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D83E0 lbl_803D83E0: # ROM: 0x3D53E0 diff --git a/asm/Kyoto/Particles/CParticleGen.s b/asm/Kyoto/Particles/CParticleGen.s index a941acf0..f7ac8d8c 100644 --- a/asm/Kyoto/Particles/CParticleGen.s +++ b/asm/Kyoto/Particles/CParticleGen.s @@ -52,6 +52,7 @@ lbl_8032A640: /* 8032A678 003275D8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7920 lbl_803D7920: # ROM: 0x3D4920 diff --git a/asm/Kyoto/Particles/CParticleGlobals.s b/asm/Kyoto/Particles/CParticleGlobals.s index ed4374a8..ea274577 100644 --- a/asm/Kyoto/Particles/CParticleGlobals.s +++ b/asm/Kyoto/Particles/CParticleGlobals.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9490 lbl_805A9490: @@ -127,6 +128,7 @@ SetParticleLifetime__16CParticleGlobalsFi: /* 8032A7A4 00327704 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE798 lbl_805AE798: # ROM: 0x3FB038 diff --git a/asm/Kyoto/Particles/CParticleSwoosh.s b/asm/Kyoto/Particles/CParticleSwoosh.s index 2b6b2a40..6823dd5f 100644 --- a/asm/Kyoto/Particles/CParticleSwoosh.s +++ b/asm/Kyoto/Particles/CParticleSwoosh.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EDD80 lbl_803EDD80: @@ -37,6 +38,7 @@ lbl_803EDD80: .4byte Get4CharId__15CParticleSwooshCF .section .sdata +.balign 8 .global lbl_805A88D8 lbl_805A88D8: @@ -5701,6 +5703,7 @@ lbl_8032F938: /* 8032F960 0032C8C0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE7B0 lbl_805AE7B0: # ROM: 0x3FB050 @@ -5852,6 +5855,7 @@ lbl_805AE830: .section .rodata +.balign 8 .global lbl_803D7928 lbl_803D7928: # ROM: 0x3D4928 diff --git a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s index 4385e409..3c31e93e 100644 --- a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s +++ b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EDDF8 lbl_803EDDF8: @@ -613,6 +614,7 @@ lbl_80330158: /* 80330180 0032D0E0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7970 lbl_803D7970: # ROM: 0x3D4970 diff --git a/asm/Kyoto/Particles/CRealElement.s b/asm/Kyoto/Particles/CRealElement.s index f665309a..9aef1c4d 100644 --- a/asm/Kyoto/Particles/CRealElement.s +++ b/asm/Kyoto/Particles/CRealElement.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EDE08 lbl_803EDE08: @@ -355,6 +356,7 @@ lbl_803EE100: .4byte 0 .section .sdata +.balign 8 .global lbl_805A88E0 lbl_805A88E0: @@ -4117,6 +4119,7 @@ IsConstant__11CREConstantCFv: /* 80333464 003303C4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE838 lbl_805AE838: # ROM: 0x3FB0D8 diff --git a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s index a27a894b..b66795f5 100644 --- a/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s +++ b/asm/Kyoto/Particles/CSpawnSystemKeyframeData.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_804BFF10 lbl_804BFF10: @@ -10,6 +11,7 @@ lbl_804BFF1C: .skip 0x14 .section .sbss, "wa" +.balign 8 .global lbl_805A94C0 lbl_805A94C0: @@ -875,6 +877,7 @@ lbl_80333F7C: /* 80333FA4 00330F04 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7978 lbl_803D7978: # ROM: 0x3D4978 diff --git a/asm/Kyoto/Particles/CUVElement.s b/asm/Kyoto/Particles/CUVElement.s index 44786856..b61dd02f 100644 --- a/asm/Kyoto/Particles/CUVElement.s +++ b/asm/Kyoto/Particles/CUVElement.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE118 lbl_803EE118: @@ -25,6 +26,7 @@ lbl_803EE134: .4byte HasConstantUV__12CUVEConstantFv .section .sdata +.balign 8 .global lbl_805A88E8 lbl_805A88E8: @@ -683,6 +685,7 @@ lbl_8033485C: /* 80334874 003317D4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE860 lbl_805AE860: # ROM: 0x3FB100 @@ -700,6 +703,7 @@ lbl_805AE86C: .section .rodata +.balign 8 .global lbl_803D7980 lbl_803D7980: # ROM: 0x3D4980 diff --git a/asm/Kyoto/Particles/CVectorElement.s b/asm/Kyoto/Particles/CVectorElement.s index cef7b6d7..4e79af37 100644 --- a/asm/Kyoto/Particles/CVectorElement.s +++ b/asm/Kyoto/Particles/CVectorElement.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE150 lbl_803EE150: @@ -193,6 +194,7 @@ lbl_803EE2E0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A88F8 lbl_805A88F8: @@ -2998,6 +3000,7 @@ IsFastConstant__15CVEFastConstantCF: /* 80336FC0 00333F20 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE870 lbl_805AE870: # ROM: 0x3FB110 diff --git a/asm/Kyoto/Particles/CWarp.s b/asm/Kyoto/Particles/CWarp.s index 6aa38774..b0fe3b74 100644 --- a/asm/Kyoto/Particles/CWarp.s +++ b/asm/Kyoto/Particles/CWarp.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE2F8 lbl_803EE2F8: diff --git a/asm/Kyoto/Streams/CInputStream.s b/asm/Kyoto/Streams/CInputStream.s index c605f3f8..2d2eab2e 100644 --- a/asm/Kyoto/Streams/CInputStream.s +++ b/asm/Kyoto/Streams/CInputStream.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global __vt__12CInputStream __vt__12CInputStream: @@ -11,6 +12,7 @@ __vt__12CInputStream: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A94F0 lbl_805A94F0: @@ -454,6 +456,7 @@ __ct__12CInputStreamFi: /* 8033F1C0 0033C120 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7A68 lbl_803D7A68: # ROM: 0x3D4A68 diff --git a/asm/Kyoto/Streams/CMemoryInStream.s b/asm/Kyoto/Streams/CMemoryInStream.s index 9c968aff..8bb0b99a 100644 --- a/asm/Kyoto/Streams/CMemoryInStream.s +++ b/asm/Kyoto/Streams/CMemoryInStream.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global __vt__15CMemoryInStream __vt__15CMemoryInStream: diff --git a/asm/Kyoto/Streams/CMemoryStreamOut.s b/asm/Kyoto/Streams/CMemoryStreamOut.s index 6686e1e5..97db2d09 100644 --- a/asm/Kyoto/Streams/CMemoryStreamOut.s +++ b/asm/Kyoto/Streams/CMemoryStreamOut.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE3A8 lbl_803EE3A8: diff --git a/asm/Kyoto/Streams/COutputStream.s b/asm/Kyoto/Streams/COutputStream.s index 7eb3e639..d2846d15 100644 --- a/asm/Kyoto/Streams/COutputStream.s +++ b/asm/Kyoto/Streams/COutputStream.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE3B8 lbl_803EE3B8: @@ -303,6 +304,7 @@ lbl_8033F77C: /* 8033F7A8 0033C708 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7A70 lbl_803D7A70: # ROM: 0x3D4A70 diff --git a/asm/Kyoto/Streams/CZipInputStream.s b/asm/Kyoto/Streams/CZipInputStream.s index 533311bb..ab22da98 100644 --- a/asm/Kyoto/Streams/CZipInputStream.s +++ b/asm/Kyoto/Streams/CZipInputStream.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE3C8 lbl_803EE3C8: @@ -171,6 +172,7 @@ lbl_8033F8E4: /* 8033F9E8 0033C948 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7A78 lbl_803D7A78: # ROM: 0x3D4A78 diff --git a/asm/Kyoto/Streams/CZipSupport.s b/asm/Kyoto/Streams/CZipSupport.s index 5979e55e..2d3fe529 100644 --- a/asm/Kyoto/Streams/CZipSupport.s +++ b/asm/Kyoto/Streams/CZipSupport.s @@ -33,6 +33,7 @@ Alloc__11CZipSupportFPvUiUi: /* 8033FA44 0033C9A4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7A88 lbl_803D7A88: # ROM: 0x3D4A88 diff --git a/asm/Kyoto/Text/CBlockInstruction.s b/asm/Kyoto/Text/CBlockInstruction.s index baf91eaf..d0f5744d 100644 --- a/asm/Kyoto/Text/CBlockInstruction.s +++ b/asm/Kyoto/Text/CBlockInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED8C8 lbl_803ED8C8: diff --git a/asm/Kyoto/Text/CColorInstruction.s b/asm/Kyoto/Text/CColorInstruction.s index 95b0c6ba..37fbcf85 100644 --- a/asm/Kyoto/Text/CColorInstruction.s +++ b/asm/Kyoto/Text/CColorInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED5B0 lbl_803ED5B0: diff --git a/asm/Kyoto/Text/CColorOverrideInstruction.s b/asm/Kyoto/Text/CColorOverrideInstruction.s index 7c4d321f..b0dc0a28 100644 --- a/asm/Kyoto/Text/CColorOverrideInstruction.s +++ b/asm/Kyoto/Text/CColorOverrideInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED5D0 lbl_803ED5D0: diff --git a/asm/Kyoto/Text/CDrawStringOptions.s b/asm/Kyoto/Text/CDrawStringOptions.s index da115fb1..5e23bda6 100644 --- a/asm/Kyoto/Text/CDrawStringOptions.s +++ b/asm/Kyoto/Text/CDrawStringOptions.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8800 lbl_805A8800: diff --git a/asm/Kyoto/Text/CFont.s b/asm/Kyoto/Text/CFont.s index 7c94b1a3..53b674b3 100644 --- a/asm/Kyoto/Text/CFont.s +++ b/asm/Kyoto/Text/CFont.s @@ -51,6 +51,7 @@ __ct__5CFontFf: /* 80306020 00302F80 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE490 lbl_805AE490: # ROM: 0x3FAD30 diff --git a/asm/Kyoto/Text/CFontImageDef.s b/asm/Kyoto/Text/CFontImageDef.s index 851af831..18847d81 100644 --- a/asm/Kyoto/Text/CFontImageDef.s +++ b/asm/Kyoto/Text/CFontImageDef.s @@ -215,6 +215,7 @@ lbl_803596E0: /* 80359714 00356674 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEA00 lbl_805AEA00: # ROM: 0x3FB2A0 @@ -238,6 +239,7 @@ lbl_805AEA10: .section .rodata +.balign 8 .global lbl_803D8348 lbl_803D8348: # ROM: 0x3D5348 diff --git a/asm/Kyoto/Text/CFontRenderState.s b/asm/Kyoto/Text/CFontRenderState.s index d969e5ef..6e142af6 100644 --- a/asm/Kyoto/Text/CFontRenderState.s +++ b/asm/Kyoto/Text/CFontRenderState.s @@ -837,6 +837,7 @@ lbl_802FF7F0: /* 802FF808 002FC768 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE458 lbl_805AE458: # ROM: 0x3FACF8 @@ -844,6 +845,7 @@ lbl_805AE458: .section .rodata +.balign 8 .global lbl_803D6E60 lbl_803D6E60: # ROM: 0x3D3E60 diff --git a/asm/Kyoto/Text/CImageInstruction.s b/asm/Kyoto/Text/CImageInstruction.s index abf478cd..79550e1d 100644 --- a/asm/Kyoto/Text/CImageInstruction.s +++ b/asm/Kyoto/Text/CImageInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EF798 lbl_803EF798: @@ -288,6 +289,7 @@ CalculateHeight__13CFontImageDefFv: /* 80359AE8 00356A48 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEA18 lbl_805AEA18: # ROM: 0x3FB2B8 diff --git a/asm/Kyoto/Text/CLineExtraSpaceInstruction.s b/asm/Kyoto/Text/CLineExtraSpaceInstruction.s index 3adf9bbf..fa0719b9 100644 --- a/asm/Kyoto/Text/CLineExtraSpaceInstruction.s +++ b/asm/Kyoto/Text/CLineExtraSpaceInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED610 lbl_803ED610: diff --git a/asm/Kyoto/Text/CLineInstruction.s b/asm/Kyoto/Text/CLineInstruction.s index 0a871599..8cf739ec 100644 --- a/asm/Kyoto/Text/CLineInstruction.s +++ b/asm/Kyoto/Text/CLineInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED630 lbl_803ED630: diff --git a/asm/Kyoto/Text/CLineSpacingInstruction.s b/asm/Kyoto/Text/CLineSpacingInstruction.s index 3601d01a..9e909cd0 100644 --- a/asm/Kyoto/Text/CLineSpacingInstruction.s +++ b/asm/Kyoto/Text/CLineSpacingInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED678 lbl_803ED678: diff --git a/asm/Kyoto/Text/CPopStateInstruction.s b/asm/Kyoto/Text/CPopStateInstruction.s index 7bbf9159..0ea0b038 100644 --- a/asm/Kyoto/Text/CPopStateInstruction.s +++ b/asm/Kyoto/Text/CPopStateInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED698 lbl_803ED698: diff --git a/asm/Kyoto/Text/CPushStateInstruction.s b/asm/Kyoto/Text/CPushStateInstruction.s index ad6c4299..bf2b14a9 100644 --- a/asm/Kyoto/Text/CPushStateInstruction.s +++ b/asm/Kyoto/Text/CPushStateInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED6B8 lbl_803ED6B8: diff --git a/asm/Kyoto/Text/CRasterFont.s b/asm/Kyoto/Text/CRasterFont.s index a17dc81c..7593e0e4 100644 --- a/asm/Kyoto/Text/CRasterFont.s +++ b/asm/Kyoto/Text/CRasterFont.s @@ -1818,6 +1818,7 @@ lbl_8030181C: /* 80301838 002FE798 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE460 lbl_805AE460: # ROM: 0x3FAD00 @@ -1826,6 +1827,7 @@ lbl_805AE460: .section .rodata +.balign 8 .global lbl_803D6E68 lbl_803D6E68: # ROM: 0x3D3E68 diff --git a/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s b/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s index 9f16127f..f9f6fbfa 100644 --- a/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s +++ b/asm/Kyoto/Text/CRemoveColorOverrideInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED6D8 lbl_803ED6D8: diff --git a/asm/Kyoto/Text/CSavableState.s b/asm/Kyoto/Text/CSavableState.s index 9faf6fb1..5b5c225a 100644 --- a/asm/Kyoto/Text/CSavableState.s +++ b/asm/Kyoto/Text/CSavableState.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8808 lbl_805A8808: @@ -178,6 +179,7 @@ lbl_80301AF0: /* 80301B2C 002FEA8C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE468 lbl_805AE468: # ROM: 0x3FAD08 @@ -186,6 +188,7 @@ lbl_805AE468: .section .rodata +.balign 8 .global lbl_803D6E88 lbl_803D6E88: # ROM: 0x3D3E88 diff --git a/asm/Kyoto/Text/CStringTable.s b/asm/Kyoto/Text/CStringTable.s index 71824783..b5dec4fb 100644 --- a/asm/Kyoto/Text/CStringTable.s +++ b/asm/Kyoto/Text/CStringTable.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A89D8 lbl_805A89D8: @@ -308,6 +309,7 @@ lbl_803568F4: /* 80356908 00353868 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D8310 lbl_803D8310: # ROM: 0x3D5310 diff --git a/asm/Kyoto/Text/CTextExecuteBuffer.s b/asm/Kyoto/Text/CTextExecuteBuffer.s index 093a4925..0c134602 100644 --- a/asm/Kyoto/Text/CTextExecuteBuffer.s +++ b/asm/Kyoto/Text/CTextExecuteBuffer.s @@ -2648,6 +2648,7 @@ lbl_80304038: /* 80304060 00300FC0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE470 lbl_805AE470: # ROM: 0x3FAD10 @@ -2655,6 +2656,7 @@ lbl_805AE470: .section .rodata +.balign 8 .global lbl_803D6E90 lbl_803D6E90: # ROM: 0x3D3E90 diff --git a/asm/Kyoto/Text/CTextInstruction.s b/asm/Kyoto/Text/CTextInstruction.s index c1c2346b..2351488c 100644 --- a/asm/Kyoto/Text/CTextInstruction.s +++ b/asm/Kyoto/Text/CTextInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED6F8 lbl_803ED6F8: @@ -203,6 +204,7 @@ lbl_803042E0: /* 803042F8 00301258 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6E98 lbl_803D6E98: # ROM: 0x3D3E98 diff --git a/asm/Kyoto/Text/CTextParser.s b/asm/Kyoto/Text/CTextParser.s index d4580a0c..a30e8a9d 100644 --- a/asm/Kyoto/Text/CTextParser.s +++ b/asm/Kyoto/Text/CTextParser.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED718 lbl_803ED718: @@ -1650,6 +1651,7 @@ lbl_8030598C: /* 8030599C 003028FC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AE478 lbl_805AE478: # ROM: 0x3FAD18 @@ -1669,6 +1671,7 @@ lbl_805AE488: .section .rodata +.balign 8 .global lbl_803D6EA0 lbl_803D6EA0: # ROM: 0x3D3EA0 diff --git a/asm/Kyoto/Text/CTextRenderBuffer.s b/asm/Kyoto/Text/CTextRenderBuffer.s index b69aa41d..4ad8a16f 100644 --- a/asm/Kyoto/Text/CTextRenderBuffer.s +++ b/asm/Kyoto/Text/CTextRenderBuffer.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A89E0 lbl_805A89E0: @@ -1888,6 +1889,7 @@ __ct__17CTextRenderBufferFQ217CTextRenderBuffer5EMode: /* 8035B5D8 00358538 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEA20 lbl_805AEA20: # ROM: 0x3FB2C0 @@ -1905,6 +1907,7 @@ lbl_805AEA2C: .section .rodata +.balign 8 .global lbl_803D8350 lbl_803D8350: # ROM: 0x3D5350 diff --git a/asm/Kyoto/Text/CWordBreakTables.s b/asm/Kyoto/Text/CWordBreakTables.s index 0c6b635e..1ed9399f 100644 --- a/asm/Kyoto/Text/CWordBreakTables.s +++ b/asm/Kyoto/Text/CWordBreakTables.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss, "wa" +.balign 8 .global lbl_805A9338 lbl_805A9338: @@ -192,6 +193,7 @@ lbl_80305B40: /* 80305BE4 00302B44 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6EC8 lbl_803D6EC8: # ROM: 0x3D3EC8 diff --git a/asm/Kyoto/Text/CWordInstruction.s b/asm/Kyoto/Text/CWordInstruction.s index 79f03343..510a1747 100644 --- a/asm/Kyoto/Text/CWordInstruction.s +++ b/asm/Kyoto/Text/CWordInstruction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803ED8A8 lbl_803ED8A8: diff --git a/asm/Kyoto/rstl/RstlExtras.s b/asm/Kyoto/rstl/RstlExtras.s index 6a34b0d1..67835be0 100644 --- a/asm/Kyoto/rstl/RstlExtras.s +++ b/asm/Kyoto/rstl/RstlExtras.s @@ -5,12 +5,14 @@ lbl_ctor: .4byte __sinit_RstlExtras_cpp .section .bss +.balign 8 .global lbl_804BFF30 lbl_804BFF30: .skip 0x10 .section .sbss, "wa" +.balign 8 .global lbl_805A94E8 lbl_805A94E8: @@ -614,6 +616,7 @@ lbl_8033EC10: .section .rodata +.balign 8 .global lbl_803D7A50 lbl_803D7A50: # ROM: 0x3D4A50 diff --git a/asm/Kyoto/rstl/rstl_strings.s b/asm/Kyoto/rstl/rstl_strings.s index 77ad407d..24e062de 100644 --- a/asm/Kyoto/rstl/rstl_strings.s +++ b/asm/Kyoto/rstl/rstl_strings.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_rstl_strings_cpp .section .sbss, "wa" +.balign 8 .global "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>" "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>": @@ -1747,6 +1748,7 @@ lbl_8033E410: /* 8033E42C 0033B38C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7A48 lbl_803D7A48: # ROM: 0x3D4A48 diff --git a/asm/Kyoto/zlib/infblock.s b/asm/Kyoto/zlib/infblock.s index f0115a77..063bdaa9 100644 --- a/asm/Kyoto/zlib/infblock.s +++ b/asm/Kyoto/zlib/infblock.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE440 lbl_803EE440: @@ -1244,6 +1245,7 @@ lbl_803423BC: /* 803423D0 0033F330 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7AA8 lbl_803D7AA8: # ROM: 0x3D4AA8 diff --git a/asm/Kyoto/zlib/infcodes.s b/asm/Kyoto/zlib/infcodes.s index 73a66d68..651d6dd7 100644 --- a/asm/Kyoto/zlib/infcodes.s +++ b/asm/Kyoto/zlib/infcodes.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE468 lbl_803EE468: @@ -737,6 +738,7 @@ lbl_80342DA4: /* 80342DC0 0033FD20 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7B68 lbl_803D7B68: # ROM: 0x3D4B68 diff --git a/asm/Kyoto/zlib/inffast.s b/asm/Kyoto/zlib/inffast.s index 1b8614f5..40da5134 100644 --- a/asm/Kyoto/zlib/inffast.s +++ b/asm/Kyoto/zlib/inffast.s @@ -394,6 +394,7 @@ lbl_80343350: /* 80343358 003402B8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7BA0 lbl_803D7BA0: # ROM: 0x3D4BA0 diff --git a/asm/Kyoto/zlib/inflate.s b/asm/Kyoto/zlib/inflate.s index d8ef82be..d3122517 100644 --- a/asm/Kyoto/zlib/inflate.s +++ b/asm/Kyoto/zlib/inflate.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EE490 lbl_803EE490: @@ -638,6 +639,7 @@ lbl_80343BAC: /* 80343BBC 00340B1C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D7BD8 lbl_803D7BD8: # ROM: 0x3D4BD8 diff --git a/asm/Kyoto/zlib/inftrees.s b/asm/Kyoto/zlib/inftrees.s index a2db2fee..6600104f 100644 --- a/asm/Kyoto/zlib/inftrees.s +++ b/asm/Kyoto/zlib/inftrees.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global fixed_tl fixed_tl: @@ -1099,6 +1100,7 @@ fixed_td: .4byte 0x00006001 .section .sdata +.balign 8 .global fixed_bl fixed_bl: @@ -1711,6 +1713,7 @@ lbl_80344400: /* 80344408 00341368 4E 80 00 20 */ blr .section .rodata +.balign 8 inflate_copyright: # ROM: 0x3D4C50 diff --git a/asm/Kyoto/zlib/infutil.s b/asm/Kyoto/zlib/infutil.s index db49216b..9270971a 100644 --- a/asm/Kyoto/zlib/infutil.s +++ b/asm/Kyoto/zlib/infutil.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global inflate_mask inflate_mask: diff --git a/asm/Kyoto/zlib/zutil.s b/asm/Kyoto/zlib/zutil.s index c4b48d31..50ebb711 100644 --- a/asm/Kyoto/zlib/zutil.s +++ b/asm/Kyoto/zlib/zutil.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global zcfree zcfree: diff --git a/asm/MetaRender/CCubeRenderer.s b/asm/MetaRender/CCubeRenderer.s index b97152f2..d3bbf365 100644 --- a/asm/MetaRender/CCubeRenderer.s +++ b/asm/MetaRender/CCubeRenderer.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CCubeRenderer_cpp .section .sbss, "wa" +.balign 8 .global lbl_805A91B0 lbl_805A91B0: @@ -53,6 +54,7 @@ lbl_805A91F4: .skip 0x4 .section .data +.balign 8 .global lbl_803EC5D8 lbl_803EC5D8: @@ -131,6 +133,7 @@ lbl_803EC5D8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8658 lbl_805A8658: @@ -243,6 +246,7 @@ lbl_805A86AC: .4byte 0 .section .sbss2, "", @nobits +.balign 8 # CCubeRenderer .global lbl_805AF490 @@ -256,6 +260,7 @@ lbl_805AF498: .skip 0x8 .section .bss +.balign 8 .global lbl_8046E200 lbl_8046E200: @@ -12539,6 +12544,7 @@ lbl_802C0BCC: /* 802C0BF0 002BDB50 4B FF DA A8 */ b __dt__13CCubeRendererFv .section .sdata2, "a" +.balign 8 .global lbl_805ADF88 lbl_805ADF88: # ROM: 0x3FA828 @@ -12790,6 +12796,7 @@ lbl_805AE078: .section .rodata +.balign 8 .global lbl_803D6570 lbl_803D6570: # ROM: 0x3D3570 diff --git a/asm/MetroidPrime/BodyState/CABSAim.s b/asm/MetroidPrime/BodyState/CABSAim.s index cb73d72e..89ca2af8 100644 --- a/asm/MetroidPrime/BodyState/CABSAim.s +++ b/asm/MetroidPrime/BodyState/CABSAim.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5CA0 lbl_803E5CA0: @@ -15,6 +16,7 @@ lbl_803E5CA0: .4byte Shutdown__7CABSAimFR15CBodyController .section .sdata +.balign 8 .global lbl_805A7D98 @@ -573,6 +575,7 @@ __ct__7CABSAimFv: /* 801DA49C 001D73FC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC9D0 lbl_805AC9D0: # ROM: 0x3F9270 diff --git a/asm/MetroidPrime/BodyState/CABSFlinch.s b/asm/MetroidPrime/BodyState/CABSFlinch.s index 44744649..81f4bbf3 100644 --- a/asm/MetroidPrime/BodyState/CABSFlinch.s +++ b/asm/MetroidPrime/BodyState/CABSFlinch.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5C80 lbl_803E5C80: @@ -229,6 +230,7 @@ __ct__10CABSFlinchFv: /* 801D9D14 001D6C74 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC9C0 lbl_805AC9C0: # ROM: 0x3F9260 diff --git a/asm/MetroidPrime/BodyState/CABSIdle.s b/asm/MetroidPrime/BodyState/CABSIdle.s index 9e3fac26..ba7b0994 100644 --- a/asm/MetroidPrime/BodyState/CABSIdle.s +++ b/asm/MetroidPrime/BodyState/CABSIdle.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5C60 lbl_803E5C60: diff --git a/asm/MetroidPrime/BodyState/CABSReaction.s b/asm/MetroidPrime/BodyState/CABSReaction.s index 9b71f1bd..20f0b9bd 100644 --- a/asm/MetroidPrime/BodyState/CABSReaction.s +++ b/asm/MetroidPrime/BodyState/CABSReaction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6758 lbl_803E6758: # ROM: 0x3E3758 @@ -391,6 +392,7 @@ __ct__12CABSReactionFv: /* 801F1A64 001EE9C4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACBF0 lbl_805ACBF0: # ROM: 0x3F9490 diff --git a/asm/MetroidPrime/BodyState/CBSAttack.s b/asm/MetroidPrime/BodyState/CBSAttack.s index 57d7b2c0..ccd8d2c5 100644 --- a/asm/MetroidPrime/BodyState/CBSAttack.s +++ b/asm/MetroidPrime/BodyState/CBSAttack.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1370 lbl_803E1370: @@ -21,6 +22,7 @@ lbl_803E1370: .4byte Shutdown__9CBSAttackFR15CBodyController .section .sdata +.balign 8 .global lbl_805A7710 lbl_805A7710: @@ -638,6 +640,7 @@ __ct__9CBSAttackFv: /* 80135648 001325A8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB6C0 lbl_805AB6C0: # ROM: 0x3F7F60 diff --git a/asm/MetroidPrime/BodyState/CBSCover.s b/asm/MetroidPrime/BodyState/CBSCover.s index 50563af4..4c0b6a9d 100644 --- a/asm/MetroidPrime/BodyState/CBSCover.s +++ b/asm/MetroidPrime/BodyState/CBSCover.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3E48 lbl_803E3E48: @@ -601,6 +602,7 @@ CanShoot__8CBSCoverCFv: /* 801764D8 00173438 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABEC0 lbl_805ABEC0: # ROM: 0x3F8760 diff --git a/asm/MetroidPrime/BodyState/CBSDie.s b/asm/MetroidPrime/BodyState/CBSDie.s index 2a54798e..ca8502ee 100644 --- a/asm/MetroidPrime/BodyState/CBSDie.s +++ b/asm/MetroidPrime/BodyState/CBSDie.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E13A8 lbl_803E13A8: @@ -243,6 +244,7 @@ __ct__6CBSDieFv: /* 80135934 00132894 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB6D0 lbl_805AB6D0: # ROM: 0x3F7F70 diff --git a/asm/MetroidPrime/BodyState/CBSFall.s b/asm/MetroidPrime/BodyState/CBSFall.s index 6655de99..8f29c1ee 100644 --- a/asm/MetroidPrime/BodyState/CBSFall.s +++ b/asm/MetroidPrime/BodyState/CBSFall.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E13E0 lbl_803E13E0: @@ -400,6 +401,7 @@ __ct__7CBSFallFv: /* 80135E84 00132DE4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB6E0 lbl_805AB6E0: # ROM: 0x3F7F80 diff --git a/asm/MetroidPrime/BodyState/CBSGenerate.s b/asm/MetroidPrime/BodyState/CBSGenerate.s index 32a1cfdd..9b1990c0 100644 --- a/asm/MetroidPrime/BodyState/CBSGenerate.s +++ b/asm/MetroidPrime/BodyState/CBSGenerate.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2040 lbl_803E2040: @@ -314,6 +315,7 @@ __ct__11CBSGenerateFv: /* 80146AA8 00143A08 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB9A0 lbl_805AB9A0: # ROM: 0x3F8240 diff --git a/asm/MetroidPrime/BodyState/CBSGetup.s b/asm/MetroidPrime/BodyState/CBSGetup.s index 07e86f05..e9e783a0 100644 --- a/asm/MetroidPrime/BodyState/CBSGetup.s +++ b/asm/MetroidPrime/BodyState/CBSGetup.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1418 lbl_803E1418: @@ -276,6 +277,7 @@ __ct__8CBSGetupFv: /* 801361F8 00133158 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB710 lbl_805AB710: # ROM: 0x3F7FB0 diff --git a/asm/MetroidPrime/BodyState/CBSGroundHit.s b/asm/MetroidPrime/BodyState/CBSGroundHit.s index b242c732..0c231f01 100644 --- a/asm/MetroidPrime/BodyState/CBSGroundHit.s +++ b/asm/MetroidPrime/BodyState/CBSGroundHit.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E18B0 lbl_803E18B0: @@ -419,6 +420,7 @@ __ct__12CBSGroundHitFv: /* 8013F2EC 0013C24C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB848 lbl_805AB848: # ROM: 0x3F80E8 diff --git a/asm/MetroidPrime/BodyState/CBSHurled.s b/asm/MetroidPrime/BodyState/CBSHurled.s index 52833978..505d249b 100644 --- a/asm/MetroidPrime/BodyState/CBSHurled.s +++ b/asm/MetroidPrime/BodyState/CBSHurled.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1FB0 lbl_803E1FB0: @@ -1301,6 +1302,7 @@ __ct__9CBSHurledFv: /* 8014560C 0014256C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB938 lbl_805AB938: # ROM: 0x3F81D8 diff --git a/asm/MetroidPrime/BodyState/CBSJump.s b/asm/MetroidPrime/BodyState/CBSJump.s index 281d9c3f..3b727f22 100644 --- a/asm/MetroidPrime/BodyState/CBSJump.s +++ b/asm/MetroidPrime/BodyState/CBSJump.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2008 lbl_803E2008: @@ -1198,6 +1199,7 @@ __ct__7CBSJumpFv: /* 801466B0 00143610 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB980 lbl_805AB980: # ROM: 0x3F8220 diff --git a/asm/MetroidPrime/BodyState/CBSKnockBack.s b/asm/MetroidPrime/BodyState/CBSKnockBack.s index 09574866..c87eda8f 100644 --- a/asm/MetroidPrime/BodyState/CBSKnockBack.s +++ b/asm/MetroidPrime/BodyState/CBSKnockBack.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1450 lbl_803E1450: @@ -441,6 +442,7 @@ __ct__12CBSKnockBackFv: /* 801367C8 00133728 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB718 lbl_805AB718: # ROM: 0x3F7FB8 diff --git a/asm/MetroidPrime/BodyState/CBSLieOnGround.s b/asm/MetroidPrime/BodyState/CBSLieOnGround.s index fe8fde59..22812839 100644 --- a/asm/MetroidPrime/BodyState/CBSLieOnGround.s +++ b/asm/MetroidPrime/BodyState/CBSLieOnGround.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1488 lbl_803E1488: @@ -279,6 +280,7 @@ __ct__14CBSLieOnGroundFRC6CActor: /* 80136B4C 00133AAC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB748 lbl_805AB748: # ROM: 0x3F7FE8 diff --git a/asm/MetroidPrime/BodyState/CBSLocomotion.s b/asm/MetroidPrime/BodyState/CBSLocomotion.s index 71abfc09..b38671a4 100644 --- a/asm/MetroidPrime/BodyState/CBSLocomotion.s +++ b/asm/MetroidPrime/BodyState/CBSLocomotion.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CBSFlyerLocomotion_cpp .section .data +.balign 8 .global lbl_803E14C0 lbl_803E14C0: @@ -193,6 +194,7 @@ lbl_803E16CC: .4byte GetBodyStateTransition__13CBSLocomotionFfR15CBodyController .section .sdata +.balign 8 .global lbl_805A7718 lbl_805A7718: @@ -241,6 +243,7 @@ lbl_805A7738: .4byte 0 .section .sbss +.balign 8 # CBSFlyerLocomotion .global lbl_805A8F80 @@ -2759,6 +2762,7 @@ __sinit_CBSFlyerLocomotion_cpp: /* 80138DA0 00135D00 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB750 lbl_805AB750: # ROM: 0x3F7FF0 diff --git a/asm/MetroidPrime/BodyState/CBSLoopAttack.s b/asm/MetroidPrime/BodyState/CBSLoopAttack.s index 84a0fe9e..e8eca35e 100644 --- a/asm/MetroidPrime/BodyState/CBSLoopAttack.s +++ b/asm/MetroidPrime/BodyState/CBSLoopAttack.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E17C8 lbl_803E17C8: @@ -718,6 +719,7 @@ __ct__13CBSLoopAttackFv: /* 8013B878 001387D8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB7A8 lbl_805AB7A8: # ROM: 0x3F8048 diff --git a/asm/MetroidPrime/BodyState/CBSLoopReaction.s b/asm/MetroidPrime/BodyState/CBSLoopReaction.s index fe518137..5d9a9704 100644 --- a/asm/MetroidPrime/BodyState/CBSLoopReaction.s +++ b/asm/MetroidPrime/BodyState/CBSLoopReaction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1878 lbl_803E1878: @@ -748,6 +749,7 @@ __ct__15CBSLoopReactionFv: /* 8013CA54 001399B4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB7C8 lbl_805AB7C8: # ROM: 0x3F8068 diff --git a/asm/MetroidPrime/BodyState/CBSProjectileAttack.s b/asm/MetroidPrime/BodyState/CBSProjectileAttack.s index e2bcad68..8164e9fc 100644 --- a/asm/MetroidPrime/BodyState/CBSProjectileAttack.s +++ b/asm/MetroidPrime/BodyState/CBSProjectileAttack.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E27D0 lbl_803E27D0: @@ -420,6 +421,7 @@ __ct__19CBSProjectileAttackFv: /* 8014D944 0014A8A4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABA58 lbl_805ABA58: # ROM: 0x3F82F8 diff --git a/asm/MetroidPrime/BodyState/CBSScripted.s b/asm/MetroidPrime/BodyState/CBSScripted.s index 7a4359c2..3c42d9ad 100644 --- a/asm/MetroidPrime/BodyState/CBSScripted.s +++ b/asm/MetroidPrime/BodyState/CBSScripted.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E24A8 lbl_803E24A8: @@ -274,6 +275,7 @@ __ct__11CBSScriptedFv: /* 8014B41C 0014837C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABA08 lbl_805ABA08: # ROM: 0x3F82A8 diff --git a/asm/MetroidPrime/BodyState/CBSSlide.s b/asm/MetroidPrime/BodyState/CBSSlide.s index 955e311a..55ce27df 100644 --- a/asm/MetroidPrime/BodyState/CBSSlide.s +++ b/asm/MetroidPrime/BodyState/CBSSlide.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1F78 lbl_803E1F78: @@ -354,6 +355,7 @@ __ct__8CBSSlideFv: /* 80144408 00141368 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB910 lbl_805AB910: # ROM: 0x3F81B0 diff --git a/asm/MetroidPrime/BodyState/CBSStep.s b/asm/MetroidPrime/BodyState/CBSStep.s index bb1388d6..88645937 100644 --- a/asm/MetroidPrime/BodyState/CBSStep.s +++ b/asm/MetroidPrime/BodyState/CBSStep.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1718 lbl_803E1718: @@ -336,6 +337,7 @@ __ct__7CBSStepFv: /* 801391C0 00136120 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB778 lbl_805AB778: # ROM: 0x3F8018 diff --git a/asm/MetroidPrime/BodyState/CBSTaunt.s b/asm/MetroidPrime/BodyState/CBSTaunt.s index b1f7c746..315f1b57 100644 --- a/asm/MetroidPrime/BodyState/CBSTaunt.s +++ b/asm/MetroidPrime/BodyState/CBSTaunt.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2390 lbl_803E2390: @@ -258,6 +259,7 @@ __ct__8CBSTauntFv: /* 801495D0 00146530 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB9F0 lbl_805AB9F0: # ROM: 0x3F8290 diff --git a/asm/MetroidPrime/BodyState/CBSTurn.s b/asm/MetroidPrime/BodyState/CBSTurn.s index f2e4ed16..ab0ef98a 100644 --- a/asm/MetroidPrime/BodyState/CBSTurn.s +++ b/asm/MetroidPrime/BodyState/CBSTurn.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1750 lbl_803E1750: @@ -867,6 +868,7 @@ __ct__7CBSTurnFv: /* 80139D3C 00136C9C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB780 lbl_805AB780: # ROM: 0x3F8020 diff --git a/asm/MetroidPrime/BodyState/CBSWallHang.s b/asm/MetroidPrime/BodyState/CBSWallHang.s index c54bbf9d..70b4b991 100644 --- a/asm/MetroidPrime/BodyState/CBSWallHang.s +++ b/asm/MetroidPrime/BodyState/CBSWallHang.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E43A0 lbl_803E43A0: @@ -1661,6 +1662,7 @@ __ct__11CBSWallHangFv: /* 8018EBB0 0018BB10 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC188 lbl_805AC188: # ROM: 0x3F8A28 diff --git a/asm/MetroidPrime/BodyState/CBodyController.s b/asm/MetroidPrime/BodyState/CBodyController.s index 2c752205..16ca9e5c 100644 --- a/asm/MetroidPrime/BodyState/CBodyController.s +++ b/asm/MetroidPrime/BodyState/CBodyController.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7740 lbl_805A7740: @@ -1246,6 +1247,7 @@ __ct__15CBodyControllerFR6CActorf9EBodyType: /* 8013AEC8 00137E28 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB790 lbl_805AB790: # ROM: 0x3F8030 @@ -1278,6 +1280,7 @@ lbl_805AB7A4: .section .rodata +.balign 8 .global lbl_803D0060 lbl_803D0060: # ROM: 0x3CD060 diff --git a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s index 7f4d87e7..105b44d8 100644 --- a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s +++ b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E10B0 lbl_803E10B0: @@ -1150,6 +1151,7 @@ lbl_80132424: /* 80132438 0012F398 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB6A8 lbl_805AB6A8: # ROM: 0x3F7F48 diff --git a/asm/MetroidPrime/BodyState/CBodyStateInfo.s b/asm/MetroidPrime/BodyState/CBodyStateInfo.s index 60928ba5..5448ef89 100644 --- a/asm/MetroidPrime/BodyState/CBodyStateInfo.s +++ b/asm/MetroidPrime/BodyState/CBodyStateInfo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E10D8 lbl_803E10D8: @@ -210,6 +211,7 @@ lbl_803E1350: .4byte 0 .section .sdata +.balign 8 .global lbl_805A76F8 lbl_805A76F8: @@ -3541,6 +3543,7 @@ lbl_80134DC0: /* 80134DD0 00131D30 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB6B8 lbl_805AB6B8: # ROM: 0x3F7F58 @@ -3553,6 +3556,7 @@ lbl_805AB6BC: .section .rodata +.balign 8 .global lbl_803D0058 lbl_803D0058: # ROM: 0x3CD058 diff --git a/asm/MetroidPrime/CAABoxFilter.s b/asm/MetroidPrime/CAABoxFilter.s index eb9664be..f3ba7092 100644 --- a/asm/MetroidPrime/CAABoxFilter.s +++ b/asm/MetroidPrime/CAABoxFilter.s @@ -132,6 +132,7 @@ lbl_801859E0: /* 80185A0C 0018296C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC028 lbl_805AC028: # ROM: 0x3F88C8 diff --git a/asm/MetroidPrime/CActor.s b/asm/MetroidPrime/CActor.s index 6bb27fc9..0e6c2040 100644 --- a/asm/MetroidPrime/CActor.s +++ b/asm/MetroidPrime/CActor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9EB0 lbl_803D9EB0: @@ -79,6 +80,7 @@ lbl_803D9F1C: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6E68 lbl_805A6E68: @@ -101,11 +103,7 @@ lbl_805A6E74: .float 255.0 .section .sdata2, "a" - -.global lbl_805AA34C -lbl_805AA34C: - # ROM: 0x3F6BEC - .4byte 0x3F7D70A4 +.balign 8 .global lbl_805AA350 lbl_805AA350: @@ -3749,6 +3747,7 @@ lbl_80055D54: /* 80055D5C 00052CBC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCF68 lbl_803CCF68: # ROM: 0x3C9F68 diff --git a/asm/MetroidPrime/CActorLights.s b/asm/MetroidPrime/CActorLights.s index 4878c7ce..63d5fde8 100644 --- a/asm/MetroidPrime/CActorLights.s +++ b/asm/MetroidPrime/CActorLights.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7560 lbl_805A7560: @@ -29,6 +30,7 @@ lbl_805A7570: .4byte 0 .section .sbss +.balign 8 # CActorLights .global lbl_805A8F10 @@ -39,6 +41,7 @@ lbl_805A8F14: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AB120 lbl_805AB120: @@ -2924,6 +2927,7 @@ lbl_80105820: /* 80105824 00102784 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CEE40 lbl_803CEE40: # ROM: 0x3CBE40 diff --git a/asm/MetroidPrime/CActorParameters.s b/asm/MetroidPrime/CActorParameters.s index 9a393f71..8bcf847b 100644 --- a/asm/MetroidPrime/CActorParameters.s +++ b/asm/MetroidPrime/CActorParameters.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFF80 lbl_803DFF80: @@ -11,6 +12,7 @@ lbl_803DFF80: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7580 lbl_805A7580: @@ -33,6 +35,7 @@ lbl_805A758C: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB198 lbl_805AB198: @@ -546,6 +549,7 @@ __ct__16CActorParametersFv: /* 80106B28 00103A88 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CEE50 lbl_803CEE50: # ROM: 0x3CBE50 diff --git a/asm/MetroidPrime/CActorParticles.s b/asm/MetroidPrime/CActorParticles.s index c99040a0..40200297 100644 --- a/asm/MetroidPrime/CActorParticles.s +++ b/asm/MetroidPrime/CActorParticles.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7DE8 lbl_805A7DE8: @@ -4381,6 +4382,7 @@ lbl_801E752C: /* 801E7554 001E44B4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACAA0 lbl_805ACAA0: # ROM: 0x3F9340 @@ -4414,6 +4416,7 @@ lbl_805ACABC: .section .rodata +.balign 8 .global lbl_803D1E98 lbl_803D1E98: # ROM: 0x3CEE98 diff --git a/asm/MetroidPrime/CAnimData.s b/asm/MetroidPrime/CAnimData.s index e9c2b6b5..dee64ed5 100644 --- a/asm/MetroidPrime/CAnimData.s +++ b/asm/MetroidPrime/CAnimData.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CAnimData_cpp .section .data +.balign 8 # These belong in Kyoto/Animation/C*POINode # Thanks to ODR they wound up here @@ -45,6 +46,7 @@ lbl_803D9B98: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6D98 lbl_805A6D98: @@ -83,12 +85,14 @@ lbl_805A6DB0: .4byte 0 .section .bss +.balign 8 .global lbl_8045B140 lbl_8045B140: .skip 0x40 .section .sbss +.balign 8 # CAnimData .global lbl_805A8CC8 @@ -99,6 +103,7 @@ lbl_805A8CCC: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA0F0 lbl_805AA0F0: @@ -9668,6 +9673,7 @@ __sinit_CAnimData_cpp: /* 80031A28 0002E988 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCD20 lbl_803CCD20: # ROM: 0x3C9D20 diff --git a/asm/MetroidPrime/CAnimationDatabaseGame.s b/asm/MetroidPrime/CAnimationDatabaseGame.s index 915adce7..78cca26e 100644 --- a/asm/MetroidPrime/CAnimationDatabaseGame.s +++ b/asm/MetroidPrime/CAnimationDatabaseGame.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA320 lbl_803DA320: @@ -702,6 +703,7 @@ lbl_8006E128: /* 8006E138 0006B098 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD250 lbl_803CD250: # ROM: 0x3CA250 diff --git a/asm/MetroidPrime/CArchMsgParmControllerStatus.s b/asm/MetroidPrime/CArchMsgParmControllerStatus.s index 974b9856..60833fb2 100644 --- a/asm/MetroidPrime/CArchMsgParmControllerStatus.s +++ b/asm/MetroidPrime/CArchMsgParmControllerStatus.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA098 lbl_803DA098: diff --git a/asm/MetroidPrime/CArchMsgParmInt32.s b/asm/MetroidPrime/CArchMsgParmInt32.s index d71b3604..94c7545c 100644 --- a/asm/MetroidPrime/CArchMsgParmInt32.s +++ b/asm/MetroidPrime/CArchMsgParmInt32.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9E50 lbl_803D9E50: diff --git a/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s b/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s index 23780612..622822a2 100644 --- a/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s +++ b/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9E60 lbl_803D9E60: diff --git a/asm/MetroidPrime/CArchMsgParmNull.s b/asm/MetroidPrime/CArchMsgParmNull.s index 67b1803e..3ef244e3 100644 --- a/asm/MetroidPrime/CArchMsgParmNull.s +++ b/asm/MetroidPrime/CArchMsgParmNull.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9E70 lbl_803D9E70: diff --git a/asm/MetroidPrime/CArchMsgParmReal32.s b/asm/MetroidPrime/CArchMsgParmReal32.s index 2b85da2c..613c32d2 100644 --- a/asm/MetroidPrime/CArchMsgParmReal32.s +++ b/asm/MetroidPrime/CArchMsgParmReal32.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9E80 lbl_803D9E80: diff --git a/asm/MetroidPrime/CArchitectureMessage.s b/asm/MetroidPrime/CArchitectureMessage.s deleted file mode 100644 index 31e41b06..00000000 --- a/asm/MetroidPrime/CArchitectureMessage.s +++ /dev/null @@ -1,9 +0,0 @@ -.section .data - -.global lbl_803D8E9C -lbl_803D8E9C: - # ROM: 0x3D5E9C - .4byte 0 - .4byte 0 - .4byte 0 - diff --git a/asm/MetroidPrime/CArtifactDoll.s b/asm/MetroidPrime/CArtifactDoll.s index 19132f2a..1008d650 100644 --- a/asm/MetroidPrime/CArtifactDoll.s +++ b/asm/MetroidPrime/CArtifactDoll.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CArtifactDoll_cpp .section .sdata +.balign 8 .global lbl_805A85D0 lbl_805A85D0: @@ -27,6 +28,7 @@ lbl_805A85DC: .float 1.0 .section .sbss, "wa" +.balign 8 .global lbl_805A9170 lbl_805A9170: @@ -1034,6 +1036,7 @@ __sinit_CArtifactDoll_cpp: /* 8029D6C4 0029A624 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADD60 lbl_805ADD60: # ROM: 0x3FA600 @@ -1127,6 +1130,7 @@ lbl_805ADDAC: .section .rodata +.balign 8 .global lbl_803D5D50 lbl_803D5D50: # ROM: 0x3D2D50 diff --git a/asm/MetroidPrime/CAudioStateWin.s b/asm/MetroidPrime/CAudioStateWin.s index dfc7e699..297aacfa 100644 --- a/asm/MetroidPrime/CAudioStateWin.s +++ b/asm/MetroidPrime/CAudioStateWin.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E02A8 lbl_803E02A8: @@ -117,6 +118,7 @@ __ct__14CAudioStateWinFv: /* 80111E1C 0010ED7C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CF200 lbl_803CF200: # ROM: 0x3CC200 diff --git a/asm/MetroidPrime/CAutoMapper.s b/asm/MetroidPrime/CAutoMapper.s index 5901f928..90ffe121 100644 --- a/asm/MetroidPrime/CAutoMapper.s +++ b/asm/MetroidPrime/CAutoMapper.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DAE70 lbl_803DAE70: @@ -51,6 +52,7 @@ lbl_803DAED4: .4byte lbl_8009BD9C .section .sdata +.balign 8 .global lbl_805A7168 lbl_805A7168: @@ -163,6 +165,7 @@ lbl_805A71BC: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA880 lbl_805AA880: @@ -10233,6 +10236,7 @@ lbl_8009E3C8: /* 8009E3E4 0009B344 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD7D8 lbl_803CD7D8: # ROM: 0x3CA7D8 diff --git a/asm/MetroidPrime/CAutoSave.s b/asm/MetroidPrime/CAutoSave.s deleted file mode 100644 index 267bb31c..00000000 --- a/asm/MetroidPrime/CAutoSave.s +++ /dev/null @@ -1,243 +0,0 @@ -.include "macros.inc" - -.section .data - -.global lbl_803D99F0 -lbl_803D99F0: - # ROM: 0x3D69F0 - .4byte 0 - .4byte 0 - .4byte __dt__9CAutoSaveFv - .4byte OnMessage__9CAutoSaveFRC20CArchitectureMessageR18CArchitectureQueue - .4byte GetIsContinueDraw__9CAutoSaveCFv - .4byte Draw__9CAutoSaveCFv - .4byte PreDraw__6CIOWinCFv - -.section .text, "ax" - -.global GetIsContinueDraw__9CAutoSaveCFv -GetIsContinueDraw__9CAutoSaveCFv: -/* 8002515C 000220BC 38 60 00 00 */ li r3, 0 -/* 80025160 000220C0 4E 80 00 20 */ blr - -.global Draw__9CAutoSaveCFv -Draw__9CAutoSaveCFv: -/* 80025164 000220C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025168 000220C8 7C 08 02 A6 */ mflr r0 -/* 8002516C 000220CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80025170 000220D0 80 63 00 14 */ lwz r3, 0x14(r3) -/* 80025174 000220D4 48 22 A5 AD */ bl Draw__15CSaveGameScreenFv -/* 80025178 000220D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8002517C 000220DC 7C 08 03 A6 */ mtlr r0 -/* 80025180 000220E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80025184 000220E4 4E 80 00 20 */ blr - -.global OnMessage__9CAutoSaveFRC20CArchitectureMessageR18CArchitectureQueue -OnMessage__9CAutoSaveFRC20CArchitectureMessageR18CArchitectureQueue: -/* 80025188 000220E8 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 8002518C 000220EC 7C 08 02 A6 */ mflr r0 -/* 80025190 000220F0 38 A0 00 00 */ li r5, 0 -/* 80025194 000220F4 90 01 00 84 */ stw r0, 0x84(r1) -/* 80025198 000220F8 93 E1 00 7C */ stw r31, 0x7c(r1) -/* 8002519C 000220FC 7C 7F 1B 78 */ mr r31, r3 -/* 800251A0 00022100 80 CD A0 80 */ lwz r6, gpGameState@sda21(r13) -/* 800251A4 00022104 80 06 02 10 */ lwz r0, 0x210(r6) -/* 800251A8 00022108 80 66 02 14 */ lwz r3, 0x214(r6) -/* 800251AC 0002210C 7C 00 2A 78 */ xor r0, r0, r5 -/* 800251B0 00022110 7C 63 2A 78 */ xor r3, r3, r5 -/* 800251B4 00022114 7C 60 03 79 */ or. r0, r3, r0 -/* 800251B8 00022118 40 82 00 0C */ bne lbl_800251C4 -/* 800251BC 0002211C 38 60 00 02 */ li r3, 2 -/* 800251C0 00022120 48 00 01 9C */ b lbl_8002535C -lbl_800251C4: -/* 800251C4 00022124 80 04 00 04 */ lwz r0, 4(r4) -/* 800251C8 00022128 2C 00 00 05 */ cmpwi r0, 5 -/* 800251CC 0002212C 41 82 00 3C */ beq lbl_80025208 -/* 800251D0 00022130 40 80 01 88 */ bge lbl_80025358 -/* 800251D4 00022134 2C 00 00 04 */ cmpwi r0, 4 -/* 800251D8 00022138 40 80 00 08 */ bge lbl_800251E0 -/* 800251DC 0002213C 48 00 01 7C */ b lbl_80025358 -lbl_800251E0: -/* 800251E0 00022140 7C 83 23 78 */ mr r3, r4 -/* 800251E4 00022144 48 02 C9 D9 */ bl GetParmTimerTick__7MakeMsgFRC20CArchitectureMessage -/* 800251E8 00022148 7C 64 1B 78 */ mr r4, r3 -/* 800251EC 0002214C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 800251F0 00022150 C0 24 00 04 */ lfs f1, 4(r4) -/* 800251F4 00022154 48 22 A5 A9 */ bl Update__15CSaveGameScreenFf -/* 800251F8 00022158 2C 03 00 00 */ cmpwi r3, 0 -/* 800251FC 0002215C 41 82 01 5C */ beq lbl_80025358 -/* 80025200 00022160 38 60 00 02 */ li r3, 2 -/* 80025204 00022164 48 00 01 58 */ b lbl_8002535C -lbl_80025208: -/* 80025208 00022168 7C 83 23 78 */ mr r3, r4 -/* 8002520C 0002216C 48 02 C8 D9 */ bl GetParmUserInput__7MakeMsgFRC20CArchitectureMessage -/* 80025210 00022170 3C A0 80 3E */ lis r5, lbl_803D8E9C@ha -/* 80025214 00022174 3C 80 80 3E */ lis r4, lbl_803D9810@ha -/* 80025218 00022178 38 05 8E 9C */ addi r0, r5, lbl_803D8E9C@l -/* 8002521C 0002217C 90 01 00 38 */ stw r0, 0x38(r1) -/* 80025220 00022180 38 04 98 10 */ addi r0, r4, lbl_803D9810@l -/* 80025224 00022184 90 01 00 38 */ stw r0, 0x38(r1) -/* 80025228 00022188 C0 03 00 04 */ lfs f0, 4(r3) -/* 8002522C 0002218C D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80025230 00022190 80 03 00 08 */ lwz r0, 8(r3) -/* 80025234 00022194 90 01 00 40 */ stw r0, 0x40(r1) -/* 80025238 00022198 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8002523C 0002219C D0 01 00 44 */ stfs f0, 0x44(r1) -/* 80025240 000221A0 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 80025244 000221A4 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80025248 000221A8 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 8002524C 000221AC D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80025250 000221B0 C0 03 00 18 */ lfs f0, 0x18(r3) -/* 80025254 000221B4 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 80025258 000221B8 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 8002525C 000221BC D0 01 00 54 */ stfs f0, 0x54(r1) -/* 80025260 000221C0 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80025264 000221C4 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 80025268 000221C8 88 03 00 24 */ lbz r0, 0x24(r3) -/* 8002526C 000221CC 98 01 00 5C */ stb r0, 0x5c(r1) -/* 80025270 000221D0 88 03 00 25 */ lbz r0, 0x25(r3) -/* 80025274 000221D4 98 01 00 5D */ stb r0, 0x5d(r1) -/* 80025278 000221D8 88 03 00 26 */ lbz r0, 0x26(r3) -/* 8002527C 000221DC 98 01 00 5E */ stb r0, 0x5e(r1) -/* 80025280 000221E0 88 03 00 27 */ lbz r0, 0x27(r3) -/* 80025284 000221E4 98 01 00 5F */ stb r0, 0x5f(r1) -/* 80025288 000221E8 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 8002528C 000221EC D0 01 00 60 */ stfs f0, 0x60(r1) -/* 80025290 000221F0 C0 03 00 2C */ lfs f0, 0x2c(r3) -/* 80025294 000221F4 D0 01 00 64 */ stfs f0, 0x64(r1) -/* 80025298 000221F8 88 03 00 30 */ lbz r0, 0x30(r3) -/* 8002529C 000221FC 98 01 00 68 */ stb r0, 0x68(r1) -/* 800252A0 00022200 88 03 00 31 */ lbz r0, 0x31(r3) -/* 800252A4 00022204 98 01 00 69 */ stb r0, 0x69(r1) -/* 800252A8 00022208 88 03 00 32 */ lbz r0, 0x32(r3) -/* 800252AC 0002220C 38 61 00 38 */ addi r3, r1, 0x38 -/* 800252B0 00022210 98 01 00 6A */ stb r0, 0x6a(r1) -/* 800252B4 00022214 4B FF 67 31 */ bl GetUserInput__21CArchMsgParmUserInputCFv -/* 800252B8 00022218 C0 03 00 00 */ lfs f0, 0(r3) -/* 800252BC 0002221C 38 81 00 08 */ addi r4, r1, 8 -/* 800252C0 00022220 D0 01 00 08 */ stfs f0, 8(r1) -/* 800252C4 00022224 80 03 00 04 */ lwz r0, 4(r3) -/* 800252C8 00022228 90 01 00 0C */ stw r0, 0xc(r1) -/* 800252CC 0002222C C0 03 00 08 */ lfs f0, 8(r3) -/* 800252D0 00022230 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 800252D4 00022234 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 800252D8 00022238 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 800252DC 0002223C C0 03 00 10 */ lfs f0, 0x10(r3) -/* 800252E0 00022240 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 800252E4 00022244 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 800252E8 00022248 D0 01 00 1C */ stfs f0, 0x1c(r1) -/* 800252EC 0002224C C0 03 00 18 */ lfs f0, 0x18(r3) -/* 800252F0 00022250 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 800252F4 00022254 C0 03 00 1C */ lfs f0, 0x1c(r3) -/* 800252F8 00022258 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 800252FC 0002225C 88 03 00 20 */ lbz r0, 0x20(r3) -/* 80025300 00022260 98 01 00 28 */ stb r0, 0x28(r1) -/* 80025304 00022264 88 03 00 21 */ lbz r0, 0x21(r3) -/* 80025308 00022268 98 01 00 29 */ stb r0, 0x29(r1) -/* 8002530C 0002226C 88 03 00 22 */ lbz r0, 0x22(r3) -/* 80025310 00022270 98 01 00 2A */ stb r0, 0x2a(r1) -/* 80025314 00022274 88 03 00 23 */ lbz r0, 0x23(r3) -/* 80025318 00022278 98 01 00 2B */ stb r0, 0x2b(r1) -/* 8002531C 0002227C C0 03 00 24 */ lfs f0, 0x24(r3) -/* 80025320 00022280 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80025324 00022284 C0 03 00 28 */ lfs f0, 0x28(r3) -/* 80025328 00022288 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 8002532C 0002228C 88 03 00 2C */ lbz r0, 0x2c(r3) -/* 80025330 00022290 98 01 00 34 */ stb r0, 0x34(r1) -/* 80025334 00022294 88 03 00 2D */ lbz r0, 0x2d(r3) -/* 80025338 00022298 98 01 00 35 */ stb r0, 0x35(r1) -/* 8002533C 0002229C 88 03 00 2E */ lbz r0, 0x2e(r3) -/* 80025340 000222A0 98 01 00 36 */ stb r0, 0x36(r1) -/* 80025344 000222A4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 80025348 000222A8 48 22 A4 29 */ bl ProcessUserInput__15CSaveGameScreenFRC11CFinalInput -/* 8002534C 000222AC 38 61 00 38 */ addi r3, r1, 0x38 -/* 80025350 000222B0 38 80 FF FF */ li r4, -1 -/* 80025354 000222B4 4B FF 66 99 */ bl __dt__21CArchMsgParmUserInputFv -lbl_80025358: -/* 80025358 000222B8 38 60 00 01 */ li r3, 1 -lbl_8002535C: -/* 8002535C 000222BC 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80025360 000222C0 83 E1 00 7C */ lwz r31, 0x7c(r1) -/* 80025364 000222C4 7C 08 03 A6 */ mtlr r0 -/* 80025368 000222C8 38 21 00 80 */ addi r1, r1, 0x80 -/* 8002536C 000222CC 4E 80 00 20 */ blr - -.global __dt__9CAutoSaveFv -__dt__9CAutoSaveFv: -/* 80025370 000222D0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80025374 000222D4 7C 08 02 A6 */ mflr r0 -/* 80025378 000222D8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002537C 000222DC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80025380 000222E0 7C 9F 23 78 */ mr r31, r4 -/* 80025384 000222E4 93 C1 00 08 */ stw r30, 8(r1) -/* 80025388 000222E8 7C 7E 1B 79 */ or. r30, r3, r3 -/* 8002538C 000222EC 41 82 00 40 */ beq lbl_800253CC -/* 80025390 000222F0 3C 60 80 3E */ lis r3, lbl_803D99F0@ha -/* 80025394 000222F4 34 1E 00 14 */ addic. r0, r30, 0x14 -/* 80025398 000222F8 38 03 99 F0 */ addi r0, r3, lbl_803D99F0@l -/* 8002539C 000222FC 90 1E 00 00 */ stw r0, 0(r30) -/* 800253A0 00022300 41 82 00 10 */ beq lbl_800253B0 -/* 800253A4 00022304 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 800253A8 00022308 38 80 00 01 */ li r4, 1 -/* 800253AC 0002230C 48 22 AA 79 */ bl __dt__15CSaveGameScreenFv -lbl_800253B0: -/* 800253B0 00022310 7F C3 F3 78 */ mr r3, r30 -/* 800253B4 00022314 38 80 00 00 */ li r4, 0 -/* 800253B8 00022318 48 02 D7 ED */ bl __dt__6CIOWinFv -/* 800253BC 0002231C 7F E0 07 35 */ extsh. r0, r31 -/* 800253C0 00022320 40 81 00 0C */ ble lbl_800253CC -/* 800253C4 00022324 7F C3 F3 78 */ mr r3, r30 -/* 800253C8 00022328 48 2F 05 69 */ bl Free__7CMemoryFPCv -lbl_800253CC: -/* 800253CC 0002232C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800253D0 00022330 7F C3 F3 78 */ mr r3, r30 -/* 800253D4 00022334 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800253D8 00022338 83 C1 00 08 */ lwz r30, 8(r1) -/* 800253DC 0002233C 7C 08 03 A6 */ mtlr r0 -/* 800253E0 00022340 38 21 00 10 */ addi r1, r1, 0x10 -/* 800253E4 00022344 4E 80 00 20 */ blr - -.global __ct__9CAutoSaveFv -__ct__9CAutoSaveFv: -/* 800253E8 00022348 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800253EC 0002234C 7C 08 02 A6 */ mflr r0 -/* 800253F0 00022350 3C 80 80 3D */ lis r4, lbl_803CCB50@ha -/* 800253F4 00022354 90 01 00 24 */ stw r0, 0x24(r1) -/* 800253F8 00022358 38 84 CB 50 */ addi r4, r4, lbl_803CCB50@l -/* 800253FC 0002235C 38 84 01 48 */ addi r4, r4, 0x148 -/* 80025400 00022360 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80025404 00022364 7C 7F 1B 78 */ mr r31, r3 -/* 80025408 00022368 38 61 00 08 */ addi r3, r1, 8 -/* 8002540C 0002236C 4B FD F8 AD */ bl string_l__4rstlFPCc -/* 80025410 00022370 7F E3 FB 78 */ mr r3, r31 -/* 80025414 00022374 38 81 00 08 */ addi r4, r1, 8 -/* 80025418 00022378 48 02 D7 F5 */ bl "__ct__6CIOWinFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8002541C 0002237C 38 61 00 08 */ addi r3, r1, 8 -/* 80025420 00022380 48 31 86 C1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" -/* 80025424 00022384 3C 60 80 3E */ lis r3, lbl_803D99F0@ha -/* 80025428 00022388 3C 80 80 3D */ lis r4, lbl_803CCB50@ha -/* 8002542C 0002238C 38 03 99 F0 */ addi r0, r3, lbl_803D99F0@l -/* 80025430 00022390 38 60 00 98 */ li r3, 0x98 -/* 80025434 00022394 38 84 CB 50 */ addi r4, r4, lbl_803CCB50@l -/* 80025438 00022398 90 1F 00 00 */ stw r0, 0(r31) -/* 8002543C 0002239C 38 84 01 51 */ addi r4, r4, 0x151 -/* 80025440 000223A0 38 A0 00 00 */ li r5, 0 -/* 80025444 000223A4 48 2F 04 29 */ bl __nw__FUlPCcPCc -/* 80025448 000223A8 7C 60 1B 79 */ or. r0, r3, r3 -/* 8002544C 000223AC 41 82 00 1C */ beq lbl_80025468 -/* 80025450 000223B0 80 CD A0 80 */ lwz r6, gpGameState@sda21(r13) -/* 80025454 000223B4 38 80 00 01 */ li r4, 1 -/* 80025458 000223B8 80 A6 02 10 */ lwz r5, 0x210(r6) -/* 8002545C 000223BC 80 C6 02 14 */ lwz r6, 0x214(r6) -/* 80025460 000223C0 48 22 AB 1D */ bl __ct__15CSaveGameScreen -/* 80025464 000223C4 7C 60 1B 78 */ mr r0, r3 -lbl_80025468: -/* 80025468 000223C8 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8002546C 000223CC 80 6D A0 78 */ lwz r3, gpMain@sda21(r13) -/* 80025470 000223D0 4B FD F1 21 */ bl RefreshGameState__5CMainFv -/* 80025474 000223D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80025478 000223D8 7F E3 FB 78 */ mr r3, r31 -/* 8002547C 000223DC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80025480 000223E0 7C 08 03 A6 */ mtlr r0 -/* 80025484 000223E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 80025488 000223E8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CBoneTracking.s b/asm/MetroidPrime/CBoneTracking.s index fb325930..1fe66697 100644 --- a/asm/MetroidPrime/CBoneTracking.s +++ b/asm/MetroidPrime/CBoneTracking.s @@ -632,6 +632,7 @@ Update__13CBoneTrackingFf: /* 80175ABC 00172A1C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABE98 lbl_805ABE98: # ROM: 0x3F8738 diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index 5fd879e6..496391f6 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CCollisionActor_cpp .section .data +.balign 8 .global lbl_803E4B18 lbl_803E4B18: @@ -65,6 +66,7 @@ lbl_803E4B9C: .4byte lbl_801A8D8C .section .sdata +.balign 8 .global lbl_805A7BF0 lbl_805A7BF0: @@ -153,6 +155,7 @@ lbl_805A7C30: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9050 lbl_805A9050: @@ -1936,6 +1939,7 @@ __sinit_CCollisionActor_cpp: /* 801AA280 001A71E0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC540 lbl_805AC540: # ROM: 0x3F8DE0 @@ -1968,6 +1972,7 @@ lbl_805AC554: .section .rodata +.balign 8 .global lbl_803D14A0 lbl_803D14A0: # ROM: 0x3CE4A0 diff --git a/asm/MetroidPrime/CCollisionActorManager.s b/asm/MetroidPrime/CCollisionActorManager.s index f810880e..df3e998f 100644 --- a/asm/MetroidPrime/CCollisionActorManager.s +++ b/asm/MetroidPrime/CCollisionActorManager.s @@ -1779,6 +1779,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A88C8 001A5828 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC518 lbl_805AC518: # ROM: 0x3F8DB8 @@ -1819,6 +1820,7 @@ lbl_805AC538: .section .rodata +.balign 8 .global lbl_803D1498 lbl_803D1498: # ROM: 0x3CE498 diff --git a/asm/MetroidPrime/CConsoleOutputWindow.s b/asm/MetroidPrime/CConsoleOutputWindow.s index a07ddda1..6be237d5 100644 --- a/asm/MetroidPrime/CConsoleOutputWindow.s +++ b/asm/MetroidPrime/CConsoleOutputWindow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFE50 lbl_803DFE50: @@ -15,6 +16,7 @@ lbl_803DFE50: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7540 lbl_805A7540: @@ -27,6 +29,7 @@ lbl_805A7544: .4byte 0 .section .sbss +.balign 8 # CConsoleOutputWindow .global lbl_805A8F00 @@ -34,6 +37,7 @@ lbl_805A8F00: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AB0C8 lbl_805AB0C8: @@ -348,6 +352,7 @@ lbl_800FEC54: /* 800FEC90 000FBBF0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CEE00 lbl_803CEE00: # ROM: 0x3CBE00 diff --git a/asm/MetroidPrime/CControlMapper.s b/asm/MetroidPrime/CControlMapper.s index c6c5a307..70b63e81 100644 --- a/asm/MetroidPrime/CControlMapper.s +++ b/asm/MetroidPrime/CControlMapper.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CControlMapper_cpp .section .data +.balign 8 .global lbl_803D8EB8 lbl_803D8EB8: @@ -521,11 +522,13 @@ lbl_803D9600: .4byte 0 .section .bss +.balign 8 .global lbl_804578F8 lbl_804578F8: .skip 0x10 .section .rodata +.balign 8 .global lbl_803CC030 lbl_803CC030: # ROM: 0x3C9030 @@ -617,6 +620,7 @@ lbl_803CC030: .section .sdata +.balign 8 .global lbl_805A6BF0 lbl_805A6BF0: # ROM: 0x3F4590 @@ -624,6 +628,7 @@ lbl_805A6BF0: .4byte 0 .section .sdata2 +.balign 8 .global lbl_805A9DC8 lbl_805A9DC8: diff --git a/asm/MetroidPrime/CPlayMovie.s b/asm/MetroidPrime/CCredits.s similarity index 93% rename from asm/MetroidPrime/CPlayMovie.s rename to asm/MetroidPrime/CCredits.s index 3b20f820..7feabd3f 100644 --- a/asm/MetroidPrime/CPlayMovie.s +++ b/asm/MetroidPrime/CCredits.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2, "a" +.balign 8 .global lbl_805AA030 lbl_805AA030: @@ -130,6 +131,18 @@ lbl_805AA09C: .4byte 0x3F3E0000 .section .data +.balign 8 + +.global lbl_803D99F0 +lbl_803D99F0: + # ROM: 0x3D69F0 + .4byte 0 + .4byte 0 + .4byte __dt__9CAutoSaveFv + .4byte OnMessage__9CAutoSaveFRC20CArchitectureMessageR18CArchitectureQueue + .4byte GetIsContinueDraw__9CAutoSaveCFv + .4byte Draw__9CAutoSaveCFv + .4byte PreDraw__6CIOWinCFv .global "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>" "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>": @@ -161,6 +174,7 @@ lbl_803D9A34: .4byte PreDraw__6CIOWinCFv .section .sdata +.balign 8 .global lbl_805A6D58 lbl_805A6D58: @@ -234,6 +248,233 @@ lbl_805A6D8C: .section .text, "ax" +.global GetIsContinueDraw__9CAutoSaveCFv +GetIsContinueDraw__9CAutoSaveCFv: +/* 8002515C 000220BC 38 60 00 00 */ li r3, 0 +/* 80025160 000220C0 4E 80 00 20 */ blr + +.global Draw__9CAutoSaveCFv +Draw__9CAutoSaveCFv: +/* 80025164 000220C4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80025168 000220C8 7C 08 02 A6 */ mflr r0 +/* 8002516C 000220CC 90 01 00 14 */ stw r0, 0x14(r1) +/* 80025170 000220D0 80 63 00 14 */ lwz r3, 0x14(r3) +/* 80025174 000220D4 48 22 A5 AD */ bl Draw__15CSaveGameScreenFv +/* 80025178 000220D8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8002517C 000220DC 7C 08 03 A6 */ mtlr r0 +/* 80025180 000220E0 38 21 00 10 */ addi r1, r1, 0x10 +/* 80025184 000220E4 4E 80 00 20 */ blr + +.global OnMessage__9CAutoSaveFRC20CArchitectureMessageR18CArchitectureQueue +OnMessage__9CAutoSaveFRC20CArchitectureMessageR18CArchitectureQueue: +/* 80025188 000220E8 94 21 FF 80 */ stwu r1, -0x80(r1) +/* 8002518C 000220EC 7C 08 02 A6 */ mflr r0 +/* 80025190 000220F0 38 A0 00 00 */ li r5, 0 +/* 80025194 000220F4 90 01 00 84 */ stw r0, 0x84(r1) +/* 80025198 000220F8 93 E1 00 7C */ stw r31, 0x7c(r1) +/* 8002519C 000220FC 7C 7F 1B 78 */ mr r31, r3 +/* 800251A0 00022100 80 CD A0 80 */ lwz r6, gpGameState@sda21(r13) +/* 800251A4 00022104 80 06 02 10 */ lwz r0, 0x210(r6) +/* 800251A8 00022108 80 66 02 14 */ lwz r3, 0x214(r6) +/* 800251AC 0002210C 7C 00 2A 78 */ xor r0, r0, r5 +/* 800251B0 00022110 7C 63 2A 78 */ xor r3, r3, r5 +/* 800251B4 00022114 7C 60 03 79 */ or. r0, r3, r0 +/* 800251B8 00022118 40 82 00 0C */ bne lbl_800251C4 +/* 800251BC 0002211C 38 60 00 02 */ li r3, 2 +/* 800251C0 00022120 48 00 01 9C */ b lbl_8002535C +lbl_800251C4: +/* 800251C4 00022124 80 04 00 04 */ lwz r0, 4(r4) +/* 800251C8 00022128 2C 00 00 05 */ cmpwi r0, 5 +/* 800251CC 0002212C 41 82 00 3C */ beq lbl_80025208 +/* 800251D0 00022130 40 80 01 88 */ bge lbl_80025358 +/* 800251D4 00022134 2C 00 00 04 */ cmpwi r0, 4 +/* 800251D8 00022138 40 80 00 08 */ bge lbl_800251E0 +/* 800251DC 0002213C 48 00 01 7C */ b lbl_80025358 +lbl_800251E0: +/* 800251E0 00022140 7C 83 23 78 */ mr r3, r4 +/* 800251E4 00022144 48 02 C9 D9 */ bl GetParmTimerTick__7MakeMsgFRC20CArchitectureMessage +/* 800251E8 00022148 7C 64 1B 78 */ mr r4, r3 +/* 800251EC 0002214C 80 7F 00 14 */ lwz r3, 0x14(r31) +/* 800251F0 00022150 C0 24 00 04 */ lfs f1, 4(r4) +/* 800251F4 00022154 48 22 A5 A9 */ bl Update__15CSaveGameScreenFf +/* 800251F8 00022158 2C 03 00 00 */ cmpwi r3, 0 +/* 800251FC 0002215C 41 82 01 5C */ beq lbl_80025358 +/* 80025200 00022160 38 60 00 02 */ li r3, 2 +/* 80025204 00022164 48 00 01 58 */ b lbl_8002535C +lbl_80025208: +/* 80025208 00022168 7C 83 23 78 */ mr r3, r4 +/* 8002520C 0002216C 48 02 C8 D9 */ bl GetParmUserInput__7MakeMsgFRC20CArchitectureMessage +/* 80025210 00022170 3C A0 80 3E */ lis r5, lbl_803D8E9C@ha +/* 80025214 00022174 3C 80 80 3E */ lis r4, lbl_803D9810@ha +/* 80025218 00022178 38 05 8E 9C */ addi r0, r5, lbl_803D8E9C@l +/* 8002521C 0002217C 90 01 00 38 */ stw r0, 0x38(r1) +/* 80025220 00022180 38 04 98 10 */ addi r0, r4, lbl_803D9810@l +/* 80025224 00022184 90 01 00 38 */ stw r0, 0x38(r1) +/* 80025228 00022188 C0 03 00 04 */ lfs f0, 4(r3) +/* 8002522C 0002218C D0 01 00 3C */ stfs f0, 0x3c(r1) +/* 80025230 00022190 80 03 00 08 */ lwz r0, 8(r3) +/* 80025234 00022194 90 01 00 40 */ stw r0, 0x40(r1) +/* 80025238 00022198 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8002523C 0002219C D0 01 00 44 */ stfs f0, 0x44(r1) +/* 80025240 000221A0 C0 03 00 10 */ lfs f0, 0x10(r3) +/* 80025244 000221A4 D0 01 00 48 */ stfs f0, 0x48(r1) +/* 80025248 000221A8 C0 03 00 14 */ lfs f0, 0x14(r3) +/* 8002524C 000221AC D0 01 00 4C */ stfs f0, 0x4c(r1) +/* 80025250 000221B0 C0 03 00 18 */ lfs f0, 0x18(r3) +/* 80025254 000221B4 D0 01 00 50 */ stfs f0, 0x50(r1) +/* 80025258 000221B8 C0 03 00 1C */ lfs f0, 0x1c(r3) +/* 8002525C 000221BC D0 01 00 54 */ stfs f0, 0x54(r1) +/* 80025260 000221C0 C0 03 00 20 */ lfs f0, 0x20(r3) +/* 80025264 000221C4 D0 01 00 58 */ stfs f0, 0x58(r1) +/* 80025268 000221C8 88 03 00 24 */ lbz r0, 0x24(r3) +/* 8002526C 000221CC 98 01 00 5C */ stb r0, 0x5c(r1) +/* 80025270 000221D0 88 03 00 25 */ lbz r0, 0x25(r3) +/* 80025274 000221D4 98 01 00 5D */ stb r0, 0x5d(r1) +/* 80025278 000221D8 88 03 00 26 */ lbz r0, 0x26(r3) +/* 8002527C 000221DC 98 01 00 5E */ stb r0, 0x5e(r1) +/* 80025280 000221E0 88 03 00 27 */ lbz r0, 0x27(r3) +/* 80025284 000221E4 98 01 00 5F */ stb r0, 0x5f(r1) +/* 80025288 000221E8 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 8002528C 000221EC D0 01 00 60 */ stfs f0, 0x60(r1) +/* 80025290 000221F0 C0 03 00 2C */ lfs f0, 0x2c(r3) +/* 80025294 000221F4 D0 01 00 64 */ stfs f0, 0x64(r1) +/* 80025298 000221F8 88 03 00 30 */ lbz r0, 0x30(r3) +/* 8002529C 000221FC 98 01 00 68 */ stb r0, 0x68(r1) +/* 800252A0 00022200 88 03 00 31 */ lbz r0, 0x31(r3) +/* 800252A4 00022204 98 01 00 69 */ stb r0, 0x69(r1) +/* 800252A8 00022208 88 03 00 32 */ lbz r0, 0x32(r3) +/* 800252AC 0002220C 38 61 00 38 */ addi r3, r1, 0x38 +/* 800252B0 00022210 98 01 00 6A */ stb r0, 0x6a(r1) +/* 800252B4 00022214 4B FF 67 31 */ bl GetUserInput__21CArchMsgParmUserInputCFv +/* 800252B8 00022218 C0 03 00 00 */ lfs f0, 0(r3) +/* 800252BC 0002221C 38 81 00 08 */ addi r4, r1, 8 +/* 800252C0 00022220 D0 01 00 08 */ stfs f0, 8(r1) +/* 800252C4 00022224 80 03 00 04 */ lwz r0, 4(r3) +/* 800252C8 00022228 90 01 00 0C */ stw r0, 0xc(r1) +/* 800252CC 0002222C C0 03 00 08 */ lfs f0, 8(r3) +/* 800252D0 00022230 D0 01 00 10 */ stfs f0, 0x10(r1) +/* 800252D4 00022234 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 800252D8 00022238 D0 01 00 14 */ stfs f0, 0x14(r1) +/* 800252DC 0002223C C0 03 00 10 */ lfs f0, 0x10(r3) +/* 800252E0 00022240 D0 01 00 18 */ stfs f0, 0x18(r1) +/* 800252E4 00022244 C0 03 00 14 */ lfs f0, 0x14(r3) +/* 800252E8 00022248 D0 01 00 1C */ stfs f0, 0x1c(r1) +/* 800252EC 0002224C C0 03 00 18 */ lfs f0, 0x18(r3) +/* 800252F0 00022250 D0 01 00 20 */ stfs f0, 0x20(r1) +/* 800252F4 00022254 C0 03 00 1C */ lfs f0, 0x1c(r3) +/* 800252F8 00022258 D0 01 00 24 */ stfs f0, 0x24(r1) +/* 800252FC 0002225C 88 03 00 20 */ lbz r0, 0x20(r3) +/* 80025300 00022260 98 01 00 28 */ stb r0, 0x28(r1) +/* 80025304 00022264 88 03 00 21 */ lbz r0, 0x21(r3) +/* 80025308 00022268 98 01 00 29 */ stb r0, 0x29(r1) +/* 8002530C 0002226C 88 03 00 22 */ lbz r0, 0x22(r3) +/* 80025310 00022270 98 01 00 2A */ stb r0, 0x2a(r1) +/* 80025314 00022274 88 03 00 23 */ lbz r0, 0x23(r3) +/* 80025318 00022278 98 01 00 2B */ stb r0, 0x2b(r1) +/* 8002531C 0002227C C0 03 00 24 */ lfs f0, 0x24(r3) +/* 80025320 00022280 D0 01 00 2C */ stfs f0, 0x2c(r1) +/* 80025324 00022284 C0 03 00 28 */ lfs f0, 0x28(r3) +/* 80025328 00022288 D0 01 00 30 */ stfs f0, 0x30(r1) +/* 8002532C 0002228C 88 03 00 2C */ lbz r0, 0x2c(r3) +/* 80025330 00022290 98 01 00 34 */ stb r0, 0x34(r1) +/* 80025334 00022294 88 03 00 2D */ lbz r0, 0x2d(r3) +/* 80025338 00022298 98 01 00 35 */ stb r0, 0x35(r1) +/* 8002533C 0002229C 88 03 00 2E */ lbz r0, 0x2e(r3) +/* 80025340 000222A0 98 01 00 36 */ stb r0, 0x36(r1) +/* 80025344 000222A4 80 7F 00 14 */ lwz r3, 0x14(r31) +/* 80025348 000222A8 48 22 A4 29 */ bl ProcessUserInput__15CSaveGameScreenFRC11CFinalInput +/* 8002534C 000222AC 38 61 00 38 */ addi r3, r1, 0x38 +/* 80025350 000222B0 38 80 FF FF */ li r4, -1 +/* 80025354 000222B4 4B FF 66 99 */ bl __dt__21CArchMsgParmUserInputFv +lbl_80025358: +/* 80025358 000222B8 38 60 00 01 */ li r3, 1 +lbl_8002535C: +/* 8002535C 000222BC 80 01 00 84 */ lwz r0, 0x84(r1) +/* 80025360 000222C0 83 E1 00 7C */ lwz r31, 0x7c(r1) +/* 80025364 000222C4 7C 08 03 A6 */ mtlr r0 +/* 80025368 000222C8 38 21 00 80 */ addi r1, r1, 0x80 +/* 8002536C 000222CC 4E 80 00 20 */ blr + +.global __dt__9CAutoSaveFv +__dt__9CAutoSaveFv: +/* 80025370 000222D0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 80025374 000222D4 7C 08 02 A6 */ mflr r0 +/* 80025378 000222D8 90 01 00 14 */ stw r0, 0x14(r1) +/* 8002537C 000222DC 93 E1 00 0C */ stw r31, 0xc(r1) +/* 80025380 000222E0 7C 9F 23 78 */ mr r31, r4 +/* 80025384 000222E4 93 C1 00 08 */ stw r30, 8(r1) +/* 80025388 000222E8 7C 7E 1B 79 */ or. r30, r3, r3 +/* 8002538C 000222EC 41 82 00 40 */ beq lbl_800253CC +/* 80025390 000222F0 3C 60 80 3E */ lis r3, lbl_803D99F0@ha +/* 80025394 000222F4 34 1E 00 14 */ addic. r0, r30, 0x14 +/* 80025398 000222F8 38 03 99 F0 */ addi r0, r3, lbl_803D99F0@l +/* 8002539C 000222FC 90 1E 00 00 */ stw r0, 0(r30) +/* 800253A0 00022300 41 82 00 10 */ beq lbl_800253B0 +/* 800253A4 00022304 80 7E 00 14 */ lwz r3, 0x14(r30) +/* 800253A8 00022308 38 80 00 01 */ li r4, 1 +/* 800253AC 0002230C 48 22 AA 79 */ bl __dt__15CSaveGameScreenFv +lbl_800253B0: +/* 800253B0 00022310 7F C3 F3 78 */ mr r3, r30 +/* 800253B4 00022314 38 80 00 00 */ li r4, 0 +/* 800253B8 00022318 48 02 D7 ED */ bl __dt__6CIOWinFv +/* 800253BC 0002231C 7F E0 07 35 */ extsh. r0, r31 +/* 800253C0 00022320 40 81 00 0C */ ble lbl_800253CC +/* 800253C4 00022324 7F C3 F3 78 */ mr r3, r30 +/* 800253C8 00022328 48 2F 05 69 */ bl Free__7CMemoryFPCv +lbl_800253CC: +/* 800253CC 0002232C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 800253D0 00022330 7F C3 F3 78 */ mr r3, r30 +/* 800253D4 00022334 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 800253D8 00022338 83 C1 00 08 */ lwz r30, 8(r1) +/* 800253DC 0002233C 7C 08 03 A6 */ mtlr r0 +/* 800253E0 00022340 38 21 00 10 */ addi r1, r1, 0x10 +/* 800253E4 00022344 4E 80 00 20 */ blr + +.global __ct__9CAutoSaveFv +__ct__9CAutoSaveFv: +/* 800253E8 00022348 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 800253EC 0002234C 7C 08 02 A6 */ mflr r0 +/* 800253F0 00022350 3C 80 80 3D */ lis r4, lbl_803CCB50@ha +/* 800253F4 00022354 90 01 00 24 */ stw r0, 0x24(r1) +/* 800253F8 00022358 38 84 CB 50 */ addi r4, r4, lbl_803CCB50@l +/* 800253FC 0002235C 38 84 01 48 */ addi r4, r4, 0x148 +/* 80025400 00022360 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 80025404 00022364 7C 7F 1B 78 */ mr r31, r3 +/* 80025408 00022368 38 61 00 08 */ addi r3, r1, 8 +/* 8002540C 0002236C 4B FD F8 AD */ bl string_l__4rstlFPCc +/* 80025410 00022370 7F E3 FB 78 */ mr r3, r31 +/* 80025414 00022374 38 81 00 08 */ addi r4, r1, 8 +/* 80025418 00022378 48 02 D7 F5 */ bl "__ct__6CIOWinFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" +/* 8002541C 0002237C 38 61 00 08 */ addi r3, r1, 8 +/* 80025420 00022380 48 31 86 C1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" +/* 80025424 00022384 3C 60 80 3E */ lis r3, lbl_803D99F0@ha +/* 80025428 00022388 3C 80 80 3D */ lis r4, lbl_803CCB50@ha +/* 8002542C 0002238C 38 03 99 F0 */ addi r0, r3, lbl_803D99F0@l +/* 80025430 00022390 38 60 00 98 */ li r3, 0x98 +/* 80025434 00022394 38 84 CB 50 */ addi r4, r4, lbl_803CCB50@l +/* 80025438 00022398 90 1F 00 00 */ stw r0, 0(r31) +/* 8002543C 0002239C 38 84 01 51 */ addi r4, r4, 0x151 +/* 80025440 000223A0 38 A0 00 00 */ li r5, 0 +/* 80025444 000223A4 48 2F 04 29 */ bl __nw__FUlPCcPCc +/* 80025448 000223A8 7C 60 1B 79 */ or. r0, r3, r3 +/* 8002544C 000223AC 41 82 00 1C */ beq lbl_80025468 +/* 80025450 000223B0 80 CD A0 80 */ lwz r6, gpGameState@sda21(r13) +/* 80025454 000223B4 38 80 00 01 */ li r4, 1 +/* 80025458 000223B8 80 A6 02 10 */ lwz r5, 0x210(r6) +/* 8002545C 000223BC 80 C6 02 14 */ lwz r6, 0x214(r6) +/* 80025460 000223C0 48 22 AB 1D */ bl __ct__15CSaveGameScreen +/* 80025464 000223C4 7C 60 1B 78 */ mr r0, r3 +lbl_80025468: +/* 80025468 000223C8 90 1F 00 14 */ stw r0, 0x14(r31) +/* 8002546C 000223CC 80 6D A0 78 */ lwz r3, gpMain@sda21(r13) +/* 80025470 000223D0 4B FD F1 21 */ bl RefreshGameState__5CMainFv +/* 80025474 000223D4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 80025478 000223D8 7F E3 FB 78 */ mr r3, r31 +/* 8002547C 000223DC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 80025480 000223E0 7C 08 03 A6 */ mtlr r0 +/* 80025484 000223E4 38 21 00 20 */ addi r1, r1, 0x20 +/* 80025488 000223E8 4E 80 00 20 */ blr + .global sub_8002548c sub_8002548c: /* 8002548C 000223EC 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -3423,6 +3664,7 @@ lbl_800281E0: /* 80028200 00025160 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCB18 lbl_803CCB18: # ROM: 0x3C9B18 diff --git a/asm/MetroidPrime/CDamageInfo.s b/asm/MetroidPrime/CDamageInfo.s index de9f1123..b9b9810d 100644 --- a/asm/MetroidPrime/CDamageInfo.s +++ b/asm/MetroidPrime/CDamageInfo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2, "a" +.balign 8 .global lbl_805AAB20 lbl_805AAB20: diff --git a/asm/MetroidPrime/CDecalManager.s b/asm/MetroidPrime/CDecalManager.s index ae1f4d2c..0ef06328 100644 --- a/asm/MetroidPrime/CDecalManager.s +++ b/asm/MetroidPrime/CDecalManager.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CDecalManager_cpp .section .bss +.balign 8 .global lbl_8046C558 lbl_8046C558: @@ -14,6 +15,7 @@ lbl_8046C564: .skip 0xC .section .sbss +.balign 8 # CDecalManager .global lbl_805A8F28 @@ -33,6 +35,7 @@ lbl_805A8F38: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AB378 lbl_805AB378: diff --git a/asm/MetroidPrime/CEffect.s b/asm/MetroidPrime/CEffect.s index 210bba0f..1bd80bdb 100644 --- a/asm/MetroidPrime/CEffect.s +++ b/asm/MetroidPrime/CEffect.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA118 lbl_803DA118: @@ -35,6 +36,7 @@ lbl_803DA118: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6E78 lbl_805A6E78: diff --git a/asm/MetroidPrime/CEntity.s b/asm/MetroidPrime/CEntity.s index f71769cf..1abe24c4 100644 --- a/asm/MetroidPrime/CEntity.s +++ b/asm/MetroidPrime/CEntity.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CEntity_cpp .section .data +.balign 8 .global __vt__7CEntity __vt__7CEntity: @@ -19,6 +20,7 @@ __vt__7CEntity: .4byte SetActive__7CEntityFb .section .bss +.balign 8 .global lbl_8046C3B8 lbl_8046C3B8: @@ -422,6 +424,7 @@ __sinit_CEntity_cpp: /* 800515C4 0004E524 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCF18 lbl_803CCF18: # ROM: 0x3C9F18 diff --git a/asm/MetroidPrime/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s index e097467e..51d9b6a6 100644 --- a/asm/MetroidPrime/CEnvFxManager.s +++ b/asm/MetroidPrime/CEnvFxManager.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8078 lbl_805A8078: @@ -53,12 +54,14 @@ lbl_805A809C: .float 1.0 .section .bss +.balign 8 .global lbl_8046CB40 lbl_8046CB40: .skip 0x800 .section .sbss, "wa" +.balign 8 .global lbl_805A90B0 lbl_805A90B0: @@ -4292,6 +4295,7 @@ lbl_80213AB0: /* 80213AC8 00210A28 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACF68 lbl_805ACF68: # ROM: 0x3F9808 @@ -4510,6 +4514,7 @@ lbl_805AD028: .section .rodata +.balign 8 .global lbl_803D2790 lbl_803D2790: # ROM: 0x3CF790 diff --git a/asm/MetroidPrime/CErrorOutputWindow.s b/asm/MetroidPrime/CErrorOutputWindow.s index 4147e1be..2d35141d 100644 --- a/asm/MetroidPrime/CErrorOutputWindow.s +++ b/asm/MetroidPrime/CErrorOutputWindow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EA3C0 lbl_803EA3C0: @@ -259,6 +260,7 @@ lbl_803EA410: .4byte 0x002E0000 .section .sbss, "wa" +.balign 8 .global lbl_805A9128 lbl_805A9128: @@ -853,6 +855,7 @@ __ct__18CErrorOutputWindowFiff: /* 80269C7C 00266BDC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD848 lbl_805AD848: # ROM: 0x3FA0E8 @@ -886,6 +889,7 @@ lbl_805AD860: .section .rodata +.balign 8 .global lbl_803D53E0 lbl_803D53E0: # ROM: 0x3D23E0 diff --git a/asm/MetroidPrime/CEulerAngles.s b/asm/MetroidPrime/CEulerAngles.s index 90dc38e7..19582d4f 100644 --- a/asm/MetroidPrime/CEulerAngles.s +++ b/asm/MetroidPrime/CEulerAngles.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CEulerAngles_cpp .section .sdata2, "a" +.balign 8 .global lbl_805A9F78 lbl_805A9F78: diff --git a/asm/MetroidPrime/CExplosion.s b/asm/MetroidPrime/CExplosion.s index 257e6e72..320f2d04 100644 --- a/asm/MetroidPrime/CExplosion.s +++ b/asm/MetroidPrime/CExplosion.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA0A8 lbl_803DA0A8: @@ -35,6 +36,7 @@ lbl_803DA0A8: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA3C8 lbl_805AA3C8: @@ -872,6 +874,7 @@ lbl_8005AC20: /* 8005ACCC 00057C2C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCF78 lbl_803CCF78: # ROM: 0x3C9F78 diff --git a/asm/MetroidPrime/CFlameWarp.s b/asm/MetroidPrime/CFlameWarp.s index 4d5fc7c4..0b5746b9 100644 --- a/asm/MetroidPrime/CFlameWarp.s +++ b/asm/MetroidPrime/CFlameWarp.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E51C8 lbl_803E51C8: @@ -15,6 +16,7 @@ lbl_803E51C8: .4byte Get4CharID__10CFlameWarpFv .section .sdata +.balign 8 .global lbl_805A7C90 lbl_805A7C90: @@ -898,6 +900,7 @@ lbl_801B5B94: /* 801B5BA0 001B2B00 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC668 lbl_805AC668: # ROM: 0x3F8F08 @@ -940,6 +943,7 @@ lbl_805AC684: .section .rodata +.balign 8 .global lbl_803D1638 lbl_803D1638: # ROM: 0x3CE638 diff --git a/asm/MetroidPrime/CFluidPlane.s b/asm/MetroidPrime/CFluidPlane.s index 8ff0da0a..27fc04c8 100644 --- a/asm/MetroidPrime/CFluidPlane.s +++ b/asm/MetroidPrime/CFluidPlane.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E0CE0 lbl_803E0CE0: @@ -15,6 +16,7 @@ lbl_803E0CE0: .4byte "Render__11CFluidPlaneCFRC13CStateManagerRC6CAABoxRC12CTransform4fRC12CTransform4fbRC14CFrustumPlanesRCQ24rstl33optional_object<14CRippleManager>9TUniqueIdPCbiiRC9CVector3f" .section .sdata +.balign 8 .global lbl_805A76C8 lbl_805A76C8: @@ -33,6 +35,7 @@ lbl_805A76D0: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB5E8 lbl_805AB5E8: @@ -90,11 +93,6 @@ lbl_805AB60C: # ROM: 0x3F7EAC .4byte 0x00000001 -.global lbl_805AB610 -lbl_805AB610: - # ROM: 0x3F7EB0 - .4byte 0x01000000 - .section .text, "ax" .global nullsub_209 diff --git a/asm/MetroidPrime/CFluidPlaneCPU.s b/asm/MetroidPrime/CFluidPlaneCPU.s index 5db932a3..d76a9ba6 100644 --- a/asm/MetroidPrime/CFluidPlaneCPU.s +++ b/asm/MetroidPrime/CFluidPlaneCPU.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E46C8 lbl_803E46C8: @@ -15,6 +16,7 @@ lbl_803E46C8: .4byte "Render__14CFluidPlaneCPUCFRC13CStateManagerRC6CAABoxRC12CTransform4fRC12CTransform4fbRC14CFrustumPlanesRCQ24rstl33optional_object<14CRippleManager>9TUniqueIdPCbiiRC9CVector3f" .section .sdata +.balign 8 .global lbl_805A7B98 lbl_805A7B98: @@ -43,6 +45,7 @@ lbl_805A7BA8: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9040 lbl_805A9040: @@ -52,6 +55,7 @@ lbl_805A9041: .skip 0x7 .section .sbss2, "", @nobits # 0x805AF460 - 0x805AF4C7 +.balign 8 # CFluidPlaneCPU .global lbl_805AF460 lbl_805AF460: @@ -4088,6 +4092,7 @@ lbl_8019D310: /* 8019D39C 0019A2FC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC3F8 lbl_805AC3F8: # ROM: 0x3F8C98 @@ -4158,6 +4163,7 @@ lbl_805AC43C: .section .rodata +.balign 8 .global lbl_803D1230 lbl_803D1230: # ROM: 0x3CE230 diff --git a/asm/MetroidPrime/CFluidPlaneDoor.s b/asm/MetroidPrime/CFluidPlaneDoor.s index df51761d..ebf5f829 100644 --- a/asm/MetroidPrime/CFluidPlaneDoor.s +++ b/asm/MetroidPrime/CFluidPlaneDoor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E46E8 lbl_803E46E8: @@ -15,6 +16,7 @@ lbl_803E46E8: .4byte Render__15CFluidPlaneDoorCFRC13CStateManagerRC6CAABoxRC14CFrustumPlanesRC14CRippleManagerRC9CVector3f .section .sdata +.balign 8 .global lbl_805A7BB0 lbl_805A7BB0: @@ -664,6 +666,7 @@ __ct__15CFluidPlaneDoorFUiUiUifUiQ211CFluidPlane10EFluidTypefRC14CFluidUVMotion: /* 8019DD00 0019AC60 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC440 lbl_805AC440: # ROM: 0x3F8CE0 @@ -687,6 +690,7 @@ lbl_805AC450: .section .rodata +.balign 8 .global lbl_803D1300 lbl_803D1300: # ROM: 0x3CE300 diff --git a/asm/MetroidPrime/CFluidPlaneManager.s b/asm/MetroidPrime/CFluidPlaneManager.s index acb6780b..0568bcb6 100644 --- a/asm/MetroidPrime/CFluidPlaneManager.s +++ b/asm/MetroidPrime/CFluidPlaneManager.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A76D8 lbl_805A76D8: @@ -13,6 +14,12 @@ lbl_805A76DC: .4byte 0x000000FF .section .sdata2, "a" +.balign 8 + +.global lbl_805AB610 +lbl_805AB610: + # ROM: 0x3F7EB0 + .4byte 0x01000000 .global lbl_805AB614 lbl_805AB614: @@ -587,6 +594,7 @@ Clear__Q218CFluidPlaneManager13CFluidProfileFv: /* 8012F770 0012C6D0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D0038 lbl_803D0038: # ROM: 0x3CD038 diff --git a/asm/MetroidPrime/CFluidPlaneRender.s b/asm/MetroidPrime/CFluidPlaneRender.s index e1928df8..b5d5e300 100644 --- a/asm/MetroidPrime/CFluidPlaneRender.s +++ b/asm/MetroidPrime/CFluidPlaneRender.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8408 lbl_805A8408: @@ -13,12 +14,14 @@ lbl_805A840C: .4byte 0 .section .bss +.balign 8 .global lbl_8046DCC0 lbl_8046DCC0: .skip 0x400 .section .sbss, "wa" +.balign 8 .global lbl_805A9130 lbl_805A9130: @@ -4408,6 +4411,7 @@ lbl_8026FB0C: /* 8026FB44 0026CAA4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD8B0 lbl_805AD8B0: # ROM: 0x3FA150 diff --git a/asm/MetroidPrime/CFluidUVMotion.s b/asm/MetroidPrime/CFluidUVMotion.s index b512069d..a658cd54 100644 --- a/asm/MetroidPrime/CFluidUVMotion.s +++ b/asm/MetroidPrime/CFluidUVMotion.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2, "a" +.balign 8 .global lbl_805AB438 lbl_805AB438: diff --git a/asm/MetroidPrime/CFrontEndUI.s b/asm/MetroidPrime/CFrontEndUI.s index 51061726..563b2b70 100644 --- a/asm/MetroidPrime/CFrontEndUI.s +++ b/asm/MetroidPrime/CFrontEndUI.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CFrontEndUI_cpp .section .data +.balign 8 .global lbl_803D9810 lbl_803D9810: @@ -97,6 +98,7 @@ lbl_803D9900: .4byte 0 .section .rodata +.balign 8 .global lbl_803CC540 lbl_803CC540: # ROM: 0x3C9540 @@ -288,12 +290,14 @@ lbl_803CC644: .section .sbss +.balign 8 # CFrontEndUI .global lbl_805A8CB0 lbl_805A8CB0: .skip 0x8 .section .sdata +.balign 8 .global lbl_805A6CD8 lbl_805A6CD8: @@ -370,6 +374,7 @@ lbl_805A6D0C: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805A9FA8 lbl_805A9FA8: diff --git a/asm/MetroidPrime/CGBASupport.s b/asm/MetroidPrime/CGBASupport.s index dfcb2138..7ea31151 100644 --- a/asm/MetroidPrime/CGBASupport.s +++ b/asm/MetroidPrime/CGBASupport.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8C18 lbl_803E8C18: @@ -17,6 +18,7 @@ lbl_803E8C18: .4byte 0 .section .sdata +.balign 8 .global lbl_805A82B8 lbl_805A82B8: @@ -29,6 +31,7 @@ lbl_805A82BC: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9110 lbl_805A9110: @@ -638,6 +641,7 @@ nullsub_130: /* 80248DD8 00245D38 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD598 lbl_805AD598: # ROM: 0x3F9E38 @@ -656,6 +660,7 @@ lbl_805AD5A0: .section .rodata +.balign 8 .global lbl_803D4768 lbl_803D4768: # ROM: 0x3D1768 diff --git a/asm/MetroidPrime/CGameArea.s b/asm/MetroidPrime/CGameArea.s index 732778fa..0dac2c05 100644 --- a/asm/MetroidPrime/CGameArea.s +++ b/asm/MetroidPrime/CGameArea.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA208 lbl_803DA208: @@ -55,6 +56,7 @@ lbl_803DA26C: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6E98 lbl_805A6E98: @@ -82,12 +84,8 @@ lbl_805A6EA8: .4byte 0 .4byte 0 -.global lbl_805A6EB0 -lbl_805A6EB0: - # ROM: 0x3F4850 - .4byte 0 - .section .sdata2, "a" +.balign 8 .global lbl_805AA420 lbl_805AA420: @@ -8016,6 +8014,7 @@ lbl_800647DC: /* 800647FC 0006175C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCF90 lbl_803CCF90: # ROM: 0x3C9F90 diff --git a/asm/MetroidPrime/CGameCollision.s b/asm/MetroidPrime/CGameCollision.s index 0fd80c25..f062600c 100644 --- a/asm/MetroidPrime/CGameCollision.s +++ b/asm/MetroidPrime/CGameCollision.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3F80 @@ -58,6 +59,7 @@ lbl_803E4008: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7A40 lbl_805A7A40: @@ -6551,6 +6553,7 @@ lbl_80185814: /* 80185824 00182784 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABFC8 lbl_805ABFC8: # ROM: 0x3F8868 @@ -6660,6 +6663,7 @@ lbl_805AC020: .section .rodata +.balign 8 .global lbl_803D0690 lbl_803D0690: # ROM: 0x3CD690 diff --git a/asm/MetroidPrime/CGameCubeDoll.s b/asm/MetroidPrime/CGameCubeDoll.s index 6077c5e4..14177ad9 100644 --- a/asm/MetroidPrime/CGameCubeDoll.s +++ b/asm/MetroidPrime/CGameCubeDoll.s @@ -462,6 +462,7 @@ lbl_8029EC9C: /* 8029ECD4 0029BC34 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADDD0 lbl_805ADDD0: # ROM: 0x3FA670 @@ -525,6 +526,7 @@ lbl_805ADE04: .section .rodata +.balign 8 .global lbl_803D5E98 lbl_803D5E98: # ROM: 0x3D2E98 diff --git a/asm/MetroidPrime/CGameLight.s b/asm/MetroidPrime/CGameLight.s index 561bd21e..4a0c9982 100644 --- a/asm/MetroidPrime/CGameLight.s +++ b/asm/MetroidPrime/CGameLight.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF3B8 lbl_803DF3B8: @@ -35,6 +36,7 @@ lbl_803DF3B8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7218 lbl_805A7218: @@ -43,6 +45,7 @@ lbl_805A7218: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AAA10 lbl_805AAA10: diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index e518a809..c560baad 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9CE0 lbl_803D9CE0: @@ -35,6 +36,7 @@ lbl_803D9CE0: .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager .section .sdata +.balign 8 .global lbl_805A6DB8 lbl_805A6DB8: @@ -87,6 +89,7 @@ lbl_805A6DDC: .4byte 0x00000012 .section .sdata2, "a" +.balign 8 .global lbl_805AA120 lbl_805AA120: @@ -3720,6 +3723,7 @@ lbl_8003A6E0: /* 8003A7A0 00037700 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCE20 lbl_803CCE20: # ROM: 0x3C9E20 diff --git a/asm/MetroidPrime/CGroundMovement.s b/asm/MetroidPrime/CGroundMovement.s index 98a30751..a06e1ee7 100644 --- a/asm/MetroidPrime/CGroundMovement.s +++ b/asm/MetroidPrime/CGroundMovement.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7A68 lbl_805A7A68: @@ -57,6 +58,7 @@ lbl_805A7A98: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9020 lbl_805A9020: @@ -4769,6 +4771,7 @@ lbl_80189D80: /* 80189D90 00186CF0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC030 lbl_805AC030: # ROM: 0x3F88D0 diff --git a/asm/MetroidPrime/CIOWin.s b/asm/MetroidPrime/CIOWin.s index 651de189..6d7ca804 100644 --- a/asm/MetroidPrime/CIOWin.s +++ b/asm/MetroidPrime/CIOWin.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9E90 lbl_803D9E90: diff --git a/asm/MetroidPrime/CIkChain.s b/asm/MetroidPrime/CIkChain.s index d4177292..6d1bec4f 100644 --- a/asm/MetroidPrime/CIkChain.s +++ b/asm/MetroidPrime/CIkChain.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8100 lbl_805A8100: @@ -837,6 +838,7 @@ lbl_80226408: /* 802264D0 00223430 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD1C8 lbl_805AD1C8: # ROM: 0x3F9A68 diff --git a/asm/MetroidPrime/CInGameGuiManager.s b/asm/MetroidPrime/CInGameGuiManager.s index 1f1657d4..17b4496e 100644 --- a/asm/MetroidPrime/CInGameGuiManager.s +++ b/asm/MetroidPrime/CInGameGuiManager.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7590 lbl_805A7590: @@ -69,6 +70,7 @@ lbl_805A75C0: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB1A0 lbl_805AB1A0: @@ -4878,6 +4880,7 @@ lbl_8010ADA4: /* 8010ADC0 00107D20 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CEE58 lbl_803CEE58: # ROM: 0x3CBE58 diff --git a/asm/MetroidPrime/CInGameTweakManager.s b/asm/MetroidPrime/CInGameTweakManager.s index 8c156466..eb38f49c 100644 --- a/asm/MetroidPrime/CInGameTweakManager.s +++ b/asm/MetroidPrime/CInGameTweakManager.s @@ -1412,6 +1412,7 @@ lbl_8021D428: /* 8021D438 0021A398 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D3038 lbl_803D3038: # ROM: 0x3D0038 diff --git a/asm/MetroidPrime/CInputGenerator.s b/asm/MetroidPrime/CInputGenerator.s index eba935fa..e0536bdf 100644 --- a/asm/MetroidPrime/CInputGenerator.s +++ b/asm/MetroidPrime/CInputGenerator.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803CCAA0 lbl_803CCAA0: # ROM: 0x3C9AA0 diff --git a/asm/MetroidPrime/CInventoryScreen.s b/asm/MetroidPrime/CInventoryScreen.s index fbb85310..26319a42 100644 --- a/asm/MetroidPrime/CInventoryScreen.s +++ b/asm/MetroidPrime/CInventoryScreen.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6EB0 lbl_803E6EB0: @@ -90,6 +91,7 @@ lbl_803E6FC4: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7F40 lbl_805A7F40: @@ -1955,6 +1957,7 @@ lbl_802075C8: /* 802075F8 00204558 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACDE0 lbl_805ACDE0: # ROM: 0x3F9680 @@ -2007,6 +2010,67 @@ lbl_805ACE04: .section .rodata +.balign 8 +.global lbl_803D25D0 +lbl_803D25D0: + .4byte 0 + .4byte 0x00000024 + .4byte 0x00000046 + .4byte 0x00000001 + .4byte 0x00000025 + .4byte 0x00000048 + .4byte 0x00000002 + .4byte 0x00000026 + .4byte 0x0000004A + .4byte 0x00000003 + .4byte 0x00000027 + .4byte 0x0000004C + .4byte 0x00000004 + .4byte 0x00000028 + .4byte 0x0000004E + .4byte 0x00000005 + .4byte 0x0000002E + .4byte 0x00000057 + .4byte 0x00000006 + .4byte 0x0000002F + .4byte 0x00000058 + .4byte 0x00000007 + .4byte 0x00000030 + .4byte 0x00000059 + .4byte 0x00000008 + .4byte 0x00000031 + .4byte 0x0000005A + .4byte 0x00000009 + .4byte 0x00000032 + .4byte 0x0000005B + .4byte 0x0000000A + .4byte 0x00000033 + .4byte 0x00000052 + .4byte 0x0000000B + .4byte 0x00000034 + .4byte 0x00000053 + .4byte 0x0000000C + .4byte 0x00000035 + .4byte 0x00000054 + .4byte 0x0000000D + .4byte 0x00000036 + .4byte 0x00000055 + .4byte 0x0000000E + .4byte 0x00000037 + .4byte 0x00000056 + .4byte 0x0000000F + .4byte 0x00000038 + .4byte 0x00000042 + .4byte 0x00000010 + .4byte 0x00000039 + .4byte 0x00000043 + .4byte 0x00000011 + .4byte 0x0000003A + .4byte 0x00000044 + .4byte 0x00000012 + .4byte 0x0000003B + .4byte 0x00000045 + .global lbl_803D26B4 lbl_803D26B4: # ROM: 0x3CF6B4 diff --git a/asm/MetroidPrime/CLogBookScreen.s b/asm/MetroidPrime/CLogBookScreen.s index 2d38f755..86217dfb 100644 --- a/asm/MetroidPrime/CLogBookScreen.s +++ b/asm/MetroidPrime/CLogBookScreen.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8B78 lbl_803E8B78: @@ -51,6 +52,7 @@ lbl_803E8BCC: .4byte 0 .section .sdata +.balign 8 .global lbl_805A82A8 lbl_805A82A8: @@ -73,6 +75,7 @@ lbl_805A82B4: .4byte 0x00000005 .section .sbss, "wa" +.balign 8 .global lbl_805A9108 lbl_805A9108: @@ -3251,6 +3254,7 @@ lbl_802485B4: /* 802485D0 00245530 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD578 lbl_805AD578: # ROM: 0x3F9E18 @@ -3284,6 +3288,7 @@ lbl_805AD594: .section .rodata +.balign 8 .global lbl_803D4760 lbl_803D4760: # ROM: 0x3D1760 diff --git a/asm/MetroidPrime/CMFGame.s b/asm/MetroidPrime/CMFGame.s index c86bf458..86a495ea 100644 --- a/asm/MetroidPrime/CMFGame.s +++ b/asm/MetroidPrime/CMFGame.s @@ -5,12 +5,14 @@ lbl_ctor: .4byte __sinit_CMFGame_cpp .section .bss +.balign 8 .global lbl_8045A1A8 lbl_8045A1A8: .skip 0xF98 .section .data +.balign 8 .global lbl_803D9988 lbl_803D9988: # ROM: 0x3D6988 @@ -54,6 +56,7 @@ lbl_803D99D4: .4byte PreDraw__6CIOWinCFv .section .sdata +.balign 8 .global lbl_805A6D48 lbl_805A6D48: @@ -72,6 +75,7 @@ lbl_805A6D50: .4byte 0 .section .rodata +.balign 8 .global lbl_803CCAB8 lbl_803CCAB8: .asciz "aram:TestAnim" @@ -86,6 +90,7 @@ lbl_803CCAD4: .4byte 0 .section .sbss +.balign 8 # CMFGame .global lbl_805A8CB8 @@ -101,6 +106,7 @@ lbl_805A8CC4: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA020 lbl_805AA020: diff --git a/asm/MetroidPrime/CMainFlow.s b/asm/MetroidPrime/CMainFlow.s index 0208fd9e..ab88fbc0 100644 --- a/asm/MetroidPrime/CMainFlow.s +++ b/asm/MetroidPrime/CMainFlow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9928 lbl_803D9928: # ROM: 0x3D6928 @@ -34,6 +35,7 @@ lbl_803D9944: .4byte lbl_800238B8 .section .sdata +.balign 8 .global lbl_805A6D20 lbl_805A6D20: @@ -86,6 +88,7 @@ lbl_805A6D44: .4byte 0x000003E8 .section .rodata +.balign 8 .global lbl_803CCAA8 lbl_803CCAA8: diff --git a/asm/MetroidPrime/CMapArea.s b/asm/MetroidPrime/CMapArea.s index 3b264548..620f9e27 100644 --- a/asm/MetroidPrime/CMapArea.s +++ b/asm/MetroidPrime/CMapArea.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMapArea_cpp .section .data +.balign 8 .global lbl_803DAB80 lbl_803DAB80: @@ -15,6 +16,7 @@ lbl_803DAB80: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7010 lbl_805A7010: @@ -23,12 +25,14 @@ lbl_805A7010: .4byte 0 .section .bss +.balign 8 .global lbl_8046C3E0 lbl_8046C3E0: .skip 0x28 .section .sdata2, "a" +.balign 8 .global lbl_805AA6A8 lbl_805AA6A8: @@ -1114,6 +1118,7 @@ __sinit_CMapArea_cpp: /* 80081044 0007DFA4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD630 lbl_803CD630: # ROM: 0x3CA630 diff --git a/asm/MetroidPrime/CMapUniverse.s b/asm/MetroidPrime/CMapUniverse.s index 957563f2..b2511ddd 100644 --- a/asm/MetroidPrime/CMapUniverse.s +++ b/asm/MetroidPrime/CMapUniverse.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6BD0 lbl_803E6BD0: @@ -11,6 +12,7 @@ lbl_803E6BD0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7F08 lbl_805A7F08: @@ -1887,6 +1889,7 @@ lbl_802036F0: /* 802036FC 0020065C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACD68 lbl_805ACD68: # ROM: 0x3F9608 @@ -1932,6 +1935,7 @@ lbl_805ACD90: .section .rodata +.balign 8 .global lbl_803D2588 lbl_803D2588: # ROM: 0x3CF588 diff --git a/asm/MetroidPrime/CMapWorld.s b/asm/MetroidPrime/CMapWorld.s index dd97d6d8..a634bf67 100644 --- a/asm/MetroidPrime/CMapWorld.s +++ b/asm/MetroidPrime/CMapWorld.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DAF38 lbl_803DAF38: @@ -19,6 +20,7 @@ lbl_803DAF48: .4byte 0 .section .sdata +.balign 8 .global lbl_805A71C0 lbl_805A71C0: @@ -37,6 +39,7 @@ lbl_805A71C8: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA940 lbl_805AA940: @@ -4618,6 +4621,7 @@ lbl_800A25DC: /* 800A25F0 0009F550 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD960 lbl_803CD960: # ROM: 0x3CA960 diff --git a/asm/MetroidPrime/CMapWorldInfo.s b/asm/MetroidPrime/CMapWorldInfo.s index 018d8eeb..06e41f13 100644 --- a/asm/MetroidPrime/CMapWorldInfo.s +++ b/asm/MetroidPrime/CMapWorldInfo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7948 lbl_805A7948: @@ -2083,6 +2084,7 @@ lbl_80169908: /* 80169918 00166878 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D0428 lbl_803D0428: # ROM: 0x3CD428 diff --git a/asm/MetroidPrime/CMappableObject.s b/asm/MetroidPrime/CMappableObject.s index 0f54e775..a714019b 100644 --- a/asm/MetroidPrime/CMappableObject.s +++ b/asm/MetroidPrime/CMappableObject.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMappableObject_cpp .section .data +.balign 8 .global lbl_803DFC10 lbl_803DFC10: @@ -43,6 +44,7 @@ lbl_803DFC3C: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7368 lbl_805A7368: @@ -65,12 +67,14 @@ lbl_805A7374: .float 1.0 .section .bss +.balign 8 .global lbl_8046C498 lbl_8046C498: .skip 0x60 .section .sdata2, "a" +.balign 8 .global lbl_805AAD40 lbl_805AAD40: @@ -1173,6 +1177,7 @@ __sinit_CMappableObject_cpp: /* 800E956C 000E64CC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE5F0 lbl_803CE5F0: # ROM: 0x3CB5F0 diff --git a/asm/MetroidPrime/CMemoryCardDriver.s b/asm/MetroidPrime/CMemoryCardDriver.s index 582dd1b3..eea25690 100644 --- a/asm/MetroidPrime/CMemoryCardDriver.s +++ b/asm/MetroidPrime/CMemoryCardDriver.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8D38 lbl_803E8D38: @@ -37,6 +38,7 @@ lbl_803E8D6C: .4byte lbl_8024E7B0 .section .sdata +.balign 8 .global lbl_805A82D0 lbl_805A82D0: @@ -60,6 +62,7 @@ lbl_805A82D3: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9118 lbl_805A9118: @@ -3571,6 +3574,7 @@ lbl_8024F164: /* 8024F168 0024C0C8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD5D0 lbl_805AD5D0: # ROM: 0x3F9E70 @@ -3579,6 +3583,7 @@ lbl_805AD5D0: .section .rodata +.balign 8 .global lbl_803D47A8 lbl_803D47A8: # ROM: 0x3D17A8 diff --git a/asm/MetroidPrime/CMessageScreen.s b/asm/MetroidPrime/CMessageScreen.s index fb96d07b..2419b375 100644 --- a/asm/MetroidPrime/CMessageScreen.s +++ b/asm/MetroidPrime/CMessageScreen.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7E30 lbl_805A7E30: @@ -728,6 +729,7 @@ __ct__14CMessageScreenFUif: /* 801F0064 001ECFC4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACB68 lbl_805ACB68: # ROM: 0x3F9408 @@ -851,6 +853,7 @@ lbl_805ACBC8: .section .rodata +.balign 8 .global lbl_803D1F48 lbl_803D1F48: # ROM: 0x3CEF48 diff --git a/asm/MetroidPrime/CModelData.s b/asm/MetroidPrime/CModelData.s index c249caf0..3b806367 100644 --- a/asm/MetroidPrime/CModelData.s +++ b/asm/MetroidPrime/CModelData.s @@ -5,12 +5,14 @@ lbl_ctor: .4byte __sinit_CModelData_cpp .section .bss +.balign 8 .global lbl_8046C538 lbl_8046C538: .skip 0x20 .section .sdata2, "a" +.balign 8 .global lbl_805AB368 lbl_805AB368: diff --git a/asm/MetroidPrime/CNESEmulator.s b/asm/MetroidPrime/CNESEmulator.s index ff926127..7d924506 100644 --- a/asm/MetroidPrime/CNESEmulator.s +++ b/asm/MetroidPrime/CNESEmulator.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EBC50 lbl_803EBC50: @@ -19,6 +20,7 @@ lbl_803EBC60: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9160 lbl_805A9160: @@ -1313,6 +1315,7 @@ lbl_80294D3C: /* 80294D4C 00291CAC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADC60 lbl_805ADC60: # ROM: 0x3FA500 @@ -1402,6 +1405,7 @@ lbl_805ADCA8: .section .rodata +.balign 8 .global lbl_803D5B80 lbl_803D5B80: # ROM: 0x3D2B80 diff --git a/asm/MetroidPrime/CObjectList.s b/asm/MetroidPrime/CObjectList.s index 66b839b7..315eb8fa 100644 --- a/asm/MetroidPrime/CObjectList.s +++ b/asm/MetroidPrime/CObjectList.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D96D8 lbl_803D96D8: diff --git a/asm/MetroidPrime/CParticleDatabase.s b/asm/MetroidPrime/CParticleDatabase.s index 595077d0..a7889eaf 100644 --- a/asm/MetroidPrime/CParticleDatabase.s +++ b/asm/MetroidPrime/CParticleDatabase.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7220 lbl_805A7220: @@ -64,6 +65,7 @@ lbl_805A722B: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AAA40 lbl_805AAA40: @@ -4602,6 +4604,7 @@ lbl_800BB940: /* 800BB954 000B88B4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CDEA0 lbl_803CDEA0: # ROM: 0x3CAEA0 diff --git a/asm/MetroidPrime/CParticleGenInfo.s b/asm/MetroidPrime/CParticleGenInfo.s index 0edbf3b2..59654a4c 100644 --- a/asm/MetroidPrime/CParticleGenInfo.s +++ b/asm/MetroidPrime/CParticleGenInfo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF498 lbl_803DF498: @@ -27,6 +28,7 @@ lbl_803DF498: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AAA30 lbl_805AAA30: @@ -278,6 +280,7 @@ lbl_800B7A5C: /* 800B7A6C 000B49CC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CDE88 lbl_803CDE88: # ROM: 0x3CAE88 diff --git a/asm/MetroidPrime/CParticleGenInfoGeneric.s b/asm/MetroidPrime/CParticleGenInfoGeneric.s index 6903a1d7..dfcaf61b 100644 --- a/asm/MetroidPrime/CParticleGenInfoGeneric.s +++ b/asm/MetroidPrime/CParticleGenInfoGeneric.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF448 lbl_803DF448: diff --git a/asm/MetroidPrime/CPauseScreen.s b/asm/MetroidPrime/CPauseScreen.s index 26965500..2fa762f2 100644 --- a/asm/MetroidPrime/CPauseScreen.s +++ b/asm/MetroidPrime/CPauseScreen.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA390 lbl_803DA390: @@ -55,6 +56,7 @@ lbl_803DA3CC: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6F60 lbl_805A6F60: @@ -117,6 +119,7 @@ lbl_805A6F8C: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA548 lbl_805AA548: @@ -4161,6 +4164,7 @@ lbl_800742FC: /* 8007430C 0007126C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD2B8 lbl_803CD2B8: # ROM: 0x3CA2B8 diff --git a/asm/MetroidPrime/CPauseScreenBlur.s b/asm/MetroidPrime/CPauseScreenBlur.s index b5cb5390..ffbe9c5c 100644 --- a/asm/MetroidPrime/CPauseScreenBlur.s +++ b/asm/MetroidPrime/CPauseScreenBlur.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E9A00 lbl_803E9A00: @@ -11,6 +12,7 @@ lbl_803E9A00: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8398 lbl_805A8398: @@ -470,6 +472,7 @@ __ct__16CPauseScreenBlurFv: /* 8025DBBC 0025AB1C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD730 lbl_805AD730: # ROM: 0x3F9FD0 @@ -498,6 +501,7 @@ lbl_805AD740: .section .rodata +.balign 8 .global lbl_803D5240 lbl_803D5240: # ROM: 0x3D2240 diff --git a/asm/MetroidPrime/CPauseScreenFrame.s b/asm/MetroidPrime/CPauseScreenFrame.s index 4bf07400..16080d45 100644 --- a/asm/MetroidPrime/CPauseScreenFrame.s +++ b/asm/MetroidPrime/CPauseScreenFrame.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8708 lbl_803E8708: @@ -131,6 +132,7 @@ lbl_803E8864: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8290 lbl_805A8290: @@ -3587,6 +3589,7 @@ __ct__15CQuitGameScreenF9EQuitType: /* 80244BA4 00241B04 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD530 lbl_805AD530: # ROM: 0x3F9DD0 @@ -3632,6 +3635,7 @@ lbl_805AD558: .section .rodata +.balign 8 .global lbl_803D43C8 lbl_803D43C8: # ROM: 0x3D13C8 diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s index b314c338..7768f4fc 100644 --- a/asm/MetroidPrime/CPhysicsActor.s +++ b/asm/MetroidPrime/CPhysicsActor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E0628 lbl_803E0628: @@ -41,6 +42,7 @@ lbl_803E0628: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7630 lbl_805A7630: @@ -53,6 +55,7 @@ lbl_805A7634: .4byte 0 .section .sdata2, "a" +.balign 8 .global skGravityConstant__13CPhysicsActor skGravityConstant__13CPhysicsActor: diff --git a/asm/MetroidPrime/CPreFrontEnd.s b/asm/MetroidPrime/CPreFrontEnd.s index e62dee8c..c78355a8 100644 --- a/asm/MetroidPrime/CPreFrontEnd.s +++ b/asm/MetroidPrime/CPreFrontEnd.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC010 lbl_803EC010: @@ -139,6 +140,7 @@ __ct__12CPreFrontEndFv: /* 8029E640 0029B5A0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D5E80 lbl_803D5E80: # ROM: 0x3D2E80 diff --git a/asm/MetroidPrime/CProjectedShadow.s b/asm/MetroidPrime/CProjectedShadow.s index 0514a38e..0d2e7435 100644 --- a/asm/MetroidPrime/CProjectedShadow.s +++ b/asm/MetroidPrime/CProjectedShadow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A85E0 lbl_805A85E0: @@ -9,6 +10,7 @@ lbl_805A85E0: .4byte 0 .section .sbss2, "", @nobits +.balign 8 # CProjectedShadow .global lbl_805AF480 lbl_805AF480: @@ -945,6 +947,7 @@ __ct__16CProjectedShadowFv: /* 8029E4A0 0029B400 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADDB0 lbl_805ADDB0: # ROM: 0x3FA650 @@ -982,6 +985,7 @@ lbl_805ADDC8: .section .rodata +.balign 8 .global lbl_803D5E50 lbl_803D5E50: # ROM: 0x3D2E50 diff --git a/asm/MetroidPrime/CRagDoll.s b/asm/MetroidPrime/CRagDoll.s index ccab4aca..d69cdaf0 100644 --- a/asm/MetroidPrime/CRagDoll.s +++ b/asm/MetroidPrime/CRagDoll.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E70D0 lbl_803E70D0: @@ -13,6 +14,7 @@ lbl_803E70D0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7FB8 lbl_805A7FB8: @@ -2354,6 +2356,7 @@ __ct__8CRagDollFfffUi: /* 8020E994 0020B8F4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACEE0 lbl_805ACEE0: # ROM: 0x3F9780 diff --git a/asm/MetroidPrime/CRainSplashGenerator.s b/asm/MetroidPrime/CRainSplashGenerator.s index 8dbe96eb..5871f0c6 100644 --- a/asm/MetroidPrime/CRainSplashGenerator.s +++ b/asm/MetroidPrime/CRainSplashGenerator.s @@ -1223,6 +1223,7 @@ lbl_8026AD34: /* 8026AD5C 00267CBC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD868 lbl_805AD868: # ROM: 0x3FA108 @@ -1311,6 +1312,7 @@ lbl_805AD8A8: .section .rodata +.balign 8 .global lbl_803D53F8 lbl_803D53F8: # ROM: 0x3D23F8 diff --git a/asm/MetroidPrime/CRipple.s b/asm/MetroidPrime/CRipple.s index 275360dd..8c379f93 100644 --- a/asm/MetroidPrime/CRipple.s +++ b/asm/MetroidPrime/CRipple.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 # CRipple .global lbl_805A8F58 @@ -11,6 +12,7 @@ lbl_805A8F5C: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AB3F0 lbl_805AB3F0: diff --git a/asm/MetroidPrime/CRippleManager.s b/asm/MetroidPrime/CRippleManager.s index f8de6314..c023e141 100644 --- a/asm/MetroidPrime/CRippleManager.s +++ b/asm/MetroidPrime/CRippleManager.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2, "a" +.balign 8 .global lbl_805AB460 lbl_805AB460: @@ -416,6 +417,7 @@ lbl_8011D4A0: /* 8011D4B0 0011A410 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CF318 lbl_803CF318: # ROM: 0x3CC318 diff --git a/asm/MetroidPrime/CRumbleManager.s b/asm/MetroidPrime/CRumbleManager.s index a3218848..40071773 100644 --- a/asm/MetroidPrime/CRumbleManager.s +++ b/asm/MetroidPrime/CRumbleManager.s @@ -166,6 +166,7 @@ __ct__14CRumbleManagerFv: /* 8022E31C 0022B27C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD348 lbl_805AD348: # ROM: 0x3F9BE8 diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s index 58b5dc28..601e406d 100644 --- a/asm/MetroidPrime/CSamusDoll.s +++ b/asm/MetroidPrime/CSamusDoll.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CSamusDoll_cpp .section .sdata +.balign 8 .global lbl_805A72C8 lbl_805A72C8: @@ -117,6 +118,7 @@ lbl_805A731C: .float 1.0 .section .bss +.balign 8 .global lbl_8046C470 lbl_8046C470: @@ -126,6 +128,7 @@ lbl_8046C47C: .skip 0xC .section .sdata2, "a" +.balign 8 .global lbl_805AABA0 lbl_805AABA0: @@ -4613,6 +4616,7 @@ __sinit_CSamusDoll_cpp: /* 800DE7F8 000DB758 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE2D8 lbl_803CE2D8: # ROM: 0x3CB2D8 @@ -4682,43 +4686,24 @@ lbl_803CE338: lbl_803CE3AC: # ROM: 0x3CB3AC .asciz "CMDL_InvPowerBeam" - .byte 0x43, 0x4D - .asciz "DL_InvIceBeam" - .byte 0x43, 0x4D - .asciz "DL_InvWaveBeam" - .byte 0x43 - .asciz "MDL_InvPlasmaBeam" - .byte 0x43, 0x4D - .asciz "DL_InvVisor" + .asciz "CMDL_InvIceBeam" + .asciz "CMDL_InvWaveBeam" + .asciz "CMDL_InvPlasmaBeam" + .asciz "CMDL_InvVisor" .asciz "CMDL_InvGravityVisor" - .byte 0x43, 0x4D, 0x44 - .asciz "L_InvPhazonVisor" - .byte 0x43, 0x4D, 0x44 - .asciz "L_InvFusionVisor" - .byte 0x43, 0x4D, 0x44 - .asciz "L_InvPowerFins" - .byte 0x43 - .asciz "MDL_InvVariaFins" - .byte 0x43, 0x4D, 0x44 - .asciz "L_InvGravityFins" - .byte 0x43, 0x4D, 0x44 - .asciz "L_InvPhazonFins" + .asciz "CMDL_InvPhazonVisor" + .asciz "CMDL_InvFusionVisor" + .asciz "CMDL_InvPowerFins" + .asciz "CMDL_InvVariaFins" + .asciz "CMDL_InvGravityFins" + .asciz "CMDL_InvPhazonFins" .asciz "CMDL_InvGrappleBeam" .asciz "GUN_LCTR" - .byte 0x47, 0x52, 0x41 - .asciz "PPLE_LCTR" - .byte 0x56, 0x49 - .asciz "SOR_LCTR" - .byte 0x53, 0x61, 0x6D - .asciz "usBallANCS" - .byte 0x3F - .asciz "?(??)" - .byte 0x50, 0x68 - .asciz "azonIndirectTexture" + .asciz "GRAPPLE_LCTR" + .asciz "VISOR_LCTR" + .asciz "SamusBallANCS" + .asciz "??(??)" + .asciz "PhazonIndirectTexture" .asciz "ANCS_ItemScreenSamus" - .byte 0x42, 0x61, 0x6C - .asciz "lInnerGlow" - .byte 0x4D - .asciz "orphBallTransitionFlash" - .4byte 0 - + .asciz "BallInnerGlow" + .asciz "MorphBallTransitionFlash" diff --git a/asm/MetroidPrime/CSaveGameScreen.s b/asm/MetroidPrime/CSaveGameScreen.s index 6b2ee2ca..1a96d97f 100644 --- a/asm/MetroidPrime/CSaveGameScreen.s +++ b/asm/MetroidPrime/CSaveGameScreen.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8DA0 lbl_803E8DA0: @@ -58,14 +59,8 @@ lbl_803E8DFC: .4byte lbl_8025051C .4byte lbl_80250530 -.global lbl_803E8E40 -lbl_803E8E40: - # ROM: 0x3E5E40 - .4byte 0x803D4B50 - .4byte 0x803D4B5B - .4byte 0x803D4B66 - .section .sdata +.balign 8 .global lbl_805A82D8 lbl_805A82D8: @@ -1937,6 +1932,7 @@ lbl_80250A68: /* 80250A78 0024D9D8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD5D8 lbl_805AD5D8: # ROM: 0x3F9E78 diff --git a/asm/MetroidPrime/CScriptMailbox.s b/asm/MetroidPrime/CScriptMailbox.s index dceba8cf..eaf486ef 100644 --- a/asm/MetroidPrime/CScriptMailbox.s +++ b/asm/MetroidPrime/CScriptMailbox.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7328 lbl_805A7328: @@ -486,6 +487,7 @@ __ct__14CScriptMailboxFv: /* 800E2064 000DEFC4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE5C0 lbl_803CE5C0: # ROM: 0x3CB5C0 diff --git a/asm/MetroidPrime/CSimpleShadow.s b/asm/MetroidPrime/CSimpleShadow.s index f0eee6da..f07b8262 100644 --- a/asm/MetroidPrime/CSimpleShadow.s +++ b/asm/MetroidPrime/CSimpleShadow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7578 lbl_805A7578: @@ -13,6 +14,7 @@ lbl_805A757C: .4byte 0x00000031 .section .sdata2, "a" +.balign 8 .global lbl_805AB170 lbl_805AB170: diff --git a/asm/MetroidPrime/CSlideShow.s b/asm/MetroidPrime/CSlideShow.s index 9b82608a..bd2aea5b 100644 --- a/asm/MetroidPrime/CSlideShow.s +++ b/asm/MetroidPrime/CSlideShow.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CSlideShow_cpp .section .data +.balign 8 .global lbl_803EBFB8 lbl_803EBFB8: @@ -33,6 +34,7 @@ lbl_803EBFD4: .4byte lbl_8029C018 .section .sbss2, "", @nobits +.balign 8 # CSlideShow .global lbl_805AF478 lbl_805AF478: @@ -42,6 +44,7 @@ lbl_805AF47C: .skip 0x4 .section .sdata +.balign 8 .global lbl_805A8590 lbl_805A8590: @@ -120,6 +123,7 @@ lbl_805A85C8: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9168 lbl_805A9168: @@ -5485,6 +5489,7 @@ __sinit_CSlideShow_cpp: /* 8029C5F4 00299554 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADCE8 lbl_805ADCE8: # ROM: 0x3FA588 @@ -5605,6 +5610,7 @@ lbl_805ADD50: .section .rodata +.balign 8 .global lbl_803D5C38 lbl_803D5C38: # ROM: 0x3D2C38 diff --git a/asm/MetroidPrime/CSortedLists.s b/asm/MetroidPrime/CSortedLists.s index e698c46c..5aac2ffe 100644 --- a/asm/MetroidPrime/CSortedLists.s +++ b/asm/MetroidPrime/CSortedLists.s @@ -1550,6 +1550,7 @@ __ct__Q22SL5SNodeFv: /* 8014ABE0 00147B40 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB9F8 lbl_805AB9F8: # ROM: 0x3F8298 diff --git a/asm/MetroidPrime/CSplashScreen.s b/asm/MetroidPrime/CSplashScreen.s index 8160d4a0..afb739bc 100644 --- a/asm/MetroidPrime/CSplashScreen.s +++ b/asm/MetroidPrime/CSplashScreen.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2, "a" +.balign 8 .global lbl_805AA0A0 lbl_805AA0A0: @@ -90,6 +91,7 @@ lbl_805AA0E8: .4byte 0 .section .data +.balign 8 .global lbl_803D9A50 lbl_803D9A50: @@ -125,6 +127,7 @@ lbl_803D9A88: .balign 4 .section .sdata +.balign 8 .global lbl_805A6D90 lbl_805A6D90: @@ -1417,6 +1420,7 @@ lbl_800293E8: /* 80029408 00026368 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCCD0 lbl_803CCCD0: # ROM: 0x3C9CD0 diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index cfc84aab..dd324722 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_8045C550 lbl_8045C550: @@ -22,6 +23,7 @@ lbl_8046B97C: .skip 0xA3C .section .sdata +.balign 8 .global lbl_805A6E20 lbl_805A6E20: @@ -129,6 +131,7 @@ lbl_805A6E64: .4byte 0 .section .sbss +.balign 8 # CStateManager .global lbl_805A8D98 @@ -183,6 +186,7 @@ lbl_805A8DD4: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA260 lbl_805AA260: @@ -445,6 +449,11 @@ lbl_805AA348: # ROM: 0x3F6BE8 .4byte 0x43480000 +.global lbl_805AA34C +lbl_805AA34C: + # ROM: 0x3F6BEC + .4byte 0x3F7D70A4 + .section .text, "ax" .global IntegrateVisorFog__13CStateManagerFf @@ -15508,6 +15517,7 @@ lbl_8005105C: /* 80051080 0004DFE0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCEE0 lbl_803CCEE0: # ROM: 0x3C9EE0 diff --git a/asm/MetroidPrime/CSteeringBehaviors.s b/asm/MetroidPrime/CSteeringBehaviors.s index fb1f9f32..11039f89 100644 --- a/asm/MetroidPrime/CSteeringBehaviors.s +++ b/asm/MetroidPrime/CSteeringBehaviors.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7748 lbl_805A7748: @@ -2451,6 +2452,7 @@ __ct__18CSteeringBehaviorsFv: /* 8013ED58 0013BCB8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB7D8 lbl_805AB7D8: # ROM: 0x3F8078 diff --git a/asm/MetroidPrime/CTargetReticles.s b/asm/MetroidPrime/CTargetReticles.s index ae5eebba..4453e024 100644 --- a/asm/MetroidPrime/CTargetReticles.s +++ b/asm/MetroidPrime/CTargetReticles.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CTargetReticles_cpp .section .sdata +.balign 8 .global lbl_805A7230 lbl_805A7230: @@ -97,12 +98,14 @@ lbl_805A7274: .4byte 0 .section .bss +.balign 8 .global lbl_8046C450 lbl_8046C450: .skip 0x20 .section .sdata2, "a" +.balign 8 .global lbl_805AAA50 lbl_805AAA50: @@ -6532,6 +6535,7 @@ __sinit_CTargetReticles_cpp: /* 800C1D24 000BEC84 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CDEE8 lbl_803CDEE8: # ROM: 0x3CAEE8 diff --git a/asm/MetroidPrime/CTransitionDatabaseGame.s b/asm/MetroidPrime/CTransitionDatabaseGame.s index f92a37fc..c977809a 100644 --- a/asm/MetroidPrime/CTransitionDatabaseGame.s +++ b/asm/MetroidPrime/CTransitionDatabaseGame.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA340 lbl_803DA340: @@ -11,6 +12,7 @@ lbl_803DA340: .4byte 0 .section .sbss +.balign 8 # CTransitionDatabaseGame .global lbl_805A8DF0 @@ -1760,6 +1762,7 @@ lbl_8006F934: /* 8006F950 0006C8B0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD288 lbl_803CD288: # ROM: 0x3CA288 diff --git a/asm/MetroidPrime/CVisorFlare.s b/asm/MetroidPrime/CVisorFlare.s index d61b4ba2..154190ae 100644 --- a/asm/MetroidPrime/CVisorFlare.s +++ b/asm/MetroidPrime/CVisorFlare.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7F50 lbl_805A7F50: @@ -1000,6 +1001,7 @@ lbl_80208350: /* 8020840C 0020536C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACE08 lbl_805ACE08: # ROM: 0x3F96A8 @@ -1044,6 +1046,7 @@ lbl_805ACE28: .section .rodata +.balign 8 .global lbl_803D2720 lbl_803D2720: # ROM: 0x3CF720 diff --git a/asm/MetroidPrime/CWeaponMgr.s b/asm/MetroidPrime/CWeaponMgr.s index 901e6b7b..676a218c 100644 --- a/asm/MetroidPrime/CWeaponMgr.s +++ b/asm/MetroidPrime/CWeaponMgr.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7278 lbl_805A7278: @@ -696,6 +697,7 @@ lbl_800C25DC: /* 800C25EC 000BF54C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE018 lbl_803CE018: # ROM: 0x3CB018 diff --git a/asm/MetroidPrime/CWorld.s b/asm/MetroidPrime/CWorld.s index 89a6e99b..66afd803 100644 --- a/asm/MetroidPrime/CWorld.s +++ b/asm/MetroidPrime/CWorld.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CWorld_cpp .section .data +.balign 8 .global lbl_803D9FC0 lbl_803D9FC0: @@ -73,6 +74,7 @@ lbl_803DA04C: .4byte 0 .section .sbss +.balign 8 # CWorld .global lbl_805A8DD8 @@ -89,6 +91,7 @@ lbl_805A8DE4: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA3B0 lbl_805AA3B0: @@ -5002,6 +5005,7 @@ __sinit_CWorld_cpp: /* 80059F1C 00056E7C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCF70 lbl_803CCF70: # ROM: 0x3C9F70 diff --git a/asm/MetroidPrime/CWorldShadow.s b/asm/MetroidPrime/CWorldShadow.s index bc1e10f5..86fa53e1 100644 --- a/asm/MetroidPrime/CWorldShadow.s +++ b/asm/MetroidPrime/CWorldShadow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 # CWorldShadow .global lbl_805A8F18 @@ -17,6 +18,7 @@ lbl_805A8F24: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AB290 lbl_805AB290: @@ -999,6 +1001,7 @@ lbl_80111C34: /* 80111CC8 0010EC28 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CF1F8 lbl_803CF1F8: # ROM: 0x3CC1F8 diff --git a/asm/MetroidPrime/CWorldTransManager.s b/asm/MetroidPrime/CWorldTransManager.s index 57c2eada..c6411257 100644 --- a/asm/MetroidPrime/CWorldTransManager.s +++ b/asm/MetroidPrime/CWorldTransManager.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7F88 lbl_805A7F88: @@ -59,6 +60,7 @@ lbl_805A7FB0: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A90A8 lbl_805A90A8: @@ -3089,6 +3091,7 @@ lbl_8020B918: /* 8020B938 00208898 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACE40 lbl_805ACE40: # ROM: 0x3F96E0 @@ -3256,6 +3259,7 @@ lbl_805ACEC4: .section .rodata +.balign 8 .global lbl_803D2750 lbl_803D2750: # ROM: 0x3CF750 diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index 7ff27b64..2f4e4d30 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CBallCamera_cpp .section .data +.balign 8 .global lbl_803DAB90 lbl_803DAB90: @@ -61,6 +62,7 @@ lbl_803DAC28: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7018 lbl_805A7018: @@ -373,12 +375,14 @@ lbl_805A710C: .4byte 0x00000015 .section .bss +.balign 8 .global lbl_8046C408 lbl_8046C408: .skip 0x18 .section .sbss +.balign 8 # CBallCamera .global lbl_805A8E48 @@ -395,6 +399,7 @@ lbl_805A8E54: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA6D0 lbl_805AA6D0: @@ -14463,6 +14468,7 @@ __sinit_CBallCamera_cpp: /* 8008DA6C 0008A9CC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD678 lbl_803CD678: # ROM: 0x3CA678 diff --git a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s index e419540b..dc1dec65 100644 --- a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s +++ b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8248 lbl_805A8248: @@ -954,6 +955,7 @@ lbl_8023F2E0: /* 8023F32C 0023C28C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD4C0 lbl_805AD4C0: # ROM: 0x3F9D60 diff --git a/asm/MetroidPrime/Cameras/CCameraFilter.s b/asm/MetroidPrime/Cameras/CCameraFilter.s index d8ddfd6e..c9ee918a 100644 --- a/asm/MetroidPrime/Cameras/CCameraFilter.s +++ b/asm/MetroidPrime/Cameras/CCameraFilter.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CCameraFilter_cpp .section .data +.balign 8 .global lbl_803DFCC0 lbl_803DFCC0: @@ -33,6 +34,7 @@ lbl_803DFCE4: .4byte lbl_800EC234 .section .sdata +.balign 8 .global lbl_805A73D8 lbl_805A73D8: @@ -51,6 +53,7 @@ lbl_805A73E0: .4byte 0 .section .sbss +.balign 8 # CCameraFilter .global lbl_805A8EE0 @@ -58,6 +61,7 @@ lbl_805A8EE0: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AADF0 lbl_805AADF0: @@ -3421,6 +3425,7 @@ __sinit_CCameraFilter_cpp: /* 800ED7E8 000EA748 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE650 lbl_803CE650: # ROM: 0x3CB650 diff --git a/asm/MetroidPrime/Cameras/CCameraHint.s b/asm/MetroidPrime/Cameras/CCameraHint.s deleted file mode 100644 index 8f914951..00000000 --- a/asm/MetroidPrime/Cameras/CCameraHint.s +++ /dev/null @@ -1,79 +0,0 @@ -.include "macros.inc" - -.section .data - -.global lbl_803DF6F4 -lbl_803DF6F4: - # ROM: 0x3DC6F4 - .4byte 0 - .4byte 0 - .4byte __dt__11CCameraHintFv - -.section .text, "ax" - -.global __dt__11CCameraHintFv -__dt__11CCameraHintFv: -/* 800C518C 000C20EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800C5190 000C20F0 7C 08 02 A6 */ mflr r0 -/* 800C5194 000C20F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800C5198 000C20F8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800C519C 000C20FC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800C51A0 000C2100 41 82 00 1C */ beq lbl_800C51BC -/* 800C51A4 000C2104 3C A0 80 3E */ lis r5, lbl_803DF6F4@ha -/* 800C51A8 000C2108 7C 80 07 35 */ extsh. r0, r4 -/* 800C51AC 000C210C 38 05 F6 F4 */ addi r0, r5, lbl_803DF6F4@l -/* 800C51B0 000C2110 90 1F 00 00 */ stw r0, 0(r31) -/* 800C51B4 000C2114 40 81 00 08 */ ble lbl_800C51BC -/* 800C51B8 000C2118 48 25 07 79 */ bl Free__7CMemoryFPCv -lbl_800C51BC: -/* 800C51BC 000C211C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800C51C0 000C2120 7F E3 FB 78 */ mr r3, r31 -/* 800C51C4 000C2124 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800C51C8 000C2128 7C 08 03 A6 */ mtlr r0 -/* 800C51CC 000C212C 38 21 00 10 */ addi r1, r1, 0x10 -/* 800C51D0 000C2130 4E 80 00 20 */ blr - -.global __ct__11CCameraHintFiQ211CBallCamera20EBallCameraBehaviourfffRC9CVector3fRC9CVector3fRC9CVector3fffffffffff -__ct__11CCameraHintFiQ211CBallCamera20EBallCameraBehaviourfffRC9CVector3fRC9CVector3fRC9CVector3fffffffffff: -/* 800C51D4 000C2134 3D 20 80 3E */ lis r9, lbl_803DF6F4@ha -/* 800C51D8 000C2138 C1 A1 00 08 */ lfs f13, 8(r1) -/* 800C51DC 000C213C 38 09 F6 F4 */ addi r0, r9, lbl_803DF6F4@l -/* 800C51E0 000C2140 C1 81 00 0C */ lfs f12, 0xc(r1) -/* 800C51E4 000C2144 90 03 00 00 */ stw r0, 0(r3) -/* 800C51E8 000C2148 C1 61 00 10 */ lfs f11, 0x10(r1) -/* 800C51EC 000C214C 90 83 00 04 */ stw r4, 4(r3) -/* 800C51F0 000C2150 C1 41 00 14 */ lfs f10, 0x14(r1) -/* 800C51F4 000C2154 90 A3 00 08 */ stw r5, 8(r3) -/* 800C51F8 000C2158 C1 21 00 18 */ lfs f9, 0x18(r1) -/* 800C51FC 000C215C D0 23 00 0C */ stfs f1, 0xc(r3) -/* 800C5200 000C2160 D0 43 00 10 */ stfs f2, 0x10(r3) -/* 800C5204 000C2164 D0 63 00 14 */ stfs f3, 0x14(r3) -/* 800C5208 000C2168 C0 06 00 00 */ lfs f0, 0(r6) -/* 800C520C 000C216C D0 03 00 18 */ stfs f0, 0x18(r3) -/* 800C5210 000C2170 C0 06 00 04 */ lfs f0, 4(r6) -/* 800C5214 000C2174 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 800C5218 000C2178 C0 06 00 08 */ lfs f0, 8(r6) -/* 800C521C 000C217C D0 03 00 20 */ stfs f0, 0x20(r3) -/* 800C5220 000C2180 C0 07 00 00 */ lfs f0, 0(r7) -/* 800C5224 000C2184 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 800C5228 000C2188 C0 07 00 04 */ lfs f0, 4(r7) -/* 800C522C 000C218C D0 03 00 28 */ stfs f0, 0x28(r3) -/* 800C5230 000C2190 C0 07 00 08 */ lfs f0, 8(r7) -/* 800C5234 000C2194 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 800C5238 000C2198 C0 08 00 00 */ lfs f0, 0(r8) -/* 800C523C 000C219C D0 03 00 30 */ stfs f0, 0x30(r3) -/* 800C5240 000C21A0 C0 08 00 04 */ lfs f0, 4(r8) -/* 800C5244 000C21A4 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 800C5248 000C21A8 C0 08 00 08 */ lfs f0, 8(r8) -/* 800C524C 000C21AC D0 03 00 38 */ stfs f0, 0x38(r3) -/* 800C5250 000C21B0 D0 83 00 3C */ stfs f4, 0x3c(r3) -/* 800C5254 000C21B4 D0 A3 00 40 */ stfs f5, 0x40(r3) -/* 800C5258 000C21B8 D0 C3 00 44 */ stfs f6, 0x44(r3) -/* 800C525C 000C21BC D0 E3 00 48 */ stfs f7, 0x48(r3) -/* 800C5260 000C21C0 D1 03 00 4C */ stfs f8, 0x4c(r3) -/* 800C5264 000C21C4 D1 A3 00 50 */ stfs f13, 0x50(r3) -/* 800C5268 000C21C8 D1 83 00 54 */ stfs f12, 0x54(r3) -/* 800C526C 000C21CC D1 63 00 58 */ stfs f11, 0x58(r3) -/* 800C5270 000C21D0 D1 43 00 5C */ stfs f10, 0x5c(r3) -/* 800C5274 000C21D4 D1 23 00 60 */ stfs f9, 0x60(r3) -/* 800C5278 000C21D8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s index 64db8652..c4d04673 100644 --- a/asm/MetroidPrime/Cameras/CCameraManager.s +++ b/asm/MetroidPrime/Cameras/CCameraManager.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D8EA8 lbl_803D8EA8: @@ -11,6 +12,7 @@ lbl_803D8EA8: .4byte 0 .section .sdata2 +.balign 8 .global lbl_805A9D88 lbl_805A9D88: # ROM: 0x3F6628 @@ -74,6 +76,7 @@ lbl_805A9DC0: .double 4.503601774854144E15 .section .sdata +.balign 8 .global lbl_805A6BD0 lbl_805A6BD0: # ROM: 0x3F4570 @@ -111,6 +114,7 @@ lbl_805A6BE8: .4byte 0 .section .rodata +.balign 8 .global lbl_803CC028 lbl_803CC028: # ROM: 0x3C9028 diff --git a/asm/MetroidPrime/Cameras/CCameraShakeData.s b/asm/MetroidPrime/Cameras/CCameraShakeData.s index ee794ddb..9f62a58a 100644 --- a/asm/MetroidPrime/Cameras/CCameraShakeData.s +++ b/asm/MetroidPrime/Cameras/CCameraShakeData.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CCameraShakeData_cpp .section .sdata +.balign 8 .global lbl_805A7888 lbl_805A7888: @@ -37,6 +38,7 @@ lbl_805A789C: .float 1.0 .section .bss +.balign 8 .global lbl_8046C7D0 lbl_8046C7D0: .skip 0x78 @@ -1555,6 +1557,7 @@ lbl_8015DE74: /* 8015DE84 0015ADE4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABC00 lbl_805ABC00: # ROM: 0x3F84A0 diff --git a/asm/MetroidPrime/Cameras/CCinematicCamera.s b/asm/MetroidPrime/Cameras/CCinematicCamera.s index c7f6a7f3..50afb44a 100644 --- a/asm/MetroidPrime/Cameras/CCinematicCamera.s +++ b/asm/MetroidPrime/Cameras/CCinematicCamera.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DADF8 lbl_803DADF8: @@ -37,6 +38,7 @@ lbl_803DADF8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7160 lbl_805A7160: @@ -49,6 +51,7 @@ lbl_805A7164: .4byte 0 .section .sbss +.balign 8 # CCinematicCamera .global lbl_805A8E68 @@ -65,6 +68,7 @@ lbl_805A8E74: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA858 lbl_805AA858: @@ -3161,6 +3165,7 @@ lbl_80095674: /* 8009568C 000925EC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD7C0 lbl_803CD7C0: # ROM: 0x3CA7C0 diff --git a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s index 08e40c46..355db330 100644 --- a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s +++ b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9660 lbl_803D9660: # ROM: 0x3D6660 @@ -36,12 +37,14 @@ lbl_803D9660: .4byte 0 .section .rodata +.balign 8 .global lbl_803CC420 lbl_803CC420: .asciz "First Person Camera" .4byte 0 .section .sdata +.balign 8 .global lbl_805A6BF8 lbl_805A6BF8: # ROM: 0x3F4598 @@ -143,6 +146,7 @@ lbl_805A6C44: .float 1.0 .section .sdata2 +.balign 8 .global lbl_805A9DD0 lbl_805A9DD0: diff --git a/asm/MetroidPrime/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s index 4bdd043e..0d23e621 100644 --- a/asm/MetroidPrime/Cameras/CGameCamera.s +++ b/asm/MetroidPrime/Cameras/CGameCamera.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA188 lbl_803DA188: # ROM: 0x3D7188 @@ -42,6 +43,7 @@ lbl_803DA194: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6E80 lbl_805A6E80: @@ -74,6 +76,7 @@ lbl_805A6E94: .float 1.0 .section .sdata2, "a" +.balign 8 .global lbl_805AA3D8 lbl_805AA3D8: diff --git a/asm/MetroidPrime/Cameras/CInterpolationCamera.s b/asm/MetroidPrime/Cameras/CInterpolationCamera.s index 78e6ffa8..3a3a518d 100644 --- a/asm/MetroidPrime/Cameras/CInterpolationCamera.s +++ b/asm/MetroidPrime/Cameras/CInterpolationCamera.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E9D80 lbl_803E9D80: @@ -1174,6 +1175,7 @@ lbl_80265F8C: /* 8026603C 00262F9C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD7B8 lbl_805AD7B8: # ROM: 0x3FA058 @@ -1231,6 +1233,7 @@ lbl_805AD7E4: .section .rodata +.balign 8 .global lbl_803D5298 lbl_803D5298: # ROM: 0x3D2298 diff --git a/asm/MetroidPrime/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s index c8c67571..8c9837be 100644 --- a/asm/MetroidPrime/Cameras/CPathCamera.s +++ b/asm/MetroidPrime/Cameras/CPathCamera.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPathCamera_cpp .section .data +.balign 8 .global lbl_803E0C68 lbl_803E0C68: @@ -41,6 +42,7 @@ lbl_803E0C68: .4byte 0 .section .sdata +.balign 8 .global lbl_805A76B0 lbl_805A76B0: @@ -69,12 +71,14 @@ lbl_805A76C0: .4byte 0 .section .bss +.balign 8 .global lbl_8046C720 lbl_8046C720: .skip 0x18 .section .sbss +.balign 8 # CPathCamera .global lbl_805A8F60 @@ -91,6 +95,7 @@ lbl_805A8F6C: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AB5C8 lbl_805AB5C8: diff --git a/asm/MetroidPrime/Decode.s b/asm/MetroidPrime/Decode.s index dc1346a4..e68c7467 100644 --- a/asm/MetroidPrime/Decode.s +++ b/asm/MetroidPrime/Decode.s @@ -427,6 +427,7 @@ GetParmDeleteIOWin__7MakeMsgFRC20CArchitectureMessage: /* 80051D78 0004ECD8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCF20 lbl_803CCF20: # ROM: 0x3C9F20 diff --git a/asm/MetroidPrime/Enemies/CActorContraption.s b/asm/MetroidPrime/Enemies/CActorContraption.s index c46e44e0..8dcdc65f 100644 --- a/asm/MetroidPrime/Enemies/CActorContraption.s +++ b/asm/MetroidPrime/Enemies/CActorContraption.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E85E8 lbl_803E85E8: @@ -677,6 +678,7 @@ lbl_8023FBDC: /* 8023FBFC 0023CB5C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD4E8 lbl_805AD4E8: # ROM: 0x3F9D88 @@ -689,6 +691,7 @@ lbl_805AD4EC: .section .rodata +.balign 8 .global lbl_803D43A0 lbl_803D43A0: # ROM: 0x3D13A0 diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index 963a7e53..cadb0ddb 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CAi_cpp .section .data +.balign 8 .global lbl_803DAF58 lbl_803DAF58: @@ -1041,6 +1042,7 @@ lbl_803DBCCC: .4byte 0 .section .sdata +.balign 8 .global lbl_805A71D0 lbl_805A71D0: @@ -1059,6 +1061,7 @@ lbl_805A71D8: .4byte 0 .section .sbss +.balign 8 # CAi + CAiFuncMap .global lbl_805A8E78 @@ -1078,6 +1081,7 @@ lbl_805A8E88: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AA978 lbl_805AA978: @@ -4590,6 +4594,7 @@ __sinit_CAi_cpp: /* 800A5338 000A2298 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD968 lbl_803CD968: # ROM: 0x3CA968 diff --git a/asm/MetroidPrime/Enemies/CAmbientAI.s b/asm/MetroidPrime/Enemies/CAmbientAI.s index 62fb10a8..847098f1 100644 --- a/asm/MetroidPrime/Enemies/CAmbientAI.s +++ b/asm/MetroidPrime/Enemies/CAmbientAI.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8CB0 lbl_803E8CB0: @@ -754,6 +755,7 @@ __ct__10CAmbientAI: /* 8024C28C 002491EC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD5B0 lbl_805AD5B0: # ROM: 0x3F9E50 @@ -792,6 +794,7 @@ lbl_805AD5C8: .section .rodata +.balign 8 .global lbl_803D4798 lbl_803D4798: # ROM: 0x3D1798 diff --git a/asm/MetroidPrime/Enemies/CAtomicAlpha.s b/asm/MetroidPrime/Enemies/CAtomicAlpha.s index 9afbcb74..c6703b36 100644 --- a/asm/MetroidPrime/Enemies/CAtomicAlpha.s +++ b/asm/MetroidPrime/Enemies/CAtomicAlpha.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E88A8 lbl_803E88A8: @@ -187,6 +188,7 @@ lbl_803E88A8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A82A0 lbl_805A82A0: @@ -1238,6 +1240,7 @@ lbl_802459E4: /* 80245A2C 0024298C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD560 lbl_805AD560: # ROM: 0x3F9E00 @@ -1270,6 +1273,7 @@ lbl_805AD574: .section .rodata +.balign 8 .global lbl_803D4730 lbl_803D4730: # ROM: 0x3D1730 diff --git a/asm/MetroidPrime/Enemies/CAtomicBeta.s b/asm/MetroidPrime/Enemies/CAtomicBeta.s index 851ba6b4..57bf8093 100644 --- a/asm/MetroidPrime/Enemies/CAtomicBeta.s +++ b/asm/MetroidPrime/Enemies/CAtomicBeta.s @@ -1,6 +1,14 @@ .include "macros.inc" .section .data +.balign 8 + +.global lbl_803E8E40 +lbl_803E8E40: + # ROM: 0x3E5E40 + .4byte 0x803D4B50 + .4byte 0x803D4B5B + .4byte 0x803D4B66 .global lbl_803E8E4C lbl_803E8E4C: @@ -186,6 +194,7 @@ lbl_803E8E4C: .4byte GetDeathExplosionParticle__10CPatternedCFv .section .sdata +.balign 8 .global lbl_805A82E0 lbl_805A82E0: @@ -1392,6 +1401,7 @@ __ct__11CAtomicBeta: /* 80251BAC 0024EB0C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD5F0 lbl_805AD5F0: # ROM: 0x3F9E90 @@ -1434,6 +1444,7 @@ lbl_805AD60C: .section .rodata +.balign 8 .global lbl_803D4B50 lbl_803D4B50: # ROM: 0x3D1B50 diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index c4bc0f0f..f776ec47 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CBabygoth_cpp .section .data +.balign 8 .global lbl_803E7350 @@ -272,6 +273,7 @@ lbl_803E767C: .4byte lbl_80223268 .section .sdata +.balign 8 .global lbl_805A80D8 lbl_805A80D8: @@ -8266,6 +8268,7 @@ __sinit_CBabygoth_cpp: /* 8022468C 002215EC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD110 lbl_805AD110: # ROM: 0x3F99B0 @@ -8415,6 +8418,7 @@ lbl_805AD188: .section .rodata +.balign 8 .global lbl_803D31A8 lbl_803D31A8: # ROM: 0x3D01A8 diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index d3a5f5a4..15d83e3b 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF890 lbl_803DF890: @@ -227,6 +228,7 @@ lbl_803DFB5C: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7338 lbl_805A7338: @@ -275,6 +277,7 @@ lbl_805A7358: .4byte 0 .section .sbss +.balign 8 # CBeetleFR .global lbl_805A8EC0 @@ -288,6 +291,7 @@ lbl_805A8ECC: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AACE0 lbl_805AACE0: diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index 38c78509..13221b09 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E0338 lbl_803E0338: @@ -207,6 +208,7 @@ lbl_803E061C: .4byte __dt__17CBCAdditiveAimCmd .section .sdata +.balign 8 .global lbl_805A7628 lbl_805A7628: @@ -215,6 +217,7 @@ lbl_805A7628: .4byte 0 .section .sbss +.balign 8 # CBloodFlower .global lbl_805A8F40 @@ -225,6 +228,7 @@ lbl_805A8F44: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AB398 lbl_805AB398: @@ -1996,6 +2000,7 @@ lbl_8011A440: /* 8011A45C 001173BC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CF2F0 lbl_803CF2F0: # ROM: 0x3CC2F0 diff --git a/asm/MetroidPrime/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s index 01d5596b..e1e2fa5f 100644 --- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s +++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E7ED0 lbl_803E7ED0: @@ -41,6 +42,7 @@ lbl_803E7ED0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8178 lbl_805A8178: @@ -99,6 +101,7 @@ lbl_805A81A0: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A90D8 lbl_805A90D8: @@ -1429,6 +1432,7 @@ lbl_8022F664: /* 8022F688 0022C5E8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD358 lbl_805AD358: # ROM: 0x3F9BF8 @@ -1461,6 +1465,7 @@ lbl_805AD36C: .section .rodata +.balign 8 .global lbl_803D3408 lbl_803D3408: # ROM: 0x3D0408 diff --git a/asm/MetroidPrime/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s index a88f70df..7e33967d 100644 --- a/asm/MetroidPrime/Enemies/CBurrower.s +++ b/asm/MetroidPrime/Enemies/CBurrower.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CBurrower_cpp .section .data +.balign 8 .global lbl_803EA790 lbl_803EA790: @@ -1886,6 +1887,7 @@ __sinit_CBurrower_cpp: /* 802712A8 0026E208 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD8D8 lbl_805AD8D8: # ROM: 0x3FA178 @@ -1918,6 +1920,7 @@ lbl_805AD8EC: .section .rodata +.balign 8 .global lbl_803D5420 lbl_803D5420: # ROM: 0x3D2420 diff --git a/asm/MetroidPrime/Enemies/CBurstFire.s b/asm/MetroidPrime/Enemies/CBurstFire.s index 91f3bb7e..3a51d390 100644 --- a/asm/MetroidPrime/Enemies/CBurstFire.s +++ b/asm/MetroidPrime/Enemies/CBurstFire.s @@ -321,6 +321,7 @@ lbl_801AD570: /* 801AD57C 001AA4DC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC598 lbl_805AC598: # ROM: 0x3F8E38 diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index 7c375a57..2143c96d 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CChozoGhost_cpp .section .data +.balign 8 .global lbl_803E18E8 @@ -264,6 +265,7 @@ lbl_803E1BE4: .4byte lbl_80141DAC .section .sdata +.balign 8 .global lbl_805A7758 @@ -313,6 +315,7 @@ lbl_805A7778: .4byte 0 .section .bss +.balign 8 .global lbl_8046C748 lbl_8046C748: @@ -4140,6 +4143,7 @@ __sinit_CChozoGhost_cpp: /* 80142930 0013F890 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB878 lbl_805AB878: # ROM: 0x3F8118 @@ -4272,6 +4276,7 @@ lbl_805AB8DC: .section .rodata +.balign 8 .global lbl_803D0078 lbl_803D0078: # ROM: 0x3CD078 diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 2031f8c9..812de36d 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E36A8 @@ -284,6 +285,7 @@ lbl_803E3A58: .4byte 0 .section .sdata +.balign 8 .global lbl_805A78B0 lbl_805A78B0: @@ -476,6 +478,7 @@ lbl_805A7944: .4byte 0x00000013 .section .bss +.balign 8 .global lbl_8046C848 lbl_8046C848: @@ -494,6 +497,7 @@ lbl_8046C8A8: .skip 0x18 .section .sbss +.balign 8 # CDrone .global lbl_805A8FE0 lbl_805A8FE0: @@ -10262,6 +10266,7 @@ lbl_80167BF8: /* 80167C10 00164B70 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABC88 lbl_805ABC88: # ROM: 0x3F8528 @@ -10560,6 +10565,7 @@ lbl_805ABD80: .section .rodata +.balign 8 .global lbl_803D0398 lbl_803D0398: # ROM: 0x3CD398 diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index d3ca83c0..3975af8f 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CElitePirate_cpp .section .data +.balign 8 .global lbl_803E7AE0 @@ -272,6 +273,7 @@ lbl_803E7E20: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8128 lbl_805A8128: @@ -7967,6 +7969,7 @@ __sinit_CElitePirate_cpp: /* 8022E0F0 0022B050 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD2C0 lbl_805AD2C0: # ROM: 0x3F9B60 @@ -8139,6 +8142,7 @@ lbl_805AD344: .section .rodata +.balign 8 .global lbl_803D3278 lbl_803D3278: # ROM: 0x3D0278 diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index 18e853c7..f735259a 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E7740 lbl_803E7740: @@ -219,6 +220,7 @@ lbl_803E7A18: .4byte lbl_80225358 .section .sdata +.balign 8 .global lbl_805A80F8 lbl_805A80F8: @@ -227,6 +229,7 @@ lbl_805A80F8: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A90D0 lbl_805A90D0: @@ -1532,6 +1535,7 @@ Accept__8CEyeBallFR8IVisitor: /* 802258E4 00222844 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD190 lbl_805AD190: # ROM: 0x3F9A30 @@ -1595,6 +1599,7 @@ lbl_805AD1C4: .section .rodata +.balign 8 .global lbl_803D3248 lbl_803D3248: # ROM: 0x3D0248 diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index 724dd944..73315e5e 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CFireFlea_cpp .section .data +.balign 8 .global lbl_803E1C88 lbl_803E1C88: @@ -203,6 +204,7 @@ lbl_803E1F54: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7780 lbl_805A7780: @@ -241,6 +243,7 @@ lbl_805A7798: .4byte 0 .section .sbss +.balign 8 # CFireFlea .global lbl_805A8F90 @@ -1821,6 +1824,7 @@ __sinit_CFireFlea_cpp: /* 80143F80 00140EE0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB8E0 lbl_805AB8E0: # ROM: 0x3F8180 @@ -1875,6 +1879,7 @@ lbl_805AB908: .section .rodata +.balign 8 .global lbl_803D0098 lbl_803D0098: # ROM: 0x3CD098 diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index 9ae1a60f..4b95c2d2 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CFlaahgra_cpp .section .data +.balign 8 .global lbl_803E4D08 lbl_803E4D08: @@ -331,6 +332,7 @@ lbl_803E5154: .4byte Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId .section .sdata +.balign 8 .global lbl_805A7C40 lbl_805A7C40: @@ -433,6 +435,7 @@ lbl_805A7C8C: .4byte 0x00000021 .section .sbss, "wa" +.balign 8 .global lbl_805A9058 lbl_805A9058: @@ -8303,6 +8306,7 @@ __sinit_CFlaahgra_cpp: /* 801B45C8 001B1528 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC5B8 lbl_805AC5B8: # ROM: 0x3F8E58 @@ -8502,6 +8506,7 @@ lbl_805AC65C: .section .rodata +.balign 8 .global lbl_803D14E0 lbl_803D14E0: # ROM: 0x3CE4E0 diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s index f51e975c..7a160de5 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6FD8 lbl_803E6FD8: @@ -35,6 +36,7 @@ lbl_803E6FD8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7F68 lbl_805A7F68: @@ -764,6 +766,7 @@ lbl_80208E00: /* 80208E14 00205D74 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACE30 lbl_805ACE30: # ROM: 0x3F96D0 @@ -786,6 +789,7 @@ lbl_805ACE3C: .section .rodata +.balign 8 .global lbl_803D2738 lbl_803D2738: # ROM: 0x3CF738 diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index 34590601..3fc5262a 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6408 lbl_803E6408: @@ -223,6 +224,7 @@ lbl_803E66D4: .4byte lbl_801F0E38 .section .sdata +.balign 8 .global lbl_805A7E40 lbl_805A7E40: @@ -254,11 +256,6 @@ lbl_805A7E54: # ROM: 0x3F57F4 .4byte 0x00000014 -.global lbl_805A7E58 -lbl_805A7E58: - # ROM: 0x3F57F8 - .4byte 0x00000013 - .section .text, "ax" .global SaveBombSlotInfo__17CFlaahgraTentacleFR13CStateManager @@ -1431,6 +1428,7 @@ lbl_801F0FA0: /* 801F10C4 001EE024 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACBD0 lbl_805ACBD0: # ROM: 0x3F9470 @@ -1459,6 +1457,7 @@ lbl_805ACBE0: .section .rodata +.balign 8 .global lbl_803D2000 lbl_803D2000: # ROM: 0x3CF000 diff --git a/asm/MetroidPrime/Enemies/CFlickerBat.s b/asm/MetroidPrime/Enemies/CFlickerBat.s index 8f9d3d4a..0b69263c 100644 --- a/asm/MetroidPrime/Enemies/CFlickerBat.s +++ b/asm/MetroidPrime/Enemies/CFlickerBat.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E0DE0 lbl_803E0DE0: @@ -187,6 +188,7 @@ lbl_803E0DE0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A76F0 lbl_805A76F0: @@ -1438,6 +1440,7 @@ lbl_801312E0: /* 80131434 0012E394 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB680 lbl_805AB680: # ROM: 0x3F7F20 @@ -1490,6 +1493,7 @@ lbl_805AB6A4: .section .rodata +.balign 8 .global lbl_803D0050 lbl_803D0050: # ROM: 0x3CD050 diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index f36c92d5..db4819d6 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CFlyingPirate_cpp .section .data +.balign 8 .global lbl_803E67E8 lbl_803E67E8: @@ -297,6 +298,7 @@ lbl_803E6B98: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7E80 @@ -452,6 +454,7 @@ lbl_805A7EF8: .4byte 0 .section .bss +.balign 8 .global lbl_8046C950 lbl_8046C950: @@ -14419,6 +14422,7 @@ __sinit_CFlyingPirate_cpp: /* 80200BD4 001FDB34 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACC40 lbl_805ACC40: # ROM: 0x3F94E0 @@ -14757,6 +14761,7 @@ lbl_805ACD48: .section .rodata +.balign 8 .global lbl_803D2070 lbl_803D2070: # ROM: 0x3CF070 diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index 6c5168e6..c87a0d31 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CGrenadeLauncher_cpp .section .data +.balign 8 .global lbl_803E7F58 lbl_803E7F58: # ROM: 0x3E4F58 @@ -76,6 +77,7 @@ lbl_803E7FDC: .4byte 0 .section .sdata +.balign 8 .global lbl_805A81A8 lbl_805A81A8: @@ -154,6 +156,7 @@ lbl_805A81E0: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A90E8 lbl_805A90E8: .skip 0x4 @@ -2381,6 +2384,7 @@ __sinit_CGrenadeLauncher_cpp: /* 80231670 0022E5D0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD370 lbl_805AD370: # ROM: 0x3F9C10 @@ -2489,6 +2493,7 @@ lbl_805AD3C4: .section .rodata +.balign 8 .global lbl_803D3410 lbl_803D3410: # ROM: 0x3D0410 diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 7d1d9cbe..a1ddfddb 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CIceSheegoth_cpp .section .data +.balign 8 .global lbl_803E4728 lbl_803E4728: @@ -271,6 +272,7 @@ lbl_803E4A54: .4byte lbl_801A56F4 .section .sdata +.balign 8 .global lbl_805A7BB8 lbl_805A7BB8: @@ -10061,6 +10063,7 @@ __sinit_CIceSheegoth_cpp: /* 801A6EBC 001A3E1C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC458 lbl_805AC458: # ROM: 0x3F8CF8 @@ -10298,6 +10301,7 @@ lbl_805AC514: .section .rodata +.balign 8 .global lbl_803D1360 lbl_803D1360: # ROM: 0x3CE360 diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s index 9661a152..846d0864 100644 --- a/asm/MetroidPrime/Enemies/CJellyZap.s +++ b/asm/MetroidPrime/Enemies/CJellyZap.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5930 lbl_803E5930: @@ -207,6 +208,7 @@ lbl_803E5954: .4byte GetDeathExplosionParticle__10CPatternedCFv .section .sdata +.balign 8 .global lbl_805A7D88 lbl_805A7D88: @@ -225,12 +227,14 @@ lbl_805A7D90: .4byte 0 .section .bss +.balign 8 .global lbl_8046C920 lbl_8046C920: .skip 0x18 .section .sbss, "wa" +.balign 8 .global lbl_805A9070 lbl_805A9070: @@ -1648,6 +1652,7 @@ Accept__9CJellyZapFR8IVisitor: /* 801D8CF0 001D5C50 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC990 lbl_805AC990: # ROM: 0x3F9230 diff --git a/asm/MetroidPrime/Enemies/CKnockBackController.s b/asm/MetroidPrime/Enemies/CKnockBackController.s index 86bea8b1..363f642d 100644 --- a/asm/MetroidPrime/Enemies/CKnockBackController.s +++ b/asm/MetroidPrime/Enemies/CKnockBackController.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8150 lbl_803E8150: @@ -31,6 +32,7 @@ lbl_803E8178: .4byte 0 .section .sdata +.balign 8 .global lbl_805A81F8 lbl_805A81F8: @@ -1408,6 +1410,7 @@ lbl_80233F60: /* 80233FAC 00230F0C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD410 lbl_805AD410: # ROM: 0x3F9CB0 @@ -1466,6 +1469,7 @@ lbl_805AD43C: .section .rodata +.balign 8 .global lbl_803D3490 lbl_803D3490: # ROM: 0x3D0490 diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index 121b8e72..24656caa 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMagdolite_cpp .section .data +.balign 8 .global lbl_803E81A0 lbl_803E81A0: @@ -297,6 +298,7 @@ lbl_803E850C: .4byte lbl_80236D28 .section .sdata +.balign 8 .global lbl_805A8208 lbl_805A8208: @@ -4018,6 +4020,7 @@ __sinit_CMagdolite_cpp: /* 80237B60 00234AC0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD440 lbl_805AD440: # ROM: 0x3F9CE0 @@ -4086,6 +4089,7 @@ lbl_805AD470: .section .rodata +.balign 8 .global lbl_803D42E8 lbl_803D42E8: # ROM: 0x3D12E8 diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s index ccdb4ca2..9a154be2 100644 --- a/asm/MetroidPrime/Enemies/CMetaree.s +++ b/asm/MetroidPrime/Enemies/CMetaree.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2878 lbl_803E2878: @@ -187,6 +188,7 @@ lbl_803E2878: .4byte 0 .section .sdata +.balign 8 .global lbl_805A77F8 lbl_805A77F8: @@ -1213,6 +1215,7 @@ Accept__8CMetareeFR8IVisitor: /* 8014EF50 0014BEB0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABAA8 lbl_805ABAA8: # ROM: 0x3F8348 diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index e09f9294..6a4a008f 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMetroid_cpp .section .data +.balign 8 .global lbl_803E3AD8 lbl_803E3AD8: @@ -191,6 +192,7 @@ lbl_803E3AD8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7950 lbl_805A7950: @@ -374,6 +376,7 @@ lbl_805A79D8: .4byte 0 .section .sbss +.balign 8 .global lbl_805A8FE8 lbl_805A8FE8: @@ -9965,6 +9968,7 @@ __sinit_CMetroid_cpp: /* 80172A98 0016F9F8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABD90 lbl_805ABD90: # ROM: 0x3F8630 @@ -10163,6 +10167,7 @@ lbl_805ABE28: .section .rodata +.balign 8 .global lbl_803D04D8 lbl_803D04D8: # ROM: 0x3CD4D8 diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index ffe8f083..6918b803 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMetroidBeta_cpp .section .data +.balign 8 .global lbl_803E5388 lbl_803E5388: @@ -243,6 +244,7 @@ lbl_803E5654: .4byte lbl_801C5CFC .section .sdata +.balign 8 .global lbl_805A7CE8 lbl_805A7CE8: @@ -370,6 +372,7 @@ lbl_805A7D44: .4byte 0x00003FFF .section .sbss, "wa" +.balign 8 .global lbl_805A9060 lbl_805A9060: @@ -6850,6 +6853,7 @@ __sinit_CMetroidBeta_cpp: /* 801C6B30 001C3A90 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC7A0 lbl_805AC7A0: # ROM: 0x3F9040 @@ -7037,6 +7041,7 @@ lbl_805AC840: .section .rodata +.balign 8 .global lbl_803D1A80 lbl_803D1A80: # ROM: 0x3CEA80 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 7e63527b..7a204c7b 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMetroidPrimeEssence_cpp .section .data +.balign 8 .global lbl_803EB1F0 lbl_803EB1F0: @@ -321,6 +322,7 @@ lbl_803EB58C: .4byte lbl_80280078 .section .sdata +.balign 8 .global lbl_805A84A0 lbl_805A84A0: @@ -4434,6 +4436,7 @@ __sinit_CMetroidPrimeEssence_cpp: /* 8028045C 0027D3BC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADA20 lbl_805ADA20: # ROM: 0x3FA2C0 @@ -4577,6 +4580,7 @@ lbl_805ADA94: .section .rodata +.balign 8 .global lbl_803D5880 lbl_803D5880: # ROM: 0x3D2880 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 929a4b7b..22316b9a 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMetroidPrimeExo_cpp .section .data +.balign 8 .global lbl_803EAA90 lbl_803EAA90: @@ -523,6 +524,7 @@ lbl_803EB0FC: .4byte GetWeight__13CPhysicsActorCFv .section .sdata +.balign 8 .global lbl_805A8410 lbl_805A8410: @@ -705,12 +707,14 @@ lbl_805A849C: .float 1.0 .section .bss +.balign 8 .global lbl_8046E0C0 lbl_8046E0C0: .skip 0x18 .section .sbss, "wa" +.balign 8 .global lbl_805A9140 lbl_805A9140: @@ -13269,6 +13273,7 @@ __sinit_CMetroidPrimeExo_cpp: /* 8027C5C8 00279528 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD8F0 lbl_805AD8F0: # ROM: 0x3FA190 @@ -13634,6 +13639,7 @@ lbl_805ADA1C: .section .rodata +.balign 8 .global lbl_803D5428 lbl_803D5428: # ROM: 0x3D2428 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s index fd78f17c..0a6fba91 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC390 lbl_803EC390: @@ -360,6 +361,7 @@ Accept__23CMetroidPrimeProjectileFR8IVisitor: /* 802A07EC 0029D74C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADE30 lbl_805ADE30: # ROM: 0x3FA6D0 @@ -372,6 +374,7 @@ lbl_805ADE34: .section .rodata +.balign 8 .global lbl_803D5EE8 lbl_803D5EE8: # ROM: 0x3D2EE8 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s index b5f6b6fb..76522198 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EB638 lbl_803EB638: @@ -1763,6 +1764,7 @@ __ct__14SPrimeStruct2BFR12CInputStream: /* 80281D64 0027ECC4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D58D8 lbl_803D58D8: # ROM: 0x3D28D8 diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s index 3e4d6b5a..56ae6beb 100644 --- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s +++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E4018 lbl_803E4018: @@ -187,6 +188,7 @@ lbl_803E4018: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7AA0 lbl_805A7AA0: @@ -2715,6 +2717,7 @@ lbl_8018C214: /* 8018C224 00189184 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC0A8 lbl_805AC0A8: # ROM: 0x3F8948 @@ -2857,6 +2860,7 @@ lbl_805AC114: .section .rodata +.balign 8 .global lbl_803D06D0 lbl_803D06D0: # ROM: 0x3CD6D0 diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index 094eb059..2fb2c2f3 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EB6C8 lbl_803EB6C8: @@ -311,6 +312,7 @@ lbl_803EB868: .4byte sub_8028c304 .section .sdata +.balign 8 .global lbl_805A8538 lbl_805A8538: @@ -8469,6 +8471,7 @@ lbl_802925C4: /* 802925DC 0028F53C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADB90 lbl_805ADB90: # ROM: 0x3FA430 @@ -8673,6 +8676,7 @@ lbl_805ADC30: .section .rodata +.balign 8 .global lbl_803D5998 lbl_803D5998: # ROM: 0x3D2998 diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index f801c33c..93de0ba7 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CParasite_cpp .section .data +.balign 8 .global lbl_803E2FF8 lbl_803E2FF8: @@ -199,6 +200,7 @@ lbl_803E3004: .4byte 0 .section .sbss +.balign 8 # CParasite .global lbl_805A8FB0 @@ -239,6 +241,7 @@ lbl_805A8FD8: .skip 0x8 .section .sdata +.balign 8 .global lbl_805A7850 lbl_805A7850: @@ -267,6 +270,7 @@ lbl_805A7860: .4byte 0 .section .bss +.balign 8 .global lbl_8046C770 lbl_8046C770: .skip 0x18 @@ -5031,6 +5035,7 @@ __sinit_CParasite_cpp: /* 8015ADC0 00157D20 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABB68 lbl_805ABB68: # ROM: 0x3F8408 @@ -5139,6 +5144,7 @@ lbl_805ABBBC: .section .rodata +.balign 8 .global lbl_803D0330 lbl_803D0330: # ROM: 0x3CD330 diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index c11af0ad..15f48e3e 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPatterned_cpp .section .data +.balign 8 .global lbl_803DA5C8 lbl_803DA5C8: @@ -379,6 +380,7 @@ lbl_803DAA68: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6FA0 lbl_805A6FA0: @@ -481,6 +483,7 @@ lbl_805A6FEC: .4byte 0x00000021 .section .sbss +.balign 8 # CPatterned .global lbl_805A8E10 lbl_805A8E10: @@ -514,6 +517,7 @@ lbl_805A8E3C: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA610 lbl_805AA610: @@ -8158,6 +8162,7 @@ __sinit_CPatterned_cpp: /* 8007DFEC 0007AF4C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD600 lbl_803CD600: # ROM: 0x3CA600 diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index de4a2678..a822e650 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EBC70 lbl_803EBC70: @@ -221,6 +222,7 @@ lbl_803EBF3C: .4byte lbl_802957F8 .section .sdata +.balign 8 .global lbl_805A8588 lbl_805A8588: @@ -1242,6 +1244,7 @@ lbl_80295B2C: /* 80295B3C 00292A9C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADCB0 lbl_805ADCB0: # ROM: 0x3FA550 @@ -1250,6 +1253,7 @@ lbl_805ADCB0: .section .rodata +.balign 8 .global lbl_803D5BB0 lbl_803D5BB0: # ROM: 0x3D2BB0 diff --git a/asm/MetroidPrime/Enemies/CPhazonPool.s b/asm/MetroidPrime/Enemies/CPhazonPool.s index a39feabe..54d52a41 100644 --- a/asm/MetroidPrime/Enemies/CPhazonPool.s +++ b/asm/MetroidPrime/Enemies/CPhazonPool.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EBB48 lbl_803EBB48: # ROM: 0x3E8B48 @@ -76,6 +77,7 @@ lbl_803EBBC4: .4byte lbl_80292B30 .section .sdata +.balign 8 .global lbl_805A8580 lbl_805A8580: @@ -1554,6 +1556,7 @@ lbl_80293AC8: /* 80293AFC 00290A5C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADC38 lbl_805ADC38: # ROM: 0x3FA4D8 @@ -1602,6 +1605,7 @@ lbl_805ADC58: .section .rodata +.balign 8 .global lbl_803D5B78 lbl_803D5B78: # ROM: 0x3D2B78 diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index 2960cef8..ea45c868 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2078 @@ -214,6 +215,7 @@ lbl_803E20C4: .4byte GetDeathExplosionParticle__10CPatternedCFv .section .sdata +.balign 8 .global lbl_805A77A0 lbl_805A77A0: @@ -3049,6 +3051,7 @@ lbl_80149288: /* 801492AC 0014620C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB9A8 lbl_805AB9A8: # ROM: 0x3F8248 @@ -3141,6 +3144,7 @@ lbl_805AB9EC: .section .rodata +.balign 8 .global lbl_803D00A0 lbl_803D00A0: # ROM: 0x3CD0A0 diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index 097630ed..a3f2a836 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPuddleToadGamma_cpp .section .data +.balign 8 .global lbl_803E24E0 lbl_803E24E0: @@ -191,6 +192,7 @@ lbl_803E24E0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A77B8 lbl_805A77B8: @@ -233,12 +235,14 @@ lbl_805A77D4: .4byte 0x00000024 .section .bss +.balign 8 .global lbl_8046C758 lbl_8046C758: .skip 0x18 .section .sbss +.balign 8 # CPuddleToadGamma .global lbl_805A8FA0 @@ -2190,6 +2194,7 @@ __sinit_CPuddleToadGamma_cpp: /* 8014CFF8 00149F58 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABA10 lbl_805ABA10: # ROM: 0x3F82B0 @@ -2252,6 +2257,7 @@ lbl_805ABA3C: .section .rodata +.balign 8 .global lbl_803D0170 lbl_803D0170: # ROM: 0x3CD170 diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s index 97cd72e6..1b56a0c7 100644 --- a/asm/MetroidPrime/Enemies/CPuffer.s +++ b/asm/MetroidPrime/Enemies/CPuffer.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E96C0 lbl_803E96C0: @@ -187,6 +188,7 @@ lbl_803E96C0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8380 lbl_805A8380: @@ -206,6 +208,186 @@ lbl_805A8388: .section .text, "ax" +.global sub_8025bfa4 +sub_8025bfa4: +/* 8025BFA4 00258F04 94 21 FE F0 */ stwu r1, -0x110(r1) +/* 8025BFA8 00258F08 7C 08 02 A6 */ mflr r0 +/* 8025BFAC 00258F0C 90 01 01 14 */ stw r0, 0x114(r1) +/* 8025BFB0 00258F10 DB E1 01 00 */ stfd f31, 0x100(r1) +/* 8025BFB4 00258F14 F3 E1 01 08 */ psq_st f31, 264(r1), 0, qr0 +/* 8025BFB8 00258F18 DB C1 00 F0 */ stfd f30, 0xf0(r1) +/* 8025BFBC 00258F1C F3 C1 00 F8 */ psq_st f30, 248(r1), 0, qr0 +/* 8025BFC0 00258F20 DB A1 00 E0 */ stfd f29, 0xe0(r1) +/* 8025BFC4 00258F24 F3 A1 00 E8 */ psq_st f29, 232(r1), 0, qr0 +/* 8025BFC8 00258F28 DB 81 00 D0 */ stfd f28, 0xd0(r1) +/* 8025BFCC 00258F2C F3 81 00 D8 */ psq_st f28, 216(r1), 0, qr0 +/* 8025BFD0 00258F30 DB 61 00 C0 */ stfd f27, 0xc0(r1) +/* 8025BFD4 00258F34 F3 61 00 C8 */ psq_st f27, 200(r1), 0, qr0 +/* 8025BFD8 00258F38 DB 41 00 B0 */ stfd f26, 0xb0(r1) +/* 8025BFDC 00258F3C F3 41 00 B8 */ psq_st f26, 184(r1), 0, qr0 +/* 8025BFE0 00258F40 BF 21 00 94 */ stmw r25, 0x94(r1) +/* 8025BFE4 00258F44 7C 7D 1B 78 */ mr r29, r3 +/* 8025BFE8 00258F48 7C 9E 23 78 */ mr r30, r4 +/* 8025BFEC 00258F4C 80 63 04 50 */ lwz r3, 0x450(r3) +/* 8025BFF0 00258F50 C0 03 00 04 */ lfs f0, 4(r3) +/* 8025BFF4 00258F54 D0 01 00 50 */ stfs f0, 0x50(r1) +/* 8025BFF8 00258F58 C0 03 00 08 */ lfs f0, 8(r3) +/* 8025BFFC 00258F5C D0 01 00 54 */ stfs f0, 0x54(r1) +/* 8025C000 00258F60 C0 03 00 0C */ lfs f0, 0xc(r3) +/* 8025C004 00258F64 D0 01 00 58 */ stfs f0, 0x58(r1) +/* 8025C008 00258F68 80 1D 05 D4 */ lwz r0, 0x5d4(r29) +/* 8025C00C 00258F6C 2C 00 00 00 */ cmpwi r0, 0 +/* 8025C010 00258F70 40 82 00 7C */ bne lbl_8025C08C +/* 8025C014 00258F74 3C 60 80 3F */ lis r3, lbl_803E9688@ha +/* 8025C018 00258F78 3B 9D 05 D8 */ addi r28, r29, 0x5d8 +/* 8025C01C 00258F7C 3B E3 96 88 */ addi r31, r3, lbl_803E9688@l +/* 8025C020 00258F80 3B 40 00 00 */ li r26, 0 +lbl_8025C024: +/* 8025C024 00258F84 80 9F 00 00 */ lwz r4, 0(r31) +/* 8025C028 00258F88 38 61 00 40 */ addi r3, r1, 0x40 +/* 8025C02C 00258F8C 4B DA 8C 8D */ bl string_l__4rstlFPCc +/* 8025C030 00258F90 7F A4 EB 78 */ mr r4, r29 +/* 8025C034 00258F94 38 61 00 5C */ addi r3, r1, 0x5c +/* 8025C038 00258F98 38 A1 00 40 */ addi r5, r1, 0x40 +/* 8025C03C 00258F9C 4B DF 6E 95 */ bl "GetScaledLocatorTransform__6CActorCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" +/* 8025C040 00258FA0 80 1D 05 D4 */ lwz r0, 0x5d4(r29) +/* 8025C044 00258FA4 C0 41 00 80 */ lfs f2, 0x80(r1) +/* 8025C048 00258FA8 1C 00 00 0C */ mulli r0, r0, 0xc +/* 8025C04C 00258FAC C0 21 00 70 */ lfs f1, 0x70(r1) +/* 8025C050 00258FB0 C0 01 00 60 */ lfs f0, 0x60(r1) +/* 8025C054 00258FB4 7C 7C 02 15 */ add. r3, r28, r0 +/* 8025C058 00258FB8 41 82 00 10 */ beq lbl_8025C068 +/* 8025C05C 00258FBC D0 03 00 00 */ stfs f0, 0(r3) +/* 8025C060 00258FC0 D0 23 00 04 */ stfs f1, 4(r3) +/* 8025C064 00258FC4 D0 43 00 08 */ stfs f2, 8(r3) +lbl_8025C068: +/* 8025C068 00258FC8 80 9D 05 D4 */ lwz r4, 0x5d4(r29) +/* 8025C06C 00258FCC 38 61 00 40 */ addi r3, r1, 0x40 +/* 8025C070 00258FD0 38 04 00 01 */ addi r0, r4, 1 +/* 8025C074 00258FD4 90 1D 05 D4 */ stw r0, 0x5d4(r29) +/* 8025C078 00258FD8 48 0E 1A 69 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" +/* 8025C07C 00258FDC 3B 5A 00 01 */ addi r26, r26, 1 +/* 8025C080 00258FE0 3B FF 00 04 */ addi r31, r31, 4 +/* 8025C084 00258FE4 2C 1A 00 0E */ cmpwi r26, 0xe +/* 8025C088 00258FE8 41 80 FF 9C */ blt lbl_8025C024 +lbl_8025C08C: +/* 8025C08C 00258FEC 38 61 00 50 */ addi r3, r1, 0x50 +/* 8025C090 00258FF0 48 0B 86 69 */ bl CanBeNormalized__9CVector3fCFv +/* 8025C094 00258FF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 8025C098 00258FF8 41 82 00 FC */ beq lbl_8025C194 +/* 8025C09C 00258FFC 38 61 00 34 */ addi r3, r1, 0x34 +/* 8025C0A0 00259000 38 81 00 50 */ addi r4, r1, 0x50 +/* 8025C0A4 00259004 48 0B 87 AD */ bl AsNormalized__9CVector3fCFv +/* 8025C0A8 00259008 C0 41 00 34 */ lfs f2, 0x34(r1) +/* 8025C0AC 0025900C 3C 60 80 3F */ lis r3, lbl_803E9650@ha +/* 8025C0B0 00259010 C0 21 00 38 */ lfs f1, 0x38(r1) +/* 8025C0B4 00259014 3B 63 96 50 */ addi r27, r3, lbl_803E9650@l +/* 8025C0B8 00259018 C0 01 00 3C */ lfs f0, 0x3c(r1) +/* 8025C0BC 0025901C FF E0 10 50 */ fneg f31, f2 +/* 8025C0C0 00259020 FF C0 08 50 */ fneg f30, f1 +/* 8025C0C4 00259024 3B 9D 05 D8 */ addi r28, r29, 0x5d8 +/* 8025C0C8 00259028 FF A0 00 50 */ fneg f29, f0 +/* 8025C0CC 0025902C 3B E0 00 00 */ li r31, 0 +lbl_8025C0D0: +/* 8025C0D0 00259030 7F 85 E3 78 */ mr r5, r28 +/* 8025C0D4 00259034 38 61 00 28 */ addi r3, r1, 0x28 +/* 8025C0D8 00259038 38 9D 00 34 */ addi r4, r29, 0x34 +/* 8025C0DC 0025903C 48 0B 69 A5 */ bl Rotate__12CTransform4fCFRC9CVector3f +/* 8025C0E0 00259040 C3 81 00 28 */ lfs f28, 0x28(r1) +/* 8025C0E4 00259044 C3 61 00 2C */ lfs f27, 0x2c(r1) +/* 8025C0E8 00259048 C3 41 00 30 */ lfs f26, 0x30(r1) +/* 8025C0EC 0025904C C0 22 B9 E8 */ lfs f1, lbl_805AD708@sda21(r2) +/* 8025C0F0 00259050 48 0B 8C 55 */ bl FastCosR__5CMathFf +/* 8025C0F4 00259054 EC 1E 06 F2 */ fmuls f0, f30, f27 +/* 8025C0F8 00259058 EC 1F 07 3A */ fmadds f0, f31, f28, f0 +/* 8025C0FC 0025905C EC 1D 06 BA */ fmadds f0, f29, f26, f0 +/* 8025C100 00259060 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8025C104 00259064 7C 80 00 26 */ mfcr r4 +/* 8025C108 00259068 38 00 00 01 */ li r0, 1 +/* 8025C10C 0025906C 80 7D 05 D0 */ lwz r3, 0x5d0(r29) +/* 8025C110 00259070 7C 1A F8 30 */ slw r26, r0, r31 +/* 8025C114 00259074 54 99 17 FE */ rlwinm r25, r4, 2, 0x1f, 0x1f +/* 8025C118 00259078 7C 63 D0 38 */ and r3, r3, r26 +/* 8025C11C 0025907C 7C 03 00 D0 */ neg r0, r3 +/* 8025C120 00259080 7C 00 1B 78 */ or r0, r0, r3 +/* 8025C124 00259084 54 00 0F FE */ srwi r0, r0, 0x1f +/* 8025C128 00259088 7C 00 C8 40 */ cmplw r0, r25 +/* 8025C12C 0025908C 41 82 00 30 */ beq lbl_8025C15C +/* 8025C130 00259090 80 9B 00 00 */ lwz r4, 0(r27) +/* 8025C134 00259094 38 61 00 18 */ addi r3, r1, 0x18 +/* 8025C138 00259098 4B DA 8B 81 */ bl string_l__4rstlFPCc +/* 8025C13C 0025909C 80 7D 00 64 */ lwz r3, 0x64(r29) +/* 8025C140 002590A0 7F 25 CB 78 */ mr r5, r25 +/* 8025C144 002590A4 7F C6 F3 78 */ mr r6, r30 +/* 8025C148 002590A8 38 81 00 18 */ addi r4, r1, 0x18 +/* 8025C14C 002590AC 80 63 00 10 */ lwz r3, 0x10(r3) +/* 8025C150 002590B0 4B DC EC 71 */ bl SetParticleEffectState__9CAnimDataFQ24rstl6stringbR13CStateManager +/* 8025C154 002590B4 38 61 00 18 */ addi r3, r1, 0x18 +/* 8025C158 002590B8 48 0E 19 89 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" +lbl_8025C15C: +/* 8025C15C 002590BC 28 19 00 00 */ cmplwi r25, 0 +/* 8025C160 002590C0 41 82 00 10 */ beq lbl_8025C170 +/* 8025C164 002590C4 80 1D 05 D0 */ lwz r0, 0x5d0(r29) +/* 8025C168 002590C8 7C 00 D3 78 */ or r0, r0, r26 +/* 8025C16C 002590CC 48 00 00 0C */ b lbl_8025C178 +lbl_8025C170: +/* 8025C170 002590D0 80 7D 05 D0 */ lwz r3, 0x5d0(r29) +/* 8025C174 002590D4 7C 60 D0 78 */ andc r0, r3, r26 +lbl_8025C178: +/* 8025C178 002590D8 3B FF 00 01 */ addi r31, r31, 1 +/* 8025C17C 002590DC 90 1D 05 D0 */ stw r0, 0x5d0(r29) +/* 8025C180 002590E0 2C 1F 00 0E */ cmpwi r31, 0xe +/* 8025C184 002590E4 3B 9C 00 0C */ addi r28, r28, 0xc +/* 8025C188 002590E8 3B 7B 00 04 */ addi r27, r27, 4 +/* 8025C18C 002590EC 41 80 FF 44 */ blt lbl_8025C0D0 +/* 8025C190 002590F0 48 00 00 68 */ b lbl_8025C1F8 +lbl_8025C194: +/* 8025C194 002590F4 3C 60 80 3F */ lis r3, lbl_803E9650@ha +/* 8025C198 002590F8 3B 20 00 00 */ li r25, 0 +/* 8025C19C 002590FC 3B 63 96 50 */ addi r27, r3, lbl_803E9650@l +/* 8025C1A0 00259100 3B E0 00 01 */ li r31, 1 +lbl_8025C1A4: +/* 8025C1A4 00259104 80 7D 05 D0 */ lwz r3, 0x5d0(r29) +/* 8025C1A8 00259108 7F E0 C8 30 */ slw r0, r31, r25 +/* 8025C1AC 0025910C 7C 60 00 39 */ and. r0, r3, r0 +/* 8025C1B0 00259110 41 82 00 30 */ beq lbl_8025C1E0 +/* 8025C1B4 00259114 80 9B 00 00 */ lwz r4, 0(r27) +/* 8025C1B8 00259118 38 61 00 08 */ addi r3, r1, 8 +/* 8025C1BC 0025911C 4B DA 8A FD */ bl string_l__4rstlFPCc +/* 8025C1C0 00259120 80 7D 00 64 */ lwz r3, 0x64(r29) +/* 8025C1C4 00259124 7F C6 F3 78 */ mr r6, r30 +/* 8025C1C8 00259128 38 81 00 08 */ addi r4, r1, 8 +/* 8025C1CC 0025912C 38 A0 00 00 */ li r5, 0 +/* 8025C1D0 00259130 80 63 00 10 */ lwz r3, 0x10(r3) +/* 8025C1D4 00259134 4B DC EB ED */ bl SetParticleEffectState__9CAnimDataFQ24rstl6stringbR13CStateManager +/* 8025C1D8 00259138 38 61 00 08 */ addi r3, r1, 8 +/* 8025C1DC 0025913C 48 0E 19 05 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" +lbl_8025C1E0: +/* 8025C1E0 00259140 3B 39 00 01 */ addi r25, r25, 1 +/* 8025C1E4 00259144 3B 7B 00 04 */ addi r27, r27, 4 +/* 8025C1E8 00259148 2C 19 00 0E */ cmpwi r25, 0xe +/* 8025C1EC 0025914C 41 80 FF B8 */ blt lbl_8025C1A4 +/* 8025C1F0 00259150 38 00 00 00 */ li r0, 0 +/* 8025C1F4 00259154 90 1D 05 D0 */ stw r0, 0x5d0(r29) +lbl_8025C1F8: +/* 8025C1F8 00259158 E3 E1 01 08 */ psq_l f31, 264(r1), 0, qr0 +/* 8025C1FC 0025915C CB E1 01 00 */ lfd f31, 0x100(r1) +/* 8025C200 00259160 E3 C1 00 F8 */ psq_l f30, 248(r1), 0, qr0 +/* 8025C204 00259164 CB C1 00 F0 */ lfd f30, 0xf0(r1) +/* 8025C208 00259168 E3 A1 00 E8 */ psq_l f29, 232(r1), 0, qr0 +/* 8025C20C 0025916C CB A1 00 E0 */ lfd f29, 0xe0(r1) +/* 8025C210 00259170 E3 81 00 D8 */ psq_l f28, 216(r1), 0, qr0 +/* 8025C214 00259174 CB 81 00 D0 */ lfd f28, 0xd0(r1) +/* 8025C218 00259178 E3 61 00 C8 */ psq_l f27, 200(r1), 0, qr0 +/* 8025C21C 0025917C CB 61 00 C0 */ lfd f27, 0xc0(r1) +/* 8025C220 00259180 E3 41 00 B8 */ psq_l f26, 184(r1), 0, qr0 +/* 8025C224 00259184 CB 41 00 B0 */ lfd f26, 0xb0(r1) +/* 8025C228 00259188 BB 21 00 94 */ lmw r25, 0x94(r1) +/* 8025C22C 0025918C 80 01 01 14 */ lwz r0, 0x114(r1) +/* 8025C230 00259190 7C 08 03 A6 */ mtlr r0 +/* 8025C234 00259194 38 21 01 10 */ addi r1, r1, 0x110 +/* 8025C238 00259198 4E 80 00 20 */ blr + .global Think__7CPufferFfR13CStateManager Think__7CPufferFfR13CStateManager: /* 8025C23C 0025919C 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -884,6 +1066,13 @@ __ct__7CPuffer: /* 8025CC20 00259B80 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 + +.global lbl_805AD708 +lbl_805AD708: + # ROM: 0x3F9FA8 + .float 0.7853982 + .global lbl_805AD70C lbl_805AD70C: # ROM: 0x3F9FAC diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index f4cad9b9..f94d80b1 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CRidley_cpp .section .data +.balign 8 .global lbl_803E9198 @@ -422,6 +423,7 @@ lbl_803E9688: .4byte 0x803D521A .section .sdata +.balign 8 .global lbl_805A82F0 lbl_805A82F0: @@ -600,6 +602,7 @@ lbl_805A8378: .4byte 0 .section .bss +.balign 8 .global lbl_8046D3A8 lbl_8046D3A8: @@ -11138,187 +11141,8 @@ __sinit_CRidley_cpp: /* 8025BF9C 00258EFC 38 21 07 00 */ addi r1, r1, 0x700 /* 8025BFA0 00258F00 4E 80 00 20 */ blr -.global sub_8025bfa4 -sub_8025bfa4: -/* 8025BFA4 00258F04 94 21 FE F0 */ stwu r1, -0x110(r1) -/* 8025BFA8 00258F08 7C 08 02 A6 */ mflr r0 -/* 8025BFAC 00258F0C 90 01 01 14 */ stw r0, 0x114(r1) -/* 8025BFB0 00258F10 DB E1 01 00 */ stfd f31, 0x100(r1) -/* 8025BFB4 00258F14 F3 E1 01 08 */ psq_st f31, 264(r1), 0, qr0 -/* 8025BFB8 00258F18 DB C1 00 F0 */ stfd f30, 0xf0(r1) -/* 8025BFBC 00258F1C F3 C1 00 F8 */ psq_st f30, 248(r1), 0, qr0 -/* 8025BFC0 00258F20 DB A1 00 E0 */ stfd f29, 0xe0(r1) -/* 8025BFC4 00258F24 F3 A1 00 E8 */ psq_st f29, 232(r1), 0, qr0 -/* 8025BFC8 00258F28 DB 81 00 D0 */ stfd f28, 0xd0(r1) -/* 8025BFCC 00258F2C F3 81 00 D8 */ psq_st f28, 216(r1), 0, qr0 -/* 8025BFD0 00258F30 DB 61 00 C0 */ stfd f27, 0xc0(r1) -/* 8025BFD4 00258F34 F3 61 00 C8 */ psq_st f27, 200(r1), 0, qr0 -/* 8025BFD8 00258F38 DB 41 00 B0 */ stfd f26, 0xb0(r1) -/* 8025BFDC 00258F3C F3 41 00 B8 */ psq_st f26, 184(r1), 0, qr0 -/* 8025BFE0 00258F40 BF 21 00 94 */ stmw r25, 0x94(r1) -/* 8025BFE4 00258F44 7C 7D 1B 78 */ mr r29, r3 -/* 8025BFE8 00258F48 7C 9E 23 78 */ mr r30, r4 -/* 8025BFEC 00258F4C 80 63 04 50 */ lwz r3, 0x450(r3) -/* 8025BFF0 00258F50 C0 03 00 04 */ lfs f0, 4(r3) -/* 8025BFF4 00258F54 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 8025BFF8 00258F58 C0 03 00 08 */ lfs f0, 8(r3) -/* 8025BFFC 00258F5C D0 01 00 54 */ stfs f0, 0x54(r1) -/* 8025C000 00258F60 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8025C004 00258F64 D0 01 00 58 */ stfs f0, 0x58(r1) -/* 8025C008 00258F68 80 1D 05 D4 */ lwz r0, 0x5d4(r29) -/* 8025C00C 00258F6C 2C 00 00 00 */ cmpwi r0, 0 -/* 8025C010 00258F70 40 82 00 7C */ bne lbl_8025C08C -/* 8025C014 00258F74 3C 60 80 3F */ lis r3, lbl_803E9688@ha -/* 8025C018 00258F78 3B 9D 05 D8 */ addi r28, r29, 0x5d8 -/* 8025C01C 00258F7C 3B E3 96 88 */ addi r31, r3, lbl_803E9688@l -/* 8025C020 00258F80 3B 40 00 00 */ li r26, 0 -lbl_8025C024: -/* 8025C024 00258F84 80 9F 00 00 */ lwz r4, 0(r31) -/* 8025C028 00258F88 38 61 00 40 */ addi r3, r1, 0x40 -/* 8025C02C 00258F8C 4B DA 8C 8D */ bl string_l__4rstlFPCc -/* 8025C030 00258F90 7F A4 EB 78 */ mr r4, r29 -/* 8025C034 00258F94 38 61 00 5C */ addi r3, r1, 0x5c -/* 8025C038 00258F98 38 A1 00 40 */ addi r5, r1, 0x40 -/* 8025C03C 00258F9C 4B DF 6E 95 */ bl "GetScaledLocatorTransform__6CActorCFRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8025C040 00258FA0 80 1D 05 D4 */ lwz r0, 0x5d4(r29) -/* 8025C044 00258FA4 C0 41 00 80 */ lfs f2, 0x80(r1) -/* 8025C048 00258FA8 1C 00 00 0C */ mulli r0, r0, 0xc -/* 8025C04C 00258FAC C0 21 00 70 */ lfs f1, 0x70(r1) -/* 8025C050 00258FB0 C0 01 00 60 */ lfs f0, 0x60(r1) -/* 8025C054 00258FB4 7C 7C 02 15 */ add. r3, r28, r0 -/* 8025C058 00258FB8 41 82 00 10 */ beq lbl_8025C068 -/* 8025C05C 00258FBC D0 03 00 00 */ stfs f0, 0(r3) -/* 8025C060 00258FC0 D0 23 00 04 */ stfs f1, 4(r3) -/* 8025C064 00258FC4 D0 43 00 08 */ stfs f2, 8(r3) -lbl_8025C068: -/* 8025C068 00258FC8 80 9D 05 D4 */ lwz r4, 0x5d4(r29) -/* 8025C06C 00258FCC 38 61 00 40 */ addi r3, r1, 0x40 -/* 8025C070 00258FD0 38 04 00 01 */ addi r0, r4, 1 -/* 8025C074 00258FD4 90 1D 05 D4 */ stw r0, 0x5d4(r29) -/* 8025C078 00258FD8 48 0E 1A 69 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" -/* 8025C07C 00258FDC 3B 5A 00 01 */ addi r26, r26, 1 -/* 8025C080 00258FE0 3B FF 00 04 */ addi r31, r31, 4 -/* 8025C084 00258FE4 2C 1A 00 0E */ cmpwi r26, 0xe -/* 8025C088 00258FE8 41 80 FF 9C */ blt lbl_8025C024 -lbl_8025C08C: -/* 8025C08C 00258FEC 38 61 00 50 */ addi r3, r1, 0x50 -/* 8025C090 00258FF0 48 0B 86 69 */ bl CanBeNormalized__9CVector3fCFv -/* 8025C094 00258FF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8025C098 00258FF8 41 82 00 FC */ beq lbl_8025C194 -/* 8025C09C 00258FFC 38 61 00 34 */ addi r3, r1, 0x34 -/* 8025C0A0 00259000 38 81 00 50 */ addi r4, r1, 0x50 -/* 8025C0A4 00259004 48 0B 87 AD */ bl AsNormalized__9CVector3fCFv -/* 8025C0A8 00259008 C0 41 00 34 */ lfs f2, 0x34(r1) -/* 8025C0AC 0025900C 3C 60 80 3F */ lis r3, lbl_803E9650@ha -/* 8025C0B0 00259010 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 8025C0B4 00259014 3B 63 96 50 */ addi r27, r3, lbl_803E9650@l -/* 8025C0B8 00259018 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 8025C0BC 0025901C FF E0 10 50 */ fneg f31, f2 -/* 8025C0C0 00259020 FF C0 08 50 */ fneg f30, f1 -/* 8025C0C4 00259024 3B 9D 05 D8 */ addi r28, r29, 0x5d8 -/* 8025C0C8 00259028 FF A0 00 50 */ fneg f29, f0 -/* 8025C0CC 0025902C 3B E0 00 00 */ li r31, 0 -lbl_8025C0D0: -/* 8025C0D0 00259030 7F 85 E3 78 */ mr r5, r28 -/* 8025C0D4 00259034 38 61 00 28 */ addi r3, r1, 0x28 -/* 8025C0D8 00259038 38 9D 00 34 */ addi r4, r29, 0x34 -/* 8025C0DC 0025903C 48 0B 69 A5 */ bl Rotate__12CTransform4fCFRC9CVector3f -/* 8025C0E0 00259040 C3 81 00 28 */ lfs f28, 0x28(r1) -/* 8025C0E4 00259044 C3 61 00 2C */ lfs f27, 0x2c(r1) -/* 8025C0E8 00259048 C3 41 00 30 */ lfs f26, 0x30(r1) -/* 8025C0EC 0025904C C0 22 B9 E8 */ lfs f1, lbl_805AD708@sda21(r2) -/* 8025C0F0 00259050 48 0B 8C 55 */ bl FastCosR__5CMathFf -/* 8025C0F4 00259054 EC 1E 06 F2 */ fmuls f0, f30, f27 -/* 8025C0F8 00259058 EC 1F 07 3A */ fmadds f0, f31, f28, f0 -/* 8025C0FC 0025905C EC 1D 06 BA */ fmadds f0, f29, f26, f0 -/* 8025C100 00259060 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8025C104 00259064 7C 80 00 26 */ mfcr r4 -/* 8025C108 00259068 38 00 00 01 */ li r0, 1 -/* 8025C10C 0025906C 80 7D 05 D0 */ lwz r3, 0x5d0(r29) -/* 8025C110 00259070 7C 1A F8 30 */ slw r26, r0, r31 -/* 8025C114 00259074 54 99 17 FE */ rlwinm r25, r4, 2, 0x1f, 0x1f -/* 8025C118 00259078 7C 63 D0 38 */ and r3, r3, r26 -/* 8025C11C 0025907C 7C 03 00 D0 */ neg r0, r3 -/* 8025C120 00259080 7C 00 1B 78 */ or r0, r0, r3 -/* 8025C124 00259084 54 00 0F FE */ srwi r0, r0, 0x1f -/* 8025C128 00259088 7C 00 C8 40 */ cmplw r0, r25 -/* 8025C12C 0025908C 41 82 00 30 */ beq lbl_8025C15C -/* 8025C130 00259090 80 9B 00 00 */ lwz r4, 0(r27) -/* 8025C134 00259094 38 61 00 18 */ addi r3, r1, 0x18 -/* 8025C138 00259098 4B DA 8B 81 */ bl string_l__4rstlFPCc -/* 8025C13C 0025909C 80 7D 00 64 */ lwz r3, 0x64(r29) -/* 8025C140 002590A0 7F 25 CB 78 */ mr r5, r25 -/* 8025C144 002590A4 7F C6 F3 78 */ mr r6, r30 -/* 8025C148 002590A8 38 81 00 18 */ addi r4, r1, 0x18 -/* 8025C14C 002590AC 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8025C150 002590B0 4B DC EC 71 */ bl SetParticleEffectState__9CAnimDataFQ24rstl6stringbR13CStateManager -/* 8025C154 002590B4 38 61 00 18 */ addi r3, r1, 0x18 -/* 8025C158 002590B8 48 0E 19 89 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" -lbl_8025C15C: -/* 8025C15C 002590BC 28 19 00 00 */ cmplwi r25, 0 -/* 8025C160 002590C0 41 82 00 10 */ beq lbl_8025C170 -/* 8025C164 002590C4 80 1D 05 D0 */ lwz r0, 0x5d0(r29) -/* 8025C168 002590C8 7C 00 D3 78 */ or r0, r0, r26 -/* 8025C16C 002590CC 48 00 00 0C */ b lbl_8025C178 -lbl_8025C170: -/* 8025C170 002590D0 80 7D 05 D0 */ lwz r3, 0x5d0(r29) -/* 8025C174 002590D4 7C 60 D0 78 */ andc r0, r3, r26 -lbl_8025C178: -/* 8025C178 002590D8 3B FF 00 01 */ addi r31, r31, 1 -/* 8025C17C 002590DC 90 1D 05 D0 */ stw r0, 0x5d0(r29) -/* 8025C180 002590E0 2C 1F 00 0E */ cmpwi r31, 0xe -/* 8025C184 002590E4 3B 9C 00 0C */ addi r28, r28, 0xc -/* 8025C188 002590E8 3B 7B 00 04 */ addi r27, r27, 4 -/* 8025C18C 002590EC 41 80 FF 44 */ blt lbl_8025C0D0 -/* 8025C190 002590F0 48 00 00 68 */ b lbl_8025C1F8 -lbl_8025C194: -/* 8025C194 002590F4 3C 60 80 3F */ lis r3, lbl_803E9650@ha -/* 8025C198 002590F8 3B 20 00 00 */ li r25, 0 -/* 8025C19C 002590FC 3B 63 96 50 */ addi r27, r3, lbl_803E9650@l -/* 8025C1A0 00259100 3B E0 00 01 */ li r31, 1 -lbl_8025C1A4: -/* 8025C1A4 00259104 80 7D 05 D0 */ lwz r3, 0x5d0(r29) -/* 8025C1A8 00259108 7F E0 C8 30 */ slw r0, r31, r25 -/* 8025C1AC 0025910C 7C 60 00 39 */ and. r0, r3, r0 -/* 8025C1B0 00259110 41 82 00 30 */ beq lbl_8025C1E0 -/* 8025C1B4 00259114 80 9B 00 00 */ lwz r4, 0(r27) -/* 8025C1B8 00259118 38 61 00 08 */ addi r3, r1, 8 -/* 8025C1BC 0025911C 4B DA 8A FD */ bl string_l__4rstlFPCc -/* 8025C1C0 00259120 80 7D 00 64 */ lwz r3, 0x64(r29) -/* 8025C1C4 00259124 7F C6 F3 78 */ mr r6, r30 -/* 8025C1C8 00259128 38 81 00 08 */ addi r4, r1, 8 -/* 8025C1CC 0025912C 38 A0 00 00 */ li r5, 0 -/* 8025C1D0 00259130 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8025C1D4 00259134 4B DC EB ED */ bl SetParticleEffectState__9CAnimDataFQ24rstl6stringbR13CStateManager -/* 8025C1D8 00259138 38 61 00 08 */ addi r3, r1, 8 -/* 8025C1DC 0025913C 48 0E 19 05 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" -lbl_8025C1E0: -/* 8025C1E0 00259140 3B 39 00 01 */ addi r25, r25, 1 -/* 8025C1E4 00259144 3B 7B 00 04 */ addi r27, r27, 4 -/* 8025C1E8 00259148 2C 19 00 0E */ cmpwi r25, 0xe -/* 8025C1EC 0025914C 41 80 FF B8 */ blt lbl_8025C1A4 -/* 8025C1F0 00259150 38 00 00 00 */ li r0, 0 -/* 8025C1F4 00259154 90 1D 05 D0 */ stw r0, 0x5d0(r29) -lbl_8025C1F8: -/* 8025C1F8 00259158 E3 E1 01 08 */ psq_l f31, 264(r1), 0, qr0 -/* 8025C1FC 0025915C CB E1 01 00 */ lfd f31, 0x100(r1) -/* 8025C200 00259160 E3 C1 00 F8 */ psq_l f30, 248(r1), 0, qr0 -/* 8025C204 00259164 CB C1 00 F0 */ lfd f30, 0xf0(r1) -/* 8025C208 00259168 E3 A1 00 E8 */ psq_l f29, 232(r1), 0, qr0 -/* 8025C20C 0025916C CB A1 00 E0 */ lfd f29, 0xe0(r1) -/* 8025C210 00259170 E3 81 00 D8 */ psq_l f28, 216(r1), 0, qr0 -/* 8025C214 00259174 CB 81 00 D0 */ lfd f28, 0xd0(r1) -/* 8025C218 00259178 E3 61 00 C8 */ psq_l f27, 200(r1), 0, qr0 -/* 8025C21C 0025917C CB 61 00 C0 */ lfd f27, 0xc0(r1) -/* 8025C220 00259180 E3 41 00 B8 */ psq_l f26, 184(r1), 0, qr0 -/* 8025C224 00259184 CB 41 00 B0 */ lfd f26, 0xb0(r1) -/* 8025C228 00259188 BB 21 00 94 */ lmw r25, 0x94(r1) -/* 8025C22C 0025918C 80 01 01 14 */ lwz r0, 0x114(r1) -/* 8025C230 00259190 7C 08 03 A6 */ mtlr r0 -/* 8025C234 00259194 38 21 01 10 */ addi r1, r1, 0x110 -/* 8025C238 00259198 4E 80 00 20 */ blr - .section .sdata2, "a" +.balign 8 .global lbl_805AD628 lbl_805AD628: # ROM: 0x3F9EC8 @@ -11590,13 +11414,9 @@ lbl_805AD700: .4byte 0xBF32B8C2 .4byte 0 -.global lbl_805AD708 -lbl_805AD708: - # ROM: 0x3F9FA8 - .float 0.7853982 - .section .rodata +.balign 8 .global lbl_803D4B98 lbl_803D4B98: # ROM: 0x3D1B98 diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s index f4a84751..0cebdf09 100644 --- a/asm/MetroidPrime/Enemies/CRipper.s +++ b/asm/MetroidPrime/Enemies/CRipper.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3348 lbl_803E3348: @@ -187,6 +188,7 @@ lbl_803E3348: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7878 lbl_805A7878: @@ -992,6 +994,7 @@ lbl_8015C714: /* 8015C8DC 0015983C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABBF8 lbl_805ABBF8: # ROM: 0x3F8498 @@ -1004,6 +1007,7 @@ lbl_805ABBFC: .section .rodata +.balign 8 .global lbl_803D0358 lbl_803D0358: # ROM: 0x3CD358 diff --git a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s index e636972d..d8d61d7c 100644 --- a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s +++ b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E80C0 lbl_803E80C0: @@ -384,6 +385,7 @@ lbl_80232B78: /* 80232CA0 0022FC00 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD3E8 lbl_805AD3E8: # ROM: 0x3F9C88 diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s index d184a43c..14fd89d3 100644 --- a/asm/MetroidPrime/Enemies/CSeedling.s +++ b/asm/MetroidPrime/Enemies/CSeedling.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E9DF8 lbl_803E9DF8: @@ -201,6 +202,7 @@ lbl_803E9E10: .4byte 0 .section .sdata +.balign 8 .global lbl_805A83F8 lbl_805A83F8: @@ -1411,6 +1413,7 @@ lbl_8026705C: /* 80267140 002640A0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD7E8 lbl_805AD7E8: # ROM: 0x3FA088 @@ -1433,6 +1436,7 @@ lbl_805AD7F4: .section .rodata +.balign 8 .global lbl_803D52B0 lbl_803D52B0: # ROM: 0x3D22B0 diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s index a988b9b4..4587f2aa 100644 --- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s +++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8578 lbl_803E8578: @@ -35,6 +36,7 @@ lbl_803E8578: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8230 lbl_805A8230: @@ -67,6 +69,7 @@ lbl_805A8244: .4byte 0x00000013 .section .bss +.balign 8 .global lbl_8046D360 lbl_8046D360: @@ -76,6 +79,7 @@ lbl_8046D378: .skip 0x18 .section .sbss, "wa" +.balign 8 .global lbl_805A90F0 lbl_805A90F0: @@ -3553,6 +3557,7 @@ lbl_8023E5E8: /* 8023E600 0023B560 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD488 lbl_805AD488: # ROM: 0x3F9D28 @@ -3616,6 +3621,7 @@ lbl_805AD4B8: .section .rodata +.balign 8 .global lbl_803D4388 lbl_803D4388: # ROM: 0x3D1388 diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index c6b77868..30fc5857 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CSpacePirate_cpp .section .data +.balign 8 .global lbl_803E0700 lbl_803E0700: @@ -409,6 +410,7 @@ lbl_803E0BE0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7650 lbl_805A7650: @@ -522,6 +524,7 @@ lbl_805A76A0: .4byte 0 .section .bss +.balign 8 .global lbl_8046C570 lbl_8046C570: @@ -531,6 +534,7 @@ lbl_8046C618: .skip 0x108 .section .sdata2, "a" +.balign 8 .global lbl_805AB4D0 lbl_805AB4D0: @@ -15058,6 +15062,7 @@ __sinit_CSpacePirate_cpp: /* 8012D304 0012A264 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CF438 lbl_803CF438: # ROM: 0x3CC438 diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index b12c3eef..1ca9839a 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2D28 lbl_803E2D28: @@ -187,6 +188,7 @@ lbl_803E2D28: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7838 lbl_805A7838: @@ -2286,6 +2288,7 @@ lbl_80156954: /* 8015697C 001538DC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABB48 lbl_805ABB48: # ROM: 0x3F83E8 @@ -2324,6 +2327,7 @@ lbl_805ABB60: .section .rodata +.balign 8 .global lbl_803D01F8 lbl_803D01F8: # ROM: 0x3CD1F8 diff --git a/asm/MetroidPrime/Enemies/CStateMachine.s b/asm/MetroidPrime/Enemies/CStateMachine.s index 76c6f83f..c2d6a2ef 100644 --- a/asm/MetroidPrime/Enemies/CStateMachine.s +++ b/asm/MetroidPrime/Enemies/CStateMachine.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2, "a" +.balign 8 .global lbl_805AA6A0 lbl_805AA6A0: @@ -855,6 +856,7 @@ lbl_80080174: /* 8008018C 0007D0EC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD628 lbl_803CD628: # ROM: 0x3CA628 diff --git a/asm/MetroidPrime/Enemies/CTeamAiMgr.s b/asm/MetroidPrime/Enemies/CTeamAiMgr.s index 15c82d1d..1e070f12 100644 --- a/asm/MetroidPrime/Enemies/CTeamAiMgr.s +++ b/asm/MetroidPrime/Enemies/CTeamAiMgr.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8558 lbl_803E8558: @@ -4126,6 +4127,7 @@ lbl_8023B4BC: /* 8023B4D8 00238438 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD478 lbl_805AD478: # ROM: 0x3F9D18 @@ -4148,6 +4150,7 @@ lbl_805AD484: .section .rodata +.balign 8 .global lbl_803D4380 lbl_803D4380: # ROM: 0x3D1380 diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index cca76280..be8f53be 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CThardus_cpp .section .data +.balign 8 .global lbl_803E5CE0 lbl_803E5CE0: @@ -417,6 +418,7 @@ lbl_803E6074: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7DA8 lbl_805A7DA8: @@ -499,6 +501,7 @@ lbl_805A7DE4: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9078 lbl_805A9078: @@ -10778,6 +10781,7 @@ __sinit_CThardus_cpp: /* 801E38A0 001E0800 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC9E8 lbl_805AC9E8: # ROM: 0x3F9288 @@ -11002,6 +11006,7 @@ lbl_805ACA98: .section .rodata +.balign 8 .global lbl_803D1BA0 lbl_803D1BA0: # ROM: 0x3CEBA0 diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index a0d7798f..3f3d7d5b 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6BE0 lbl_803E6BE0: @@ -187,6 +188,7 @@ lbl_803E6BE0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7F10 lbl_805A7F10: @@ -2887,6 +2889,7 @@ Accept__22CThardusRockProjectileFR8IVisitor: /* 80205D30 00202C90 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACD98 lbl_805ACD98: # ROM: 0x3F9638 @@ -2971,70 +2974,11 @@ lbl_805ACDD8: .section .rodata +.balign 8 .global lbl_803D2590 lbl_803D2590: # ROM: 0x3CF590 .asciz "Rock_01_Collision_LCTR" - .byte 0x52 - .asciz "OCK_PROJECTILE_EFFECT-%u-%i" + .asciz "ROCK_PROJECTILE_EFFECT-%u-%i" .asciz "??(??)" .balign 4 - .4byte 0 - .4byte 0 - .4byte 0x00000024 - .4byte 0x00000046 - .4byte 0x00000001 - .4byte 0x00000025 - .4byte 0x00000048 - .4byte 0x00000002 - .4byte 0x00000026 - .4byte 0x0000004A - .4byte 0x00000003 - .4byte 0x00000027 - .4byte 0x0000004C - .4byte 0x00000004 - .4byte 0x00000028 - .4byte 0x0000004E - .4byte 0x00000005 - .4byte 0x0000002E - .4byte 0x00000057 - .4byte 0x00000006 - .4byte 0x0000002F - .4byte 0x00000058 - .4byte 0x00000007 - .4byte 0x00000030 - .4byte 0x00000059 - .4byte 0x00000008 - .4byte 0x00000031 - .4byte 0x0000005A - .4byte 0x00000009 - .4byte 0x00000032 - .4byte 0x0000005B - .4byte 0x0000000A - .4byte 0x00000033 - .4byte 0x00000052 - .4byte 0x0000000B - .4byte 0x00000034 - .4byte 0x00000053 - .4byte 0x0000000C - .4byte 0x00000035 - .4byte 0x00000054 - .4byte 0x0000000D - .4byte 0x00000036 - .4byte 0x00000055 - .4byte 0x0000000E - .4byte 0x00000037 - .4byte 0x00000056 - .4byte 0x0000000F - .4byte 0x00000038 - .4byte 0x00000042 - .4byte 0x00000010 - .4byte 0x00000039 - .4byte 0x00000043 - .4byte 0x00000011 - .4byte 0x0000003A - .4byte 0x00000044 - .4byte 0x00000012 - .4byte 0x0000003B - .4byte 0x00000045 - diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index a4950c3e..585e46f5 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CTryclops_cpp .section .data +.balign 8 .global lbl_803E9A10 lbl_803E9A10: @@ -219,6 +220,7 @@ lbl_803E9A40: .4byte 0 .section .sdata +.balign 8 .global lbl_805A83A0 lbl_805A83A0: @@ -271,12 +273,14 @@ lbl_805A83C4: .4byte 0x00000013 .section .bss +.balign 8 .global lbl_8046DC90 lbl_8046DC90: .skip 0x18 .section .sbss, "wa" +.balign 8 .global lbl_805A9120 lbl_805A9120: @@ -3972,6 +3976,7 @@ __sinit_CTryclops_cpp: /* 8026107C 0025DFDC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD748 lbl_805AD748: # ROM: 0x3F9FE8 diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index ec9e4b7d..087d439f 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6308 lbl_803E6308: @@ -47,6 +48,7 @@ lbl_803E6374: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7DF8 lbl_805A7DF8: @@ -105,6 +107,7 @@ lbl_805A7E20: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9080 lbl_805A9080: @@ -135,6 +138,7 @@ lbl_805A90A0: .skip 0x8 .section .sbss2, "", @nobits # 0x805AF460 - 0x805AF4C7 +.balign 8 # CWallCrawlerSwarm .global lbl_805AF468 lbl_805AF468: @@ -144,6 +148,7 @@ lbl_805AF46C: .skip 0x4 .section .bss +.balign 8 .global lbl_8046C938 lbl_8046C938: @@ -8743,6 +8748,7 @@ lbl_801EF1D0: /* 801EF1E8 001EC148 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACAC0 lbl_805ACAC0: # ROM: 0x3F9360 @@ -8931,6 +8937,7 @@ lbl_805ACB5C: .section .rodata +.balign 8 .global lbl_803D1F20 lbl_803D1F20: # ROM: 0x3CEF20 diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s index 1f2abd3d..30f42900 100644 --- a/asm/MetroidPrime/Enemies/CWallWalker.s +++ b/asm/MetroidPrime/Enemies/CWallWalker.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EA0F0 lbl_803EA0F0: @@ -1222,6 +1223,7 @@ ProjectPointToPlane__11CWallWalkerFRC9CVector3fRC9CVector3fRC9CVector3f: /* 80269474 002663D4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD818 lbl_805AD818: # ROM: 0x3FA0B8 diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 0a068f15..72835b51 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFF90 lbl_803DFF90: @@ -209,6 +210,7 @@ lbl_803E025C: .4byte 0 .section .sdata +.balign 8 .global lbl_805A75C8 @@ -258,6 +260,7 @@ lbl_805A75E8: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB1E0 lbl_805AB1E0: @@ -7252,6 +7255,7 @@ lbl_80110F54: /* 80110F88 0010DEE8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CF1D8 lbl_803CF1D8: # ROM: 0x3CC1D8 diff --git a/asm/MetroidPrime/Enemies/SPositionHistory.s b/asm/MetroidPrime/Enemies/SPositionHistory.s index 6c4ce849..975252b5 100644 --- a/asm/MetroidPrime/Enemies/SPositionHistory.s +++ b/asm/MetroidPrime/Enemies/SPositionHistory.s @@ -154,6 +154,7 @@ sub_802a09f8: /* 802A0A08 0029D968 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADE38 lbl_805ADE38: # ROM: 0x3FA6D8 diff --git a/asm/MetroidPrime/Factories/CAssetFactory.s b/asm/MetroidPrime/Factories/CAssetFactory.s index 4cb725db..1820a189 100644 --- a/asm/MetroidPrime/Factories/CAssetFactory.s +++ b/asm/MetroidPrime/Factories/CAssetFactory.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9C88 lbl_803D9C88: @@ -448,6 +449,7 @@ lbl_80034DEC: /* 80034E00 00031D60 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCD80 lbl_803CCD80: # ROM: 0x3C9D80 diff --git a/asm/MetroidPrime/Factories/CCharacterFactory.s b/asm/MetroidPrime/Factories/CCharacterFactory.s index 9399a1ee..85ef4181 100644 --- a/asm/MetroidPrime/Factories/CCharacterFactory.s +++ b/asm/MetroidPrime/Factories/CCharacterFactory.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9BA8 lbl_803D9BA8: @@ -3468,6 +3469,7 @@ lbl_8003479C: /* 80034848 000317A8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCD78 lbl_803CCD78: # ROM: 0x3C9D78 diff --git a/asm/MetroidPrime/Factories/CSaveWorldFactory.s b/asm/MetroidPrime/Factories/CSaveWorldFactory.s index 84008599..734c3463 100644 --- a/asm/MetroidPrime/Factories/CSaveWorldFactory.s +++ b/asm/MetroidPrime/Factories/CSaveWorldFactory.s @@ -1082,6 +1082,7 @@ lbl_8026BBD4: /* 8026BBEC 00268B4C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D5418 lbl_803D5418: # ROM: 0x3D2418 diff --git a/asm/MetroidPrime/Factories/CScannableObjectInfo.s b/asm/MetroidPrime/Factories/CScannableObjectInfo.s index b8c7fcdf..02b793e8 100644 --- a/asm/MetroidPrime/Factories/CScannableObjectInfo.s +++ b/asm/MetroidPrime/Factories/CScannableObjectInfo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3AC8 lbl_803E3AC8: @@ -497,6 +498,7 @@ GetImagePaneName__16CPauseScreenBaseFUi: /* 80169FB4 00166F14 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABD88 lbl_805ABD88: # ROM: 0x3F8628 @@ -505,6 +507,7 @@ lbl_805ABD88: .section .rodata +.balign 8 .global lbl_803D0430 lbl_803D0430: # ROM: 0x3CD430 diff --git a/asm/MetroidPrime/Factories/CStateMachineFactory.s b/asm/MetroidPrime/Factories/CStateMachineFactory.s index a5a726d7..1c1cb8e4 100644 --- a/asm/MetroidPrime/Factories/CStateMachineFactory.s +++ b/asm/MetroidPrime/Factories/CStateMachineFactory.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF700 lbl_803DF700: @@ -281,6 +282,7 @@ lbl_800DEB80: /* 800DEB98 000DBAF8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE528 lbl_803CE528: # ROM: 0x3CB528 diff --git a/asm/MetroidPrime/GameObjectLists.s b/asm/MetroidPrime/GameObjectLists.s index 4ac3fab1..9e4e078b 100644 --- a/asm/MetroidPrime/GameObjectLists.s +++ b/asm/MetroidPrime/GameObjectLists.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5258 lbl_803E5258: diff --git a/asm/MetroidPrime/HUD/CHudBallInterface.s b/asm/MetroidPrime/HUD/CHudBallInterface.s index 4fe07c77..69ce30ff 100644 --- a/asm/MetroidPrime/HUD/CHudBallInterface.s +++ b/asm/MetroidPrime/HUD/CHudBallInterface.s @@ -399,6 +399,7 @@ lbl_801CD9F4: /* 801CDA28 001CA988 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC8C0 lbl_805AC8C0: # ROM: 0x3F9160 @@ -417,6 +418,7 @@ lbl_805AC8C8: .section .rodata +.balign 8 .global lbl_803D1AD8 lbl_803D1AD8: # ROM: 0x3CEAD8 diff --git a/asm/MetroidPrime/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s index 0df058c5..d1d06f78 100644 --- a/asm/MetroidPrime/HUD/CHudDecoInterface.s +++ b/asm/MetroidPrime/HUD/CHudDecoInterface.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E4470 lbl_803E4470: @@ -121,6 +122,7 @@ lbl_803E4594: .4byte __dt__23CHudDecoInterfaceCombatFv .section .sdata +.balign 8 .global lbl_805A7AB8 lbl_805A7AB8: @@ -9546,6 +9548,7 @@ lbl_801974A8: /* 801974B8 00194418 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC1B8 lbl_805AC1B8: # ROM: 0x3F8A58 @@ -10124,6 +10127,7 @@ lbl_805AC3B8: .section .rodata +.balign 8 .global lbl_803D0948 lbl_803D0948: # ROM: 0x3CD948 diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index bbd83569..d782b9fb 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CSamusHud_cpp .section .data +.balign 8 .global lbl_803DA298 lbl_803DA298: @@ -57,6 +58,12 @@ lbl_803DA304: .4byte __dt__19IHudThreatInterfaceFv .section .sdata +.balign 8 + +.global lbl_805A6EB0 +lbl_805A6EB0: + # ROM: 0x3F4850 + .4byte 0 .global lbl_805A6EB4 lbl_805A6EB4: @@ -260,12 +267,14 @@ lbl_805A6F50: .4byte 0 .section .bss +.balign 8 .global lbl_8046C3C8 lbl_8046C3C8: .skip 0x18 .section .sbss +.balign 8 # CSamusHud .global lbl_805A8DE8 @@ -273,6 +282,7 @@ lbl_805A8DE8: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AA448 lbl_805AA448: @@ -10678,6 +10688,7 @@ __sinit_CSamusHud_cpp: /* 8006D808 0006A768 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCFB8 lbl_803CCFB8: # ROM: 0x3C9FB8 diff --git a/asm/MetroidPrime/IRenderer.s b/asm/MetroidPrime/IRenderer.s index 4332e911..fd81a154 100644 --- a/asm/MetroidPrime/IRenderer.s +++ b/asm/MetroidPrime/IRenderer.s @@ -1,4 +1,5 @@ .section .data +.balign 8 .global lbl_803D8D90 lbl_803D8D90: @@ -70,3 +71,11 @@ lbl_803D8D90: .4byte 0 .4byte 0 .4byte 0 + +# CArchitectureMessage +.global lbl_803D8E9C +lbl_803D8E9C: + # ROM: 0x3D5E9C + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/MetroidPrime/PathFinding/CPathFindArea.s b/asm/MetroidPrime/PathFinding/CPathFindArea.s index 4a516bf4..7911a033 100644 --- a/asm/MetroidPrime/PathFinding/CPathFindArea.s +++ b/asm/MetroidPrime/PathFinding/CPathFindArea.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5718 lbl_803E5718: @@ -2291,6 +2292,7 @@ lbl_801CC120: /* 801CC128 001C9088 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC870 lbl_805AC870: # ROM: 0x3F9110 @@ -2329,6 +2331,7 @@ lbl_805AC888: .section .rodata +.balign 8 .global lbl_803D1AA0 lbl_803D1AA0: # ROM: 0x3CEAA0 diff --git a/asm/MetroidPrime/PathFinding/CPathFindRegion.s b/asm/MetroidPrime/PathFinding/CPathFindRegion.s index f07b6ac1..2fd40cd9 100644 --- a/asm/MetroidPrime/PathFinding/CPathFindRegion.s +++ b/asm/MetroidPrime/PathFinding/CPathFindRegion.s @@ -1298,6 +1298,7 @@ __ct__13CPFRegionDataFv: /* 801CA168 001C70C8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC860 lbl_805AC860: # ROM: 0x3F9100 diff --git a/asm/MetroidPrime/PathFinding/CPathFindSearch.s b/asm/MetroidPrime/PathFinding/CPathFindSearch.s index fc641699..d8b95c16 100644 --- a/asm/MetroidPrime/PathFinding/CPathFindSearch.s +++ b/asm/MetroidPrime/PathFinding/CPathFindSearch.s @@ -2562,6 +2562,7 @@ __ct__11CPFOpenListFv: /* 801C8EA4 001C5E04 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC848 lbl_805AC848: # ROM: 0x3F90E8 diff --git a/asm/MetroidPrime/Player/CFaceplateDecoration.s b/asm/MetroidPrime/Player/CFaceplateDecoration.s index 4eeba850..dc6d172a 100644 --- a/asm/MetroidPrime/Player/CFaceplateDecoration.s +++ b/asm/MetroidPrime/Player/CFaceplateDecoration.s @@ -152,6 +152,7 @@ __ct__20CFaceplateDecorationFR13CStateManager: /* 80175CD4 00172C34 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABEB0 lbl_805ABEB0: # ROM: 0x3F8750 diff --git a/asm/MetroidPrime/Player/CFidget.s b/asm/MetroidPrime/Player/CFidget.s index 731adf64..941981dd 100644 --- a/asm/MetroidPrime/Player/CFidget.s +++ b/asm/MetroidPrime/Player/CFidget.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7830 lbl_805A7830: @@ -354,6 +355,7 @@ __ct__7CFidgetFv: /* 80154C04 00151B64 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABB20 lbl_805ABB20: # ROM: 0x3F83C0 diff --git a/asm/MetroidPrime/Player/CGameHintInfo.s b/asm/MetroidPrime/Player/CGameHintInfo.s index f3c090eb..9d4dddad 100644 --- a/asm/MetroidPrime/Player/CGameHintInfo.s +++ b/asm/MetroidPrime/Player/CGameHintInfo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EA0E0 lbl_803EA0E0: @@ -11,6 +12,7 @@ lbl_803EA0E0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8400 lbl_805A8400: @@ -1529,6 +1531,7 @@ lbl_80268540: /* 80268568 002654C8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD7F8 lbl_805AD7F8: # ROM: 0x3FA098 @@ -1566,6 +1569,7 @@ lbl_805AD810: .section .rodata +.balign 8 .global lbl_803D53C0 lbl_803D53C0: # ROM: 0x3D23C0 diff --git a/asm/MetroidPrime/Player/CGameOptions.s b/asm/MetroidPrime/Player/CGameOptions.s index a7f2df48..5cff9afd 100644 --- a/asm/MetroidPrime/Player/CGameOptions.s +++ b/asm/MetroidPrime/Player/CGameOptions.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7FE0 lbl_805A7FE0: @@ -1536,6 +1537,7 @@ lbl_8020FC38: /* 8020FC44 0020CBA4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACF40 lbl_805ACF40: # ROM: 0x3F97E0 diff --git a/asm/MetroidPrime/Player/CGameState.s b/asm/MetroidPrime/Player/CGameState.s index 4cbd0df7..655232d9 100644 --- a/asm/MetroidPrime/Player/CGameState.s +++ b/asm/MetroidPrime/Player/CGameState.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7D58 lbl_805A7D58: @@ -3326,6 +3327,7 @@ lbl_801D647C: /* 801D648C 001D33EC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC940 lbl_805AC940: # ROM: 0x3F91E0 @@ -3355,6 +3357,7 @@ lbl_805AC958: .section .rodata +.balign 8 .global lbl_803D1B88 lbl_803D1B88: # ROM: 0x3CEB88 diff --git a/asm/MetroidPrime/Player/CGrappleArm.s b/asm/MetroidPrime/Player/CGrappleArm.s index 8d51b1e5..aa83257c 100644 --- a/asm/MetroidPrime/Player/CGrappleArm.s +++ b/asm/MetroidPrime/Player/CGrappleArm.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2, "a" +.balign 8 .global lbl_805AB468 lbl_805AB468: @@ -115,6 +116,7 @@ lbl_805AB4C8: .double 0.0 .section .data +.balign 8 .global lbl_803E06B0 lbl_803E06B0: @@ -145,6 +147,7 @@ lbl_803E06DC: .4byte lbl_8011F3A0 .section .sdata +.balign 8 .global lbl_805A7638 lbl_805A7638: @@ -3589,6 +3592,7 @@ lbl_801204D4: /* 80120514 0011D474 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CF320 lbl_803CF320: # ROM: 0x3CC320 diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index fbbb2648..43eb6c62 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CMorphBall_cpp .section .sdata +.balign 8 .global lbl_805A73E8 lbl_805A73E8: @@ -253,6 +254,7 @@ lbl_805A74A8: .4byte 0 .section .bss +.balign 8 .global lbl_8046C4F8 lbl_8046C4F8: @@ -262,6 +264,7 @@ lbl_8046C504: .skip 0x1C .section .sbss +.balign 8 # CMorphBall .global lbl_805A8EE8 @@ -284,6 +287,7 @@ lbl_805A8EFC: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AAE70 lbl_805AAE70: @@ -15144,6 +15148,7 @@ lbl_800FA60C: /* 800FA620 000F7580 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE910 lbl_803CE910: # ROM: 0x3CB910 diff --git a/asm/MetroidPrime/Player/CMorphBallShadow.s b/asm/MetroidPrime/Player/CMorphBallShadow.s index 991789f0..8627f4b1 100644 --- a/asm/MetroidPrime/Player/CMorphBallShadow.s +++ b/asm/MetroidPrime/Player/CMorphBallShadow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss2, "", @nobits +.balign 8 # CMorphBallShadow .global lbl_805AF470 lbl_805AF470: @@ -1311,6 +1312,7 @@ lbl_80296E04: /* 80296E20 00293D80 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADCB8 lbl_805ADCB8: # ROM: 0x3FA558 @@ -1343,6 +1345,7 @@ lbl_805ADCCC: .section .rodata +.balign 8 .global lbl_803D5BD0 lbl_803D5BD0: # ROM: 0x3D2BD0 diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 80dd2c2a..63a61df1 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPlayer_cpp .section .data +.balign 8 .global lbl_803D96E8 lbl_803D96E8: # ROM: 0x3D66E8 @@ -96,6 +97,7 @@ lbl_803D97E4: .4byte 0 .section .bss +.balign 8 .global lbl_80457908 lbl_80457908: .skip 0xC0 @@ -119,6 +121,7 @@ lbl_80458350: .skip 0x1E58 .section .rodata +.balign 8 .global skPlayerLandSfxSoft__7CPlayer skPlayerLandSfxSoft__7CPlayer: .2byte 0xFFFF, 0x05E4, 0x05D2, 0x0621 @@ -167,6 +170,7 @@ lbl_803CC4F8: .balign 4 .section .sbss +.balign 8 # CPlayer .global lbl_805A8C78 @@ -221,6 +225,7 @@ lbl_805A8CA8: .skip 0x8 .section .sdata +.balign 8 .global lbl_805A6C48 lbl_805A6C48: # ROM: 0x3F45E8 @@ -402,6 +407,7 @@ lbl_805A6CD4: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805A9E00 lbl_805A9E00: diff --git a/asm/MetroidPrime/Player/CPlayerCameraBob.s b/asm/MetroidPrime/Player/CPlayerCameraBob.s index 24ba7be5..228e47e6 100644 --- a/asm/MetroidPrime/Player/CPlayerCameraBob.s +++ b/asm/MetroidPrime/Player/CPlayerCameraBob.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPlayerCameraBob_cpp .section .sdata +.balign 8 .global lbl_805A7378 lbl_805A7378: @@ -127,6 +128,7 @@ lbl_805A73D4: .float 1.0 .section .sbss +.balign 8 # CPlayerCameraBob .global lbl_805A8ED0 @@ -140,6 +142,7 @@ lbl_805A8ED8: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AAD98 lbl_805AAD98: diff --git a/asm/MetroidPrime/Player/CPlayerDynamics.s b/asm/MetroidPrime/Player/CPlayerDynamics.s index 79d0ce7e..0fdcef4f 100644 --- a/asm/MetroidPrime/Player/CPlayerDynamics.s +++ b/asm/MetroidPrime/Player/CPlayerDynamics.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPlayerDynamics_cpp .section .sdata +.balign 8 .global lbl_805A84E8 lbl_805A84E8: @@ -103,12 +104,14 @@ lbl_805A8530: .4byte 0 .section .bss +.balign 8 .global lbl_8046E0D8 lbl_8046E0D8: .skip 0x18 .section .sbss, "wa" +.balign 8 .global lbl_805A9150 lbl_805A9150: @@ -7606,6 +7609,7 @@ __sinit_CPlayerDynamics_cpp: /* 802887C4 00285724 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADA98 lbl_805ADA98: # ROM: 0x3FA338 @@ -7860,6 +7864,7 @@ lbl_805ADB78: .section .rodata +.balign 8 .global lbl_803D5908 lbl_803D5908: # ROM: 0x3D2908 diff --git a/asm/MetroidPrime/Player/CPlayerEnergyDrain.s b/asm/MetroidPrime/Player/CPlayerEnergyDrain.s index 04a355c9..b6989a4f 100644 --- a/asm/MetroidPrime/Player/CPlayerEnergyDrain.s +++ b/asm/MetroidPrime/Player/CPlayerEnergyDrain.s @@ -717,6 +717,7 @@ lbl_801B4EA4: /* 801B4F58 001B1EB8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC660 lbl_805AC660: # ROM: 0x3F8F00 @@ -725,6 +726,7 @@ lbl_805AC660: .section .rodata +.balign 8 .global lbl_803D1630 lbl_803D1630: # ROM: 0x3CE630 diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index abe5b985..0d9bfecb 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPlayerGun_cpp .section .data +.balign 8 .global lbl_803D9D50 lbl_803D9D50: # ROM: 0x3D6D50 @@ -78,6 +79,7 @@ lbl_803D9E04: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6DE0 lbl_805A6DE0: @@ -144,6 +146,7 @@ lbl_805A6E18: .4byte 0 .section .bss +.balign 8 .global lbl_8045C518 lbl_8045C518: @@ -153,6 +156,7 @@ lbl_8045C530: .skip 0x20 .section .sbss +.balign 8 # CPlayerGun .global lbl_805A8D70 @@ -178,6 +182,7 @@ lbl_805A8D8C: .skip 0xC .section .sdata2, "a" +.balign 8 .global lbl_805AA168 lbl_805AA168: @@ -10992,6 +10997,7 @@ __sinit_CPlayerGun_cpp: /* 80043DDC 00040D3C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCE38 lbl_803CCE38: # ROM: 0x3C9E38 diff --git a/asm/MetroidPrime/Player/CPlayerInputFilter.s b/asm/MetroidPrime/Player/CPlayerInputFilter.s index 2825266a..81cf493f 100644 --- a/asm/MetroidPrime/Player/CPlayerInputFilter.s +++ b/asm/MetroidPrime/Player/CPlayerInputFilter.s @@ -831,6 +831,7 @@ __ct__Q27CPlayer12CInputFilterFv: /* 802979E0 00294940 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADCD0 lbl_805ADCD0: # ROM: 0x3FA570 diff --git a/asm/MetroidPrime/Player/CPlayerOrbit.s b/asm/MetroidPrime/Player/CPlayerOrbit.s index 79f50f2b..d83bafb5 100644 --- a/asm/MetroidPrime/Player/CPlayerOrbit.s +++ b/asm/MetroidPrime/Player/CPlayerOrbit.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPlayerOrbit_cpp .section .sdata +.balign 8 .global lbl_805A7A08 lbl_805A7A08: @@ -77,6 +78,7 @@ lbl_805A7A3C: .4byte 0x00000013 .section .bss +.balign 8 .global lbl_8046C8C0 lbl_8046C8C0: @@ -89,6 +91,7 @@ lbl_8046C8F0: .skip 0x18 .section .sbss, "wa" +.balign 8 .global lbl_805A9000 lbl_805A9000: @@ -7327,6 +7330,7 @@ __sinit_CPlayerOrbit_cpp: /* 8017FB80 0017CAE0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABF50 lbl_805ABF50: # ROM: 0x3F87F0 diff --git a/asm/MetroidPrime/Player/CPlayerState.s b/asm/MetroidPrime/Player/CPlayerState.s index 9f0d8017..0db636b0 100644 --- a/asm/MetroidPrime/Player/CPlayerState.s +++ b/asm/MetroidPrime/Player/CPlayerState.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DAD40 lbl_803DAD40: @@ -45,6 +46,7 @@ lbl_803DAD40: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7150 lbl_805A7150: @@ -63,6 +65,7 @@ lbl_805A7158: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA828 lbl_805AA828: @@ -1745,6 +1748,7 @@ sub_800926c4: /* 8009278C 0008F6EC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD6C0 lbl_803CD6C0: # ROM: 0x3CA6C0 diff --git a/asm/MetroidPrime/Player/CPlayerVisor.s b/asm/MetroidPrime/Player/CPlayerVisor.s index 90042512..bb61e19e 100644 --- a/asm/MetroidPrime/Player/CPlayerVisor.s +++ b/asm/MetroidPrime/Player/CPlayerVisor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A75F0 lbl_805A75F0: @@ -63,6 +64,7 @@ lbl_805A761C: .float 1.0 .section .sdata2, "a" +.balign 8 .global lbl_805AB2E8 lbl_805AB2E8: @@ -3441,6 +3443,7 @@ lbl_80114C18: /* 80114C44 00111BA4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CF210 lbl_803CF210: # ROM: 0x3CC210 diff --git a/asm/MetroidPrime/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s index f6967a00..29c8ef10 100644 --- a/asm/MetroidPrime/Player/CSamusFaceReflection.s +++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CSamusFaceReflection_cpp .section .sdata +.balign 8 .global lbl_805A7868 lbl_805A7868: @@ -17,6 +18,7 @@ lbl_805A786C: .float 1.0 .section .bss +.balign 8 .global lbl_8046C7A0 lbl_8046C7A0: @@ -730,6 +732,7 @@ __sinit_CSamusFaceReflection_cpp: /* 8015B850 001587B0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABBC0 lbl_805ABBC0: # ROM: 0x3F8460 @@ -793,6 +796,7 @@ lbl_805ABBF0: .section .rodata +.balign 8 .global lbl_803D0340 lbl_803D0340: # ROM: 0x3CD340 diff --git a/asm/MetroidPrime/Player/CSaveWorld.s b/asm/MetroidPrime/Player/CSaveWorld.s index 22982246..7665ebf1 100644 --- a/asm/MetroidPrime/Player/CSaveWorld.s +++ b/asm/MetroidPrime/Player/CSaveWorld.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A82C0 lbl_805A82C0: @@ -2786,6 +2787,7 @@ sub_8024b374: /* 8024B398 002482F8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD5A8 lbl_805AD5A8: # ROM: 0x3F9E48 @@ -2794,6 +2796,7 @@ lbl_805AD5A8: .section .rodata +.balign 8 .global lbl_803D4780 lbl_803D4780: # ROM: 0x3D1780 diff --git a/asm/MetroidPrime/Player/CScanDisplay.s b/asm/MetroidPrime/Player/CScanDisplay.s index 1ca7d546..5c69b872 100644 --- a/asm/MetroidPrime/Player/CScanDisplay.s +++ b/asm/MetroidPrime/Player/CScanDisplay.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A79E0 lbl_805A79E0: @@ -2379,6 +2380,7 @@ lbl_80174B00: /* 80174B0C 00171A6C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABE30 lbl_805ABE30: # ROM: 0x3F86D0 @@ -2452,6 +2454,7 @@ lbl_805ABE6C: .section .rodata +.balign 8 .global lbl_803D0620 lbl_803D0620: # ROM: 0x3CD620 diff --git a/asm/MetroidPrime/Player/CStaticInterference.s b/asm/MetroidPrime/Player/CStaticInterference.s index ae7b6caa..fa1b569a 100644 --- a/asm/MetroidPrime/Player/CStaticInterference.s +++ b/asm/MetroidPrime/Player/CStaticInterference.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A7CD8 lbl_805A7CD8: @@ -467,6 +468,7 @@ lbl_801C0D70: /* 801C0D88 001BDCE8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC798 lbl_805AC798: # ROM: 0x3F9038 @@ -479,6 +481,7 @@ lbl_805AC79C: .section .rodata +.balign 8 .global lbl_803D1A78 lbl_803D1A78: # ROM: 0x3CEA78 diff --git a/asm/MetroidPrime/Player/CWorldLayerState.s b/asm/MetroidPrime/Player/CWorldLayerState.s index 26fc386b..baf2f297 100644 --- a/asm/MetroidPrime/Player/CWorldLayerState.s +++ b/asm/MetroidPrime/Player/CWorldLayerState.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CScriptLayerManager_cpp .section .sdata +.balign 8 .global lbl_805A8200 lbl_805A8200: @@ -14,6 +15,7 @@ lbl_805A8200: .section .bss +.balign 8 .global lbl_8046D340 lbl_8046D340: diff --git a/asm/MetroidPrime/RumbleFxTable.s b/asm/MetroidPrime/RumbleFxTable.s index 92afc6b8..49d9a96d 100644 --- a/asm/MetroidPrime/RumbleFxTable.s +++ b/asm/MetroidPrime/RumbleFxTable.s @@ -641,6 +641,7 @@ __sinit_RumbleFxTable_cpp: /* 80227394 002242F4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD1E0 lbl_805AD1E0: # ROM: 0x3F9A80 diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index 5916ad44..aa5f5798 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A72A0 lbl_805A72A0: @@ -49,6 +50,7 @@ lbl_805A72C0: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AAB48 lbl_805AAB48: @@ -23676,85 +23678,58 @@ lbl_800DAA04: /* 800DAA2C 000D798C 4E 80 00 20 */ blr .section .rodata +.balign 8 +.global lbl_803CE070 +lbl_803CE070: + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000002 .global lbl_803CE07C lbl_803CE07C: # ROM: 0x3CB07C .asciz "Atomic Alpha" - .byte 0x3F, 0x3F, 0x28 - .4byte 0x3F3F2900 + .asciz "??(??)" .asciz "PhazonHealingNodule" .asciz "Omega Pirate" - .byte 0x42, 0x75, 0x72 - .asciz "rower" - .byte 0x53, 0x65 - .asciz "edling" - .byte 0x54 - .asciz "ryclops" + .asciz "Burrower" + .asciz "Seedling" + .asciz "Tryclops" .asciz "Puffer" - .byte 0x52 - .asciz "idley" - .byte 0x49, 0x63 - .asciz "eZoomer" + .asciz "Ridley" + .asciz "IceZoomer" .asciz "Atomic Beta" - .4byte 0x00476565 - .4byte 0x6D657200 + .asciz "" + .asciz "Geemer" .asciz "Oculus" - .byte 0x4D - .asciz "agdolite" - .byte 0x45, 0x6C, 0x69 - .asciz "te Pirate" - .byte 0x45, 0x79 - .asciz "eball" - .byte 0x42, 0x61 - .asciz "bygoth" - .byte 0x54 - .asciz "hardus Rock Projectile" - .byte 0x46 - .asciz "laahgra Tenticle" - .byte 0x54, 0x68, 0x61 - .asciz "rdus" - .byte 0x4A, 0x65, 0x6C - .asciz "lyZap" - .byte 0x44, 0x72 - .4byte 0x6F6E6500 + .asciz "Magdolite" + .asciz "Elite Pirate" + .asciz "Eyeball" + .asciz "Babygoth" + .asciz "Thardus Rock Projectile" + .asciz "Flaahgra Tenticle" + .asciz "Thardus" + .asciz "JellyZap" + .asciz "Drone" .asciz "Ice Sheegoth" - .byte 0x4D, 0x65, 0x74 - .asciz "roid" - .byte 0x52, 0x69, 0x70 - .4byte 0x70657200 + .asciz "Metroid" + .asciz "Ripper" .asciz "Parasite" - .byte 0x46, 0x6C, 0x61 - .asciz "ahgra" - .byte 0x4E, 0x65 - .asciz "wIntroBoss" - .byte 0x4D - .asciz "etaree" - .byte 0x53 - .asciz "pankWeed" - .byte 0x46, 0x69, 0x72 - .asciz "eFlea" - .byte 0x47, 0x61 - .asciz "mma Puddle Toad" + .asciz "Flaahgra" + .asciz "NewIntroBoss" + .asciz "Metaree" + .asciz "SpankWeed" + .asciz "FireFlea" + .asciz "Gamma Puddle Toad" .asciz "Puddle Spore" - .byte 0x43, 0x68, 0x6F - .asciz "zo Ghost" - .byte 0x46, 0x6C, 0x69 - .asciz "ckerBat" + .asciz "Chozo Ghost" + .asciz "FlickerBat" .asciz "Blood Flower" - .byte 0x46, 0x6C, 0x79 - .asciz "ingPirate" - .byte 0x53, 0x70 - .asciz "ace Pirate" - .byte 0x53 - .asciz "pace pirate <" - .byte 0x3E, 0x20 - .asciz "has AnimationInformation property with invalid character selected.\n" + .asciz "FlyingPirate" + .asciz "Space Pirate" + .asciz "Space pirate <" + .asciz "> has AnimationInformation property with invalid character selected.\n" .asciz "ERROR: Actor/Ai keyframe '" - .byte 0x27 - .asciz " not loaded because it has no valid animation selected.\n" - .byte 0x57, 0x61, 0x72 - .asciz "wasp" - .byte 0x42, 0x65, 0x65 - .4byte 0x746C6500 - .4byte 0 - + .asciz "' not loaded because it has no valid animation selected.\n" + .asciz "Warwasp" + .asciz "Beetle" + .balign 4 diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index 5e565384..bfb5b4a2 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC0A0 lbl_803EC0A0: @@ -200,6 +201,7 @@ lbl_803EC370: .section .sdata +.balign 8 .global lbl_805A85E8 lbl_805A85E8: @@ -1376,6 +1378,7 @@ sub_802a027c: /* 802A0334 0029D294 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADE18 lbl_805ADE18: # ROM: 0x3FA6B8 @@ -1404,6 +1407,7 @@ lbl_805ADE28: .section .rodata +.balign 8 .global lbl_803D5EB8 lbl_803D5EB8: # ROM: 0x3D2EB8 diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index 9fc56e41..d332b384 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E9990 lbl_803E9990: @@ -35,6 +36,7 @@ lbl_803E9990: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8390 lbl_805A8390: @@ -713,6 +715,7 @@ lbl_8025D4F4: /* 8025D5B0 0025A510 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD718 lbl_805AD718: # ROM: 0x3F9FB8 @@ -740,6 +743,7 @@ lbl_805AD728: .section .rodata +.balign 8 .global lbl_803D5230 lbl_803D5230: # ROM: 0x3D2230 diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s index c7fff503..2b8ca78e 100644 --- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s +++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5758 lbl_803E5758: @@ -65,6 +66,7 @@ lbl_803E57C4: .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType .section .sdata +.balign 8 .global lbl_805A7D48 lbl_805A7D48: @@ -6163,6 +6165,7 @@ lbl_801D378C: /* 801D3840 001D07A0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC8D0 lbl_805AC8D0: # ROM: 0x3F9170 @@ -6283,6 +6286,7 @@ lbl_805AC938: .section .rodata +.balign 8 .global lbl_803D1B70 lbl_803D1B70: # ROM: 0x3CEB70 diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index 4ba119d2..e3f9799a 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E0D70 lbl_803E0D70: @@ -35,6 +36,7 @@ lbl_803E0D70: .4byte 0 .section .sdata +.balign 8 .global lbl_805A76E8 lbl_805A76E8: @@ -43,12 +45,14 @@ lbl_805A76E8: .4byte 0 .section .bss +.balign 8 .global lbl_8046C738 lbl_8046C738: .skip 0x10 .section .sbss +.balign 8 # CHudBillboardEffect .global lbl_805A8F70 @@ -62,6 +66,7 @@ lbl_805A8F78: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AB658 lbl_805AB658: @@ -687,6 +692,7 @@ lbl_801302E0: /* 801302F0 0012D250 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D0048 lbl_803D0048: # ROM: 0x3CD048 diff --git a/asm/MetroidPrime/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s index 3f77ebe4..913fb7a9 100644 --- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s +++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E70E8 lbl_803E70E8: @@ -35,6 +36,7 @@ lbl_803E70E8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8070 lbl_805A8070: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActor.s b/asm/MetroidPrime/ScriptObjects/CScriptActor.s index 0450dc08..8a737ea7 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA450 lbl_803DA450: @@ -41,6 +42,7 @@ lbl_803DA450: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA5D0 lbl_805AA5D0: @@ -989,6 +991,7 @@ lbl_80075C1C: /* 80075C5C 00072BBC 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD5E8 lbl_803CD5E8: # ROM: 0x3CA5E8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s index 37b103dd..8b124d24 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFE20 lbl_803DFE20: @@ -23,6 +24,7 @@ lbl_803DFE40: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB0C0 lbl_805AB0C0: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s index 0a088c38..7b70b02d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2D08 lbl_803E2D08: @@ -961,6 +962,7 @@ lbl_80154754: /* 80154764 001516C4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABB18 lbl_805ABB18: # ROM: 0x3F83B8 @@ -973,6 +975,7 @@ lbl_805ABB1C: .section .rodata +.balign 8 .global lbl_803D01F0 lbl_803D01F0: # ROM: 0x3CD1F0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s index b72a138c..088c2a46 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6398 lbl_803E6398: @@ -35,6 +36,7 @@ lbl_803E6398: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7E28 lbl_805A7E28: @@ -344,6 +346,7 @@ lbl_801EF5B4: /* 801EF600 001EC560 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACB60 lbl_805ACB60: # ROM: 0x3F9400 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s index b36a52b8..ff91b980 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E52F8 lbl_803E52F8: @@ -182,6 +183,7 @@ __ct__21CScriptAreaAttributesF9TUniqueIdRC11CEntityInfob10EEnvFxTypeffffi11EPhaz /* 801BD698 001BA5F8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D19F0 lbl_803D19F0: # ROM: 0x3CE9F0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s index d9466303..e72f15b5 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3E80 lbl_803E3E80: @@ -481,6 +482,7 @@ calculate_ball_aabox__Fv: /* 80176B28 00173A88 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABED0 lbl_805ABED0: # ROM: 0x3F8770 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s index 5baa9f9e..027d42ba 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EB180 lbl_803EB180: @@ -412,6 +413,7 @@ lbl_8027C950: /* 8027CB34 00279A94 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D5868 lbl_803D5868: # ROM: 0x3D2868 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s index 57ee283f..a5e5c1e1 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFCA0 lbl_803DFCA0: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s index 848c6ec2..3a8c095b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFC80 lbl_803DFC80: @@ -15,6 +16,7 @@ lbl_803DFC80: .4byte SetActive__7CEntityFb .section .sdata2, "a" +.balign 8 .global lbl_805AADE8 lbl_805AADE8: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s index b26e8905..05548142 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF688 lbl_803DF688: @@ -33,7 +34,15 @@ lbl_803DF688: .4byte GetSortingBounds__6CActorCFRC12CTransform4f .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType +.global lbl_803DF6F4 +lbl_803DF6F4: + # ROM: 0x3DC6F4 + .4byte 0 + .4byte 0 + .4byte __dt__11CCameraHintFv + .section .sdata +.balign 8 .global lbl_805A7298 lbl_805A7298: @@ -42,6 +51,7 @@ lbl_805A7298: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AAB40 lbl_805AAB40: @@ -842,3 +852,70 @@ lbl_800C4EF4: /* 800C5180 000C20E0 7C 08 03 A6 */ mtlr r0 /* 800C5184 000C20E4 38 21 01 F0 */ addi r1, r1, 0x1f0 /* 800C5188 000C20E8 4E 80 00 20 */ blr + +.global __dt__11CCameraHintFv +__dt__11CCameraHintFv: +/* 800C518C 000C20EC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 800C5190 000C20F0 7C 08 02 A6 */ mflr r0 +/* 800C5194 000C20F4 90 01 00 14 */ stw r0, 0x14(r1) +/* 800C5198 000C20F8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 800C519C 000C20FC 7C 7F 1B 79 */ or. r31, r3, r3 +/* 800C51A0 000C2100 41 82 00 1C */ beq lbl_800C51BC +/* 800C51A4 000C2104 3C A0 80 3E */ lis r5, lbl_803DF6F4@ha +/* 800C51A8 000C2108 7C 80 07 35 */ extsh. r0, r4 +/* 800C51AC 000C210C 38 05 F6 F4 */ addi r0, r5, lbl_803DF6F4@l +/* 800C51B0 000C2110 90 1F 00 00 */ stw r0, 0(r31) +/* 800C51B4 000C2114 40 81 00 08 */ ble lbl_800C51BC +/* 800C51B8 000C2118 48 25 07 79 */ bl Free__7CMemoryFPCv +lbl_800C51BC: +/* 800C51BC 000C211C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 800C51C0 000C2120 7F E3 FB 78 */ mr r3, r31 +/* 800C51C4 000C2124 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 800C51C8 000C2128 7C 08 03 A6 */ mtlr r0 +/* 800C51CC 000C212C 38 21 00 10 */ addi r1, r1, 0x10 +/* 800C51D0 000C2130 4E 80 00 20 */ blr + +.global __ct__11CCameraHintFiQ211CBallCamera20EBallCameraBehaviourfffRC9CVector3fRC9CVector3fRC9CVector3fffffffffff +__ct__11CCameraHintFiQ211CBallCamera20EBallCameraBehaviourfffRC9CVector3fRC9CVector3fRC9CVector3fffffffffff: +/* 800C51D4 000C2134 3D 20 80 3E */ lis r9, lbl_803DF6F4@ha +/* 800C51D8 000C2138 C1 A1 00 08 */ lfs f13, 8(r1) +/* 800C51DC 000C213C 38 09 F6 F4 */ addi r0, r9, lbl_803DF6F4@l +/* 800C51E0 000C2140 C1 81 00 0C */ lfs f12, 0xc(r1) +/* 800C51E4 000C2144 90 03 00 00 */ stw r0, 0(r3) +/* 800C51E8 000C2148 C1 61 00 10 */ lfs f11, 0x10(r1) +/* 800C51EC 000C214C 90 83 00 04 */ stw r4, 4(r3) +/* 800C51F0 000C2150 C1 41 00 14 */ lfs f10, 0x14(r1) +/* 800C51F4 000C2154 90 A3 00 08 */ stw r5, 8(r3) +/* 800C51F8 000C2158 C1 21 00 18 */ lfs f9, 0x18(r1) +/* 800C51FC 000C215C D0 23 00 0C */ stfs f1, 0xc(r3) +/* 800C5200 000C2160 D0 43 00 10 */ stfs f2, 0x10(r3) +/* 800C5204 000C2164 D0 63 00 14 */ stfs f3, 0x14(r3) +/* 800C5208 000C2168 C0 06 00 00 */ lfs f0, 0(r6) +/* 800C520C 000C216C D0 03 00 18 */ stfs f0, 0x18(r3) +/* 800C5210 000C2170 C0 06 00 04 */ lfs f0, 4(r6) +/* 800C5214 000C2174 D0 03 00 1C */ stfs f0, 0x1c(r3) +/* 800C5218 000C2178 C0 06 00 08 */ lfs f0, 8(r6) +/* 800C521C 000C217C D0 03 00 20 */ stfs f0, 0x20(r3) +/* 800C5220 000C2180 C0 07 00 00 */ lfs f0, 0(r7) +/* 800C5224 000C2184 D0 03 00 24 */ stfs f0, 0x24(r3) +/* 800C5228 000C2188 C0 07 00 04 */ lfs f0, 4(r7) +/* 800C522C 000C218C D0 03 00 28 */ stfs f0, 0x28(r3) +/* 800C5230 000C2190 C0 07 00 08 */ lfs f0, 8(r7) +/* 800C5234 000C2194 D0 03 00 2C */ stfs f0, 0x2c(r3) +/* 800C5238 000C2198 C0 08 00 00 */ lfs f0, 0(r8) +/* 800C523C 000C219C D0 03 00 30 */ stfs f0, 0x30(r3) +/* 800C5240 000C21A0 C0 08 00 04 */ lfs f0, 4(r8) +/* 800C5244 000C21A4 D0 03 00 34 */ stfs f0, 0x34(r3) +/* 800C5248 000C21A8 C0 08 00 08 */ lfs f0, 8(r8) +/* 800C524C 000C21AC D0 03 00 38 */ stfs f0, 0x38(r3) +/* 800C5250 000C21B0 D0 83 00 3C */ stfs f4, 0x3c(r3) +/* 800C5254 000C21B4 D0 A3 00 40 */ stfs f5, 0x40(r3) +/* 800C5258 000C21B8 D0 C3 00 44 */ stfs f6, 0x44(r3) +/* 800C525C 000C21BC D0 E3 00 48 */ stfs f7, 0x48(r3) +/* 800C5260 000C21C0 D1 03 00 4C */ stfs f8, 0x4c(r3) +/* 800C5264 000C21C4 D1 A3 00 50 */ stfs f13, 0x50(r3) +/* 800C5268 000C21C8 D1 83 00 54 */ stfs f12, 0x54(r3) +/* 800C526C 000C21CC D1 63 00 58 */ stfs f11, 0x58(r3) +/* 800C5270 000C21D0 D1 43 00 5C */ stfs f10, 0x5c(r3) +/* 800C5274 000C21D4 D1 23 00 60 */ stfs f9, 0x60(r3) +/* 800C5278 000C21D8 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s index 2996c7d2..3221d111 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8C40 lbl_803E8C40: @@ -35,6 +36,7 @@ lbl_803E8C40: .4byte 0 .section .sdata +.balign 8 .global lbl_805A82C8 lbl_805A82C8: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s index e7bdfe45..8b176964 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CScriptCameraPitchVolume_cpp .section .data +.balign 8 .global lbl_803E7A70 lbl_803E7A70: @@ -39,6 +40,7 @@ lbl_803E7A70: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8120 lbl_805A8120: @@ -399,6 +401,7 @@ __sinit_CScriptCameraPitchVolume_cpp: /* 802269B8 00223918 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD1D8 lbl_805AD1D8: # ROM: 0x3F9A78 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s index 4a84e556..dcb6de1f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFE00 lbl_803DFE00: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s index d1d8695f..0e130fc1 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF348 lbl_803DF348: @@ -35,6 +36,7 @@ lbl_803DF348: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7210 lbl_805A7210: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s index fb590a98..a1205877 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6BB0 lbl_803E6BB0: # ROM: 0x3E3BB0 @@ -14,6 +15,7 @@ lbl_803E6BB0: .4byte SetActive__7CEntityFb .section .sdata +.balign 8 .global lbl_805A7F00 lbl_805A7F00: @@ -1227,6 +1229,7 @@ lbl_80201B54: /* 80201D0C 001FEC6C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACD50 lbl_805ACD50: # ROM: 0x3F95F0 @@ -1246,6 +1249,7 @@ lbl_805ACD60: .section .rodata +.balign 8 .global lbl_803D2580 lbl_803D2580: # ROM: 0x3CF580 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s index 6822bdd3..4d326608 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5C20 lbl_803E5C20: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCounter.s b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s index 19617ff6..3a4bc9e1 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCounter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DAEF0 lbl_803DAEF0: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s index 778d2f96..5cc6f0a8 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E0BF8 lbl_803E0BF8: @@ -35,6 +36,7 @@ lbl_803E0BF8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A76A8 lbl_805A76A8: @@ -43,6 +45,7 @@ lbl_805A76A8: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB5B8 lbl_805AB5B8: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s index 2d37944b..1f88b954 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFD08 lbl_803DFD08: @@ -35,6 +36,7 @@ lbl_803DFD08: .4byte 0 .section .sdata +.balign 8 .global lbl_805A74B0 lbl_805A74B0: @@ -83,6 +85,7 @@ lbl_805A74D0: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB058 lbl_805AB058: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s index c0683b62..f0fbfaee 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFD78 lbl_803DFD78: @@ -41,6 +42,7 @@ lbl_803DFD78: .4byte 0 .section .sdata +.balign 8 .global lbl_805A74D8 lbl_805A74D8: @@ -169,6 +171,7 @@ lbl_805A7538: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB080 lbl_805AB080: @@ -2784,6 +2787,7 @@ lbl_800FDD64: /* 800FDDDC 000FAD3C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CEDF8 lbl_803CEDF8: # ROM: 0x3CBDF8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s index a2813697..773b7281 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E23C8 lbl_803E23C8: # ROM: 0x3DF3C8 @@ -34,6 +35,7 @@ lbl_803E23C8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A77A8 lbl_805A77A8: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s index 3d8a85f6..7399ce50 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E27B0 lbl_803E27B0: @@ -280,6 +281,7 @@ lbl_8014D380: /* 8014D3C0 0014A320 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABA40 lbl_805ABA40: # ROM: 0x3F82E0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s index b8d9c0fd..22424b63 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF580 lbl_803DF580: @@ -77,6 +78,7 @@ lbl_803DF604: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7288 lbl_805A7288: @@ -99,6 +101,7 @@ lbl_805A7294: .4byte 0x00000030 .section .sdata2, "a" +.balign 8 .global lbl_805AAB30 lbl_805AAB30: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s index 90283388..c8a86451 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2B48 lbl_803E2B48: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s index 25c18215..daa058bf 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DAA78 lbl_803DAA78: @@ -77,6 +78,7 @@ lbl_803DAAFC: .4byte lbl_8007E8B8 .section .sdata +.balign 8 .global lbl_805A6FF0 lbl_805A6FF0: @@ -115,6 +117,7 @@ lbl_805A7008: .4byte 0 .section .sbss +.balign 8 # CScriptDoor .global lbl_805A8E40 @@ -125,6 +128,7 @@ lbl_805A8E44: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA688 lbl_805AA688: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s index dded203f..73178342 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E4400 lbl_803E4400: @@ -35,6 +36,7 @@ lbl_803E4400: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7AB0 lbl_805A7AB0: @@ -581,6 +583,7 @@ lbl_8018F18C: /* 8018F360 0018C2C0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC1B0 lbl_805AC1B0: # ROM: 0x3F8A50 @@ -589,6 +592,7 @@ lbl_805AC1B0: .section .rodata +.balign 8 .global lbl_803D0940 lbl_803D0940: # ROM: 0x3CD940 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 8c91bc80..82291d67 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DAC38 lbl_803DAC38: @@ -49,6 +50,7 @@ lbl_803DACB0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7110 lbl_805A7110: @@ -67,6 +69,7 @@ lbl_805A7118: .4byte 0 .section .sbss +.balign 8 # CScriptEffect .global lbl_805A8E58 @@ -77,6 +80,7 @@ lbl_805A8E5C: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA7E0 lbl_805AA7E0: @@ -2383,6 +2387,7 @@ lbl_8008FAC4: /* 8008FAEC 0008CA4C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD690 lbl_803CD690: # ROM: 0x3CA690 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s index 447471dc..7da2636c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF328 lbl_803DF328: @@ -15,6 +16,7 @@ lbl_803DF328: .4byte SetActive__7CEntityFb .section .sdata2, "a" +.balign 8 .global lbl_805AAA00 lbl_805AAA00: @@ -933,6 +935,7 @@ lbl_800B51AC: /* 800B51C4 000B2124 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CDE78 lbl_803CDE78: # ROM: 0x3CAE78 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s index 40b86d5b..0115bf0f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E0D00 lbl_803E0D00: @@ -35,6 +36,7 @@ lbl_803E0D00: .4byte 0 .section .sdata +.balign 8 .global lbl_805A76E0 lbl_805A76E0: @@ -43,6 +45,7 @@ lbl_805A76E0: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB650 lbl_805AB650: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s index b1d85789..f7b48701 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CScriptGunTurret_cpp .section .data +.balign 8 .global lbl_803E71D0 lbl_803E71D0: @@ -119,6 +120,7 @@ lbl_803E72A4: .4byte 0 .section .sdata +.balign 8 .global lbl_805A80A0 lbl_805A80A0: @@ -191,6 +193,7 @@ lbl_805A80D4: .4byte 0x00000014 .section .sbss, "wa" +.balign 8 .global lbl_805A90C0 lbl_805A90C0: @@ -7088,6 +7091,7 @@ __sinit_CScriptGunTurret_cpp: /* 8021BC94 00218BF4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD068 lbl_805AD068: # ROM: 0x3F9908 @@ -7260,6 +7264,7 @@ lbl_805AD0F8: .section .rodata +.balign 8 .global lbl_803D2908 lbl_803D2908: # ROM: 0x3CF908 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s index 34c60c72..99633c6d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFBF0 lbl_803DFBF0: @@ -15,6 +16,7 @@ lbl_803DFBF0: .4byte SetActive__7CEntityFb .section .sdata +.balign 8 .global lbl_805A7360 lbl_805A7360: @@ -23,6 +25,7 @@ lbl_805A7360: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AAD38 lbl_805AAD38: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s index 7ad1359e..f395b732 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EB658 lbl_803EB658: @@ -2374,6 +2375,7 @@ sub_8028a918: /* 8028A9C8 00287928 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADB80 lbl_805ADB80: # ROM: 0x3FA420 @@ -2386,6 +2388,7 @@ lbl_805ADB84: .section .rodata +.balign 8 .global lbl_803D5980 lbl_803D5980: # ROM: 0x3D2980 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s index d922a9ff..0b29f45e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E86E8 lbl_803E86E8: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s index 98885c9d..1dda4a7e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E7048 lbl_803E7048: @@ -360,6 +361,7 @@ Accept__11CScriptMidiFR8IVisitor: /* 8020BE18 00208D78 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACEC8 lbl_805ACEC8: # ROM: 0x3F9768 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s index 601bdae0..e2e0b02e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF4F8 lbl_803DF4F8: @@ -41,6 +42,7 @@ lbl_803DF4F8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7280 lbl_805A7280: @@ -53,6 +55,7 @@ lbl_805A7284: .float 2.0 .section .sdata2, "a" +.balign 8 .global lbl_805AAAE8 lbl_805AAAE8: @@ -1116,6 +1119,7 @@ lbl_800C3410: /* 800C3444 000C03A4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE020 lbl_803CE020: # ROM: 0x3CB020 @@ -1126,7 +1130,4 @@ lbl_803CE020: .asciz "G_AllPickupsFound_2" .asciz "STRG_AllPickupsFound_1" .balign 4 - .4byte 0 - .4byte 0x00000001 - .4byte 0x00000002 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s index f9f119e4..26811d46 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3618 lbl_803E3618: @@ -15,6 +16,7 @@ lbl_803E3618: .4byte SetActive__7CEntityFb .section .sdata +.balign 8 .global lbl_805A78A0 lbl_805A78A0: @@ -903,6 +905,7 @@ lbl_8015EAB4: /* 8015EACC 0015BA2C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABC48 lbl_805ABC48: # ROM: 0x3F84E8 @@ -962,6 +965,7 @@ lbl_805ABC78: .section .rodata +.balign 8 .global lbl_803D0390 lbl_803D0390: # ROM: 0x3CD390 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s index 460029fc..8a3f1f3b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF220 lbl_803DF220: @@ -77,6 +78,7 @@ lbl_803DF2AC: .4byte lbl_800B2238 .section .sdata +.balign 8 .global lbl_805A71F0 lbl_805A71F0: @@ -119,6 +121,7 @@ lbl_805A720C: .4byte 0x00000031 .section .sdata2, "a" +.balign 8 .global lbl_805AA9C8 lbl_805AA9C8: @@ -4202,6 +4205,7 @@ lbl_800B44E4: /* 800B44F4 000B1454 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CDE70 lbl_803CDE70: # ROM: 0x3CAE70 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s index 3f58c26a..ed043a36 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E4BE0 lbl_803E4BE0: @@ -81,6 +82,7 @@ lbl_803E4C64: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7C38 lbl_805A7C38: @@ -2344,6 +2346,7 @@ lbl_801AC1DC: /* 801AC20C 001A916C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC558 lbl_805AC558: # ROM: 0x3F8DF8 @@ -2411,6 +2414,7 @@ lbl_805AC588: .section .rodata +.balign 8 .global lbl_803D14B8 lbl_803D14B8: # ROM: 0x3CE4B8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s index 32c3ad96..e71c9307 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E32D8 lbl_803E32D8: @@ -35,6 +36,7 @@ lbl_803E32D8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7870 lbl_805A7870: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s index c5fcc134..6e9f1d65 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5CC0 lbl_803E5CC0: # ROM: 0x3E2CC0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s index 2f92cfb5..93a838fc 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3638 lbl_803E3638: @@ -35,6 +36,7 @@ lbl_803E3638: .4byte 0 .section .sdata +.balign 8 .global lbl_805A78A8 lbl_805A78A8: @@ -300,6 +302,7 @@ lbl_8015ED18: /* 8015EE4C 0015BDAC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABC80 lbl_805ABC80: # ROM: 0x3F8520 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s index f57cbf41..5574817d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC030 lbl_803EC030: @@ -483,6 +484,7 @@ lbl_8029F2B0: /* 8029F314 0029C274 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADE08 lbl_805ADE08: # ROM: 0x3FA6A8 @@ -500,6 +502,7 @@ lbl_805ADE10: .section .rodata +.balign 8 .global lbl_803D5EB0 lbl_803D5EB0: # ROM: 0x3D2EB0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s index 0fd87f2c..9b7cbb57 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF870 lbl_803DF870: @@ -15,6 +16,7 @@ lbl_803DF870: .4byte SetActive__7CEntityFb .section .sdata +.balign 8 .global lbl_805A7330 lbl_805A7330: @@ -27,6 +29,7 @@ lbl_805A7334: .4byte 0x00000064 .section .sdata2, "a" +.balign 8 .global lbl_805AACC8 lbl_805AACC8: @@ -595,6 +598,7 @@ lbl_800E2EC0: /* 800E2ED8 000DFE38 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE5C8 lbl_803CE5C8: # ROM: 0x3CB5C8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s index 1b014c3a..ea93ffcd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF830 lbl_803DF830: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s index 2420669c..35e8ca23 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3E28 lbl_803E3E28: @@ -208,6 +209,7 @@ lbl_80175168: /* 801751A4 00172104 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABE90 lbl_805ABE90: # ROM: 0x3F8730 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s index 13b4f5a5..367226af 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CScriptRoomAcoustics_cpp .section .data +.balign 8 .global lbl_803E4708 lbl_803E4708: @@ -19,6 +20,7 @@ lbl_803E4708: .4byte SetActive__7CEntityFb .section .sbss, "wa" +.balign 8 .global lbl_805A9048 lbl_805A9048: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index 64b23656..da5cc8f2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF128 lbl_803DF128: @@ -73,6 +74,7 @@ lbl_803DF194: .4byte lbl_800B0510 .section .sdata +.balign 8 .global lbl_805A71E0 lbl_805A71E0: @@ -91,12 +93,14 @@ lbl_805A71E8: .4byte 0 .section .bss +.balign 8 .global lbl_8046C438 lbl_8046C438: .skip 0x18 .section .sbss +.balign 8 # CScriptSound .global lbl_805A8E90 @@ -119,6 +123,7 @@ lbl_805A8EA1: .skip 0x7 .section .sdata2, "a" +.balign 8 .global lbl_805AA9A0 lbl_805AA9A0: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s index eda15627..48fb74eb 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF850 lbl_803DF850: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index 4fa18f4f..e4cbcbbd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2B68 lbl_803E2B68: @@ -119,6 +120,7 @@ lbl_803E2CA0: .4byte lbl_80152B58 .section .sdata +.balign 8 .global lbl_805A7808 lbl_805A7808: @@ -5320,6 +5322,7 @@ lbl_80153A0C: /* 80153A28 00150988 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABAB8 lbl_805ABAB8: # ROM: 0x3F8358 @@ -5425,6 +5428,7 @@ lbl_805ABB10: .section .rodata +.balign 8 .global lbl_803D01B8 lbl_803D01B8: # ROM: 0x3CD1B8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s index 42da698a..e1603b1c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E2438 lbl_803E2438: @@ -35,6 +36,7 @@ lbl_803E2438: .4byte 0 .section .sdata +.balign 8 .global lbl_805A77B0 lbl_805A77B0: @@ -283,6 +285,7 @@ lbl_8014AF00: /* 8014B0BC 0014801C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABA00 lbl_805ABA00: # ROM: 0x3F82A0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s index dc5b00b6..dff27bfc 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E02C8 lbl_803E02C8: @@ -35,6 +36,7 @@ lbl_803E02C8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7620 lbl_805A7620: @@ -43,6 +45,7 @@ lbl_805A7620: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB388 lbl_805AB388: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s index 272b5036..cb1bad58 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CScriptSpindleCamera_cpp .section .data +.balign 8 .global lbl_803E8670 lbl_803E8670: @@ -41,6 +42,7 @@ lbl_803E8670: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8270 lbl_805A8270: @@ -83,12 +85,14 @@ lbl_805A828C: .float 1.0 .section .bss +.balign 8 .global lbl_8046D390 lbl_8046D390: .skip 0x18 .section .sbss, "wa" +.balign 8 .global lbl_805A90F8 lbl_805A90F8: @@ -2093,6 +2097,7 @@ __sinit_CScriptSpindleCamera_cpp: /* 802418EC 0023E84C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD4F0 lbl_805AD4F0: # ROM: 0x3F9D90 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s index 755284b0..d1e060b6 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E3DA8 lbl_803E3DA8: @@ -328,6 +329,7 @@ lbl_80174EC4: /* 80174F10 00171E70 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABE70 lbl_805ABE70: # ROM: 0x3F8710 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s index 6af1e824..813b6214 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E7068 lbl_803E7068: @@ -797,6 +798,7 @@ sub_8020c844: /* 8020C850 002097B0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACED8 lbl_805ACED8: # ROM: 0x3F9778 @@ -805,6 +807,7 @@ lbl_805ACED8: .section .rodata +.balign 8 .global lbl_803D2778 lbl_803D2778: # ROM: 0x3CF778 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s index d0a19609..cc43f334 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5C40 lbl_803E5C40: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s index 9a4db44d..c4a9549a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E4330 lbl_803E4330: @@ -35,6 +36,7 @@ lbl_803E4330: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7AA8 lbl_805A7AA8: @@ -223,6 +225,7 @@ Accept__21CScriptTargetingPointFR8IVisitor: /* 8018D4B8 0018A418 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC180 lbl_805AC180: # ROM: 0x3F8A20 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTimer.s b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s index 060349a0..34e26519 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTimer.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DADD8 lbl_803DADD8: @@ -15,6 +16,7 @@ lbl_803DADD8: .4byte SetActive__7CEntityFb .section .sdata2, "a" +.balign 8 .global lbl_805AA850 lbl_805AA850: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index 0128b192..dd9e31b5 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA4D8 lbl_803DA4D8: @@ -39,6 +40,7 @@ lbl_803DA4D8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6F90 lbl_805A6F90: @@ -51,6 +53,7 @@ lbl_805A6F94: .4byte 0x00000022 .section .sbss +.balign 8 # CScriptTrigger .global lbl_805A8E00 @@ -61,6 +64,7 @@ lbl_805A8E04: .skip 0xC .section .sdata2, "a" +.balign 8 .global lbl_805AA5F0 lbl_805AA5F0: @@ -1485,6 +1489,7 @@ lbl_8007704C: /* 80077068 00073FC8 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD5F8 lbl_803CD5F8: # ROM: 0x3CA5F8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s index cd182a8e..aa8ac8c6 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5830 lbl_803E5830: @@ -35,6 +36,7 @@ lbl_803E5830: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7D78 lbl_805A7D78: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s index 6177a8c6..8cf3e0f2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E58C0 lbl_803E58C0: @@ -35,6 +36,7 @@ lbl_803E58C0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7D80 lbl_805A7D80: @@ -708,6 +710,7 @@ lbl_801D78EC: /* 801D7918 001D4878 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC970 lbl_805AC970: # ROM: 0x3F9210 @@ -750,6 +753,7 @@ lbl_805AC98C: .section .rodata +.balign 8 .global lbl_803D1B90 lbl_803D1B90: # ROM: 0x3CEB90 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s index 39983d3c..67ac4cd7 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFE70 lbl_803DFE70: @@ -39,6 +40,7 @@ lbl_803DFE70: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7548 lbl_805A7548: @@ -61,12 +63,14 @@ lbl_805A7554: .4byte 0x00000007 .section .bss +.balign 8 .global lbl_8046C520 lbl_8046C520: .skip 0x18 .section .sbss +.balign 8 # CScriptWater .global lbl_805A8F08 @@ -74,6 +78,7 @@ lbl_805A8F08: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AB0D8 lbl_805AB0D8: @@ -3653,6 +3658,7 @@ lbl_80101EE0: /* 80101EFC 000FEE5C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CEE20 lbl_803CEE20: # ROM: 0x3CBE20 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s index d33c4b4d..760aacdb 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA558 lbl_803DA558: @@ -35,6 +36,7 @@ lbl_803DA558: .4byte 0 .section .sdata +.balign 8 .global lbl_805A6F98 lbl_805A6F98: @@ -43,6 +45,7 @@ lbl_805A6F98: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA600 lbl_805AA600: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s index c7fe31eb..543a95de 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E58A0 lbl_803E58A0: @@ -506,6 +507,7 @@ lbl_801D6BA8: /* 801D6FC0 001D3F20 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC960 lbl_805AC960: # ROM: 0x3F9200 diff --git a/asm/MetroidPrime/TCastTo.s b/asm/MetroidPrime/TCastTo.s index cbcccda1..35d9d6ae 100644 --- a/asm/MetroidPrime/TCastTo.s +++ b/asm/MetroidPrime/TCastTo.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DBF60 lbl_803DBF60: diff --git a/asm/MetroidPrime/TGameTypes.s b/asm/MetroidPrime/TGameTypes.s index b46af0b2..e62a9dfb 100644 --- a/asm/MetroidPrime/TGameTypes.s +++ b/asm/MetroidPrime/TGameTypes.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_TGameTypes_cpp .section .sbss +.balign 8 # TGameTypes .global kInvalidEditorId diff --git a/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s b/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s index e90e9cea..6514b4fb 100644 --- a/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s +++ b/asm/MetroidPrime/Tweaks/CTweakAutoMapper.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF438 lbl_803DF438: @@ -11,6 +12,7 @@ lbl_803DF438: .4byte 0 .section .sbss +.balign 8 # CGameArea or CMApWorld .global lbl_805A8EB0 @@ -18,6 +20,7 @@ lbl_805A8EB0: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AAA28 lbl_805AAA28: diff --git a/asm/MetroidPrime/Tweaks/CTweakBall.s b/asm/MetroidPrime/Tweaks/CTweakBall.s index 45cef0de..9e29bf16 100644 --- a/asm/MetroidPrime/Tweaks/CTweakBall.s +++ b/asm/MetroidPrime/Tweaks/CTweakBall.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DAD30 lbl_803DAD30: @@ -11,6 +12,7 @@ lbl_803DAD30: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA810 lbl_805AA810: diff --git a/asm/MetroidPrime/Tweaks/CTweakGame.s b/asm/MetroidPrime/Tweaks/CTweakGame.s index 170a17d7..1d4656d1 100644 --- a/asm/MetroidPrime/Tweaks/CTweakGame.s +++ b/asm/MetroidPrime/Tweaks/CTweakGame.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9CD0 lbl_803D9CD0: # ROM: 0x3D6CD0 diff --git a/asm/MetroidPrime/Tweaks/CTweakGui.s b/asm/MetroidPrime/Tweaks/CTweakGui.s index 501b2099..750bc1c7 100644 --- a/asm/MetroidPrime/Tweaks/CTweakGui.s +++ b/asm/MetroidPrime/Tweaks/CTweakGui.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA440 lbl_803DA440: @@ -11,6 +12,7 @@ lbl_803DA440: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA590 lbl_805AA590: diff --git a/asm/MetroidPrime/Tweaks/CTweakGuiColors.s b/asm/MetroidPrime/Tweaks/CTweakGuiColors.s index ccf6615d..a655a68d 100644 --- a/asm/MetroidPrime/Tweaks/CTweakGuiColors.s +++ b/asm/MetroidPrime/Tweaks/CTweakGuiColors.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5748 lbl_803E5748: diff --git a/asm/MetroidPrime/Tweaks/CTweakGunRes.s b/asm/MetroidPrime/Tweaks/CTweakGunRes.s index d6fa3294..440eb09a 100644 --- a/asm/MetroidPrime/Tweaks/CTweakGunRes.s +++ b/asm/MetroidPrime/Tweaks/CTweakGunRes.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF4E8 lbl_803DF4E8: @@ -669,6 +670,7 @@ lbl_800BC268: /* 800BC2AC 000B920C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CDEC0 lbl_803CDEC0: # ROM: 0x3CAEC0 diff --git a/asm/MetroidPrime/Tweaks/CTweakParticle.s b/asm/MetroidPrime/Tweaks/CTweakParticle.s index 07ff16f6..1a2adf33 100644 --- a/asm/MetroidPrime/Tweaks/CTweakParticle.s +++ b/asm/MetroidPrime/Tweaks/CTweakParticle.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA088 lbl_803DA088: diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayer.s b/asm/MetroidPrime/Tweaks/CTweakPlayer.s index e3d1f283..167aee7c 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayer.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayer.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803D9CB8 lbl_803D9CB8: @@ -18,6 +19,7 @@ lbl_803D9CC4: .4byte 0 .section .sbss +.balign 8 # TOneStatic .global lbl_805A8CD0 @@ -28,6 +30,7 @@ lbl_805A8CD4: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AA118 lbl_805AA118: diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s b/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s index 38171228..40d9a647 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayerControl.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DA350 lbl_803DA350: diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s b/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s index fcd9c201..2a863884 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayerGun.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 lbl_803DA360: # ROM: 0x3D7360 @@ -21,6 +22,7 @@ lbl_803DA384: .4byte __dt__15CTweakPlayerGunFv .section .sdata +.balign 8 .global lbl_805A6F58 lbl_805A6F58: @@ -29,6 +31,7 @@ lbl_805A6F58: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AA538 lbl_805AA538: @@ -1027,6 +1030,7 @@ lbl_80070A54: /* 80070A94 0006D9F4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD290 lbl_803CD290: # ROM: 0x3CA290 diff --git a/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s b/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s index 1ebb96b8..886374b1 100644 --- a/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s +++ b/asm/MetroidPrime/Tweaks/CTweakPlayerRes.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E4CF8 lbl_803E4CF8: @@ -1132,6 +1133,7 @@ lbl_801AD0DC: /* 801AD11C 001AA07C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC590 lbl_805AC590: # ROM: 0x3F8E30 diff --git a/asm/MetroidPrime/Tweaks/CTweakSlideShow.s b/asm/MetroidPrime/Tweaks/CTweakSlideShow.s index 6e18baba..635ad889 100644 --- a/asm/MetroidPrime/Tweaks/CTweakSlideShow.s +++ b/asm/MetroidPrime/Tweaks/CTweakSlideShow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC000 lbl_803EC000: @@ -189,6 +190,7 @@ sub_8029c858: /* 8029C880 002997E0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADD58 lbl_805ADD58: # ROM: 0x3FA5F8 diff --git a/asm/MetroidPrime/Tweaks/CTweakTargeting.s b/asm/MetroidPrime/Tweaks/CTweakTargeting.s index a794ffc5..649adea3 100644 --- a/asm/MetroidPrime/Tweaks/CTweakTargeting.s +++ b/asm/MetroidPrime/Tweaks/CTweakTargeting.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF428 lbl_803DF428: @@ -11,6 +12,7 @@ lbl_803DF428: .4byte 0 .section .sbss +.balign 8 # CTweakTargeting .global lbl_805A8EA8 @@ -21,6 +23,7 @@ lbl_805A8EAC: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805AAA18 lbl_805AAA18: @@ -1148,6 +1151,7 @@ lbl_800B6990: /* 800B69B8 000B3918 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CDE80 lbl_803CDE80: # ROM: 0x3CAE80 diff --git a/asm/MetroidPrime/Tweaks/CTweaks.s b/asm/MetroidPrime/Tweaks/CTweaks.s index daccb849..5f642df1 100644 --- a/asm/MetroidPrime/Tweaks/CTweaks.s +++ b/asm/MetroidPrime/Tweaks/CTweaks.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_8045B180 lbl_8045B180: @@ -40,6 +41,7 @@ lbl_8045C208: .skip 0x310 .section .sbss +.balign 8 # CTweaks .global gpTweakPlayer @@ -1950,6 +1952,7 @@ lbl_800371A0: /* 800371E0 00034140 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CCD88 lbl_803CCD88: # ROM: 0x3C9D88 diff --git a/asm/MetroidPrime/Weapons/CAuxWeapon.s b/asm/MetroidPrime/Weapons/CAuxWeapon.s index b52dc0a5..791f1f92 100644 --- a/asm/MetroidPrime/Weapons/CAuxWeapon.s +++ b/asm/MetroidPrime/Weapons/CAuxWeapon.s @@ -1391,6 +1391,7 @@ __ct__10CAuxWeaponF9TUniqueId: /* 801B9C48 001B6BA8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC6D0 lbl_805AC6D0: # ROM: 0x3F8F70 @@ -1423,6 +1424,7 @@ lbl_805AC6E4: .section .rodata +.balign 8 .global lbl_803D1658 lbl_803D1658: # ROM: 0x3CE658 diff --git a/asm/MetroidPrime/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s index 15d767d6..39d82164 100644 --- a/asm/MetroidPrime/Weapons/CBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CBeamProjectile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E4648 lbl_803E4648: @@ -39,6 +40,7 @@ lbl_803E4648: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7B90 lbl_805A7B90: @@ -787,6 +789,7 @@ lbl_80199844: /* 80199890 001967F0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC3E8 lbl_805AC3E8: # ROM: 0x3F8C88 diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index f03be263..0f90a37d 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DACC0 lbl_803DACC0: @@ -35,6 +36,7 @@ lbl_803DACC0: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7120 lbl_805A7120: @@ -97,12 +99,14 @@ lbl_805A714C: .4byte 0x00000012 .section .bss +.balign 8 .global lbl_8046C420 lbl_8046C420: .skip 0x18 .section .sbss +.balign 8 # CBomb .global lbl_805A8E60 @@ -110,6 +114,7 @@ lbl_805A8E60: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AA800 lbl_805AA800: @@ -1258,6 +1263,7 @@ lbl_80090A7C: /* 80090B50 0008DAB0 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CD6A8 lbl_803CD6A8: # ROM: 0x3CA6A8 diff --git a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s index f098c2fd..b9a366bb 100644 --- a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E9118 lbl_803E9118: @@ -39,6 +40,7 @@ lbl_803E9118: .4byte 0 .section .sdata +.balign 8 .global lbl_805A82E8 lbl_805A82E8: @@ -747,6 +749,7 @@ lbl_80252530: /* 80252594 0024F4F4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD610 lbl_805AD610: # ROM: 0x3F9EB0 @@ -775,6 +778,7 @@ lbl_805AD620: .section .rodata +.balign 8 .global lbl_803D4B78 lbl_803D4B78: # ROM: 0x3D1B78 diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index c33dcbae..4164d09a 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CEnergyProjectile_cpp .section .data +.balign 8 .global lbl_803E7158 lbl_803E7158: @@ -41,6 +42,7 @@ lbl_803E7158: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A90B8 lbl_805A90B8: @@ -2083,6 +2085,7 @@ __sinit_CEnergyProjectile_cpp: /* 8021588C 002127EC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD030 lbl_805AD030: # ROM: 0x3F98D0 @@ -2151,6 +2154,7 @@ lbl_805AD060: .section .rodata +.balign 8 .global lbl_803D2890 lbl_803D2890: # ROM: 0x3CF890 diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s index fbf43109..2773eecb 100644 --- a/asm/MetroidPrime/Weapons/CFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CFlameThrower.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CFlameThrower_cpp .section .data +.balign 8 .global lbl_803E45D8 lbl_803E45D8: @@ -1778,6 +1779,7 @@ __sinit_CFlameThrower_cpp: /* 80198DDC 00195D3C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC3C0 lbl_805AC3C0: # ROM: 0x3F8C60 @@ -1821,6 +1823,7 @@ lbl_805AC3E4: .section .rodata +.balign 8 .global lbl_803D1210 lbl_803D1210: # ROM: 0x3CE210 diff --git a/asm/MetroidPrime/Weapons/CGunWeapon.s b/asm/MetroidPrime/Weapons/CGunWeapon.s index 1ca88907..81116884 100644 --- a/asm/MetroidPrime/Weapons/CGunWeapon.s +++ b/asm/MetroidPrime/Weapons/CGunWeapon.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E52B0 lbl_803E52B0: @@ -4005,6 +4006,7 @@ lbl_801BD440: /* 801BD444 001BA3A4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC6E8 lbl_805AC6E8: # ROM: 0x3F8F88 @@ -4054,6 +4056,7 @@ lbl_805AC710: .section .rodata +.balign 8 .global lbl_803D1750 lbl_803D1750: # ROM: 0x3CE750 diff --git a/asm/MetroidPrime/Weapons/CIceBeam.s b/asm/MetroidPrime/Weapons/CIceBeam.s index 9b41ec18..0a648324 100644 --- a/asm/MetroidPrime/Weapons/CIceBeam.s +++ b/asm/MetroidPrime/Weapons/CIceBeam.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF7E8 lbl_803DF7E8: @@ -25,6 +26,7 @@ lbl_803DF7E8: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AACC0 lbl_805AACC0: @@ -845,6 +847,7 @@ __ct__8CIceBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E1A34 000DE994 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE598 lbl_803CE598: # ROM: 0x3CB598 diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s index 8f276ea5..29b1e9b6 100644 --- a/asm/MetroidPrime/Weapons/CIceImpact.s +++ b/asm/MetroidPrime/Weapons/CIceImpact.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E51E8 lbl_803E51E8: @@ -35,6 +36,7 @@ lbl_803E51E8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7C98 lbl_805A7C98: @@ -2929,6 +2931,7 @@ lbl_801B846C: /* 801B8478 001B53D8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC688 lbl_805AC688: # ROM: 0x3F8F28 @@ -3004,6 +3007,7 @@ lbl_805AC6C8: .section .rodata +.balign 8 .global lbl_803D1640 lbl_803D1640: # ROM: 0x3CE640 diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index 100269dd..4659d1cf 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E6778 lbl_803E6778: @@ -35,6 +36,12 @@ lbl_803E6778: .4byte 0 .section .sdata +.balign 8 + +.global lbl_805A7E58 +lbl_805A7E58: + # ROM: 0x3F57F8 + .4byte 0x00000013 .global lbl_805A7E5C lbl_805A7E5C: @@ -2727,6 +2734,7 @@ lbl_801F409C: /* 801F40C4 001F1024 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACC00 lbl_805ACC00: # ROM: 0x3F94A0 @@ -2805,6 +2813,7 @@ lbl_805ACC38: .section .rodata +.balign 8 .global lbl_803D2050 lbl_803D2050: # ROM: 0x3CF050 diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index 16fa8974..3392bdef 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CNewFlameThrower_cpp .section .data +.balign 8 .global lbl_803E9D10 lbl_803E9D10: @@ -39,6 +40,7 @@ lbl_803E9D10: .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager .section .sdata +.balign 8 .global lbl_805A83C8 lbl_805A83C8: @@ -97,6 +99,7 @@ lbl_805A83F0: .4byte 0 .section .bss +.balign 8 .global lbl_8046DCA8 lbl_8046DCA8: @@ -4577,6 +4580,7 @@ __sinit_CNewFlameThrower_cpp: /* 80264FB8 00261F18 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD788 lbl_805AD788: # ROM: 0x3FA028 @@ -4639,6 +4643,7 @@ lbl_805AD7B4: .section .rodata +.balign 8 .global lbl_803D5278 lbl_803D5278: # ROM: 0x3D2278 diff --git a/asm/MetroidPrime/Weapons/CPhazonBeam.s b/asm/MetroidPrime/Weapons/CPhazonBeam.s index c2e6de7d..c0028807 100644 --- a/asm/MetroidPrime/Weapons/CPhazonBeam.s +++ b/asm/MetroidPrime/Weapons/CPhazonBeam.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E42E8 lbl_803E42E8: @@ -1170,6 +1171,7 @@ __ct__11CPhazonBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 8018D260 0018A1C0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC118 lbl_805AC118: # ROM: 0x3F89B8 @@ -1298,6 +1300,7 @@ lbl_805AC178: .section .rodata +.balign 8 .global lbl_803D08F8 lbl_803D08F8: # ROM: 0x3CD8F8 diff --git a/asm/MetroidPrime/Weapons/CPlasmaBeam.s b/asm/MetroidPrime/Weapons/CPlasmaBeam.s index 07d990df..bd7a47ee 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaBeam.s +++ b/asm/MetroidPrime/Weapons/CPlasmaBeam.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPlasmaBeam_cpp .section .data +.balign 8 .global lbl_803DF710 lbl_803DF710: @@ -29,6 +30,7 @@ lbl_803DF710: .4byte 0 .section .sdata +.balign 8 .global lbl_805A7320 lbl_805A7320: @@ -38,12 +40,14 @@ lbl_805A7320: .section .bss +.balign 8 .global lbl_8046C488 lbl_8046C488: .skip 0x10 .section .sdata2, "a" +.balign 8 .global lbl_805AAC50 lbl_805AAC50: @@ -917,6 +921,7 @@ lbl_800DF688: /* 800DF694 000DC5F4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE530 lbl_803CE530: # ROM: 0x3CB530 diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index 32cb6633..671d76fa 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPlasmaProjectile_cpp .section .data +.balign 8 .global lbl_803E3F00 lbl_803E3F00: @@ -43,6 +44,7 @@ lbl_803E3F00: .4byte 0 .section .sbss +.balign 8 .global lbl_805A8FF8 lbl_805A8FF8: @@ -2857,6 +2859,7 @@ __sinit_CPlasmaProjectile_cpp: /* 80179388 001762E8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABEE0 lbl_805ABEE0: # ROM: 0x3F8780 @@ -2982,6 +2985,7 @@ lbl_805ABF4C: .section .rodata +.balign 8 .global lbl_803D0630 lbl_803D0630: # ROM: 0x3CD630 diff --git a/asm/MetroidPrime/Weapons/CPowerBeam.s b/asm/MetroidPrime/Weapons/CPowerBeam.s index 112cfb14..3a59f2a3 100644 --- a/asm/MetroidPrime/Weapons/CPowerBeam.s +++ b/asm/MetroidPrime/Weapons/CPowerBeam.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DF758 lbl_803DF758: @@ -25,6 +26,7 @@ lbl_803DF758: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AAC88 lbl_805AAC88: @@ -765,6 +767,7 @@ __ct__10CPowerBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800E00AC 000DD00C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE548 lbl_803CE548: # ROM: 0x3CB548 diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s index 600b9697..78c0f543 100644 --- a/asm/MetroidPrime/Weapons/CPowerBomb.s +++ b/asm/MetroidPrime/Weapons/CPowerBomb.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CPowerBomb_cpp .section .data +.balign 8 .global lbl_803E2808 lbl_803E2808: @@ -39,6 +40,7 @@ lbl_803E2808: .4byte 0 .section .sdata +.balign 8 .global lbl_805A77D8 lbl_805A77D8: @@ -77,6 +79,7 @@ lbl_805A77F0: .4byte 0 .section .sbss +.balign 8 # CPowerBomb .global lbl_805A8FA8 @@ -630,6 +633,7 @@ __sinit_CPowerBomb_cpp: /* 8014E100 0014B060 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ABA80 lbl_805ABA80: # ROM: 0x3F8320 @@ -682,6 +686,7 @@ lbl_805ABAA4: .section .rodata +.balign 8 .global lbl_803D01A0 lbl_803D01A0: # ROM: 0x3CD1A0 diff --git a/asm/MetroidPrime/Weapons/CProjectileInfo.s b/asm/MetroidPrime/Weapons/CProjectileInfo.s index 1eb52bc4..7bb4efe6 100644 --- a/asm/MetroidPrime/Weapons/CProjectileInfo.s +++ b/asm/MetroidPrime/Weapons/CProjectileInfo.s @@ -333,6 +333,7 @@ __ct__15CProjectileInfoFUiRC11CDamageInfo: /* 8021C160 002190C0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD100 lbl_805AD100: # ROM: 0x3F99A0 diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index e2e088a6..48831010 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E8050 lbl_803E8050: @@ -35,6 +36,7 @@ lbl_803E8050: .4byte 0 .section .sdata +.balign 8 .global lbl_805A81E8 lbl_805A81E8: @@ -1252,6 +1254,7 @@ lbl_80232710: /* 802327BC 0022F71C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AD3C8 lbl_805AD3C8: # ROM: 0x3F9C68 @@ -1290,6 +1293,7 @@ lbl_805AD3E0: .section .rodata +.balign 8 .global lbl_803D3468 lbl_803D3468: # ROM: 0x3D0468 diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index 4c862e55..e019e545 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E1800 @@ -38,6 +39,7 @@ lbl_803E1800: .4byte 0 .section .sbss +.balign 8 # CTargetableProjectile .global lbl_805A8F88 @@ -581,6 +583,7 @@ Accept__21CTargetableProjectileFR8IVisitor: /* 8013C044 00138FA4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AB7B8 lbl_805AB7B8: # ROM: 0x3F8058 @@ -603,6 +606,7 @@ lbl_805AB7C4: .section .rodata +.balign 8 .global lbl_803D0070 lbl_803D0070: # ROM: 0x3CD070 diff --git a/asm/MetroidPrime/Weapons/CWaveBeam.s b/asm/MetroidPrime/Weapons/CWaveBeam.s index 195f3a87..ca81692f 100644 --- a/asm/MetroidPrime/Weapons/CWaveBeam.s +++ b/asm/MetroidPrime/Weapons/CWaveBeam.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CWaveBeam_cpp .section .data +.balign 8 .global lbl_803DF7A0 lbl_803DF7A0: @@ -29,6 +30,7 @@ lbl_803DF7A0: .4byte 0 .section .sbss +.balign 8 # CWaveBeam .global lbl_805A8EB8 @@ -36,6 +38,7 @@ lbl_805A8EB8: .skip 0x8 .section .sdata2, "a" +.balign 8 .global lbl_805AAC98 lbl_805AAC98: @@ -1080,6 +1083,7 @@ __sinit_CWaveBeam_cpp: /* 800E0EDC 000DDE3C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803CE568 lbl_803CE568: # ROM: 0x3CB568 diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index 93bb37b1..e41e1ae6 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CWaveBuster_cpp .section .data +.balign 8 .global lbl_803E5318 lbl_803E5318: @@ -39,6 +40,7 @@ lbl_803E5318: .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager .section .sdata +.balign 8 .global lbl_805A7CC0 lbl_805A7CC0: @@ -67,6 +69,7 @@ lbl_805A7CD0: .4byte 0 .section .bss +.balign 8 .global lbl_8046C908 lbl_8046C908: .skip 0xC @@ -3393,6 +3396,7 @@ __sinit_CWaveBuster_cpp: /* 801C07A4 001BD704 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC718 lbl_805AC718: # ROM: 0x3F8FB8 @@ -3547,6 +3551,7 @@ lbl_805AC794: .section .rodata +.balign 8 .global lbl_803D19F8 lbl_803D19F8: # ROM: 0x3CE9F8 diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s index d0e1b59c..9b61c763 100644 --- a/asm/MetroidPrime/Weapons/CWeapon.s +++ b/asm/MetroidPrime/Weapons/CWeapon.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803DFEF0 lbl_803DFEF0: @@ -47,6 +48,7 @@ lbl_803DFF5C: .4byte lbl_80101F84 .section .sdata +.balign 8 .global lbl_805A7558 lbl_805A7558: @@ -55,6 +57,7 @@ lbl_805A7558: .4byte 0 .section .sdata2, "a" +.balign 8 .global lbl_805AB108 lbl_805AB108: diff --git a/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s b/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s index 06f3388c..b4222bdc 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s +++ b/asm/MetroidPrime/Weapons/GunController/CGSComboFire.s @@ -279,6 +279,7 @@ __ct__12CGSComboFireFv: /* 801CD48C 001CA3EC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC8B0 lbl_805AC8B0: # ROM: 0x3F9150 @@ -297,6 +298,7 @@ lbl_805AC8B8: .section .rodata +.balign 8 .global lbl_803D1AC8 lbl_803D1AC8: # ROM: 0x3CEAC8 diff --git a/asm/MetroidPrime/Weapons/GunController/CGSFidget.s b/asm/MetroidPrime/Weapons/GunController/CGSFidget.s index 2e92b60b..245c1d37 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGSFidget.s +++ b/asm/MetroidPrime/Weapons/GunController/CGSFidget.s @@ -322,6 +322,7 @@ __ct__9CGSFidgetFv: /* 801F153C 001EE49C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ACBE8 lbl_805ACBE8: # ROM: 0x3F9488 @@ -334,6 +335,7 @@ lbl_805ACBEC: .section .rodata +.balign 8 .global lbl_803D2038 lbl_803D2038: # ROM: 0x3CF038 diff --git a/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s b/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s index ce517bed..805af9af 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s +++ b/asm/MetroidPrime/Weapons/GunController/CGSFreeLook.s @@ -280,6 +280,7 @@ __ct__11CGSFreeLookFv: /* 801CD09C 001C9FFC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC8A0 lbl_805AC8A0: # ROM: 0x3F9140 @@ -298,6 +299,7 @@ lbl_805AC8A8: .section .rodata +.balign 8 .global lbl_803D1AB8 lbl_803D1AB8: # ROM: 0x3CEAB8 diff --git a/asm/MetroidPrime/Weapons/GunController/CGunController.s b/asm/MetroidPrime/Weapons/GunController/CGunController.s index f3d152f7..10a8dcab 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGunController.s +++ b/asm/MetroidPrime/Weapons/GunController/CGunController.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803E5728 lbl_803E5728: @@ -842,6 +843,7 @@ __ct__14CGunControllerFR10CModelData: /* 801CCCA4 001C9C04 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC890 lbl_805AC890: # ROM: 0x3F9130 @@ -860,6 +862,7 @@ lbl_805AC898: .section .rodata +.balign 8 .global lbl_803D1AA8 lbl_803D1AA8: # ROM: 0x3CEAA8 diff --git a/asm/MetroidPrime/Weapons/GunController/CGunMotion.s b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s index 7775a5aa..7dc02c61 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGunMotion.s +++ b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s @@ -558,6 +558,7 @@ __ct__10CGunMotionFUiRC9CVector3f: /* 801D972C 001D668C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AC9B8 lbl_805AC9B8: # ROM: 0x3F9258 diff --git a/asm/MetroidPrime/Weapons/WeaponTypes.s b/asm/MetroidPrime/Weapons/WeaponTypes.s index 4762e5ff..3160eaa2 100644 --- a/asm/MetroidPrime/Weapons/WeaponTypes.s +++ b/asm/MetroidPrime/Weapons/WeaponTypes.s @@ -773,6 +773,7 @@ lbl_8028B480: /* 8028B48C 002883EC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADB88 lbl_805ADB88: # ROM: 0x3FA428 diff --git a/asm/MetroidPrime/main.s b/asm/MetroidPrime/main.s index 9d2f7843..781bc819 100644 --- a/asm/MetroidPrime/main.s +++ b/asm/MetroidPrime/main.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global sGraphicsFifo sGraphicsFifo: @@ -18,6 +19,7 @@ lbl_80457798: .skip 0x160 .section .data, "wa" +.balign 8 .global lbl_803D8D60 lbl_803D8D60: # ROM: 0x3D5D60 @@ -48,6 +50,7 @@ lbl_803D8D84: .section .rodata, "a" +.balign 8 # CGameGlobalObjects .global lbl_803CB3A0 lbl_803CB3A0: @@ -798,6 +801,7 @@ s_ZZZ_AGSC: .section .sdata, "wa" +.balign 8 .global lbl_805A6BC0 lbl_805A6BC0: # ROM: 0x3F4560 @@ -821,6 +825,7 @@ lbl_805A6BCC: .section .sbss, "wa" +.balign 8 .balign 4 .global gpResourceFactory gpResourceFactory: @@ -893,6 +898,7 @@ lbl_805A8C74: .skip 0x4 .section .sdata2, "a" +.balign 8 .global lbl_805A9D20 lbl_805A9D20: # ROM: 0x3F65C0 @@ -980,6 +986,16 @@ lbl_805A9D78: # ROM: 0x3F6618 .4byte 0x41200000 +.global lbl_805A9D7C +lbl_805A9D7C: + # ROM: 0x3F661C + .float 1.0 + +.global lbl_805A9D80 +lbl_805A9D80: + # ROM: 0x3F6620 + .double 4.503601774854144E15 + .section .text, "ax" .global UpdateStreamedAudio__5CMainFv diff --git a/asm/MetroidPrime/text_80008894_80009144.s b/asm/MetroidPrime/text_80008894_80009144.s index 740c1c77..110e3bc3 100644 --- a/asm/MetroidPrime/text_80008894_80009144.s +++ b/asm/MetroidPrime/text_80008894_80009144.s @@ -1,17 +1,5 @@ .include "macros.inc" -.section .sdata2 - -.global lbl_805A9D7C -lbl_805A9D7C: - # ROM: 0x3F661C - .float 1.0 - -.global lbl_805A9D80 -lbl_805A9D80: - # ROM: 0x3F6620 - .double 4.503601774854144E15 - .section .text, "ax" diff --git a/asm/Runtime/FILE_POS.s b/asm/Runtime/FILE_POS.s index 0abad394..b4b7fb7d 100644 --- a/asm/Runtime/FILE_POS.s +++ b/asm/Runtime/FILE_POS.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .balign 4 .global lbl_805A99D0 lbl_805A99D0: diff --git a/asm/Runtime/Gecko_ExceptionPPC.s b/asm/Runtime/Gecko_ExceptionPPC.s index 62056171..91763681 100644 --- a/asm/Runtime/Gecko_ExceptionPPC.s +++ b/asm/Runtime/Gecko_ExceptionPPC.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 lbl_80542188: .skip 0x10 diff --git a/asm/Runtime/__init_cpp_exceptions.s b/asm/Runtime/__init_cpp_exceptions.s index 2e272a36..b98991e4 100644 --- a/asm/Runtime/__init_cpp_exceptions.s +++ b/asm/Runtime/__init_cpp_exceptions.s @@ -59,6 +59,7 @@ __fini_cpp_exceptions_reference: .4byte __fini_cpp_exceptions .section .sdata, "wa" +.balign 8 fragmentID: .4byte 0xFFFFFFFE .4byte 0 diff --git a/asm/Runtime/abort_exit.s b/asm/Runtime/abort_exit.s index 07d74c7e..9e87c02c 100644 --- a/asm/Runtime/abort_exit.s +++ b/asm/Runtime/abort_exit.s @@ -1,10 +1,12 @@ .include "macros.inc" .section .bss +.balign 8 lbl_80542198: .skip 0x100 .section .sbss +.balign 8 .balign 4 .global lbl_805A99B8 lbl_805A99B8: diff --git a/asm/Runtime/alloc.s b/asm/Runtime/alloc.s index 4ab5089e..38d12259 100644 --- a/asm/Runtime/alloc.s +++ b/asm/Runtime/alloc.s @@ -1,10 +1,12 @@ .include "macros.inc" .section .bss +.balign 8 "protopool$192": .skip 0x338 .section .rodata +.balign 8 .global lbl_803D85C0 lbl_803D85C0: # ROM: 0x3D55C0 @@ -17,6 +19,7 @@ lbl_803D85C0: .section .sbss +.balign 8 .balign 4 .global lbl_805A99C8 lbl_805A99C8: diff --git a/asm/Runtime/ansi_fp.s b/asm/Runtime/ansi_fp.s index 9412e269..0378c691 100644 --- a/asm/Runtime/ansi_fp.s +++ b/asm/Runtime/ansi_fp.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D85D8 lbl_803D85D8: # ROM: 0x3D55D8 @@ -2115,6 +2116,7 @@ abs: .endif .section .sdata2, "a" +.balign 8 .global lbl_805AEC60 lbl_805AEC60: # ROM: 0x3FB500 diff --git a/asm/Runtime/e_acos.s b/asm/Runtime/e_acos.s index 6f6a6d85..9fec5f69 100644 --- a/asm/Runtime/e_acos.s +++ b/asm/Runtime/e_acos.s @@ -217,6 +217,7 @@ lbl_803916D0: /* 803916D4 0038E634 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AECB8 lbl_805AECB8: # ROM: 0x3FB558 diff --git a/asm/Runtime/e_asin.s b/asm/Runtime/e_asin.s index 6fea8228..f2d99324 100644 --- a/asm/Runtime/e_asin.s +++ b/asm/Runtime/e_asin.s @@ -172,6 +172,7 @@ lbl_80391934: /* 80391938 0038E898 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AED48 lbl_805AED48: # ROM: 0x3FB5E8 diff --git a/asm/Runtime/e_atan2.s b/asm/Runtime/e_atan2.s index c2e4d227..1cc4e41e 100644 --- a/asm/Runtime/e_atan2.s +++ b/asm/Runtime/e_atan2.s @@ -202,6 +202,7 @@ lbl_80391BB8: /* 80391BC8 0038EB28 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEDE0 lbl_805AEDE0: # ROM: 0x3FB680 diff --git a/asm/Runtime/e_exp.s b/asm/Runtime/e_exp.s index a7432ca8..4b13568d 100644 --- a/asm/Runtime/e_exp.s +++ b/asm/Runtime/e_exp.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D8720 lbl_803D8720: # ROM: 0x3D5720 @@ -172,6 +173,7 @@ lbl_80391DE0: /* 80391DE4 0038ED44 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEE38 lbl_805AEE38: # ROM: 0x3FB6D8 diff --git a/asm/Runtime/e_fmod.s b/asm/Runtime/e_fmod.s index 865acb4c..6d29e894 100644 --- a/asm/Runtime/e_fmod.s +++ b/asm/Runtime/e_fmod.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D8750 lbl_803D8750: # ROM: 0x3D5750 diff --git a/asm/Runtime/e_log.s b/asm/Runtime/e_log.s index 133061b1..1f305201 100644 --- a/asm/Runtime/e_log.s +++ b/asm/Runtime/e_log.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .balign 4 .global lbl_805A99E0 lbl_805A99E0: @@ -183,6 +184,7 @@ lbl_80392398: /* 8039239C 0038F2FC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEEB0 lbl_805AEEB0: # ROM: 0x3FB750 diff --git a/asm/Runtime/e_pow.s b/asm/Runtime/e_pow.s index fa5be493..644c73de 100644 --- a/asm/Runtime/e_pow.s +++ b/asm/Runtime/e_pow.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D8760 lbl_803D8760: # ROM: 0x3D5760 @@ -619,6 +620,7 @@ lbl_80392C04: /* 80392C28 0038FB88 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEF30 lbl_805AEF30: # ROM: 0x3FB7D0 diff --git a/asm/Runtime/e_rem_pio2.s b/asm/Runtime/e_rem_pio2.s index c98b0de4..9ea4f7e0 100644 --- a/asm/Runtime/e_rem_pio2.s +++ b/asm/Runtime/e_rem_pio2.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D8790 lbl_803D8790: # ROM: 0x3D5790 @@ -361,6 +362,7 @@ lbl_80392FB4: /* 80392FC8 0038FF28 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF040 lbl_805AF040: # ROM: 0x3FB8E0 diff --git a/asm/Runtime/global_destructor_chain.s b/asm/Runtime/global_destructor_chain.s index fa082955..f1f9363a 100644 --- a/asm/Runtime/global_destructor_chain.s +++ b/asm/Runtime/global_destructor_chain.s @@ -39,6 +39,7 @@ __destroy_global_chain_reference: .4byte __destroy_global_chain .section .sbss +.balign 8 .balign 4 __global_destructor_chain: .skip 0x8 diff --git a/asm/Runtime/k_cos.s b/asm/Runtime/k_cos.s index 87c39215..4996b795 100644 --- a/asm/Runtime/k_cos.s +++ b/asm/Runtime/k_cos.s @@ -72,6 +72,7 @@ lbl_803930B8: /* 803930BC 0039001C 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF098 lbl_805AF098: # ROM: 0x3FB938 diff --git a/asm/Runtime/k_rem_pio2.s b/asm/Runtime/k_rem_pio2.s index 23dbb1a2..8f861fc0 100644 --- a/asm/Runtime/k_rem_pio2.s +++ b/asm/Runtime/k_rem_pio2.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D8918 lbl_803D8918: # ROM: 0x3D5918 @@ -1042,6 +1043,7 @@ lbl_80393EF4: /* 80393F10 00390E70 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF0E0 lbl_805AF0E0: # ROM: 0x3FB980 diff --git a/asm/Runtime/k_sin.s b/asm/Runtime/k_sin.s index 7bb313b7..10d4e9c7 100644 --- a/asm/Runtime/k_sin.s +++ b/asm/Runtime/k_sin.s @@ -49,6 +49,7 @@ lbl_80393FAC: /* 80393FB0 00390F10 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF120 lbl_805AF120: # ROM: 0x3FB9C0 diff --git a/asm/Runtime/k_tan.s b/asm/Runtime/k_tan.s index 63d774c4..4f236cd8 100644 --- a/asm/Runtime/k_tan.s +++ b/asm/Runtime/k_tan.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D8968 lbl_803D8968: # ROM: 0x3D5968 @@ -179,6 +180,7 @@ lbl_803941B8: /* 803941C4 00391124 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF158 lbl_805AF158: # ROM: 0x3FB9F8 diff --git a/asm/Runtime/mbstring.s b/asm/Runtime/mbstring.s index e8d185c7..523709b5 100644 --- a/asm/Runtime/mbstring.s +++ b/asm/Runtime/mbstring.s @@ -106,6 +106,7 @@ lbl_8038D874: /* 8038D878 0038A7D8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEC90 lbl_805AEC90: # ROM: 0x3FB530 diff --git a/asm/Runtime/printf.s b/asm/Runtime/printf.s index 242092ab..52b48021 100644 --- a/asm/Runtime/printf.s +++ b/asm/Runtime/printf.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D86C0 lbl_803D86C0: # ROM: 0x3D56C0 @@ -17,6 +18,7 @@ lbl_803D86C0: .section .data, "wa" +.balign 8 # TODO: Move these where they actually belong .global lbl_803F2778 lbl_803F2778: @@ -2949,6 +2951,7 @@ lbl_8038FCE8: /* 8038FD00 0038CC60 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AEC98 lbl_805AEC98: # ROM: 0x3FB538 diff --git a/asm/Runtime/ptmf.s b/asm/Runtime/ptmf.s index 1fc7bdc9..a34733d9 100644 --- a/asm/Runtime/ptmf.s +++ b/asm/Runtime/ptmf.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D8598 lbl_803D8598: diff --git a/asm/Runtime/runtime.s b/asm/Runtime/runtime.s index 30f82608..95d5cae3 100644 --- a/asm/Runtime/runtime.s +++ b/asm/Runtime/runtime.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D85A8 lbl_803D85A8: # ROM: 0x3D55A8 diff --git a/asm/Runtime/s_atan.s b/asm/Runtime/s_atan.s index 53598155..45d866fe 100644 --- a/asm/Runtime/s_atan.s +++ b/asm/Runtime/s_atan.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D89D0 lbl_803D89D0: # ROM: 0x3D59D0 @@ -190,6 +191,7 @@ lbl_803943C0: /* 803943C4 00391324 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF190 lbl_805AF190: # ROM: 0x3FBA30 diff --git a/asm/Runtime/s_cos.s b/asm/Runtime/s_cos.s index 21c133eb..1320ae7b 100644 --- a/asm/Runtime/s_cos.s +++ b/asm/Runtime/s_cos.s @@ -67,6 +67,7 @@ lbl_803944B4: /* 803944C0 00391420 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF1B8 lbl_805AF1B8: # ROM: 0x3FBA58 diff --git a/asm/Runtime/s_floor.s b/asm/Runtime/s_floor.s index 74def9e4..84c51d8c 100644 --- a/asm/Runtime/s_floor.s +++ b/asm/Runtime/s_floor.s @@ -100,6 +100,7 @@ lbl_80394604: /* 80394608 00391568 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF1C0 lbl_805AF1C0: # ROM: 0x3FBA60 diff --git a/asm/Runtime/s_frexp.s b/asm/Runtime/s_frexp.s index 89eaf6ed..cbc41da5 100644 --- a/asm/Runtime/s_frexp.s +++ b/asm/Runtime/s_frexp.s @@ -45,6 +45,7 @@ lbl_80394690: /* 80394694 003915F4 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF1D0 lbl_805AF1D0: # ROM: 0x3FBA70 diff --git a/asm/Runtime/s_ldexp.s b/asm/Runtime/s_ldexp.s index 9055dba6..b69949ec 100644 --- a/asm/Runtime/s_ldexp.s +++ b/asm/Runtime/s_ldexp.s @@ -136,6 +136,7 @@ lbl_8039484C: /* 80394858 003917B8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF1D8 lbl_805AF1D8: # ROM: 0x3FBA78 diff --git a/asm/Runtime/s_sin.s b/asm/Runtime/s_sin.s index 986598fc..e5070062 100644 --- a/asm/Runtime/s_sin.s +++ b/asm/Runtime/s_sin.s @@ -68,6 +68,7 @@ lbl_80394BA4: /* 80394BB0 00391B10 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AF200 lbl_805AF200: # ROM: 0x3FBAA0 diff --git a/asm/Runtime/s_tan.s b/asm/Runtime/s_tan.s index 2cdb10a9..ba7b4595 100644 --- a/asm/Runtime/s_tan.s +++ b/asm/Runtime/s_tan.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AF208 lbl_805AF208: # ROM: 0x3FBAA8 diff --git a/asm/Runtime/sdata.s b/asm/Runtime/sdata.s index 095ebf17..858d1907 100644 --- a/asm/Runtime/sdata.s +++ b/asm/Runtime/sdata.s @@ -1,4 +1,5 @@ .section .sdata +.balign 8 # TODO: Split this diff --git a/asm/Runtime/strtold.s b/asm/Runtime/strtold.s index 176a2b15..4aa903a8 100644 --- a/asm/Runtime/strtold.s +++ b/asm/Runtime/strtold.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .rodata +.balign 8 .global lbl_803D86E8 lbl_803D86E8: # ROM: 0x3D56E8 @@ -1238,6 +1239,7 @@ lbl_80391260: /* 80391270 0038E1D0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805AECA0 lbl_805AECA0: # ROM: 0x3FB540 diff --git a/asm/Runtime/uart_console_io.s b/asm/Runtime/uart_console_io.s index 89bde9c2..2055c9ea 100644 --- a/asm/Runtime/uart_console_io.s +++ b/asm/Runtime/uart_console_io.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .balign 4 .global lbl_805A99D8 lbl_805A99D8: diff --git a/asm/Weapons/CCollisionResponseData.s b/asm/Weapons/CCollisionResponseData.s index 4470831c..237859ba 100644 --- a/asm/Weapons/CCollisionResponseData.s +++ b/asm/Weapons/CCollisionResponseData.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC518 lbl_803EC518: @@ -1593,6 +1594,7 @@ lbl_802B3694: /* 802B36A4 002B0604 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADF60 lbl_805ADF60: # ROM: 0x3FA800 @@ -1611,6 +1613,7 @@ lbl_805ADF68: .section .rodata +.balign 8 .global lbl_803D6198 lbl_803D6198: # ROM: 0x3D3198 diff --git a/asm/Weapons/CDecal.s b/asm/Weapons/CDecal.s index 58d566ed..28f5cc09 100644 --- a/asm/Weapons/CDecal.s +++ b/asm/Weapons/CDecal.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CDecal_cpp .section .sbss, "wa" +.balign 8 .global sDecalRandom__6CDecal sDecalRandom__6CDecal: @@ -1144,6 +1145,7 @@ __sinit_CDecal_cpp: /* 802B589C 002B27FC 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADF70 lbl_805ADF70: # ROM: 0x3FA810 @@ -1176,6 +1178,7 @@ lbl_805ADF84: .section .rodata +.balign 8 .global lbl_803D6550 lbl_803D6550: # ROM: 0x3D3550 diff --git a/asm/Weapons/CDecalDataFactory.s b/asm/Weapons/CDecalDataFactory.s index 9fe6a803..d019fe44 100644 --- a/asm/Weapons/CDecalDataFactory.s +++ b/asm/Weapons/CDecalDataFactory.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC548 lbl_803EC548: @@ -1289,6 +1290,7 @@ IsFastConstant__14CVectorElementCFv: /* 802B4824 002B1784 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6548 lbl_803D6548: # ROM: 0x3D3548 diff --git a/asm/Weapons/CProjectileWeapon.s b/asm/Weapons/CProjectileWeapon.s index cdb22c43..a5bc314e 100644 --- a/asm/Weapons/CProjectileWeapon.s +++ b/asm/Weapons/CProjectileWeapon.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC4C8 lbl_803EC4C8: @@ -27,6 +28,7 @@ lbl_803EC4E8: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8648 lbl_805A8648: @@ -2588,6 +2590,7 @@ GetTickPeriod__17CProjectileWeaponFv: /* 802B1140 002AE0A0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADF10 lbl_805ADF10: # ROM: 0x3FA7B0 @@ -2656,6 +2659,7 @@ lbl_805ADF58: .section .rodata +.balign 8 .global lbl_803D6188 lbl_803D6188: # ROM: 0x3D3188 diff --git a/asm/Weapons/CProjectileWeaponDataFactory.s b/asm/Weapons/CProjectileWeaponDataFactory.s index 23e8f1ee..db9d30ae 100644 --- a/asm/Weapons/CProjectileWeaponDataFactory.s +++ b/asm/Weapons/CProjectileWeaponDataFactory.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC508 lbl_803EC508: @@ -1173,6 +1174,7 @@ lbl_802B212C: /* 802B2154 002AF0B4 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6190 lbl_803D6190: # ROM: 0x3D3190 diff --git a/asm/Weapons/CWeaponDescription.s b/asm/Weapons/CWeaponDescription.s index 7b3b59b5..052fbb4b 100644 --- a/asm/Weapons/CWeaponDescription.s +++ b/asm/Weapons/CWeaponDescription.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC5C8 lbl_803EC5C8: diff --git a/asm/Weapons/IWeaponRenderer.s b/asm/Weapons/IWeaponRenderer.s index 25488458..da997c0b 100644 --- a/asm/Weapons/IWeaponRenderer.s +++ b/asm/Weapons/IWeaponRenderer.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_IWeaponRenderer_cpp .section .data +.balign 8 .global lbl_803EC528 lbl_803EC528: @@ -24,6 +25,7 @@ __vt__15IWeaponRenderer: .section .sdata +.balign 8 .global sWeaponRenderer__15IWeaponRenderer sWeaponRenderer__15IWeaponRenderer: @@ -32,12 +34,14 @@ sWeaponRenderer__15IWeaponRenderer: .4byte 0 .section .bss +.balign 8 .global lbl_8046E1F0 lbl_8046E1F0: .skip 0x10 .section .sbss, "wa" +.balign 8 .global sDefaultRenderer sDefaultRenderer: diff --git a/asm/WorldFormat/CAreaOctTree.s b/asm/WorldFormat/CAreaOctTree.s index d53bd89e..e224e2f0 100644 --- a/asm/WorldFormat/CAreaOctTree.s +++ b/asm/WorldFormat/CAreaOctTree.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC408 lbl_803EC408: @@ -531,6 +532,7 @@ lbl_802A308C: /* 802A3098 0029FFF8 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADE60 lbl_805ADE60: # ROM: 0x3FA700 @@ -543,6 +545,7 @@ lbl_805ADE64: .section .rodata +.balign 8 .global lbl_803D6020 lbl_803D6020: # ROM: 0x3D3020 diff --git a/asm/WorldFormat/CAreaOctTree_Tests.s b/asm/WorldFormat/CAreaOctTree_Tests.s index 9f31864e..93d3cc50 100644 --- a/asm/WorldFormat/CAreaOctTree_Tests.s +++ b/asm/WorldFormat/CAreaOctTree_Tests.s @@ -1,12 +1,14 @@ .include "macros.inc" .section .bss +.balign 8 .global lbl_8046E0F0 lbl_8046E0F0: .skip 0x100 .section .sbss, "wa" +.balign 8 .global lbl_805A9178 lbl_805A9178: @@ -1923,6 +1925,7 @@ _close_enough__Ffff: /* 802A2630 0029F590 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADE40 lbl_805ADE40: # ROM: 0x3FA6E0 @@ -1965,6 +1968,7 @@ lbl_805ADE5C: .section .rodata +.balign 8 .global lbl_803D5EF0 lbl_803D5EF0: # ROM: 0x3D2EF0 diff --git a/asm/WorldFormat/CAreaRenderOctTree.s b/asm/WorldFormat/CAreaRenderOctTree.s index 919f0294..499f7c06 100644 --- a/asm/WorldFormat/CAreaRenderOctTree.s +++ b/asm/WorldFormat/CAreaRenderOctTree.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC4A8 lbl_803EC4A8: @@ -15,6 +16,7 @@ lbl_803EC4A8: .4byte lbl_802AEB70 .section .sdata +.balign 8 .global lbl_805A8640 lbl_805A8640: @@ -489,6 +491,7 @@ sub_802aec48: /* 802AED04 002ABC64 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADF08 lbl_805ADF08: # ROM: 0x3FA7A8 @@ -497,6 +500,7 @@ lbl_805ADF08: .section .rodata +.balign 8 .global lbl_803D6118 lbl_803D6118: # ROM: 0x3D3118 diff --git a/asm/WorldFormat/CCollidableOBBTree.s b/asm/WorldFormat/CCollidableOBBTree.s index ac1c8503..f1a94fb9 100644 --- a/asm/WorldFormat/CCollidableOBBTree.s +++ b/asm/WorldFormat/CCollidableOBBTree.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC438 lbl_803EC438: @@ -25,6 +26,7 @@ lbl_803EC448: .4byte CastRayInternal__18CCollidableOBBTreeCFRC25CInternalRayCastStructure .section .sdata +.balign 8 .global lbl_805A8630 lbl_805A8630: @@ -3163,6 +3165,7 @@ __ct__18CCollidableOBBTreeFP8COBBTreeRC13CMaterialList: /* 802AC740 002A96A0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADED0 lbl_805ADED0: # ROM: 0x3FA770 diff --git a/asm/WorldFormat/CCollidableOBBTreeGroup.s b/asm/WorldFormat/CCollidableOBBTreeGroup.s index c2b1afda..ca4d77aa 100644 --- a/asm/WorldFormat/CCollidableOBBTreeGroup.s +++ b/asm/WorldFormat/CCollidableOBBTreeGroup.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC470 lbl_803EC470: @@ -25,6 +26,7 @@ lbl_803EC498: .4byte 0 .section .sdata +.balign 8 .global lbl_805A8638 lbl_805A8638: @@ -2027,6 +2029,7 @@ lbl_802AE3C8: /* 802AE3E0 002AB340 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADF00 lbl_805ADF00: # ROM: 0x3FA7A0 @@ -2039,6 +2042,7 @@ lbl_805ADF04: .section .rodata +.balign 8 .global lbl_803D60F0 lbl_803D60F0: # ROM: 0x3D30F0 diff --git a/asm/WorldFormat/CMetroidAreaCollider.s b/asm/WorldFormat/CMetroidAreaCollider.s index 0cf80655..bd269731 100644 --- a/asm/WorldFormat/CMetroidAreaCollider.s +++ b/asm/WorldFormat/CMetroidAreaCollider.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global lbl_803EC428 lbl_803EC428: @@ -11,6 +12,7 @@ lbl_803EC428: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9180 lbl_805A9180: @@ -29,6 +31,7 @@ lbl_805A9190: .skip 0x8 .section .sbss2, "", @nobits +.balign 8 # CMovingAABoxComponent .global lbl_805AF488 lbl_805AF488: @@ -4796,6 +4799,7 @@ lbl_802A75CC: /* 802A75F8 002A4558 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADE68 lbl_805ADE68: # ROM: 0x3FA708 diff --git a/asm/WorldFormat/CMetroidModelInstance.s b/asm/WorldFormat/CMetroidModelInstance.s index 2e41dfc8..da5ad728 100644 --- a/asm/WorldFormat/CMetroidModelInstance.s +++ b/asm/WorldFormat/CMetroidModelInstance.s @@ -123,6 +123,7 @@ nullsub_30: /* 802A291C 0029F87C 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6018 lbl_803D6018: # ROM: 0x3D3018 diff --git a/asm/WorldFormat/COBBTree.s b/asm/WorldFormat/COBBTree.s index c8bb40f4..669f96f2 100644 --- a/asm/WorldFormat/COBBTree.s +++ b/asm/WorldFormat/COBBTree.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata +.balign 8 .global lbl_805A8620 lbl_805A8620: @@ -23,6 +24,7 @@ lbl_805A862C: .4byte 0 .section .sbss, "wa" +.balign 8 .global lbl_805A9198 lbl_805A9198: @@ -2360,6 +2362,7 @@ lbl_802A98D0: /* 802A98E8 002A6848 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADEC0 lbl_805ADEC0: # ROM: 0x3FA760 @@ -2378,6 +2381,7 @@ lbl_805ADEC8: .section .rodata +.balign 8 .global lbl_803D6038 lbl_803D6038: # ROM: 0x3D3038 diff --git a/asm/WorldFormat/CPVSVisAreaSet.s b/asm/WorldFormat/CPVSVisAreaSet.s index 5daad756..93e4db00 100644 --- a/asm/WorldFormat/CPVSVisAreaSet.s +++ b/asm/WorldFormat/CPVSVisAreaSet.s @@ -210,6 +210,7 @@ sub_802ae630: /* 802AE6C0 002AB620 4E 80 00 20 */ blr .section .rodata +.balign 8 .global lbl_803D6110 lbl_803D6110: # ROM: 0x3D3110 diff --git a/asm/WorldFormat/CWorldLight.s b/asm/WorldFormat/CWorldLight.s index edf4671e..16e8aadb 100644 --- a/asm/WorldFormat/CWorldLight.s +++ b/asm/WorldFormat/CWorldLight.s @@ -5,6 +5,7 @@ lbl_ctor: .4byte __sinit_CWorldLight_cpp .section .sdata +.balign 8 .global lbl_805A8610 lbl_805A8610: @@ -279,6 +280,7 @@ __sinit_CWorldLight_cpp: /* 802A7970 002A48D0 4E 80 00 20 */ blr .section .sdata2, "a" +.balign 8 .global lbl_805ADEA0 lbl_805ADEA0: # ROM: 0x3FA740 diff --git a/asm/dtors.s b/asm/dtors.s index 7b5cab32..069cf5c0 100644 --- a/asm/dtors.s +++ b/asm/dtors.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss, "wa" +.balign 8 .global lbl_8056A5A0 lbl_8056A5A0: @@ -438,6 +439,9 @@ lbl_805A6B90: .global lbl_805A6BA0 lbl_805A6BA0: .skip 0x4 +.global lbl_805A6BA4 +lbl_805A6BA4: + .skip 0x4 .global lbl_805A6BA8 lbl_805A6BA8: - .skip 0xC + .skip 0x8 diff --git a/asm/musyx/chorus_fx.s b/asm/musyx/chorus_fx.s index 463ee436..23a31f3d 100644 --- a/asm/musyx/chorus_fx.s +++ b/asm/musyx/chorus_fx.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global i2fMagic i2fMagic: .double 4.503601774854144E15 .section .data, "wa" +.balign 8 .global rsmpTab12khz rsmpTab12khz: diff --git a/asm/musyx/creverb.s b/asm/musyx/creverb.s index 49d1817c..332bcd23 100644 --- a/asm/musyx/creverb.s +++ b/asm/musyx/creverb.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AF3B0 lbl_805AF3B0: @@ -71,6 +72,7 @@ lbl_805AF3E8: .section .data, "wa" +.balign 8 lbl_803F6460: .4byte 0x000006FD .4byte 0x000007CF diff --git a/asm/musyx/hardware.s b/asm/musyx/hardware.s index fa12cd4b..e216b466 100644 --- a/asm/musyx/hardware.s +++ b/asm/musyx/hardware.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AF398 lbl_805AF398: # ROM: 0x3FBC38 @@ -25,6 +26,7 @@ lbl_805AF3A8: .section .sbss +.balign 8 .balign 4 .global salTimeOffset salTimeOffset: @@ -46,6 +48,7 @@ salFrame: .skip 0x1 .section .sdata, "wa" +.balign 8 .global lbl_805A8BD8 lbl_805A8BD8: .2byte 0 @@ -61,6 +64,7 @@ lbl_805A8BE0: .balign 4 .section .rodata +.balign 8 .global itdOffTab itdOffTab: # ROM: 0x3D5BD0 diff --git a/asm/musyx/hw_aramdma.s b/asm/musyx/hw_aramdma.s index 81f5ddc5..9e998be9 100644 --- a/asm/musyx/hw_aramdma.s +++ b/asm/musyx/hw_aramdma.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 aramQueueLo: .skip 0x284 aramQueueHi: @@ -9,6 +10,7 @@ aramStreamBuffers: .skip 0x408 .section .sbss, "wa" +.balign 8 .balign 4 .global aramIdleStreamBuffers aramIdleStreamBuffers: diff --git a/asm/musyx/hw_dolphin.s b/asm/musyx/hw_dolphin.s index 7524d7c9..ad568154 100644 --- a/asm/musyx/hw_dolphin.s +++ b/asm/musyx/hw_dolphin.s @@ -1,12 +1,14 @@ .include "macros.inc" .section .bss +.balign 8 dsp_task: .skip 0x60 dram_image: .skip 0x2008 .section .sbss, "wa" +.balign 8 .balign 4 .global oldState oldState: diff --git a/asm/musyx/hw_dspctrl.s b/asm/musyx/hw_dspctrl.s index 44f9ffd0..56410c4c 100644 --- a/asm/musyx/hw_dspctrl.s +++ b/asm/musyx/hw_dspctrl.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global gs gs: .skip 0x600 @@ -11,6 +12,7 @@ dspStudio: .skip 0x100 .section .sbss +.balign 8 .balign 4 .global dspARAMZeroBuffer dspARAMZeroBuffer: @@ -59,6 +61,7 @@ salMessageCallback: .skip 0x8 .section .data, "wa" +.balign 8 .global dspSRCCycles dspSRCCycles: @@ -76,6 +79,7 @@ dspSRCCycles: .section .rodata +.balign 8 .global lbl_803D8A68 lbl_803D8A68: # ROM: 0x3D5A68 diff --git a/asm/musyx/hw_volconv.s b/asm/musyx/hw_volconv.s index e4cce1e1..71e87ebc 100644 --- a/asm/musyx/hw_volconv.s +++ b/asm/musyx/hw_volconv.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AF2F0 lbl_805AF2F0: # ROM: 0x3FBB90 @@ -52,6 +53,7 @@ lbl_805AF320: .section .data, "wa" +.balign 8 .global musyx_vol_tab musyx_vol_tab: diff --git a/asm/musyx/reverb.s b/asm/musyx/reverb.s index caa925e3..f652c977 100644 --- a/asm/musyx/reverb.s +++ b/asm/musyx/reverb.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AF3F0 lbl_805AF3F0: # ROM: 0x3FBC90 @@ -75,6 +76,7 @@ lbl_805AF430: .section .data, "wa" +.balign 8 lbl_803F6470: .4byte 0x000006FD .4byte 0x000007CF diff --git a/asm/musyx/s_data.s b/asm/musyx/s_data.s index 0e05e2f9..f45a58da 100644 --- a/asm/musyx/s_data.s +++ b/asm/musyx/s_data.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sbss +.balign 8 .balign 4 .global sp sp: diff --git a/asm/musyx/seq.s b/asm/musyx/seq.s index ce296926..0e2aa73e 100644 --- a/asm/musyx/seq.s +++ b/asm/musyx/seq.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global seqNote seqNote: .skip 0x1400 @@ -12,6 +13,7 @@ seqMIDIPriority: .skip 0x100 .section .sbss +.balign 8 seq_next_id: .skip 0x4 curFadeOutState: @@ -30,6 +32,7 @@ seqActiveRoot: .skip 0x4 .section .sdata2 +.balign 8 .global lbl_805AF210 lbl_805AF210: # ROM: 0x3FBAB0 @@ -60,6 +63,7 @@ lbl_805AF228: .section .data, "wa" +.balign 8 .global lbl_803F2F88 lbl_803F2F88: diff --git a/asm/musyx/snd3d.s b/asm/musyx/snd3d.s index 7a0b5546..22dfd03f 100644 --- a/asm/musyx/snd3d.s +++ b/asm/musyx/snd3d.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global "tmp_em$388" "tmp_em$388": .skip 0x50 @@ -15,6 +16,7 @@ startListNum: .skip 0x700 .section .sbss +.balign 8 .balign 4 .global runListNum runListNum: @@ -54,6 +56,7 @@ s3dCallCnt: .skip 0x4 .section .sdata2 +.balign 8 .global lbl_805AF328 lbl_805AF328: # ROM: 0x3FBBC8 diff --git a/asm/musyx/snd_math.s b/asm/musyx/snd_math.s index 40ac269a..3f228eba 100644 --- a/asm/musyx/snd_math.s +++ b/asm/musyx/snd_math.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AF378 lbl_805AF378: # ROM: 0x3FBC18 diff --git a/asm/musyx/snd_midictrl.s b/asm/musyx/snd_midictrl.s index 75d4eccc..bce75048 100644 --- a/asm/musyx/snd_midictrl.s +++ b/asm/musyx/snd_midictrl.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 inpGlobalMIDIDirtyFlags: .skip 0x200 midi_ctrl: @@ -17,6 +18,7 @@ fx_lastNote: .skip 0x40 .section .data, "wa" +.balign 8 .global lbl_803F41E8 lbl_803F41E8: @@ -74,6 +76,7 @@ lbl_803F4250: .skip 4 .section .rodata +.balign 8 .global lbl_803D8AC0 lbl_803D8AC0: # ROM: 0x3D5AC0 diff --git a/asm/musyx/snd_service.s b/asm/musyx/snd_service.s index 4e853500..fba4f0f1 100644 --- a/asm/musyx/snd_service.s +++ b/asm/musyx/snd_service.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data, "wa" +.balign 8 .global sndSintab sndSintab: @@ -71,6 +72,7 @@ sndSintab: .skip 8 .section .sdata, "wa" +.balign 8 .global last_rnd last_rnd: .4byte 1 diff --git a/asm/musyx/stream.s b/asm/musyx/stream.s index 3d3f8fde..522f2582 100644 --- a/asm/musyx/stream.s +++ b/asm/musyx/stream.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .bss +.balign 8 .global streamInfo streamInfo: .skip 0x1900 .section .sbss +.balign 8 .balign 4 nextPublicID: .skip 0x4 @@ -15,6 +17,7 @@ streamCallCnt: .skip 0x3 .section .sdata2 +.balign 8 .global lbl_805AF270 lbl_805AF270: # ROM: 0x3FBB10 diff --git a/asm/musyx/synth.s b/asm/musyx/synth.s index ce26968e..0ebb4b17 100644 --- a/asm/musyx/synth.s +++ b/asm/musyx/synth.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AF230 lbl_805AF230: # ROM: 0x3FBAD0 @@ -70,6 +71,7 @@ lbl_805AF26C: .section .bss +.balign 8 .global synthTicksPerSecond synthTicksPerSecond: .skip 0x240 @@ -111,6 +113,7 @@ inpAuxA: .skip 0x484 .section .sbss +.balign 8 .balign 4 .global sndActive sndActive: diff --git a/asm/musyx/synth_ac.s b/asm/musyx/synth_ac.s index e5172503..6b4d2029 100644 --- a/asm/musyx/synth_ac.s +++ b/asm/musyx/synth_ac.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .data +.balign 8 .global toneup_tab toneup_tab: @@ -267,6 +268,7 @@ tonedown_tab: .4byte 0x3A2AC000 .section .sdata2 +.balign 8 .global lbl_805AF2B0 lbl_805AF2B0: # ROM: 0x3FBB50 diff --git a/asm/musyx/synth_adsr.s b/asm/musyx/synth_adsr.s index b59099e9..36e60aaf 100644 --- a/asm/musyx/synth_adsr.s +++ b/asm/musyx/synth_adsr.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .sdata2 +.balign 8 .global lbl_805AF2C8 lbl_805AF2C8: # ROM: 0x3FBB68 diff --git a/asm/musyx/synthdata.s b/asm/musyx/synthdata.s index 0fba0e3c..c0b7c3ec 100644 --- a/asm/musyx/synthdata.s +++ b/asm/musyx/synthdata.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global dataKeymapTab dataKeymapTab: .skip 0x800 @@ -33,6 +34,7 @@ dataMacSubTabmem: .skip 0xC .section .sbss +.balign 8 .balign 4 "result$494": .skip 0x4 diff --git a/asm/musyx/synthmacros.s b/asm/musyx/synthmacros.s index bde5b0c4..12dc3985 100644 --- a/asm/musyx/synthmacros.s +++ b/asm/musyx/synthmacros.s @@ -1,11 +1,13 @@ .include "macros.inc" .section .bss +.balign 8 .global "newsmp$473" "newsmp$473": .skip 0x20 .section .sbss +.balign 8 "cstep$1643": .skip 0x8 macRealTime: @@ -18,6 +20,7 @@ DebugMacroSteps: .skip 0x8 .section .data, "wa" +.balign 8 "kf$395": # ROM: 0x3EFFD8 .4byte 0x100010F3 @@ -314,6 +317,7 @@ midi2TimeTab: .4byte lbl_803A6AF4 .section .sdata2 +.balign 8 .global lbl_805AF288 lbl_805AF288: # ROM: 0x3FBB28 diff --git a/asm/musyx/synthvoice.s b/asm/musyx/synthvoice.s index 995054e9..c531f06d 100644 --- a/asm/musyx/synthvoice.s +++ b/asm/musyx/synthvoice.s @@ -1,6 +1,7 @@ .include "macros.inc" .section .bss +.balign 8 .global vidList vidList: .skip 0xF00 @@ -15,6 +16,7 @@ vs: .skip 0x950 .section .sbss +.balign 8 .balign 4 .global vidFree vidFree: diff --git a/obj_files.mk b/obj_files.mk index bd1c5e90..471fd840 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -10,7 +10,6 @@ METROIDPRIME :=\ $(BUILD_DIR)/asm/MetroidPrime/main.o\ $(BUILD_DIR)/asm/MetroidPrime/text_80008894_80009144.o\ $(BUILD_DIR)/asm/MetroidPrime/IRenderer.o\ - $(BUILD_DIR)/asm/MetroidPrime/CArchitectureMessage.o\ $(BUILD_DIR)/asm/MetroidPrime/Cameras/CCameraManager.o\ $(BUILD_DIR)/asm/MetroidPrime/CControlMapper.o\ $(BUILD_DIR)/asm/MetroidPrime/Cameras/CFirstPersonCamera.o\ @@ -22,8 +21,7 @@ METROIDPRIME :=\ $(BUILD_DIR)/asm/MetroidPrime/CInputGenerator.o\ $(BUILD_DIR)/asm/MetroidPrime/CMainFlow.o\ $(BUILD_DIR)/asm/MetroidPrime/CMFGame.o\ - $(BUILD_DIR)/asm/MetroidPrime/CAutoSave.o\ - $(BUILD_DIR)/asm/MetroidPrime/CPlayMovie.o\ + $(BUILD_DIR)/asm/MetroidPrime/CCredits.o\ $(BUILD_DIR)/asm/MetroidPrime/CSplashScreen.o\ $(BUILD_DIR)/asm/MetroidPrime/CInstruction.o\ $(BUILD_DIR)/asm/MetroidPrime/CAnimData.o\ @@ -98,7 +96,6 @@ METROIDPRIME :=\ $(BUILD_DIR)/asm/MetroidPrime/CMemoryDrawEnum.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDock.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.o\ - $(BUILD_DIR)/asm/MetroidPrime/Cameras/CCameraHint.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptLoader.o\ $(BUILD_DIR)/asm/MetroidPrime/CSamusDoll.o\ $(BUILD_DIR)/asm/MetroidPrime/Factories/CStateMachineFactory.o\ @@ -566,8 +563,6 @@ KYOTO :=\ $(BUILD_DIR)/asm/Kyoto/Streams/COutputStream.o\ $(BUILD_DIR)/asm/Kyoto/Streams/CZipInputStream.o\ $(BUILD_DIR)/asm/Kyoto/Streams/CZipSupport.o\ - $(BUILD_DIR)/asm/Kyoto/CFactoryStore.o\ - $(BUILD_DIR)/asm/Kyoto/CObjectReference.o\ $(BUILD_DIR)/asm/Kyoto/CSimplePool.o\ $(BUILD_DIR)/asm/Kyoto/CToken.o\ $(BUILD_DIR)/asm/Kyoto/IObj.o\