diff --git a/asm/Collision/CollisionUtil.s b/asm/Collision/CollisionUtil.s index 427cfff9..1d4ceab6 100644 --- a/asm/Collision/CollisionUtil.s +++ b/asm/Collision/CollisionUtil.s @@ -3669,13 +3669,13 @@ RayAABoxIntersection_Double__13CollisionUtilFRC5CMRayRC6CAABoxR9CVector3fRd: /* 802D30FC 002D005C DB A1 00 C0 */ stfd f29, 0xc0(r1) /* 802D3100 002D0060 F3 A1 00 C8 */ psq_st f29, 200(r1), 0, qr0 /* 802D3104 002D0064 BF 61 00 AC */ stmw r27, 0xac(r1) -/* 802D3108 002D0068 3C E0 80 3D */ lis r7, lbl_803D0004@ha +/* 802D3108 002D0068 3C E0 80 3D */ lis r7, lbl_803D6A68@ha /* 802D310C 002D006C 7C 7B 1B 78 */ mr r27, r3 -/* 802D3110 002D0070 84 67 6A 68 */ lwzu r3, 0x6a68(r7) +/* 802D3110 002D0070 84 67 6A 68 */ lwzu r3, lbl_803D6A68@l(r7) /* 802D3114 002D0074 7C BE 2B 78 */ mr r30, r5 /* 802D3118 002D0078 7C 9C 23 78 */ mr r28, r4 /* 802D311C 002D007C 7C DF 33 78 */ mr r31, r6 -/* 802D3120 002D0080 80 A7 00 04 */ lwz r5, lbl_803D0004@l(r7) +/* 802D3120 002D0080 80 A7 00 04 */ lwz r5, 4(r7) /* 802D3124 002D0084 7F 64 DB 78 */ mr r4, r27 /* 802D3128 002D0088 80 07 00 08 */ lwz r0, 8(r7) /* 802D312C 002D008C 3B A0 00 01 */ li r29, 1 @@ -4758,6 +4758,9 @@ lbl_803D6A5C: .float -1.0 .float -1.0 .float -1.0 + +.global lbl_803D6A68 +lbl_803D6A68: .4byte 0x00000002 .4byte 0x00000002 .4byte 0x00000002 diff --git a/asm/Dolphin/PPCArch.s b/asm/Dolphin/PPCArch.s new file mode 100644 index 00000000..afc3043c --- /dev/null +++ b/asm/Dolphin/PPCArch.s @@ -0,0 +1,120 @@ +.include "macros.inc" + +.section .text, "ax" + +.global PPCMfmsr +PPCMfmsr: +/* 8036F7D4 0036C734 7C 60 00 A6 */ mfmsr r3 +/* 8036F7D8 0036C738 4E 80 00 20 */ blr + +.global PPCMtmsr +PPCMtmsr: +/* 8036F7DC 0036C73C 7C 60 01 24 */ mtmsr r3 +/* 8036F7E0 0036C740 4E 80 00 20 */ blr + +.global PPCMfhid0 +PPCMfhid0: +/* 8036F7E4 0036C744 7C 70 FA A6 */ mfspr r3, 0x3f0 +/* 8036F7E8 0036C748 4E 80 00 20 */ blr + +.global PPCMthid0 +PPCMthid0: +/* 8036F7EC 0036C74C 7C 70 FB A6 */ mtspr 0x3f0, r3 +/* 8036F7F0 0036C750 4E 80 00 20 */ blr + +.global PPCMfl2cr +PPCMfl2cr: +/* 8036F7F4 0036C754 7C 79 FA A6 */ mfspr r3, 0x3f9 +/* 8036F7F8 0036C758 4E 80 00 20 */ blr + +.global PPCMtl2cr +PPCMtl2cr: +/* 8036F7FC 0036C75C 7C 79 FB A6 */ mtspr 0x3f9, r3 +/* 8036F800 0036C760 4E 80 00 20 */ blr + +.global PPCMtdec +PPCMtdec: +/* 8036F804 0036C764 7C 76 03 A6 */ mtspr 0x16, r3 +/* 8036F808 0036C768 4E 80 00 20 */ blr + +.global PPCSync +PPCSync: +/* 8036F80C 0036C76C 44 00 00 02 */ sc +/* 8036F810 0036C770 4E 80 00 20 */ blr + +.global PPCHalt +PPCHalt: +/* 8036F814 0036C774 7C 00 04 AC */ sync +lbl_8036F818: +/* 8036F818 0036C778 60 00 00 00 */ nop +/* 8036F81C 0036C77C 38 60 00 00 */ li r3, 0 +/* 8036F820 0036C780 60 00 00 00 */ nop +/* 8036F824 0036C784 4B FF FF F4 */ b lbl_8036F818 + +.global PPCMffpscr +PPCMffpscr: +/* 8036F828 0036C788 94 21 FF E8 */ stwu r1, -0x18(r1) +/* 8036F82C 0036C78C DB E1 00 10 */ stfd f31, 0x10(r1) +/* 8036F830 0036C790 FF E0 04 8E */ mffs f31 +/* 8036F834 0036C794 DB E1 00 08 */ stfd f31, 8(r1) +/* 8036F838 0036C798 80 61 00 0C */ lwz r3, 0xc(r1) +/* 8036F83C 0036C79C CB E1 00 10 */ lfd f31, 0x10(r1) +/* 8036F840 0036C7A0 38 21 00 18 */ addi r1, r1, 0x18 +/* 8036F844 0036C7A4 4E 80 00 20 */ blr + +.global PPCMtfpscr +PPCMtfpscr: +/* 8036F848 0036C7A8 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8036F84C 0036C7AC DB E1 00 18 */ stfd f31, 0x18(r1) +/* 8036F850 0036C7B0 38 80 00 00 */ li r4, 0 +/* 8036F854 0036C7B4 90 81 00 10 */ stw r4, 0x10(r1) +/* 8036F858 0036C7B8 90 61 00 14 */ stw r3, 0x14(r1) +/* 8036F85C 0036C7BC CB E1 00 10 */ lfd f31, 0x10(r1) +/* 8036F860 0036C7C0 FD FE FD 8E */ mtfsf 0xff, f31 +/* 8036F864 0036C7C4 CB E1 00 18 */ lfd f31, 0x18(r1) +/* 8036F868 0036C7C8 38 21 00 20 */ addi r1, r1, 0x20 +/* 8036F86C 0036C7CC 4E 80 00 20 */ blr + +.global PPCMfhid2 +PPCMfhid2: +/* 8036F870 0036C7D0 7C 78 E2 A6 */ mfspr r3, 0x398 +/* 8036F874 0036C7D4 4E 80 00 20 */ blr + +.global PPCMthid2 +PPCMthid2: +/* 8036F878 0036C7D8 7C 78 E3 A6 */ mtspr 0x398, r3 +/* 8036F87C 0036C7DC 4E 80 00 20 */ blr + +.global PPCMfwpar +PPCMfwpar: +/* 8036F880 0036C7E0 7C 00 04 AC */ sync +/* 8036F884 0036C7E4 7C 79 E2 A6 */ mfspr r3, 0x399 +/* 8036F888 0036C7E8 4E 80 00 20 */ blr + +.global PPCMtwpar +PPCMtwpar: +/* 8036F88C 0036C7EC 7C 79 E3 A6 */ mtspr 0x399, r3 +/* 8036F890 0036C7F0 4E 80 00 20 */ blr + +.global PPCDisableSpeculation +PPCDisableSpeculation: +/* 8036F894 0036C7F4 7C 08 02 A6 */ mflr r0 +/* 8036F898 0036C7F8 90 01 00 04 */ stw r0, 4(r1) +/* 8036F89C 0036C7FC 94 21 FF F8 */ stwu r1, -8(r1) +/* 8036F8A0 0036C800 4B FF FF 45 */ bl PPCMfhid0 +/* 8036F8A4 0036C804 60 63 02 00 */ ori r3, r3, 0x200 +/* 8036F8A8 0036C808 4B FF FF 45 */ bl PPCMthid0 +/* 8036F8AC 0036C80C 80 01 00 0C */ lwz r0, 0xc(r1) +/* 8036F8B0 0036C810 38 21 00 08 */ addi r1, r1, 8 +/* 8036F8B4 0036C814 7C 08 03 A6 */ mtlr r0 +/* 8036F8B8 0036C818 4E 80 00 20 */ blr + +.global PPCSetFpIEEEMode +PPCSetFpIEEEMode: +/* 8036F8BC 0036C81C FF A0 00 8C */ mtfsb0 0x1d +/* 8036F8C0 0036C820 4E 80 00 20 */ blr + +.global PPCSetFpNonIEEEMode +PPCSetFpNonIEEEMode: +/* 8036F8C4 0036C824 FF A0 00 4C */ mtfsb1 0x1d +/* 8036F8C8 0036C828 4E 80 00 20 */ blr diff --git a/asm/Dolphin/db.s b/asm/Dolphin/db.s index 361bb178..1ad56aa7 100644 --- a/asm/Dolphin/db.s +++ b/asm/Dolphin/db.s @@ -38,7 +38,7 @@ __DBExceptionDestinationAux: /* 8036F904 0036C864 4C C6 31 82 */ crclr 6 /* 8036F908 0036C868 94 21 FF E8 */ stwu r1, -0x18(r1) /* 8036F90C 0036C86C 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8036F910 0036C870 80 80 00 C0 */ lwz r4, 0xc0(0) +/* 8036F910 0036C870 80 80 00 C0 */ lwz r4, 0xc0(r0) /* 8036F914 0036C874 3F E4 80 00 */ addis r31, r4, 0x8000 /* 8036F918 0036C878 48 01 00 95 */ bl OSReport /* 8036F91C 0036C87C 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/Dolphin/dvd/dvd.s b/asm/Dolphin/dvd/dvd.s index c757ff01..297bdee7 100644 --- a/asm/Dolphin/dvd/dvd.s +++ b/asm/Dolphin/dvd/dvd.s @@ -6,7 +6,7 @@ .global lbl_805A8A98 lbl_805A8A98: # ROM: 0x3F6438 - .4byte 0x803EFF80 + .4byte lbl_803EFF80 .global lbl_805A8A9C lbl_805A8A9C: @@ -16,7 +16,7 @@ lbl_805A8A9C: .global lbl_805A8AA0 lbl_805A8AA0: # ROM: 0x3F6440 - .4byte 0x80371BA0 + .4byte lbl_80371BA0 .global lbl_805A8AA4 lbl_805A8AA4: @@ -86,6 +86,14 @@ lbl_805A9818: .section .data .balign 8 + +.global lbl_803EFF80 +lbl_803EFF80: + + # ROM: 0x3ECF80 + .asciz "<< Dolphin SDK - DVD\trelease build: Sep 5 2002 05:34:06 (0x2301) >>" + .balign 4 + .global lbl_803EFFC8 lbl_803EFFC8: # ROM: 0x3ECFC8 @@ -107,31 +115,32 @@ lbl_803EFFD4: .4byte 0x20697320 .4byte 0x746F6F20 .4byte 0x6269672E - -.global lbl_803F0004 -lbl_803F0004: - # ROM: 0x3ED004 .4byte 0x20202000 .global lbl_803F0008 lbl_803F0008: # ROM: 0x3ED008 - .4byte 0x803731D8 - .4byte 0x80372F4C - .4byte 0x80372FEC - .4byte 0x80373010 - .4byte 0x80372F4C - .4byte 0x80372F20 - .4byte 0x80373030 - .4byte 0x80373094 - .4byte 0x803730C0 - .4byte 0x803730F4 - .4byte 0x80373118 - .4byte 0x8037313C - .4byte 0x80373160 - .4byte 0x80373184 - .4byte 0x803731AC - .4byte 0x80373020 + .4byte lbl_803731D8 + .4byte lbl_80372F4C + .4byte lbl_80372FEC + .4byte lbl_80373010 + .4byte lbl_80372F4C + .4byte lbl_80372F20 + .4byte lbl_80373030 + .4byte lbl_80373094 + .4byte lbl_803730C0 + .4byte lbl_803730F4 + .4byte lbl_80373118 + .4byte lbl_8037313C + .4byte lbl_80373160 + .4byte lbl_80373184 + .4byte lbl_803731AC + .4byte lbl_80373020 + +.global lbl_803F0048 +lbl_803F0048: + + # ROM: 0x3ED048 .4byte 0xFFFFFFFF .4byte 0xFFFFFFFF .4byte 0xFFFFFFFF @@ -141,40 +150,44 @@ lbl_803F0008: .global lbl_803F0098 lbl_803F0098: # ROM: 0x3ED098 - .4byte 0x8037425C - .4byte 0x8037425C - .4byte 0x8037427C - .4byte 0x803742C0 - .4byte 0x8037430C - .4byte 0x80374388 - .4byte 0x80374388 - .4byte 0x80374388 - .4byte 0x80374388 - .4byte 0x80374454 - .4byte 0x80374454 - .4byte 0x8037425C - .4byte 0x80374388 + .4byte lbl_8037425C + .4byte lbl_8037425C + .4byte lbl_8037427C + .4byte lbl_803742C0 + .4byte lbl_8037430C + .4byte lbl_80374388 + .4byte lbl_80374388 + .4byte lbl_80374388 + .4byte lbl_80374388 + .4byte lbl_80374454 + .4byte lbl_80374454 + .4byte lbl_8037425C + .4byte lbl_80374388 .global lbl_803F00CC lbl_803F00CC: # ROM: 0x3ED0CC - .4byte 0x80374750 - .4byte 0x80374758 - .4byte 0x80374748 - .4byte 0x80374748 - .4byte 0x80374750 - .4byte 0x80374750 - .4byte 0x80374750 - .4byte 0x80374750 - .4byte 0x80374750 - .4byte 0x80374758 - .4byte 0x80374748 - .4byte 0x80374748 - .4byte 0x80374750 + .4byte lbl_80374750 + .4byte lbl_80374758 + .4byte lbl_80374748 + .4byte lbl_80374748 + .4byte lbl_80374750 + .4byte lbl_80374750 + .4byte lbl_80374750 + .4byte lbl_80374750 + .4byte lbl_80374750 + .4byte lbl_80374758 + .4byte lbl_80374748 + .4byte lbl_80374748 + .4byte lbl_80374750 .section .text, "ax" +.global lbl_80371BA0 +lbl_80371BA0: +/* 80371BA0 0036EB00 4E 80 00 20 */ blr + .global DVDInit DVDInit: /* 80371BA4 0036EB04 7C 08 02 A6 */ mflr r0 @@ -1616,6 +1629,7 @@ stateBusy: /* 80372F14 0036FE74 7C 03 00 2E */ lwzx r0, r3, r0 /* 80372F18 0036FE78 7C 09 03 A6 */ mtctr r0 /* 80372F1C 0036FE7C 4E 80 04 20 */ bctr +lbl_80372F20: /* 80372F20 0036FE80 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 80372F24 0036FE84 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 80372F28 0036FE88 38 A3 60 00 */ addi r5, r3, 0x6000 @@ -1627,6 +1641,7 @@ stateBusy: /* 80372F40 0036FEA0 80 67 00 18 */ lwz r3, 0x18(r7) /* 80372F44 0036FEA4 4B FF DE 5D */ bl DVDLowReadDiskID /* 80372F48 0036FEA8 48 00 02 A8 */ b lbl_803731F0 +lbl_80372F4C: /* 80372F4C 0036FEAC 80 07 00 14 */ lwz r0, 0x14(r7) /* 80372F50 0036FEB0 28 00 00 00 */ cmplwi r0, 0 /* 80372F54 0036FEB4 40 82 00 3C */ bne lbl_80372F90 @@ -1671,6 +1686,7 @@ lbl_80372FC0: /* 80372FE0 0036FF40 7C A0 2A 14 */ add r5, r0, r5 /* 80372FE4 0036FF44 4B FF DA 65 */ bl DVDLowRead /* 80372FE8 0036FF48 48 00 02 08 */ b lbl_803731F0 +lbl_80372FEC: /* 80372FEC 0036FF4C 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 80372FF0 0036FF50 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 80372FF4 0036FF54 38 A3 60 00 */ addi r5, r3, 0x6000 @@ -1680,14 +1696,17 @@ lbl_80372FC0: /* 80373004 0036FF64 80 67 00 10 */ lwz r3, 0x10(r7) /* 80373008 0036FF68 4B FF DC D9 */ bl DVDLowSeek /* 8037300C 0036FF6C 48 00 01 E4 */ b lbl_803731F0 +lbl_80373010: /* 80373010 0036FF70 3C 60 80 37 */ lis r3, cbForStateBusy@ha /* 80373014 0036FF74 38 63 32 00 */ addi r3, r3, cbForStateBusy@l /* 80373018 0036FF78 4B FF DE 2D */ bl DVDLowStopMotor /* 8037301C 0036FF7C 48 00 01 D4 */ b lbl_803731F0 +lbl_80373020: /* 80373020 0036FF80 3C 60 80 37 */ lis r3, cbForStateBusy@ha /* 80373024 0036FF84 38 63 32 00 */ addi r3, r3, cbForStateBusy@l /* 80373028 0036FF88 4B FF DE 1D */ bl DVDLowStopMotor /* 8037302C 0036FF8C 48 00 01 C4 */ b lbl_803731F0 +lbl_80373030: /* 80373030 0036FF90 3C 60 CC 00 */ lis r3, 0xCC006000@ha /* 80373034 0036FF94 38 63 60 00 */ addi r3, r3, 0xCC006000@l /* 80373038 0036FF98 80 03 00 04 */ lwz r0, 4(r3) @@ -1714,6 +1733,7 @@ lbl_8037306C: /* 80373088 0036FFE8 80 A7 00 10 */ lwz r5, 0x10(r7) /* 8037308C 0036FFEC 4B FF DF 6D */ bl DVDLowAudioStream /* 80373090 0036FFF0 48 00 01 60 */ b lbl_803731F0 +lbl_80373094: /* 80373094 0036FFF4 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 80373098 0036FFF8 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 8037309C 0036FFFC 38 83 60 00 */ addi r4, r3, 0x6000 @@ -1725,6 +1745,7 @@ lbl_8037306C: /* 803730B4 00370014 38 A0 00 00 */ li r5, 0 /* 803730B8 00370018 4B FF DF 41 */ bl DVDLowAudioStream /* 803730BC 0037001C 48 00 01 34 */ b lbl_803731F0 +lbl_803730C0: /* 803730C0 00370020 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 803730C4 00370024 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 803730C8 00370028 38 83 60 00 */ addi r4, r3, 0x6000 @@ -1738,6 +1759,7 @@ lbl_8037306C: /* 803730E8 00370048 38 A0 00 00 */ li r5, 0 /* 803730EC 0037004C 4B FF DF 0D */ bl DVDLowAudioStream /* 803730F0 00370050 48 00 01 00 */ b lbl_803731F0 +lbl_803730F4: /* 803730F4 00370054 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 803730F8 00370058 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 803730FC 0037005C 38 A3 60 00 */ addi r5, r3, 0x6000 @@ -1747,6 +1769,7 @@ lbl_8037306C: /* 8037310C 0037006C 38 60 00 00 */ li r3, 0 /* 80373110 00370070 4B FF DF 81 */ bl DVDLowRequestAudioStatus /* 80373114 00370074 48 00 00 DC */ b lbl_803731F0 +lbl_80373118: /* 80373118 00370078 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 8037311C 0037007C 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 80373120 00370080 38 A3 60 00 */ addi r5, r3, 0x6000 @@ -1756,6 +1779,7 @@ lbl_8037306C: /* 80373130 00370090 3C 60 00 01 */ lis r3, 1 /* 80373134 00370094 4B FF DF 5D */ bl DVDLowRequestAudioStatus /* 80373138 00370098 48 00 00 B8 */ b lbl_803731F0 +lbl_8037313C: /* 8037313C 0037009C 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 80373140 003700A0 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 80373144 003700A4 38 A3 60 00 */ addi r5, r3, 0x6000 @@ -1765,6 +1789,7 @@ lbl_8037306C: /* 80373154 003700B4 3C 60 00 02 */ lis r3, 2 /* 80373158 003700B8 4B FF DF 39 */ bl DVDLowRequestAudioStatus /* 8037315C 003700BC 48 00 00 94 */ b lbl_803731F0 +lbl_80373160: /* 80373160 003700C0 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 80373164 003700C4 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 80373168 003700C8 38 A3 60 00 */ addi r5, r3, 0x6000 @@ -1774,6 +1799,7 @@ lbl_8037306C: /* 80373178 003700D8 3C 60 00 03 */ lis r3, 3 /* 8037317C 003700DC 4B FF DF 15 */ bl DVDLowRequestAudioStatus /* 80373180 003700E0 48 00 00 70 */ b lbl_803731F0 +lbl_80373184: /* 80373184 003700E4 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 80373188 003700E8 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 8037318C 003700EC 38 83 60 00 */ addi r4, r3, 0x6000 @@ -1784,6 +1810,7 @@ lbl_8037306C: /* 803731A0 00370100 80 87 00 14 */ lwz r4, 0x14(r7) /* 803731A4 00370104 4B FF DF 79 */ bl DVDLowAudioBufferConfig /* 803731A8 00370108 48 00 00 48 */ b lbl_803731F0 +lbl_803731AC: /* 803731AC 0037010C 3C 60 CC 00 */ lis r3, 0xCC006004@ha /* 803731B0 00370110 80 03 60 04 */ lwz r0, 0xCC006004@l(r3) /* 803731B4 00370114 38 A3 60 00 */ addi r5, r3, 0x6000 @@ -2049,8 +2076,8 @@ lbl_80373534: /* 80373544 003704A4 38 00 00 01 */ li r0, 1 /* 80373548 003704A8 48 00 00 48 */ b lbl_80373590 lbl_8037354C: -/* 8037354C 003704AC 3C 60 80 3F */ lis r3, 0x803f -/* 80373550 003704B0 84 03 00 48 */ lwzu r0, 0x48(r3) +/* 8037354C 003704AC 3C 60 80 3F */ lis r3, lbl_803F0048@ha +/* 80373550 003704B0 84 03 00 48 */ lwzu r0, lbl_803F0048@l(r3) /* 80373554 003704B4 7C 04 00 40 */ cmplw r4, r0 /* 80373558 003704B8 40 82 00 0C */ bne lbl_80373564 /* 8037355C 003704BC 38 00 00 01 */ li r0, 1 @@ -3005,6 +3032,7 @@ DVDCancelAsync: /* 80374250 003711B0 7C 03 00 2E */ lwzx r0, r3, r0 /* 80374254 003711B4 7C 09 03 A6 */ mtctr r0 /* 80374258 003711B8 4E 80 04 20 */ bctr +lbl_8037425C: /* 8037425C 003711BC 28 1E 00 00 */ cmplwi r30, 0 /* 80374260 003711C0 41 82 01 F4 */ beq lbl_80374454 /* 80374264 003711C4 39 9E 00 00 */ addi r12, r30, 0 @@ -3013,6 +3041,7 @@ DVDCancelAsync: /* 80374270 003711D0 38 60 00 00 */ li r3, 0 /* 80374274 003711D4 4E 80 00 21 */ blrl /* 80374278 003711D8 48 00 01 DC */ b lbl_80374454 +lbl_8037427C: /* 8037427C 003711DC 80 0D AC 30 */ lwz r0, lbl_805A97F0@sda21(r13) /* 80374280 003711E0 28 00 00 00 */ cmplwi r0, 0 /* 80374284 003711E4 41 82 00 14 */ beq lbl_80374298 @@ -3032,6 +3061,7 @@ lbl_80374298: lbl_803742B8: /* 803742B8 00371218 4B FF CF BD */ bl DVDLowBreak /* 803742BC 0037121C 48 00 01 98 */ b lbl_80374454 +lbl_803742C0: /* 803742C0 00371220 7F A3 EB 78 */ mr r3, r29 /* 803742C4 00371224 48 00 07 8D */ bl __DVDDequeueWaitingQueue /* 803742C8 00371228 38 00 00 0A */ li r0, 0xa @@ -3052,6 +3082,7 @@ lbl_803742EC: /* 80374300 00371260 38 60 00 00 */ li r3, 0 /* 80374304 00371264 4E 80 00 21 */ blrl /* 80374308 00371268 48 00 01 4C */ b lbl_80374454 +lbl_8037430C: /* 8037430C 0037126C 80 1D 00 08 */ lwz r0, 8(r29) /* 80374310 00371270 2C 00 00 0D */ cmpwi r0, 0xd /* 80374314 00371274 41 82 00 28 */ beq lbl_8037433C @@ -3087,6 +3118,7 @@ lbl_80374378: /* 8037437C 003712DC 93 CD AC 34 */ stw r30, lbl_805A97F4@sda21(r13) /* 80374380 003712E0 90 0D AC 30 */ stw r0, lbl_805A97F0@sda21(r13) /* 80374384 003712E4 48 00 00 D0 */ b lbl_80374454 +lbl_80374388: /* 80374388 003712E8 4B FF CF 01 */ bl DVDLowClearCallback /* 8037438C 003712EC 3C 80 80 37 */ lis r4, cbForStateMotorStopped@ha /* 80374390 003712F0 38 04 2B 20 */ addi r0, r4, cbForStateMotorStopped@l @@ -3263,8 +3295,8 @@ lbl_803745AC: /* 803745D0 00371530 7C 7E 1B 78 */ mr r30, r3 /* 803745D4 00371534 48 00 00 20 */ b lbl_803745F4 lbl_803745D8: -/* 803745D8 00371538 3C 60 80 37 */ lis r3, 0x8037 -/* 803745DC 0037153C 34 03 46 84 */ addic. r0, r3, 0x4684 +/* 803745D8 00371538 3C 60 80 37 */ lis r3, sub_80374684@ha +/* 803745DC 0037153C 34 03 46 84 */ addic. r0, r3, sub_80374684@l /* 803745E0 00371540 3B C0 00 01 */ li r30, 1 /* 803745E4 00371544 41 82 00 10 */ beq lbl_803745F4 /* 803745E8 00371548 38 60 00 00 */ li r3, 0 @@ -3374,10 +3406,13 @@ lbl_80374724: /* 8037473C 0037169C 7C 04 00 2E */ lwzx r0, r4, r0 /* 80374740 003716A0 7C 09 03 A6 */ mtctr r0 /* 80374744 003716A4 4E 80 04 20 */ bctr +lbl_80374748: /* 80374748 003716A8 3B E0 00 01 */ li r31, 1 /* 8037474C 003716AC 48 00 00 34 */ b lbl_80374780 +lbl_80374750: /* 80374750 003716B0 3B E0 00 00 */ li r31, 0 /* 80374754 003716B4 48 00 00 2C */ b lbl_80374780 +lbl_80374758: /* 80374758 003716B8 3C 80 CC 00 */ lis r4, 0xCC006000@ha /* 8037475C 003716BC 38 84 60 00 */ addi r4, r4, 0xCC006000@l /* 80374760 003716C0 80 84 00 04 */ lwz r4, 4(r4) diff --git a/asm/Dolphin/dvd/dvderror.s b/asm/Dolphin/dvd/dvderror.s index cc618f80..4695ad94 100644 --- a/asm/Dolphin/dvd/dvderror.s +++ b/asm/Dolphin/dvd/dvderror.s @@ -23,6 +23,11 @@ lbl_803F0100: .4byte 0x00040800 .4byte 0x00100007 .4byte 0 + +.global lbl_803F0148 +lbl_803F0148: + + # ROM: 0x3ED148 .4byte 0x0A0A0A83 .4byte 0x47838981 .4byte 0x5B82AA94 @@ -51,8 +56,18 @@ lbl_803F0100: .4byte 0xAD82BE82 .4byte 0xB382A281 .4byte 0x42000000 + +.global lbl_803F01B8 +lbl_803F01B8: + + # ROM: 0x3ED1B8 .asciz "\n\n\nAn error has occurred.\nTurn the power off and refer to the\nNintendo GameCube Instruction Booklet\nfor further instructions." .balign 4 + +.global lbl_803F0238 +lbl_803F0238: + + # ROM: 0x3ED238 .4byte 0x0A0A0A41 .4byte 0x6E206572 .4byte 0x726F7220 @@ -75,8 +90,18 @@ lbl_803F0100: .4byte 0x75626599 .asciz " Instruction Booklet\nfor further instructions." .balign 4 + +.global lbl_803F02B8 +lbl_803F02B8: + + # ROM: 0x3ED2B8 .asciz "\n\n\nEin Fehler ist aufgetreten.\nBitte schalten Sie den NINTENDO GAMECUBE\naus und lesen Sie die Bedienungsanleitung,\num weitere Informationen zu erhalten." .balign 4 + +.global lbl_803F0354 +lbl_803F0354: + + # ROM: 0x3ED354 .4byte 0x0A0A0A55 .4byte 0x6E652065 .4byte 0x72726575 @@ -93,6 +118,11 @@ lbl_803F0100: .4byte 0xE966E972 .asciz "ez-vous au\nmanuel d'instructions NINTENDO GAMECUBE\npour de plus amples informations." .balign 4 + +.global lbl_803F03E4 +lbl_803F03E4: + + # ROM: 0x3ED3E4 .4byte 0x0A0A0A53 .4byte 0x65206861 .4byte 0x2070726F @@ -127,9 +157,19 @@ lbl_803F0100: .4byte 0x666F726D .4byte 0x616369F3 .4byte 0x6E2E0000 + +.global lbl_803F046C +lbl_803F046C: + + # ROM: 0x3ED46C .4byte 0x0A0A0A53 .4byte 0x6920E820 .asciz "verificato un errore.\nSpegni (OFF) e controlla il manuale\nd'istruzioni del NINTENDO GAMECUBE\nper ulteriori indicazioni." + +.global lbl_803F04EC +lbl_803F04EC: + + # ROM: 0x3ED4EC .asciz "\n\n\nEr is een fout opgetreden.\nZet de NINTENDO GAMECUBE uit en\nraadpleeg de handleiding van de\nNintendo GameCube voor nadere\ninstructies." .balign 4 diff --git a/asm/Dolphin/dvd/dvdfs.s b/asm/Dolphin/dvd/dvdfs.s index eca9e738..0427b507 100644 --- a/asm/Dolphin/dvd/dvdfs.s +++ b/asm/Dolphin/dvd/dvdfs.s @@ -56,8 +56,6 @@ lbl_803EFC90: .asciz "DVDPrepareStream(): Specified length (0x%x) is not a multiple of 32768(32*1024)" .asciz "DVDPrepareStream(): The area specified (offset(0x%x), length(0x%x)) is out of the file" .balign 4 - .asciz "<< Dolphin SDK - DVD\trelease build: Sep 5 2002 05:34:06 (0x2301) >>" - .balign 4 .section .text, "ax" @@ -731,7 +729,3 @@ lbl_80371B90: /* 80371B98 0036EAF8 7C 08 03 A6 */ mtlr r0 /* 80371B9C 0036EAFC 4E 80 00 20 */ blr -.global nullsub_62 -nullsub_62: -/* 80371BA0 0036EB00 4E 80 00 20 */ blr - diff --git a/asm/Dolphin/os/OS.s b/asm/Dolphin/os/OS.s index c83bb423..1487eb6e 100644 --- a/asm/Dolphin/os/OS.s +++ b/asm/Dolphin/os/OS.s @@ -289,8 +289,8 @@ lbl_8037D970: /* 8037D97C 0037A8DC 80 63 00 30 */ lwz r3, 0x30(r3) /* 8037D980 0037A8E0 28 03 00 00 */ cmplwi r3, 0 /* 8037D984 0037A8E4 40 82 00 10 */ bne lbl_8037D994 -/* 8037D988 0037A8E8 3C 60 80 5C */ lis r3, 0x805C20E0@ha -/* 8037D98C 0037A8EC 38 63 20 E0 */ addi r3, r3, 0x805C20E0@l +/* 8037D988 0037A8E8 3C 60 80 5C */ lis r3, __ArenaLo@ha +/* 8037D98C 0037A8EC 38 63 20 E0 */ addi r3, r3, __ArenaLo@l /* 8037D990 0037A8F0 48 00 00 04 */ b lbl_8037D994 lbl_8037D994: /* 8037D994 0037A8F4 48 00 0E 15 */ bl OSSetArenaLo @@ -304,8 +304,8 @@ lbl_8037D994: /* 8037D9B4 0037A914 80 03 00 00 */ lwz r0, 0(r3) /* 8037D9B8 0037A918 28 00 00 02 */ cmplwi r0, 2 /* 8037D9BC 0037A91C 40 80 00 18 */ bge lbl_8037D9D4 -/* 8037D9C0 0037A920 3C 60 80 5C */ lis r3, 0x805C00C8@ha -/* 8037D9C4 0037A924 38 63 00 C8 */ addi r3, r3, 0x805C00C8@l +/* 8037D9C0 0037A920 3C 60 80 5C */ lis r3, _stack_addr@ha +/* 8037D9C4 0037A924 38 63 00 C8 */ addi r3, r3, _stack_addr@l /* 8037D9C8 0037A928 38 03 00 1F */ addi r0, r3, 0x1f /* 8037D9CC 0037A92C 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a /* 8037D9D0 0037A930 48 00 0D D9 */ bl OSSetArenaLo @@ -314,8 +314,8 @@ lbl_8037D9D4: /* 8037D9D8 0037A938 80 63 00 34 */ lwz r3, 0x34(r3) /* 8037D9DC 0037A93C 28 03 00 00 */ cmplwi r3, 0 /* 8037D9E0 0037A940 40 82 00 10 */ bne lbl_8037D9F0 -/* 8037D9E4 0037A944 3C 60 81 70 */ lis r3, 0x81700000@ha -/* 8037D9E8 0037A948 38 63 00 00 */ addi r3, r3, 0x81700000@l +/* 8037D9E4 0037A944 3C 60 81 70 */ lis r3, __ArenaHi@ha +/* 8037D9E8 0037A948 38 63 00 00 */ addi r3, r3, __ArenaHi@l /* 8037D9EC 0037A94C 48 00 00 04 */ b lbl_8037D9F0 lbl_8037D9F0: /* 8037D9F0 0037A950 48 00 0D B1 */ bl OSSetArenaHi @@ -510,7 +510,7 @@ OSExceptionInit: /* 8037DC9C 0037ABFC 7E 83 A3 78 */ mr r3, r20 /* 8037DCA0 0037AC00 7E A4 AB 78 */ mr r4, r21 /* 8037DCA4 0037AC04 48 00 0E 6D */ bl DCFlushRangeNoSync -/* 8037DCA8 0037AC08 7C 00 04 AC */ sync 0 +/* 8037DCA8 0037AC08 7C 00 04 AC */ sync /* 8037DCAC 0037AC0C 7E 83 A3 78 */ mr r3, r20 /* 8037DCB0 0037AC10 7E A4 AB 78 */ mr r4, r21 /* 8037DCB4 0037AC14 48 00 0E E1 */ bl ICInvalidateRange @@ -613,7 +613,7 @@ lbl_8037DDF4: /* 8037DE0C 0037AD6C 7E 83 A3 78 */ mr r3, r20 /* 8037DE10 0037AD70 7E E4 BB 78 */ mr r4, r23 /* 8037DE14 0037AD74 48 00 0C FD */ bl DCFlushRangeNoSync -/* 8037DE18 0037AD78 7C 00 04 AC */ sync 0 +/* 8037DE18 0037AD78 7C 00 04 AC */ sync /* 8037DE1C 0037AD7C 7E 83 A3 78 */ mr r3, r20 /* 8037DE20 0037AD80 7E E4 BB 78 */ mr r4, r23 /* 8037DE24 0037AD84 48 00 0D 71 */ bl ICInvalidateRange @@ -695,7 +695,7 @@ __OSGetExceptionHandler: .global OSExceptionVector OSExceptionVector: /* 8037DEF8 0037AE58 7C 90 43 A6 */ mtspr 0x110, r4 -/* 8037DEFC 0037AE5C 80 80 00 C0 */ lwz r4, 0xc0(0) +/* 8037DEFC 0037AE5C 80 80 00 C0 */ lwz r4, 0xc0(r0) /* 8037DF00 0037AE60 90 64 00 0C */ stw r3, 0xc(r4) /* 8037DF04 0037AE64 7C 70 42 A6 */ mfspr r3, 0x110 /* 8037DF08 0037AE68 90 64 00 10 */ stw r3, 0x10(r4) @@ -723,7 +723,7 @@ __DBVECTOR: /* 8037DF5C 0037AEBC 7C 7B 03 A6 */ mtspr 0x1b, r3 lbl_8037DF60: /* 8037DF60 0037AEC0 38 60 00 00 */ li r3, 0 -/* 8037DF64 0037AEC4 80 80 00 D4 */ lwz r4, 0xd4(0) +/* 8037DF64 0037AEC4 80 80 00 D4 */ lwz r4, 0xd4(r0) /* 8037DF68 0037AEC8 54 A5 07 BD */ rlwinm. r5, r5, 0, 0x1e, 0x1e /* 8037DF6C 0037AECC 40 82 00 14 */ bne lbl_8037DF80 /* 8037DF70 0037AED0 3C A0 80 38 */ lis r5, OSDefaultExceptionHandler@ha @@ -759,7 +759,7 @@ OSDefaultExceptionHandler: /* 8037DFD4 0037AF34 7C 17 E2 A6 */ mfspr r0, 0x397 /* 8037DFD8 0037AF38 90 04 01 C0 */ stw r0, 0x1c0(r4) /* 8037DFDC 0037AF3C 7C B2 02 A6 */ mfdsisr r5 -/* 8037DFE0 0037AF40 7C D3 02 A6 */ mfdar r6 +/* 8037DFE0 0037AF40 7C D3 02 A6 */ mfspr r6, 19 /* 8037DFE4 0037AF44 94 21 FF F8 */ stwu r1, -8(r1) /* 8037DFE8 0037AF48 48 00 1D 88 */ b __OSUnhandledException @@ -772,7 +772,7 @@ __OSPSInit: /* 8037DFFC 0037AF5C 64 63 A0 00 */ oris r3, r3, 0xa000 /* 8037E000 0037AF60 4B FF 18 79 */ bl PPCMthid2 /* 8037E004 0037AF64 48 00 0B C5 */ bl ICFlashInvalidate -/* 8037E008 0037AF68 7C 00 04 AC */ sync 0 +/* 8037E008 0037AF68 7C 00 04 AC */ sync /* 8037E00C 0037AF6C 38 60 00 00 */ li r3, 0 /* 8037E010 0037AF70 7C 70 E3 A6 */ mtspr 0x390, r3 /* 8037E014 0037AF74 80 01 00 0C */ lwz r0, 0xc(r1) diff --git a/asm/Dolphin/os/OSAudioSystem.s b/asm/Dolphin/os/OSAudioSystem.s new file mode 100644 index 00000000..def5b74a --- /dev/null +++ b/asm/Dolphin/os/OSAudioSystem.s @@ -0,0 +1,231 @@ +.include "macros.inc" + +.section .data, "wa" + +.global DSPInitCode +DSPInitCode: + # ROM: 0x3EDFA8 + .4byte 0x029F0010 + .4byte 0x029F0033 + .4byte 0x029F0034 + .4byte 0x029F0035 + .4byte 0x029F0036 + .4byte 0x029F0037 + .4byte 0x029F0038 + .4byte 0x029F0039 + .4byte 0x12061203 + .4byte 0x12041205 + .4byte 0x00808000 + .4byte 0x0088FFFF + .4byte 0x00841000 + .4byte 0x0064001D + .4byte 0x02180000 + .4byte 0x81001C1E + .4byte 0x00441B1E + .4byte 0x00840800 + .4byte 0x00640027 + .4byte 0x191E0000 + .4byte 0x00DEFFFC + .4byte 0x02A08000 + .4byte 0x029C0028 + .4byte 0x16FC0054 + .4byte 0x16FD4348 + .4byte 0x002102FF + .4byte 0x02FF02FF + .4byte 0x02FF02FF + .4byte 0x02FF02FF + .4byte 0 + .4byte 0 + .4byte 0 + +.section .text, "ax" + +.global __OSInitAudioSystem +__OSInitAudioSystem: +/* 8037E7DC 0037B73C 7C 08 02 A6 */ mflr r0 +/* 8037E7E0 0037B740 90 01 00 04 */ stw r0, 4(r1) +/* 8037E7E4 0037B744 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8037E7E8 0037B748 BF 21 00 14 */ stmw r25, 0x14(r1) +/* 8037E7EC 0037B74C 4B FF FF A5 */ bl OSGetArenaHi +/* 8037E7F0 0037B750 3C 80 81 00 */ lis r4, 0x8100 +/* 8037E7F4 0037B754 38 A0 00 80 */ li r5, 0x80 +/* 8037E7F8 0037B758 38 63 FF 80 */ addi r3, r3, -128 +/* 8037E7FC 0037B75C 4B C8 4C 95 */ bl memcpy +/* 8037E800 0037B760 3C 60 80 3F */ lis r3, DSPInitCode@ha +/* 8037E804 0037B764 38 83 0F A8 */ addi r4, r3, DSPInitCode@l +/* 8037E808 0037B768 3C 60 81 00 */ lis r3, 0x8100 +/* 8037E80C 0037B76C 38 A0 00 80 */ li r5, 0x80 +/* 8037E810 0037B770 4B C8 4C 81 */ bl memcpy +/* 8037E814 0037B774 3C 60 81 00 */ lis r3, 0x8100 +/* 8037E818 0037B778 38 80 00 80 */ li r4, 0x80 +/* 8037E81C 0037B77C 48 00 02 95 */ bl DCFlushRange +/* 8037E820 0037B780 3C 60 CC 00 */ lis r3, 0xCC005000@ha +/* 8037E824 0037B784 38 63 50 00 */ addi r3, r3, 0xCC005000@l +/* 8037E828 0037B788 38 00 00 43 */ li r0, 0x43 +/* 8037E82C 0037B78C B0 03 00 12 */ sth r0, 0x12(r3) +/* 8037E830 0037B790 3B E3 00 0A */ addi r31, r3, 0xa +/* 8037E834 0037B794 38 00 08 AC */ li r0, 0x8ac +/* 8037E838 0037B798 B0 03 00 0A */ sth r0, 0xa(r3) +/* 8037E83C 0037B79C A0 03 00 0A */ lhz r0, 0xa(r3) +/* 8037E840 0037B7A0 60 00 00 01 */ ori r0, r0, 1 +/* 8037E844 0037B7A4 B0 03 00 0A */ sth r0, 0xa(r3) +lbl_8037E848: +/* 8037E848 0037B7A8 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037E84C 0037B7AC 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 8037E850 0037B7B0 40 82 FF F8 */ bne lbl_8037E848 +/* 8037E854 0037B7B4 38 00 00 00 */ li r0, 0 +/* 8037E858 0037B7B8 3C 80 CC 00 */ lis r4, 0xCC005000@ha +/* 8037E85C 0037B7BC B0 04 50 00 */ sth r0, 0xCC005000@l(r4) +lbl_8037E860: +/* 8037E860 0037B7C0 3B C4 50 00 */ addi r30, r4, 0x5000 +/* 8037E864 0037B7C4 A4 7E 00 04 */ lhzu r3, 4(r30) +/* 8037E868 0037B7C8 3B A4 50 00 */ addi r29, r4, 0x5000 +/* 8037E86C 0037B7CC A4 1D 00 06 */ lhzu r0, 6(r29) +/* 8037E870 0037B7D0 50 60 80 1E */ rlwimi r0, r3, 0x10, 0, 0xf +/* 8037E874 0037B7D4 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 +/* 8037E878 0037B7D8 40 82 FF E8 */ bne lbl_8037E860 +/* 8037E87C 0037B7DC 3C 60 CC 00 */ lis r3, 0xCC005000@ha +/* 8037E880 0037B7E0 3C 00 01 00 */ lis r0, 0x100 +/* 8037E884 0037B7E4 3B 63 50 00 */ addi r27, r3, 0xCC005000@l +/* 8037E888 0037B7E8 94 1B 00 20 */ stwu r0, 0x20(r27) +/* 8037E88C 0037B7EC 38 00 00 00 */ li r0, 0 +/* 8037E890 0037B7F0 3B 43 50 00 */ addi r26, r3, 0x5000 +/* 8037E894 0037B7F4 94 1A 00 24 */ stwu r0, 0x24(r26) +/* 8037E898 0037B7F8 38 00 00 20 */ li r0, 0x20 +/* 8037E89C 0037B7FC 3B 23 50 00 */ addi r25, r3, 0x5000 +/* 8037E8A0 0037B800 94 19 00 28 */ stwu r0, 0x28(r25) +/* 8037E8A4 0037B804 A0 7F 00 00 */ lhz r3, 0(r31) +/* 8037E8A8 0037B808 48 00 00 08 */ b lbl_8037E8B0 +lbl_8037E8AC: +/* 8037E8AC 0037B80C A0 7F 00 00 */ lhz r3, 0(r31) +lbl_8037E8B0: +/* 8037E8B0 0037B810 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a +/* 8037E8B4 0037B814 41 82 FF F8 */ beq lbl_8037E8AC +/* 8037E8B8 0037B818 B0 7F 00 00 */ sth r3, 0(r31) +/* 8037E8BC 0037B81C 48 00 6B 05 */ bl OSGetTick +/* 8037E8C0 0037B820 7C 7C 1B 78 */ mr r28, r3 +lbl_8037E8C4: +/* 8037E8C4 0037B824 48 00 6A FD */ bl OSGetTick +/* 8037E8C8 0037B828 7C 1C 18 50 */ subf r0, r28, r3 +/* 8037E8CC 0037B82C 2C 00 08 92 */ cmpwi r0, 0x892 +/* 8037E8D0 0037B830 41 80 FF F4 */ blt lbl_8037E8C4 +/* 8037E8D4 0037B834 3C 00 01 00 */ lis r0, 0x100 +/* 8037E8D8 0037B838 90 1B 00 00 */ stw r0, 0(r27) +/* 8037E8DC 0037B83C 38 60 00 00 */ li r3, 0 +/* 8037E8E0 0037B840 38 00 00 20 */ li r0, 0x20 +/* 8037E8E4 0037B844 90 7A 00 00 */ stw r3, 0(r26) +/* 8037E8E8 0037B848 90 19 00 00 */ stw r0, 0(r25) +/* 8037E8EC 0037B84C A0 7F 00 00 */ lhz r3, 0(r31) +/* 8037E8F0 0037B850 48 00 00 08 */ b lbl_8037E8F8 +lbl_8037E8F4: +/* 8037E8F4 0037B854 A0 7F 00 00 */ lhz r3, 0(r31) +lbl_8037E8F8: +/* 8037E8F8 0037B858 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a +/* 8037E8FC 0037B85C 41 82 FF F8 */ beq lbl_8037E8F4 +/* 8037E900 0037B860 B0 7F 00 00 */ sth r3, 0(r31) +/* 8037E904 0037B864 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037E908 0037B868 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 +/* 8037E90C 0037B86C B0 1F 00 00 */ sth r0, 0(r31) +lbl_8037E910: +/* 8037E910 0037B870 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037E914 0037B874 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 +/* 8037E918 0037B878 40 82 FF F8 */ bne lbl_8037E910 +/* 8037E91C 0037B87C A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037E920 0037B880 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c +/* 8037E924 0037B884 B0 1F 00 00 */ sth r0, 0(r31) +/* 8037E928 0037B888 A0 1E 00 00 */ lhz r0, 0(r30) +/* 8037E92C 0037B88C 48 00 00 08 */ b lbl_8037E934 +lbl_8037E930: +/* 8037E930 0037B890 A0 1E 00 00 */ lhz r0, 0(r30) +lbl_8037E934: +/* 8037E934 0037B894 54 05 04 3E */ clrlwi r5, r0, 0x10 +/* 8037E938 0037B898 54 00 04 21 */ rlwinm. r0, r0, 0, 0x10, 0x10 +/* 8037E93C 0037B89C 41 82 FF F4 */ beq lbl_8037E930 +/* 8037E940 0037B8A0 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037E944 0037B8A4 A0 9D 00 00 */ lhz r4, 0(r29) +/* 8037E948 0037B8A8 60 00 00 04 */ ori r0, r0, 4 +/* 8037E94C 0037B8AC B0 1F 00 00 */ sth r0, 0(r31) +/* 8037E950 0037B8B0 38 00 08 AC */ li r0, 0x8ac +/* 8037E954 0037B8B4 B0 1F 00 00 */ sth r0, 0(r31) +/* 8037E958 0037B8B8 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037E95C 0037B8BC 60 00 00 01 */ ori r0, r0, 1 +/* 8037E960 0037B8C0 B0 1F 00 00 */ sth r0, 0(r31) +lbl_8037E964: +/* 8037E964 0037B8C4 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037E968 0037B8C8 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 8037E96C 0037B8CC 40 82 FF F8 */ bne lbl_8037E964 +/* 8037E970 0037B8D0 4B FF FE 21 */ bl OSGetArenaHi +/* 8037E974 0037B8D4 38 83 FF 80 */ addi r4, r3, -128 +/* 8037E978 0037B8D8 3C 60 81 00 */ lis r3, 0x8100 +/* 8037E97C 0037B8DC 38 A0 00 80 */ li r5, 0x80 +/* 8037E980 0037B8E0 4B C8 4B 11 */ bl memcpy +/* 8037E984 0037B8E4 BB 21 00 14 */ lmw r25, 0x14(r1) +/* 8037E988 0037B8E8 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8037E98C 0037B8EC 38 21 00 30 */ addi r1, r1, 0x30 +/* 8037E990 0037B8F0 7C 08 03 A6 */ mtlr r0 +/* 8037E994 0037B8F4 4E 80 00 20 */ blr + +.global __OSStopAudioSystem +__OSStopAudioSystem: +/* 8037E998 0037B8F8 7C 08 02 A6 */ mflr r0 +/* 8037E99C 0037B8FC 3C 60 CC 00 */ lis r3, 0xCC005000@ha +/* 8037E9A0 0037B900 90 01 00 04 */ stw r0, 4(r1) +/* 8037E9A4 0037B904 38 00 08 04 */ li r0, 0x804 +/* 8037E9A8 0037B908 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8037E9AC 0037B90C 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8037E9B0 0037B910 3B E3 50 00 */ addi r31, r3, 0xCC005000@l +/* 8037E9B4 0037B914 38 63 50 00 */ addi r3, r3, 0x5000 +/* 8037E9B8 0037B918 93 C1 00 08 */ stw r30, 8(r1) +/* 8037E9BC 0037B91C B0 1F 00 0A */ sth r0, 0xa(r31) +/* 8037E9C0 0037B920 A0 03 00 36 */ lhz r0, 0x36(r3) +/* 8037E9C4 0037B924 54 00 04 5E */ rlwinm r0, r0, 0, 0x11, 0xf +/* 8037E9C8 0037B928 B0 03 00 36 */ sth r0, 0x36(r3) +/* 8037E9CC 0037B92C A4 1F 00 0A */ lhzu r0, 0xa(r31) +/* 8037E9D0 0037B930 48 00 00 08 */ b lbl_8037E9D8 +lbl_8037E9D4: +/* 8037E9D4 0037B934 A0 1F 00 00 */ lhz r0, 0(r31) +lbl_8037E9D8: +/* 8037E9D8 0037B938 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 +/* 8037E9DC 0037B93C 40 82 FF F8 */ bne lbl_8037E9D4 +/* 8037E9E0 0037B940 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037E9E4 0037B944 48 00 00 08 */ b lbl_8037E9EC +lbl_8037E9E8: +/* 8037E9E8 0037B948 A0 1F 00 00 */ lhz r0, 0(r31) +lbl_8037E9EC: +/* 8037E9EC 0037B94C 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 +/* 8037E9F0 0037B950 40 82 FF F8 */ bne lbl_8037E9E8 +/* 8037E9F4 0037B954 38 00 08 AC */ li r0, 0x8ac +/* 8037E9F8 0037B958 3C 60 CC 00 */ lis r3, 0xCC005000@ha +/* 8037E9FC 0037B95C B0 1F 00 00 */ sth r0, 0(r31) +/* 8037EA00 0037B960 38 00 00 00 */ li r0, 0 +/* 8037EA04 0037B964 B0 03 50 00 */ sth r0, 0xCC005000@l(r3) +/* 8037EA08 0037B968 38 83 50 00 */ addi r4, r3, 0x5000 +lbl_8037EA0C: +/* 8037EA0C 0037B96C A0 64 00 04 */ lhz r3, 4(r4) +/* 8037EA10 0037B970 A0 04 00 06 */ lhz r0, 6(r4) +/* 8037EA14 0037B974 50 60 80 1E */ rlwimi r0, r3, 0x10, 0, 0xf +/* 8037EA18 0037B978 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 +/* 8037EA1C 0037B97C 40 82 FF F0 */ bne lbl_8037EA0C +/* 8037EA20 0037B980 48 00 69 A1 */ bl OSGetTick +/* 8037EA24 0037B984 7C 7E 1B 78 */ mr r30, r3 +lbl_8037EA28: +/* 8037EA28 0037B988 48 00 69 99 */ bl OSGetTick +/* 8037EA2C 0037B98C 7C 1E 18 50 */ subf r0, r30, r3 +/* 8037EA30 0037B990 2C 00 00 2C */ cmpwi r0, 0x2c +/* 8037EA34 0037B994 41 80 FF F4 */ blt lbl_8037EA28 +/* 8037EA38 0037B998 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037EA3C 0037B99C 60 00 00 01 */ ori r0, r0, 1 +/* 8037EA40 0037B9A0 B0 1F 00 00 */ sth r0, 0(r31) +/* 8037EA44 0037B9A4 A0 1F 00 00 */ lhz r0, 0(r31) +/* 8037EA48 0037B9A8 48 00 00 08 */ b lbl_8037EA50 +lbl_8037EA4C: +/* 8037EA4C 0037B9AC A0 1F 00 00 */ lhz r0, 0(r31) +lbl_8037EA50: +/* 8037EA50 0037B9B0 54 00 07 FF */ clrlwi. r0, r0, 0x1f +/* 8037EA54 0037B9B4 40 82 FF F8 */ bne lbl_8037EA4C +/* 8037EA58 0037B9B8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8037EA5C 0037B9BC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8037EA60 0037B9C0 83 C1 00 08 */ lwz r30, 8(r1) +/* 8037EA64 0037B9C4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8037EA68 0037B9C8 7C 08 03 A6 */ mtlr r0 +/* 8037EA6C 0037B9CC 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSCache.s b/asm/Dolphin/os/OSCache.s index 1576f570..54a1ca63 100644 --- a/asm/Dolphin/os/OSCache.s +++ b/asm/Dolphin/os/OSCache.s @@ -35,7 +35,7 @@ lbl_803F1028: .global DCEnable DCEnable: -/* 8037EA70 0037B9D0 7C 00 04 AC */ sync 0 +/* 8037EA70 0037B9D0 7C 00 04 AC */ sync /* 8037EA74 0037B9D4 7C 70 FA A6 */ mfspr r3, 0x3f0 /* 8037EA78 0037B9D8 60 63 40 00 */ ori r3, r3, 0x4000 /* 8037EA7C 0037B9DC 7C 70 FB A6 */ mtspr 0x3f0, r3 @@ -51,7 +51,7 @@ DCInvalidateRange: /* 8037EA98 0037B9F8 54 84 D9 7E */ srwi r4, r4, 5 /* 8037EA9C 0037B9FC 7C 89 03 A6 */ mtctr r4 lbl_8037EAA0: -/* 8037EAA0 0037BA00 7C 00 1B AC */ dcbi 0, r3 +/* 8037EAA0 0037BA00 7C 00 1B AC */ dcbi r0, r3 /* 8037EAA4 0037BA04 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EAA8 0037BA08 42 00 FF F8 */ bdnz lbl_8037EAA0 /* 8037EAAC 0037BA0C 4E 80 00 20 */ blr @@ -66,7 +66,7 @@ DCFlushRange: /* 8037EAC4 0037BA24 54 84 D9 7E */ srwi r4, r4, 5 /* 8037EAC8 0037BA28 7C 89 03 A6 */ mtctr r4 lbl_8037EACC: -/* 8037EACC 0037BA2C 7C 00 18 AC */ dcbf 0, r3 +/* 8037EACC 0037BA2C 7C 00 18 AC */ dcbf r0, r3 /* 8037EAD0 0037BA30 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EAD4 0037BA34 42 00 FF F8 */ bdnz lbl_8037EACC /* 8037EAD8 0037BA38 44 00 00 02 */ sc @@ -82,7 +82,7 @@ DCStoreRange: /* 8037EAF4 0037BA54 54 84 D9 7E */ srwi r4, r4, 5 /* 8037EAF8 0037BA58 7C 89 03 A6 */ mtctr r4 lbl_8037EAFC: -/* 8037EAFC 0037BA5C 7C 00 18 6C */ dcbst 0, r3 +/* 8037EAFC 0037BA5C 7C 00 18 6C */ dcbst r0, r3 /* 8037EB00 0037BA60 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EB04 0037BA64 42 00 FF F8 */ bdnz lbl_8037EAFC /* 8037EB08 0037BA68 44 00 00 02 */ sc @@ -98,7 +98,7 @@ DCFlushRangeNoSync: /* 8037EB24 0037BA84 54 84 D9 7E */ srwi r4, r4, 5 /* 8037EB28 0037BA88 7C 89 03 A6 */ mtctr r4 lbl_8037EB2C: -/* 8037EB2C 0037BA8C 7C 00 18 AC */ dcbf 0, r3 +/* 8037EB2C 0037BA8C 7C 00 18 AC */ dcbf r0, r3 /* 8037EB30 0037BA90 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EB34 0037BA94 42 00 FF F8 */ bdnz lbl_8037EB2C /* 8037EB38 0037BA98 4E 80 00 20 */ blr @@ -113,7 +113,7 @@ DCStoreRangeNoSync: /* 8037EB50 0037BAB0 54 84 D9 7E */ srwi r4, r4, 5 /* 8037EB54 0037BAB4 7C 89 03 A6 */ mtctr r4 lbl_8037EB58: -/* 8037EB58 0037BAB8 7C 00 18 6C */ dcbst 0, r3 +/* 8037EB58 0037BAB8 7C 00 18 6C */ dcbst r0, r3 /* 8037EB5C 0037BABC 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EB60 0037BAC0 42 00 FF F8 */ bdnz lbl_8037EB58 /* 8037EB64 0037BAC4 4E 80 00 20 */ blr @@ -128,7 +128,7 @@ DCZeroRange: /* 8037EB7C 0037BADC 54 84 D9 7E */ srwi r4, r4, 5 /* 8037EB80 0037BAE0 7C 89 03 A6 */ mtctr r4 lbl_8037EB84: -/* 8037EB84 0037BAE4 7C 00 1F EC */ dcbz 0, r3 +/* 8037EB84 0037BAE4 7C 00 1F EC */ dcbz r0, r3 /* 8037EB88 0037BAE8 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EB8C 0037BAEC 42 00 FF F8 */ bdnz lbl_8037EB84 @@ -146,10 +146,10 @@ ICInvalidateRange: /* 8037EBA8 0037BB08 54 84 D9 7E */ srwi r4, r4, 5 /* 8037EBAC 0037BB0C 7C 89 03 A6 */ mtctr r4 lbl_8037EBB0: -/* 8037EBB0 0037BB10 7C 00 1F AC */ icbi 0, r3 +/* 8037EBB0 0037BB10 7C 00 1F AC */ icbi r0, r3 /* 8037EBB4 0037BB14 38 63 00 20 */ addi r3, r3, 0x20 /* 8037EBB8 0037BB18 42 00 FF F8 */ bdnz lbl_8037EBB0 -/* 8037EBBC 0037BB1C 7C 00 04 AC */ sync 0 +/* 8037EBBC 0037BB1C 7C 00 04 AC */ sync /* 8037EBC0 0037BB20 4C 00 01 2C */ isync /* 8037EBC4 0037BB24 4E 80 00 20 */ blr @@ -177,8 +177,8 @@ __LCEnable: /* 8037EBFC 0037BB5C 38 80 04 00 */ li r4, 0x400 /* 8037EC00 0037BB60 7C 89 03 A6 */ mtctr r4 lbl_8037EC04: -/* 8037EC04 0037BB64 7C 00 1A 2C */ dcbt 0, r3 -/* 8037EC08 0037BB68 7C 00 18 6C */ dcbst 0, r3 +/* 8037EC04 0037BB64 7C 00 1A 2C */ dcbt r0, r3 +/* 8037EC08 0037BB68 7C 00 18 6C */ dcbst r0, r3 /* 8037EC0C 0037BB6C 38 63 00 20 */ addi r3, r3, 0x80000020@l /* 8037EC10 0037BB70 42 00 FF F4 */ bdnz lbl_8037EC04 /* 8037EC14 0037BB74 7C 98 E2 A6 */ mfspr r4, 0x398 @@ -198,9 +198,9 @@ lbl_8037EC04: /* 8037EC4C 0037BBAC 60 00 00 00 */ nop /* 8037EC50 0037BBB0 3C 60 E0 00 */ lis r3, 0xE0000002@h /* 8037EC54 0037BBB4 60 63 00 02 */ ori r3, r3, 0xE0000002@l -/* 8037EC58 0037BBB8 7C 7F 83 A6 */ mtdbatl 3, r3 +/* 8037EC58 0037BBB8 7C 7F 83 A6 */ mtspr 543, r3 /* 8037EC5C 0037BBBC 60 63 01 FE */ ori r3, r3, 0x1fe -/* 8037EC60 0037BBC0 7C 7E 83 A6 */ mtdbatu 3, r3 +/* 8037EC60 0037BBC0 7C 7E 83 A6 */ mtspr 542, r3 /* 8037EC64 0037BBC4 4C 00 01 2C */ isync /* 8037EC68 0037BBC8 3C 60 E0 00 */ lis r3, 0xE0000020@ha /* 8037EC6C 0037BBCC 38 C0 02 00 */ li r6, 0x200 @@ -247,7 +247,7 @@ LCDisable: /* 8037ECF4 0037BC54 38 80 02 00 */ li r4, 0x200 /* 8037ECF8 0037BC58 7C 89 03 A6 */ mtctr r4 lbl_8037ECFC: -/* 8037ECFC 0037BC5C 7C 00 1B AC */ dcbi 0, r3 +/* 8037ECFC 0037BC5C 7C 00 1B AC */ dcbi r0, r3 /* 8037ED00 0037BC60 38 63 00 20 */ addi r3, r3, 0xE0000020@l /* 8037ED04 0037BC64 42 00 FF F8 */ bdnz lbl_8037ECFC /* 8037ED08 0037BC68 7C 98 E2 A6 */ mfspr r4, 0x398 @@ -403,11 +403,11 @@ L2GlobalInvalidate: /* 8037EEE0 0037BE40 90 01 00 04 */ stw r0, 4(r1) /* 8037EEE4 0037BE44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8037EEE8 0037BE48 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8037EEEC 0037BE4C 7C 00 04 AC */ sync 0 +/* 8037EEEC 0037BE4C 7C 00 04 AC */ sync /* 8037EEF0 0037BE50 4B FF 09 05 */ bl PPCMfl2cr /* 8037EEF4 0037BE54 54 63 00 7E */ clrlwi r3, r3, 1 /* 8037EEF8 0037BE58 4B FF 09 05 */ bl PPCMtl2cr -/* 8037EEFC 0037BE5C 7C 00 04 AC */ sync 0 +/* 8037EEFC 0037BE5C 7C 00 04 AC */ sync /* 8037EF00 0037BE60 4B FF 08 F5 */ bl PPCMfl2cr /* 8037EF04 0037BE64 64 63 00 20 */ oris r3, r3, 0x20 /* 8037EF08 0037BE68 4B FF 08 F5 */ bl PPCMtl2cr @@ -575,15 +575,15 @@ lbl_8037F130: /* 8037F13C 0037C09C 40 82 00 58 */ bne lbl_8037F194 /* 8037F140 0037C0A0 4B FF 06 95 */ bl PPCMfmsr /* 8037F144 0037C0A4 7C 7E 1B 78 */ mr r30, r3 -/* 8037F148 0037C0A8 7C 00 04 AC */ sync 0 +/* 8037F148 0037C0A8 7C 00 04 AC */ sync /* 8037F14C 0037C0AC 38 60 00 30 */ li r3, 0x30 /* 8037F150 0037C0B0 4B FF 06 8D */ bl PPCMtmsr -/* 8037F154 0037C0B4 7C 00 04 AC */ sync 0 -/* 8037F158 0037C0B8 7C 00 04 AC */ sync 0 +/* 8037F154 0037C0B4 7C 00 04 AC */ sync +/* 8037F158 0037C0B8 7C 00 04 AC */ sync /* 8037F15C 0037C0BC 4B FF 06 99 */ bl PPCMfl2cr /* 8037F160 0037C0C0 54 63 00 7E */ clrlwi r3, r3, 1 /* 8037F164 0037C0C4 4B FF 06 99 */ bl PPCMtl2cr -/* 8037F168 0037C0C8 7C 00 04 AC */ sync 0 +/* 8037F168 0037C0C8 7C 00 04 AC */ sync /* 8037F16C 0037C0CC 4B FF FD 71 */ bl L2GlobalInvalidate /* 8037F170 0037C0D0 7F C3 F3 78 */ mr r3, r30 /* 8037F174 0037C0D4 4B FF 06 69 */ bl PPCMtmsr diff --git a/asm/Dolphin/os/OSError.s b/asm/Dolphin/os/OSError.s index 6b8b2a93..58c026e9 100644 --- a/asm/Dolphin/os/OSError.s +++ b/asm/Dolphin/os/OSError.s @@ -41,6 +41,7 @@ lbl_803F1430: .balign 4 .asciz "\nLast interrupt (%d): SRR0 = 0x%08x TB = 0x%016llx\n" .balign 4 + .global lbl_803F170C lbl_803F170C: .4byte lbl_80380024 @@ -59,6 +60,7 @@ lbl_803F170C: .4byte lbl_80380024 .4byte lbl_80380024 .4byte lbl_8037FFD8 + .section .sdata .balign 8 .global lbl_805A8B38 diff --git a/asm/Dolphin/os/OSMemory.s b/asm/Dolphin/os/OSMemory.s index d681592f..27f47b0e 100644 --- a/asm/Dolphin/os/OSMemory.s +++ b/asm/Dolphin/os/OSMemory.s @@ -273,21 +273,21 @@ Config24MB: /* 80382B9C 0037FAFC 3C A0 81 00 */ lis r5, 0x810000FF@ha /* 80382BA0 0037FB00 38 A5 00 FF */ addi r5, r5, 0x810000FF@l /* 80382BA4 0037FB04 4C 00 01 2C */ isync -/* 80382BA8 0037FB08 7C F8 83 A6 */ mtdbatu 0, r7 -/* 80382BAC 0037FB0C 7C 99 83 A6 */ mtdbatl 0, r4 -/* 80382BB0 0037FB10 7C 78 83 A6 */ mtdbatu 0, r3 +/* 80382BA8 0037FB08 7C F8 83 A6 */ mtspr 536, r7 +/* 80382BAC 0037FB0C 7C 99 83 A6 */ mtspr 537, r4 +/* 80382BB0 0037FB10 7C 78 83 A6 */ mtspr 536, r3 /* 80382BB4 0037FB14 4C 00 01 2C */ isync -/* 80382BB8 0037FB18 7C F0 83 A6 */ mtibatu 0, r7 -/* 80382BBC 0037FB1C 7C 91 83 A6 */ mtibatl 0, r4 -/* 80382BC0 0037FB20 7C 70 83 A6 */ mtibatu 0, r3 +/* 80382BB8 0037FB18 7C F0 83 A6 */ mtspr 528, r7 +/* 80382BBC 0037FB1C 7C 91 83 A6 */ mtspr 529, r4 +/* 80382BC0 0037FB20 7C 70 83 A6 */ mtspr 528, r3 /* 80382BC4 0037FB24 4C 00 01 2C */ isync -/* 80382BC8 0037FB28 7C FC 83 A6 */ mtdbatu 2, r7 -/* 80382BCC 0037FB2C 7C DD 83 A6 */ mtdbatl 2, r6 -/* 80382BD0 0037FB30 7C BC 83 A6 */ mtdbatu 2, r5 +/* 80382BC8 0037FB28 7C FC 83 A6 */ mtspr 540, r7 +/* 80382BCC 0037FB2C 7C DD 83 A6 */ mtspr 541, r6 +/* 80382BD0 0037FB30 7C BC 83 A6 */ mtspr 540, r5 /* 80382BD4 0037FB34 4C 00 01 2C */ isync -/* 80382BD8 0037FB38 7C F4 83 A6 */ mtibatu 2, r7 -/* 80382BDC 0037FB3C 7C D5 83 A6 */ mtibatl 2, r6 -/* 80382BE0 0037FB40 7C B4 83 A6 */ mtibatu 2, r5 +/* 80382BD8 0037FB38 7C F4 83 A6 */ mtspr 532, r7 +/* 80382BDC 0037FB3C 7C D5 83 A6 */ mtspr 533, r6 +/* 80382BE0 0037FB40 7C B4 83 A6 */ mtspr 532, r5 /* 80382BE4 0037FB44 4C 00 01 2C */ isync /* 80382BE8 0037FB48 7C 60 00 A6 */ mfmsr r3 /* 80382BEC 0037FB4C 60 63 00 30 */ ori r3, r3, 0x30 @@ -308,21 +308,21 @@ Config48MB: /* 80382C1C 0037FB7C 3C A0 82 00 */ lis r5, 0x820001FF@ha /* 80382C20 0037FB80 38 A5 01 FF */ addi r5, r5, 0x820001FF@l /* 80382C24 0037FB84 4C 00 01 2C */ isync -/* 80382C28 0037FB88 7C F8 83 A6 */ mtdbatu 0, r7 -/* 80382C2C 0037FB8C 7C 99 83 A6 */ mtdbatl 0, r4 -/* 80382C30 0037FB90 7C 78 83 A6 */ mtdbatu 0, r3 +/* 80382C28 0037FB88 7C F8 83 A6 */ mtspr 536, r7 +/* 80382C2C 0037FB8C 7C 99 83 A6 */ mtspr 537, r4 +/* 80382C30 0037FB90 7C 78 83 A6 */ mtspr 536, r3 /* 80382C34 0037FB94 4C 00 01 2C */ isync -/* 80382C38 0037FB98 7C F0 83 A6 */ mtibatu 0, r7 -/* 80382C3C 0037FB9C 7C 91 83 A6 */ mtibatl 0, r4 -/* 80382C40 0037FBA0 7C 70 83 A6 */ mtibatu 0, r3 +/* 80382C38 0037FB98 7C F0 83 A6 */ mtspr 528, r7 +/* 80382C3C 0037FB9C 7C 91 83 A6 */ mtspr 529, r4 +/* 80382C40 0037FBA0 7C 70 83 A6 */ mtspr 528, r3 /* 80382C44 0037FBA4 4C 00 01 2C */ isync -/* 80382C48 0037FBA8 7C FC 83 A6 */ mtdbatu 2, r7 -/* 80382C4C 0037FBAC 7C DD 83 A6 */ mtdbatl 2, r6 -/* 80382C50 0037FBB0 7C BC 83 A6 */ mtdbatu 2, r5 +/* 80382C48 0037FBA8 7C FC 83 A6 */ mtspr 540, r7 +/* 80382C4C 0037FBAC 7C DD 83 A6 */ mtspr 541, r6 +/* 80382C50 0037FBB0 7C BC 83 A6 */ mtspr 540, r5 /* 80382C54 0037FBB4 4C 00 01 2C */ isync -/* 80382C58 0037FBB8 7C F4 83 A6 */ mtibatu 2, r7 -/* 80382C5C 0037FBBC 7C D5 83 A6 */ mtibatl 2, r6 -/* 80382C60 0037FBC0 7C B4 83 A6 */ mtibatu 2, r5 +/* 80382C58 0037FBB8 7C F4 83 A6 */ mtspr 532, r7 +/* 80382C5C 0037FBBC 7C D5 83 A6 */ mtspr 533, r6 +/* 80382C60 0037FBC0 7C B4 83 A6 */ mtspr 532, r5 /* 80382C64 0037FBC4 4C 00 01 2C */ isync /* 80382C68 0037FBC8 7C 60 00 A6 */ mfmsr r3 /* 80382C6C 0037FBCC 60 63 00 30 */ ori r3, r3, 0x30 diff --git a/asm/Dolphin/os/OSReboot.s b/asm/Dolphin/os/OSReboot.s index 15830780..71d39c30 100644 --- a/asm/Dolphin/os/OSReboot.s +++ b/asm/Dolphin/os/OSReboot.s @@ -18,7 +18,7 @@ Prepared: .section .text, "ax" Run: -/* 80382E28 0037FD88 7C 00 04 AC */ sync 0 +/* 80382E28 0037FD88 7C 00 04 AC */ sync /* 80382E2C 0037FD8C 4C 00 01 2C */ isync /* 80382E30 0037FD90 7C 68 03 A6 */ mtlr r3 /* 80382E34 0037FD94 4E 80 00 20 */ blr diff --git a/asm/Dolphin/os/OSReset.s b/asm/Dolphin/os/OSReset.s index 63699b79..b4a1edd3 100644 --- a/asm/Dolphin/os/OSReset.s +++ b/asm/Dolphin/os/OSReset.s @@ -99,7 +99,7 @@ lbl_80383140: /* 80383144 003800A4 61 08 00 08 */ ori r8, r8, 8 /* 80383148 003800A8 7D 10 FB A6 */ mtspr 0x3f0, r8 /* 8038314C 003800AC 4C 00 01 2C */ isync -/* 80383150 003800B0 7C 00 04 AC */ sync 0 +/* 80383150 003800B0 7C 00 04 AC */ sync /* 80383154 003800B4 60 00 00 00 */ nop /* 80383158 003800B8 48 00 00 08 */ b lbl_80383160 lbl_8038315C: diff --git a/asm/Dolphin/os/OSSync.s b/asm/Dolphin/os/OSSync.s index 7bbfa2f1..c15d5ade 100644 --- a/asm/Dolphin/os/OSSync.s +++ b/asm/Dolphin/os/OSSync.s @@ -9,7 +9,7 @@ SystemCallVector: /* 803843E8 00381348 61 2A 00 08 */ ori r10, r9, 8 /* 803843EC 0038134C 7D 50 FB A6 */ mtspr 0x3f0, r10 /* 803843F0 00381350 4C 00 01 2C */ isync -/* 803843F4 00381354 7C 00 04 AC */ sync 0 +/* 803843F4 00381354 7C 00 04 AC */ sync /* 803843F8 00381358 7D 30 FB A6 */ mtspr 0x3f0, r9 /* 803843FC 0038135C 4C 00 00 64 */ rfi __OSSystemCallVectorEnd: @@ -33,7 +33,7 @@ __OSInitSystemCall: /* 80384438 00381398 7F E3 FB 78 */ mr r3, r31 /* 8038443C 0038139C 38 80 01 00 */ li r4, 0x100 /* 80384440 003813A0 4B FF A6 D1 */ bl DCFlushRangeNoSync -/* 80384444 003813A4 7C 00 04 AC */ sync 0 +/* 80384444 003813A4 7C 00 04 AC */ sync /* 80384448 003813A8 7F E3 FB 78 */ mr r3, r31 /* 8038444C 003813AC 38 80 01 00 */ li r4, 0x100 /* 80384450 003813B0 4B FF A7 45 */ bl ICInvalidateRange diff --git a/asm/Dolphin/os/OSThread.s b/asm/Dolphin/os/OSThread.s index cd198ebf..4e73ad5b 100644 --- a/asm/Dolphin/os/OSThread.s +++ b/asm/Dolphin/os/OSThread.s @@ -64,11 +64,11 @@ __OSThreadInit: /* 803844E0 00381440 4B FF B1 35 */ bl OSClearContext /* 803844E4 00381444 7F E3 FB 78 */ mr r3, r31 /* 803844E8 00381448 4B FF AF 35 */ bl OSSetCurrentContext -/* 803844EC 0038144C 3C 60 80 5C */ lis r3, 0x805C00C8@ha -/* 803844F0 00381450 38 03 00 C8 */ addi r0, r3, 0x805C00C8@l -/* 803844F4 00381454 3C 60 80 5B */ lis r3, 0x805AF4C8@ha +/* 803844EC 0038144C 3C 60 80 5C */ lis r3, _stack_addr@ha +/* 803844F0 00381450 38 03 00 C8 */ addi r0, r3, _stack_addr@l +/* 803844F4 00381454 3C 60 80 5B */ lis r3, _stack_end@ha /* 803844F8 00381458 90 1C 07 1C */ stw r0, 0x71c(r28) -/* 803844FC 0038145C 38 03 F4 C8 */ addi r0, r3, 0x805AF4C8@l +/* 803844FC 0038145C 38 03 F4 C8 */ addi r0, r3, _stack_end@l /* 80384500 00381460 90 1C 07 20 */ stw r0, 0x720(r28) /* 80384504 00381464 3C 60 DE AE */ lis r3, 0xDEADBABE@ha /* 80384508 00381468 38 03 BA BE */ addi r0, r3, 0xDEADBABE@l diff --git a/asm/Dolphin/os/OSTime.s b/asm/Dolphin/os/OSTime.s index 42d1dec0..c20c55ad 100644 --- a/asm/Dolphin/os/OSTime.s +++ b/asm/Dolphin/os/OSTime.s @@ -36,9 +36,9 @@ lbl_803F2320: .global OSGetTime OSGetTime: -/* 803853A8 00382308 7C 6D 42 E6 */ mftbu r3 +/* 803853A8 00382308 7C 6D 42 E6 */ mftb r3, 269 /* 803853AC 0038230C 7C 8C 42 E6 */ mftb r4, 0x10c -/* 803853B0 00382310 7C AD 42 E6 */ mftbu r5 +/* 803853B0 00382310 7C AD 42 E6 */ mftb r5, 269 /* 803853B4 00382314 7C 03 28 00 */ cmpw r3, r5 /* 803853B8 00382318 40 82 FF F0 */ bne OSGetTime /* 803853BC 0038231C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/si/SIBios.s b/asm/Dolphin/si/SIBios.s index d426134b..ab764685 100644 --- a/asm/Dolphin/si/SIBios.s +++ b/asm/Dolphin/si/SIBios.s @@ -583,8 +583,8 @@ SIEnablePollingInterrupt: /* 803BED64 003BBCC4 93 A1 00 24 */ stw r29, 0x24(r1) /* 803BED68 003BBCC8 3B A3 00 00 */ addi r29, r3, 0 /* 803BED6C 003BBCCC 4B FC 28 F5 */ bl OSDisableInterrupts -/* 803BED70 003BBCD0 3C 80 CC 00 */ lis r4, 0xcc00 -/* 803BED74 003BBCD4 84 A4 64 34 */ lwzu r5, 0x6434(r4) +/* 803BED70 003BBCD0 3C 80 CC 00 */ lis r4, 0xCC006434@ha +/* 803BED74 003BBCD4 84 A4 64 34 */ lwzu r5, 0xCC006434@l(r4) /* 803BED78 003BBCD8 54 A0 01 09 */ rlwinm. r0, r5, 0, 4, 4 /* 803BED7C 003BBCDC 41 82 00 0C */ beq lbl_803BED88 /* 803BED80 003BBCE0 3B C0 00 01 */ li r30, 1 diff --git a/asm/Dolphin/thp/THPDec.s b/asm/Dolphin/thp/THPDec.s index a19cb2eb..71b9da2f 100644 --- a/asm/Dolphin/thp/THPDec.s +++ b/asm/Dolphin/thp/THPDec.s @@ -6596,7 +6596,7 @@ __THPHuffDecodeDCTCompY: #local func /* 803C7C60 003C4BC0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 803C7C64 003C4BC4 93 C1 00 18 */ stw r30, 0x18(r1) /* 803C7C68 003C4BC8 93 A1 00 14 */ stw r29, 0x14(r1) -/* 803C7C6C 003C4BCC 7C 00 27 EC */ dcbz 0, r4 +/* 803C7C6C 003C4BCC 7C 00 27 EC */ dcbz r0, r4 /* 803C7C70 003C4BD0 81 8D B0 40 */ lwz r12, Ydchuff@sda21(r13) /* 803C7C74 003C4BD4 81 63 06 A4 */ lwz r11, 0x6a4(r3) /* 803C7C78 003C4BD8 39 2C 00 20 */ addi r9, r12, 0x20 @@ -7060,7 +7060,7 @@ __THPHuffDecodeDCTCompU: # local func /* 803C82D8 003C5238 94 21 FF E8 */ stwu r1, -0x18(r1) /* 803C82DC 003C523C 93 E1 00 14 */ stw r31, 0x14(r1) /* 803C82E0 003C5240 93 C1 00 10 */ stw r30, 0x10(r1) -/* 803C82E4 003C5244 7C 00 27 EC */ dcbz 0, r4 +/* 803C82E4 003C5244 7C 00 27 EC */ dcbz r0, r4 /* 803C82E8 003C5248 81 8D B0 60 */ lwz r12, Udchuff@sda21(r13) /* 803C82EC 003C524C 81 63 06 A4 */ lwz r11, 0x6a4(r3) /* 803C82F0 003C5250 39 2C 00 20 */ addi r9, r12, 0x20 @@ -7537,7 +7537,7 @@ __THPHuffDecodeDCTCompV: # local func /* 803C8980 003C58E0 94 21 FF E8 */ stwu r1, -0x18(r1) /* 803C8984 003C58E4 93 E1 00 14 */ stw r31, 0x14(r1) /* 803C8988 003C58E8 93 C1 00 10 */ stw r30, 0x10(r1) -/* 803C898C 003C58EC 7C 00 27 EC */ dcbz 0, r4 +/* 803C898C 003C58EC 7C 00 27 EC */ dcbz r0, r4 /* 803C8990 003C58F0 81 8D B0 80 */ lwz r12, Vdchuff@sda21(r13) /* 803C8994 003C58F4 81 63 06 A4 */ lwz r11, 0x6a4(r3) /* 803C8998 003C58F8 39 2C 00 20 */ addi r9, r12, 0x20 diff --git a/asm/GuiSys/CRepeatState.s b/asm/GuiSys/CRepeatState.s index dc14896c..7620faa9 100644 --- a/asm/GuiSys/CRepeatState.s +++ b/asm/GuiSys/CRepeatState.s @@ -50,7 +50,7 @@ lbl_805AE190: .global lbl_805AE194 lbl_805AE194: # ROM: 0x3FAA34 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AE198 lbl_805AE198: diff --git a/asm/Kyoto/Audio/CSfxManager.s b/asm/Kyoto/Audio/CSfxManager.s index f1f85ccd..f1975b1c 100644 --- a/asm/Kyoto/Audio/CSfxManager.s +++ b/asm/Kyoto/Audio/CSfxManager.s @@ -4544,11 +4544,11 @@ lbl_802EB408: .global __ct__Q211CSfxManager11CSfxChannelFv __ct__Q211CSfxManager11CSfxChannelFv: /* 802EB420 002E8380 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802EB424 002E8384 3C 80 80 5A */ lis r4, lbl_805A0004@ha +/* 802EB424 002E8384 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802EB428 002E8388 C0 02 C6 04 */ lfs f0, lbl_805AE324@sda21(r2) /* 802EB42C 002E838C 38 00 00 00 */ li r0, 0 -/* 802EB430 002E8390 84 C4 66 A0 */ lwzu r6, 0x66a0(r4) -/* 802EB434 002E8394 80 A4 00 04 */ lwz r5, lbl_805A0004@l(r4) +/* 802EB430 002E8390 84 C4 66 A0 */ lwzu r6, sZeroVector__9CVector3f@l(r4) +/* 802EB434 002E8394 80 A4 00 04 */ lwz r5, 4(r4) /* 802EB438 002E8398 90 C1 00 38 */ stw r6, 0x38(r1) /* 802EB43C 002E839C 80 84 00 08 */ lwz r4, 8(r4) /* 802EB440 002E83A0 90 A1 00 3C */ stw r5, 0x3c(r1) diff --git a/asm/Kyoto/Basics/CStopwatch.s b/asm/Kyoto/Basics/CStopwatch.s index 251ac407..031f5b3c 100644 --- a/asm/Kyoto/Basics/CStopwatch.s +++ b/asm/Kyoto/Basics/CStopwatch.s @@ -51,11 +51,11 @@ lbl_802D62A8: InitGlobalTimer__10CStopwatchFv: /* 802D62B8 002D3218 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802D62BC 002D321C 7C 08 02 A6 */ mflr r0 -/* 802D62C0 002D3220 3C 60 80 5A */ lis r3, lbl_805A0004@ha +/* 802D62C0 002D3220 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha /* 802D62C4 002D3224 38 80 00 00 */ li r4, 0 /* 802D62C8 002D3228 90 01 00 14 */ stw r0, 0x14(r1) -/* 802D62CC 002D322C 84 03 FD 30 */ lwzu r0, -0x2d0(r3) -/* 802D62D0 002D3230 80 A3 00 04 */ lwz r5, lbl_805A0004@l(r3) +/* 802D62CC 002D322C 84 03 FD 30 */ lwzu r0, mData__10CStopwatch@l(r3) +/* 802D62D0 002D3230 80 A3 00 04 */ lwz r5, 4(r3) /* 802D62D4 002D3234 7C 00 22 78 */ xor r0, r0, r4 /* 802D62D8 002D3238 7C A4 22 78 */ xor r4, r5, r4 /* 802D62DC 002D323C 7C 80 03 79 */ or. r0, r4, r0 diff --git a/asm/Kyoto/Graphics/CCubeModel.s b/asm/Kyoto/Graphics/CCubeModel.s index ba742dc6..60bade88 100644 --- a/asm/Kyoto/Graphics/CCubeModel.s +++ b/asm/Kyoto/Graphics/CCubeModel.s @@ -1200,8 +1200,8 @@ SetArraysCurrent__10CCubeModelCFv: /* 80307634 00304594 80 83 00 08 */ lwz r4, 8(r3) /* 80307638 00304598 28 04 00 00 */ cmplwi r4, 0 /* 8030763C 0030459C 41 82 00 24 */ beq lbl_80307660 -/* 80307640 003045A0 3C 60 80 5A */ lis r3, 0x805a -/* 80307644 003045A4 84 03 53 EC */ lwzu r0, 0x53ec(r3) +/* 80307640 003045A0 3C 60 80 5A */ lis r3, lbl_805A53EC@ha +/* 80307644 003045A4 84 03 53 EC */ lwzu r0, lbl_805A53EC@l(r3) /* 80307648 003045A8 7C 00 20 40 */ cmplw r0, r4 /* 8030764C 003045AC 41 82 00 14 */ beq lbl_80307660 /* 80307650 003045B0 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/Kyoto/Graphics/CGX.s b/asm/Kyoto/Graphics/CGX.s index da182994..b196a566 100644 --- a/asm/Kyoto/Graphics/CGX.s +++ b/asm/Kyoto/Graphics/CGX.s @@ -399,8 +399,8 @@ lbl_803080B4: sub_803080d4: /* 803080D4 00305034 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803080D8 00305038 7C 08 02 A6 */ mflr r0 -/* 803080DC 0030503C 3C 60 80 5A */ lis r3, 0x805a -/* 803080E0 00305040 34 63 53 EC */ addic. r3, r3, 0x53ec +/* 803080DC 0030503C 3C 60 80 5A */ lis r3, lbl_805A53EC@ha +/* 803080E0 00305040 34 63 53 EC */ addic. r3, r3, lbl_805A53EC@l /* 803080E4 00305044 90 01 00 14 */ stw r0, 0x14(r1) /* 803080E8 00305048 41 82 00 08 */ beq lbl_803080F0 /* 803080EC 0030504C 48 00 01 B1 */ bl __ct__Q23CGX8SGXStateFv diff --git a/asm/Kyoto/zlib/zutil.s b/asm/Kyoto/zlib/zutil.s index 50ebb711..bf2f13a9 100644 --- a/asm/Kyoto/zlib/zutil.s +++ b/asm/Kyoto/zlib/zutil.s @@ -1,7 +1,6 @@ .include "macros.inc" -.section .data -.balign 8 +.section .text .global zcfree zcfree: diff --git a/asm/MetaRender/CCubeRenderer.s b/asm/MetaRender/CCubeRenderer.s index 447a9b37..234c4b9f 100644 --- a/asm/MetaRender/CCubeRenderer.s +++ b/asm/MetaRender/CCubeRenderer.s @@ -263,8 +263,11 @@ lbl_805AF498: .balign 8 .lcomm lbl_8046E200, 0xC, 4 -.lcomm lbl_8046E20C, 0x1DF8, 4 -.lcomm lbl_80470004, 0x9168, 4 +.lcomm lbl_8046E20C, 0x68, 4 +.lcomm lbl_8046E274, 0x4808, 4 +.lcomm lbl_80472A7C, 0x64D0, 4 +.lcomm lbl_80478F4C, 0x208, 4 +.lcomm lbl_80479154, 0x18, 4 .lcomm lbl_8047916C, 0xC, 4 .lcomm lbl_80479178, 0x320, 4 @@ -7663,12 +7666,12 @@ SetViewportOrtho__13CCubeRendererFbff: /* 802BC8E8 002B9848 DB 81 00 40 */ stfd f28, 0x40(r1) /* 802BC8EC 002B984C F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 802BC8F0 002B9850 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 802BC8F4 002B9854 3C 80 80 3F */ lis r4, lbl_803F0004@ha -/* 802BC8F8 002B9858 84 C4 D9 10 */ lwzu r6, -0x26f0(r4) +/* 802BC8F4 002B9854 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha +/* 802BC8F8 002B9858 84 C4 D9 10 */ lwzu r6, mViewport__9CGraphics@l(r4) /* 802BC8FC 002B985C 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 802BC900 002B9860 FC A0 08 90 */ fmr f5, f1 /* 802BC904 002B9864 FC C0 10 90 */ fmr f6, f2 -/* 802BC908 002B9868 80 04 00 04 */ lwz r0, lbl_803F0004@l(r4) +/* 802BC908 002B9868 80 04 00 04 */ lwz r0, 4(r4) /* 802BC90C 002B986C 80 E4 00 08 */ lwz r7, 8(r4) /* 802BC910 002B9870 7C 7F 1B 78 */ mr r31, r3 /* 802BC914 002B9874 81 04 00 0C */ lwz r8, 0xc(r4) @@ -11494,7 +11497,7 @@ lbl_802BFE2C: /* 802BFE44 002BCDA4 1C 00 00 24 */ mulli r0, r0, 0x24 /* 802BFE48 002BCDA8 7C 64 02 14 */ add r3, r4, r0 /* 802BFE4C 002BCDAC 38 03 00 24 */ addi r0, r3, 0x24 -/* 802BFE50 002BCDB0 7C 00 02 2C */ dcbt 0, r0 +/* 802BFE50 002BCDB0 7C 00 02 2C */ dcbt r0, r0 lbl_802BFE54: /* 802BFE54 002BCDB4 38 21 00 30 */ addi r1, r1, 0x30 /* 802BFE58 002BCDB8 4E 80 00 20 */ blr @@ -11510,30 +11513,30 @@ Shutdown__7BucketsFv: .global Init__7BucketsFv Init__7BucketsFv: -/* 802BFE74 002BCDD4 3C 60 80 47 */ lis r3, 0x8047 +/* 802BFE74 002BCDD4 3C 60 80 47 */ lis r3, lbl_8046E274@ha /* 802BFE78 002BCDD8 94 21 FD F0 */ stwu r1, -0x210(r1) -/* 802BFE7C 002BCDDC 34 83 E2 74 */ addic. r4, r3, -7564 +/* 802BFE7C 002BCDDC 34 83 E2 74 */ addic. r4, r3, lbl_8046E274@l /* 802BFE80 002BCDE0 41 82 00 0C */ beq lbl_802BFE8C /* 802BFE84 002BCDE4 38 00 00 00 */ li r0, 0 /* 802BFE88 002BCDE8 90 04 00 00 */ stw r0, 0(r4) lbl_802BFE8C: -/* 802BFE8C 002BCDEC 3C 60 80 47 */ lis r3, 0x8047 +/* 802BFE8C 002BCDEC 3C 60 80 47 */ lis r3, lbl_80472A7C@ha /* 802BFE90 002BCDF0 90 8D A6 0C */ stw r4, lbl_805A91CC@sda21(r13) -/* 802BFE94 002BCDF4 34 83 2A 7C */ addic. r4, r3, 0x2a7c +/* 802BFE94 002BCDF4 34 83 2A 7C */ addic. r4, r3, lbl_80472A7C@l /* 802BFE98 002BCDF8 41 82 00 0C */ beq lbl_802BFEA4 /* 802BFE9C 002BCDFC 38 00 00 00 */ li r0, 0 /* 802BFEA0 002BCE00 90 04 00 00 */ stw r0, 0(r4) lbl_802BFEA4: -/* 802BFEA4 002BCE04 3C 60 80 48 */ lis r3, 0x8048 +/* 802BFEA4 002BCE04 3C 60 80 48 */ lis r3, lbl_80478F4C@ha /* 802BFEA8 002BCE08 90 8D A6 10 */ stw r4, lbl_805A91D0@sda21(r13) -/* 802BFEAC 002BCE0C 34 83 8F 4C */ addic. r4, r3, -28852 +/* 802BFEAC 002BCE0C 34 83 8F 4C */ addic. r4, r3, lbl_80478F4C@l /* 802BFEB0 002BCE10 41 82 00 0C */ beq lbl_802BFEBC /* 802BFEB4 002BCE14 38 00 00 00 */ li r0, 0 /* 802BFEB8 002BCE18 90 04 00 00 */ stw r0, 0(r4) lbl_802BFEBC: -/* 802BFEBC 002BCE1C 3C 60 80 48 */ lis r3, 0x8048 +/* 802BFEBC 002BCE1C 3C 60 80 48 */ lis r3, lbl_80479154@ha /* 802BFEC0 002BCE20 90 8D A6 1C */ stw r4, lbl_805A91DC@sda21(r13) -/* 802BFEC4 002BCE24 34 63 91 54 */ addic. r3, r3, -28332 +/* 802BFEC4 002BCE24 34 63 91 54 */ addic. r3, r3, lbl_80479154@l /* 802BFEC8 002BCE28 41 82 00 0C */ beq lbl_802BFED4 /* 802BFECC 002BCE2C 38 00 00 00 */ li r0, 0 /* 802BFED0 002BCE30 90 03 00 00 */ stw r0, 0(r3) diff --git a/asm/MetroTRK/mslsupp.s b/asm/MetroTRK/mslsupp.s new file mode 100644 index 00000000..7b362499 --- /dev/null +++ b/asm/MetroTRK/mslsupp.s @@ -0,0 +1,21 @@ +.include "macros.inc" + +.section .text, "ax" + +.global EnableMetroTRKInterrupts +EnableMetroTRKInterrupts: +/* 80003640 000005A0 4E 80 00 20 */ blr + +.global InitMetroTRK +InitMetroTRK: +/* 80003644 000005A4 4E 80 00 20 */ blr + +.global __read_console +__read_console: +/* 80003648 000005A8 38 60 00 00 */ li r3, 0 +/* 8000364C 000005AC 4E 80 00 20 */ blr + +.global __TRK_write_console +__TRK_write_console: +/* 80003650 000005B0 38 60 00 00 */ li r3, 0 +/* 80003654 000005B4 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CActorLights.s b/asm/MetroidPrime/CActorLights.s index d064e162..fe872059 100644 --- a/asm/MetroidPrime/CActorLights.s +++ b/asm/MetroidPrime/CActorLights.s @@ -76,7 +76,7 @@ lbl_805AB134: .global lbl_805AB138 lbl_805AB138: # ROM: 0x3F79D8 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AB13C lbl_805AB13C: diff --git a/asm/MetroidPrime/CActorParticles.s b/asm/MetroidPrime/CActorParticles.s index 17020829..2c40b680 100644 --- a/asm/MetroidPrime/CActorParticles.s +++ b/asm/MetroidPrime/CActorParticles.s @@ -4420,24 +4420,50 @@ lbl_805ACABC: .global lbl_803D1E98 lbl_803D1E98: # ROM: 0x3CEE98 - .4byte 0x803D1EB0 - .4byte 0x803D1EBE - .4byte 0x803D1ECE - .4byte 0x803D1ED9 - .4byte 0x803D1EE8 - .4byte 0x803D1EF8 + .4byte lbl_803D1EB0 + .4byte lbl_803D1EBE + .4byte lbl_803D1ECE + .4byte lbl_803D1ED9 + .4byte lbl_803D1EE8 + .4byte lbl_803D1EF8 .global lbl_803D1EB0 lbl_803D1EB0: + # ROM: 0x3CEEB0 .asciz "Effect_OnFire" + +.global lbl_803D1EBE +lbl_803D1EBE: + + # ROM: 0x3CEEBE .byte 0x45, 0x66 .asciz "fect_IceBreak" + +.global lbl_803D1ECE +lbl_803D1ECE: + + # ROM: 0x3CEECE .byte 0x45, 0x66 .asciz "fect_Ash" + +.global lbl_803D1ED9 +lbl_803D1ED9: + + # ROM: 0x3CEED9 .byte 0x45, 0x66, 0x66 .asciz "ect_FirePop" + +.global lbl_803D1EE8 +lbl_803D1EE8: + + # ROM: 0x3CEEE8 .asciz "Effect_Electric" + +.global lbl_803D1EF8 +lbl_803D1EF8: + + # ROM: 0x3CEEF8 .asciz "Effect_IcePop" .byte 0x5F, 0x44 .4byte 0x47525000 diff --git a/asm/MetroidPrime/CArtifactDoll.s b/asm/MetroidPrime/CArtifactDoll.s index d14bb627..9ef06166 100644 --- a/asm/MetroidPrime/CArtifactDoll.s +++ b/asm/MetroidPrime/CArtifactDoll.s @@ -1134,18 +1134,18 @@ lbl_805ADDAC: .global lbl_803D5D50 lbl_803D5D50: # ROM: 0x3D2D50 - .4byte 0x803D5DB0 - .4byte 0x803D5DBC - .4byte 0x803D5DC8 - .4byte 0x803D5DD4 - .4byte 0x803D5DE0 - .4byte 0x803D5DEC - .4byte 0x803D5DF8 - .4byte 0x803D5E04 - .4byte 0x803D5E10 - .4byte 0x803D5E1C - .4byte 0x803D5E29 - .4byte 0x803D5E36 + .4byte lbl_803D5DB0 + .4byte lbl_803D5DBC + .4byte lbl_803D5DC8 + .4byte lbl_803D5DD4 + .4byte lbl_803D5DE0 + .4byte lbl_803D5DEC + .4byte lbl_803D5DF8 + .4byte lbl_803D5E04 + .4byte lbl_803D5E10 + .4byte lbl_803D5E1C + .4byte lbl_803D5E29 + .4byte lbl_803D5E36 .global lbl_803D5D80 lbl_803D5D80: @@ -1165,19 +1165,75 @@ lbl_803D5D80: .global lbl_803D5DB0 lbl_803D5DB0: + # ROM: 0x3D2DB0 .asciz "CMDL_Piece1" + +.global lbl_803D5DBC +lbl_803D5DBC: + + # ROM: 0x3D2DBC .asciz "CMDL_Piece2" + +.global lbl_803D5DC8 +lbl_803D5DC8: + + # ROM: 0x3D2DC8 .asciz "CMDL_Piece3" + +.global lbl_803D5DD4 +lbl_803D5DD4: + + # ROM: 0x3D2DD4 .asciz "CMDL_Piece4" + +.global lbl_803D5DE0 +lbl_803D5DE0: + + # ROM: 0x3D2DE0 .asciz "CMDL_Piece5" + +.global lbl_803D5DEC +lbl_803D5DEC: + + # ROM: 0x3D2DEC .asciz "CMDL_Piece6" + +.global lbl_803D5DF8 +lbl_803D5DF8: + + # ROM: 0x3D2DF8 .asciz "CMDL_Piece7" + +.global lbl_803D5E04 +lbl_803D5E04: + + # ROM: 0x3D2E04 .asciz "CMDL_Piece8" + +.global lbl_803D5E10 +lbl_803D5E10: + + # ROM: 0x3D2E10 .asciz "CMDL_Piece9" + +.global lbl_803D5E1C +lbl_803D5E1C: + + # ROM: 0x3D2E1C .asciz "CMDL_Piece10" + +.global lbl_803D5E29 +lbl_803D5E29: + + # ROM: 0x3D2E29 .byte 0x43, 0x4D, 0x44 .asciz "L_Piece11" + +.global lbl_803D5E36 +lbl_803D5E36: + + # ROM: 0x3D2E36 .byte 0x43, 0x4D .asciz "DL_Piece12" .byte 0x3F diff --git a/asm/MetroidPrime/CAutoMapper.s b/asm/MetroidPrime/CAutoMapper.s index 0e9b3bd1..f9bad67d 100644 --- a/asm/MetroidPrime/CAutoMapper.s +++ b/asm/MetroidPrime/CAutoMapper.s @@ -327,7 +327,7 @@ lbl_805AA908: .global lbl_805AA90C lbl_805AA90C: # ROM: 0x3F71AC - .4byte 0x3F19999A + .float 0.6 .global lbl_805AA910 lbl_805AA910: diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index b5bb4b32..7f8d3cdc 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -1189,14 +1189,14 @@ lbl_801A9708: /* 801A9710 001A6670 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801A9714 001A6674 C0 02 A8 30 */ lfs f0, lbl_805AC550@sda21(r2) /* 801A9718 001A6678 D3 FB 02 88 */ stfs f31, 0x288(r27) -/* 801A971C 001A667C 3C 80 80 57 */ lis r4, lbl_80570004@ha +/* 801A971C 001A667C 3C 80 80 57 */ lis r4, lbl_8056D578@ha /* 801A9720 001A6680 38 00 00 10 */ li r0, 0x10 /* 801A9724 001A6684 C0 22 A8 20 */ lfs f1, lbl_805AC540@sda21(r2) /* 801A9728 001A6688 D0 1B 02 8C */ stfs f0, 0x28c(r27) /* 801A972C 001A668C 7F 63 DB 78 */ mr r3, r27 /* 801A9730 001A6690 D0 1B 02 90 */ stfs f0, 0x290(r27) -/* 801A9734 001A6694 84 E4 D5 78 */ lwzu r7, -0x2a88(r4) -/* 801A9738 001A6698 80 C4 00 04 */ lwz r6, lbl_80570004@l(r4) +/* 801A9734 001A6694 84 E4 D5 78 */ lwzu r7, lbl_8056D578@l(r4) +/* 801A9738 001A6698 80 C4 00 04 */ lwz r6, 4(r4) /* 801A973C 001A669C 90 FB 02 94 */ stw r7, 0x294(r27) /* 801A9740 001A66A0 90 DB 02 98 */ stw r6, 0x298(r27) /* 801A9744 001A66A4 80 E4 00 08 */ lwz r7, 8(r4) @@ -1510,15 +1510,15 @@ lbl_801A9BEC: /* 801A9BF8 001A6B58 C0 02 A8 30 */ lfs f0, lbl_805AC550@sda21(r2) /* 801A9BFC 001A6B5C 90 1A 02 84 */ stw r0, 0x284(r26) /* 801A9C00 001A6B60 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l -/* 801A9C04 001A6B64 3C 80 80 57 */ lis r4, lbl_80570004@ha +/* 801A9C04 001A6B64 3C 80 80 57 */ lis r4, lbl_8056D578@ha /* 801A9C08 001A6B68 38 00 00 10 */ li r0, 0x10 /* 801A9C0C 001A6B6C D0 1A 02 88 */ stfs f0, 0x288(r26) /* 801A9C10 001A6B70 7F 43 D3 78 */ mr r3, r26 /* 801A9C14 001A6B74 C0 22 A8 20 */ lfs f1, lbl_805AC540@sda21(r2) /* 801A9C18 001A6B78 D0 1A 02 8C */ stfs f0, 0x28c(r26) /* 801A9C1C 001A6B7C D0 1A 02 90 */ stfs f0, 0x290(r26) -/* 801A9C20 001A6B80 84 E4 D5 78 */ lwzu r7, -0x2a88(r4) -/* 801A9C24 001A6B84 80 C4 00 04 */ lwz r6, lbl_80570004@l(r4) +/* 801A9C20 001A6B80 84 E4 D5 78 */ lwzu r7, lbl_8056D578@l(r4) +/* 801A9C24 001A6B84 80 C4 00 04 */ lwz r6, 4(r4) /* 801A9C28 001A6B88 90 FA 02 94 */ stw r7, 0x294(r26) /* 801A9C2C 001A6B8C 90 DA 02 98 */ stw r6, 0x298(r26) /* 801A9C30 001A6B90 80 E4 00 08 */ lwz r7, 8(r4) @@ -1775,7 +1775,7 @@ lbl_801A9FFC: /* 801A9FFC 001A6F5C 90 1F 02 7C */ stw r0, 0x27c(r31) /* 801AA000 001A6F60 38 A0 00 00 */ li r5, 0 /* 801AA004 001A6F64 C0 02 A8 30 */ lfs f0, lbl_805AC550@sda21(r2) -/* 801AA008 001A6F68 3C 80 80 57 */ lis r4, lbl_80570004@ha +/* 801AA008 001A6F68 3C 80 80 57 */ lis r4, lbl_8056D578@ha /* 801AA00C 001A6F6C 90 BF 02 80 */ stw r5, 0x280(r31) /* 801AA010 001A6F70 38 00 00 10 */ li r0, 0x10 /* 801AA014 001A6F74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha @@ -1786,8 +1786,8 @@ lbl_801A9FFC: /* 801AA028 001A6F88 D0 1F 02 88 */ stfs f0, 0x288(r31) /* 801AA02C 001A6F8C D0 1F 02 8C */ stfs f0, 0x28c(r31) /* 801AA030 001A6F90 D0 1F 02 90 */ stfs f0, 0x290(r31) -/* 801AA034 001A6F94 84 E4 D5 78 */ lwzu r7, -0x2a88(r4) -/* 801AA038 001A6F98 80 C4 00 04 */ lwz r6, lbl_80570004@l(r4) +/* 801AA034 001A6F94 84 E4 D5 78 */ lwzu r7, lbl_8056D578@l(r4) +/* 801AA038 001A6F98 80 C4 00 04 */ lwz r6, 4(r4) /* 801AA03C 001A6F9C 90 FF 02 94 */ stw r7, 0x294(r31) /* 801AA040 001A6FA0 90 DF 02 98 */ stw r6, 0x298(r31) /* 801AA044 001A6FA4 80 E4 00 08 */ lwz r7, 8(r4) diff --git a/asm/MetroidPrime/CCredits.s b/asm/MetroidPrime/CCredits.s index d870c7db..bd65b576 100644 --- a/asm/MetroidPrime/CCredits.s +++ b/asm/MetroidPrime/CCredits.s @@ -3494,10 +3494,10 @@ lbl_80027F6C: /* 80027FA0 00024F00 81 8C 00 54 */ lwz r12, 0x54(r12) /* 80027FA4 00024F04 7D 89 03 A6 */ mtctr r12 /* 80027FA8 00024F08 4E 80 04 21 */ bctrl -/* 80027FAC 00024F0C 3C 80 80 3F */ lis r4, lbl_803F0004@ha -/* 80027FB0 00024F10 87 A4 D9 10 */ lwzu r29, -0x26f0(r4) +/* 80027FAC 00024F0C 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha +/* 80027FB0 00024F10 87 A4 D9 10 */ lwzu r29, mViewport__9CGraphics@l(r4) /* 80027FB4 00024F14 7F E3 FB 78 */ mr r3, r31 -/* 80027FB8 00024F18 83 84 00 04 */ lwz r28, lbl_803F0004@l(r4) +/* 80027FB8 00024F18 83 84 00 04 */ lwz r28, 4(r4) /* 80027FBC 00024F1C 83 64 00 08 */ lwz r27, 8(r4) /* 80027FC0 00024F20 83 44 00 0C */ lwz r26, 0xc(r4) /* 80027FC4 00024F24 48 33 36 61 */ bl sub_8035b624 @@ -3667,52 +3667,125 @@ lbl_800281E0: .balign 8 .global lbl_803CCB18 lbl_803CCB18: + # ROM: 0x3C9B18 - .4byte 0x803CCB50 - .4byte 0x803CCB62 - .4byte 0x803CCB62 - .4byte 0x803CCB79 - .4byte 0x803CCB8C - .4byte 0x803CCBA4 - .4byte 0x803CCBBB - .4byte 0x803CCBD3 + .4byte lbl_803CCB50 + .4byte lbl_803CCB62 + .4byte lbl_803CCB62 + .4byte lbl_803CCB79 + .4byte lbl_803CCB8C + .4byte lbl_803CCBA4 + .4byte lbl_803CCBBB + .4byte lbl_803CCBD3 .global lbl_803CCB38 lbl_803CCB38: + # ROM: 0x3C9B38 - .4byte 0x803CCBE6 - .4byte 0x803CCBFE - .4byte 0x803CCC15 - .4byte 0x803CCC2B - .4byte 0x803CCC44 - .4byte 0x803CCC5C + .4byte lbl_803CCBE6 + .4byte lbl_803CCBFE + .4byte lbl_803CCC15 + .4byte lbl_803CCC2B + .4byte lbl_803CCC44 + .4byte lbl_803CCC5C .global lbl_803CCB50 lbl_803CCB50: + # ROM: 0x3C9B50 .asciz "Video/wingame.thp" + +.global lbl_803CCB62 +lbl_803CCB62: + + # ROM: 0x3C9B62 .byte 0x56, 0x69 .asciz "deo/wingame_best.thp" + +.global lbl_803CCB79 +lbl_803CCB79: + + # ROM: 0x3C9B79 .byte 0x56, 0x69, 0x64 .asciz "eo/losegame.thp" + +.global lbl_803CCB8C +lbl_803CCB8C: + + # ROM: 0x3C9B8C .asciz "Video/05_tallonText.thp" + +.global lbl_803CCBA4 +lbl_803CCBA4: + + # ROM: 0x3C9BA4 .asciz "Video/AfterCredits.thp" + +.global lbl_803CCBBB +lbl_803CCBBB: + + # ROM: 0x3C9BBB .byte 0x56 .asciz "ideo/SpecialEnding.thp" + +.global lbl_803CCBD3 +lbl_803CCBD3: + + # ROM: 0x3C9BD3 .byte 0x56 .asciz "ideo/creditBG.thp" + +.global lbl_803CCBE6 +lbl_803CCBE6: + + # ROM: 0x3C9BE6 .byte 0x56, 0x69 .asciz "deo/win_bad_begin.thp" + +.global lbl_803CCBFE +lbl_803CCBFE: + + # ROM: 0x3C9BFE .byte 0x56, 0x69 .asciz "deo/win_bad_loop.thp" + +.global lbl_803CCC15 +lbl_803CCC15: + + # ROM: 0x3C9C15 .byte 0x56, 0x69, 0x64 .asciz "eo/win_bad_end.thp" + +.global lbl_803CCC2B +lbl_803CCC2B: + + # ROM: 0x3C9C2B .byte 0x56 .asciz "ideo/win_good_begin.thp" + +.global lbl_803CCC44 +lbl_803CCC44: + + # ROM: 0x3C9C44 .asciz "Video/win_good_loop.thp" + +.global lbl_803CCC5C +lbl_803CCC5C: + + # ROM: 0x3C9C5C .asciz "Video/win_good_end.thp" + +.global lbl_803CCC73 +lbl_803CCC73: + + # ROM: 0x3C9C73 .byte 0x41 .asciz "udio/ending3.rsf" + +.global lbl_803CCC85 +lbl_803CCC85: + + # ROM: 0x3C9C85 .byte 0x41, 0x75, 0x64 .asciz "io/samusjak.rsf" .asciz "AutoSave" diff --git a/asm/MetroidPrime/CDamageVulnerability.s b/asm/MetroidPrime/CDamageVulnerability.s index 46ce19da..f71a926c 100644 --- a/asm/MetroidPrime/CDamageVulnerability.s +++ b/asm/MetroidPrime/CDamageVulnerability.s @@ -534,14 +534,14 @@ lbl_80102B1C: __ct__20CDamageVulnerabilityFR12CInputStream: /* 80102B58 000FFAB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80102B5C 000FFABC 7C 08 02 A6 */ mflr r0 -/* 80102B60 000FFAC0 3C A0 80 57 */ lis r5, lbl_80570004@ha +/* 80102B60 000FFAC0 3C A0 80 57 */ lis r5, lbl_8056D718@ha /* 80102B64 000FFAC4 90 01 00 24 */ stw r0, 0x24(r1) /* 80102B68 000FFAC8 BF 61 00 0C */ stmw r27, 0xc(r1) /* 80102B6C 000FFACC 7C 9F 23 78 */ mr r31, r4 /* 80102B70 000FFAD0 7C 7E 1B 78 */ mr r30, r3 /* 80102B74 000FFAD4 7F E3 FB 78 */ mr r3, r31 -/* 80102B78 000FFAD8 84 85 D7 18 */ lwzu r4, -0x28e8(r5) -/* 80102B7C 000FFADC 80 05 00 04 */ lwz r0, lbl_80570004@l(r5) +/* 80102B78 000FFAD8 84 85 D7 18 */ lwzu r4, lbl_8056D718@l(r5) +/* 80102B7C 000FFADC 80 05 00 04 */ lwz r0, 4(r5) /* 80102B80 000FFAE0 90 9E 00 00 */ stw r4, 0(r30) /* 80102B84 000FFAE4 90 1E 00 04 */ stw r0, 4(r30) /* 80102B88 000FFAE8 80 85 00 08 */ lwz r4, 8(r5) diff --git a/asm/MetroidPrime/CDecalManager.s b/asm/MetroidPrime/CDecalManager.s index 45e357aa..c25a0815 100644 --- a/asm/MetroidPrime/CDecalManager.s +++ b/asm/MetroidPrime/CDecalManager.s @@ -318,9 +318,9 @@ lbl_8011724C: /* 80117274 001141D4 38 80 00 00 */ li r4, 0 /* 80117278 001141D8 48 22 9B C9 */ bl __dt__6CTokenFv /* 8011727C 001141DC 80 BC 08 CC */ lwz r5, 0x8cc(r28) -/* 80117280 001141E0 3C 60 80 57 */ lis r3, 0x8057 +/* 80117280 001141E0 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 80117284 001141E4 20 9B 00 01 */ subfic r4, r27, 1 -/* 80117288 001141E8 84 03 F7 58 */ lwzu r0, -0x8a8(r3) +/* 80117288 001141E8 84 03 F7 58 */ lwzu r0, lbl_8056F758@l(r3) /* 8011728C 001141EC 7C 84 00 34 */ cntlzw r4, r4 /* 80117290 001141F0 90 BF 00 70 */ stw r5, 0x70(r31) /* 80117294 001141F4 54 00 10 3A */ slwi r0, r0, 2 diff --git a/asm/MetroidPrime/CFrontEndUI.s b/asm/MetroidPrime/CFrontEndUI.s index 67e76e5f..3a7a3791 100644 --- a/asm/MetroidPrime/CFrontEndUI.s +++ b/asm/MetroidPrime/CFrontEndUI.s @@ -101,31 +101,43 @@ lbl_803D9900: .balign 8 .global lbl_803CC540 lbl_803CC540: + # ROM: 0x3C9540 - .4byte 0x803CC644 + .4byte lbl_803CC644 .4byte 0 - .4byte 0x803CC65D + .4byte lbl_803CC65D .4byte 0x01000000 - .4byte 0x803CC674 + .4byte lbl_803CC674 .4byte 0 - .4byte 0x803CC694 + .4byte lbl_803CC694 .4byte 0x01000000 - .4byte 0x803CC6B0 + .4byte lbl_803CC6B0 .4byte 0 - .4byte 0x803CC6D3 + .4byte lbl_803CC6D3 .4byte 0 - .4byte 0x803CC6EF + .4byte lbl_803CC6EF .4byte 0x01000000 - .4byte 0x803CC704 + .4byte lbl_803CC704 .4byte 0 - .4byte 0x803CC704 + .4byte lbl_803CC704 .4byte 0 - .asciz "!#$MetroidBuildInfo!#$Build v1.088 10/29/2002 2:21:25" + +.global MetroidBuildInfo +MetroidBuildInfo: + .4byte 0x2123244D + .4byte 0x6574726F + .4byte 0x69644275 + .4byte 0x696C6449 + .4byte 0x6E666F21 + .byte 0x23, 0x24 + .byte 0x42, 0x75 + .asciz "ild v1.088 10/29/2002 2:21:25" .byte 0x50, 0x41 .4byte 0x44000000 .global lbl_803CC5C4 lbl_803CC5C4: + # ROM: 0x3C95C4 .4byte 0x04420449 .4byte 0x044A044B @@ -133,6 +145,7 @@ lbl_803CC5C4: .global lbl_803CC5D0 lbl_803CC5D0: + # ROM: 0x3C95D0 .4byte 0x044E044F .4byte 0x04500451 @@ -140,6 +153,7 @@ lbl_803CC5D0: .global lbl_803CC5DC lbl_803CC5DC: + # ROM: 0x3C95DC .4byte 0x40866666 .4byte 0x40C33333 @@ -147,6 +161,7 @@ lbl_803CC5DC: .global lbl_803CC5E8 lbl_803CC5E8: + # ROM: 0x3C95E8 .4byte 0x3EE147AD .4byte 0x40AD1EB9 @@ -154,6 +169,7 @@ lbl_803CC5E8: .global lbl_803CC5F4 lbl_803CC5F4: + # ROM: 0x3C95F4 .4byte 0x00000001 .4byte 0x00000002 @@ -168,6 +184,7 @@ lbl_803CC5F4: .global lbl_803CC61C lbl_803CC61C: + # ROM: 0x3C961C .4byte 0x00000009 .4byte 0x00000009 @@ -182,21 +199,72 @@ lbl_803CC61C: .global lbl_803CC644 lbl_803CC644: + # ROM: 0x3C9644 .asciz "Video/00_first_start.thp" + +.global lbl_803CC65D +lbl_803CC65D: + + # ROM: 0x3C965D .byte 0x56, 0x69, 0x64 .asciz "eo/01_startloop.thp" + +.global lbl_803CC674 +lbl_803CC674: + + # ROM: 0x3C9674 .asciz "Video/02_start_fileselect_A.thp" + +.global lbl_803CC694 +lbl_803CC694: + + # ROM: 0x3C9694 .asciz "Video/03_fileselectloop.thp" + +.global lbl_803CC6B0 +lbl_803CC6B0: + + # ROM: 0x3C96B0 .asciz "Video/04_fileselect_playgame_A.thp" + +.global lbl_803CC6D3 +lbl_803CC6D3: + + # ROM: 0x3C96D3 .byte 0x56 .asciz "ideo/06_fileselect_GBA.thp" + +.global lbl_803CC6EF +lbl_803CC6EF: + + # ROM: 0x3C96EF .byte 0x56 .asciz "ideo/07_GBAloop.thp" + +.global lbl_803CC704 +lbl_803CC704: + + # ROM: 0x3C9704 .asciz "Video/08_GBA_fileselect.thp" + +.global lbl_803CC720 +lbl_803CC720: + + # ROM: 0x3C9720 .asciz "Audio/frontend_1.rsf" + +.global lbl_803CC735 +lbl_803CC735: + + # ROM: 0x3C9735 .byte 0x41, 0x75, 0x64 .asciz "io/frontend_2.rsf" + +.global lbl_803CC74A +lbl_803CC74A: + + # ROM: 0x3C974A .byte 0x46, 0x72 .asciz "ontEnd_AGSC" .asciz "??(??)" @@ -1119,10 +1187,10 @@ lbl_8001C1CC: /* 8001C204 00019164 7D 89 03 A6 */ mtctr r12 /* 8001C208 00019168 4E 80 04 21 */ bctrl /* 8001C20C 0001916C 80 7F 00 CC */ lwz r3, 0xcc(r31) -/* 8001C210 00019170 3C 80 80 3F */ lis r4, lbl_803F0004@ha -/* 8001C214 00019174 87 84 D9 10 */ lwzu r28, -0x26f0(r4) +/* 8001C210 00019170 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha +/* 8001C214 00019174 87 84 D9 10 */ lwzu r28, mViewport__9CGraphics@l(r4) /* 8001C218 00019178 28 03 00 00 */ cmplwi r3, 0 -/* 8001C21C 0001917C 83 A4 00 04 */ lwz r29, lbl_803F0004@l(r4) +/* 8001C21C 0001917C 83 A4 00 04 */ lwz r29, 4(r4) /* 8001C220 00019180 83 64 00 08 */ lwz r27, 8(r4) /* 8001C224 00019184 83 44 00 0C */ lwz r26, 0xc(r4) /* 8001C228 00019188 41 82 01 2C */ beq lbl_8001C354 diff --git a/asm/MetroidPrime/CGameArea.s b/asm/MetroidPrime/CGameArea.s index f5b6bbef..39b09339 100644 --- a/asm/MetroidPrime/CGameArea.s +++ b/asm/MetroidPrime/CGameArea.s @@ -1418,8 +1418,8 @@ Update__Q29CGameArea8CAreaFogFf: /* 8005ED48 0005BCA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8005ED4C 0005BCAC 40 82 01 AC */ bne lbl_8005EEF8 lbl_8005ED50: -/* 8005ED50 0005BCB0 3C 60 80 3D */ lis r3, lbl_803D0004@ha -/* 8005ED54 0005BCB4 84 03 CF 98 */ lwzu r0, -0x3068(r3) +/* 8005ED50 0005BCB0 3C 60 80 3D */ lis r3, lbl_803CCF98@ha +/* 8005ED54 0005BCB4 84 03 CF 98 */ lwzu r0, lbl_803CCF98@l(r3) /* 8005ED58 0005BCB8 C0 5F 00 34 */ lfs f2, 0x34(r31) /* 8005ED5C 0005BCBC 38 E1 00 5C */ addi r7, r1, 0x5c /* 8005ED60 0005BCC0 C0 3F 00 14 */ lfs f1, 0x14(r31) @@ -1428,7 +1428,7 @@ lbl_8005ED50: /* 8005ED6C 0005BCCC ED 82 07 F2 */ fmuls f12, f2, f31 /* 8005ED70 0005BCD0 90 01 00 20 */ stw r0, 0x20(r1) /* 8005ED74 0005BCD4 ED 7F 00 72 */ fmuls f11, f31, f1 -/* 8005ED78 0005BCD8 80 C3 00 04 */ lwz r6, lbl_803D0004@l(r3) +/* 8005ED78 0005BCD8 80 C3 00 04 */ lwz r6, 4(r3) /* 8005ED7C 0005BCDC ED 5F 00 32 */ fmuls f10, f31, f0 /* 8005ED80 0005BCE0 80 A3 00 08 */ lwz r5, 8(r3) /* 8005ED84 0005BCE4 80 83 00 0C */ lwz r4, 0xc(r3) @@ -8020,6 +8020,10 @@ lbl_803CCF90: # ROM: 0x3C9F90 .asciz "??(??)" .balign 4 + +.global lbl_803CCF98 +lbl_803CCF98: + # ROM: 0x3C9F98 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/MetroidPrime/CInGameGuiManager.s b/asm/MetroidPrime/CInGameGuiManager.s index c58f2fea..a0e547b9 100644 --- a/asm/MetroidPrime/CInGameGuiManager.s +++ b/asm/MetroidPrime/CInGameGuiManager.s @@ -4884,40 +4884,41 @@ lbl_8010ADA4: .global lbl_803CEE58 lbl_803CEE58: # ROM: 0x3CBE58 - .4byte 0x803CEF50 - .4byte 0x803CEF5F - .4byte 0x803CEF68 - .4byte 0x803CEF74 - .4byte 0x803CEF80 - .4byte 0x803CEF8B - .4byte 0x803CEF95 - .4byte 0x803CEFA9 - .4byte 0x803CEFBA - .4byte 0x803CEFC8 - .4byte 0x803CEFD9 - .4byte 0x803CEFE8 - .4byte 0x803CEFF8 - .4byte 0x803CF007 + .4byte lbl_803CEF50 + .4byte lbl_803CEF5F + .4byte lbl_803CEF68 + .4byte lbl_803CEF74 + .4byte lbl_803CEF80 + .4byte lbl_803CEF8B + .4byte lbl_803CEF95 + .4byte lbl_803CEFA9 + .4byte lbl_803CEFBA + .4byte lbl_803CEFC8 + .4byte lbl_803CEFD9 + .4byte lbl_803CEFE8 + .4byte lbl_803CEFF8 + .4byte lbl_803CF007 .global lbl_803CEE90 lbl_803CEE90: # ROM: 0x3CBE90 - .4byte 0x803CF016 - .4byte 0x803CF02E - .4byte 0x803CF046 - .4byte 0x803CF060 - .4byte 0x803CF079 - .4byte 0x803CF097 - .4byte 0x803CF0B5 - .4byte 0x803CF0D5 - .4byte 0x803CF0F4 - .4byte 0x803CF107 - .4byte 0x803CF120 - .4byte 0x803CF139 - .4byte 0x803CF159 + .4byte lbl_803CF016 + .4byte lbl_803CF02E + .4byte lbl_803CF046 + .4byte lbl_803CF060 + .4byte lbl_803CF079 + .4byte lbl_803CF097 + .4byte lbl_803CF0B5 + .4byte lbl_803CF0D5 + .4byte lbl_803CF0F4 + .4byte lbl_803CF107 + .4byte lbl_803CF120 + .4byte lbl_803CF139 + .4byte lbl_803CF159 .global lbl_803CEEC4 lbl_803CEEC4: + # ROM: 0x3CBEC4 .asciz "FaceplateDecoration" .asciz " FaceReflection" @@ -4926,48 +4927,175 @@ lbl_803CEEC4: .asciz " AutoMapper" .asciz " PauseScreen" .asciz " Total" + +.global lbl_803CEF50 +lbl_803CEF50: + + # ROM: 0x3CBF50 .asciz "InGameGui_DGRP" - .byte 0x49 - .asciz "ce_DGRP" + +.global lbl_803CEF5F +lbl_803CEF5F: + + # ROM: 0x3CBF5F + .asciz "Ice_DGRP" + +.global lbl_803CEF68 +lbl_803CEF68: + + # ROM: 0x3CBF68 .asciz "Phazon_DGRP" + +.global lbl_803CEF74 +lbl_803CEF74: + + # ROM: 0x3CBF74 .asciz "Plasma_DGRP" + +.global lbl_803CEF80 +lbl_803CEF80: + + # ROM: 0x3CBF80 .asciz "Power_DGRP" - .byte 0x57 - .asciz "ave_DGRP" - .byte 0x42, 0x61, 0x6C - .asciz "lTransition_DGRP" - .byte 0x47, 0x72, 0x61 - .asciz "vitySuit_DGRP" - .byte 0x49, 0x63 - .asciz "e_Anim_DGRP" + +.global lbl_803CEF8B +lbl_803CEF8B: + + # ROM: 0x3CBF8B + .asciz "Wave_DGRP" + +.global lbl_803CEF95 +lbl_803CEF95: + + # ROM: 0x3CBF95 + .asciz "BallTransition_DGRP" + +.global lbl_803CEFA9 +lbl_803CEFA9: + + # ROM: 0x3CBFA9 + .asciz "GravitySuit_DGRP" + +.global lbl_803CEFBA +lbl_803CEFBA: + + # ROM: 0x3CBFBA + .asciz "Ice_Anim_DGRP" + +.global lbl_803CEFC8 +lbl_803CEFC8: + + # ROM: 0x3CBFC8 .asciz "Plasma_Anim_DGRP" - .byte 0x50, 0x6F, 0x77 - .asciz "erSuit_DGRP" + +.global lbl_803CEFD9 +lbl_803CEFD9: + + # ROM: 0x3CBFD9 + .asciz "PowerSuit_DGRP" + +.global lbl_803CEFE8 +lbl_803CEFE8: + + # ROM: 0x3CBFE8 .asciz "Power_Anim_DGRP" + +.global lbl_803CEFF8 +lbl_803CEFF8: + + # ROM: 0x3CBFF8 .asciz "VariaSuit_DGRP" - .byte 0x57 - .asciz "ave_Anim_DGRP" - .byte 0x49, 0x6E - .asciz "ventorySuitPower_DGRP" + +.global lbl_803CF007 +lbl_803CF007: + + # ROM: 0x3CC007 + .asciz "Wave_Anim_DGRP" + +.global lbl_803CF016 +lbl_803CF016: + + # ROM: 0x3CC016 + .asciz "InventorySuitPower_DGRP" + +.global lbl_803CF02E +lbl_803CF02E: + + # ROM: 0x3CC02E .byte 0x49, 0x6E .asciz "ventorySuitVaria_DGRP" + +.global lbl_803CF046 +lbl_803CF046: + + # ROM: 0x3CC046 .byte 0x49, 0x6E .asciz "ventorySuitGravity_DGRP" + +.global lbl_803CF060 +lbl_803CF060: + + # ROM: 0x3CC060 .asciz "InventorySuitPhazon_DGRP" + +.global lbl_803CF079 +lbl_803CF079: + + # ROM: 0x3CC079 .byte 0x49, 0x6E, 0x76 .asciz "entorySuitFusionPower_DGRP" + +.global lbl_803CF097 +lbl_803CF097: + + # ROM: 0x3CC097 .byte 0x49 .asciz "nventorySuitFusionVaria_DGRP" + +.global lbl_803CF0B5 +lbl_803CF0B5: + + # ROM: 0x3CC0B5 .byte 0x49, 0x6E, 0x76 .asciz "entorySuitFusionGravity_DGRP" + +.global lbl_803CF0D5 +lbl_803CF0D5: + + # ROM: 0x3CC0D5 .byte 0x49, 0x6E, 0x76 .asciz "entorySuitFusionPhazon_DGRP" + +.global lbl_803CF0F4 +lbl_803CF0F4: + + # ROM: 0x3CC0F4 .asciz "SamusBallANCS_DGRP" + +.global lbl_803CF107 +lbl_803CF107: + + # ROM: 0x3CC107 .byte 0x53 .asciz "amusSpiderBallANCS_DGRP" + +.global lbl_803CF120 +lbl_803CF120: + + # ROM: 0x3CC120 .asciz "PauseScreenDontDump_DGRP" + +.global lbl_803CF139 +lbl_803CF139: + + # ROM: 0x3CC139 .byte 0x50, 0x61, 0x75 .asciz "seScreenDontDump_NoARAM_DGRP" + +.global lbl_803CF159 +lbl_803CF159: + + # ROM: 0x3CC159 .byte 0x50, 0x61, 0x75 .asciz "seScreenTokens_DGRP" .asciz "??(??)" @@ -4982,4 +5110,3 @@ lbl_803CEEC4: .asciz "R_DeathDot" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/CInventoryScreen.s b/asm/MetroidPrime/CInventoryScreen.s index 26319a42..f5c96f28 100644 --- a/asm/MetroidPrime/CInventoryScreen.s +++ b/asm/MetroidPrime/CInventoryScreen.s @@ -1961,7 +1961,7 @@ lbl_802075C8: .global lbl_805ACDE0 lbl_805ACDE0: # ROM: 0x3F9680 - .4byte 0x803E6FC4 + .4byte lbl_803E6FC4 .global lbl_805ACDE4 lbl_805ACDE4: @@ -2028,6 +2028,11 @@ lbl_803D25D0: .4byte 0x00000004 .4byte 0x00000028 .4byte 0x0000004E + +.global lbl_803D260C +lbl_803D260C: + + # ROM: 0x3CF60C .4byte 0x00000005 .4byte 0x0000002E .4byte 0x00000057 @@ -2043,6 +2048,11 @@ lbl_803D25D0: .4byte 0x00000009 .4byte 0x00000032 .4byte 0x0000005B + +.global lbl_803D2648 +lbl_803D2648: + + # ROM: 0x3CF648 .4byte 0x0000000A .4byte 0x00000033 .4byte 0x00000052 @@ -2058,6 +2068,11 @@ lbl_803D25D0: .4byte 0x0000000E .4byte 0x00000037 .4byte 0x00000056 + +.global lbl_803D2684 +lbl_803D2684: + + # ROM: 0x3CF684 .4byte 0x0000000F .4byte 0x00000038 .4byte 0x00000042 @@ -2094,15 +2109,15 @@ lbl_803D26B4: lbl_803D26F0: # ROM: 0x3CF6F0 .4byte 0x00000005 - .4byte 0x803D25D0 + .4byte lbl_803D25D0 .4byte 0x00000005 - .4byte 0x803D260C + .4byte lbl_803D260C .4byte 0x00000005 - .4byte 0x803D2648 + .4byte lbl_803D2648 .4byte 0x00000004 - .4byte 0x803D2684 + .4byte lbl_803D2684 .4byte 0x00000005 - .4byte 0x803D26B4 + .4byte lbl_803D26B4 .global lbl_803D2718 lbl_803D2718: diff --git a/asm/MetroidPrime/CMFGame.s b/asm/MetroidPrime/CMFGame.s index 9b6bcbdb..a4464be2 100644 --- a/asm/MetroidPrime/CMFGame.s +++ b/asm/MetroidPrime/CMFGame.s @@ -85,6 +85,7 @@ lbl_803CCAD4: .asciz "CMFGameLoader" .asciz "STRG_IntroLevelLoad" .asciz "CMFGame" + .balign 4 .4byte 0 .section .sbss diff --git a/asm/MetroidPrime/CMemoryCardDriver.s b/asm/MetroidPrime/CMemoryCardDriver.s index eea25690..73c223d7 100644 --- a/asm/MetroidPrime/CMemoryCardDriver.s +++ b/asm/MetroidPrime/CMemoryCardDriver.s @@ -3578,8 +3578,8 @@ lbl_8024F164: .global lbl_805AD5D0 lbl_805AD5D0: # ROM: 0x3F9E70 - .4byte 0x803D47CC - .4byte 0x803D47DB + .4byte lbl_803D47CC + .4byte lbl_803D47DB .section .rodata @@ -3594,6 +3594,11 @@ lbl_803D47A8: lbl_803D47CC: # ROM: 0x3D17CC .asciz "MetroidPrime A" + +.global lbl_803D47DB +lbl_803D47DB: + + # ROM: 0x3D17DB .byte 0x4D .asciz "etroidPrime B" .byte 0x4E, 0x6F @@ -3682,28 +3687,3 @@ lbl_803D47CC: .asciz "%02d.%02d.%02d %02d:%02d" .balign 4 -.global lbl_803D4A90 -lbl_803D4A90: - # ROM: 0x3D1A90 - .asciz "TXTR_SaveBanner" - .asciz "TXTR_SaveIcon0" - .byte 0x54 - .asciz "XTR_SaveIcon1" - .byte 0x53, 0x54 - .asciz "RG_MemoryCard" - .byte 0x46, 0x52 - .asciz "ME_GenericMenu" - .byte 0x74 - .asciz "extpane_message" - .asciz "tablegroup_choices" - .byte 0x74 - .asciz "extpane_choice0" - .asciz "textpane_choice1" - .byte 0x74, 0x65, 0x78 - .asciz "tpane_choice2" - .byte 0x74, 0x65 - .asciz "xtpane_choice3" - .byte 0x3F - .asciz "?(??)" - .balign 4 - diff --git a/asm/MetroidPrime/CPauseScreenBlur.s b/asm/MetroidPrime/CPauseScreenBlur.s index ffbe9c5c..857233e6 100644 --- a/asm/MetroidPrime/CPauseScreenBlur.s +++ b/asm/MetroidPrime/CPauseScreenBlur.s @@ -504,11 +504,8 @@ lbl_805AD740: .balign 8 .global lbl_803D5240 lbl_803D5240: + # ROM: 0x3D2240 .asciz "TXTR_MapLightQuarter" .balign 4 - .asciz "ballGrab_locator" - .byte 0x53, 0x6B, 0x65 - .asciz "leton_Root" - .balign 4 diff --git a/asm/MetroidPrime/CPauseScreenFrame.s b/asm/MetroidPrime/CPauseScreenFrame.s index 41477753..852665b9 100644 --- a/asm/MetroidPrime/CPauseScreenFrame.s +++ b/asm/MetroidPrime/CPauseScreenFrame.s @@ -21,13 +21,13 @@ lbl_803E8714: lbl_803E8720: # ROM: 0x3E5720 .4byte 0x00000005 - .4byte 0x803D4404 + .4byte lbl_803D4404 .4byte 0x00000005 - .4byte 0x803D447C + .4byte lbl_803D447C .4byte 0x00000004 - .4byte 0x803D44F4 + .4byte lbl_803D44F4 .4byte 0x00000004 - .4byte 0x803D4554 + .4byte lbl_803D4554 .4byte 0 .4byte 0 .4byte 0 @@ -3662,6 +3662,11 @@ lbl_803D43F0: .4byte 0x00000001 .4byte 0x00000001 .4byte 0 + +.global lbl_803D4404 +lbl_803D4404: + + # ROM: 0x3D1404 .4byte 0 .4byte 0x00000015 .4byte 0 @@ -3692,6 +3697,11 @@ lbl_803D43F0: .float 1.0 .float 1.0 .4byte 0x00000003 + +.global lbl_803D447C +lbl_803D447C: + + # ROM: 0x3D147C .4byte 0x00000004 .4byte 0x00000019 .4byte 0 @@ -3722,6 +3732,11 @@ lbl_803D43F0: .float 1.0 .float 1.0 .4byte 0x00000003 + +.global lbl_803D44F4 +lbl_803D44F4: + + # ROM: 0x3D14F4 .4byte 0x00000008 .4byte 0x0000001D .4byte 0 @@ -3746,6 +3761,11 @@ lbl_803D43F0: .float 1.0 .float 1.0 .4byte 0x00000003 + +.global lbl_803D4554 +lbl_803D4554: + + # ROM: 0x3D1554 .4byte 0x0000000B .4byte 0x00000020 .4byte 0 diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s index 0a1c7699..fc4788c8 100644 --- a/asm/MetroidPrime/CSamusDoll.s +++ b/asm/MetroidPrime/CSamusDoll.s @@ -4656,50 +4656,144 @@ lbl_803CE338: .4byte 0x00000019 .4byte 0x00000015 .4byte 0x0000001D - .4byte 0x803CE3AC - .4byte 0x803CE3BE - .4byte 0x803CE3CE - .4byte 0x803CE3DF - .4byte 0x803CE3AC - .4byte 0x803CE3F2 - .4byte 0x803CE400 - .4byte 0x803CE3F2 - .4byte 0x803CE415 - .4byte 0x803CE429 - .4byte 0x803CE429 - .4byte 0x803CE429 - .4byte 0x803CE429 - .4byte 0x803CE43D - .4byte 0x803CE43D - .4byte 0x803CE43D - .4byte 0x803CE43D - .4byte 0x803CE43D - .4byte 0x803CE44F - .4byte 0x803CE461 - .4byte 0x803CE475 + .4byte lbl_803CE3AC + .4byte lbl_803CE3BE + .4byte lbl_803CE3CE + .4byte lbl_803CE3DF + .4byte lbl_803CE3AC + .4byte lbl_803CE3F2 + .4byte lbl_803CE400 + .4byte lbl_803CE3F2 + .4byte lbl_803CE415 + .4byte lbl_803CE429 + .4byte lbl_803CE429 + .4byte lbl_803CE429 + .4byte lbl_803CE429 + .4byte lbl_803CE43D + .4byte lbl_803CE43D + .4byte lbl_803CE43D + .4byte lbl_803CE43D + .4byte lbl_803CE43D + .4byte lbl_803CE44F + .4byte lbl_803CE461 + .4byte lbl_803CE475 .global lbl_803CE3AC lbl_803CE3AC: + # ROM: 0x3CB3AC .asciz "CMDL_InvPowerBeam" - .asciz "CMDL_InvIceBeam" - .asciz "CMDL_InvWaveBeam" - .asciz "CMDL_InvPlasmaBeam" - .asciz "CMDL_InvVisor" + +.global lbl_803CE3BE +lbl_803CE3BE: + + # ROM: 0x3CB3BE + .byte 0x43, 0x4D + .asciz "DL_InvIceBeam" + +.global lbl_803CE3CE +lbl_803CE3CE: + + # ROM: 0x3CB3CE + .byte 0x43, 0x4D + .asciz "DL_InvWaveBeam" + +.global lbl_803CE3DF +lbl_803CE3DF: + + # ROM: 0x3CB3DF + .byte 0x43 + .asciz "MDL_InvPlasmaBeam" + +.global lbl_803CE3F2 +lbl_803CE3F2: + + # ROM: 0x3CB3F2 + .byte 0x43, 0x4D + .asciz "DL_InvVisor" + +.global lbl_803CE400 +lbl_803CE400: + + # ROM: 0x3CB400 .asciz "CMDL_InvGravityVisor" - .asciz "CMDL_InvPhazonVisor" - .asciz "CMDL_InvFusionVisor" - .asciz "CMDL_InvPowerFins" - .asciz "CMDL_InvVariaFins" - .asciz "CMDL_InvGravityFins" - .asciz "CMDL_InvPhazonFins" + +.global lbl_803CE415 +lbl_803CE415: + + # ROM: 0x3CB415 + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvPhazonVisor" + +.global lbl_803CE429 +lbl_803CE429: + + # ROM: 0x3CB429 + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvFusionVisor" + +.global lbl_803CE43D +lbl_803CE43D: + + # ROM: 0x3CB43D + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvPowerFins" + +.global lbl_803CE44F +lbl_803CE44F: + + # ROM: 0x3CB44F + .byte 0x43 + .asciz "MDL_InvVariaFins" + +.global lbl_803CE461 +lbl_803CE461: + + # ROM: 0x3CB461 + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvGravityFins" + +.global lbl_803CE475 +lbl_803CE475: + + # ROM: 0x3CB475 + .byte 0x43, 0x4D, 0x44 + .asciz "L_InvPhazonFins" + +.global lbl_803CE488 +lbl_803CE488: + + # ROM: 0x3CB488 .asciz "CMDL_InvGrappleBeam" + +.global lbl_803CE49C +lbl_803CE49C: + + # ROM: 0x3CB49C .asciz "GUN_LCTR" - .asciz "GRAPPLE_LCTR" - .asciz "VISOR_LCTR" - .asciz "SamusBallANCS" - .asciz "??(??)" - .asciz "PhazonIndirectTexture" + +.global lbl_803CE4A5 +lbl_803CE4A5: + + # ROM: 0x3CB4A5 + .byte 0x47, 0x52, 0x41 + .asciz "PPLE_LCTR" + +.global lbl_803CE4B2 +lbl_803CE4B2: + + # ROM: 0x3CB4B2 + .byte 0x56, 0x49 + .asciz "SOR_LCTR" + .byte 0x53, 0x61, 0x6D + .asciz "usBallANCS" + .byte 0x3F + .asciz "?(??)" + .byte 0x50, 0x68 + .asciz "azonIndirectTexture" .asciz "ANCS_ItemScreenSamus" - .asciz "BallInnerGlow" - .asciz "MorphBallTransitionFlash" + .byte 0x42, 0x61, 0x6C + .asciz "lInnerGlow" + .byte 0x4D + .asciz "orphBallTransitionFlash" + .4byte 0 diff --git a/asm/MetroidPrime/CSaveGameScreen.s b/asm/MetroidPrime/CSaveGameScreen.s index 1a96d97f..3b463abd 100644 --- a/asm/MetroidPrime/CSaveGameScreen.s +++ b/asm/MetroidPrime/CSaveGameScreen.s @@ -1936,26 +1936,75 @@ lbl_80250A68: .global lbl_805AD5D8 lbl_805AD5D8: # ROM: 0x3F9E78 - .4byte 0x803D4A90 + .4byte lbl_803D4A90 .global lbl_805AD5DC lbl_805AD5DC: # ROM: 0x3F9E7C - .4byte 0x803D4AA0 + .4byte lbl_803D4AA0 .global lbl_805AD5E0 lbl_805AD5E0: # ROM: 0x3F9E80 - .4byte 0x803D4AAF + .4byte lbl_803D4AAF .global lbl_805AD5E4 lbl_805AD5E4: # ROM: 0x3F9E84 - .4byte 0x803D4ABE + .4byte lbl_803D4ABE .global lbl_805AD5E8 lbl_805AD5E8: # ROM: 0x3F9E88 - .4byte 0x803D4ACE + .4byte lbl_803D4ACE .4byte 0 +.section .rodata +.balign 8 + +.global lbl_803D4A90 +lbl_803D4A90: + + # ROM: 0x3D1A90 + .asciz "TXTR_SaveBanner" + +.global lbl_803D4AA0 +lbl_803D4AA0: + + # ROM: 0x3D1AA0 + .asciz "TXTR_SaveIcon0" + +.global lbl_803D4AAF +lbl_803D4AAF: + + # ROM: 0x3D1AAF + .byte 0x54 + .asciz "XTR_SaveIcon1" + +.global lbl_803D4ABE +lbl_803D4ABE: + + # ROM: 0x3D1ABE + .byte 0x53, 0x54 + .asciz "RG_MemoryCard" + +.global lbl_803D4ACE +lbl_803D4ACE: + + # ROM: 0x3D1ACE + .byte 0x46, 0x52 + .asciz "ME_GenericMenu" + .byte 0x74 + .asciz "extpane_message" + .asciz "tablegroup_choices" + .byte 0x74 + .asciz "extpane_choice0" + .asciz "textpane_choice1" + .byte 0x74, 0x65, 0x78 + .asciz "tpane_choice2" + .byte 0x74, 0x65 + .asciz "xtpane_choice3" + .byte 0x3F + .asciz "?(??)" + .balign 4 + diff --git a/asm/MetroidPrime/CSlideShow.s b/asm/MetroidPrime/CSlideShow.s index e0009e6f..830e86cb 100644 --- a/asm/MetroidPrime/CSlideShow.s +++ b/asm/MetroidPrime/CSlideShow.s @@ -4843,8 +4843,8 @@ sub_8029bd24: /* 8029BD60 00298CC0 48 0A 50 AD */ bl GetObj__6CTokenFv /* 8029BD64 00298CC4 83 E3 00 04 */ lwz r31, 4(r3) /* 8029BD68 00298CC8 3C 80 43 30 */ lis r4, 0x4330 -/* 8029BD6C 00298CCC 3C 60 80 3F */ lis r3, lbl_803F0004@ha -/* 8029BD70 00298CD0 87 83 D9 10 */ lwzu r28, -0x26f0(r3) +/* 8029BD6C 00298CCC 3C 60 80 3F */ lis r3, mViewport__9CGraphics@ha +/* 8029BD70 00298CD0 87 83 D9 10 */ lwzu r28, mViewport__9CGraphics@l(r3) /* 8029BD74 00298CD4 A8 BF 00 04 */ lha r5, 4(r31) /* 8029BD78 00298CD8 28 17 00 00 */ cmplwi r23, 0 /* 8029BD7C 00298CDC A8 1F 00 06 */ lha r0, 6(r31) @@ -4853,7 +4853,7 @@ sub_8029bd24: /* 8029BD88 00298CE8 6C 00 80 00 */ xoris r0, r0, 0x8000 /* 8029BD8C 00298CEC C8 42 BF F8 */ lfd f2, lbl_805ADD18@sda21(r2) /* 8029BD90 00298CF0 90 A1 00 64 */ stw r5, 0x64(r1) -/* 8029BD94 00298CF4 83 63 00 04 */ lwz r27, lbl_803F0004@l(r3) +/* 8029BD94 00298CF4 83 63 00 04 */ lwz r27, 4(r3) /* 8029BD98 00298CF8 C8 21 00 60 */ lfd f1, 0x60(r1) /* 8029BD9C 00298CFC 90 81 00 68 */ stw r4, 0x68(r1) /* 8029BDA0 00298D00 EF E1 10 28 */ fsubs f31, f1, f2 @@ -5493,27 +5493,27 @@ __sinit_CSlideShow_cpp: .global lbl_805ADCE8 lbl_805ADCE8: # ROM: 0x3FA588 - .4byte 0x803D5C52 + .4byte lbl_803D5C52 .global lbl_805ADCEC lbl_805ADCEC: # ROM: 0x3FA58C - .4byte 0x803D5C5A + .4byte lbl_803D5C5A .global lbl_805ADCF0 lbl_805ADCF0: # ROM: 0x3FA590 - .4byte 0x803D5C6D + .4byte lbl_803D5C6D .global lbl_805ADCF4 lbl_805ADCF4: # ROM: 0x3FA594 - .4byte 0x803D5C7D + .4byte lbl_803D5C7D .global lbl_805ADCF8 lbl_805ADCF8: # ROM: 0x3FA598 - .4byte 0x803D5C90 + .4byte lbl_803D5C90 .global lbl_805ADCFC lbl_805ADCFC: @@ -5528,8 +5528,8 @@ lbl_805ADD04: .global lbl_805ADD08 lbl_805ADD08: # ROM: 0x3FA5A8 - .4byte 0x803D5CA5 - .4byte 0x803D5CBD + .4byte lbl_803D5CA5 + .4byte lbl_803D5CBD .global lbl_805ADD10 lbl_805ADD10: @@ -5621,19 +5621,55 @@ lbl_803D5C38: .global lbl_803D5C48 lbl_803D5C48: + # ROM: 0x3D2C48 .asciz "slideshow" + +.global lbl_803D5C52 +lbl_803D5C52: + + # ROM: 0x3D2C52 .byte 0x47, 0x61 .asciz "llery" + +.global lbl_803D5C5A +lbl_803D5C5A: + + # ROM: 0x3D2C5A .byte 0x47, 0x61 .asciz "lleryAssets_DGRP" + +.global lbl_803D5C6D +lbl_803D5C6D: + + # ROM: 0x3D2C6D .byte 0x54, 0x58, 0x54 .asciz "R_GalleryTag" + +.global lbl_803D5C7D +lbl_803D5C7D: + + # ROM: 0x3D2C7D .byte 0x43, 0x4D, 0x44 .asciz "L_GalleryBorder" + +.global lbl_803D5C90 +lbl_803D5C90: + + # ROM: 0x3D2C90 .asciz "Audio/frontend_1.rsf" + +.global lbl_803D5CA5 +lbl_803D5CA5: + + # ROM: 0x3D2CA5 .byte 0x53, 0x54, 0x52 .asciz "G_SlideShow_Unlock1_" + +.global lbl_803D5CBD +lbl_803D5CBD: + + # ROM: 0x3D2CBD .byte 0x53, 0x54, 0x52 .asciz "G_SlideShow_Unlock2_" .byte 0x25, 0x64, 0x2F diff --git a/asm/MetroidPrime/CSplashScreen.s b/asm/MetroidPrime/CSplashScreen.s index 9714558a..eb9077a7 100644 --- a/asm/MetroidPrime/CSplashScreen.s +++ b/asm/MetroidPrime/CSplashScreen.s @@ -1423,20 +1423,31 @@ lbl_800293E8: .balign 8 .global lbl_803CCCD0 lbl_803CCCD0: + # ROM: 0x3C9CD0 - .4byte 0x803CCCDC - .4byte 0x803CCCEE - .4byte 0x803CCCFD + .4byte lbl_803CCCDC + .4byte lbl_803CCCEE + .4byte lbl_803CCCFD .global lbl_803CCCDC lbl_803CCCDC: + # ROM: 0x3C9CDC .asciz "TXTR_NintendoLogo" + +.global lbl_803CCCEE +lbl_803CCCEE: + + # ROM: 0x3C9CEE .byte 0x54, 0x58 .asciz "TR_RetroLogo" + +.global lbl_803CCCFD +lbl_803CCCFD: + + # ROM: 0x3C9CFD .byte 0x54, 0x58, 0x54 .asciz "R_DolbyLogo" .asciz "??(??)" .byte 0x53 .asciz "plashScreen" - diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index 645a32a9..b2cf9473 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -399,7 +399,7 @@ lbl_805AA320: .global lbl_805AA324 lbl_805AA324: # ROM: 0x3F6BC4 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AA328 lbl_805AA328: diff --git a/asm/MetroidPrime/CTargetReticles.s b/asm/MetroidPrime/CTargetReticles.s index 2a85f807..2efb4582 100644 --- a/asm/MetroidPrime/CTargetReticles.s +++ b/asm/MetroidPrime/CTargetReticles.s @@ -4509,12 +4509,12 @@ lbl_800C0010: lbl_800C0080: /* 800C0080 000BCFE0 C0 62 8D 38 */ lfs f3, lbl_805AAA58@sda21(r2) lbl_800C0084: -/* 800C0084 000BCFE4 3C 60 80 5A */ lis r3, lbl_805A0004@ha -/* 800C0088 000BCFE8 84 83 66 A0 */ lwzu r4, 0x66a0(r3) +/* 800C0084 000BCFE4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800C0088 000BCFE8 84 83 66 A0 */ lwzu r4, sZeroVector__9CVector3f@l(r3) /* 800C008C 000BCFEC C0 22 8D 38 */ lfs f1, lbl_805AAA58@sda21(r2) /* 800C0090 000BCFF0 38 A1 00 1C */ addi r5, r1, 0x1c /* 800C0094 000BCFF4 A0 01 00 14 */ lhz r0, 0x14(r1) -/* 800C0098 000BCFF8 80 C3 00 04 */ lwz r6, lbl_805A0004@l(r3) +/* 800C0098 000BCFF8 80 C3 00 04 */ lwz r6, 4(r3) /* 800C009C 000BCFFC FC 40 08 90 */ fmr f2, f1 /* 800C00A0 000BD000 80 E3 00 08 */ lwz r7, 8(r3) /* 800C00A4 000BD004 38 61 00 34 */ addi r3, r1, 0x34 @@ -4739,12 +4739,12 @@ lbl_800C03A8: lbl_800C03D0: /* 800C03D0 000BD330 C0 62 8D 38 */ lfs f3, lbl_805AAA58@sda21(r2) lbl_800C03D4: -/* 800C03D4 000BD334 3C 60 80 5A */ lis r3, lbl_805A0004@ha -/* 800C03D8 000BD338 84 83 66 A0 */ lwzu r4, 0x66a0(r3) +/* 800C03D4 000BD334 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800C03D8 000BD338 84 83 66 A0 */ lwzu r4, sZeroVector__9CVector3f@l(r3) /* 800C03DC 000BD33C C0 22 8D 38 */ lfs f1, lbl_805AAA58@sda21(r2) /* 800C03E0 000BD340 38 A1 00 48 */ addi r5, r1, 0x48 /* 800C03E4 000BD344 A0 01 00 18 */ lhz r0, 0x18(r1) -/* 800C03E8 000BD348 80 C3 00 04 */ lwz r6, lbl_805A0004@l(r3) +/* 800C03E8 000BD348 80 C3 00 04 */ lwz r6, 4(r3) /* 800C03EC 000BD34C FC 40 08 90 */ fmr f2, f1 /* 800C03F0 000BD350 80 E3 00 08 */ lwz r7, 8(r3) /* 800C03F4 000BD354 38 61 00 54 */ addi r3, r1, 0x54 diff --git a/asm/MetroidPrime/CWorldTransManager.s b/asm/MetroidPrime/CWorldTransManager.s index 2dde22f5..7624fe7e 100644 --- a/asm/MetroidPrime/CWorldTransManager.s +++ b/asm/MetroidPrime/CWorldTransManager.s @@ -1451,7 +1451,7 @@ lbl_8020A1B8: DrawAllModels__18CWorldTransManagerCFv: /* 8020A1D4 00207134 94 21 FC 10 */ stwu r1, -0x3f0(r1) /* 8020A1D8 00207138 7C 08 02 A6 */ mflr r0 -/* 8020A1DC 0020713C 3C 80 80 5A */ lis r4, lbl_805A0004@ha +/* 8020A1DC 0020713C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8020A1E0 00207140 C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) /* 8020A1E4 00207144 90 01 03 F4 */ stw r0, 0x3f4(r1) /* 8020A1E8 00207148 38 A1 00 3C */ addi r5, r1, 0x3c @@ -1461,10 +1461,10 @@ DrawAllModels__18CWorldTransManagerCFv: /* 8020A1F8 00207158 39 40 00 00 */ li r10, 0 /* 8020A1FC 0020715C 93 C1 03 E8 */ stw r30, 0x3e8(r1) /* 8020A200 00207160 7C 7E 1B 78 */ mr r30, r3 -/* 8020A204 00207164 84 C4 66 A0 */ lwzu r6, 0x66a0(r4) +/* 8020A204 00207164 84 C4 66 A0 */ lwzu r6, sZeroVector__9CVector3f@l(r4) /* 8020A208 00207168 83 E3 00 04 */ lwz r31, 4(r3) /* 8020A20C 0020716C 38 61 01 08 */ addi r3, r1, 0x108 -/* 8020A210 00207170 81 04 00 04 */ lwz r8, lbl_805A0004@l(r4) +/* 8020A210 00207170 81 04 00 04 */ lwz r8, 4(r4) /* 8020A214 00207174 80 04 00 08 */ lwz r0, 8(r4) /* 8020A218 00207178 38 80 00 00 */ li r4, 0 /* 8020A21C 0020717C 90 C1 00 3C */ stw r6, 0x3c(r1) diff --git a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s index 94f3219b..7f831f50 100644 --- a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s +++ b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s @@ -979,7 +979,7 @@ lbl_805AD4CC: .global lbl_805AD4D0 lbl_805AD4D0: # ROM: 0x3F9D70 - .4byte 0x3F19999A + .float 0.6 .4byte 0 .global lbl_805AD4D8 diff --git a/asm/MetroidPrime/Cameras/CCameraFilter.s b/asm/MetroidPrime/Cameras/CCameraFilter.s index b0cd1846..500ff03f 100644 --- a/asm/MetroidPrime/Cameras/CCameraFilter.s +++ b/asm/MetroidPrime/Cameras/CCameraFilter.s @@ -3429,36 +3429,36 @@ __sinit_CCameraFilter_cpp: .global lbl_803CE650 lbl_803CE650: # ROM: 0x3CB650 - .4byte 0x803CE738 - .4byte 0x803CE744 - .4byte 0x803CE750 - .4byte 0x803CE75C - .4byte 0x803CE768 - .4byte 0x803CE774 - .4byte 0x803CE780 - .4byte 0x803CE78C - .4byte 0x803CE798 - .4byte 0x803CE7A4 - .4byte 0x803CE7C5 - .4byte 0x803CE7E6 - .4byte 0x803CE807 - .4byte 0x803CE828 - .4byte 0x803CE849 - .4byte 0x803CE86A - .4byte 0x803CE88B - .4byte 0x803CE8AC - .4byte 0x803CE8CD - .4byte 0x803CE8D6 - .4byte 0x803CE8DF - .4byte 0x803CE8E8 + .4byte lbl_803CE738 + .4byte lbl_803CE744 + .4byte lbl_803CE750 + .4byte lbl_803CE75C + .4byte lbl_803CE768 + .4byte lbl_803CE774 + .4byte lbl_803CE780 + .4byte lbl_803CE78C + .4byte lbl_803CE798 + .4byte lbl_803CE7A4 + .4byte lbl_803CE7C5 + .4byte lbl_803CE7E6 + .4byte lbl_803CE807 + .4byte lbl_803CE828 + .4byte lbl_803CE849 + .4byte lbl_803CE86A + .4byte lbl_803CE88B + .4byte lbl_803CE8AC + .4byte lbl_803CE8CD + .4byte lbl_803CE8D6 + .4byte lbl_803CE8DF + .4byte lbl_803CE8E8 .global lbl_803CE6A8 lbl_803CE6A8: # ROM: 0x3CB6A8 - .4byte 0x803CE8F1 - .4byte 0x803CE8F1 - .4byte 0x803CE8F1 - .4byte 0x803CE8F2 + .4byte lbl_803CE8F1 + .4byte lbl_803CE8F1 + .4byte lbl_803CE8F1 + .4byte lbl_803CE8F2 .4byte 0x00000004 .4byte 0x00000004 .4byte 0x00000004 @@ -3494,42 +3494,147 @@ lbl_803CE6A8: .global lbl_803CE738 lbl_803CE738: + # ROM: 0x3CB738 .asciz "PassThru " + +.global lbl_803CE744 +lbl_803CE744: + + # ROM: 0x3CB744 .asciz "Multiply " + +.global lbl_803CE750 +lbl_803CE750: + + # ROM: 0x3CB750 .asciz "Invert " + +.global lbl_803CE75C +lbl_803CE75C: + + # ROM: 0x3CB75C .asciz "Add " + +.global lbl_803CE768 +lbl_803CE768: + + # ROM: 0x3CB768 .asciz "Subtract " + +.global lbl_803CE774 +lbl_803CE774: + + # ROM: 0x3CB774 .asciz "Blend " + +.global lbl_803CE780 +lbl_803CE780: + + # ROM: 0x3CB780 .asciz "WideScreen " + +.global lbl_803CE78C +lbl_803CE78C: + + # ROM: 0x3CB78C .asciz "SceneAdd " + +.global lbl_803CE798 +lbl_803CE798: + + # ROM: 0x3CB798 .asciz "NoColor " + +.global lbl_803CE7A4 +lbl_803CE7A4: + + # ROM: 0x3CB7A4 .asciz "FullScreen " - .byte 0x46, 0x75, 0x6C - .asciz "lScreenHalvesLeftRight " - .byte 0x46, 0x75 - .asciz "llScreenHalvesTopBottom " - .byte 0x46 - .asciz "ullScreenQuarters " + +.global lbl_803CE7C5 +lbl_803CE7C5: + + # ROM: 0x3CB7C5 + .asciz "FullScreenHalvesLeftRight " + +.global lbl_803CE7E6 +lbl_803CE7E6: + + # ROM: 0x3CB7E6 + .asciz "FullScreenHalvesTopBottom " + +.global lbl_803CE807 +lbl_803CE807: + + # ROM: 0x3CB807 + .asciz "FullScreenQuarters " + +.global lbl_803CE828 +lbl_803CE828: + + # ROM: 0x3CB828 .asciz "CinemaBars " - .byte 0x53, 0x63, 0x61 - .asciz "nLinesEven " - .byte 0x53, 0x63 - .asciz "anLinesOdd " - .byte 0x52 - .asciz "andomStatic " + +.global lbl_803CE849 +lbl_803CE849: + + # ROM: 0x3CB849 + .asciz "ScanLinesEven " + +.global lbl_803CE86A +lbl_803CE86A: + + # ROM: 0x3CB86A + .asciz "ScanLinesOdd " + +.global lbl_803CE88B +lbl_803CE88B: + + # ROM: 0x3CB88B + .asciz "RandomStatic " + +.global lbl_803CE8AC +lbl_803CE8AC: + + # ROM: 0x3CB8AC .asciz "CookieCutterDepthRandomStatic " - .byte 0x4E, 0x6F, 0x42 - .asciz "lur " - .byte 0x4C, 0x6F - .asciz "Blur " - .byte 0x48 - .asciz "iBlur " + +.global lbl_803CE8CD +lbl_803CE8CD: + + # ROM: 0x3CB8CD + .asciz "NoBlur " + +.global lbl_803CE8D6 +lbl_803CE8D6: + + # ROM: 0x3CB8D6 + .asciz "LoBlur " + +.global lbl_803CE8DF +lbl_803CE8DF: + + # ROM: 0x3CB8DF + .asciz "HiBlur " + +.global lbl_803CE8E8 +lbl_803CE8E8: + + # ROM: 0x3CB8E8 .asciz "XRay " - .byte 0x00, 0x54, 0x58 - .asciz "TR_XRayPalette" - .byte 0x3F - .asciz "?(??)" + +.global lbl_803CE8F1 +lbl_803CE8F1: + + # ROM: 0x3CB8F1 + .asciz "" + +.global lbl_803CE8F2 +lbl_803CE8F2: + + # ROM: 0x3CB8F2 + .asciz "TXTR_XRayPalette" + .asciz "??(??)" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s index 3cdffb7e..15d06df4 100644 --- a/asm/MetroidPrime/Cameras/CCameraManager.s +++ b/asm/MetroidPrime/Cameras/CCameraManager.s @@ -375,7 +375,6 @@ lbl_8000949C: lbl_800094A8: /* 800094A8 00006408 80 01 00 24 */ lwz r0, 0x24(r1) /* 800094AC 0000640C 83 E1 00 1C */ lwz r31, 0x1c(r1) -.global lbl_800094B0 lbl_800094B0: /* 800094B0 00006410 83 C1 00 18 */ lwz r30, 0x18(r1) /* 800094B4 00006414 7C 08 03 A6 */ mtlr r0 @@ -1826,9 +1825,6 @@ IsInFirstPersonCamera__14CCameraManagerCFv: /* 8000A8F0 00007850 7C 03 00 50 */ subf r0, r3, r0 /* 8000A8F4 00007854 7C 00 00 34 */ cntlzw r0, r0 /* 8000A8F8 00007858 54 03 D9 7E */ srwi r3, r0, 5 - -.global sub_8000a8fc -sub_8000a8fc: /* 8000A8FC 0000785C 4E 80 00 20 */ blr .global IsInCinematicCamera__14CCameraManagerCFv @@ -2357,9 +2353,6 @@ lbl_8000B020: /* 8000B048 00007FA8 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8000B04C 00007FAC 7C 08 03 A6 */ mtlr r0 /* 8000B050 00007FB0 38 21 00 30 */ addi r1, r1, 0x30 - -.global sub_8000b054 -sub_8000b054: /* 8000B054 00007FB4 4E 80 00 20 */ blr .global EnterCinematic__14CCameraManagerFR13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index 2112bff9..87783d4e 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -4597,217 +4597,837 @@ __sinit_CAi_cpp: .balign 8 .global lbl_803CD968 lbl_803CD968: + # ROM: 0x3CA968 .asciz "Patrol" + +.global lbl_803CD96F +lbl_803CD96F: + + # ROM: 0x3CA96F .byte 0x46 .asciz "ollowPattern" + +.global lbl_803CD97D +lbl_803CD97D: + + # ROM: 0x3CA97D .byte 0x44, 0x65, 0x61 - .4byte 0x64005061 + .byte 0x64, 0x00 + +.global lbl_803CD982 +lbl_803CD982: + + # ROM: 0x3CA982 + .byte 0x50, 0x61 .asciz "thFind" + +.global lbl_803CD98B +lbl_803CD98B: + + # ROM: 0x3CA98B .byte 0x53 .asciz "tart" + +.global lbl_803CD991 +lbl_803CD991: + + # ROM: 0x3CA991 .byte 0x53, 0x65, 0x6C .asciz "ectTarget" + +.global lbl_803CD99E +lbl_803CD99E: + + # ROM: 0x3CA99E .byte 0x54, 0x61 .asciz "rgetPatrol" + +.global lbl_803CD9AB +lbl_803CD9AB: + + # ROM: 0x3CA9AB .byte 0x54 .asciz "argetPlayer" + +.global lbl_803CD9B8 +lbl_803CD9B8: + + # ROM: 0x3CA9B8 .asciz "TargetCover" + +.global lbl_803CD9C4 +lbl_803CD9C4: + + # ROM: 0x3CA9C4 .asciz "Halt" + +.global lbl_803CD9C9 +lbl_803CD9C9: + + # ROM: 0x3CA9C9 .byte 0x57, 0x61, 0x6C - .4byte 0x6B005275 - .4byte 0x6E004765 + .byte 0x6B, 0x00 + +.global lbl_803CD9CE +lbl_803CD9CE: + + # ROM: 0x3CA9CE + .byte 0x52, 0x75 + .byte 0x6E, 0x00 + +.global lbl_803CD9D2 +lbl_803CD9D2: + + # ROM: 0x3CA9D2 + .byte 0x47, 0x65 .asciz "nerate" + +.global lbl_803CD9DB +lbl_803CD9DB: + + # ROM: 0x3CA9DB .byte 0x44 .asciz "eactivate" + +.global lbl_803CD9E6 +lbl_803CD9E6: + + # ROM: 0x3CA9E6 .byte 0x41, 0x74 .asciz "tack" + +.global lbl_803CD9ED +lbl_803CD9ED: + + # ROM: 0x3CA9ED .byte 0x4C, 0x6F, 0x6F .asciz "pedAttack" + +.global lbl_803CD9FA +lbl_803CD9FA: + + # ROM: 0x3CA9FA .byte 0x4A, 0x75 .asciz "mpBack" + +.global lbl_803CDA03 +lbl_803CDA03: + + # ROM: 0x3CAA03 .byte 0x44 .asciz "oubleSnap" + +.global lbl_803CDA0E +lbl_803CDA0E: + + # ROM: 0x3CAA0E .byte 0x53, 0x68 .asciz "uffle" + +.global lbl_803CDA16 +lbl_803CDA16: + + # ROM: 0x3CAA16 .byte 0x54, 0x75 .asciz "rnAround" + +.global lbl_803CDA21 +lbl_803CDA21: + + # ROM: 0x3CAA21 .byte 0x53, 0x6B, 0x69 - .4byte 0x64004163 + .byte 0x64, 0x00 + +.global lbl_803CDA26 +lbl_803CDA26: + + # ROM: 0x3CAA26 + .byte 0x41, 0x63 .asciz "tive" + +.global lbl_803CDA2D +lbl_803CDA2D: + + # ROM: 0x3CAA2D .byte 0x49, 0x6E, 0x41 .asciz "ctive" + +.global lbl_803CDA36 +lbl_803CDA36: + + # ROM: 0x3CAA36 .byte 0x43, 0x6F .asciz "verAttack" + +.global lbl_803CDA42 +lbl_803CDA42: + + # ROM: 0x3CAA42 .byte 0x43, 0x72 .asciz "ouch" + +.global lbl_803CDA49 +lbl_803CDA49: + + # ROM: 0x3CAA49 .byte 0x46, 0x61, 0x64 .4byte 0x65496E00 + +.global lbl_803CDA50 +lbl_803CDA50: + + # ROM: 0x3CAA50 .asciz "FadeOut" + +.global lbl_803CDA58 +lbl_803CDA58: + + # ROM: 0x3CAA58 .asciz "GetUp" + +.global lbl_803CDA5E +lbl_803CDA5E: + + # ROM: 0x3CAA5E .byte 0x54, 0x61 .4byte 0x756E7400 + +.global lbl_803CDA64 +lbl_803CDA64: + + # ROM: 0x3CAA64 .asciz "Suck" + +.global lbl_803CDA69 +lbl_803CDA69: + + # ROM: 0x3CAA69 .byte 0x46, 0x6C, 0x65 - .4byte 0x65004C75 - .4byte 0x726B0050 + .byte 0x65, 0x00 + +.global lbl_803CDA6E +lbl_803CDA6E: + + # ROM: 0x3CAA6E + .byte 0x4C, 0x75 + .byte 0x72, 0x6B, 0x00 + +.global lbl_803CDA73 +lbl_803CDA73: + + # ROM: 0x3CAA73 + .byte 0x50 .asciz "rojectileAttack" + +.global lbl_803CDA84 +lbl_803CDA84: + + # ROM: 0x3CAA84 .asciz "Flinch" + +.global lbl_803CDA8B +lbl_803CDA8B: + + # ROM: 0x3CAA8B .byte 0x48 .asciz "urled" + +.global lbl_803CDA92 +lbl_803CDA92: + + # ROM: 0x3CAA92 .byte 0x54, 0x65 .asciz "legraphAttack" + +.global lbl_803CDAA2 +lbl_803CDAA2: + + # ROM: 0x3CAAA2 .byte 0x4A, 0x75 - .4byte 0x6D700045 + .byte 0x6D, 0x70, 0x00 + +.global lbl_803CDAA7 +lbl_803CDAA7: + + # ROM: 0x3CAAA7 + .byte 0x45 .asciz "xplode" + +.global lbl_803CDAAF +lbl_803CDAAF: + + # ROM: 0x3CAAAF .byte 0x44 .asciz "odge" + +.global lbl_803CDAB5 +lbl_803CDAB5: + + # ROM: 0x3CAAB5 .byte 0x52, 0x65, 0x74 .asciz "reat" + +.global lbl_803CDABD +lbl_803CDABD: + + # ROM: 0x3CAABD .byte 0x43, 0x6F, 0x76 - .4byte 0x65720041 + .byte 0x65, 0x72, 0x00 + +.global lbl_803CDAC3 +lbl_803CDAC3: + + # ROM: 0x3CAAC3 + .byte 0x41 .asciz "pproach" + +.global lbl_803CDACC +lbl_803CDACC: + + # ROM: 0x3CAACC .asciz "WallHang" + +.global lbl_803CDAD5 +lbl_803CDAD5: + + # ROM: 0x3CAAD5 .byte 0x57, 0x61, 0x6C .asciz "lDetach" + +.global lbl_803CDAE0 +lbl_803CDAE0: + + # ROM: 0x3CAAE0 .asciz "Enraged" + +.global lbl_803CDAE8 +lbl_803CDAE8: + + # ROM: 0x3CAAE8 .asciz "SpecialAttack" + +.global lbl_803CDAF6 +lbl_803CDAF6: + + # ROM: 0x3CAAF6 .byte 0x47, 0x72 .asciz "owth" + +.global lbl_803CDAFD +lbl_803CDAFD: + + # ROM: 0x3CAAFD .byte 0x46, 0x61, 0x69 - .4byte 0x6E74004C + .byte 0x6E, 0x74, 0x00 + +.global lbl_803CDB03 +lbl_803CDB03: + + # ROM: 0x3CAB03 + .byte 0x4C .4byte 0x616E6400 + +.global lbl_803CDB08 +lbl_803CDB08: + + # ROM: 0x3CAB08 .asciz "Bounce" + +.global lbl_803CDB0F +lbl_803CDB0F: + + # ROM: 0x3CAB0F .byte 0x50 .asciz "athFindEx" + +.global lbl_803CDB1A +lbl_803CDB1A: + + # ROM: 0x3CAB1A .byte 0x44, 0x69 .4byte 0x7A7A7900 + +.global lbl_803CDB20 +lbl_803CDB20: + + # ROM: 0x3CAB20 .asciz "CallForBackup" + +.global lbl_803CDB2E +lbl_803CDB2E: + + # ROM: 0x3CAB2E .byte 0x42, 0x75 .asciz "lbAttack" + +.global lbl_803CDB39 +lbl_803CDB39: + + # ROM: 0x3CAB39 .byte 0x50, 0x6F, 0x64 .asciz "Attack" + +.global lbl_803CDB43 +lbl_803CDB43: + + # ROM: 0x3CAB43 .byte 0x49 .asciz "nAttackPosition" + +.global lbl_803CDB54 +lbl_803CDB54: + + # ROM: 0x3CAB54 .asciz "Leash" + +.global lbl_803CDB5A +lbl_803CDB5A: + + # ROM: 0x3CAB5A .byte 0x4F, 0x66 .asciz "fLine" + +.global lbl_803CDB62 +lbl_803CDB62: + + # ROM: 0x3CAB62 .byte 0x41, 0x74 .asciz "tacked" + +.global lbl_803CDB6B +lbl_803CDB6B: + + # ROM: 0x3CAB6B .byte 0x50 .asciz "athShagged" + +.global lbl_803CDB77 +lbl_803CDB77: + + # ROM: 0x3CAB77 .byte 0x50 .asciz "athOver" + +.global lbl_803CDB80 +lbl_803CDB80: + + # ROM: 0x3CAB80 .asciz "PathFound" + +.global lbl_803CDB8A +lbl_803CDB8A: + + # ROM: 0x3CAB8A .byte 0x54, 0x6F .asciz "oClose" + +.global lbl_803CDB93 +lbl_803CDB93: + + # ROM: 0x3CAB93 .byte 0x49 .asciz "nRange" + +.global lbl_803CDB9B +lbl_803CDB9B: + + # ROM: 0x3CAB9B .byte 0x49 .asciz "nMaxRange" + +.global lbl_803CDBA6 +lbl_803CDBA6: + + # ROM: 0x3CABA6 .byte 0x49, 0x6E .asciz "DetectionRange" + +.global lbl_803CDBB7 +lbl_803CDBB7: + + # ROM: 0x3CABB7 .byte 0x53 .asciz "potPlayer" + +.global lbl_803CDBC2 +lbl_803CDBC2: + + # ROM: 0x3CABC2 .byte 0x50, 0x6C .asciz "ayerSpot" + +.global lbl_803CDBCD +lbl_803CDBCD: + + # ROM: 0x3CABCD .byte 0x50, 0x61, 0x74 .asciz "ternOver" + +.global lbl_803CDBD9 +lbl_803CDBD9: + + # ROM: 0x3CABD9 .byte 0x50, 0x61, 0x74 .asciz "ternShagged" + +.global lbl_803CDBE8 +lbl_803CDBE8: + + # ROM: 0x3CABE8 .asciz "HasAttackPattern" + +.global lbl_803CDBF9 +lbl_803CDBF9: + + # ROM: 0x3CABF9 .byte 0x48, 0x61, 0x73 .asciz "PatrolPath" + +.global lbl_803CDC07 +lbl_803CDC07: + + # ROM: 0x3CAC07 .byte 0x48 .asciz "asRetreatPattern" + +.global lbl_803CDC19 +lbl_803CDC19: + + # ROM: 0x3CAC19 .byte 0x44, 0x65, 0x6C - .4byte 0x61790052 + .byte 0x61, 0x79, 0x00 + +.global lbl_803CDC1F +lbl_803CDC1F: + + # ROM: 0x3CAC1F + .byte 0x52 .asciz "andomDelay" + +.global lbl_803CDC2B +lbl_803CDC2B: + + # ROM: 0x3CAC2B .byte 0x46 .asciz "ixedDelay" + +.global lbl_803CDC36 +lbl_803CDC36: + + # ROM: 0x3CAC36 .byte 0x44, 0x65 .asciz "fault" + +.global lbl_803CDC3E +lbl_803CDC3E: + + # ROM: 0x3CAC3E .byte 0x41, 0x6E .asciz "imOver" + +.global lbl_803CDC47 +lbl_803CDC47: + + # ROM: 0x3CAC47 .byte 0x53 .asciz "houldAttack" + +.global lbl_803CDC54 +lbl_803CDC54: + + # ROM: 0x3CAC54 .asciz "ShouldDoubleSnap" + +.global lbl_803CDC65 +lbl_803CDC65: + + # ROM: 0x3CAC65 .byte 0x49, 0x6E, 0x50 .asciz "osition" + +.global lbl_803CDC70 +lbl_803CDC70: + + # ROM: 0x3CAC70 .asciz "ShouldTurn" + +.global lbl_803CDC7B +lbl_803CDC7B: + + # ROM: 0x3CAC7B .byte 0x48 .asciz "itSomething" + +.global lbl_803CDC88 +lbl_803CDC88: + + # ROM: 0x3CAC88 .asciz "ShouldJumpBack" + +.global lbl_803CDC97 +lbl_803CDC97: + + # ROM: 0x3CAC97 .byte 0x53 .asciz "tuck" + +.global lbl_803CDC9D +lbl_803CDC9D: + + # ROM: 0x3CAC9D .byte 0x4E, 0x6F, 0x50 .asciz "athNodes" + +.global lbl_803CDCA9 +lbl_803CDCA9: + + # ROM: 0x3CACA9 .byte 0x4C, 0x61, 0x6E .4byte 0x64656400 + +.global lbl_803CDCB0 +lbl_803CDCB0: + + # ROM: 0x3CACB0 .asciz "HearShot" + +.global lbl_803CDCB9 +lbl_803CDCB9: + + # ROM: 0x3CACB9 .byte 0x48, 0x65, 0x61 .asciz "rPlayer" + +.global lbl_803CDCC4 +lbl_803CDCC4: + + # ROM: 0x3CACC4 .asciz "CoverCheck" + +.global lbl_803CDCCF +lbl_803CDCCF: + + # ROM: 0x3CACCF .byte 0x43 .asciz "overFind" + +.global lbl_803CDCD9 +lbl_803CDCD9: + + # ROM: 0x3CACD9 .byte 0x43, 0x6F, 0x76 .asciz "erBlown" + +.global lbl_803CDCE4 +lbl_803CDCE4: + + # ROM: 0x3CACE4 .asciz "CoverNearlyBlown" + +.global lbl_803CDCF5 +lbl_803CDCF5: + + # ROM: 0x3CACF5 .byte 0x43, 0x6F, 0x76 .asciz "eringFire" + +.global lbl_803CDD02 +lbl_803CDD02: + + # ROM: 0x3CAD02 .byte 0x47, 0x6F .4byte 0x74557000 + +.global lbl_803CDD08 +lbl_803CDD08: + + # ROM: 0x3CAD08 .asciz "LineOfSight" + +.global lbl_803CDD14 +lbl_803CDD14: + + # ROM: 0x3CAD14 .asciz "AggressionCheck" + +.global lbl_803CDD24 +lbl_803CDD24: + + # ROM: 0x3CAD24 .asciz "AttackOver" + +.global lbl_803CDD2F +lbl_803CDD2F: + + # ROM: 0x3CAD2F .byte 0x53 .asciz "houldTaunt" + +.global lbl_803CDD3B +lbl_803CDD3B: + + # ROM: 0x3CAD3B .byte 0x49 .asciz "nside" + +.global lbl_803CDD42 +lbl_803CDD42: + + # ROM: 0x3CAD42 .byte 0x53, 0x68 .asciz "ouldFire" + +.global lbl_803CDD4D +lbl_803CDD4D: + + # ROM: 0x3CAD4D .byte 0x53, 0x68, 0x6F .asciz "uldFlinch" + +.global lbl_803CDD5A +lbl_803CDD5A: + + # ROM: 0x3CAD5A .byte 0x50, 0x61 .asciz "trolPathOver" + +.global lbl_803CDD69 +lbl_803CDD69: + + # ROM: 0x3CAD69 .byte 0x53, 0x68, 0x6F .asciz "uldDodge" + +.global lbl_803CDD75 +lbl_803CDD75: + + # ROM: 0x3CAD75 .byte 0x53, 0x68, 0x6F .asciz "uldRetreat" + +.global lbl_803CDD83 +lbl_803CDD83: + + # ROM: 0x3CAD83 .byte 0x53 .asciz "houldCrouch" + +.global lbl_803CDD90 +lbl_803CDD90: + + # ROM: 0x3CAD90 .asciz "ShouldMove" + +.global lbl_803CDD9B +lbl_803CDD9B: + + # ROM: 0x3CAD9B .byte 0x53 .asciz "hotAt" + +.global lbl_803CDDA2 +lbl_803CDDA2: + + # ROM: 0x3CADA2 .byte 0x48, 0x61 .asciz "sTargetingPoint" + +.global lbl_803CDDB4 +lbl_803CDDB4: + + # ROM: 0x3CADB4 .asciz "ShouldWallHang" + +.global lbl_803CDDC3 +lbl_803CDDC3: + + # ROM: 0x3CADC3 .byte 0x53 .asciz "etAIStage" + +.global lbl_803CDDCE +lbl_803CDDCE: + + # ROM: 0x3CADCE .byte 0x41, 0x49 .asciz "Stage" + +.global lbl_803CDDD6 +lbl_803CDDD6: + + # ROM: 0x3CADD6 .byte 0x53, 0x74 .asciz "artAttack" + +.global lbl_803CDDE2 +lbl_803CDDE2: + + # ROM: 0x3CADE2 .byte 0x42, 0x72 .asciz "eakAttack" + +.global lbl_803CDDEE +lbl_803CDDEE: + + # ROM: 0x3CADEE .byte 0x53, 0x68 .asciz "ouldStrafe" + +.global lbl_803CDDFB +lbl_803CDDFB: + + # ROM: 0x3CADFB .byte 0x53 .asciz "houldSpecialAttack" + +.global lbl_803CDE0F +lbl_803CDE0F: + + # ROM: 0x3CAE0F .byte 0x4C .asciz "ostInterest" + +.global lbl_803CDE1C +lbl_803CDE1C: + + # ROM: 0x3CAE1C .asciz "CodeTrigger" + +.global lbl_803CDE28 +lbl_803CDE28: + + # ROM: 0x3CAE28 .asciz "BounceFind" + +.global lbl_803CDE33 +lbl_803CDE33: + + # ROM: 0x3CAE33 .byte 0x52 .asciz "andom" + +.global lbl_803CDE3A +lbl_803CDE3A: + + # ROM: 0x3CAE3A .byte 0x46, 0x69 .asciz "xedRandom" + +.global lbl_803CDE46 +lbl_803CDE46: + + # ROM: 0x3CAE46 .byte 0x49, 0x73 .asciz "Dizzy" + +.global lbl_803CDE4E +lbl_803CDE4E: + + # ROM: 0x3CAE4E .byte 0x53, 0x68 .asciz "ouldCallForBackup" .byte 0x3F, 0x3F .asciz "(??)" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CAtomicBeta.s b/asm/MetroidPrime/Enemies/CAtomicBeta.s index b3d0dde2..ca3f7d5c 100644 --- a/asm/MetroidPrime/Enemies/CAtomicBeta.s +++ b/asm/MetroidPrime/Enemies/CAtomicBeta.s @@ -6,9 +6,9 @@ .global lbl_803E8E40 lbl_803E8E40: # ROM: 0x3E5E40 - .4byte 0x803D4B50 - .4byte 0x803D4B5B - .4byte 0x803D4B66 + .4byte lbl_803D4B50 + .4byte lbl_803D4B5B + .4byte lbl_803D4B66 .global lbl_803E8E4C lbl_803E8E4C: @@ -1447,10 +1447,21 @@ lbl_805AD60C: .balign 8 .global lbl_803D4B50 lbl_803D4B50: + # ROM: 0x3D1B50 .asciz "bomb2_LCTR" + +.global lbl_803D4B5B +lbl_803D4B5B: + + # ROM: 0x3D1B5B .byte 0x62 .asciz "omb3_LCTR" + +.global lbl_803D4B66 +lbl_803D4B66: + + # ROM: 0x3D1B66 .byte 0x62, 0x6F .asciz "mb4_LCTR" .byte 0x3F, 0x3F, 0x28 diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index 4f35ec02..ed73a12e 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -8279,17 +8279,17 @@ lbl_805AD110: .global lbl_805AD114 lbl_805AD114: # ROM: 0x3F99B4 - .4byte 0x803D31DE + .4byte lbl_803D31DE .global lbl_805AD118 lbl_805AD118: # ROM: 0x3F99B8 - .4byte 0x803D31EC + .4byte lbl_803D31EC .global lbl_805AD11C lbl_805AD11C: # ROM: 0x3F99BC - .4byte 0x803D31F3 + .4byte lbl_803D31F3 .global lbl_805AD120 lbl_805AD120: @@ -8344,7 +8344,7 @@ lbl_805AD144: .global lbl_805AD148 lbl_805AD148: # ROM: 0x3F99E8 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AD14C lbl_805AD14C: @@ -8424,26 +8424,47 @@ lbl_805AD188: .global lbl_803D31A8 lbl_803D31A8: # ROM: 0x3D01A8 - .4byte 0x803D31D0 + .4byte lbl_803D31D0 .4byte 0x3F99999A - .4byte 0x803D31D7 + .4byte lbl_803D31D7 .4byte 0x3F99999A - .4byte 0x803D31DE + .4byte lbl_803D31DE .4byte 0x3FD9999A - .4byte 0x803D31EC + .4byte lbl_803D31EC .4byte 0x3F99999A - .4byte 0x803D31F3 + .4byte lbl_803D31F3 .float 0.9 .global lbl_803D31D0 lbl_803D31D0: + # ROM: 0x3D01D0 .asciz "L_knee" + +.global lbl_803D31D7 +lbl_803D31D7: + + # ROM: 0x3D01D7 .byte 0x52 .asciz "_knee" + +.global lbl_803D31DE +lbl_803D31DE: + + # ROM: 0x3D01DE .byte 0x4C, 0x43 .asciz "TR_SHEMOUTH" + +.global lbl_803D31EC +lbl_803D31EC: + + # ROM: 0x3D01EC .asciz "Pelvis" + +.global lbl_803D31F3 +lbl_803D31F3: + + # ROM: 0x3D01F3 .byte 0x62 .asciz "utt_LCTR" .byte 0x3F, 0x3F, 0x28 diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index 9874aff9..ee661564 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -2003,13 +2003,29 @@ lbl_8011A440: .balign 8 .global lbl_803CF2F0 lbl_803CF2F0: + # ROM: 0x3CC2F0 .asciz "LCTR_FLOFLOWER" + +.global lbl_803CF2FF +lbl_803CF2FF: + + # ROM: 0x3CC2FF .byte 0x46 .asciz "ire1" + +.global lbl_803CF305 +lbl_803CF305: + + # ROM: 0x3CC305 .byte 0x46, 0x69, 0x72 - .4byte 0x65320046 + .byte 0x65, 0x32, 0x00 + +.global lbl_803CF30B +lbl_803CF30B: + + # ROM: 0x3CC30B + .byte 0x46 .asciz "ire3" .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 - diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 81c43fa2..88d8bc92 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -295,17 +295,17 @@ lbl_805A78B0: .global lbl_805A78B4 lbl_805A78B4: # ROM: 0x3F5254 - .4byte 0x803D0398 + .4byte lbl_803D0398 .global lbl_805A78B8 lbl_805A78B8: # ROM: 0x3F5258 - .4byte 0x803D03A4 + .4byte lbl_803D03A4 .global lbl_805A78BC lbl_805A78BC: # ROM: 0x3F525C - .4byte 0x803D03B3 + .4byte lbl_803D03B3 .global lbl_805A78C0 lbl_805A78C0: @@ -10558,9 +10558,20 @@ lbl_805ABD80: .balign 8 .global lbl_803D0398 lbl_803D0398: + # ROM: 0x3CD398 .asciz "Beacon_LCTR" + +.global lbl_803D03A4 +lbl_803D03A4: + + # ROM: 0x3CD3A4 .asciz "R_GUN_TOP_LCTR" + +.global lbl_803D03B3 +lbl_803D03B3: + + # ROM: 0x3CD3B3 .byte 0x4C .asciz "_GUN_TOP_LCTR" .byte 0x53, 0x68 diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 7d691910..f028f31d 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -2913,13 +2913,13 @@ lbl_802297FC: sub_80229818: /* 80229818 00226778 94 21 FF 00 */ stwu r1, -0x100(r1) /* 8022981C 0022677C 7C 08 02 A6 */ mflr r0 -/* 80229820 00226780 3C A0 80 57 */ lis r5, lbl_80570004@ha +/* 80229820 00226780 3C A0 80 57 */ lis r5, lbl_8056D780@ha /* 80229824 00226784 90 01 01 04 */ stw r0, 0x104(r1) /* 80229828 00226788 BD C1 00 B8 */ stmw r14, 0xb8(r1) /* 8022982C 0022678C 7C 9F 23 78 */ mr r31, r4 /* 80229830 00226790 7C 7E 1B 78 */ mr r30, r3 -/* 80229834 00226794 85 E5 D7 80 */ lwzu r15, -0x2880(r5) -/* 80229838 00226798 82 05 00 04 */ lwz r16, lbl_80570004@l(r5) +/* 80229834 00226794 85 E5 D7 80 */ lwzu r15, lbl_8056D780@l(r5) +/* 80229838 00226798 82 05 00 04 */ lwz r16, 4(r5) /* 8022983C 0022679C 82 25 00 08 */ lwz r17, 8(r5) /* 80229840 002267A0 82 45 00 0C */ lwz r18, 0xc(r5) /* 80229844 002267A4 82 65 00 10 */ lwz r19, 0x10(r5) @@ -7981,27 +7981,27 @@ lbl_805AD2C0: .global lbl_805AD2C4 lbl_805AD2C4: # ROM: 0x3F9B64 - .4byte 0x803D3364 + .4byte lbl_803D3364 .global lbl_805AD2C8 lbl_805AD2C8: # ROM: 0x3F9B68 - .4byte 0x803D33A0 + .4byte lbl_803D33A0 .global lbl_805AD2CC lbl_805AD2CC: # ROM: 0x3F9B6C - .4byte 0x803D3377 + .4byte lbl_803D3377 .global lbl_805AD2D0 lbl_805AD2D0: # ROM: 0x3F9B70 - .4byte 0x803D336B + .4byte lbl_803D336B .global lbl_805AD2D4 lbl_805AD2D4: # ROM: 0x3F9B74 - .4byte 0x803D33B5 + .4byte lbl_803D33B5 .global lbl_805AD2D8 lbl_805AD2D8: @@ -8061,7 +8061,7 @@ lbl_805AD300: .global lbl_805AD304 lbl_805AD304: # ROM: 0x3F9BA4 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AD308 lbl_805AD308: @@ -8149,84 +8149,175 @@ lbl_805AD344: .global lbl_803D3278 lbl_803D3278: # ROM: 0x3D0278 - .4byte 0x803D3310 - .4byte 0x803D331B + .4byte lbl_803D3310 + .4byte lbl_803D331B .float 1.0 .float 1.5 - .4byte 0x803D331B - .4byte 0x803D3323 + .4byte lbl_803D331B + .4byte lbl_803D3323 .float 0.9 .4byte 0x3FA66666 - .4byte 0x803D332B - .4byte 0x803D3332 + .4byte lbl_803D332B + .4byte lbl_803D3332 .float 0.9 .4byte 0x3FA66666 .global lbl_803D32A8 lbl_803D32A8: # ROM: 0x3D02A8 - .4byte 0x803D333A - .4byte 0x803D3345 + .4byte lbl_803D333A + .4byte lbl_803D3345 .float 1.0 .float 1.5 - .4byte 0x803D3345 - .4byte 0x803D334D + .4byte lbl_803D3345 + .4byte lbl_803D334D .float 0.9 .4byte 0x3FA66666 - .4byte 0x803D3355 - .4byte 0x803D335C + .4byte lbl_803D3355 + .4byte lbl_803D335C .float 0.9 .4byte 0x3FA66666 - .4byte 0x803D3364 + .4byte lbl_803D3364 .4byte 0x3F99999A - .4byte 0x803D336B + .4byte lbl_803D336B .float 1.5 - .4byte 0x803D3377 + .4byte lbl_803D3377 .float 1.5 - .4byte 0x803D3383 + .4byte lbl_803D3383 .float 1.5 - .4byte 0x803D338B + .4byte lbl_803D338B .4byte 0x3F99999A - .4byte 0x803D3392 + .4byte lbl_803D3392 .4byte 0x3F4CCCCD - .4byte 0x803D3399 + .4byte lbl_803D3399 .4byte 0x3F4CCCCD .global lbl_803D3310 lbl_803D3310: + # ROM: 0x3D0310 .asciz "L_shoulder" + +.global lbl_803D331B +lbl_803D331B: + + # ROM: 0x3D031B .byte 0x4C .asciz "_elbow" + +.global lbl_803D3323 +lbl_803D3323: + + # ROM: 0x3D0323 .byte 0x4C .asciz "_wrist" + +.global lbl_803D332B +lbl_803D332B: + + # ROM: 0x3D032B .byte 0x4C .asciz "_knee" + +.global lbl_803D3332 +lbl_803D3332: + + # ROM: 0x3D0332 .byte 0x4C, 0x5F .asciz "ankle" + +.global lbl_803D333A +lbl_803D333A: + + # ROM: 0x3D033A .byte 0x52, 0x5F .asciz "shoulder" + +.global lbl_803D3345 +lbl_803D3345: + + # ROM: 0x3D0345 .byte 0x52, 0x5F, 0x65 .asciz "lbow" + +.global lbl_803D334D +lbl_803D334D: + + # ROM: 0x3D034D .byte 0x52, 0x5F, 0x77 .asciz "rist" + +.global lbl_803D3355 +lbl_803D3355: + + # ROM: 0x3D0355 .byte 0x52, 0x5F, 0x6B .4byte 0x6E656500 + +.global lbl_803D335C +lbl_803D335C: + + # ROM: 0x3D035C .asciz "R_ankle" + +.global lbl_803D3364 +lbl_803D3364: + + # ROM: 0x3D0364 .asciz "Head_1" + +.global lbl_803D336B +lbl_803D336B: + + # ROM: 0x3D036B .byte 0x4C .asciz "_Palm_LCTR" + +.global lbl_803D3377 +lbl_803D3377: + + # ROM: 0x3D0377 .byte 0x52 .asciz "_Palm_LCTR" + +.global lbl_803D3383 +lbl_803D3383: + + # ROM: 0x3D0383 .byte 0x53 .asciz "pine_1" + +.global lbl_803D338B +lbl_803D338B: + + # ROM: 0x3D038B .byte 0x43 .asciz "ollar" + +.global lbl_803D3392 +lbl_803D3392: + + # ROM: 0x3D0392 .byte 0x4C, 0x5F .asciz "ball" + +.global lbl_803D3399 +lbl_803D3399: + + # ROM: 0x3D0399 .byte 0x52, 0x5F, 0x62 .4byte 0x616C6C00 + +.global lbl_803D33A0 +lbl_803D33A0: + + # ROM: 0x3D03A0 .asciz "grenadeLauncher_LCTR" + +.global lbl_803D33B5 +lbl_803D33B5: + + # ROM: 0x3D03B5 .byte 0x6C, 0x6F, 0x63 .asciz "kon_target_LCTR" .asciz "??(??)" diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index 5587dd41..4973ffd2 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -8513,39 +8513,39 @@ lbl_805AC65C: .global lbl_803D14E0 lbl_803D14E0: # ROM: 0x3CE4E0 - .4byte 0x803D1590 - .4byte 0x803D1598 - .4byte 0x3F19999A + .4byte lbl_803D1590 + .4byte lbl_803D1598 + .float 0.6 .float 1.0 - .4byte 0x803D1598 - .4byte 0x803D15A0 - .4byte 0x3F19999A + .4byte lbl_803D1598 + .4byte lbl_803D15A0 + .float 0.6 .float 1.0 - .4byte 0x803D15A0 - .4byte 0x803D15AC - .4byte 0x3F19999A + .4byte lbl_803D15A0 + .4byte lbl_803D15AC + .float 0.6 .float 1.0 - .4byte 0x803D15BC - .4byte 0x803D15C4 - .4byte 0x3F19999A + .4byte lbl_803D15BC + .4byte lbl_803D15C4 + .float 0.6 .float 1.0 - .4byte 0x803D15C4 - .4byte 0x803D15CC - .4byte 0x3F19999A + .4byte lbl_803D15C4 + .4byte lbl_803D15CC + .float 0.6 .float 1.0 - .4byte 0x803D15CC - .4byte 0x803D15D8 - .4byte 0x3F19999A + .4byte lbl_803D15CC + .4byte lbl_803D15D8 + .float 0.6 .float 1.0 - .4byte 0x803D15E8 + .4byte lbl_803D15E8 .float 1.5 - .4byte 0x803D15EF + .4byte lbl_803D15EF .float 1.5 - .4byte 0x803D15F7 + .4byte lbl_803D15F7 .float 1.5 - .4byte 0x803D15FF + .4byte lbl_803D15FF .float 1.5 - .4byte 0x803D1607 + .4byte lbl_803D1607 .float 1.5 .global lbl_803D1568 @@ -8568,22 +8568,83 @@ lbl_803D157C: .global lbl_803D1590 lbl_803D1590: + # ROM: 0x3CE590 .asciz "L_elbow" + +.global lbl_803D1598 +lbl_803D1598: + + # ROM: 0x3CE598 .asciz "L_blade" + +.global lbl_803D15A0 +lbl_803D15A0: + + # ROM: 0x3CE5A0 .asciz "L_CLAW_LCTR" + +.global lbl_803D15AC +lbl_803D15AC: + + # ROM: 0x3CE5AC .asciz "L_CLAW_END_LCTR" + +.global lbl_803D15BC +lbl_803D15BC: + + # ROM: 0x3CE5BC .asciz "R_elbow" + +.global lbl_803D15C4 +lbl_803D15C4: + + # ROM: 0x3CE5C4 .asciz "R_blade" + +.global lbl_803D15CC +lbl_803D15CC: + + # ROM: 0x3CE5CC .asciz "R_CLAW_LCTR" + +.global lbl_803D15D8 +lbl_803D15D8: + + # ROM: 0x3CE5D8 .asciz "R_CLAW_END_LCTR" + +.global lbl_803D15E8 +lbl_803D15E8: + + # ROM: 0x3CE5E8 .asciz "Head_1" + +.global lbl_803D15EF +lbl_803D15EF: + + # ROM: 0x3CE5EF .byte 0x53 .asciz "pine_2" + +.global lbl_803D15F7 +lbl_803D15F7: + + # ROM: 0x3CE5F7 .byte 0x53 .asciz "pine_4" + +.global lbl_803D15FF +lbl_803D15FF: + + # ROM: 0x3CE5FF .byte 0x53 .asciz "pine_6" + +.global lbl_803D1607 +lbl_803D1607: + + # ROM: 0x3CE607 .byte 0x43 .asciz "ollar" .byte 0x3F, 0x3F diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index f1d4b519..47e2f933 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -1432,7 +1432,7 @@ lbl_801F0FA0: .global lbl_805ACBD0 lbl_805ACBD0: # ROM: 0x3F9470 - .4byte 0x803D2025 + .4byte lbl_803D2025 .global lbl_805ACBD4 lbl_805ACBD4: @@ -1461,19 +1461,30 @@ lbl_805ACBE0: .global lbl_803D2000 lbl_803D2000: # ROM: 0x3CF000 - .4byte 0x803D2018 + .4byte lbl_803D2018 .float 2.0 - .4byte 0x803D201E + .4byte lbl_803D201E .4byte 0x3F99999A - .4byte 0x803D2025 + .4byte lbl_803D2025 .4byte 0x3F99999A .global lbl_803D2018 lbl_803D2018: + # ROM: 0x3CF018 .asciz "Arm_8" + +.global lbl_803D201E +lbl_803D201E: + + # ROM: 0x3CF01E .byte 0x41, 0x72 .asciz "m_10" + +.global lbl_803D2025 +lbl_803D2025: + + # ROM: 0x3CF025 .byte 0x41, 0x72, 0x6D .4byte 0x5F313200 .asciz "??(??)" diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index afa0ced4..93673eef 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -10,10 +10,10 @@ lbl_ctor: .global skBursts__13CFlyingPirate skBursts__13CFlyingPirate: # ROM: 0x3E37E8 - .4byte 0x803D2078 - .4byte 0x803D2180 - .4byte 0x803D2288 - .4byte 0x803D2364 + .4byte lbl_803D2078 + .4byte lbl_803D2180 + .4byte lbl_803D2288 + .4byte lbl_803D2364 .4byte 0 .global lbl_803E67FC @@ -14769,6 +14769,11 @@ lbl_803D2070: # ROM: 0x3CF070 .asciz "??(??)" .balign 4 + +.global lbl_803D2078 +lbl_803D2078: + + # ROM: 0x3CF078 .4byte 0x0000000A .4byte 0x00000003 .4byte 0x00000004 @@ -14835,6 +14840,11 @@ lbl_803D2070: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803D2180 +lbl_803D2180: + + # ROM: 0x3CF180 .4byte 0x00000005 .4byte 0x00000003 .4byte 0x00000004 @@ -14901,6 +14911,11 @@ lbl_803D2070: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803D2288 +lbl_803D2288: + + # ROM: 0x3CF288 .4byte 0x0000001E .4byte 0x00000003 .4byte 0x00000004 @@ -14956,6 +14971,11 @@ lbl_803D2070: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803D2364 +lbl_803D2364: + + # ROM: 0x3CF364 .4byte 0x0000000A .4byte 0x00000006 .4byte 0x00000005 diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index 2a44e9e9..63906818 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -2394,12 +2394,12 @@ lbl_805AD370: .global lbl_805AD378 lbl_805AD378: # ROM: 0x3F9C18 - .4byte 0x803D3410 + .4byte lbl_803D3410 .global lbl_805AD37C lbl_805AD37C: # ROM: 0x3F9C1C - .4byte 0x803D341D + .4byte lbl_803D341D .global lbl_805AD380 lbl_805AD380: @@ -2496,8 +2496,14 @@ lbl_805AD3C4: .balign 8 .global lbl_803D3410 lbl_803D3410: + # ROM: 0x3D0410 .asciz "grenade_LCTR" + +.global lbl_803D341D +lbl_803D341D: + + # ROM: 0x3D041D .byte 0x6C, 0x6F, 0x63 .asciz "kon_target_LCTR" .asciz "??(??)" diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index e4999aa4..47e11a4e 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -10077,27 +10077,27 @@ lbl_805AC458: .global lbl_805AC45C lbl_805AC45C: # ROM: 0x3F8CFC - .4byte 0x803D143E + .4byte lbl_803D143E .global lbl_805AC460 lbl_805AC460: # ROM: 0x3F8D00 - .4byte 0x803D1426 + .4byte lbl_803D1426 .global lbl_805AC464 lbl_805AC464: # ROM: 0x3F8D04 - .4byte 0x803D1412 + .4byte lbl_803D1412 .global lbl_805AC468 lbl_805AC468: # ROM: 0x3F8D08 - .4byte 0x803D144E + .4byte lbl_803D144E .global lbl_805AC46C lbl_805AC46C: # ROM: 0x3F8D0C - .4byte 0x803D1459 + .4byte lbl_803D1459 .global lbl_805AC470 lbl_805AC470: @@ -10112,7 +10112,7 @@ lbl_805AC474: .global lbl_805AC478 lbl_805AC478: # ROM: 0x3F8D18 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AC47C lbl_805AC47C: @@ -10310,65 +10310,137 @@ lbl_805AC514: .global lbl_803D1360 lbl_803D1360: # ROM: 0x3CE360 - .4byte 0x803D13D8 - .4byte 0x803D13DE + .4byte lbl_803D13D8 + .4byte lbl_803D13DE .float 0.4 .float 0.75 - .4byte 0x803D13E5 - .4byte 0x803D13ED + .4byte lbl_803D13E5 + .4byte lbl_803D13ED .float 0.4 .float 0.75 - .4byte 0x803D13F5 - .4byte 0x803D13FB + .4byte lbl_803D13F5 + .4byte lbl_803D13FB .float 0.4 .float 0.75 - .4byte 0x803D1402 - .4byte 0x803D140A + .4byte lbl_803D1402 + .4byte lbl_803D140A .float 0.4 .float 0.75 - .4byte 0x803D1412 + .4byte lbl_803D1412 .4byte 0x3F0CCCCD - .4byte 0x803D141F + .4byte lbl_803D141F .4byte 0x3F8CCCCD - .4byte 0x803D1426 + .4byte lbl_803D1426 .4byte 0x3F8CCCCD - .4byte 0x803D1434 + .4byte lbl_803D1434 .float 0.7 - .4byte 0x803D143E + .4byte lbl_803D143E .4byte 0x3F99999A - .4byte 0x803D144E - .4byte 0x3F19999A - .4byte 0x803D1459 - .4byte 0x3F19999A + .4byte lbl_803D144E + .float 0.6 + .4byte lbl_803D1459 + .float 0.6 .global lbl_803D13D8 lbl_803D13D8: + # ROM: 0x3CE3D8 .asciz "L_hip" + +.global lbl_803D13DE +lbl_803D13DE: + + # ROM: 0x3CE3DE .byte 0x4C, 0x5F .asciz "knee" + +.global lbl_803D13E5 +lbl_803D13E5: + + # ROM: 0x3CE3E5 .byte 0x4C, 0x5F, 0x61 .asciz "nkle" + +.global lbl_803D13ED +lbl_803D13ED: + + # ROM: 0x3CE3ED .byte 0x4C, 0x5F, 0x54 .asciz "oe_3" + +.global lbl_803D13F5 +lbl_803D13F5: + + # ROM: 0x3CE3F5 .byte 0x52, 0x5F, 0x68 - .4byte 0x69700052 + .byte 0x69, 0x70, 0x00 + +.global lbl_803D13FB +lbl_803D13FB: + + # ROM: 0x3CE3FB + .byte 0x52 .asciz "_knee" + +.global lbl_803D1402 +lbl_803D1402: + + # ROM: 0x3CE402 .byte 0x52, 0x5F .asciz "ankle" + +.global lbl_803D140A +lbl_803D140A: + + # ROM: 0x3CE40A .byte 0x52, 0x5F .asciz "Toe_3" + +.global lbl_803D1412 +lbl_803D1412: + + # ROM: 0x3CE412 .byte 0x4A, 0x61 .asciz "w_end_LCTR" + +.global lbl_803D141F +lbl_803D141F: + + # ROM: 0x3CE41F .byte 0x50 .asciz "elvis" + +.global lbl_803D1426 +lbl_803D1426: + + # ROM: 0x3CE426 .byte 0x4C, 0x43 .asciz "TR_SHEMOUTH" + +.global lbl_803D1434 +lbl_803D1434: + + # ROM: 0x3CE434 .asciz "butt_LCTR" + +.global lbl_803D143E +lbl_803D143E: + + # ROM: 0x3CE43E .byte 0x49, 0x63 .asciz "e_Shards_LCTR" + +.global lbl_803D144E +lbl_803D144E: + + # ROM: 0x3CE44E .byte 0x47, 0x69 .asciz "llL_LCTR" + +.global lbl_803D1459 +lbl_803D1459: + + # ROM: 0x3CE459 .byte 0x47, 0x69, 0x6C .asciz "lR_LCTR" .asciz "??(??)" diff --git a/asm/MetroidPrime/Enemies/CKnockBackController.s b/asm/MetroidPrime/Enemies/CKnockBackController.s index 0fce3b05..70351163 100644 --- a/asm/MetroidPrime/Enemies/CKnockBackController.s +++ b/asm/MetroidPrime/Enemies/CKnockBackController.s @@ -1037,12 +1037,12 @@ lbl_80233A7C: SelectDamageState__20CKnockBackControllerFR10CPatternedRC11CDamageInfo11EWeaponType14EKnockBackType: /* 80233A80 002309E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80233A84 002309E4 7C 08 02 A6 */ mflr r0 -/* 80233A88 002309E8 3D 00 80 3D */ lis r8, lbl_803D0008@ha +/* 80233A88 002309E8 3D 00 80 3D */ lis r8, lbl_803D3490@ha /* 80233A8C 002309EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80233A90 002309F0 84 08 34 90 */ lwzu r0, 0x3490(r8) +/* 80233A90 002309F0 84 08 34 90 */ lwzu r0, lbl_803D3490@l(r8) /* 80233A94 002309F4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80233A98 002309F8 7C 7F 1B 78 */ mr r31, r3 -/* 80233A9C 002309FC C0 28 00 08 */ lfs f1, lbl_803D0008@l(r8) +/* 80233A9C 002309FC C0 28 00 08 */ lfs f1, 0x8(r8) /* 80233AA0 00230A00 93 C1 00 18 */ stw r30, 0x18(r1) /* 80233AA4 00230A04 C0 08 00 0C */ lfs f0, 0xc(r8) /* 80233AA8 00230A08 93 A1 00 14 */ stw r29, 0x14(r1) diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index 5e589a00..58dfc770 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -10,12 +10,12 @@ lbl_ctor: .global lbl_803E81A0 lbl_803E81A0: # ROM: 0x3E51A0 - .4byte 0x803D431E + .4byte lbl_803D431E .4byte 0 .float 1.0 .float 0.15 .float 0.5 - .4byte 0x803D431E + .4byte lbl_803D431E .4byte 0 .float 0.75 .float 0.15 @@ -308,27 +308,27 @@ lbl_805A8208: .global lbl_805A820C lbl_805A820C: # ROM: 0x3F5BAC - .4byte 0x803D4310 + .4byte lbl_803D4310 .global lbl_805A8210 lbl_805A8210: # ROM: 0x3F5BB0 - .4byte 0x803D431E + .4byte lbl_803D431E .global lbl_805A8214 lbl_805A8214: # ROM: 0x3F5BB4 - .4byte 0x803D431E + .4byte lbl_803D431E .global lbl_805A8218 lbl_805A8218: # ROM: 0x3F5BB8 - .4byte 0x803D4323 + .4byte lbl_803D4323 .global lbl_805A821C lbl_805A821C: # ROM: 0x3F5BBC - .4byte 0x803D432C + .4byte lbl_803D432C .global lbl_805A8220 lbl_805A8220: @@ -4093,32 +4093,74 @@ lbl_805AD470: .global lbl_803D42E8 lbl_803D42E8: # ROM: 0x3D12E8 - .4byte 0x803D4338 + .4byte lbl_803D4338 .float 0.75 - .4byte 0x803D433F + .4byte lbl_803D433F .float 0.75 - .4byte 0x803D4346 + .4byte lbl_803D4346 .float 0.75 - .4byte 0x803D434D + .4byte lbl_803D434D .float 0.75 - .4byte 0x803D4354 + .4byte lbl_803D4354 .float 0.75 .global lbl_803D4310 lbl_803D4310: + # ROM: 0x3D1310 .asciz "LCTR_MAGMOUTH" + +.global lbl_803D431E +lbl_803D431E: + + # ROM: 0x3D131E .byte 0x68, 0x65 - .4byte 0x61640054 + .byte 0x61, 0x64, 0x00 + +.global lbl_803D4323 +lbl_803D4323: + + # ROM: 0x3D1323 + .byte 0x54 .asciz "op_LCTR" + +.global lbl_803D432C +lbl_803D432C: + + # ROM: 0x3D132C .asciz "Bottom_LCTR" + +.global lbl_803D4338 +lbl_803D4338: + + # ROM: 0x3D1338 .asciz "spine1" + +.global lbl_803D433F +lbl_803D433F: + + # ROM: 0x3D133F .byte 0x73 .asciz "pine3" + +.global lbl_803D4346 +lbl_803D4346: + + # ROM: 0x3D1346 .byte 0x73, 0x70 .asciz "ine5" + +.global lbl_803D434D +lbl_803D434D: + + # ROM: 0x3D134D .byte 0x73, 0x70, 0x69 .4byte 0x6E653700 + +.global lbl_803D4354 +lbl_803D4354: + + # ROM: 0x3D1354 .asciz "spine9" .byte 0x3F .asciz "?(??)" diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index 5fbe2506..c58efcb1 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -10180,23 +10180,23 @@ lbl_805ABE28: .global lbl_803D04D8 lbl_803D04D8: # ROM: 0x3CD4D8 - .4byte 0x803D0550 - .4byte 0x803D0557 - .4byte 0x803D055F - .4byte 0x803D0567 - .4byte 0x803D056D - .4byte 0x803D0574 - .4byte 0x803D057F - .4byte 0x803D058D - .4byte 0x803D0595 - .4byte 0x803D059C - .4byte 0x803D05A4 - .4byte 0x803D05AC - .4byte 0x803D05B2 - .4byte 0x803D05B9 - .4byte 0x803D05C4 - .4byte 0x803D05D2 - .4byte 0x803D05DA + .4byte lbl_803D0550 + .4byte lbl_803D0557 + .4byte lbl_803D055F + .4byte lbl_803D0567 + .4byte lbl_803D056D + .4byte lbl_803D0574 + .4byte lbl_803D057F + .4byte lbl_803D058D + .4byte lbl_803D0595 + .4byte lbl_803D059C + .4byte lbl_803D05A4 + .4byte lbl_803D05AC + .4byte lbl_803D05B2 + .4byte lbl_803D05B9 + .4byte lbl_803D05C4 + .4byte lbl_803D05D2 + .4byte lbl_803D05DA .global lbl_803D051C lbl_803D051C: @@ -10221,37 +10221,128 @@ lbl_803D0530: .global lbl_803D0550 lbl_803D0550: + # ROM: 0x3CD550 .asciz "Head_1" + +.global lbl_803D0557 +lbl_803D0557: + + # ROM: 0x3CD557 .byte 0x4C .asciz "_ankle" + +.global lbl_803D055F +lbl_803D055F: + + # ROM: 0x3CD55F .byte 0x4C .asciz "_elbow" + +.global lbl_803D0567 +lbl_803D0567: + + # ROM: 0x3CD567 .byte 0x4C .asciz "_hip" + +.global lbl_803D056D +lbl_803D056D: + + # ROM: 0x3CD56D .byte 0x4C, 0x5F, 0x6B .4byte 0x6E656500 + +.global lbl_803D0574 +lbl_803D0574: + + # ROM: 0x3CD574 .asciz "L_shoulder" + +.global lbl_803D057F +lbl_803D057F: + + # ROM: 0x3CD57F .byte 0x4C .asciz "_varias2_SDK" + +.global lbl_803D058D +lbl_803D058D: + + # ROM: 0x3CD58D .byte 0x4C, 0x5F, 0x77 .asciz "rist" + +.global lbl_803D0595 +lbl_803D0595: + + # ROM: 0x3CD595 .byte 0x50, 0x65, 0x6C .4byte 0x76697300 + +.global lbl_803D059C +lbl_803D059C: + + # ROM: 0x3CD59C .asciz "R_ankle" + +.global lbl_803D05A4 +lbl_803D05A4: + + # ROM: 0x3CD5A4 .asciz "R_elbow" + +.global lbl_803D05AC +lbl_803D05AC: + + # ROM: 0x3CD5AC .asciz "R_hip" + +.global lbl_803D05B2 +lbl_803D05B2: + + # ROM: 0x3CD5B2 .byte 0x52, 0x5F .asciz "knee" + +.global lbl_803D05B9 +lbl_803D05B9: + + # ROM: 0x3CD5B9 .byte 0x52, 0x5F, 0x73 .asciz "houlder" + +.global lbl_803D05C4 +lbl_803D05C4: + + # ROM: 0x3CD5C4 .asciz "R_varias2_SDK" + +.global lbl_803D05D2 +lbl_803D05D2: + + # ROM: 0x3CD5D2 .byte 0x53, 0x70 .asciz "ine_1" + +.global lbl_803D05DA +lbl_803D05DA: + + # ROM: 0x3CD5DA .byte 0x53, 0x70 .asciz "ine_2" + +.global lbl_803D05E2 +lbl_803D05E2: + + # ROM: 0x3CD5E2 .byte 0x6C, 0x6F .asciz "ckon_target_LCTR" + +.global lbl_803D05F5 +lbl_803D05F5: + + # ROM: 0x3CD5F5 .byte 0x53, 0x6B, 0x65 .asciz "leton_Root" .byte 0x3F diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index b621320f..9bc85324 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -6865,23 +6865,23 @@ lbl_805AC7A0: .global lbl_805AC7A4 lbl_805AC7A4: # ROM: 0x3F9044 - .4byte 0x803D1A80 + .4byte lbl_803D1A80 .float 1.5 .global lbl_805AC7AC lbl_805AC7AC: # ROM: 0x3F904C - .4byte 0x803D1A87 + .4byte lbl_803D1A87 .global lbl_805AC7B0 lbl_805AC7B0: # ROM: 0x3F9050 - .4byte 0x803D1A90 + .4byte lbl_803D1A90 .global lbl_805AC7B4 lbl_805AC7B4: # ROM: 0x3F9054 - .4byte 0x803D1A80 + .4byte lbl_803D1A80 .global lbl_805AC7B8 lbl_805AC7B8: @@ -7047,10 +7047,21 @@ lbl_805AC840: .balign 8 .global lbl_803D1A80 lbl_803D1A80: + # ROM: 0x3CEA80 .asciz "Pelvis" + +.global lbl_803D1A87 +lbl_803D1A87: + + # ROM: 0x3CEA87 .byte 0x4C .asciz "_Claw_1" + +.global lbl_803D1A90 +lbl_803D1A90: + + # ROM: 0x3CEA90 .asciz "R_Claw_1" .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 6a28bf1b..3e291efb 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -4440,17 +4440,17 @@ __sinit_CMetroidPrimeEssence_cpp: .global lbl_805ADA20 lbl_805ADA20: # ROM: 0x3FA2C0 - .4byte 0x803D589C + .4byte lbl_803D589C .global lbl_805ADA24 lbl_805ADA24: # ROM: 0x3FA2C4 - .4byte 0x803D58AF + .4byte lbl_803D58AF .global lbl_805ADA28 lbl_805ADA28: # ROM: 0x3FA2C8 - .4byte 0x803D58B4 + .4byte lbl_803D58B4 .global lbl_805ADA2C lbl_805ADA2C: @@ -4598,10 +4598,21 @@ lbl_803D5890: .global lbl_803D589C lbl_803D589C: + # ROM: 0x3D289C .asciz "lockon_target_LCTR" + +.global lbl_803D58AF +lbl_803D58AF: + + # ROM: 0x3D28AF .byte 0x45 .4byte 0x79657300 + +.global lbl_803D58B4 +lbl_803D58B4: + + # ROM: 0x3D28B4 .asciz "Head" .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 24f21cf6..5fc95565 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -10,9 +10,9 @@ lbl_ctor: .global lbl_803EAA90 lbl_803EAA90: # ROM: 0x3E7A90 - .4byte 0x803D56DB + .4byte lbl_803D56DB .float 1.5 - .4byte 0x803D56E7 + .4byte lbl_803D56E7 .4byte 0x40133333 .4byte 0 .4byte 0x3F6B851F @@ -20,116 +20,116 @@ lbl_803EAA90: .global lbl_803EAAA8 lbl_803EAAA8: # ROM: 0x3E7AA8 - .4byte 0x803D56F5 - .4byte 0x803D5700 - .4byte 0x3F19999A - .4byte 0x3F19999A - .4byte 0x3F19999A - .4byte 0x803D5700 - .4byte 0x803D5708 + .4byte lbl_803D56F5 + .4byte lbl_803D5700 + .float 0.6 + .float 0.6 + .float 0.6 + .4byte lbl_803D5700 + .4byte lbl_803D5708 .float 0.3 .float 0.3 .float 0.3 - .4byte 0x803D5708 - .4byte 0x803D5710 + .4byte lbl_803D5708 + .4byte lbl_803D5710 .float 0.3 .float 0.3 .float 0.3 - .4byte 0x803D5710 - .4byte 0x803D571C + .4byte lbl_803D5710 + .4byte lbl_803D571C .float 0.4 .4byte 0x3F99999A .float 0.4 - .4byte 0x803D5727 - .4byte 0x803D5731 + .4byte lbl_803D5727 + .4byte lbl_803D5731 .float 0.2 .float 0.2 .float 0.2 - .4byte 0x803D5731 - .4byte 0x803D573B + .4byte lbl_803D5731 + .4byte lbl_803D573B .float 0.2 .float 0.2 .float 0.2 - .4byte 0x803D573B - .4byte 0x803D5745 + .4byte lbl_803D573B + .4byte lbl_803D5745 .float 0.2 .float 0.2 .float 0.7 - .4byte 0x803D5752 - .4byte 0x803D575E + .4byte lbl_803D5752 + .4byte lbl_803D575E .float 0.2 .float 0.2 .float 0.2 - .4byte 0x803D575E - .4byte 0x803D576A + .4byte lbl_803D575E + .4byte lbl_803D576A .float 0.2 .float 0.2 .float 0.2 - .4byte 0x803D5777 - .4byte 0x803D5782 - .4byte 0x3F19999A - .4byte 0x3F19999A - .4byte 0x3F19999A - .4byte 0x803D5782 - .4byte 0x803D578A + .4byte lbl_803D5777 + .4byte lbl_803D5782 + .float 0.6 + .float 0.6 + .float 0.6 + .4byte lbl_803D5782 + .4byte lbl_803D578A .float 0.3 .float 0.3 .float 0.3 - .4byte 0x803D578A - .4byte 0x803D5792 + .4byte lbl_803D578A + .4byte lbl_803D5792 .float 0.3 .float 0.3 .float 0.3 - .4byte 0x803D5792 - .4byte 0x803D579E + .4byte lbl_803D5792 + .4byte lbl_803D579E .float 0.4 .4byte 0x3F99999A .float 0.4 - .4byte 0x803D57A9 - .4byte 0x803D57B3 + .4byte lbl_803D57A9 + .4byte lbl_803D57B3 .float 0.2 .float 0.2 .float 0.2 - .4byte 0x803D57B3 - .4byte 0x803D57BD + .4byte lbl_803D57B3 + .4byte lbl_803D57BD .float 0.2 .float 0.2 .float 0.2 - .4byte 0x803D57BD - .4byte 0x803D57C7 + .4byte lbl_803D57BD + .4byte lbl_803D57C7 .float 0.2 .float 0.2 .float 0.7 - .4byte 0x803D57D4 - .4byte 0x803D57E0 + .4byte lbl_803D57D4 + .4byte lbl_803D57E0 .float 0.4 .float 0.4 .float 0.4 - .4byte 0x803D57E0 - .4byte 0x803D57EC + .4byte lbl_803D57E0 + .4byte lbl_803D57EC .float 0.2 .float 0.2 .float 0.2 - .4byte 0x803D57F9 - .4byte 0x803D5804 + .4byte lbl_803D57F9 + .4byte lbl_803D5804 .4byte 0x3F4CCCCD .4byte 0x3F4CCCCD .4byte 0x3F4CCCCD - .4byte 0x803D5804 - .4byte 0x803D580C + .4byte lbl_803D5804 + .4byte lbl_803D580C .float 0.7 .float 0.7 .float 0.7 - .4byte 0x803D580C - .4byte 0x803D5814 - .4byte 0x3F19999A + .4byte lbl_803D580C + .4byte lbl_803D5814 + .float 0.6 .float 0.1 - .4byte 0x3F19999A - .4byte 0x803D581F - .4byte 0x803D5829 + .float 0.6 + .4byte lbl_803D581F + .4byte lbl_803D5829 .4byte 0x3F4CCCCD .float 0.1 - .4byte 0x3F19999A + .float 0.6 .4byte 0 .4byte 0 .float 2.0 @@ -139,26 +139,26 @@ lbl_803EAAA8: .global lbl_803EAC74 lbl_803EAC74: # ROM: 0x3E7C74 - .4byte 0x803D5731 - .4byte 0x803D57B3 - .4byte 0x803D5727 - .4byte 0x803D57A9 + .4byte lbl_803D5731 + .4byte lbl_803D57B3 + .4byte lbl_803D5727 + .4byte lbl_803D57A9 .4byte 0 .4byte 0 - .4byte 0x803D5700 - .4byte 0x803D5782 + .4byte lbl_803D5700 + .4byte lbl_803D5782 .4byte 0 .4byte 0 - .4byte 0x803D5833 - .4byte 0x803D581F + .4byte lbl_803D5833 + .4byte lbl_803D581F .4byte 0 .4byte 0 - .4byte 0x803D56F5 - .4byte 0x803D5777 - .4byte 0x803D575E - .4byte 0x803D57E0 - .4byte 0x803D576A - .4byte 0x803D57EC + .4byte lbl_803D56F5 + .4byte lbl_803D5777 + .4byte lbl_803D575E + .4byte lbl_803D57E0 + .4byte lbl_803D576A + .4byte lbl_803D57EC .global lbl_803EACC4 lbl_803EACC4: @@ -13280,34 +13280,34 @@ lbl_805AD8F0: .global lbl_805AD8F4 lbl_805AD8F4: # ROM: 0x3FA194 - .4byte 0x803D5618 - .4byte 0x803D5626 + .4byte lbl_803D5618 + .4byte lbl_803D5626 .global lbl_805AD8FC lbl_805AD8FC: # ROM: 0x3FA19C - .4byte 0x803D5634 - .4byte 0x803D563C + .4byte lbl_803D5634 + .4byte lbl_803D563C .global lbl_805AD904 lbl_805AD904: # ROM: 0x3FA1A4 - .4byte 0x803D5680 + .4byte lbl_803D5680 .global lbl_805AD908 lbl_805AD908: # ROM: 0x3FA1A8 - .4byte 0x803D5690 + .4byte lbl_803D5690 .global lbl_805AD90C lbl_805AD90C: # ROM: 0x3FA1AC - .4byte 0x803D5696 + .4byte lbl_803D5696 .global lbl_805AD910 lbl_805AD910: # ROM: 0x3FA1B0 - .4byte 0x803D56A4 + .4byte lbl_803D56A4 .global lbl_805AD914 lbl_805AD914: @@ -13327,7 +13327,7 @@ lbl_805AD91C: .global lbl_805AD920 lbl_805AD920: # ROM: 0x3FA1C0 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AD924 lbl_805AD924: @@ -13656,20 +13656,20 @@ lbl_803D5434: .global lbl_803D5444 lbl_803D5444: # ROM: 0x3D2444 - .4byte 0x803D5644 - .4byte 0x803D564F - .4byte 0x803D5660 - .4byte 0x803D5670 + .4byte lbl_803D5644 + .4byte lbl_803D564F + .4byte lbl_803D5660 + .4byte lbl_803D5670 .global lbl_803D5454 lbl_803D5454: # ROM: 0x3D2454 - .4byte 0x803D56BB - .4byte 0x803D56C3 - .4byte 0x803D5634 - .4byte 0x803D56CB - .4byte 0x803D56D3 - .4byte 0x803D563C + .4byte lbl_803D56BB + .4byte lbl_803D56C3 + .4byte lbl_803D5634 + .4byte lbl_803D56CB + .4byte lbl_803D56D3 + .4byte lbl_803D563C .global lbl_803D546C lbl_803D546C: @@ -13796,84 +13796,325 @@ lbl_803D5570: .global lbl_803D5618 lbl_803D5618: + # ROM: 0x3D2618 .asciz "driller_LCTR1" + +.global lbl_803D5626 +lbl_803D5626: + + # ROM: 0x3D2626 .byte 0x64, 0x72 .asciz "iller_LCTR2" + +.global lbl_803D5634 +lbl_803D5634: + + # ROM: 0x3D2634 .asciz "L_eye_3" + +.global lbl_803D563C +lbl_803D563C: + + # ROM: 0x3D263C .asciz "R_eye_3" + +.global lbl_803D5644 +lbl_803D5644: + + # ROM: 0x3D2644 .asciz "Flame_Head" + +.global lbl_803D564F +lbl_803D564F: + + # ROM: 0x3D264F .byte 0x46 .asciz "lame_HeadLockOn" + +.global lbl_803D5660 +lbl_803D5660: + + # ROM: 0x3D2660 .asciz "Flame_Lshoulder" + +.global lbl_803D5670 +lbl_803D5670: + + # ROM: 0x3D2670 .asciz "Flame_Rshoulder" + +.global lbl_803D5680 +lbl_803D5680: + + # ROM: 0x3D2680 .asciz "Head_LockON_SDK" + +.global lbl_803D5690 +lbl_803D5690: + + # ROM: 0x3D2690 .asciz "Jaw_1" + +.global lbl_803D5696 +lbl_803D5696: + + # ROM: 0x3D2696 .byte 0x43, 0x5F .asciz "bottomtooth" + +.global lbl_803D56A4 +lbl_803D56A4: + + # ROM: 0x3D26A4 .asciz "B_headup_additive_body" + +.global lbl_803D56BB +lbl_803D56BB: + + # ROM: 0x3D26BB .byte 0x4C .asciz "_eye_1" + +.global lbl_803D56C3 +lbl_803D56C3: + + # ROM: 0x3D26C3 .byte 0x4C .asciz "_eye_2" + +.global lbl_803D56CB +lbl_803D56CB: + + # ROM: 0x3D26CB .byte 0x52 .asciz "_eye_1" + +.global lbl_803D56D3 +lbl_803D56D3: + + # ROM: 0x3D26D3 .byte 0x52 .asciz "_eye_2" + +.global lbl_803D56DB +lbl_803D56DB: + + # ROM: 0x3D26DB .byte 0x53 .asciz "phere_LCTR" + +.global lbl_803D56E7 +lbl_803D56E7: + + # ROM: 0x3D26E7 .byte 0x53 .asciz "keleton_Root" + +.global lbl_803D56F5 +lbl_803D56F5: + + # ROM: 0x3D26F5 .byte 0x52, 0x5F, 0x73 .asciz "houlder" + +.global lbl_803D5700 +lbl_803D5700: + + # ROM: 0x3D2700 .asciz "R_elbow" + +.global lbl_803D5708 +lbl_803D5708: + + # ROM: 0x3D2708 .asciz "R_wrist" + +.global lbl_803D5710 +lbl_803D5710: + + # ROM: 0x3D2710 .asciz "R_hand_LCTR" + +.global lbl_803D571C +lbl_803D571C: + + # ROM: 0x3D271C .asciz "R_leg_LCTR" + +.global lbl_803D5727 +lbl_803D5727: + + # ROM: 0x3D2727 .byte 0x52 .asciz "_front_1" + +.global lbl_803D5731 +lbl_803D5731: + + # ROM: 0x3D2731 .byte 0x52, 0x5F, 0x66 .asciz "ront_2" + +.global lbl_803D573B +lbl_803D573B: + + # ROM: 0x3D273B .byte 0x52 .asciz "_front_3" + +.global lbl_803D5745 +lbl_803D5745: + + # ROM: 0x3D2745 .byte 0x46, 0x5F, 0x52 .asciz "_leg_LCTR" + +.global lbl_803D5752 +lbl_803D5752: + + # ROM: 0x3D2752 .byte 0x52, 0x5F .asciz "stinger_1" + +.global lbl_803D575E +lbl_803D575E: + + # ROM: 0x3D275E .byte 0x52, 0x5F .asciz "stinger_2" + +.global lbl_803D576A +lbl_803D576A: + + # ROM: 0x3D276A .byte 0x52, 0x5F .asciz "spike_LCTR" + +.global lbl_803D5777 +lbl_803D5777: + + # ROM: 0x3D2777 .byte 0x4C .asciz "_shoulder" + +.global lbl_803D5782 +lbl_803D5782: + + # ROM: 0x3D2782 .byte 0x4C, 0x5F .asciz "elbow" + +.global lbl_803D578A +lbl_803D578A: + + # ROM: 0x3D278A .byte 0x4C, 0x5F .asciz "wrist" + +.global lbl_803D5792 +lbl_803D5792: + + # ROM: 0x3D2792 .byte 0x4C, 0x5F .asciz "hand_LCTR" + +.global lbl_803D579E +lbl_803D579E: + + # ROM: 0x3D279E .byte 0x4C, 0x5F .asciz "leg_LCTR" + +.global lbl_803D57A9 +lbl_803D57A9: + + # ROM: 0x3D27A9 .byte 0x4C, 0x5F, 0x66 .asciz "ront_1" + +.global lbl_803D57B3 +lbl_803D57B3: + + # ROM: 0x3D27B3 .byte 0x4C .asciz "_front_2" + +.global lbl_803D57BD +lbl_803D57BD: + + # ROM: 0x3D27BD .byte 0x4C, 0x5F, 0x66 .asciz "ront_3" + +.global lbl_803D57C7 +lbl_803D57C7: + + # ROM: 0x3D27C7 .byte 0x46 .asciz "_L_leg_LCTR" + +.global lbl_803D57D4 +lbl_803D57D4: + + # ROM: 0x3D27D4 .asciz "L_stinger_1" + +.global lbl_803D57E0 +lbl_803D57E0: + + # ROM: 0x3D27E0 .asciz "L_stinger_2" + +.global lbl_803D57EC +lbl_803D57EC: + + # ROM: 0x3D27EC .asciz "L_spike_LCTR" + +.global lbl_803D57F9 +lbl_803D57F9: + + # ROM: 0x3D27F9 .byte 0x42, 0x5F, 0x73 .asciz "houlder" + +.global lbl_803D5804 +lbl_803D5804: + + # ROM: 0x3D2804 .asciz "B_elbow" + +.global lbl_803D580C +lbl_803D580C: + + # ROM: 0x3D280C .asciz "B_wrist" + +.global lbl_803D5814 +lbl_803D5814: + + # ROM: 0x3D2814 .asciz "B_leg_LCTR" + +.global lbl_803D581F +lbl_803D581F: + + # ROM: 0x3D281F .byte 0x48 .asciz "ead_LCTR" + +.global lbl_803D5829 +lbl_803D5829: + + # ROM: 0x3D2829 .byte 0x48, 0x6F, 0x72 .asciz "n_LCTR" + +.global lbl_803D5833 +lbl_803D5833: + + # ROM: 0x3D2833 .byte 0x48 .4byte 0x65616400 .asciz "??(??)" diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s index 6362ca42..cdf3c114 100644 --- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s +++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s @@ -2864,68 +2864,68 @@ lbl_805AC114: .global lbl_803D06D0 lbl_803D06D0: # ROM: 0x3CD6D0 - .4byte 0x803D07E4 - .4byte 0x803D07EB + .4byte lbl_803D07E4 + .4byte lbl_803D07EB .float 4.0 .float 1.0 .float 4.0 - .4byte 0x803D07EB - .4byte 0x803D07F3 + .4byte lbl_803D07EB + .4byte lbl_803D07F3 .float 2.0 .float 1.0 .float 2.0 - .4byte 0x803D07F3 - .4byte 0x803D07FA + .4byte lbl_803D07F3 + .4byte lbl_803D07FA .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D07FA - .4byte 0x803D0801 + .4byte lbl_803D07FA + .4byte lbl_803D0801 .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D0801 - .4byte 0x803D0808 + .4byte lbl_803D0801 + .4byte lbl_803D0808 .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D080F - .4byte 0x803D0820 + .4byte lbl_803D080F + .4byte lbl_803D0820 .float 0.5 .float 0.5 .float 0.5 - .4byte 0x803D0820 - .4byte 0x803D082E + .4byte lbl_803D0820 + .4byte lbl_803D082E .float 0.5 .float 0.5 .float 0.5 - .4byte 0x803D083C - .4byte 0x803D084D + .4byte lbl_803D083C + .4byte lbl_803D084D .float 0.5 .float 0.5 .float 0.5 - .4byte 0x803D084D - .4byte 0x803D085B + .4byte lbl_803D084D + .4byte lbl_803D085B .float 0.5 .float 0.5 .float 0.5 - .4byte 0x803D0869 - .4byte 0x803D0879 + .4byte lbl_803D0869 + .4byte lbl_803D0879 .float 0.5 .float 0.5 .float 0.5 - .4byte 0x803D0879 - .4byte 0x803D0886 + .4byte lbl_803D0879 + .4byte lbl_803D0886 .float 0.5 .float 0.5 .float 0.5 - .4byte 0x803D0893 - .4byte 0x803D08A3 + .4byte lbl_803D0893 + .4byte lbl_803D08A3 .float 0.5 .float 0.5 .float 0.5 - .4byte 0x803D08A3 - .4byte 0x803D08B0 + .4byte lbl_803D08A3 + .4byte lbl_803D08B0 .float 0.5 .float 0.5 .float 0.5 @@ -2933,47 +2933,145 @@ lbl_803D06D0: .global lbl_803D07D4 lbl_803D07D4: # ROM: 0x3CD7D4 - .4byte 0x803D08BD + .4byte lbl_803D08BD .float 1.5 - .4byte 0x803D08C4 + .4byte lbl_803D08C4 .float 1.5 .global lbl_803D07E4 lbl_803D07E4: + # ROM: 0x3CD7E4 .asciz "Pelvis" + +.global lbl_803D07EB +lbl_803D07EB: + + # ROM: 0x3CD7EB .byte 0x53 .asciz "pine_3" + +.global lbl_803D07F3 +lbl_803D07F3: + + # ROM: 0x3CD7F3 .byte 0x54 .asciz "ail_1" + +.global lbl_803D07FA +lbl_803D07FA: + + # ROM: 0x3CD7FA .byte 0x54, 0x61 .asciz "il_2" + +.global lbl_803D0801 +lbl_803D0801: + + # ROM: 0x3CD801 .byte 0x54, 0x61, 0x69 .4byte 0x6C5F3300 + +.global lbl_803D0808 +lbl_803D0808: + + # ROM: 0x3CD808 .asciz "Tail_4" + +.global lbl_803D080F +lbl_803D080F: + + # ROM: 0x3CD80F .byte 0x52 .asciz "_shoulder_front" + +.global lbl_803D0820 +lbl_803D0820: + + # ROM: 0x3CD820 .asciz "R_elbow_front" + +.global lbl_803D082E +lbl_803D082E: + + # ROM: 0x3CD82E .byte 0x52, 0x5F .asciz "wrist_front" + +.global lbl_803D083C +lbl_803D083C: + + # ROM: 0x3CD83C .asciz "L_shoulder_front" + +.global lbl_803D084D +lbl_803D084D: + + # ROM: 0x3CD84D .byte 0x4C, 0x5F, 0x65 .asciz "lbow_front" + +.global lbl_803D085B +lbl_803D085B: + + # ROM: 0x3CD85B .byte 0x4C .asciz "_wrist_front" + +.global lbl_803D0869 +lbl_803D0869: + + # ROM: 0x3CD869 .byte 0x52, 0x5F, 0x73 .asciz "houlder_back" + +.global lbl_803D0879 +lbl_803D0879: + + # ROM: 0x3CD879 .byte 0x52, 0x5F, 0x65 .asciz "lbow_back" + +.global lbl_803D0886 +lbl_803D0886: + + # ROM: 0x3CD886 .byte 0x52, 0x5F .asciz "wrist_back" + +.global lbl_803D0893 +lbl_803D0893: + + # ROM: 0x3CD893 .byte 0x4C .asciz "_shoulder_back" + +.global lbl_803D08A3 +lbl_803D08A3: + + # ROM: 0x3CD8A3 .byte 0x4C .asciz "_elbow_back" - .asciz "L_wrist_back" + +.global lbl_803D08B0 +lbl_803D08B0: + + # ROM: 0x3CD8B0 + .4byte 0x4C5F7772 + .4byte 0x6973745F + .asciz "back" + +.global lbl_803D08BD +lbl_803D08BD: + + # ROM: 0x3CD8BD .byte 0x48, 0x65, 0x61 .4byte 0x645F3100 + +.global lbl_803D08C4 +lbl_803D08C4: + + # ROM: 0x3CD8C4 .asciz "Tail_5" .byte 0x3F .asciz "?(??)" diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index 455d3bae..4842846e 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -7040,7 +7040,6 @@ lbl_802911D0: /* 802911D0 0028E130 7C 1D C0 40 */ cmplw r29, r24 /* 802911D4 0028E134 41 80 F9 80 */ blt lbl_80290B54 /* 802911D8 0028E138 48 00 05 88 */ b lbl_80291760 -.global lbl_802911DC lbl_802911DC: /* 802911DC 0028E13C A0 14 00 00 */ lhz r0, 0(r20) /* 802911E0 0028E140 38 A1 00 48 */ addi r5, r1, 0x48 @@ -7128,7 +7127,6 @@ lbl_80291218: /* 80291324 0028E284 C0 1F 04 24 */ lfs f0, 0x424(r31) /* 80291328 0028E288 D0 1F 04 20 */ stfs f0, 0x420(r31) /* 8029132C 0028E28C 48 00 04 34 */ b lbl_80291760 -.global lbl_80291330 lbl_80291330: /* 80291330 0028E290 A0 14 00 00 */ lhz r0, 0(r20) /* 80291334 0028E294 A0 7F 09 90 */ lhz r3, 0x990(r31) @@ -7194,7 +7192,6 @@ lbl_802913E0: /* 80291420 0028E380 90 1F 0A 7C */ stw r0, 0xa7c(r31) /* 80291424 0028E384 D0 1F 0A 84 */ stfs f0, 0xa84(r31) /* 80291428 0028E388 48 00 03 38 */ b lbl_80291760 -.global lbl_8029142C lbl_8029142C: /* 8029142C 0028E38C A0 14 00 00 */ lhz r0, 0(r20) /* 80291430 0028E390 7F C3 F3 78 */ mr r3, r30 @@ -7243,28 +7240,23 @@ lbl_802914D0: /* 802914D8 0028E438 38 80 00 01 */ li r4, 1 /* 802914DC 0028E43C 4B F9 60 C1 */ bl sub_8022759c /* 802914E0 0028E440 48 00 02 80 */ b lbl_80291760 -.global lbl_802914E4 lbl_802914E4: /* 802914E4 0028E444 38 00 00 01 */ li r0, 1 /* 802914E8 0028E448 98 1F 09 EC */ stb r0, 0x9ec(r31) /* 802914EC 0028E44C 48 00 02 74 */ b lbl_80291760 -.global lbl_802914F0 lbl_802914F0: /* 802914F0 0028E450 7F C5 F3 78 */ mr r5, r30 /* 802914F4 0028E454 38 80 00 01 */ li r4, 1 /* 802914F8 0028E458 4B F9 60 A5 */ bl sub_8022759c /* 802914FC 0028E45C 48 00 02 64 */ b lbl_80291760 -.global lbl_80291500 lbl_80291500: /* 80291500 0028E460 38 00 00 01 */ li r0, 1 /* 80291504 0028E464 98 1F 0A 3C */ stb r0, 0xa3c(r31) /* 80291508 0028E468 48 00 02 58 */ b lbl_80291760 -.global lbl_8029150C lbl_8029150C: /* 8029150C 0028E46C 7F C4 F3 78 */ mr r4, r30 /* 80291510 0028E470 4B FF A0 09 */ bl sub_8028b518 /* 80291514 0028E474 48 00 02 4C */ b lbl_80291760 -.global lbl_80291518 lbl_80291518: /* 80291518 0028E478 C0 02 BE A0 */ lfs f0, lbl_805ADBC0@sda21(r2) /* 8029151C 0028E47C D0 1F 03 B4 */ stfs f0, 0x3b4(r31) @@ -7314,7 +7306,6 @@ lbl_80291518: /* 802915CC 0028E52C 90 72 01 08 */ stw r3, 0x108(r18) /* 802915D0 0028E530 90 01 01 3C */ stw r0, 0x13c(r1) /* 802915D4 0028E534 48 00 01 8C */ b lbl_80291760 -.global lbl_802915D8 lbl_802915D8: /* 802915D8 0028E538 C0 02 BE A0 */ lfs f0, lbl_805ADBC0@sda21(r2) /* 802915DC 0028E53C D0 1F 03 B4 */ stfs f0, 0x3b4(r31) @@ -7364,12 +7355,10 @@ lbl_802915D8: /* 8029168C 0028E5EC 90 72 01 08 */ stw r3, 0x108(r18) /* 80291690 0028E5F0 90 01 01 24 */ stw r0, 0x124(r1) /* 80291694 0028E5F4 48 00 00 CC */ b lbl_80291760 -.global lbl_80291698 lbl_80291698: /* 80291698 0028E5F8 38 00 00 01 */ li r0, 1 /* 8029169C 0028E5FC 98 1F 0B 78 */ stb r0, 0xb78(r31) /* 802916A0 0028E600 48 00 00 C0 */ b lbl_80291760 -.global lbl_802916A4 lbl_802916A4: /* 802916A4 0028E604 80 9F 0B 88 */ lwz r4, 0xb88(r31) /* 802916A8 0028E608 88 64 00 03 */ lbz r3, 3(r4) @@ -7383,7 +7372,6 @@ lbl_802916C0: lbl_802916C4: /* 802916C4 0028E624 98 04 00 03 */ stb r0, 3(r4) /* 802916C8 0028E628 48 00 00 98 */ b lbl_80291760 -.global lbl_802916CC lbl_802916CC: /* 802916CC 0028E62C 80 9F 0B 88 */ lwz r4, 0xb88(r31) /* 802916D0 0028E630 88 64 00 02 */ lbz r3, 2(r4) @@ -7397,7 +7385,6 @@ lbl_802916E8: lbl_802916EC: /* 802916EC 0028E64C 98 04 00 02 */ stb r0, 2(r4) /* 802916F0 0028E650 48 00 00 70 */ b lbl_80291760 -.global lbl_802916F4 lbl_802916F4: /* 802916F4 0028E654 80 9F 0B 88 */ lwz r4, 0xb88(r31) /* 802916F8 0028E658 88 64 00 01 */ lbz r3, 1(r4) @@ -7411,7 +7398,6 @@ lbl_80291710: lbl_80291714: /* 80291714 0028E674 98 04 00 01 */ stb r0, 1(r4) /* 80291718 0028E678 48 00 00 48 */ b lbl_80291760 -.global lbl_8029171C lbl_8029171C: /* 8029171C 0028E67C 80 9F 0B 88 */ lwz r4, 0xb88(r31) /* 80291720 0028E680 88 64 00 00 */ lbz r3, 0(r4) @@ -7425,7 +7411,6 @@ lbl_80291738: lbl_8029173C: /* 8029173C 0028E69C 98 04 00 00 */ stb r0, 0(r4) /* 80291740 0028E6A0 48 00 00 20 */ b lbl_80291760 -.global lbl_80291744 lbl_80291744: /* 80291744 0028E6A4 A0 14 00 00 */ lhz r0, 0(r20) /* 80291748 0028E6A8 7F E3 FB 78 */ mr r3, r31 @@ -7709,8 +7694,8 @@ lbl_8029186C: /* 80291B64 0028EAC4 98 1F 0A DE */ stb r0, 0xade(r31) /* 80291B68 0028EAC8 98 9F 0A DF */ stb r4, 0xadf(r31) /* 80291B6C 0028EACC 98 9F 0A E0 */ stb r4, 0xae0(r31) -/* 80291B70 0028EAD0 84 A3 D5 78 */ lwzu r5, -0x2a88(r3) -/* 80291B74 0028EAD4 80 83 00 04 */ lwz r4, lbl_80570004@l(r3) +/* 80291B70 0028EAD0 84 A3 D5 78 */ lwzu r5, lbl_8056D578@l(r3) +/* 80291B74 0028EAD4 80 83 00 04 */ lwz r4, 4(r3) /* 80291B78 0028EAD8 90 BF 0A E4 */ stw r5, 0xae4(r31) /* 80291B7C 0028EADC 90 9F 0A E8 */ stw r4, 0xae8(r31) /* 80291B80 0028EAE0 80 A3 00 08 */ lwz r5, 8(r3) @@ -8475,7 +8460,7 @@ lbl_802925C4: .global lbl_805ADB90 lbl_805ADB90: # ROM: 0x3FA430 - .4byte 0x803D5A74 + .4byte lbl_803D5A74 .global lbl_805ADB94 lbl_805ADB94: @@ -8520,7 +8505,7 @@ lbl_805ADBB0: .global lbl_805ADBB4 lbl_805ADBB4: # ROM: 0x3FA454 - .4byte 0x803D5A8A + .4byte lbl_803D5A8A .float 1.0 .global lbl_805ADBBC @@ -8631,7 +8616,7 @@ lbl_805ADC0C: .global lbl_805ADC10 lbl_805ADC10: # ROM: 0x3FA4B0 - .4byte 0x3F19999A + .float 0.6 .global lbl_805ADC14 lbl_805ADC14: @@ -8680,92 +8665,178 @@ lbl_805ADC30: .global lbl_803D5998 lbl_803D5998: # ROM: 0x3D2998 - .4byte 0x803D5A9D - .4byte 0x803D5AA5 + .4byte lbl_803D5A9D + .4byte lbl_803D5AA5 .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5AAC - .4byte 0x803D5AB4 + .4byte lbl_803D5AAC + .4byte lbl_803D5AB4 .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5ABC - .4byte 0x803D5AC4 + .4byte lbl_803D5ABC + .4byte lbl_803D5AC4 .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5ACC - .4byte 0x803D5AAC + .4byte lbl_803D5ACC + .4byte lbl_803D5AAC .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5AD3 - .4byte 0x803D5ABC + .4byte lbl_803D5AD3 + .4byte lbl_803D5ABC .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5ADA - .4byte 0x803D5AE2 + .4byte lbl_803D5ADA + .4byte lbl_803D5AE2 .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5AEA - .4byte 0x803D5AF2 + .4byte lbl_803D5AEA + .4byte lbl_803D5AF2 .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5AE2 - .4byte 0x803D5AFA + .4byte lbl_803D5AE2 + .4byte lbl_803D5AFA .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5AF2 - .4byte 0x803D5B04 + .4byte lbl_803D5AF2 + .4byte lbl_803D5B04 .float 1.0 .float 1.0 .float 1.0 - .4byte 0x803D5AFA - .4byte 0x803D5B0E + .4byte lbl_803D5AFA + .4byte lbl_803D5B0E .float 2.0 .float 2.0 .float 2.0 - .4byte 0x803D5B04 - .4byte 0x803D5B1C + .4byte lbl_803D5B04 + .4byte lbl_803D5B1C .float 2.0 .float 2.0 .float 2.0 .global lbl_803D5A74 lbl_803D5A74: + # ROM: 0x3D2A74 .asciz "grenadeLauncher2_LCTR" + +.global lbl_803D5A8A +lbl_803D5A8A: + + # ROM: 0x3D2A8A .byte 0x6C, 0x6F .asciz "ckon_target_LCTR" + +.global lbl_803D5A9D +lbl_803D5A9D: + + # ROM: 0x3D2A9D .byte 0x53, 0x70, 0x69 .asciz "ne_2" + +.global lbl_803D5AA5 +lbl_803D5AA5: + + # ROM: 0x3D2AA5 .byte 0x43, 0x6F, 0x6C .4byte 0x6C617200 + +.global lbl_803D5AAC +lbl_803D5AAC: + + # ROM: 0x3D2AAC .asciz "R_ankle" + +.global lbl_803D5AB4 +lbl_803D5AB4: + + # ROM: 0x3D2AB4 .asciz "R_toe_1" + +.global lbl_803D5ABC +lbl_803D5ABC: + + # ROM: 0x3D2ABC .asciz "L_ankle" + +.global lbl_803D5AC4 +lbl_803D5AC4: + + # ROM: 0x3D2AC4 .asciz "L_toe_1" + +.global lbl_803D5ACC +lbl_803D5ACC: + + # ROM: 0x3D2ACC .asciz "R_knee" + +.global lbl_803D5AD3 +lbl_803D5AD3: + + # ROM: 0x3D2AD3 .byte 0x4C .asciz "_knee" + +.global lbl_803D5ADA +lbl_803D5ADA: + + # ROM: 0x3D2ADA .byte 0x52, 0x5F .asciz "elbow" + +.global lbl_803D5AE2 +lbl_803D5AE2: + + # ROM: 0x3D2AE2 .byte 0x52, 0x5F .asciz "wrist" + +.global lbl_803D5AEA +lbl_803D5AEA: + + # ROM: 0x3D2AEA .byte 0x4C, 0x5F .asciz "elbow" + +.global lbl_803D5AF2 +lbl_803D5AF2: + + # ROM: 0x3D2AF2 .byte 0x4C, 0x5F .asciz "wrist" + +.global lbl_803D5AFA +lbl_803D5AFA: + + # ROM: 0x3D2AFA .byte 0x52, 0x5F .asciz "index_1" + +.global lbl_803D5B04 +lbl_803D5B04: + + # ROM: 0x3D2B04 .asciz "L_index_1" + +.global lbl_803D5B0E +lbl_803D5B0E: + + # ROM: 0x3D2B0E .byte 0x52, 0x5F .asciz "index_3_SDK" + +.global lbl_803D5B1C +lbl_803D5B1C: + + # ROM: 0x3D2B1C .asciz "L_index_3_SDK" .byte 0x4F, 0x6D .asciz "ega Pirate Flash" diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 67df516b..da9b9400 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -5056,7 +5056,7 @@ lbl_805ABB78: .global lbl_805ABB7C lbl_805ABB7C: # ROM: 0x3F841C - .4byte 0x3F19999A + .float 0.6 .global lbl_805ABB80 lbl_805ABB80: diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index 3650523d..fe6caefe 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -662,7 +662,7 @@ lbl_805AA67C: .global lbl_805AA680 lbl_805AA680: # ROM: 0x3F6F20 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AA684 lbl_805AA684: diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index 5e4694bf..fcd3c026 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -937,10 +937,10 @@ lbl_802956C4: /* 802956CC 0029262C 81 8C 00 8C */ lwz r12, 0x8c(r12) /* 802956D0 00292630 7D 89 03 A6 */ mtctr r12 /* 802956D4 00292634 4E 80 04 21 */ bctrl -/* 802956D8 00292638 3C A0 80 57 */ lis r5, lbl_80570004@ha -/* 802956DC 0029263C 84 C5 D7 18 */ lwzu r6, -0x28e8(r5) +/* 802956D8 00292638 3C A0 80 57 */ lis r5, lbl_8056D718@ha +/* 802956DC 0029263C 84 C5 D7 18 */ lwzu r6, lbl_8056D718@l(r5) /* 802956E0 00292640 38 80 00 00 */ li r4, 0 -/* 802956E4 00292644 80 05 00 04 */ lwz r0, lbl_80570004@l(r5) +/* 802956E4 00292644 80 05 00 04 */ lwz r0, 4(r5) /* 802956E8 00292648 90 C3 00 00 */ stw r6, 0(r3) /* 802956EC 0029264C 90 03 00 04 */ stw r0, 4(r3) /* 802956F0 00292650 80 C5 00 08 */ lwz r6, 8(r5) diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index f6a1dc1e..ab362e53 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -7,22 +7,22 @@ .global lbl_803E2078 lbl_803E2078: # ROM: 0x3DF078 - .4byte 0x803D00A0 - .4byte 0x803D00AC - .4byte 0x803D00B8 - .4byte 0x803D00C4 - .4byte 0x803D00D0 - .4byte 0x803D00DC - .4byte 0x803D00E8 - .4byte 0x803D00F4 - .4byte 0x803D0100 - .4byte 0x803D010C - .4byte 0x803D0119 - .4byte 0x803D0126 - .4byte 0x803D0133 - .4byte 0x803D0140 - .4byte 0x803D014D - .4byte 0x803D015A + .4byte lbl_803D00A0 + .4byte lbl_803D00AC + .4byte lbl_803D00B8 + .4byte lbl_803D00C4 + .4byte lbl_803D00D0 + .4byte lbl_803D00DC + .4byte lbl_803D00E8 + .4byte lbl_803D00F4 + .4byte lbl_803D0100 + .4byte lbl_803D010C + .4byte lbl_803D0119 + .4byte lbl_803D0126 + .4byte lbl_803D0133 + .4byte lbl_803D0140 + .4byte lbl_803D014D + .4byte lbl_803D015A .global lbl_803E20B8 lbl_803E20B8: @@ -3147,26 +3147,102 @@ lbl_805AB9EC: .balign 8 .global lbl_803D00A0 lbl_803D00A0: + # ROM: 0x3CD0A0 .asciz "Glow_1_LCTR" + +.global lbl_803D00AC +lbl_803D00AC: + + # ROM: 0x3CD0AC .asciz "Glow_2_LCTR" + +.global lbl_803D00B8 +lbl_803D00B8: + + # ROM: 0x3CD0B8 .asciz "Glow_3_LCTR" + +.global lbl_803D00C4 +lbl_803D00C4: + + # ROM: 0x3CD0C4 .asciz "Glow_4_LCTR" + +.global lbl_803D00D0 +lbl_803D00D0: + + # ROM: 0x3CD0D0 .asciz "Glow_5_LCTR" + +.global lbl_803D00DC +lbl_803D00DC: + + # ROM: 0x3CD0DC .asciz "Glow_6_LCTR" + +.global lbl_803D00E8 +lbl_803D00E8: + + # ROM: 0x3CD0E8 .asciz "Glow_7_LCTR" + +.global lbl_803D00F4 +lbl_803D00F4: + + # ROM: 0x3CD0F4 .asciz "Glow_8_LCTR" + +.global lbl_803D0100 +lbl_803D0100: + + # ROM: 0x3CD100 .asciz "Glow_9_LCTR" + +.global lbl_803D010C +lbl_803D010C: + + # ROM: 0x3CD10C .asciz "Glow_10_LCTR" + +.global lbl_803D0119 +lbl_803D0119: + + # ROM: 0x3CD119 .byte 0x47, 0x6C, 0x6F .asciz "w_11_LCTR" + +.global lbl_803D0126 +lbl_803D0126: + + # ROM: 0x3CD126 .byte 0x47, 0x6C .asciz "ow_12_LCTR" + +.global lbl_803D0133 +lbl_803D0133: + + # ROM: 0x3CD133 .byte 0x47 .asciz "low_13_LCTR" + +.global lbl_803D0140 +lbl_803D0140: + + # ROM: 0x3CD140 .asciz "Glow_14_LCTR" + +.global lbl_803D014D +lbl_803D014D: + + # ROM: 0x3CD14D .byte 0x47, 0x6C, 0x6F .asciz "w_15_LCTR" + +.global lbl_803D015A +lbl_803D015A: + + # ROM: 0x3CD15A .byte 0x47, 0x6C .asciz "ow_16_LCTR" .byte 0x3F diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index 4df4c267..9e024060 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -202,12 +202,12 @@ lbl_805A77B8: .global lbl_805A77BC lbl_805A77BC: # ROM: 0x3F515C - .4byte 0x803D0170 + .4byte lbl_803D0170 .global lbl_805A77C0 lbl_805A77C0: # ROM: 0x3F5160 - .4byte 0x803D017F + .4byte lbl_803D017F .global lbl_805A77C4 lbl_805A77C4: @@ -2259,8 +2259,14 @@ lbl_805ABA3C: .balign 8 .global lbl_803D0170 lbl_803D0170: + # ROM: 0x3CD170 .asciz "MOUTH_LCTR_SDK" + +.global lbl_803D017F +lbl_803D017F: + + # ROM: 0x3CD17F .byte 0x53 .asciz "AMUS_POS_LCTR_SDK" .byte 0x3F, 0x3F diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index d42e6136..0b112f3c 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -389,38 +389,38 @@ lbl_803E95A4: .global lbl_803E9650 lbl_803E9650: # ROM: 0x3E6650 - .4byte 0x803D5100 - .4byte 0x803D5109 - .4byte 0x803D5112 - .4byte 0x803D511B - .4byte 0x803D5124 - .4byte 0x803D512D - .4byte 0x803D5136 - .4byte 0x803D513F - .4byte 0x803D5148 - .4byte 0x803D5151 - .4byte 0x803D515A - .4byte 0x803D5163 - .4byte 0x803D516C - .4byte 0x803D5175 + .4byte lbl_803D5100 + .4byte lbl_803D5109 + .4byte lbl_803D5112 + .4byte lbl_803D511B + .4byte lbl_803D5124 + .4byte lbl_803D512D + .4byte lbl_803D5136 + .4byte lbl_803D513F + .4byte lbl_803D5148 + .4byte lbl_803D5151 + .4byte lbl_803D515A + .4byte lbl_803D5163 + .4byte lbl_803D516C + .4byte lbl_803D5175 .global lbl_803E9688 lbl_803E9688: # ROM: 0x3E6688 - .4byte 0x803D517E - .4byte 0x803D518A - .4byte 0x803D5196 - .4byte 0x803D51A2 - .4byte 0x803D51AE - .4byte 0x803D51BA - .4byte 0x803D51C6 - .4byte 0x803D51D2 - .4byte 0x803D51DE - .4byte 0x803D51EA - .4byte 0x803D51F6 - .4byte 0x803D5202 - .4byte 0x803D520E - .4byte 0x803D521A + .4byte lbl_803D517E + .4byte lbl_803D518A + .4byte lbl_803D5196 + .4byte lbl_803D51A2 + .4byte lbl_803D51AE + .4byte lbl_803D51BA + .4byte lbl_803D51C6 + .4byte lbl_803D51D2 + .4byte lbl_803D51DE + .4byte lbl_803D51EA + .4byte lbl_803D51F6 + .4byte lbl_803D5202 + .4byte lbl_803D520E + .4byte lbl_803D521A .section .sdata .balign 8 @@ -11418,41 +11418,41 @@ lbl_805AD700: .global lbl_803D4B98 lbl_803D4B98: # ROM: 0x3D1B98 - .4byte 0x803D4D5C - .4byte 0x803D4D63 + .4byte lbl_803D4D5C + .4byte lbl_803D4D63 .4byte 0x3F28F5C3 - .4byte 0x803D4D63 - .4byte 0x803D4D6A + .4byte lbl_803D4D63 + .4byte lbl_803D4D6A .4byte 0x3F28F5C3 - .4byte 0x803D4D6A - .4byte 0x803D4D71 + .4byte lbl_803D4D6A + .4byte lbl_803D4D71 .4byte 0x3F28F5C3 - .4byte 0x803D4D71 - .4byte 0x803D4D78 + .4byte lbl_803D4D71 + .4byte lbl_803D4D78 .4byte 0x3F28F5C3 .global lbl_803D4BC8 lbl_803D4BC8: # ROM: 0x3D1BC8 - .4byte 0x803D4D7F - .4byte 0x3F19999A - .4byte 0x803D4D8D - .4byte 0x3F19999A - .4byte 0x803D4D95 + .4byte lbl_803D4D7F + .float 0.6 + .4byte lbl_803D4D8D + .float 0.6 + .4byte lbl_803D4D95 .float 0.3 - .4byte 0x803D4DA6 - .4byte 0x3F19999A - .4byte 0x803D4DAD + .4byte lbl_803D4DA6 + .float 0.6 + .4byte lbl_803D4DAD .float 0.5 - .4byte 0x803D4DB5 + .4byte lbl_803D4DB5 .float 0.5 - .4byte 0x803D4DBD - .4byte 0x3F19999A - .4byte 0x803D4DC5 - .4byte 0x3F19999A - .4byte 0x803D4DCD + .4byte lbl_803D4DBD + .float 0.6 + .4byte lbl_803D4DC5 + .float 0.6 + .4byte lbl_803D4DCD .float 0.4 - .4byte 0x803D4DD7 + .4byte lbl_803D4DD7 .float 0.4 .global lbl_803D4C18 @@ -11546,33 +11546,104 @@ lbl_803D4CCC: .global lbl_803D4D5C lbl_803D4D5C: + # ROM: 0x3D1D5C .asciz "Tail_1" + +.global lbl_803D4D63 +lbl_803D4D63: + + # ROM: 0x3D1D63 .byte 0x54 .asciz "ail_3" + +.global lbl_803D4D6A +lbl_803D4D6A: + + # ROM: 0x3D1D6A .byte 0x54, 0x61 .asciz "il_5" + +.global lbl_803D4D71 +lbl_803D4D71: + + # ROM: 0x3D1D71 .byte 0x54, 0x61, 0x69 .4byte 0x6C5F3700 + +.global lbl_803D4D78 +lbl_803D4D78: + + # ROM: 0x3D1D78 .asciz "Tail_9" + +.global lbl_803D4D7F +lbl_803D4D7F: + + # ROM: 0x3D1D7F .byte 0x53 .asciz "keleton_Root" + +.global lbl_803D4D8D +lbl_803D4D8D: + + # ROM: 0x3D1D8D .byte 0x53, 0x70, 0x69 .asciz "ne_2" + +.global lbl_803D4D95 +lbl_803D4D95: + + # ROM: 0x3D1D95 .byte 0x62, 0x72, 0x65 .asciz "astPlate_LCTR" + +.global lbl_803D4DA6 +lbl_803D4DA6: + + # ROM: 0x3D1DA6 .byte 0x48, 0x65 .asciz "ad_1" + +.global lbl_803D4DAD +lbl_803D4DAD: + + # ROM: 0x3D1DAD .byte 0x4C, 0x5F, 0x77 .asciz "rist" + +.global lbl_803D4DB5 +lbl_803D4DB5: + + # ROM: 0x3D1DB5 .byte 0x52, 0x5F, 0x77 .asciz "rist" + +.global lbl_803D4DBD +lbl_803D4DBD: + + # ROM: 0x3D1DBD .byte 0x4C, 0x5F, 0x61 .asciz "nkle" + +.global lbl_803D4DC5 +lbl_803D4DC5: + + # ROM: 0x3D1DC5 .byte 0x52, 0x5F, 0x61 .asciz "nkle" + +.global lbl_803D4DCD +lbl_803D4DCD: + + # ROM: 0x3D1DCD .byte 0x4C, 0x5F, 0x70 .asciz "inky_1" + +.global lbl_803D4DD7 +lbl_803D4DD7: + + # ROM: 0x3D1DD7 .byte 0x52 .asciz "_pinky_1" .byte 0x3F, 0x3F, 0x28 @@ -11663,57 +11734,193 @@ lbl_803D4D5C: .global lbl_803D5100 lbl_803D5100: + # ROM: 0x3D2100 .asciz "GasJet01" + +.global lbl_803D5109 +lbl_803D5109: + + # ROM: 0x3D2109 .byte 0x47, 0x61, 0x73 .asciz "Jet02" + +.global lbl_803D5112 +lbl_803D5112: + + # ROM: 0x3D2112 .byte 0x47, 0x61 .asciz "sJet03" + +.global lbl_803D511B +lbl_803D511B: + + # ROM: 0x3D211B .byte 0x47 .asciz "asJet04" + +.global lbl_803D5124 +lbl_803D5124: + + # ROM: 0x3D2124 .asciz "GasJet05" + +.global lbl_803D512D +lbl_803D512D: + + # ROM: 0x3D212D .byte 0x47, 0x61, 0x73 .asciz "Jet06" + +.global lbl_803D5136 +lbl_803D5136: + + # ROM: 0x3D2136 .byte 0x47, 0x61 .asciz "sJet07" + +.global lbl_803D513F +lbl_803D513F: + + # ROM: 0x3D213F .byte 0x47 .asciz "asJet08" + +.global lbl_803D5148 +lbl_803D5148: + + # ROM: 0x3D2148 .asciz "GasJet09" + +.global lbl_803D5151 +lbl_803D5151: + + # ROM: 0x3D2151 .byte 0x47, 0x61, 0x73 .asciz "Jet10" + +.global lbl_803D515A +lbl_803D515A: + + # ROM: 0x3D215A .byte 0x47, 0x61 .asciz "sJet11" + +.global lbl_803D5163 +lbl_803D5163: + + # ROM: 0x3D2163 .byte 0x47 .asciz "asJet12" + +.global lbl_803D516C +lbl_803D516C: + + # ROM: 0x3D216C .asciz "GasJet13" + +.global lbl_803D5175 +lbl_803D5175: + + # ROM: 0x3D2175 .byte 0x47, 0x61, 0x73 .asciz "Jet14" + +.global lbl_803D517E +lbl_803D517E: + + # ROM: 0x3D217E .byte 0x47, 0x61 .asciz "s_01_LCTR" + +.global lbl_803D518A +lbl_803D518A: + + # ROM: 0x3D218A .byte 0x47, 0x61 .asciz "s_02_LCTR" + +.global lbl_803D5196 +lbl_803D5196: + + # ROM: 0x3D2196 .byte 0x47, 0x61 .asciz "s_03_LCTR" + +.global lbl_803D51A2 +lbl_803D51A2: + + # ROM: 0x3D21A2 .byte 0x47, 0x61 .asciz "s_04_LCTR" + +.global lbl_803D51AE +lbl_803D51AE: + + # ROM: 0x3D21AE .byte 0x47, 0x61 .asciz "s_05_LCTR" + +.global lbl_803D51BA +lbl_803D51BA: + + # ROM: 0x3D21BA .byte 0x47, 0x61 .asciz "s_06_LCTR" + +.global lbl_803D51C6 +lbl_803D51C6: + + # ROM: 0x3D21C6 .byte 0x47, 0x61 .asciz "s_07_LCTR" + +.global lbl_803D51D2 +lbl_803D51D2: + + # ROM: 0x3D21D2 .byte 0x47, 0x61 .asciz "s_08_LCTR" + +.global lbl_803D51DE +lbl_803D51DE: + + # ROM: 0x3D21DE .byte 0x47, 0x61 .asciz "s_09_LCTR" + +.global lbl_803D51EA +lbl_803D51EA: + + # ROM: 0x3D21EA .byte 0x47, 0x61 .asciz "s_10_LCTR" + +.global lbl_803D51F6 +lbl_803D51F6: + + # ROM: 0x3D21F6 .byte 0x47, 0x61 .asciz "s_11_LCTR" + +.global lbl_803D5202 +lbl_803D5202: + + # ROM: 0x3D2202 .byte 0x47, 0x61 .asciz "s_12_LCTR" + +.global lbl_803D520E +lbl_803D520E: + + # ROM: 0x3D220E .byte 0x47, 0x61 .asciz "s_13_LCTR" + +.global lbl_803D521A +lbl_803D521A: + + # ROM: 0x3D221A .byte 0x47, 0x61 .asciz "s_14_LCTR" .byte 0x3F, 0x3F diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s index b2a9a2bc..f24040e8 100644 --- a/asm/MetroidPrime/Enemies/CSeedling.s +++ b/asm/MetroidPrime/Enemies/CSeedling.s @@ -1440,38 +1440,94 @@ lbl_805AD7F4: .global lbl_803D52B0 lbl_803D52B0: # ROM: 0x3D22B0 - .4byte 0x803D52E0 - .4byte 0x803D52F2 - .4byte 0x803D5304 - .4byte 0x803D5316 - .4byte 0x803D5328 - .4byte 0x803D533A - .4byte 0x803D534C - .4byte 0x803D535E - .4byte 0x803D5370 - .4byte 0x803D5382 - .4byte 0x803D5394 - .4byte 0x803D53A6 + .4byte lbl_803D52E0 + .4byte lbl_803D52F2 + .4byte lbl_803D5304 + .4byte lbl_803D5316 + .4byte lbl_803D5328 + .4byte lbl_803D533A + .4byte lbl_803D534C + .4byte lbl_803D535E + .4byte lbl_803D5370 + .4byte lbl_803D5382 + .4byte lbl_803D5394 + .4byte lbl_803D53A6 .global lbl_803D52E0 lbl_803D52E0: + # ROM: 0x3D22E0 .asciz "A_spike1_LCTR_SDK" + +.global lbl_803D52F2 +lbl_803D52F2: + + # ROM: 0x3D22F2 .byte 0x41, 0x5F .asciz "spike2_LCTR_SDK" + +.global lbl_803D5304 +lbl_803D5304: + + # ROM: 0x3D2304 .asciz "A_spike3_LCTR_SDK" + +.global lbl_803D5316 +lbl_803D5316: + + # ROM: 0x3D2316 .byte 0x41, 0x5F .asciz "spike4_LCTR_SDK" + +.global lbl_803D5328 +lbl_803D5328: + + # ROM: 0x3D2328 .asciz "A_spike5_LCTR_SDK" + +.global lbl_803D533A +lbl_803D533A: + + # ROM: 0x3D233A .byte 0x41, 0x5F .asciz "spike6_LCTR_SDK" + +.global lbl_803D534C +lbl_803D534C: + + # ROM: 0x3D234C .asciz "B_spike1_LCTR_SDK" + +.global lbl_803D535E +lbl_803D535E: + + # ROM: 0x3D235E .byte 0x42, 0x5F .asciz "spike2_LCTR_SDK" + +.global lbl_803D5370 +lbl_803D5370: + + # ROM: 0x3D2370 .asciz "B_spike3_LCTR_SDK" + +.global lbl_803D5382 +lbl_803D5382: + + # ROM: 0x3D2382 .byte 0x42, 0x5F .asciz "spike4_LCTR_SDK" + +.global lbl_803D5394 +lbl_803D5394: + + # ROM: 0x3D2394 .asciz "B_spike5_LCTR_SDK" + +.global lbl_803D53A6 +lbl_803D53A6: + + # ROM: 0x3D23A6 .byte 0x42, 0x5F .asciz "spike6_LCTR_SDK" .asciz "??(??)" diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index 683f6f1a..a3abab1c 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -10,18 +10,18 @@ lbl_ctor: .global lbl_803E0700 lbl_803E0700: # ROM: 0x3DD700 - .4byte 0x803CF470 - .4byte 0x803CF578 - .4byte 0x803CF6AC - .4byte 0x803CF788 - .4byte 0x803CF838 - .4byte 0x803CF940 - .4byte 0x803CF9F0 - .4byte 0x803CFAF8 - .4byte 0x803CFC2C - .4byte 0x803CFD08 - .4byte 0x803CFDB8 - .4byte 0x803CFEC0 + .4byte lbl_803CF470 + .4byte lbl_803CF578 + .4byte lbl_803CF6AC + .4byte lbl_803CF788 + .4byte lbl_803CF838 + .4byte lbl_803CF940 + .4byte lbl_803CF9F0 + .4byte lbl_803CFAF8 + .4byte lbl_803CFC2C + .4byte lbl_803CFD08 + .4byte lbl_803CFDB8 + .4byte lbl_803CFEC0 .4byte 0 .global lbl_803E0734 @@ -788,7 +788,7 @@ lbl_805AB594: .global lbl_805AB598 lbl_805AB598: # ROM: 0x3F7E38 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AB59C lbl_805AB59C: @@ -15079,6 +15079,11 @@ lbl_803CF438: .float 0.15 .float 0.15 .float 0.15 + +.global lbl_803CF470 +lbl_803CF470: + + # ROM: 0x3CC470 .4byte 0x00000014 .4byte 0x00000003 .4byte 0x00000004 @@ -15145,6 +15150,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CF578 +lbl_803CF578: + + # ROM: 0x3CC578 .4byte 0x0000000F .4byte 0x00000005 .4byte 0x00000003 @@ -15222,6 +15232,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CF6AC +lbl_803CF6AC: + + # ROM: 0x3CC6AC .4byte 0x00000028 .4byte 0x00000001 .4byte 0x00000002 @@ -15277,6 +15292,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CF788 +lbl_803CF788: + + # ROM: 0x3CC788 .4byte 0x00000014 .4byte 0x00000010 .4byte 0x00000004 @@ -15321,6 +15341,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CF838 +lbl_803CF838: + + # ROM: 0x3CC838 .4byte 0x0000000F .4byte 0x00000010 .4byte 0x00000001 @@ -15387,6 +15412,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CF940 +lbl_803CF940: + + # ROM: 0x3CC940 .4byte 0x00000023 .4byte 0x00000007 .4byte 0x0000000D @@ -15431,6 +15461,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CF9F0 +lbl_803CF9F0: + + # ROM: 0x3CC9F0 .4byte 0x0000000A .4byte 0x00000010 .4byte 0x0000000F @@ -15497,6 +15532,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CFAF8 +lbl_803CFAF8: + + # ROM: 0x3CCAF8 .4byte 0x0000001A .4byte 0x00000010 .4byte 0x00000008 @@ -15574,6 +15614,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CFC2C +lbl_803CFC2C: + + # ROM: 0x3CCC2C .4byte 0x00000028 .4byte 0x00000001 .4byte 0x00000010 @@ -15629,6 +15674,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CFD08 +lbl_803CFD08: + + # ROM: 0x3CCD08 .4byte 0x00000028 .4byte 0x00000007 .4byte 0x0000000D @@ -15673,6 +15723,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CFDB8 +lbl_803CFDB8: + + # ROM: 0x3CCDB8 .4byte 0x0000001E .4byte 0x00000009 .4byte 0x0000000B @@ -15739,6 +15794,11 @@ lbl_803CF438: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803CFEC0 +lbl_803CFEC0: + + # ROM: 0x3CCEC0 .4byte 0x00000023 .4byte 0x00000007 .4byte 0x0000000D @@ -15814,15 +15874,7 @@ lbl_803CFF70: .byte 0x52, 0x5F .4byte 0x68697000 .4byte 0x525F6B6E - -.global lbl_803D0004 -lbl_803D0004: - # ROM: 0x3CD004 .4byte 0x65650052 - -.global lbl_803D0008 -lbl_803D0008: - # ROM: 0x3CD008 .asciz "_ankle" .byte 0x4C .asciz "_hip" diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index 5634a398..2eade601 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -2330,44 +2330,81 @@ lbl_805ABB60: .balign 8 .global lbl_803D01F8 lbl_803D01F8: + # ROM: 0x3CD1F8 - .4byte 0x803D023C - .float 1.5 - .4byte 0x803D0248 - .float 1.0 - .4byte 0x803D024E - .float 1.0 - .4byte 0x803D0254 - .float 1.0 - .4byte 0x803D025A - .float 1.0 - .4byte 0x803D0267 - .float 1.0 - .4byte 0x803D027D - .float 1.5 + .4byte lbl_803D023C + .4byte 0x3FC00000 + .4byte lbl_803D0248 + .4byte 0x3F800000 + .4byte lbl_803D024E + .4byte 0x3F800000 + .4byte lbl_803D0254 + .4byte 0x3F800000 + .4byte lbl_803D025A + .4byte 0x3F800000 + .4byte lbl_803D0267 + .4byte 0x3F800000 + .4byte lbl_803D027D + .4byte 0x3FC00000 .global lbl_803D0230 lbl_803D0230: + # ROM: 0x3CD230 .asciz "Arm_2" .byte 0x41, 0x72 .4byte 0x6D5F3300 + +.global lbl_803D023C +lbl_803D023C: + + # ROM: 0x3CD23C .asciz "Arm_4" .byte 0x41, 0x72 .4byte 0x6D5F3500 + +.global lbl_803D0248 +lbl_803D0248: + + # ROM: 0x3CD248 .asciz "Arm_6" + +.global lbl_803D024E +lbl_803D024E: + + # ROM: 0x3CD24E .byte 0x41, 0x72 .4byte 0x6D5F3700 + +.global lbl_803D0254 +lbl_803D0254: + + # ROM: 0x3CD254 .asciz "Arm_8" + +.global lbl_803D025A +lbl_803D025A: + + # ROM: 0x3CD25A .byte 0x41, 0x72 .4byte 0x6D5F3900 .asciz "Arm_10" + +.global lbl_803D0267 +lbl_803D0267: + + # ROM: 0x3CD267 .byte 0x41 .asciz "rm_11" .byte 0x41, 0x72 .asciz "m_12" .byte 0x41, 0x72, 0x6D .asciz "_end" + +.global lbl_803D027D +lbl_803D027D: + + # ROM: 0x3CD27D .byte 0x73, 0x77, 0x6F .asciz "osh_LCTR" .byte 0x6C, 0x6F, 0x63 diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index c65851ce..61bf63fc 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -10787,7 +10787,7 @@ __sinit_CThardus_cpp: .global lbl_805AC9E8 lbl_805AC9E8: # ROM: 0x3F9288 - .4byte 0x803D1CB8 + .4byte lbl_803D1CB8 .global lbl_805AC9EC lbl_805AC9EC: @@ -11012,119 +11012,221 @@ lbl_805ACA98: .global lbl_803D1BA0 lbl_803D1BA0: # ROM: 0x3CEBA0 - .4byte 0x803D1CBF - .4byte 0x803D1CC6 - .4byte 0x803D1CD0 - .4byte 0x803D1CD8 - .4byte 0x803D1CDE - .4byte 0x803D1CF3 - .4byte 0x803D1CB8 + .4byte lbl_803D1CBF + .4byte lbl_803D1CC6 + .4byte lbl_803D1CD0 + .4byte lbl_803D1CD8 + .4byte lbl_803D1CDE + .4byte lbl_803D1CF3 + .4byte lbl_803D1CB8 .global lbl_803D1BBC lbl_803D1BBC: # ROM: 0x3CEBBC - .4byte 0x803D1CBF - .4byte 0x803D1D04 - .4byte 0x803D1D1B - .4byte 0x803D1D32 - .4byte 0x803D1D48 - .4byte 0x803D1D63 - .4byte 0x803D1D7E + .4byte lbl_803D1CBF + .4byte lbl_803D1D04 + .4byte lbl_803D1D1B + .4byte lbl_803D1D32 + .4byte lbl_803D1D48 + .4byte lbl_803D1D63 + .4byte lbl_803D1D7E .global lbl_803D1BD8 lbl_803D1BD8: # ROM: 0x3CEBD8 - .4byte 0x803D1D92 + .4byte lbl_803D1D92 .4byte 0 .4byte 0x41300000 .4byte 0 - .4byte 0x803D1D92 + .4byte lbl_803D1D92 .4byte 0 .4byte 0x41100000 .4byte 0 - .4byte 0x803D1D92 + .4byte lbl_803D1D92 .4byte 0 .4byte 0x40E00000 .4byte 0 - .4byte 0x803D1D92 + .4byte lbl_803D1D92 .4byte 0xC0400000 .4byte 0x41100000 .4byte 0 - .4byte 0x803D1D92 + .4byte lbl_803D1D92 .float 4.0 .4byte 0x40E00000 .4byte 0 - .4byte 0x803D1D92 + .4byte lbl_803D1D92 .4byte 0xC0800000 .float 8.0 .4byte 0 - .4byte 0x803D1CBF + .4byte lbl_803D1CBF .float 1.0 - .4byte 0x803D1D04 + .4byte lbl_803D1D04 .float 1.5 - .4byte 0x803D1D1B + .4byte lbl_803D1D1B .float 1.5 - .4byte 0x803D1D32 + .4byte lbl_803D1D32 .float 1.0 - .4byte 0x803D1D48 + .4byte lbl_803D1D48 .float 2.5 - .4byte 0x803D1D63 + .4byte lbl_803D1D63 .float 1.5 - .4byte 0x803D1D7E + .4byte lbl_803D1D7E .float 1.5 - .4byte 0x803D1D93 + .4byte lbl_803D1D93 .float 0.75 - .4byte 0x803D1DAD + .4byte lbl_803D1DAD .float 0.75 - .4byte 0x803D1DC7 + .4byte lbl_803D1DC7 .float 0.75 - .4byte 0x803D1DDC + .4byte lbl_803D1DDC .4byte 0x40100000 - .4byte 0x803D1DF2 + .4byte lbl_803D1DF2 .float 2.0 - .4byte 0x803D1E08 + .4byte lbl_803D1E08 .4byte 0x40400000 .4byte 0x40400000 .float 1.0 - .4byte 0x803D1E1E + .4byte lbl_803D1E1E .4byte 0x40400000 .float 2.0 .4byte 0x40400000 .global lbl_803D1CB8 lbl_803D1CB8: + # ROM: 0x3CECB8 .asciz "Neck_1" + +.global lbl_803D1CBF +lbl_803D1CBF: + + # ROM: 0x3CECBF .byte 0x52 .asciz "_knee" + +.global lbl_803D1CC6 +lbl_803D1CC6: + + # ROM: 0x3CECC6 .byte 0x52, 0x5F .asciz "forearm" + +.global lbl_803D1CD0 +lbl_803D1CD0: + + # ROM: 0x3CECD0 .asciz "L_elbow" + +.global lbl_803D1CD8 +lbl_803D1CD8: + + # ROM: 0x3CECD8 .asciz "L_hip" + +.global lbl_803D1CDE +lbl_803D1CDE: + + # ROM: 0x3CECDE .byte 0x52, 0x5F .asciz "collar_BigRock_SDK" + +.global lbl_803D1CF3 +lbl_803D1CF3: + + # ROM: 0x3CECF3 .byte 0x63 .asciz "ollar_rock4_SDK" + +.global lbl_803D1D04 +lbl_803D1D04: + + # ROM: 0x3CED04 .asciz "R_Elbow_Collision_LCTR" + +.global lbl_803D1D1B +lbl_803D1D1B: + + # ROM: 0x3CED1B .byte 0x4C .asciz "_Elbow_Collision_LCTR" + +.global lbl_803D1D32 +lbl_803D1D32: + + # ROM: 0x3CED32 .byte 0x4C, 0x5F .asciz "Knee_Collision_LCTR" + +.global lbl_803D1D48 +lbl_803D1D48: + + # ROM: 0x3CED48 .asciz "R_Back_Rock_Collision_LCTR" + +.global lbl_803D1D63 +lbl_803D1D63: + + # ROM: 0x3CED63 .byte 0x4C .asciz "_Back_Rock_Collision_LCTR" + +.global lbl_803D1D7E +lbl_803D1D7E: + + # ROM: 0x3CED7E .byte 0x48, 0x65 .asciz "ad_Collision_LCTR" - .byte 0x00, 0x52 + +.global lbl_803D1D92 +lbl_803D1D92: + + # ROM: 0x3CED92 + .byte 0x00 + +.global lbl_803D1D93 +lbl_803D1D93: + + # ROM: 0x3CED93 + .byte 0x52 .asciz "_Shoulder_Collision_LCTR" + +.global lbl_803D1DAD +lbl_803D1DAD: + + # ROM: 0x3CEDAD .byte 0x4C, 0x5F, 0x53 .asciz "houlder_Collision_LCTR" + +.global lbl_803D1DC7 +lbl_803D1DC7: + + # ROM: 0x3CEDC7 .byte 0x53 .asciz "pine_Collision_LCTR" + +.global lbl_803D1DDC +lbl_803D1DDC: + + # ROM: 0x3CEDDC .asciz "R_Hand_Collision_LCTR" + +.global lbl_803D1DF2 +lbl_803D1DF2: + + # ROM: 0x3CEDF2 .byte 0x4C, 0x5F .asciz "Hand_Collision_LCTR" + +.global lbl_803D1E08 +lbl_803D1E08: + + # ROM: 0x3CEE08 .asciz "R_Foot_Collision_LCTR" + +.global lbl_803D1E1E +lbl_803D1E1E: + + # ROM: 0x3CEE1E .byte 0x4C, 0x5F .asciz "Foot_Collision_LCTR" .asciz "center_LCTR" diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index 8c06bba2..262e51b7 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -3980,12 +3980,12 @@ __sinit_CTryclops_cpp: .global lbl_805AD748 lbl_805AD748: # ROM: 0x3F9FE8 - .4byte 0x803D5258 + .4byte lbl_803D5258 .global lbl_805AD74C lbl_805AD74C: # ROM: 0x3F9FEC - .4byte 0x803D5269 + .4byte lbl_803D5269 .global lbl_805AD750 lbl_805AD750: @@ -4057,3 +4057,19 @@ lbl_805AD784: # ROM: 0x3FA024 .4byte 0xBE99999A +.section .rodata +.balign 8 + +.global lbl_803D5258 +lbl_803D5258: + + # ROM: 0x3D2258 + .asciz "ballGrab_locator" + +.global lbl_803D5269 +lbl_803D5269: + + # ROM: 0x3D2269 + .byte 0x53, 0x6B, 0x65 + .asciz "leton_Root" + .balign 4 \ No newline at end of file diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index 66ba4d17..21ee6a5c 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -2944,7 +2944,7 @@ lbl_801E9D54: HardwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox: /* 801E9DC0 001E6D20 94 21 FC F0 */ stwu r1, -0x310(r1) /* 801E9DC4 001E6D24 7C 08 02 A6 */ mflr r0 -/* 801E9DC8 001E6D28 3C C0 80 5A */ lis r6, lbl_805A0004@ha +/* 801E9DC8 001E6D28 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 801E9DCC 001E6D2C C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) /* 801E9DD0 001E6D30 90 01 03 14 */ stw r0, 0x314(r1) /* 801E9DD4 001E6D34 39 00 00 00 */ li r8, 0 @@ -2958,8 +2958,8 @@ HardwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox: /* 801E9DF4 001E6D54 93 A1 03 04 */ stw r29, 0x304(r1) /* 801E9DF8 001E6D58 7C 7D 1B 78 */ mr r29, r3 /* 801E9DFC 001E6D5C 38 61 00 1C */ addi r3, r1, 0x1c -/* 801E9E00 001E6D60 84 86 66 A0 */ lwzu r4, 0x66a0(r6) -/* 801E9E04 001E6D64 80 E6 00 04 */ lwz r7, lbl_805A0004@l(r6) +/* 801E9E00 001E6D60 84 86 66 A0 */ lwzu r4, sZeroVector__9CVector3f@l(r6) +/* 801E9E04 001E6D64 80 E6 00 04 */ lwz r7, 4(r6) /* 801E9E08 001E6D68 80 06 00 08 */ lwz r0, 8(r6) /* 801E9E0C 001E6D6C 38 C0 00 04 */ li r6, 4 /* 801E9E10 001E6D70 90 81 00 10 */ stw r4, 0x10(r1) @@ -8851,7 +8851,7 @@ lbl_805ACB18: .global lbl_805ACB1C lbl_805ACB1C: # ROM: 0x3F93BC - .4byte 0x3F19999A + .float 0.6 .global lbl_805ACB20 lbl_805ACB20: diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s index be7a7997..c3ff10d5 100644 --- a/asm/MetroidPrime/Enemies/CWallWalker.s +++ b/asm/MetroidPrime/Enemies/CWallWalker.s @@ -1227,7 +1227,7 @@ ProjectPointToPlane__11CWallWalkerFRC9CVector3fRC9CVector3fRC9CVector3f: .global lbl_805AD818 lbl_805AD818: # ROM: 0x3FA0B8 - .4byte 0x803D53C8 + .4byte lbl_803D53C8 .global lbl_805AD81C lbl_805AD81C: @@ -1237,7 +1237,7 @@ lbl_805AD81C: .global lbl_805AD820 lbl_805AD820: # ROM: 0x3FA0C0 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AD824 lbl_805AD824: @@ -1284,3 +1284,12 @@ lbl_805AD844: # ROM: 0x3FA0E4 .float 0.017453292 +.section .rodata +.balign 8 + +.global lbl_803D53C8 +lbl_803D53C8: + + # ROM: 0x3D23C8 + .asciz "BendingAnimationHack" + .balign 4 \ No newline at end of file diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 0f9404cd..63b52806 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -7260,8 +7260,13 @@ lbl_80110F54: lbl_803CF1D8: # ROM: 0x3CC1D8 .float 0.4 - .4byte 0x3F19999A + .float 0.6 .float 1.0 + +.global lbl_803CF1E4 +lbl_803CF1E4: + + # ROM: 0x3CC1E4 .asciz "LCTR_WARTAIL" .balign 4 .4byte 0 diff --git a/asm/MetroidPrime/Factories/CScannableObjectInfo.s b/asm/MetroidPrime/Factories/CScannableObjectInfo.s index e3b40c0d..cde9b9e6 100644 --- a/asm/MetroidPrime/Factories/CScannableObjectInfo.s +++ b/asm/MetroidPrime/Factories/CScannableObjectInfo.s @@ -517,44 +517,154 @@ lbl_803D0430: .global lbl_803D0440 lbl_803D0440: # ROM: 0x3CD440 - .4byte 0x803D0490 - .4byte 0x803D0492 - .4byte 0x803D0494 - .4byte 0x803D0496 - .4byte 0x803D0498 - .4byte 0x803D049B - .4byte 0x803D049E - .4byte 0x803D04A1 - .4byte 0x803D04A5 - .4byte 0x803D04A9 - .4byte 0x803D04AE - .4byte 0x803D04B0 - .4byte 0x803D04B2 - .4byte 0x803D04B4 - .4byte 0x803D04B6 - .4byte 0x803D04B9 - .4byte 0x803D04BC - .4byte 0x803D04BF - .4byte 0x803D04C3 - .4byte 0x803D04C7 + .4byte lbl_803D0490 + .4byte lbl_803D0492 + .4byte lbl_803D0494 + .4byte lbl_803D0496 + .4byte lbl_803D0498 + .4byte lbl_803D049B + .4byte lbl_803D049E + .4byte lbl_803D04A1 + .4byte lbl_803D04A5 + .4byte lbl_803D04A9 + .4byte lbl_803D04AE + .4byte lbl_803D04B0 + .4byte lbl_803D04B2 + .4byte lbl_803D04B4 + .4byte lbl_803D04B6 + .4byte lbl_803D04B9 + .4byte lbl_803D04BC + .4byte lbl_803D04BF + .4byte lbl_803D04C3 + .4byte lbl_803D04C7 .global lbl_803D0490 lbl_803D0490: + # ROM: 0x3CD490 - .4byte 0x30003100 - .4byte 0x32003300 - .4byte 0x30310031 - .4byte 0x32003233 - .4byte 0x00303132 - .4byte 0x00313233 - .4byte 0x00303132 - .4byte 0x33003400 - .4byte 0x35003600 - .4byte 0x37003435 - .4byte 0x00353600 - .4byte 0x36370034 - .4byte 0x35360035 - .4byte 0x36370034 + .2byte 0x3000 + +.global lbl_803D0492 +lbl_803D0492: + + # ROM: 0x3CD492 + .2byte 0x3100 + +.global lbl_803D0494 +lbl_803D0494: + + # ROM: 0x3CD494 + .2byte 0x3200 + +.global lbl_803D0496 +lbl_803D0496: + + # ROM: 0x3CD496 + .2byte 0x3300 + +.global lbl_803D0498 +lbl_803D0498: + + # ROM: 0x3CD498 + .byte 0x30, 0x31, 0x00 + +.global lbl_803D049B +lbl_803D049B: + + # ROM: 0x3CD49B + .byte 0x31 + .byte 0x32, 0x00 + +.global lbl_803D049E +lbl_803D049E: + + # ROM: 0x3CD49E + .byte 0x32, 0x33 + .byte 0x00 + +.global lbl_803D04A1 +lbl_803D04A1: + + # ROM: 0x3CD4A1 + .byte 0x30, 0x31, 0x32 + .byte 0x00 + +.global lbl_803D04A5 +lbl_803D04A5: + + # ROM: 0x3CD4A5 + .byte 0x31, 0x32, 0x33 + .byte 0x00 + +.global lbl_803D04A9 +lbl_803D04A9: + + # ROM: 0x3CD4A9 + .byte 0x30, 0x31, 0x32 + .byte 0x33, 0x00 + +.global lbl_803D04AE +lbl_803D04AE: + + # ROM: 0x3CD4AE + .2byte 0x3400 + +.global lbl_803D04B0 +lbl_803D04B0: + + # ROM: 0x3CD4B0 + .2byte 0x3500 + +.global lbl_803D04B2 +lbl_803D04B2: + + # ROM: 0x3CD4B2 + .2byte 0x3600 + +.global lbl_803D04B4 +lbl_803D04B4: + + # ROM: 0x3CD4B4 + .2byte 0x3700 + +.global lbl_803D04B6 +lbl_803D04B6: + + # ROM: 0x3CD4B6 + .byte 0x34, 0x35 + .byte 0x00 + +.global lbl_803D04B9 +lbl_803D04B9: + + # ROM: 0x3CD4B9 + .byte 0x35, 0x36, 0x00 + +.global lbl_803D04BC +lbl_803D04BC: + + # ROM: 0x3CD4BC + .byte 0x36, 0x37, 0x00 + +.global lbl_803D04BF +lbl_803D04BF: + + # ROM: 0x3CD4BF + .byte 0x34 + .byte 0x35, 0x36, 0x00 + +.global lbl_803D04C3 +lbl_803D04C3: + + # ROM: 0x3CD4C3 + .byte 0x35 + .byte 0x36, 0x37, 0x00 + +.global lbl_803D04C7 +lbl_803D04C7: + + # ROM: 0x3CD4C7 + .byte 0x34 .4byte 0x35363700 .asciz "??(??)" .byte 0x25 diff --git a/asm/MetroidPrime/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s index ec8d7a33..db69b499 100644 --- a/asm/MetroidPrime/HUD/CHudDecoInterface.s +++ b/asm/MetroidPrime/HUD/CHudDecoInterface.s @@ -10155,11 +10155,11 @@ lbl_803D09F0: # ROM: 0x3CD9F0 .asciz "energybart01_bossbar" .balign 4 - .4byte 0x8018FFA0 ;# ptr - .4byte 0x8018FFA0 ;# ptr - .4byte 0x8018FE7C ;# ptr - .4byte 0x8018FF18 ;# ptr - .4byte 0x8018FF44 ;# ptr + .4byte CombatEnergyCoordFunc__19CHudEnergyInterfaceFf + .4byte CombatEnergyCoordFunc__19CHudEnergyInterfaceFf + .4byte XRayEnergyCoordFunc__19CHudEnergyInterfaceFf + .4byte ThermalEnergyCoordFunc__19CHudEnergyInterfaceFf + .4byte BallEnergyCoordFunc__19CHudEnergyInterfaceFf .float 0.2 .float 0.2 .float 0.1 @@ -10250,10 +10250,10 @@ lbl_803D0D08: .4byte 0 .4byte 0x41066666 .4byte 0 - .4byte 0x80191EB0 ;# ptr + .4byte CombatMissileBarCoordFunc__20CHudMissileInterfaceFf .4byte 0 - .4byte 0x80191D98 ;# ptr - .4byte 0x80191E34 ;# ptr + .4byte XRayMissileBarCoordFunc__20CHudMissileInterfaceFf + .4byte ThermalMissileBarCoordFunc__20CHudMissileInterfaceFf .4byte 0 .global lbl_803D0D30 @@ -10298,10 +10298,10 @@ lbl_803D0E04: .4byte 0 .4byte 0x41066666 .4byte 0 - .4byte 0x80193788 ;# ptr + .4byte CombatThreatBarCoordFunc__19CHudThreatInterfaceFf .4byte 0 - .4byte 0x8019367C ;# ptr - .4byte 0x80193710 ;# ptr + .4byte XRayThreatBarCoordFunc__19CHudThreatInterfaceFf + .4byte ThermalThreatBarCoordFunc__19CHudThreatInterfaceFf .4byte 0 .global lbl_803D0E2C @@ -10325,22 +10325,73 @@ lbl_803D0E38: .global lbl_803D0E58 lbl_803D0E58: + # ROM: 0x3CDE58 .asciz "BaseWidget_VisorMenu" + +.global lbl_803D0E6D +lbl_803D0E6D: + + # ROM: 0x3CDE6D .byte 0x42, 0x61, 0x73 .asciz "eWidget_BeamMenu" + +.global lbl_803D0E81 +lbl_803D0E81: + + # ROM: 0x3CDE81 .byte 0x54, 0x65, 0x78 .asciz "tPane_VisorMenu" + +.global lbl_803D0E94 +lbl_803D0E94: + + # ROM: 0x3CDE94 .asciz "TextPane_BeamMenu" + +.global lbl_803D0EA6 +lbl_803D0EA6: + + # ROM: 0x3CDEA6 .byte 0x62, 0x61 .asciz "sewidget_visormenutitle" + +.global lbl_803D0EC0 +lbl_803D0EC0: + + # ROM: 0x3CDEC0 .asciz "basewidget_beammenutitle" + +.global lbl_803D0ED9 +lbl_803D0ED9: + + # ROM: 0x3CDED9 .byte 0x6D, 0x6F, 0x64 .asciz "el_visor" + +.global lbl_803D0EE5 +lbl_803D0EE5: + + # ROM: 0x3CDEE5 .byte 0x6D, 0x6F, 0x64 .asciz "el_beam" + +.global lbl_803D0EF0 +lbl_803D0EF0: + + # ROM: 0x3CDEF0 .4byte 0x6C6F7A00 + +.global lbl_803D0EF4 +lbl_803D0EF4: + + # ROM: 0x3CDEF4 .asciz "icon" + +.global lbl_803D0EF9 +lbl_803D0EF9: + + # ROM: 0x3CDEF9 .byte 0x67, 0x68, 0x6F .4byte 0x73740025 .4byte 0x73257300 diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index 2363d442..7463113f 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -458,7 +458,7 @@ lbl_805AA4D8: .global lbl_805AA4E0 lbl_805AA4E0: # ROM: 0x3F6D80 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AA4E4 lbl_805AA4E4: @@ -10719,39 +10719,110 @@ lbl_803CD024: .asciz "model_videoband" .asciz "textpane_message" .balign 4 - .4byte 0x803CD0C0 - .4byte 0x803CD0D4 - .4byte 0x803CD0E8 - .4byte 0x803CD0FC - .4byte 0x803CD110 - .4byte 0x803CD124 - .4byte 0x803CD138 - .4byte 0x803CD14C - .4byte 0x803CD160 - .4byte 0x803CD174 - .4byte 0x803CD188 - .4byte 0x803CD19C - .4byte 0x803CD1B0 - .4byte 0x803CD1C4 - .4byte 0x803CD1D8 + .4byte lbl_803CD0C0 + .4byte lbl_803CD0D4 + .4byte lbl_803CD0E8 + .4byte lbl_803CD0FC + .4byte lbl_803CD110 + .4byte lbl_803CD124 + .4byte lbl_803CD138 + .4byte lbl_803CD14C + .4byte lbl_803CD160 + .4byte lbl_803CD174 + .4byte lbl_803CD188 + .4byte lbl_803CD19C + .4byte lbl_803CD1B0 + .4byte lbl_803CD1C4 + .4byte lbl_803CD1D8 .global lbl_803CD0C0 lbl_803CD0C0: + # ROM: 0x3CA0C0 .asciz " Radar" + +.global lbl_803CD0D4 +lbl_803CD0D4: + + # ROM: 0x3CA0D4 .asciz " Lag" + +.global lbl_803CD0E8 +lbl_803CD0E8: + + # ROM: 0x3CA0E8 .asciz " Lights" + +.global lbl_803CD0FC +lbl_803CD0FC: + + # ROM: 0x3CA0FC .asciz " Targeting" + +.global lbl_803CD110 +lbl_803CD110: + + # ROM: 0x3CA110 .asciz " Damage" + +.global lbl_803CD124 +lbl_803CD124: + + # ROM: 0x3CA124 .asciz " FrameGlue" + +.global lbl_803CD138 +lbl_803CD138: + + # ROM: 0x3CA138 .asciz " BaseFrame" + +.global lbl_803CD14C +lbl_803CD14C: + + # ROM: 0x3CA14C .asciz " EnergyGroup" + +.global lbl_803CD160 +lbl_803CD160: + + # ROM: 0x3CA160 .asciz " ThreatGroup" + +.global lbl_803CD174 +lbl_803CD174: + + # ROM: 0x3CA174 .asciz " MissileGroup" + +.global lbl_803CD188 +lbl_803CD188: + + # ROM: 0x3CA188 .asciz " FreeLookGroup" + +.global lbl_803CD19C +lbl_803CD19C: + + # ROM: 0x3CA19C .asciz " HelmetGroup" + +.global lbl_803CD1B0 +lbl_803CD1B0: + + # ROM: 0x3CA1B0 .asciz " DecoGroup" + +.global lbl_803CD1C4 +lbl_803CD1C4: + + # ROM: 0x3CA1C4 .asciz " CamDebug" + +.global lbl_803CD1D8 +lbl_803CD1D8: + + # ROM: 0x3CA1D8 .asciz " Total" .asciz "%02d:%02d:%02d" .byte 0x3F diff --git a/asm/MetroidPrime/Player/CGameHintInfo.s b/asm/MetroidPrime/Player/CGameHintInfo.s index d1980a61..52558a34 100644 --- a/asm/MetroidPrime/Player/CGameHintInfo.s +++ b/asm/MetroidPrime/Player/CGameHintInfo.s @@ -1572,9 +1572,8 @@ lbl_805AD810: .balign 8 .global lbl_803D53C0 lbl_803D53C0: + # ROM: 0x3D23C0 .asciz "??(??)" .balign 4 - .asciz "BendingAnimationHack" - .balign 4 diff --git a/asm/MetroidPrime/Player/CGrappleArm.s b/asm/MetroidPrime/Player/CGrappleArm.s index 249df7fe..4a1bba1e 100644 --- a/asm/MetroidPrime/Player/CGrappleArm.s +++ b/asm/MetroidPrime/Player/CGrappleArm.s @@ -3596,14 +3596,14 @@ lbl_801204D4: .global lbl_803CF320 lbl_803CF320: # ROM: 0x3CC320 - .4byte 0x803CF3A2 - .4byte 0x803CF3B1 - .4byte 0x803CF3C2 - .4byte 0x803CF3D1 - .4byte 0x803CF3E1 - .4byte 0x803CF3F1 - .4byte 0x803CF402 - .4byte 0x803CF413 + .4byte lbl_803CF3A2 + .4byte lbl_803CF3B1 + .4byte lbl_803CF3C2 + .4byte lbl_803CF3D1 + .4byte lbl_803CF3E1 + .4byte lbl_803CF3F1 + .4byte lbl_803CF402 + .4byte lbl_803CF413 .global lbl_803CF340 lbl_803CF340: @@ -3636,13 +3636,29 @@ lbl_803CF38E: .global lbl_803CF39B lbl_803CF39B: .asciz "LGBeam" +.global lbl_803CF3A2 +lbl_803CF3A2: .asciz "PowerSuit_DGRP" +.global lbl_803CF3B1 +lbl_803CF3B1: .asciz "GravitySuit_DGRP" +.global lbl_803CF3C2 +lbl_803CF3C2: .asciz "VariaSuit_DGRP" +.global lbl_803CF3D1 +lbl_803CF3D1: .asciz "PhazonSuit_DGRP" +.global lbl_803CF3E1 +lbl_803CF3E1: .asciz "FusionSuit_DGRP" +.global lbl_803CF3F1 +lbl_803CF3F1: .asciz "FusionSuitG_DGRP" +.global lbl_803CF402 +lbl_803CF402: .asciz "FusionSuitV_DGRP" +.global lbl_803CF413 +lbl_803CF413: .asciz "FusionSuitP_DGRP" .asciz "??(??)" .asciz "Whole Body" diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index dc04c160..48cee7bd 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -430,7 +430,7 @@ lbl_805AAEE0: .global lbl_805AAEE4 lbl_805AAEE4: # ROM: 0x3F7784 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AAEE8 lbl_805AAEE8: @@ -15148,110 +15148,113 @@ lbl_800FA60C: .balign 8 .global lbl_803CE910 lbl_803CE910: + # ROM: 0x3CB910 - .4byte 0x803CEBF4 + .4byte lbl_803CEBF4 .4byte 0 - .4byte 0x803CEBF4 + .4byte lbl_803CEBF4 .4byte 0 - .4byte 0x803CEBF4 + .4byte lbl_803CEBF4 .4byte 0x00000001 - .4byte 0x803CEBF4 + .4byte lbl_803CEBF4 .4byte 0 - .4byte 0x803CEC02 + .4byte lbl_803CEC02 .4byte 0 - .4byte 0x803CEC02 + .4byte lbl_803CEC02 .4byte 0x00000002 - .4byte 0x803CEC02 + .4byte lbl_803CEC02 .4byte 0x00000001 - .4byte 0x803CEC02 + .4byte lbl_803CEC02 .4byte 0x00000003 - .4byte 0x803CEC16 + .4byte lbl_803CEC16 .4byte 0 - .4byte 0x803CEC16 + .4byte lbl_803CEC16 .4byte 0 - .4byte 0x803CEC16 + .4byte lbl_803CEC16 .4byte 0x00000001 - .4byte 0x803CEC16 + .4byte lbl_803CEC16 .4byte 0 - .4byte 0x803CEC2B + .4byte lbl_803CEC2B .4byte 0 - .4byte 0x803CEC2B + .4byte lbl_803CEC2B .4byte 0x00000002 - .4byte 0x803CEC2B + .4byte lbl_803CEC2B .4byte 0x00000001 - .4byte 0x803CEC2B + .4byte lbl_803CEC2B .4byte 0x00000003 - .4byte 0x803CEC46 + .4byte lbl_803CEC46 .4byte 0 - .4byte 0x803CEC46 + .4byte lbl_803CEC46 .4byte 0 - .4byte 0x803CEC46 + .4byte lbl_803CEC46 .4byte 0x00000001 - .4byte 0x803CEC46 + .4byte lbl_803CEC46 .4byte 0x00000002 - .4byte 0x803CEC2B + .4byte lbl_803CEC2B .4byte 0 - .4byte 0x803CEC2B + .4byte lbl_803CEC2B .4byte 0x00000002 - .4byte 0x803CEC2B + .4byte lbl_803CEC2B .4byte 0x00000001 - .4byte 0x803CEC2B + .4byte lbl_803CEC2B .4byte 0x00000003 .global lbl_803CE9D0 lbl_803CE9D0: + # ROM: 0x3CB9D0 - .4byte 0x803CEC61 + .4byte lbl_803CEC61 .4byte 0 - .4byte 0x803CEC61 + .4byte lbl_803CEC61 .4byte 0 - .4byte 0x803CEC61 + .4byte lbl_803CEC61 .4byte 0x00000001 - .4byte 0x803CEC75 + .4byte lbl_803CEC75 .4byte 0 - .4byte 0x803CEC02 + .4byte lbl_803CEC02 .4byte 0 - .4byte 0x803CEC02 + .4byte lbl_803CEC02 .4byte 0x00000002 - .4byte 0x803CEC02 + .4byte lbl_803CEC02 .4byte 0x00000001 - .4byte 0x803CEC02 + .4byte lbl_803CEC02 .4byte 0x00000003 .global lbl_803CEA10 lbl_803CEA10: + # ROM: 0x3CBA10 - .4byte 0x803CEC89 + .4byte lbl_803CEC89 .4byte 0 - .4byte 0x803CEC89 + .4byte lbl_803CEC89 .4byte 0 - .4byte 0x803CEC89 + .4byte lbl_803CEC89 .4byte 0x00000001 - .4byte 0x803CECA2 + .4byte lbl_803CECA2 .4byte 0 - .4byte 0x803CEC89 + .4byte lbl_803CEC89 .4byte 0 - .4byte 0x803CEC89 + .4byte lbl_803CEC89 .4byte 0 - .4byte 0x803CEC89 + .4byte lbl_803CEC89 .4byte 0x00000001 - .4byte 0x803CECA2 + .4byte lbl_803CECA2 .4byte 0 - .4byte 0x803CECBB + .4byte lbl_803CECBB .4byte 0 - .4byte 0x803CECBB + .4byte lbl_803CECBB .4byte 0 - .4byte 0x803CECBB + .4byte lbl_803CECBB .4byte 0 - .4byte 0x803CECBB + .4byte lbl_803CECBB .4byte 0 - .4byte 0x803CECBB + .4byte lbl_803CECBB .4byte 0 - .4byte 0x803CECBB + .4byte lbl_803CECBB .4byte 0 - .4byte 0x803CECBB + .4byte lbl_803CECBB .4byte 0 - .4byte 0x803CECBB + .4byte lbl_803CECBB .4byte 0 .global lbl_803CEA90 @@ -15377,24 +15380,70 @@ lbl_803CEBC4: .global lbl_803CEBF4 lbl_803CEBF4: + # ROM: 0x3CBBF4 .asciz "SamusBallANCS" + +.global lbl_803CEC02 +lbl_803CEC02: + + # ROM: 0x3CBC02 .byte 0x53, 0x61 .asciz "musFusionBallANCS" + +.global lbl_803CEC16 +lbl_803CEC16: + + # ROM: 0x3CBC16 .byte 0x53, 0x61 .asciz "musBallLowPolyCMDL" + +.global lbl_803CEC2B +lbl_803CEC2B: + + # ROM: 0x3CBC2B .byte 0x53 .asciz "amusBallFusionLowPolyCMDL" + +.global lbl_803CEC46 +lbl_803CEC46: + + # ROM: 0x3CBC46 .byte 0x53, 0x61 .asciz "musSpiderBallLowPolyCMDL" + +.global lbl_803CEC61 +lbl_803CEC61: + + # ROM: 0x3CBC61 .byte 0x53, 0x61, 0x6D .asciz "usSpiderBallANCS" + +.global lbl_803CEC75 +lbl_803CEC75: + + # ROM: 0x3CBC75 .byte 0x53, 0x61, 0x6D .asciz "usPhazonBallANCS" + +.global lbl_803CEC89 +lbl_803CEC89: + + # ROM: 0x3CBC89 .byte 0x53, 0x61, 0x6D .asciz "usSpiderBallGlassCMDL" + +.global lbl_803CECA2 +lbl_803CECA2: + + # ROM: 0x3CBCA2 .byte 0x53, 0x61 .asciz "musPhazonBallGlassCMDL" + +.global lbl_803CECBB +lbl_803CECBB: + + # ROM: 0x3CBCBB .byte 0x53 .asciz "amusBallFrozenCMDL" .balign 4 @@ -15436,4 +15485,3 @@ lbl_803CEBF4: .byte 0x45, 0x66, 0x66 .asciz "ect_MorphBallIceBreak" .balign 4 - diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index c0c35bcb..397be154 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -438,7 +438,7 @@ lbl_805A9E10: .global lbl_805A9E14 lbl_805A9E14: # ROM: 0x3F66B4 - .4byte 0x803CC4F8 + .4byte lbl_803CC4F8 .global lbl_805A9E18 lbl_805A9E18: @@ -846,7 +846,7 @@ lbl_805A9F68: .global lbl_805A9F6C lbl_805A9F6C: # ROM: 0x3F680C - .4byte 0x3F19999A + .float 0.6 .global lbl_805A9F70 lbl_805A9F70: diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index 1ecbfebb..7f93581c 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -127,7 +127,7 @@ lbl_805A6E08: .global lbl_805A6E0C lbl_805A6E0C: # ROM: 0x3F47AC - .4byte 0x3F19999A + .float 0.6 .global lbl_805A6E10 lbl_805A6E10: @@ -443,7 +443,7 @@ lbl_805AA244: .global lbl_805AA248 lbl_805AA248: # ROM: 0x3F6AE8 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AA24C lbl_805AA24C: @@ -9252,11 +9252,11 @@ DrawScreenTex__Ff: /* 800424B0 0003F410 48 2C 79 AD */ bl GetProjectionState__9CGraphicsFv /* 800424B4 0003F414 88 03 00 00 */ lbz r0, 0(r3) /* 800424B8 0003F418 3C C0 43 30 */ lis r6, 0x4330 -/* 800424BC 0003F41C 3C 80 80 3F */ lis r4, lbl_803F0008@ha -/* 800424C0 0003F420 85 04 D9 10 */ lwzu r8, -0x26f0(r4) +/* 800424BC 0003F41C 3C 80 80 3F */ lis r4, mViewport__9CGraphics@ha +/* 800424C0 0003F420 85 04 D9 10 */ lwzu r8, mViewport__9CGraphics@l(r4) /* 800424C4 0003F424 98 01 00 20 */ stb r0, 0x20(r1) /* 800424C8 0003F428 6D 07 80 00 */ xoris r7, r8, 0x8000 -/* 800424CC 0003F42C 80 A4 00 08 */ lwz r5, lbl_803F0008@l(r4) +/* 800424CC 0003F42C 80 A4 00 08 */ lwz r5, 8(r4) /* 800424D0 0003F430 C0 03 00 04 */ lfs f0, 4(r3) /* 800424D4 0003F434 81 24 00 04 */ lwz r9, 4(r4) /* 800424D8 0003F438 7C A8 2A 14 */ add r5, r8, r5 @@ -10197,7 +10197,7 @@ lbl_800431B0: __ct__10CPlayerGunF9TUniqueId: /* 800431C8 00040128 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 800431CC 0004012C 7C 08 02 A6 */ mflr r0 -/* 800431D0 00040130 3C A0 80 5A */ lis r5, lbl_805A0004@ha +/* 800431D0 00040130 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 800431D4 00040134 3C C0 80 3E */ lis r6, lbl_803D9D50@ha /* 800431D8 00040138 90 01 00 A4 */ stw r0, 0xa4(r1) /* 800431DC 0004013C 39 00 00 00 */ li r8, 0 @@ -10209,9 +10209,9 @@ __ct__10CPlayerGunF9TUniqueId: /* 800431F4 00040154 7C 7F 1B 78 */ mr r31, r3 /* 800431F8 00040158 38 C0 00 04 */ li r6, 4 /* 800431FC 0004015C 39 40 00 00 */ li r10, 0 -/* 80043200 00040160 84 85 66 A0 */ lwzu r4, 0x66a0(r5) -/* 80043204 00040164 80 E5 00 04 */ lwz r7, lbl_805A0004@l(r5) -/* 80043208 00040168 80 05 00 08 */ lwz r0, 8(r5) +/* 80043200 00040160 84 85 66 A0 */ lwzu r4, sZeroVector__9CVector3f@l(r5) +/* 80043204 00040164 80 E5 00 04 */ lwz r7, 0x4(r5) +/* 80043208 00040168 80 05 00 08 */ lwz r0, 0x8(r5) /* 8004320C 0004016C 38 A1 00 58 */ addi r5, r1, 0x58 /* 80043210 00040170 90 81 00 58 */ stw r4, 0x58(r1) /* 80043214 00040174 38 80 00 08 */ li r4, 8 diff --git a/asm/MetroidPrime/RumbleFxTable.s b/asm/MetroidPrime/RumbleFxTable.s index 20970f77..3ae80239 100644 --- a/asm/MetroidPrime/RumbleFxTable.s +++ b/asm/MetroidPrime/RumbleFxTable.s @@ -797,7 +797,7 @@ lbl_805AD254: .global lbl_805AD258 lbl_805AD258: # ROM: 0x3F9AF8 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AD25C lbl_805AD25C: diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index 10498a56..e1f024b3 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -22265,17 +22265,17 @@ lbl_800D964C: .global ClassifyVector__FRC9CVector3f ClassifyVector__FRC9CVector3f: /* 800D9668 000D65C8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800D966C 000D65CC 3C 80 80 3D */ lis r4, lbl_803D0004@ha +/* 800D966C 000D65CC 3C 80 80 3D */ lis r4, lbl_803CE070@ha /* 800D9670 000D65D0 C0 43 00 08 */ lfs f2, 8(r3) /* 800D9674 000D65D4 39 01 00 14 */ addi r8, r1, 0x14 /* 800D9678 000D65D8 C0 23 00 04 */ lfs f1, 4(r3) /* 800D967C 000D65DC C0 03 00 00 */ lfs f0, 0(r3) /* 800D9680 000D65E0 FC 40 12 10 */ fabs f2, f2 /* 800D9684 000D65E4 FC 20 0A 10 */ fabs f1, f1 -/* 800D9688 000D65E8 84 E4 E0 70 */ lwzu r7, -0x1f90(r4) +/* 800D9688 000D65E8 84 E4 E0 70 */ lwzu r7, lbl_803CE070@l(r4) /* 800D968C 000D65EC FC 60 02 10 */ fabs f3, f0 /* 800D9690 000D65F0 FC 00 10 18 */ frsp f0, f2 -/* 800D9694 000D65F4 80 C4 00 04 */ lwz r6, lbl_803D0004@l(r4) +/* 800D9694 000D65F4 80 C4 00 04 */ lwz r6, 4(r4) /* 800D9698 000D65F8 FC 20 08 18 */ frsp f1, f1 /* 800D969C 000D65FC FC 40 18 18 */ frsp f2, f3 /* 800D96A0 000D6600 80 A4 00 08 */ lwz r5, 8(r4) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s index b98cab94..336c2fc4 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s @@ -10,12 +10,12 @@ lbl_ctor: .global lbl_803E71D0 lbl_803E71D0: # ROM: 0x3E41D0 - .4byte 0x803D293C - .4byte 0x803D2A44 - .4byte 0x803D2B4C - .4byte 0x803D2CAC - .4byte 0x803D2DB4 - .4byte 0x803D2EBC + .4byte lbl_803D293C + .4byte lbl_803D2A44 + .4byte lbl_803D2B4C + .4byte lbl_803D2CAC + .4byte lbl_803D2DB4 + .4byte lbl_803D2EBC .4byte 0 .global lbl_803E71EC @@ -7105,17 +7105,17 @@ lbl_805AD06C: .global lbl_805AD070 lbl_805AD070: # ROM: 0x3F9910 - .4byte 0x803D2FF0 + .4byte lbl_803D2FF0 .global lbl_805AD074 lbl_805AD074: # ROM: 0x3F9914 - .4byte 0x803D2FF8 + .4byte lbl_803D2FF8 .global lbl_805AD078 lbl_805AD078: # ROM: 0x3F9918 - .4byte 0x803D3003 + .4byte lbl_803D3003 .global lbl_805AD07C lbl_805AD07C: @@ -7130,7 +7130,7 @@ lbl_805AD080: .global lbl_805AD084 lbl_805AD084: # ROM: 0x3F9924 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AD088 lbl_805AD088: @@ -7281,6 +7281,11 @@ lbl_803D2908: .4byte 0x00000001 .4byte 0x00000001 .4byte 0x00000001 + +.global lbl_803D293C +lbl_803D293C: + + # ROM: 0x3CF93C .4byte 0x00000003 .4byte 0x00000001 .4byte 0x00000002 @@ -7347,6 +7352,11 @@ lbl_803D2908: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803D2A44 +lbl_803D2A44: + + # ROM: 0x3CFA44 .4byte 0x0000001E .4byte 0x00000004 .4byte 0x00000005 @@ -7413,6 +7423,11 @@ lbl_803D2908: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803D2B4C +lbl_803D2B4C: + + # ROM: 0x3CFB4C .4byte 0x00000005 .4byte 0x00000010 .4byte 0x00000001 @@ -7501,6 +7516,11 @@ lbl_803D2908: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803D2CAC +lbl_803D2CAC: + + # ROM: 0x3CFCAC .4byte 0x00000014 .4byte 0x00000010 .4byte 0x0000000F @@ -7567,6 +7587,11 @@ lbl_803D2908: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803D2DB4 +lbl_803D2DB4: + + # ROM: 0x3CFDB4 .4byte 0x0000000A .4byte 0x0000000E .4byte 0x00000004 @@ -7633,6 +7658,11 @@ lbl_803D2908: .4byte 0 .4byte 0 .4byte 0 + +.global lbl_803D2EBC +lbl_803D2EBC: + + # ROM: 0x3CFEBC .4byte 0x0000000A .4byte 0x0000000E .4byte 0x0000000D @@ -7713,9 +7743,20 @@ lbl_803D2908: .global lbl_803D2FF0 lbl_803D2FF0: + # ROM: 0x3CFFF0 .asciz "Gun_SDK" + +.global lbl_803D2FF8 +lbl_803D2FF8: + + # ROM: 0x3CFFF8 .asciz "Blast_LCTR" + +.global lbl_803D3003 +lbl_803D3003: + + # ROM: 0x3D0003 .byte 0x6C .asciz "ight_LCTR" .byte 0x6C, 0x6F diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s index 9b7cbb57..c74decf0 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s @@ -601,12 +601,22 @@ lbl_800E2EC0: .balign 8 .global lbl_803CE5C8 lbl_803CE5C8: + # ROM: 0x3CB5C8 .asciz "??(??)" .balign 4 + +.global lbl_803CE5D0 +lbl_803CE5D0: + + # ROM: 0x3CB5D0 .asciz "LCTR_GARMOUTH" + +.global lbl_803CE5DE +lbl_803CE5DE: + + # ROM: 0x3CB5DE .byte 0x54, 0x61 .asciz "rget_Tail" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/TGameTypes.s b/asm/MetroidPrime/TGameTypes.s index e62a9dfb..9f269e0a 100644 --- a/asm/MetroidPrime/TGameTypes.s +++ b/asm/MetroidPrime/TGameTypes.s @@ -44,7 +44,7 @@ __ct__9TEditorIdFR12CInputStream: __sinit_TGameTypes_cpp: /* 8011A498 001173F8 3C 60 00 01 */ lis r3, 1 /* 8011A49C 001173FC 38 80 FF FF */ li r4, -1 -/* 8011A4A0 00117400 38 03 FF FF */ subi r0, r3, 1 +/* 8011A4A0 00117400 38 03 FF FF */ addi r0, r3, -0x1 /* 8011A4A4 00117404 90 8D A3 88 */ stw r4, kInvalidEditorId@sda21(r13) /* 8011A4A8 00117408 B0 0D A3 8C */ sth r0, kInvalidUniqueId@sda21(r13) /* 8011A4AC 0011740C 90 8D A3 90 */ stw r4, kInvalidAreaId@sda21(r13) diff --git a/asm/MetroidPrime/UserNames.s b/asm/MetroidPrime/UserNames.s new file mode 100644 index 00000000..6e6a988d --- /dev/null +++ b/asm/MetroidPrime/UserNames.s @@ -0,0 +1,10 @@ +.include "macros.inc" + +.section .text, "ax" + +.global IsUser__Fi +IsUser__Fi: +/* 800B44F8 000B1458 20 03 00 01 */ subfic r0, r3, 1 +/* 800B44FC 000B145C 7C 00 00 34 */ cntlzw r0, r0 +/* 800B4500 000B1460 54 03 D9 7E */ srwi r3, r0, 5 +/* 800B4504 000B1464 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/CAuxWeapon.s b/asm/MetroidPrime/Weapons/CAuxWeapon.s index 791f1f92..f980a4f4 100644 --- a/asm/MetroidPrime/Weapons/CAuxWeapon.s +++ b/asm/MetroidPrime/Weapons/CAuxWeapon.s @@ -1435,20 +1435,36 @@ lbl_803D1658: .global lbl_803D1664 lbl_803D1664: # ROM: 0x3CE664 - .4byte 0x803D1678 - .4byte 0x803D1685 - .4byte 0x803D168E - .4byte 0x803D1699 - .4byte 0x803D1678 + .4byte lbl_803D1678 + .4byte lbl_803D1685 + .4byte lbl_803D168E + .4byte lbl_803D1699 + .4byte lbl_803D1678 .global lbl_803D1678 lbl_803D1678: + # ROM: 0x3CE678 .asciz "SuperMissile" + +.global lbl_803D1685 +lbl_803D1685: + + # ROM: 0x3CE685 .byte 0x49, 0x63, 0x65 .asciz "Combo" + +.global lbl_803D168E +lbl_803D168E: + + # ROM: 0x3CE68E .byte 0x57, 0x61 .asciz "veBuster" + +.global lbl_803D1699 +lbl_803D1699: + + # ROM: 0x3CE699 .byte 0x46, 0x6C, 0x61 .asciz "meThrower" .byte 0x3F, 0x3F diff --git a/asm/MetroidPrime/Weapons/CGunWeapon.s b/asm/MetroidPrime/Weapons/CGunWeapon.s index 60c58ebb..b82998fe 100644 --- a/asm/MetroidPrime/Weapons/CGunWeapon.s +++ b/asm/MetroidPrime/Weapons/CGunWeapon.s @@ -4010,12 +4010,12 @@ lbl_801BD440: .global lbl_805AC6E8 lbl_805AC6E8: # ROM: 0x3F8F88 - .4byte 0x803D19D1 + .4byte lbl_803D19D1 .global lbl_805AC6EC lbl_805AC6EC: # ROM: 0x3F8F8C - .4byte 0x803D19D7 + .4byte lbl_803D19D7 .global lbl_805AC6F0 lbl_805AC6F0: @@ -4060,69 +4060,69 @@ lbl_805AC710: .global lbl_803D1750 lbl_803D1750: # ROM: 0x3CE750 - .4byte 0x803D1828 - .4byte 0x803D1834 - .4byte 0x803D1840 - .4byte 0x803D184A - .4byte 0x803D1828 - .4byte 0x803D1854 - .4byte 0x803D185F - .4byte 0x803D186C - .4byte 0x803D1879 - .4byte 0x803D1886 + .4byte lbl_803D1828 + .4byte lbl_803D1834 + .4byte lbl_803D1840 + .4byte lbl_803D184A + .4byte lbl_803D1828 + .4byte lbl_803D1854 + .4byte lbl_803D185F + .4byte lbl_803D186C + .4byte lbl_803D1879 + .4byte lbl_803D1886 .global lbl_803D1778 lbl_803D1778: # ROM: 0x3CE778 - .4byte 0x803D1892 - .4byte 0x803D189E - .4byte 0x803D18A7 - .4byte 0x803D189E - .4byte 0x803D18B1 - .4byte 0x803D189E - .4byte 0x803D18BC - .4byte 0x803D189E - .4byte 0x803D18A7 - .4byte 0x803D189E + .4byte lbl_803D1892 + .4byte lbl_803D189E + .4byte lbl_803D18A7 + .4byte lbl_803D189E + .4byte lbl_803D18B1 + .4byte lbl_803D189E + .4byte lbl_803D18BC + .4byte lbl_803D189E + .4byte lbl_803D18A7 + .4byte lbl_803D189E .global lbl_803D17A0 lbl_803D17A0: # ROM: 0x3CE7A0 - .4byte 0x803D18C9 - .4byte 0x803D18D3 - .4byte 0x803D18DB - .4byte 0x803D18E4 - .4byte 0x803D18EF + .4byte lbl_803D18C9 + .4byte lbl_803D18D3 + .4byte lbl_803D18DB + .4byte lbl_803D18E4 + .4byte lbl_803D18EF .global lbl_803D17B4 lbl_803D17B4: # ROM: 0x3CE7B4 - .4byte 0x803D18FA - .4byte 0x803D190A - .4byte 0x803D1918 - .4byte 0x803D1927 - .4byte 0x803D1938 + .4byte lbl_803D18FA + .4byte lbl_803D190A + .4byte lbl_803D1918 + .4byte lbl_803D1927 + .4byte lbl_803D1938 .global lbl_803D17C8 lbl_803D17C8: # ROM: 0x3CE7C8 - .4byte 0x803D1949 - .4byte 0x803D1954 - .4byte 0x803D195D - .4byte 0x803D1967 - .4byte 0x803D1973 + .4byte lbl_803D1949 + .4byte lbl_803D1954 + .4byte lbl_803D195D + .4byte lbl_803D1967 + .4byte lbl_803D1973 .global lbl_803D17DC lbl_803D17DC: # ROM: 0x3CE7DC - .4byte 0x803D197F - .4byte 0x803D1988 - .4byte 0x803D1993 - .4byte 0x803D199C - .4byte 0x803D19A6 - .4byte 0x803D19B0 - .4byte 0x803D19BB - .4byte 0x803D19C6 + .4byte lbl_803D197F + .4byte lbl_803D1988 + .4byte lbl_803D1993 + .4byte lbl_803D199C + .4byte lbl_803D19A6 + .4byte lbl_803D19B0 + .4byte lbl_803D19BB + .4byte lbl_803D19C6 .global lbl_803D17FC lbl_803D17FC: @@ -4141,70 +4141,262 @@ lbl_803D17FC: .global lbl_803D1828 lbl_803D1828: + # ROM: 0x3CE828 .asciz "PowerMuzzle" + +.global lbl_803D1834 +lbl_803D1834: + + # ROM: 0x3CE834 .asciz "PowerCharge" + +.global lbl_803D1840 +lbl_803D1840: + + # ROM: 0x3CE840 .asciz "IceMuzzle" + +.global lbl_803D184A +lbl_803D184A: + + # ROM: 0x3CE84A .byte 0x49, 0x63 .asciz "eCharge" + +.global lbl_803D1854 +lbl_803D1854: + + # ROM: 0x3CE854 .asciz "WaveCharge" + +.global lbl_803D185F +lbl_803D185F: + + # ROM: 0x3CE85F .byte 0x50 .asciz "lasmaMuzzle" + +.global lbl_803D186C +lbl_803D186C: + + # ROM: 0x3CE86C .asciz "PlasmaCharge" + +.global lbl_803D1879 +lbl_803D1879: + + # ROM: 0x3CE879 .byte 0x50, 0x68, 0x61 .asciz "zonMuzzle" + +.global lbl_803D1886 +lbl_803D1886: + + # ROM: 0x3CE886 .byte 0x45, 0x6D .asciz "ptyMuzzle" + +.global lbl_803D1892 +lbl_803D1892: + + # ROM: 0x3CE892 .byte 0x70, 0x6F .asciz "werFrozen" + +.global lbl_803D189E +lbl_803D189E: + + # ROM: 0x3CE89E .byte 0x49, 0x63 .asciz "e2nd_2" + +.global lbl_803D18A7 +lbl_803D18A7: + + # ROM: 0x3CE8A7 .byte 0x69 .asciz "ceFrozen" + +.global lbl_803D18B1 +lbl_803D18B1: + + # ROM: 0x3CE8B1 .byte 0x77, 0x61, 0x76 .asciz "eFrozen" + +.global lbl_803D18BC +lbl_803D18BC: + + # ROM: 0x3CE8BC .asciz "plasmaFrozen" + +.global lbl_803D18C9 +lbl_803D18C9: + + # ROM: 0x3CE8C9 .byte 0x50, 0x6F, 0x77 .asciz "erXfer" + +.global lbl_803D18D3 +lbl_803D18D3: + + # ROM: 0x3CE8D3 .byte 0x49 .asciz "ceXfer" + +.global lbl_803D18DB +lbl_803D18DB: + + # ROM: 0x3CE8DB .byte 0x57 .asciz "aveXfer" + +.global lbl_803D18E4 +lbl_803D18E4: + + # ROM: 0x3CE8E4 .asciz "PlasmaXfer" + +.global lbl_803D18EF +lbl_803D18EF: + + # ROM: 0x3CE8EF .byte 0x50 .asciz "hazonXfer" + +.global lbl_803D18FA +lbl_803D18FA: + + # ROM: 0x3CE8FA .byte 0x50, 0x6F .asciz "wer_Anim_DGRP" + +.global lbl_803D190A +lbl_803D190A: + + # ROM: 0x3CE90A .byte 0x49, 0x63 .asciz "e_Anim_DGRP" + +.global lbl_803D1918 +lbl_803D1918: + + # ROM: 0x3CE918 .asciz "Wave_Anim_DGRP" + +.global lbl_803D1927 +lbl_803D1927: + + # ROM: 0x3CE927 .byte 0x50 .asciz "lasma_Anim_DGRP" + +.global lbl_803D1938 +lbl_803D1938: + + # ROM: 0x3CE938 .asciz "Phazon_Anim_DGRP" + +.global lbl_803D1949 +lbl_803D1949: + + # ROM: 0x3CE949 .byte 0x50, 0x6F, 0x77 .asciz "er_DGRP" + +.global lbl_803D1954 +lbl_803D1954: + + # ROM: 0x3CE954 .asciz "Ice_DGRP" + +.global lbl_803D195D +lbl_803D195D: + + # ROM: 0x3CE95D .byte 0x57, 0x61, 0x76 .asciz "e_DGRP" + +.global lbl_803D1967 +lbl_803D1967: + + # ROM: 0x3CE967 .byte 0x50 .asciz "lasma_DGRP" + +.global lbl_803D1973 +lbl_803D1973: + + # ROM: 0x3CE973 .byte 0x50 .asciz "hazon_DGRP" + +.global lbl_803D197F +lbl_803D197F: + + # ROM: 0x3CE97F .byte 0x50 .asciz "owerArm" + +.global lbl_803D1988 +lbl_803D1988: + + # ROM: 0x3CE988 .asciz "GravityArm" + +.global lbl_803D1993 +lbl_803D1993: + + # ROM: 0x3CE993 .byte 0x56 .asciz "ariaArm" + +.global lbl_803D199C +lbl_803D199C: + + # ROM: 0x3CE99C .asciz "PhazonArm" + +.global lbl_803D19A6 +lbl_803D19A6: + + # ROM: 0x3CE9A6 .byte 0x46, 0x75 .asciz "sionArm" + +.global lbl_803D19B0 +lbl_803D19B0: + + # ROM: 0x3CE9B0 .asciz "FusionArmG" + +.global lbl_803D19BB +lbl_803D19BB: + + # ROM: 0x3CE9BB .byte 0x46 .asciz "usionArmV" + +.global lbl_803D19C6 +lbl_803D19C6: + + # ROM: 0x3CE9C6 .byte 0x46, 0x75 .asciz "sionArmP" + +.global lbl_803D19D1 +lbl_803D19D1: + + # ROM: 0x3CE9D1 .byte 0x4C, 0x42, 0x45 - .4byte 0x414D0065 + .byte 0x41, 0x4D, 0x00 + +.global lbl_803D19D7 +lbl_803D19D7: + + # ROM: 0x3CE9D7 + .byte 0x65 .asciz "lbow" .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 diff --git a/asm/MetroidPrime/Weapons/CPhazonBeam.s b/asm/MetroidPrime/Weapons/CPhazonBeam.s index 451c0225..5e640d16 100644 --- a/asm/MetroidPrime/Weapons/CPhazonBeam.s +++ b/asm/MetroidPrime/Weapons/CPhazonBeam.s @@ -1180,17 +1180,17 @@ lbl_805AC118: .global lbl_805AC11C lbl_805AC11C: # ROM: 0x3F89BC - .4byte 0x803D08F8 + .4byte lbl_803D08F8 .global lbl_805AC120 lbl_805AC120: # ROM: 0x3F89C0 - .4byte 0x803D0904 + .4byte lbl_803D0904 .global lbl_805AC124 lbl_805AC124: # ROM: 0x3F89C4 - .4byte 0x803D0912 + .4byte lbl_803D0912 .global lbl_805AC128 lbl_805AC128: @@ -1245,7 +1245,7 @@ lbl_805AC14C: .global lbl_805AC150 lbl_805AC150: # ROM: 0x3F89F0 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AC154 lbl_805AC154: @@ -1303,9 +1303,20 @@ lbl_805AC178: .balign 8 .global lbl_803D08F8 lbl_803D08F8: + # ROM: 0x3CD8F8 .asciz "PhazonVeins" + +.global lbl_803D0904 +lbl_803D0904: + + # ROM: 0x3CD904 .asciz "PhazonVeins_2" + +.global lbl_803D0912 +lbl_803D0912: + + # ROM: 0x3CD912 .byte 0x70, 0x68 .asciz "azonScale_LCTR_SDK" .byte 0x3F diff --git a/asm/MetroidPrime/main.s b/asm/MetroidPrime/main.s index bf7c67eb..378ba2c7 100644 --- a/asm/MetroidPrime/main.s +++ b/asm/MetroidPrime/main.s @@ -4127,8 +4127,6 @@ AddPaksAndFactories__18CGameGlobalObjectsFv: /* 80006178 000030D8 38 84 BE 74 */ addi r4, r4, lbl_803CBE74@l /* 8000617C 000030DC 38 84 00 C3 */ addi r4, r4, 0xc3 /* 80006180 000030E0 4B FF EB 39 */ bl string_l__4rstlFPCc -.global lbl_80006184 -lbl_80006184: /* 80006184 000030E4 38 7F 00 04 */ addi r3, r31, 4 /* 80006188 000030E8 38 81 00 58 */ addi r4, r1, 0x58 /* 8000618C 000030EC 38 A0 00 00 */ li r5, 0 @@ -5024,10 +5022,10 @@ UpdateTicks__24CGameArchitectureSupportFv: /* 80006E30 00003D90 7C 85 20 10 */ subfc r4, r5, r4 /* 80006E34 00003D94 7C 60 19 10 */ subfe r3, r0, r3 /* 80006E38 00003D98 48 38 31 2D */ bl __cvt_sll_flt -/* 80006E3C 00003D9C 3C 60 80 5A */ lis r3, lbl_805A0004@ha -/* 80006E40 00003DA0 84 03 FD 30 */ lwzu r0, -0x2d0(r3) +/* 80006E3C 00003D9C 3C 60 80 5A */ lis r3, mData__10CStopwatch@ha +/* 80006E40 00003DA0 84 03 FD 30 */ lwzu r0, mData__10CStopwatch@l(r3) /* 80006E44 00003DA4 38 80 00 00 */ li r4, 0 -/* 80006E48 00003DA8 80 A3 00 04 */ lwz r5, lbl_805A0004@l(r3) +/* 80006E48 00003DA8 80 A3 00 04 */ lwz r5, 4(r3) /* 80006E4C 00003DAC 7C 00 22 78 */ xor r0, r0, r4 /* 80006E50 00003DB0 C0 03 00 10 */ lfs f0, 0x10(r3) /* 80006E54 00003DB4 7C A4 22 78 */ xor r4, r5, r4 @@ -6269,7 +6267,6 @@ lbl_80007FEC: lbl_80007FF8: /* 80007FF8 00004F58 38 7E 04 00 */ addi r3, r30, 0x400 /* 80007FFC 00004F5C 7C 83 20 50 */ subf r4, r3, r4 -.global lbl_80008000 lbl_80008000: /* 80008000 00004F60 48 37 6A B1 */ bl DCFlushRange /* 80008004 00004F64 3C 60 80 3D */ lis r3, lbl_803CBE74@ha diff --git a/asm/Runtime/ansi_fp.s b/asm/Runtime/ansi_fp.s index 0378c691..06b2fa38 100644 --- a/asm/Runtime/ansi_fp.s +++ b/asm/Runtime/ansi_fp.s @@ -31,7 +31,18 @@ lbl_803D85D8: .4byte 0x00313238 .4byte 0x00323536 .4byte 0 - .4byte 0x2E000043 + +.global lbl_803D86B8 +lbl_803D86B8: + + # ROM: 0x3D56B8 + .2byte 0x2E00 + +.global lbl_803D86BA +lbl_803D86BA: + + # ROM: 0x3D56BA + .byte 0x00, 0x43 .4byte 0 @@ -2106,14 +2117,12 @@ lbl_8038CE14: /* 8038CE14 00389D74 7C 83 23 78 */ mr r3, r4 /* 8038CE18 00389D78 4E 80 00 20 */ blr -.if 1 .global abs abs: /* 8038CE1C 00389D7C 7C 64 FE 70 */ srawi r4, r3, 0x1f /* 8038CE20 00389D80 7C 80 1A 78 */ xor r0, r4, r3 /* 8038CE24 00389D84 7C 64 00 50 */ subf r3, r4, r0 /* 8038CE28 00389D88 4E 80 00 20 */ blr -.endif .section .sdata2, "a" .balign 8 diff --git a/asm/Runtime/misc_io.s b/asm/Runtime/misc_io.s index 3883b162..002b8e30 100644 --- a/asm/Runtime/misc_io.s +++ b/asm/Runtime/misc_io.s @@ -2,7 +2,7 @@ .section .text, "ax" -/* THIS DOESN'T WORK???? */ +# THIS DOESN'T WORK???? # .global __stdio_atexit # __stdio_atexit: # /* 8038DCCC 0038AC2C 3C 60 80 39 */ lis r3, __close_all@ha diff --git a/asm/Runtime/printf.s b/asm/Runtime/printf.s index 52b48021..073686b7 100644 --- a/asm/Runtime/printf.s +++ b/asm/Runtime/printf.s @@ -38,7 +38,7 @@ lbl_803F2778: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80003648 ;# ptr + .4byte 0x80003648 .4byte 0x8039127C .4byte 0x80391274 .4byte 0 @@ -58,7 +58,7 @@ lbl_803F2778: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80003648 ;# ptr + .4byte 0x80003648 .4byte 0x8039127C .4byte 0x80391274 .4byte 0 @@ -78,7 +78,7 @@ lbl_803F2778: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80003648 ;# ptr + .4byte 0x80003648 .4byte 0x8039127C .4byte 0x80391274 .4byte 0 @@ -582,7 +582,6 @@ lbl_803F2F40: .section .text, "ax" -.if 1 /* TODO: Move __stdio_atexit to its own file (misc_io), * it's here to work around a bug with CW */ @@ -592,7 +591,6 @@ __stdio_atexit: /* 8038DCD0 0038AC30 38 03 B1 18 */ addi r0, r3, __close_all@l /* 8038DCD4 0038AC34 90 0D AE 00 */ stw r0, lbl_805A99C0@sda21(r13) /* 8038DCD8 0038AC38 4E 80 00 20 */ blr -.endif .global sprintf sprintf: diff --git a/asm/WorldFormat/CAreaOctTree.s b/asm/WorldFormat/CAreaOctTree.s index e224e2f0..fa64f531 100644 --- a/asm/WorldFormat/CAreaOctTree.s +++ b/asm/WorldFormat/CAreaOctTree.s @@ -551,8 +551,3 @@ lbl_803D6020: # ROM: 0x3D3020 .asciz "??(??)" .balign 4 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - diff --git a/asm/WorldFormat/CMetroidAreaCollider.s b/asm/WorldFormat/CMetroidAreaCollider.s index 842d3c6a..2ae33ff6 100644 --- a/asm/WorldFormat/CMetroidAreaCollider.s +++ b/asm/WorldFormat/CMetroidAreaCollider.s @@ -34,6 +34,16 @@ lbl_805A918C: lbl_805A9190: .skip 0x8 +.section .rodata +.balign 8 + +.global lbl_803D6028 +lbl_803D6028: + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .section .sbss2, "", @nobits .balign 8 # CMovingAABoxComponent @@ -58,7 +68,7 @@ __ct__Q220CMetroidAreaCollider22CMovingAABoxComponentsFRC6CAABoxRC9CVector3f: /* 802A30B8 002A0018 7C BE 2B 78 */ mr r30, r5 /* 802A30BC 002A001C 93 43 00 00 */ stw r26, 0(r3) /* 802A30C0 002A0020 7C 7C 1B 78 */ mr r28, r3 -/* 802A30C4 002A0024 3C 60 80 3D */ lis r3, lbl_803D0004@ha +/* 802A30C4 002A0024 3C 60 80 3D */ lis r3, lbl_803D6028@ha /* 802A30C8 002A0028 7C 9D 23 78 */ mr r29, r4 /* 802A30CC 002A002C 93 5C 06 C4 */ stw r26, 0x6c4(r28) /* 802A30D0 002A0030 7F DB F3 78 */ mr r27, r30 @@ -77,9 +87,9 @@ __ct__Q220CMetroidAreaCollider22CMovingAABoxComponentsFRC6CAABoxRC9CVector3f: /* 802A3104 002A0064 D0 1C 06 F8 */ stfs f0, 0x6f8(r28) /* 802A3108 002A0068 C0 04 00 14 */ lfs f0, 0x14(r4) /* 802A310C 002A006C D0 1C 06 FC */ stfs f0, 0x6fc(r28) -/* 802A3110 002A0070 84 C3 60 28 */ lwzu r6, 0x6028(r3) +/* 802A3110 002A0070 84 C3 60 28 */ lwzu r6, lbl_803D6028@l(r3) /* 802A3114 002A0074 80 02 D7 6C */ lwz r0, lbl_805AF48C@sda21(r2) -/* 802A3118 002A0078 80 A3 00 04 */ lwz r5, lbl_803D0004@l(r3) +/* 802A3118 002A0078 80 A3 00 04 */ lwz r5, 4(r3) /* 802A311C 002A007C 80 83 00 08 */ lwz r4, 8(r3) /* 802A3120 002A0080 80 62 D7 68 */ lwz r3, lbl_805AF488@sda21(r2) /* 802A3124 002A0084 90 C1 00 40 */ stw r6, 0x40(r1) diff --git a/asm/musyx/creverb.s b/asm/musyx/creverb.s index 332bcd23..773ea87b 100644 --- a/asm/musyx/creverb.s +++ b/asm/musyx/creverb.s @@ -62,7 +62,7 @@ lbl_805AF3E0: .global lbl_805AF3E4 lbl_805AF3E4: # ROM: 0x3FBC84 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AF3E8 lbl_805AF3E8: diff --git a/asm/musyx/dsp_import.s b/asm/musyx/dsp_import.s new file mode 100644 index 00000000..52e4ad34 --- /dev/null +++ b/asm/musyx/dsp_import.s @@ -0,0 +1,1672 @@ +.include "macros.inc" + +.section .data, "wa" + +.global dspSlave +dspSlave: + # ROM: 0x3F1A80 + .4byte 0 + .4byte 0x029F0C10 + .4byte 0x029F0C1F + .4byte 0x029F0C3B + .4byte 0x029F0C4A + .4byte 0x029F0C50 + .4byte 0x029F0C82 + .4byte 0x029F0C88 + .4byte 0x13021303 + .4byte 0x12041305 + .4byte 0x13068E00 + .4byte 0x8C008B00 + .4byte 0x009200FF + .4byte 0x81008900 + .4byte 0x009E0E80 + .4byte 0x00FE0E1B + .4byte 0x810000FE + .4byte 0x0E3116FC + .4byte 0xDCD116FD + .4byte 0x000016FB + .4byte 0x000126FC + .4byte 0x02A08000 + .4byte 0x029C0029 + .4byte 0x029F0045 + .4byte 0x13021303 + .4byte 0x12041305 + .4byte 0x13068E00 + .4byte 0x8C008B00 + .4byte 0x009200FF + .4byte 0x16FCDCD1 + .4byte 0x16FD0001 + .4byte 0x16FB0001 + .4byte 0x26FC02A0 + .4byte 0x8000029C + .4byte 0x00408E00 + .4byte 0x81008900 + .4byte 0x009FBABE + .4byte 0x26FE02C0 + .4byte 0x8000029C + .4byte 0x004A8200 + .4byte 0x0294004A + .4byte 0x23FF8100 + .4byte 0x26FE02C0 + .4byte 0x8000029C + .4byte 0x005427FF + .4byte 0x02407FFF + .4byte 0x2ECE2FCF + .4byte 0x16CD0C00 + .4byte 0x81002EC9 + .4byte 0x1FFB2FCB + .4byte 0x02BF055C + .4byte 0x00800C00 + .4byte 0x8E008100 + .4byte 0x8970B100 + .4byte 0x0291007E + .4byte 0x0A12C100 + .4byte 0x0292007E + .4byte 0x009F0AFF + .4byte 0x4C001C7E + .4byte 0x02131C7E + .4byte 0x176F16FC + .4byte 0xFBAD16FD + .4byte 0x80800021 + .4byte 0x16FCBAAD + .4byte 0x2EFD0021 + .4byte 0x81008970 + .4byte 0x8E782ECE + .4byte 0x2FCF009E + .4byte 0x0E442ECD + .4byte 0x0E002EC9 + .4byte 0x009E0040 + .4byte 0x2ECB0081 + .4byte 0x0E440082 + .4byte 0x0000009B + .4byte 0x009F009A + .4byte 0x01408100 + .4byte 0x89008F00 + .4byte 0x02BF055C + .4byte 0x193E193C + .4byte 0xB100193F + .4byte 0x029400A6 + .4byte 0x005A1B5E + .4byte 0x029F00AE + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x00AD4C00 + .4byte 0x1B5E1B5C + .4byte 0x193E193C + .4byte 0xB100193F + .4byte 0x029400B8 + .4byte 0x005A1B5E + .4byte 0x029F00C0 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x00BF4C00 + .4byte 0x1B5E1B5C + .4byte 0x193E193C + .4byte 0xB100193F + .4byte 0x029400CA + .4byte 0x005A1B5E + .4byte 0x029F00D2 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x00D14C00 + .4byte 0x1B5E1B5C + .4byte 0x00820400 + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x00DD005A + .4byte 0x1B5E029F + .4byte 0x00E59900 + .4byte 0x1B5E1B5C + .4byte 0x007B00E4 + .4byte 0x4C001B5E + .4byte 0x1B5C193E + .4byte 0x193CB179 + .4byte 0x029400EE + .4byte 0x005A1B5E + .4byte 0x029F00F6 + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x00F54C00 + .4byte 0x1B5E1B5C + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x00FF005A + .4byte 0x1B5E029F + .4byte 0x01079900 + .4byte 0x1B5E1B5C + .4byte 0x007B0106 + .4byte 0x4C001B5E + .4byte 0x1B5C0082 + .4byte 0x07C0193E + .4byte 0x193CB179 + .4byte 0x02940112 + .4byte 0x005A1B5E + .4byte 0x029F011A + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x01194C00 + .4byte 0x1B5E1B5C + .4byte 0x193E193C + .4byte 0xB1790294 + .4byte 0x0123005A + .4byte 0x1B5E029F + .4byte 0x012B9900 + .4byte 0x1B5E1B5C + .4byte 0x007B012A + .4byte 0x4C001B5E + .4byte 0x1B5C193E + .4byte 0x193CB179 + .4byte 0x02940134 + .4byte 0x005A1B5E + .4byte 0x029F013C + .4byte 0x99001B5E + .4byte 0x1B5C007B + .4byte 0x013B4C00 + .4byte 0x1B5E1B5C + .4byte 0x029F0068 + .4byte 0x0085FFFF + .4byte 0x81508940 + .4byte 0x8E4800FA + .4byte 0x0E1700F8 + .4byte 0x0E180081 + .4byte 0x000002BF + .4byte 0x04F100DA + .4byte 0x0E1700D8 + .4byte 0x0E188948 + .4byte 0x00810400 + .4byte 0x02BF04F1 + .4byte 0x00DA0E17 + .4byte 0x00D80E18 + .4byte 0x89480081 + .4byte 0x07C002BF + .4byte 0x04F1029F + .4byte 0x00680086 + .4byte 0x07C002BF + .4byte 0x0484029F + .4byte 0x00688100 + .4byte 0x8E00191E + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x000016C9 + .4byte 0x000116CB + .4byte 0x078002BF + .4byte 0x055C029F + .4byte 0x00688100 + .4byte 0x89708E60 + .4byte 0x2ECE2CCF + .4byte 0x16CD0E44 + .4byte 0x16C90000 + .4byte 0x89000D20 + .4byte 0x2DCB4C00 + .4byte 0x1C800080 + .4byte 0x02800081 + .4byte 0x00000082 + .4byte 0x01400083 + .4byte 0x0E440A00 + .4byte 0x27C903A0 + .4byte 0x0004029C + .4byte 0x018C2ECE + .4byte 0x2CCF16CD + .4byte 0x0E5416C9 + .4byte 0x000016CB + .4byte 0x0260009F + .4byte 0x00A08F00 + .4byte 0x007F01A5 + .4byte 0x197E1B1A + .4byte 0x197C1B1A + .4byte 0x1B5E7C22 + .4byte 0x1B3E1B3C + .4byte 0x1C04029F + .4byte 0x00688E70 + .4byte 0x8960191F + .4byte 0x2ECE2CCF + .4byte 0x16CD0C00 + .4byte 0x16C90000 + .4byte 0x05030340 + .4byte 0xFFF02FCB + .4byte 0x02BF055C + .4byte 0x00800C00 + .4byte 0x029F0068 + .4byte 0x81008970 + .4byte 0x8E782ECE + .4byte 0x2FCF16CD + .4byte 0x0B8016C9 + .4byte 0x000016CB + .4byte 0x00C00082 + .4byte 0x0E08009F + .4byte 0x00001B5F + .4byte 0x009F0140 + .4byte 0x1B5F009F + .4byte 0x02801B5F + .4byte 0x009F0400 + .4byte 0x1B5F009F + .4byte 0x05401B5F + .4byte 0x009F0680 + .4byte 0x1B5F009F + .4byte 0x07C01B5F + .4byte 0x009F0900 + .4byte 0x1B5F009F + .4byte 0x0A401B5F + .4byte 0x02BF055C + .4byte 0x00DE0BA7 + .4byte 0x00DF0BA8 + .4byte 0x2ECE2FCF + .4byte 0x16CD03C0 + .4byte 0x16C90000 + .4byte 0x16CB0080 + .4byte 0x81008900 + .4byte 0x00DE0B84 + .4byte 0x009F0B31 + .4byte 0x4C001C7E + .4byte 0x021300FE + .4byte 0x0E1500DE + .4byte 0x0B85009F + .4byte 0x0B344C00 + .4byte 0x1C7E0213 + .4byte 0x00FE0E16 + .4byte 0x00DE0B86 + .4byte 0x009F0B11 + .4byte 0x4C001C7E + .4byte 0x021300FE + .4byte 0x0E148100 + .4byte 0x00DE0B9B + .4byte 0xB1000295 + .4byte 0x023A8900 + .4byte 0x00DF0B9E + .4byte 0x03000CC0 + .4byte 0x00FF0E40 + .4byte 0x00DF0B9F + .4byte 0x03000CC0 + .4byte 0x00FF0E41 + .4byte 0x009F0CE0 + .4byte 0x00FF0E42 + .4byte 0x00FF0E43 + .4byte 0x02BF055C + .4byte 0x00DE0B9C + .4byte 0x2ECE00DE + .4byte 0x0B9D2ECF + .4byte 0x16CD0CC0 + .4byte 0x16C90000 + .4byte 0x16CB0040 + .4byte 0x02BF055C + .4byte 0x029F0068 + .4byte 0x009F0CE0 + .4byte 0x00FF0E42 + .4byte 0x00FF0E40 + .4byte 0x00FF0E41 + .4byte 0x00FF0E43 + .4byte 0x02BF055C + .4byte 0x029F0068 + .4byte 0x8E0000E0 + .4byte 0x0E070080 + .4byte 0x0BA20081 + .4byte 0x03C00E05 + .4byte 0x00FE0E04 + .4byte 0x89008150 + .4byte 0x009F0B80 + .4byte 0x007A025B + .4byte 0x193E4C49 + .4byte 0x1C5E1A59 + .4byte 0x00830E05 + .4byte 0x1B611B60 + .4byte 0x00DE0B87 + .4byte 0x06010295 + .4byte 0x0267029F + .4byte 0x033200DE + .4byte 0x0E4200FE + .4byte 0x0E1C00C3 + .4byte 0x0E15177F + .4byte 0x8E008A00 + .4byte 0x81008900 + .4byte 0x00DE0BB3 + .4byte 0x00DF0BB2 + .4byte 0x1F1F4D00 + .4byte 0x14818D1E + .4byte 0x1FD80098 + .4byte 0x80000080 + .4byte 0x0E44A830 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC38AD30 + .4byte 0xAC3800FE + .4byte 0x0BB28F00 + .4byte 0x00800E44 + .4byte 0x00C10E43 + .4byte 0x1C61193A + .4byte 0x19189059 + .4byte 0x19199E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E51 + .4byte 0x80809759 + .4byte 0x80919E00 + .4byte 0x6F331B7F + .4byte 0x00C30E14 + .4byte 0x8F008D00 + .4byte 0x8A00177F + .4byte 0x810000DE + .4byte 0x0B9BB100 + .4byte 0x0295032A + .4byte 0x00DE0E42 + .4byte 0x00FE0E43 + .4byte 0x81008900 + .4byte 0x00DE0B9E + .4byte 0x00DF0BA0 + .4byte 0x82000293 + .4byte 0x03067800 + .4byte 0x029F0309 + .4byte 0x02950309 + .4byte 0x740000FE + .4byte 0x0B9E00DF + .4byte 0x0E4305E0 + .4byte 0x4C0000FE + .4byte 0x0E408100 + .4byte 0x890000DE + .4byte 0x0B9F00DF + .4byte 0x0BA18200 + .4byte 0x0293031D + .4byte 0x7800029F + .4byte 0x03200295 + .4byte 0x03207400 + .4byte 0x00FE0B9F + .4byte 0x00DF0E43 + .4byte 0x05E04C00 + .4byte 0x00FE0E41 + .4byte 0x029F0332 + .4byte 0x00DE0E42 + .4byte 0x00FE0E40 + .4byte 0x00FE0E41 + .4byte 0x00FE0E43 + .4byte 0x81008E00 + .4byte 0x84008900 + .4byte 0x1EFE0E40 + .4byte 0x1EBE0083 + .4byte 0x0E081C03 + .4byte 0x1FF5191A + .4byte 0xF858FBA0 + .4byte 0xF8B1FBA0 + .4byte 0xF8B1FBA0 + .4byte 0xF8B1FBA0 + .4byte 0xF83B1B7E + .4byte 0x00830E04 + .4byte 0x81008973 + .4byte 0x19611960 + .4byte 0x780000FE + .4byte 0x0E040294 + .4byte 0x02538E00 + .4byte 0x810000DE + .4byte 0x0B9BB100 + .4byte 0x0295036A + .4byte 0x00DE0B9C + .4byte 0x00DC0B9D + .4byte 0x2ECE2CCF + .4byte 0x810000DE + .4byte 0x0E1C2ECD + .4byte 0x16C90001 + .4byte 0x16CB0040 + .4byte 0x02BF055C + .4byte 0x81008900 + .4byte 0x00DE0B82 + .4byte 0x00DF0B83 + .4byte 0x2ECE2FCF + .4byte 0x16CD0B80 + .4byte 0x16C90001 + .4byte 0x16CB00C0 + .4byte 0x02BF055C + .4byte 0x810000DE + .4byte 0x0B8000DC + .4byte 0x0B81B100 + .4byte 0x02940386 + .4byte 0x00C00E07 + .4byte 0x029F0068 + .4byte 0x2ECE2CCF + .4byte 0x16CD0B80 + .4byte 0x16C90000 + .4byte 0x16CB00C0 + .4byte 0x00820E08 + .4byte 0x009F0000 + .4byte 0x1B5F009F + .4byte 0x01401B5F + .4byte 0x009F0280 + .4byte 0x1B5F009F + .4byte 0x04001B5F + .4byte 0x009F0540 + .4byte 0x1B5F009F + .4byte 0x06801B5F + .4byte 0x009F07C0 + .4byte 0x1B5F009F + .4byte 0x09001B5F + .4byte 0x009F0A40 + .4byte 0x1B5F02BF + .4byte 0x055C00DE + .4byte 0x0BA700DF + .4byte 0x0BA82ECE + .4byte 0x2FCF16CD + .4byte 0x03C016C9 + .4byte 0x000016CB + .4byte 0x00808100 + .4byte 0x890000DE + .4byte 0x0B84009F + .4byte 0x0B314C00 + .4byte 0x1C7E0213 + .4byte 0x00FE0E15 + .4byte 0x00DE0B85 + .4byte 0x009F0B34 + .4byte 0x4C001C7E + .4byte 0x021300FE + .4byte 0x0E1600DE + .4byte 0x0B86009F + .4byte 0x0B114C00 + .4byte 0x1C7E0213 + .4byte 0x00FE0E14 + .4byte 0x810000DE + .4byte 0x0B9BB100 + .4byte 0x02950403 + .4byte 0x890000DF + .4byte 0x0B9E0300 + .4byte 0x0CC000FF + .4byte 0x0E4000DF + .4byte 0x0B9F0300 + .4byte 0x0CC000FF + .4byte 0x0E41009F + .4byte 0x0CE000FF + .4byte 0x0E4200FF + .4byte 0x0E4302BF + .4byte 0x055C00DE + .4byte 0x0B9C2ECE + .4byte 0x00DE0B9D + .4byte 0x2ECF16CD + .4byte 0x0CC016C9 + .4byte 0x000016CB + .4byte 0x004002BF + .4byte 0x055C00C0 + .4byte 0x0E07029F + .4byte 0x0248009F + .4byte 0x0CE000FF + .4byte 0x0E4200FF + .4byte 0x0E4000FF + .4byte 0x0E4100FF + .4byte 0x0E4302BF + .4byte 0x055C00C0 + .4byte 0x0E07029F + .4byte 0x02488E00 + .4byte 0x00860400 + .4byte 0x81008970 + .4byte 0x191C2ECE + .4byte 0x2CCF1FC6 + .4byte 0x2ECD16C9 + .4byte 0x000116CB + .4byte 0x078002BF + .4byte 0x055C02BF + .4byte 0x0484029F + .4byte 0x00688E00 + .4byte 0x008607C0 + .4byte 0x81008970 + .4byte 0x191C2ECE + .4byte 0x2CCF1FC6 + .4byte 0x2ECD16C9 + .4byte 0x000116CB + .4byte 0x078002BF + .4byte 0x055C02BF + .4byte 0x0484029F + .4byte 0x00688C00 + .4byte 0x8A008100 + .4byte 0x8970191F + .4byte 0x2ECE2FCF + .4byte 0x16CD0280 + .4byte 0x16C90001 + .4byte 0x16CB0280 + .4byte 0x8F508140 + .4byte 0x00810400 + .4byte 0x00830000 + .4byte 0x00820140 + .4byte 0x00990080 + .4byte 0x02BF055C + .4byte 0x1105046C + .4byte 0x1F611120 + .4byte 0x045E8972 + .4byte 0x195CF07B + .4byte 0x197DF131 + .4byte 0x81398900 + .4byte 0x68002ECE + .4byte 0x2CCF1FFB + .4byte 0x2FCD0F01 + .4byte 0x2FC91FF9 + .4byte 0x2FCB7200 + .4byte 0x1F5E1F1C + .4byte 0x810026C9 + .4byte 0x02A00004 + .4byte 0x029C046D + .4byte 0x029F0068 + .4byte 0x029F0068 + .4byte 0x029F0068 + .4byte 0x029F0068 + .4byte 0x16FCDCD1 + .4byte 0x16FD0002 + .4byte 0x16FB0001 + .4byte 0x029F0C91 + .4byte 0x029F0045 + .4byte 0x8E00191F + .4byte 0x191D1F5F + .4byte 0x1F1D2FCE + .4byte 0x2DCF8900 + .4byte 0x1FA62DCD + .4byte 0x0E002EC9 + .4byte 0x8100009C + .4byte 0x00C02CCB + .4byte 0x1CA00081 + .4byte 0x0E444800 + .4byte 0x1B3E1B3C + .4byte 0x0B000099 + .4byte 0x00604B00 + .4byte 0x1B3D0081 + .4byte 0x0E441C06 + .4byte 0x00830000 + .4byte 0x1C4327C9 + .4byte 0x03A00004 + .4byte 0x029C04A5 + .4byte 0x110904DA + .4byte 0x8E00193A + .4byte 0x19386900 + .4byte 0x2FCE2DCF + .4byte 0x8900193D + .4byte 0x2DCD16C9 + .4byte 0x00008100 + .4byte 0x009C00C0 + .4byte 0x2CCB0081 + .4byte 0x0E444800 + .4byte 0x1B3E1B3C + .4byte 0x0B000960 + .4byte 0x4B001B3D + .4byte 0x00810E44 + .4byte 0x8F0080F0 + .4byte 0x80C06A00 + .4byte 0x48001117 + .4byte 0x04D480F0 + .4byte 0x80C06B32 + .4byte 0x492280F0 + .4byte 0x80C06A3A + .4byte 0x482A80F0 + .4byte 0x80C06B32 + .4byte 0x49221B5F + .4byte 0x1B5D80F0 + .4byte 0x80C06A00 + .4byte 0x48001117 + .4byte 0x04E880F0 + .4byte 0x80C06B32 + .4byte 0x492280F0 + .4byte 0x80C06A3A + .4byte 0x482A80F0 + .4byte 0x80C06B32 + .4byte 0x49221B5F + .4byte 0x1B5D1C05 + .4byte 0x02DF8E00 + .4byte 0x009B0E44 + .4byte 0x009D00C0 + .4byte 0x02BF0541 + .4byte 0x490000FF + .4byte 0x0E1D00FD + .4byte 0x0E1E8900 + .4byte 0x02BF055C + .4byte 0x1104052C + .4byte 0x00DA0E1D + .4byte 0x00D80E1E + .4byte 0x009B0EA4 + .4byte 0x009D00C0 + .4byte 0x02BF0541 + .4byte 0x490000FF + .4byte 0x0E1D00FD + .4byte 0x0E1E0083 + .4byte 0x0E4402BF + .4byte 0x054C8900 + .4byte 0x00DA0E1D + .4byte 0x00D80E1E + .4byte 0x009B0E44 + .4byte 0x009D00C0 + .4byte 0x02BF0541 + .4byte 0x490000FF + .4byte 0x0E1D00FD + .4byte 0x0E1E0083 + .4byte 0x0EA402BF + .4byte 0x054C0000 + .4byte 0x00008E00 + .4byte 0x890000DA + .4byte 0x0E1D00D8 + .4byte 0x0E1E009B + .4byte 0x0EA4009D + .4byte 0x00C002BF + .4byte 0x05414900 + .4byte 0x00830E44 + .4byte 0x02BF054C + .4byte 0x00830EA4 + .4byte 0x02BF054C + .4byte 0x02DF8E00 + .4byte 0x00FAFFCE + .4byte 0x00F8FFCF + .4byte 0x00FBFFCD + .4byte 0x16C90000 + .4byte 0x2DCB02DF + .4byte 0x8F008D00 + .4byte 0x8A00197A + .4byte 0x1978A000 + .4byte 0xB6001130 + .4byte 0x055A9179 + .4byte 0x4E6D197A + .4byte 0x4D43A039 + .4byte 0xB62902DF + .4byte 0x26C902A0 + .4byte 0x0004029C + .4byte 0x055C02DF + .4byte 0x26FE02C0 + .4byte 0x8000029C + .4byte 0x056202DF + .4byte 0x26FC02A0 + .4byte 0x8000029C + .4byte 0x056802DF + .4byte 0x26FC02A0 + .4byte 0x8000029C + .4byte 0x056E02DF + .4byte 0x81008970 + .4byte 0x8E602ECE + .4byte 0x2CCF16CD + .4byte 0x0E4416C9 + .4byte 0x00008900 + .4byte 0x0D202DCB + .4byte 0x4C001C80 + .4byte 0x00800280 + .4byte 0x00810000 + .4byte 0x00820140 + .4byte 0x00830E44 + .4byte 0x0A0027C9 + .4byte 0x03A00004 + .4byte 0x029C058B + .4byte 0x2ECE2CCF + .4byte 0x16CD0E54 + .4byte 0x16C90000 + .4byte 0x16CB0260 + .4byte 0x009F00A0 + .4byte 0x8F00007F + .4byte 0x05A4197E + .4byte 0x1B1A197C + .4byte 0x1B1A1B5E + .4byte 0x1B5C1B3E + .4byte 0x1B3C1C04 + .4byte 0x029F0068 + .4byte 0x00820BB8 + .4byte 0x195E2ED1 + .4byte 0x195E2ED4 + .4byte 0x195E2ED5 + .4byte 0x195E2ED6 + .4byte 0x195E2ED7 + .4byte 0x195E2ED8 + .4byte 0x195E2ED9 + .4byte 0x195E2EA0 + .4byte 0x195E2EA1 + .4byte 0x195E2EA2 + .4byte 0x195E2EA3 + .4byte 0x195E2EA4 + .4byte 0x195E2EA5 + .4byte 0x195E2EA6 + .4byte 0x195E2EA7 + .4byte 0x195E2EA8 + .4byte 0x195E2EA9 + .4byte 0x195E2EAA + .4byte 0x195E2EAB + .4byte 0x195E2EAC + .4byte 0x195E2EAD + .4byte 0x195E2EAE + .4byte 0x195E2EAF + .4byte 0x195E2EDE + .4byte 0x195E2EDA + .4byte 0x195E2EDB + .4byte 0x195E2EDC + .4byte 0x8C008A00 + .4byte 0x8E0000D8 + .4byte 0x0E16195B + .4byte 0x19598100 + .4byte 0x195C0080 + .4byte 0x0E44195F + .4byte 0x1B1F195F + .4byte 0x1B1F195F + .4byte 0x1B1F185F + .4byte 0x1B1F6B00 + .4byte 0x15054D00 + .4byte 0x157E1C9F + .4byte 0x1CBD05E0 + .4byte 0x99007D00 + .4byte 0x1CDD8900 + .4byte 0x1FA51502 + .4byte 0x1CBF009A + .4byte 0x01FC009E + .4byte 0x0E440081 + .4byte 0xFFDD0083 + .4byte 0x0D800064 + .4byte 0x061A1827 + .4byte 0x1B074A00 + .4byte 0x1FFC1827 + .4byte 0x1B071579 + .4byte 0x35001827 + .4byte 0x1B074100 + .4byte 0x1B7E1827 + .4byte 0x1B071B7F + .4byte 0x00000065 + .4byte 0x06201827 + .4byte 0x1B070000 + .4byte 0x00000007 + .4byte 0x187F0066 + .4byte 0x06294A3B + .4byte 0x1FFC1579 + .4byte 0x35334100 + .4byte 0x1B7F0004 + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x1ADC0082 + .4byte 0x0BD227DC + .4byte 0x1ADF27DB + .4byte 0x1ADF27DA + .4byte 0x1ADF0082 + .4byte 0x0BBE27D9 + .4byte 0x1ADF27D8 + .4byte 0x1ADF8F00 + .4byte 0x00C10E42 + .4byte 0x00820D80 + .4byte 0x19401943 + .4byte 0x80F0B8C0 + .4byte 0x111F0654 + .4byte 0xA6F0BCF0 + .4byte 0x19401943 + .4byte 0xBCF04EC0 + .4byte 0xB831A6F0 + .4byte 0xBCF0BC00 + .4byte 0x4E001B3E + .4byte 0x00E10E42 + .4byte 0x02DF0082 + .4byte 0x0BB8195E + .4byte 0x2ED1195E + .4byte 0x2ED4195E + .4byte 0x2ED5195E + .4byte 0x2ED6195E + .4byte 0x2ED7195E + .4byte 0x2ED8195E + .4byte 0x2ED9195E + .4byte 0x2EA0195E + .4byte 0x2EA1195E + .4byte 0x2EA2195E + .4byte 0x2EA3195E + .4byte 0x2EA4195E + .4byte 0x2EA5195E + .4byte 0x2EA6195E + .4byte 0x2EA7195E + .4byte 0x2EA8195E + .4byte 0x2EA9195E + .4byte 0x2EAA195E + .4byte 0x2EAB195E + .4byte 0x2EAC195E + .4byte 0x2EAD195E + .4byte 0x2EAE195E + .4byte 0x2EAF195E + .4byte 0x2EDE195E + .4byte 0x2EDA195E + .4byte 0x2EDB195E + .4byte 0x2EDC8C00 + .4byte 0x8A008E00 + .4byte 0x195B1959 + .4byte 0x8100195C + .4byte 0x00800E44 + .4byte 0x195F195F + .4byte 0x195F1B1F + .4byte 0x185F1B1F + .4byte 0x6B001505 + .4byte 0x4D00157E + .4byte 0x1C9F1CBD + .4byte 0x05E09900 + .4byte 0x7D001CDD + .4byte 0x89001FA5 + .4byte 0x15021CBF + .4byte 0x009A01FC + .4byte 0x009E0E45 + .4byte 0x0081FFDD + .4byte 0x00830D80 + .4byte 0x006406CB + .4byte 0x18271B07 + .4byte 0x4A001B7E + .4byte 0x18271B07 + .4byte 0x1B7C0000 + .4byte 0x18271B07 + .4byte 0 + .4byte 0x18271B07 + .4byte 0 + .4byte 0x006506D1 + .4byte 0x18271B07 + .4byte 0 + .4byte 0x006606D6 + .4byte 0x4A001B7E + .4byte 0x1B7C0004 + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x1ADC0082 + .4byte 0x0BD227DC + .4byte 0x1ADF27DB + .4byte 0x1ADF27DA + .4byte 0x1ADF0082 + .4byte 0x0BBE27D9 + .4byte 0x1ADF27D8 + .4byte 0x1ADF8D00 + .4byte 0x8B008F00 + .4byte 0x00C10E42 + .4byte 0x00820D80 + .4byte 0x81001120 + .4byte 0x07038900 + .4byte 0x1940189E + .4byte 0x181B199A + .4byte 0x54001F5E + .4byte 0x1959B000 + .4byte 0xFB008139 + .4byte 0x00E10E42 + .4byte 0x02DF0082 + .4byte 0x0BB8195E + .4byte 0x2ED1195E + .4byte 0x2ED4195E + .4byte 0x2ED5195E + .4byte 0x2ED6195E + .4byte 0x2ED7195E + .4byte 0x2ED8195E + .4byte 0x2ED9195E + .4byte 0x2EA0195E + .4byte 0x2EA1195E + .4byte 0x2EA2195E + .4byte 0x2EA3195E + .4byte 0x2EA4195E + .4byte 0x2EA5195E + .4byte 0x2EA6195E + .4byte 0x2EA7195E + .4byte 0x2EA8195E + .4byte 0x2EA9195E + .4byte 0x2EAA195E + .4byte 0x2EAB195E + .4byte 0x2EAC195E + .4byte 0x2EAD195E + .4byte 0x2EAE195E + .4byte 0x2EAF195E + .4byte 0x2EDE195E + .4byte 0x2EDA195E + .4byte 0x2EDB195E + .4byte 0x2EDC00C0 + .4byte 0x0E420081 + .4byte 0xFFDD1120 + .4byte 0x07481824 + .4byte 0x1B040000 + .4byte 0x000000E0 + .4byte 0x0E420082 + .4byte 0x0BD90004 + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x189F1ADF + .4byte 0x89001ADC + .4byte 0x27DC00FF + .4byte 0x0BD227DB + .4byte 0x00FF0BD1 + .4byte 0x27DA00FF + .4byte 0x0BD027D9 + .4byte 0x00FF0BBE + .4byte 0x27D800FF + .4byte 0x0BBD02DF + .4byte 0x00C00E40 + .4byte 0x00810B89 + .4byte 0x00C20E08 + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x80E700F8 + .4byte 0x0BA900FB + .4byte 0x0BAC02DF + .4byte 0x00C00E40 + .4byte 0x00810B89 + .4byte 0x00C20E08 + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x80E700F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E400081 + .4byte 0x0B8D00C2 + .4byte 0x0E0B1C62 + .4byte 0x00C40E41 + .4byte 0x00C50E0C + .4byte 0x02BF80E7 + .4byte 0x00F80BAA + .4byte 0x00FB0BAD + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E081C62 + .4byte 0x00C40E41 + .4byte 0x00C50E09 + .4byte 0x02BF80E7 + .4byte 0x00F80BA9 + .4byte 0x00FB0BAC + .4byte 0x00C00E40 + .4byte 0x00810B91 + .4byte 0x00C20E0E + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0F02BF + .4byte 0x80E700F8 + .4byte 0x0BAB00FB + .4byte 0x0BAE02DF + .4byte 0x00C00E40 + .4byte 0x00810B89 + .4byte 0x00C20E08 + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x80E700F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E400081 + .4byte 0x0B8D00C2 + .4byte 0x0E0B1C62 + .4byte 0x00C40E41 + .4byte 0x00C50E0C + .4byte 0x02BF80E7 + .4byte 0x00F80BAA + .4byte 0x00FB0BAD + .4byte 0x00C00E40 + .4byte 0x00810B91 + .4byte 0x00C20E0E + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0F02BF + .4byte 0x80E700F8 + .4byte 0x0BAB00FB + .4byte 0x0BAE02DF + .4byte 0x00C00E40 + .4byte 0x00810B89 + .4byte 0x00C20E08 + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x80E700F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E430081 + .4byte 0x0B9700C2 + .4byte 0x0E0A1C62 + .4byte 0x02BF81F9 + .4byte 0x00F80BAF + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E081C62 + .4byte 0x00C40E41 + .4byte 0x00C50E09 + .4byte 0x02BF80E7 + .4byte 0x00F80BA9 + .4byte 0x00FB0BAC + .4byte 0x00C00E40 + .4byte 0x00810B8D + .4byte 0x00C20E0B + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0C02BF + .4byte 0x80E700F8 + .4byte 0x0BAA00FB + .4byte 0x0BAD00C0 + .4byte 0x0E430081 + .4byte 0x0B9700C2 + .4byte 0x0E0A1C62 + .4byte 0x1C8000C5 + .4byte 0x0E0D02BF + .4byte 0x80E700F8 + .4byte 0x0BAF00FB + .4byte 0x0BB002DF + .4byte 0x00C00E40 + .4byte 0x00810B89 + .4byte 0x00C20E08 + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x80E700F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E400081 + .4byte 0x0B9100C2 + .4byte 0x0E0E1C62 + .4byte 0x00C40E41 + .4byte 0x00C50E0F + .4byte 0x02BF80E7 + .4byte 0x00F80BAB + .4byte 0x00FB0BAE + .4byte 0x00C00E43 + .4byte 0x00810B95 + .4byte 0x00C20E10 + .4byte 0x1C621C80 + .4byte 0x00C50E0A + .4byte 0x02BF80E7 + .4byte 0x00F80BB1 + .4byte 0x00FB0BAF + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E081C62 + .4byte 0x00C40E41 + .4byte 0x00C50E09 + .4byte 0x02BF80E7 + .4byte 0x00F80BA9 + .4byte 0x00FB0BAC + .4byte 0x00C00E40 + .4byte 0x00810B8D + .4byte 0x00C20E0B + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0C02BF + .4byte 0x80E700F8 + .4byte 0x0BAA00FB + .4byte 0x0BAD00C0 + .4byte 0x0E400081 + .4byte 0x0B9100C2 + .4byte 0x0E0E1C62 + .4byte 0x00C40E41 + .4byte 0x00C50E0F + .4byte 0x02BF80E7 + .4byte 0x00F80BAB + .4byte 0x00FB0BAE + .4byte 0x00C00E43 + .4byte 0x00810B97 + .4byte 0x00C20E0A + .4byte 0x1C621C80 + .4byte 0x00C50E0D + .4byte 0x02BF80E7 + .4byte 0x00F80BAF + .4byte 0x00FB0BB0 + .4byte 0x00C00E43 + .4byte 0x00810B95 + .4byte 0x00C20E10 + .4byte 0x1C6202BF + .4byte 0x81F900F8 + .4byte 0x0BB102DF + .4byte 0x00C00E40 + .4byte 0x00810B89 + .4byte 0x00C20E08 + .4byte 0x00830E44 + .4byte 0x00C40E41 + .4byte 0x00C50E09 + .4byte 0x02BF8282 + .4byte 0x00F80BA9 + .4byte 0x00FB0BAC + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E080083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x828200F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E400081 + .4byte 0x0B8D00C2 + .4byte 0x0E0B0083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0C02BF + .4byte 0x828200F8 + .4byte 0x0BAA00FB + .4byte 0x0BAD02DF + .4byte 0x00C00E40 + .4byte 0x00810B89 + .4byte 0x00C20E08 + .4byte 0x00830E44 + .4byte 0x00C40E41 + .4byte 0x00C50E09 + .4byte 0x02BF8282 + .4byte 0x00F80BA9 + .4byte 0x00FB0BAC + .4byte 0x00C00E40 + .4byte 0x00810B91 + .4byte 0x00C20E0E + .4byte 0x00830E44 + .4byte 0x00C40E41 + .4byte 0x00C50E0F + .4byte 0x02BF8282 + .4byte 0x00F80BAB + .4byte 0x00FB0BAE + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E080083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x828200F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E400081 + .4byte 0x0B8D00C2 + .4byte 0x0E0B0083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0C02BF + .4byte 0x828200F8 + .4byte 0x0BAA00FB + .4byte 0x0BAD00C0 + .4byte 0x0E400081 + .4byte 0x0B9100C2 + .4byte 0x0E0E0083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0F02BF + .4byte 0x828200F8 + .4byte 0x0BAB00FB + .4byte 0x0BAE02DF + .4byte 0x00C00E40 + .4byte 0x00810B89 + .4byte 0x00C20E08 + .4byte 0x00830E44 + .4byte 0x00C40E41 + .4byte 0x00C50E09 + .4byte 0x02BF8282 + .4byte 0x00F80BA9 + .4byte 0x00FB0BAC + .4byte 0x00C00E43 + .4byte 0x00810B97 + .4byte 0x00C20E0A + .4byte 0x00830E44 + .4byte 0x02BF845D + .4byte 0x00F80BAF + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E080083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x828200F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E400081 + .4byte 0x0B8D00C2 + .4byte 0x0E0B0083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0C02BF + .4byte 0x828200F8 + .4byte 0x0BAA00FB + .4byte 0x0BAD00C0 + .4byte 0x0E430081 + .4byte 0x0B9700C2 + .4byte 0x0E0A0083 + .4byte 0x0E441C80 + .4byte 0x00C50E0D + .4byte 0x02BF8282 + .4byte 0x00F80BAF + .4byte 0x00FB0BB0 + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E080083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x828200F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E400081 + .4byte 0x0B9100C2 + .4byte 0x0E0E0083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0F02BF + .4byte 0x828200F8 + .4byte 0x0BAB00FB + .4byte 0x0BAE00C0 + .4byte 0x0E430081 + .4byte 0x0B9500C2 + .4byte 0x0E100083 + .4byte 0x0E441C80 + .4byte 0x00C50E0A + .4byte 0x02BF8282 + .4byte 0x00F80BB1 + .4byte 0x00FB0BAF + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E080083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x828200F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E400081 + .4byte 0x0B8D00C2 + .4byte 0x0E0B0083 + .4byte 0x0E4400C0 + .4byte 0x0E4100C5 + .4byte 0x0E0C02BF + .4byte 0x828200F8 + .4byte 0x0BAA00FB + .4byte 0x0BAD00C0 + .4byte 0x0E400081 + .4byte 0x0B9100C2 + .4byte 0x0E0E0083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0F02BF + .4byte 0x828200F8 + .4byte 0x0BAB00FB + .4byte 0x0BAE00C0 + .4byte 0x0E430081 + .4byte 0x0B9700C2 + .4byte 0x0E0A0083 + .4byte 0x0E441C80 + .4byte 0x00C50E0D + .4byte 0x02BF8282 + .4byte 0x00F80BAF + .4byte 0x00FB0BB0 + .4byte 0x00C00E43 + .4byte 0x00810B95 + .4byte 0x00C20E10 + .4byte 0x00830E44 + .4byte 0x02BF845D + .4byte 0x00F80BB1 + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E081C62 + .4byte 0x00C40E41 + .4byte 0x00C50E09 + .4byte 0x02BF80E7 + .4byte 0x00F80BA9 + .4byte 0x00FB0BAC + .4byte 0x00C00E43 + .4byte 0x00810B91 + .4byte 0x00C20E0E + .4byte 0x1C621C80 + .4byte 0x00C50E0F + .4byte 0x02BF80E7 + .4byte 0x00F80BAB + .4byte 0x00FB0BAE + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E081C62 + .4byte 0x00C40E41 + .4byte 0x00C50E09 + .4byte 0x02BF80E7 + .4byte 0x00F80BA9 + .4byte 0x00FB0BAC + .4byte 0x00C00E43 + .4byte 0x00810B91 + .4byte 0x00C20E0E + .4byte 0x1C621C80 + .4byte 0x00C50E0F + .4byte 0x02BF80E7 + .4byte 0x00F80BAB + .4byte 0x00FB0BAE + .4byte 0x00C00E40 + .4byte 0x00810B8D + .4byte 0x00C20E0B + .4byte 0x1C6200C4 + .4byte 0x0E4100C5 + .4byte 0x0E0C02BF + .4byte 0x80E700F8 + .4byte 0x0BAA00FB + .4byte 0x0BAD00C0 + .4byte 0x0E430081 + .4byte 0x0B9900C2 + .4byte 0x0E0D1C62 + .4byte 0x02BF81F9 + .4byte 0x00F80BB0 + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E080083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x828200F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E430081 + .4byte 0x0B9100C2 + .4byte 0x0E0E0083 + .4byte 0x0E441C80 + .4byte 0x00C50E0F + .4byte 0x02BF8282 + .4byte 0x00F80BAB + .4byte 0x00FB0BAE + .4byte 0x02DF00C0 + .4byte 0x0E400081 + .4byte 0x0B8900C2 + .4byte 0x0E080083 + .4byte 0x0E4400C4 + .4byte 0x0E4100C5 + .4byte 0x0E0902BF + .4byte 0x828200F8 + .4byte 0x0BA900FB + .4byte 0x0BAC00C0 + .4byte 0x0E430081 + .4byte 0x0B9100C2 + .4byte 0x0E0E0083 + .4byte 0x0E441C80 + .4byte 0x00C50E0F + .4byte 0x02BF8282 + .4byte 0x00F80BAB + .4byte 0x00FB0BAE + .4byte 0x00C00E40 + .4byte 0x00810B8D + .4byte 0x00C20E0B + .4byte 0x00830E44 + .4byte 0x00C40E41 + .4byte 0x00C50E0C + .4byte 0x02BF8282 + .4byte 0x00F80BAA + .4byte 0x00FB0BAD + .4byte 0x00C00E43 + .4byte 0x00810B99 + .4byte 0x00C20E0D + .4byte 0x00830E44 + .4byte 0x02BF845D + .4byte 0x00F80BB0 + .4byte 0x02DF0082 + .4byte 0x013E01BC + .4byte 0x02480413 + .4byte 0x04270165 + .4byte 0x05740B37 + .4byte 0x015F0478 + .4byte 0x04740476 + .4byte 0x01A9043B + .4byte 0x047A0BB1 + .4byte 0x01750768 + .4byte 0x077A079D + .4byte 0x07C007F4 + .4byte 0x08110844 + .4byte 0x087708C6 + .4byte 0x08D908FE + .4byte 0x0923095A + .4byte 0x097909AF + .4byte 0x09E50A39 + .4byte 0x0A5B0768 + .4byte 0x07680768 + .4byte 0x07680768 + .4byte 0x07680A99 + .4byte 0x0ABD0768 + .4byte 0x07680768 + .4byte 0x07680768 + .4byte 0x076805A8 + .4byte 0x065D0707 + .4byte 0x10001200 + .4byte 0x14008E00 + .4byte 0x81008970 + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x0E8016C9 + .4byte 0x000016CB + .4byte 0x01001F7E + .4byte 0x1F3C8100 + .4byte 0x26C902A0 + .4byte 0x0004029C + .4byte 0x0B46191E + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x028016C9 + .4byte 0x000016CB + .4byte 0x02801C80 + .4byte 0x00800280 + .4byte 0x00C10E1B + .4byte 0x00850000 + .4byte 0x0089007F + .4byte 0x00820F00 + .4byte 0x008316B4 + .4byte 0x1CE38100 + .4byte 0x26C902A0 + .4byte 0x0004029C + .4byte 0x0B648F00 + .4byte 0x8A788C68 + .4byte 0xF1001A3F + .4byte 0x84E3107E + .4byte 0xF2E3F2E7 + .4byte 0xF2786E68 + .4byte 0xF1321A3F + .4byte 0x119E0B80 + .4byte 0x1C6784E3 + .4byte 0x107EF2E3 + .4byte 0xF2E7F278 + .4byte 0x6E68F132 + .4byte 0x1A3F1C67 + .4byte 0x84E3107E + .4byte 0xF2E3F2E7 + .4byte 0xF2006E00 + .4byte 0x1B5E00E1 + .4byte 0x0E1B0080 + .4byte 0x02800083 + .4byte 0x0F000081 + .4byte 0x00000082 + .4byte 0x01400089 + .4byte 0xFFFF8900 + .4byte 0x81008F00 + .4byte 0x11A00BA0 + .4byte 0x197F9930 + .4byte 0x1B1E1B3F + .4byte 0x7D291B5F + .4byte 0x1B5D8E00 + .4byte 0x1FDB1F99 + .4byte 0x2ECE2CCF + .4byte 0x16CD0E80 + .4byte 0x16C90001 + .4byte 0x16CB0100 + .4byte 0x02BF055C + .4byte 0x1C04029F + .4byte 0x00688E00 + .4byte 0x81008970 + .4byte 0x191C2ECE + .4byte 0x2CCF16CD + .4byte 0x07C016C9 + .4byte 0x000116CB + .4byte 0x050002BF + .4byte 0x055C8100 + .4byte 0x8970191C + .4byte 0x2ECE2CCF + .4byte 0x16CD07C0 + .4byte 0x16C90000 + .4byte 0x89000D20 + .4byte 0x2DCB4C00 + .4byte 0x1C800080 + .4byte 0x07C00083 + .4byte 0x00001C43 + .4byte 0x0A0027C9 + .4byte 0x03A00004 + .4byte 0x029C0BD3 + .4byte 0x2ECE2CCF + .4byte 0x16CD07D0 + .4byte 0x16C90000 + .4byte 0x16CB04E0 + .4byte 0x8F0080F0 + .4byte 0x80C06A00 + .4byte 0x4800114F + .4byte 0x0BEE80F0 + .4byte 0x80C06B32 + .4byte 0x492280F0 + .4byte 0x80C06A3A + .4byte 0x482A80F0 + .4byte 0x80C06B32 + .4byte 0x49221B5F + .4byte 0x1B5D80F0 + .4byte 0x80C06800 + .4byte 0x7C004A00 + .4byte 0x114F0C05 + .4byte 0x80F080C0 + .4byte 0x69327D00 + .4byte 0x4B2280F0 + .4byte 0x80C0683A + .4byte 0x7C004A2A + .4byte 0x80F080C0 + .4byte 0x69327D00 + .4byte 0x4B221B5F + .4byte 0x1B5D1C04 + .4byte 0x029F0068 + .4byte 0x8E0016FC + .4byte 0xECC01FCC + .4byte 0x1D9E2EFD + .4byte 0x26FC02A0 + .4byte 0x8000029C + .4byte 0x0C160000 + .4byte 0 + .4byte 0x02FF8E00 + .4byte 0x00F00E17 + .4byte 0x00FE0E18 + .4byte 0x00FC0E19 + .4byte 0x1FCC1D9E + .4byte 0x16FCFEED + .4byte 0x2EFD26FC + .4byte 0x02A08000 + .4byte 0x029C0C2B + .4byte 0x00D00E17 + .4byte 0x00DE0E18 + .4byte 0x00DC0E19 + .4byte 0 + .4byte 0 + .4byte 0x02FF8E00 + .4byte 0x1DBC1DBE + .4byte 0x810000DE + .4byte 0x0BB70601 + .4byte 0x02950C47 + .4byte 0x0E0000FE + .4byte 0x0B871FCD + .4byte 0x1F8D02FF + .4byte 0 + .4byte 0 + .4byte 0x000002FF + .4byte 0x8E001DBC + .4byte 0x1DBE8100 + .4byte 0x00DE0BB7 + .4byte 0x06010295 + .4byte 0x0C5F0E00 + .4byte 0x00FE0B87 + .4byte 0x1FCD1F8D + .4byte 0x02FF8100 + .4byte 0x00DE0B88 + .4byte 0x06010295 + .4byte 0x0C7100DE + .4byte 0x0BDA2EDA + .4byte 0x00DE0BDB + .4byte 0x2EDB00DE + .4byte 0x0BDC2EDC + .4byte 0x1FCD1F8D + .4byte 0x02FF00DE + .4byte 0x0BDA2EDA + .4byte 0x26DB2EDB + .4byte 0x26DC2EDC + .4byte 0x810000DC + .4byte 0x0BDD7600 + .4byte 0x00FC0BDD + .4byte 0x81001FCD + .4byte 0x1F8D02FF + .4byte 0 + .4byte 0 + .4byte 0x000002FF + .4byte 0 + .4byte 0 + .4byte 0x02FF0C9F + .4byte 0x0CA20CDA + .4byte 0x0CDD8E00 + .4byte 0x81008900 + .4byte 0x02BF0CE0 + .4byte 0x27FF009E + .4byte 0x0C8D4C00 + .4byte 0x1C7E0313 + .4byte 0x1C7F176F + .4byte 0x0021029F + .4byte 0x00300021 + .4byte 0x81008900 + .4byte 0x02BF0CE0 + .4byte 0x24FF02BF + .4byte 0x0CE625FF + .4byte 0x02BF0CE6 + .4byte 0x27FF2ECE + .4byte 0x2CCF16C9 + .4byte 0x00012FCD + .4byte 0x2DCB8100 + .4byte 0x890002BF + .4byte 0x0CE024FF + .4byte 0x1C9E1CBC + .4byte 0x02BF0CE6 + .4byte 0x25FF02BF + .4byte 0x0CE627FF + .4byte 0x1CDF1CFD + .4byte 0x810002BF + .4byte 0x0CE026FF + .4byte 0x1C1E8900 + .4byte 0x02BF0CE6 + .4byte 0x20FF1F5F + .4byte 0x02BF0CE0 + .4byte 0x21FF02BF + .4byte 0x0CE023FF + .4byte 0x26C902A0 + .4byte 0x0004029C + .4byte 0x0CD2029F + .4byte 0x80B50021 + .4byte 0x029F8000 + .4byte 0x0021029F + .4byte 0x00450021 + .4byte 0x26FE02C0 + .4byte 0x8000029C + .4byte 0x0CE002DF + .4byte 0x27FE03C0 + .4byte 0x8000029C + .4byte 0x0CE602DF + .4byte 0 + .4byte 0 + + +.section .sdata + +.global dspSlaveLength +dspSlaveLength: + # ROM: 0x3F6588 + .4byte 0x19E00000 + .4byte 0 diff --git a/asm/musyx/hw_memory.s b/asm/musyx/hw_memory.s new file mode 100644 index 00000000..895f0b73 --- /dev/null +++ b/asm/musyx/hw_memory.s @@ -0,0 +1,30 @@ +.include "macros.inc" + +.section .text, "ax" + +.global salMalloc +salMalloc: +/* 803B5134 003B2094 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 803B5138 003B2098 7C 08 02 A6 */ mflr r0 +/* 803B513C 003B209C 90 01 00 14 */ stw r0, 0x14(r1) +/* 803B5140 003B20A0 81 8D AF 84 */ lwz r12, salHooks@sda21(r13) +/* 803B5144 003B20A4 7D 89 03 A6 */ mtctr r12 +/* 803B5148 003B20A8 4E 80 04 21 */ bctrl +/* 803B514C 003B20AC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 803B5150 003B20B0 7C 08 03 A6 */ mtlr r0 +/* 803B5154 003B20B4 38 21 00 10 */ addi r1, r1, 0x10 +/* 803B5158 003B20B8 4E 80 00 20 */ blr + +.global salFree +salFree: +/* 803B515C 003B20BC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 803B5160 003B20C0 7C 08 02 A6 */ mflr r0 +/* 803B5164 003B20C4 38 8D AF 84 */ addi r4, r13, salHooks@sda21 +/* 803B5168 003B20C8 90 01 00 14 */ stw r0, 0x14(r1) +/* 803B516C 003B20CC 81 84 00 04 */ lwz r12, 4(r4) +/* 803B5170 003B20D0 7D 89 03 A6 */ mtctr r12 +/* 803B5174 003B20D4 4E 80 04 21 */ bctrl +/* 803B5178 003B20D8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 803B517C 003B20DC 7C 08 03 A6 */ mtlr r0 +/* 803B5180 003B20E0 38 21 00 10 */ addi r1, r1, 0x10 +/* 803B5184 003B20E4 4E 80 00 20 */ blr diff --git a/asm/musyx/reverb.s b/asm/musyx/reverb.s index f652c977..bea231bb 100644 --- a/asm/musyx/reverb.s +++ b/asm/musyx/reverb.s @@ -61,7 +61,7 @@ lbl_805AF420: .global lbl_805AF428 lbl_805AF428: # ROM: 0x3FBCC8 - .4byte 0x3F19999A + .float 0.6 .global lbl_805AF42C lbl_805AF42C: diff --git a/asm/musyx/reverb_fx.s b/asm/musyx/reverb_fx.s new file mode 100644 index 00000000..c7b74edc --- /dev/null +++ b/asm/musyx/reverb_fx.s @@ -0,0 +1,62 @@ +.include "macros.inc" + +.section .text, "ax" + +.global sndAuxCallbackReverbHI +sndAuxCallbackReverbHI: +/* 803B5B00 003B2A60 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 803B5B04 003B2A64 7C 08 02 A6 */ mflr r0 +/* 803B5B08 003B2A68 7C 87 23 78 */ mr r7, r4 +/* 803B5B0C 003B2A6C 90 01 00 14 */ stw r0, 0x14(r1) +/* 803B5B10 003B2A70 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 803B5B14 003B2A74 2C 00 00 01 */ cmpwi r0, 1 +/* 803B5B18 003B2A78 41 82 00 34 */ beq lbl_803B5B4C +/* 803B5B1C 003B2A7C 40 80 00 30 */ bge lbl_803B5B4C +/* 803B5B20 003B2A80 2C 00 00 00 */ cmpwi r0, 0 +/* 803B5B24 003B2A84 40 80 00 08 */ bge lbl_803B5B2C +/* 803B5B28 003B2A88 48 00 00 24 */ b lbl_803B5B4C +lbl_803B5B2C: +/* 803B5B2C 003B2A8C 88 05 01 C4 */ lbz r0, 0x1c4(r5) +/* 803B5B30 003B2A90 28 00 00 00 */ cmplwi r0, 0 +/* 803B5B34 003B2A94 40 82 00 18 */ bne lbl_803B5B4C +/* 803B5B38 003B2A98 80 67 00 00 */ lwz r3, 0(r7) +/* 803B5B3C 003B2A9C 7C A6 2B 78 */ mr r6, r5 +/* 803B5B40 003B2AA0 80 87 00 04 */ lwz r4, 4(r7) +/* 803B5B44 003B2AA4 80 A7 00 08 */ lwz r5, 8(r7) +/* 803B5B48 003B2AA8 48 00 0C 21 */ bl ReverbHICallback +lbl_803B5B4C: +/* 803B5B4C 003B2AAC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 803B5B50 003B2AB0 7C 08 03 A6 */ mtlr r0 +/* 803B5B54 003B2AB4 38 21 00 10 */ addi r1, r1, 0x10 +/* 803B5B58 003B2AB8 4E 80 00 20 */ blr + +.global sndAuxCallbackPrepareReverbHI +sndAuxCallbackPrepareReverbHI: +/* 803B5B5C 003B2ABC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 803B5B60 003B2AC0 7C 08 02 A6 */ mflr r0 +/* 803B5B64 003B2AC4 90 01 00 14 */ stw r0, 0x14(r1) +/* 803B5B68 003B2AC8 38 00 00 00 */ li r0, 0 +/* 803B5B6C 003B2ACC 98 03 01 C4 */ stb r0, 0x1c4(r3) +/* 803B5B70 003B2AD0 C0 23 01 C8 */ lfs f1, 0x1c8(r3) +/* 803B5B74 003B2AD4 C0 43 01 D0 */ lfs f2, 0x1d0(r3) +/* 803B5B78 003B2AD8 C0 63 01 CC */ lfs f3, 0x1cc(r3) +/* 803B5B7C 003B2ADC C0 83 01 D4 */ lfs f4, 0x1d4(r3) +/* 803B5B80 003B2AE0 C0 A3 01 D8 */ lfs f5, 0x1d8(r3) +/* 803B5B84 003B2AE4 C0 C3 01 DC */ lfs f6, 0x1dc(r3) +/* 803B5B88 003B2AE8 48 00 00 39 */ bl ReverbHICreate +/* 803B5B8C 003B2AEC 80 01 00 14 */ lwz r0, 0x14(r1) +/* 803B5B90 003B2AF0 7C 08 03 A6 */ mtlr r0 +/* 803B5B94 003B2AF4 38 21 00 10 */ addi r1, r1, 0x10 +/* 803B5B98 003B2AF8 4E 80 00 20 */ blr + +.global sndAuxCallbackShutdownReverbHI +sndAuxCallbackShutdownReverbHI: +/* 803B5B9C 003B2AFC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 803B5BA0 003B2B00 7C 08 02 A6 */ mflr r0 +/* 803B5BA4 003B2B04 90 01 00 14 */ stw r0, 0x14(r1) +/* 803B5BA8 003B2B08 48 00 0C A1 */ bl ReverbHIFree +/* 803B5BAC 003B2B0C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 803B5BB0 003B2B10 38 60 00 01 */ li r3, 1 +/* 803B5BB4 003B2B14 7C 08 03 A6 */ mtlr r0 +/* 803B5BB8 003B2B18 38 21 00 10 */ addi r1, r1, 0x10 +/* 803B5BBC 003B2B1C 4E 80 00 20 */ blr diff --git a/asm/musyx/seq_api.s b/asm/musyx/seq_api.s new file mode 100644 index 00000000..e9b9a85e --- /dev/null +++ b/asm/musyx/seq_api.s @@ -0,0 +1,122 @@ +.include "macros.inc" + +.section .text, "ax" + +.global sndSeqStop +sndSeqStop: +/* 8039BFFC 00398F5C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8039C000 00398F60 7C 08 02 A6 */ mflr r0 +/* 8039C004 00398F64 90 01 00 14 */ stw r0, 0x14(r1) +/* 8039C008 00398F68 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8039C00C 00398F6C 7C 7F 1B 78 */ mr r31, r3 +/* 8039C010 00398F70 48 01 90 AD */ bl hwDisableIrq +/* 8039C014 00398F74 7F E3 FB 78 */ mr r3, r31 +/* 8039C018 00398F78 4B FF 9B 25 */ bl seqStop +/* 8039C01C 00398F7C 48 01 90 69 */ bl hwEnableIrq +/* 8039C020 00398F80 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8039C024 00398F84 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8039C028 00398F88 7C 08 03 A6 */ mtlr r0 +/* 8039C02C 00398F8C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8039C030 00398F90 4E 80 00 20 */ blr + +.global sndSeqSpeed +sndSeqSpeed: +/* 8039C034 00398F94 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8039C038 00398F98 7C 08 02 A6 */ mflr r0 +/* 8039C03C 00398F9C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8039C040 00398FA0 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8039C044 00398FA4 7C 9F 23 78 */ mr r31, r4 +/* 8039C048 00398FA8 93 C1 00 08 */ stw r30, 8(r1) +/* 8039C04C 00398FAC 7C 7E 1B 78 */ mr r30, r3 +/* 8039C050 00398FB0 48 01 90 6D */ bl hwDisableIrq +/* 8039C054 00398FB4 7F C3 F3 78 */ mr r3, r30 +/* 8039C058 00398FB8 7F E4 FB 78 */ mr r4, r31 +/* 8039C05C 00398FBC 4B FF 9E 21 */ bl seqSpeed +/* 8039C060 00398FC0 48 01 90 25 */ bl hwEnableIrq +/* 8039C064 00398FC4 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8039C068 00398FC8 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8039C06C 00398FCC 83 C1 00 08 */ lwz r30, 8(r1) +/* 8039C070 00398FD0 7C 08 03 A6 */ mtlr r0 +/* 8039C074 00398FD4 38 21 00 10 */ addi r1, r1, 0x10 +/* 8039C078 00398FD8 4E 80 00 20 */ blr + +.global sndSeqContinue +sndSeqContinue: +/* 8039C07C 00398FDC 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8039C080 00398FE0 7C 08 02 A6 */ mflr r0 +/* 8039C084 00398FE4 90 01 00 14 */ stw r0, 0x14(r1) +/* 8039C088 00398FE8 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8039C08C 00398FEC 7C 7F 1B 78 */ mr r31, r3 +/* 8039C090 00398FF0 48 01 90 2D */ bl hwDisableIrq +/* 8039C094 00398FF4 7F E3 FB 78 */ mr r3, r31 +/* 8039C098 00398FF8 4B FF 9E C9 */ bl seqContinue +/* 8039C09C 00398FFC 48 01 8F E9 */ bl hwEnableIrq +/* 8039C0A0 00399000 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8039C0A4 00399004 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8039C0A8 00399008 7C 08 03 A6 */ mtlr r0 +/* 8039C0AC 0039900C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8039C0B0 00399010 4E 80 00 20 */ blr + +.global sndSeqMute +sndSeqMute: +/* 8039C0B4 00399014 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8039C0B8 00399018 7C 08 02 A6 */ mflr r0 +/* 8039C0BC 0039901C 90 01 00 24 */ stw r0, 0x24(r1) +/* 8039C0C0 00399020 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8039C0C4 00399024 7C BF 2B 78 */ mr r31, r5 +/* 8039C0C8 00399028 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8039C0CC 0039902C 7C 9E 23 78 */ mr r30, r4 +/* 8039C0D0 00399030 93 A1 00 14 */ stw r29, 0x14(r1) +/* 8039C0D4 00399034 7C 7D 1B 78 */ mr r29, r3 +/* 8039C0D8 00399038 48 01 8F E5 */ bl hwDisableIrq +/* 8039C0DC 0039903C 7F A3 EB 78 */ mr r3, r29 +/* 8039C0E0 00399040 7F C4 F3 78 */ mr r4, r30 +/* 8039C0E4 00399044 7F E5 FB 78 */ mr r5, r31 +/* 8039C0E8 00399048 4B FF 9F 81 */ bl seqMute +/* 8039C0EC 0039904C 48 01 8F 99 */ bl hwEnableIrq +/* 8039C0F0 00399050 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8039C0F4 00399054 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8039C0F8 00399058 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8039C0FC 0039905C 83 A1 00 14 */ lwz r29, 0x14(r1) +/* 8039C100 00399060 7C 08 03 A6 */ mtlr r0 +/* 8039C104 00399064 38 21 00 20 */ addi r1, r1, 0x20 +/* 8039C108 00399068 4E 80 00 20 */ blr + +.global sndSeqVolume +sndSeqVolume: +/* 8039C10C 0039906C 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8039C110 00399070 7C 08 02 A6 */ mflr r0 +/* 8039C114 00399074 90 01 00 24 */ stw r0, 0x24(r1) +/* 8039C118 00399078 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8039C11C 0039907C 7C DF 33 78 */ mr r31, r6 +/* 8039C120 00399080 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8039C124 00399084 7C BE 2B 78 */ mr r30, r5 +/* 8039C128 00399088 93 A1 00 14 */ stw r29, 0x14(r1) +/* 8039C12C 0039908C 7C 9D 23 78 */ mr r29, r4 +/* 8039C130 00399090 93 81 00 10 */ stw r28, 0x10(r1) +/* 8039C134 00399094 7C 7C 1B 78 */ mr r28, r3 +/* 8039C138 00399098 48 01 8F 85 */ bl hwDisableIrq +/* 8039C13C 0039909C 7F 83 E3 78 */ mr r3, r28 +/* 8039C140 003990A0 7F A4 EB 78 */ mr r4, r29 +/* 8039C144 003990A4 7F C5 F3 78 */ mr r5, r30 +/* 8039C148 003990A8 7F E6 FB 78 */ mr r6, r31 +/* 8039C14C 003990AC 4B FF 9F D9 */ bl seqVolume +/* 8039C150 003990B0 48 01 8F 35 */ bl hwEnableIrq +/* 8039C154 003990B4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8039C158 003990B8 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8039C15C 003990BC 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8039C160 003990C0 83 A1 00 14 */ lwz r29, 0x14(r1) +/* 8039C164 003990C4 83 81 00 10 */ lwz r28, 0x10(r1) +/* 8039C168 003990C8 7C 08 03 A6 */ mtlr r0 +/* 8039C16C 003990CC 38 21 00 20 */ addi r1, r1, 0x20 +/* 8039C170 003990D0 4E 80 00 20 */ blr + +.global seqGetMIDIPriority +seqGetMIDIPriority: +/* 8039C174 003990D4 3C A0 80 55 */ lis r5, seqMIDIPriority@ha +/* 8039C178 003990D8 54 66 2C F4 */ rlwinm r6, r3, 5, 0x13, 0x1a +/* 8039C17C 003990DC 38 65 FD 10 */ addi r3, r5, seqMIDIPriority@l +/* 8039C180 003990E0 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e +/* 8039C184 003990E4 7C 63 32 14 */ add r3, r3, r6 +/* 8039C188 003990E8 7C 63 02 2E */ lhzx r3, r3, r0 +/* 8039C18C 003990EC 4E 80 00 20 */ blr diff --git a/asm/musyx/snd_init.s b/asm/musyx/snd_init.s new file mode 100644 index 00000000..d31a28e7 --- /dev/null +++ b/asm/musyx/snd_init.s @@ -0,0 +1,97 @@ +.include "macros.inc" + +.section .text, "ax" + +.global sndInit +sndInit: +/* 803B0BC0 003ADB20 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 803B0BC4 003ADB24 7C 08 02 A6 */ mflr r0 +/* 803B0BC8 003ADB28 39 20 00 00 */ li r9, 0 +/* 803B0BCC 003ADB2C 90 01 00 24 */ stw r0, 0x24(r1) +/* 803B0BD0 003ADB30 54 60 06 3E */ clrlwi r0, r3, 0x18 +/* 803B0BD4 003ADB34 28 00 00 40 */ cmplwi r0, 0x40 +/* 803B0BD8 003ADB38 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 803B0BDC 003ADB3C 7D 1F 43 78 */ mr r31, r8 +/* 803B0BE0 003ADB40 93 C1 00 18 */ stw r30, 0x18(r1) +/* 803B0BE4 003ADB44 7C FE 3B 78 */ mr r30, r7 +/* 803B0BE8 003ADB48 93 A1 00 14 */ stw r29, 0x14(r1) +/* 803B0BEC 003ADB4C 99 2D AE 48 */ stb r9, sndActive@sda21(r13) +/* 803B0BF0 003ADB50 41 81 00 14 */ bgt lbl_803B0C04 +/* 803B0BF4 003ADB54 3C E0 80 55 */ lis r7, synthInfo@ha +/* 803B0BF8 003ADB58 38 E7 00 50 */ addi r7, r7, synthInfo@l +/* 803B0BFC 003ADB5C 98 67 02 10 */ stb r3, 0x210(r7) +/* 803B0C00 003ADB60 48 00 00 14 */ b lbl_803B0C14 +lbl_803B0C04: +/* 803B0C04 003ADB64 3C 60 80 55 */ lis r3, synthInfo@ha +/* 803B0C08 003ADB68 38 00 00 40 */ li r0, 0x40 +/* 803B0C0C 003ADB6C 38 63 00 50 */ addi r3, r3, synthInfo@l +/* 803B0C10 003ADB70 98 03 02 10 */ stb r0, 0x210(r3) +lbl_803B0C14: +/* 803B0C14 003ADB74 54 C0 06 3E */ clrlwi r0, r6, 0x18 +/* 803B0C18 003ADB78 28 00 00 08 */ cmplwi r0, 8 +/* 803B0C1C 003ADB7C 41 81 00 14 */ bgt lbl_803B0C30 +/* 803B0C20 003ADB80 3C 60 80 55 */ lis r3, synthInfo@ha +/* 803B0C24 003ADB84 38 63 00 50 */ addi r3, r3, synthInfo@l +/* 803B0C28 003ADB88 98 C3 02 13 */ stb r6, 0x213(r3) +/* 803B0C2C 003ADB8C 48 00 00 14 */ b lbl_803B0C40 +lbl_803B0C30: +/* 803B0C30 003ADB90 3C 60 80 55 */ lis r3, synthInfo@ha +/* 803B0C34 003ADB94 38 00 00 08 */ li r0, 8 +/* 803B0C38 003ADB98 38 63 00 50 */ addi r3, r3, synthInfo@l +/* 803B0C3C 003ADB9C 98 03 02 13 */ stb r0, 0x213(r3) +lbl_803B0C40: +/* 803B0C40 003ADBA0 3C 60 80 55 */ lis r3, synthInfo@ha +/* 803B0C44 003ADBA4 38 00 7D 00 */ li r0, 0x7d00 +/* 803B0C48 003ADBA8 3B A3 00 50 */ addi r29, r3, synthInfo@l +/* 803B0C4C 003ADBAC 90 01 00 08 */ stw r0, 8(r1) +/* 803B0C50 003ADBB0 7F C6 F3 78 */ mr r6, r30 +/* 803B0C54 003ADBB4 38 61 00 08 */ addi r3, r1, 8 +/* 803B0C58 003ADBB8 98 9D 02 11 */ stb r4, 0x211(r29) +/* 803B0C5C 003ADBBC 88 9D 02 10 */ lbz r4, 0x210(r29) +/* 803B0C60 003ADBC0 98 BD 02 12 */ stb r5, 0x212(r29) +/* 803B0C64 003ADBC4 88 BD 02 13 */ lbz r5, 0x213(r29) +/* 803B0C68 003ADBC8 48 00 24 39 */ bl hwInit +/* 803B0C6C 003ADBCC 2C 03 00 00 */ cmpwi r3, 0 +/* 803B0C70 003ADBD0 40 82 00 4C */ bne lbl_803B0CBC +/* 803B0C74 003ADBD4 8B BD 02 10 */ lbz r29, 0x210(r29) +/* 803B0C78 003ADBD8 4B FF 95 0D */ bl dataInitStack +/* 803B0C7C 003ADBDC 7F E4 FB 78 */ mr r4, r31 +/* 803B0C80 003ADBE0 38 60 00 00 */ li r3, 0 +/* 803B0C84 003ADBE4 4B FF 1C 3D */ bl dataInit +/* 803B0C88 003ADBE8 4B FE 7E 71 */ bl seqInit +/* 803B0C8C 003ADBEC 38 00 00 00 */ li r0, 0 +/* 803B0C90 003ADBF0 7F A4 EB 78 */ mr r4, r29 +/* 803B0C94 003ADBF4 98 0D AE 80 */ stb r0, synthIdleWaitActive@sda21(r13) +/* 803B0C98 003ADBF8 38 60 7D 00 */ li r3, 0x7d00 +/* 803B0C9C 003ADBFC 4B FE AD C9 */ bl synthInit +/* 803B0CA0 003ADC00 4B FE BB C5 */ bl streamInit +/* 803B0CA4 003ADC04 4B FF 8D 2D */ bl vsInit +/* 803B0CA8 003ADC08 7F C3 F3 78 */ mr r3, r30 +/* 803B0CAC 003ADC0C 4B FF FE D9 */ bl s3dInit +/* 803B0CB0 003ADC10 38 00 00 01 */ li r0, 1 +/* 803B0CB4 003ADC14 38 60 00 00 */ li r3, 0 +/* 803B0CB8 003ADC18 98 0D AE 48 */ stb r0, sndActive@sda21(r13) +lbl_803B0CBC: +/* 803B0CBC 003ADC1C 80 01 00 24 */ lwz r0, 0x24(r1) +/* 803B0CC0 003ADC20 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 803B0CC4 003ADC24 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 803B0CC8 003ADC28 83 A1 00 14 */ lwz r29, 0x14(r1) +/* 803B0CCC 003ADC2C 7C 08 03 A6 */ mtlr r0 +/* 803B0CD0 003ADC30 38 21 00 20 */ addi r1, r1, 0x20 +/* 803B0CD4 003ADC34 4E 80 00 20 */ blr + +.global sndQuit +sndQuit: +/* 803B0CD8 003ADC38 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 803B0CDC 003ADC3C 7C 08 02 A6 */ mflr r0 +/* 803B0CE0 003ADC40 90 01 00 14 */ stw r0, 0x14(r1) +/* 803B0CE4 003ADC44 48 00 24 75 */ bl hwExit +/* 803B0CE8 003ADC48 4B FF 1C BD */ bl dataExit +/* 803B0CEC 003ADC4C 4B FF FE D1 */ bl s3dExit +/* 803B0CF0 003ADC50 4B FE B2 E9 */ bl synthExit +/* 803B0CF4 003ADC54 38 00 00 00 */ li r0, 0 +/* 803B0CF8 003ADC58 98 0D AE 48 */ stb r0, sndActive@sda21(r13) +/* 803B0CFC 003ADC5C 80 01 00 14 */ lwz r0, 0x14(r1) +/* 803B0D00 003ADC60 7C 08 03 A6 */ mtlr r0 +/* 803B0D04 003ADC64 38 21 00 10 */ addi r1, r1, 0x10 +/* 803B0D08 003ADC68 4E 80 00 20 */ blr diff --git a/asm/musyx/synth_dbtab.s b/asm/musyx/synth_dbtab.s new file mode 100644 index 00000000..47477941 --- /dev/null +++ b/asm/musyx/synth_dbtab.s @@ -0,0 +1,497 @@ +.include "macros.inc" + +.section .data, "wa" + +.global dspAttenuationTab +dspAttenuationTab: + # ROM: 0x3F0820 + .4byte 0x7FFF78D6 + .4byte 0x72136BB1 + .4byte 0x65AB5FFB + .4byte 0x5A9D558B + .4byte 0x50C24C3E + .4byte 0x47FA43F3 + .4byte 0x40263C8F + .4byte 0x392C35F9 + .4byte 0x32F4301B + .4byte 0x2D6A2ADF + .4byte 0x28792636 + .4byte 0x2412220E + .4byte 0x20261E5A + .4byte 0x1CA71B0D + .4byte 0x1989181C + .4byte 0x16C2157C + .4byte 0x14491326 + .4byte 0x12141111 + .4byte 0x101D0F36 + .4byte 0x0E5C0D8E + .4byte 0x0CCC0C15 + .4byte 0x0B680AC5 + .4byte 0x0A2A0999 + .4byte 0x090F088D + .4byte 0x0813079F + .4byte 0x073206CB + .4byte 0x066A060E + .4byte 0x05B70565 + .4byte 0x051804CF + .4byte 0x048A0449 + .4byte 0x040C03D2 + .4byte 0x039B0367 + .4byte 0x03370309 + .4byte 0x02DD02B4 + .4byte 0x028D0269 + .4byte 0x02460226 + .4byte 0x020701EA + .4byte 0x01CE01B4 + .4byte 0x019C0185 + .4byte 0x016F015B + .4byte 0x01470135 + .4byte 0x01240113 + .4byte 0x010400F5 + .4byte 0x00E700DA + .4byte 0x00CE00C3 + .4byte 0x00B800AD + .4byte 0x00A4009B + .4byte 0x0092008A + .4byte 0x0082007B + .4byte 0x0074006D + .4byte 0x00670061 + .4byte 0x005C0057 + .4byte 0x0052004D + .4byte 0x00490045 + .4byte 0x0041003D + .4byte 0x003A0037 + .4byte 0x00330031 + .4byte 0x002E002B + .4byte 0x00290026 + .4byte 0x00240022 + .4byte 0x0020001E + .4byte 0x001D001B + .4byte 0x001A0018 + .4byte 0x00170015 + .4byte 0x00140013 + .4byte 0x00120011 + .4byte 0x0010000F + .4byte 0x000E000D + .4byte 0x000D000C + .4byte 0x000B000A + .4byte 0x000A0009 + .4byte 0x00090008 + .4byte 0x00080007 + .4byte 0x00070006 + .4byte 0x00060006 + .4byte 0x00050005 + .4byte 0x00050004 + .4byte 0x00040004 + .4byte 0x00040003 + .4byte 0x00030003 + .4byte 0x00030003 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020002 + .4byte 0x00020001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010001 + .4byte 0x00010000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global dspScale2IndexTab +dspScale2IndexTab: + # ROM: 0x3F09A4 + .4byte 0xC1786C65 + .4byte 0x605C5957 + .4byte 0x5452504F + .4byte 0x4D4C4B49 + .4byte 0x48474645 + .4byte 0x44444342 + .4byte 0x4140403F + .4byte 0x3F3E3D3D + .4byte 0x3C3C3B3B + .4byte 0x3A3A3939 + .4byte 0x38383737 + .4byte 0x37363636 + .4byte 0x35353434 + .4byte 0x34333333 + .4byte 0x32323232 + .4byte 0x31313130 + .4byte 0x3030302F + .4byte 0x2F2F2F2E + .4byte 0x2E2E2E2D + .4byte 0x2D2D2D2C + .4byte 0x2C2C2C2C + .4byte 0x2B2B2B2B + .4byte 0x2B2A2A2A + .4byte 0x2A2A2929 + .4byte 0x29292929 + .4byte 0x28282828 + .4byte 0x28282727 + .4byte 0x27272727 + .4byte 0x26262626 + .4byte 0x26262625 + .4byte 0x25252525 + .4byte 0x25252424 + .4byte 0x24242424 + .4byte 0x24232323 + .4byte 0x23232323 + .4byte 0x23222222 + .4byte 0x22222222 + .4byte 0x22212121 + .4byte 0x21212121 + .4byte 0x21212020 + .4byte 0x20202020 + .4byte 0x2020201F + .4byte 0x1F1F1F1F + .4byte 0x1F1F1F1F + .4byte 0x1F1E1E1E + .4byte 0x1E1E1E1E + .4byte 0x1E1E1E1E + .4byte 0x1D1D1D1D + .4byte 0x1D1D1D1D + .4byte 0x1D1D1D1C + .4byte 0x1C1C1C1C + .4byte 0x1C1C1C1C + .4byte 0x1C1C1C1B + .4byte 0x1B1B1B1B + .4byte 0x1B1B1B1B + .4byte 0x1B1B1B1A + .4byte 0x1A1A1A1A + .4byte 0x1A1A1A1A + .4byte 0x1A1A1A1A + .4byte 0x19191919 + .4byte 0x19191919 + .4byte 0x19191919 + .4byte 0x19191818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18181818 + .4byte 0x18171717 + .4byte 0x17171717 + .4byte 0x17171717 + .4byte 0x17171717 + .4byte 0x17161616 + .4byte 0x16161616 + .4byte 0x16161616 + .4byte 0x16161616 + .4byte 0x16151515 + .4byte 0x15151515 + .4byte 0x15151515 + .4byte 0x15151515 + .4byte 0x15151514 + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0x14141414 + .4byte 0x14141313 + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0x13131313 + .4byte 0x13121212 + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0x12121212 + .4byte 0x12121111 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x11111111 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0F0F0F + .4byte 0x0F0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0E + .4byte 0x0E0E0E0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0D + .4byte 0x0D0D0D0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0C0C0C0C + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0B0B0B0B + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A0A0A0A + .4byte 0x0A090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x09090909 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x08070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x07070707 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050505 + .4byte 0x05050404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04040404 + .4byte 0x04030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030303 + .4byte 0x03030302 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020202 + .4byte 0x02020201 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010101 + .4byte 0x01010100 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global dspDLSVolTab +dspDLSVolTab: + # ROM: 0x3F0DA4 + .4byte 0 + .4byte 0x388205FF + .4byte 0x398205FF + .4byte 0x3A1246BF + .4byte 0x3A8205FF + .4byte 0x3ACB295F + .4byte 0x3B1246BF + .4byte 0x3B47192F + .4byte 0x3B8205FF + .4byte 0x3BA48F97 + .4byte 0x3BCB295F + .4byte 0x3BF5D356 + .4byte 0x3C1246BF + .4byte 0x3C2BABEB + .4byte 0x3C47192F + .4byte 0x3C648E8A + .4byte 0x3C8205FF + .4byte 0x3C92C8C5 + .4byte 0x3CA48F97 + .4byte 0x3CB75A75 + .4byte 0x3CCB295F + .4byte 0x3CDFFC54 + .4byte 0x3CF5D356 + .4byte 0x3D065732 + .4byte 0x3D1246BF + .4byte 0x3D1EB852 + .4byte 0x3D2BABEB + .4byte 0x3D39218A + .4byte 0x3D47192F + .4byte 0x3D5592DA + .4byte 0x3D648E8A + .4byte 0x3D740C41 + .4byte 0x3D8205FF + .4byte 0x3D8A46E1 + .4byte 0x3D92C8C5 + .4byte 0x3D9B8BAC + .4byte 0x3DA48F97 + .4byte 0x3DADD484 + .4byte 0x3DB75A75 + .4byte 0x3DC12168 + .4byte 0x3DCB295F + .4byte 0x3DD57258 + .4byte 0x3DDFFC54 + .4byte 0x3DEAC754 + .4byte 0x3DF5D356 + .4byte 0x3E00902E + .4byte 0x3E065732 + .4byte 0x3E0C3EB8 + .4byte 0x3E1246BF + .4byte 0x3E186F48 + .4byte 0x3E1EB852 + .4byte 0x3E2521DE + .4byte 0x3E2BABEB + .4byte 0x3E32567A + .4byte 0x3E39218A + .4byte 0x3E400D1B + .4byte 0x3E47192F + .4byte 0x3E4E45C3 + .4byte 0x3E5592DA + .4byte 0x3E5D0071 + .4byte 0x3E648E8A + .4byte 0x3E6C3D25 + .4byte 0x3E740C41 + .4byte 0x3E7BFBDF + .4byte 0x3E820621 + .4byte 0x3E861E71 + .4byte 0x3E8A4702 + .4byte 0x3E8E7FD4 + .4byte 0x3E92C8E7 + .4byte 0x3E97223A + .4byte 0x3E9B8BCE + .4byte 0x3EA005A3 + .4byte 0x3EA48FB8 + .4byte 0x3EA92A0F + .4byte 0x3EADD4A6 + .4byte 0x3EB28F7E + .4byte 0x3EB75A96 + .4byte 0x3EBC35F0 + .4byte 0x3EC1218A + .4byte 0x3EC61D65 + .4byte 0x3ECB2980 + .4byte 0x3ED045DD + .4byte 0x3ED5727A + .4byte 0x3EDAAF57 + .4byte 0x3EDFFC76 + .4byte 0x3EE559D5 + .4byte 0x3EEAC775 + .4byte 0x3EF04556 + .4byte 0x3EF5D378 + .4byte 0x3EFB71DA + .4byte 0x3F00903F + .4byte 0x3F036FB1 + .4byte 0x3F065743 + .4byte 0x3F0946F6 + .4byte 0x3F0C3EC9 + .4byte 0x3F0F3EBC + .4byte 0x3F1246D0 + .4byte 0x3F155704 + .4byte 0x3F186F58 + .4byte 0x3F1B8FCD + .4byte 0x3F1EB863 + .4byte 0x3F21E918 + .4byte 0x3F2521EE + .4byte 0x3F2862E5 + .4byte 0x3F2BABFC + .4byte 0x3F2EFD33 + .4byte 0x3F32568A + .4byte 0x3F35B802 + .4byte 0x3F39219B + .4byte 0x3F3C9353 + .4byte 0x3F400D3D + .4byte 0x3F438F36 + .4byte 0x3F471950 + .4byte 0x3F4AAB8A + .4byte 0x3F4E45E5 + .4byte 0x3F51E860 + .4byte 0x3F5592FB + .4byte 0x3F5945B7 + .4byte 0x3F5D0093 + .4byte 0x3F60C38F + .4byte 0x3F648EAC + .4byte 0x3F6861E9 + .4byte 0x3F6C3D47 + .4byte 0x3F7020C5 + .4byte 0x3F740C63 + .4byte 0x3F780022 + .4byte 0x3F7BFC01 + .4byte 0x3F800000 + .4byte 0x3F800000 diff --git a/asm/os/__ppc_eabi_init.s b/asm/os/__ppc_eabi_init.s index 2d229aed..806c9c05 100644 --- a/asm/os/__ppc_eabi_init.s +++ b/asm/os/__ppc_eabi_init.s @@ -21,9 +21,9 @@ __flush_cache: /* 80003380 00000380 7C 65 18 50 */ subf r3, r5, r3 /* 80003384 00000384 7C 84 1A 14 */ add r4, r4, r3 lbl_80003388: -/* 80003388 00000388 7C 00 28 6C */ dcbst 0, r5 -/* 8000338C 0000038C 7C 00 04 AC */ sync 0 -/* 80003390 00000390 7C 00 2F AC */ icbi 0, r5 +/* 80003388 00000388 7C 00 28 6C */ dcbst r0, r5 +/* 8000338C 0000038C 7C 00 04 AC */ sync +/* 80003390 00000390 7C 00 2F AC */ icbi r0, r5 /* 80003394 00000394 30 A5 00 08 */ addic r5, r5, 8 /* 80003398 00000398 34 84 FF F8 */ addic. r4, r4, -8 /* 8000339C 0000039C 40 80 FF EC */ bge lbl_80003388 diff --git a/asm/os/__ppc_eabi_init_text.s b/asm/os/__ppc_eabi_init_text.s index 6ef1a0f9..c9a7c811 100644 --- a/asm/os/__ppc_eabi_init_text.s +++ b/asm/os/__ppc_eabi_init_text.s @@ -2,7 +2,6 @@ .section .text, "ax" -.if 1 .global __init_user __init_user: /* 80385824 00382784 7C 08 02 A6 */ mflr r0 @@ -13,7 +12,6 @@ __init_user: /* 80385838 00382798 38 21 00 08 */ addi r1, r1, 8 /* 8038583C 0038279C 7C 08 03 A6 */ mtlr r0 /* 80385840 003827A0 4E 80 00 20 */ blr -.endif .global __init_cpp __init_cpp: