From 326199f2f4c20cd5fc847c243c40a630be7d4c62 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 21 Aug 2022 01:23:57 -0400 Subject: [PATCH] Fully shiftable?? --- asm/Dolphin/dvd/dvdfatal.s | 16 +- asm/Dolphin/exi/EXIBios.s | 23 +- asm/Dolphin/gx/GXAttr.s | 230 ++++++++ asm/Dolphin/gx/GXFrameBuf.s | 79 +++ asm/Dolphin/gx/GXInit.s | 218 +------- asm/Dolphin/gx/GXLight.s | 20 +- asm/Dolphin/gx/GXPerf.s | 175 ++++-- asm/Dolphin/gx/GXTexture.s | 285 +++++----- asm/Dolphin/os/OSThread.s | 2 +- asm/Dolphin/si/SISamplingRate.s | 17 - asm/Dolphin/thp/THPDec.s | 18 +- asm/Dolphin/vi.s | 87 +-- asm/MetroidPrime/CAutoMapper.s | 2 +- asm/MetroidPrime/CCredits.s | 4 +- asm/MetroidPrime/CFrontEndUI.s | 24 +- asm/MetroidPrime/CSamusDoll.s | 8 +- asm/MetroidPrime/Enemies/CAi.s | 246 ++++----- asm/MetroidPrime/Enemies/CBeetle.s | 6 +- asm/MetroidPrime/Enemies/CBloodFlower.s | 6 +- asm/MetroidPrime/Enemies/CEyeBall.s | 2 +- asm/MetroidPrime/Enemies/CMetroid.s | 6 +- asm/MetroidPrime/Enemies/CParasite.s | 2 +- .../Enemies/CThardusRockProjectile.s | 2 +- asm/MetroidPrime/Enemies/CWarWasp.s | 2 +- asm/MetroidPrime/HUD/CHudDecoInterface.s | 22 +- asm/MetroidPrime/Player/CPlayerGun.s | 2 +- .../Player/CSamusFaceReflection.s | 2 +- .../ScriptObjects/CScriptPlayerActor.s | 2 +- asm/Runtime/alloc.s | 2 +- asm/Runtime/ansi_files.s | 12 + asm/Runtime/ansi_fp.s | 43 ++ asm/Runtime/printf.s | 521 ++++++++++-------- asm/musyx/chorus_fx.s | 12 +- asm/musyx/creverb.s | 2 +- asm/musyx/hardware.s | 2 +- asm/musyx/hw_aramdma.s | 4 +- asm/musyx/reverb.s | 2 +- src/os/__ppc_eabi_init.c | 4 +- 38 files changed, 1194 insertions(+), 918 deletions(-) diff --git a/asm/Dolphin/dvd/dvdfatal.s b/asm/Dolphin/dvd/dvdfatal.s index 411cd5bd..badd818b 100644 --- a/asm/Dolphin/dvd/dvdfatal.s +++ b/asm/Dolphin/dvd/dvdfatal.s @@ -5,12 +5,12 @@ .global lbl_805A8AB0 lbl_805A8AB0: # ROM: 0x3F6450 - .4byte 0x803F0148 + .4byte lbl_803F0148 .global lbl_805A8AB4 lbl_805A8AB4: # ROM: 0x3F6454 - .4byte 0x803F01B8 + .4byte lbl_803F01B8 .section .sbss @@ -36,12 +36,12 @@ lbl_805AEB24: .balign 8 lbl_803D8570: # ROM: 0x3D5570 - .4byte 0x803F0238 - .4byte 0x803F02B8 - .4byte 0x803F0354 - .4byte 0x803F03E4 - .4byte 0x803F046C - .4byte 0x803F04EC + .4byte lbl_803F0238 + .4byte lbl_803F02B8 + .4byte lbl_803F0354 + .4byte lbl_803F03E4 + .4byte lbl_803F046C + .4byte lbl_803F04EC .section .text, "ax" diff --git a/asm/Dolphin/exi/EXIBios.s b/asm/Dolphin/exi/EXIBios.s index c4198001..9a20983f 100644 --- a/asm/Dolphin/exi/EXIBios.s +++ b/asm/Dolphin/exi/EXIBios.s @@ -1,5 +1,26 @@ .include "macros.inc" +.section .data, "wa" +.balign 8 +lbl_803F7050: + .asciz "<< Dolphin SDK - EXI\trelease build: Sep 5 2002 05:33:04 (0x2301) >>" + .balign 4 + .asciz "Memory Card 59" + .balign 4 + .asciz "Memory Card 123" + .asciz "Memory Card 251" + .asciz "Memory Card 507" + .asciz "USB Adapter" + .asciz "Net Card" + .balign 4 + .asciz "Artist Ether" + .balign 4 + .asciz "Stream Hanger" + .balign 4 + .asciz "IS Viewer" + .balign 4 + .4byte 0 + .section .bss .balign 8 .global lbl_80569E98 @@ -12,7 +33,7 @@ lbl_80569E98: .global lbl_805A8C10 lbl_805A8C10: # ROM: 0x3F65B0 - .4byte 0x803F7050 + .4byte lbl_803F7050 .4byte 0 diff --git a/asm/Dolphin/gx/GXAttr.s b/asm/Dolphin/gx/GXAttr.s index 328b4cfc..6ab96c06 100644 --- a/asm/Dolphin/gx/GXAttr.s +++ b/asm/Dolphin/gx/GXAttr.s @@ -1,5 +1,146 @@ .include "macros.inc" +.section .data +.balign 8 + +.global lbl_803F0718 +lbl_803F0718: + # ROM: 0x3ED718 + .4byte lbl_80376F38 + .4byte lbl_80376F50 + .4byte lbl_80376F70 + .4byte lbl_80376F90 + .4byte lbl_80376FB0 + .4byte lbl_80376FD0 + .4byte lbl_80376FF0 + .4byte lbl_80377010 + .4byte lbl_80377030 + .4byte lbl_80377050 + .4byte lbl_80377070 + .4byte lbl_803770D8 + .4byte lbl_803770F8 + .4byte lbl_80377118 + .4byte lbl_80377130 + .4byte lbl_80377150 + .4byte lbl_80377170 + .4byte lbl_80377190 + .4byte lbl_803771B0 + .4byte lbl_803771D0 + .4byte lbl_803771F0 + .4byte lbl_8037720C + .4byte lbl_8037720C + .4byte lbl_8037720C + .4byte lbl_8037720C + .4byte lbl_803770A4 + +.global lbl_803F0780 +lbl_803F0780: + # ROM: 0x3ED780 + .4byte lbl_80377294 + .4byte lbl_803772B0 + .4byte lbl_803772D0 + .4byte lbl_803772F0 + .4byte lbl_80377310 + .4byte lbl_80377330 + .4byte lbl_80377350 + .4byte lbl_80377370 + .4byte lbl_80377390 + .4byte lbl_803773B0 + .4byte lbl_803773D0 + .4byte lbl_80377438 + .4byte lbl_80377458 + .4byte lbl_80377478 + .4byte lbl_80377494 + .4byte lbl_803774B4 + .4byte lbl_803774D4 + .4byte lbl_803774F4 + .4byte lbl_80377514 + .4byte lbl_80377534 + .4byte lbl_80377554 + .4byte lbl_80377570 + .4byte lbl_80377570 + .4byte lbl_80377570 + .4byte lbl_80377570 + .4byte lbl_80377404 + +.global lbl_803F07E8 +lbl_803F07E8: + # ROM: 0x3ED7E8 + .4byte lbl_803777C8 + .4byte lbl_80377804 + .4byte lbl_80377868 + .4byte lbl_80377894 + .4byte lbl_803778C0 + .4byte lbl_80377900 + .4byte lbl_8037793C + .4byte lbl_8037797C + .4byte lbl_803779BC + .4byte lbl_803779FC + .4byte lbl_80377A3C + .4byte lbl_80377A7C + .4byte lbl_80377AB4 + .4byte lbl_80377AB4 + .4byte lbl_80377AB4 + .4byte lbl_80377AB4 + .4byte lbl_80377804 + +.global lbl_803F082C +lbl_803F082C: + # ROM: 0x3ED82C + .4byte lbl_80377B34 + .4byte lbl_80377B70 + .4byte lbl_80377BD4 + .4byte lbl_80377C00 + .4byte lbl_80377C2C + .4byte lbl_80377C6C + .4byte lbl_80377CA8 + .4byte lbl_80377CE8 + .4byte lbl_80377D28 + .4byte lbl_80377D64 + .4byte lbl_80377DA4 + .4byte lbl_80377DE4 + .4byte lbl_80377E1C + .4byte lbl_80377E1C + .4byte lbl_80377E1C + .4byte lbl_80377E1C + .4byte lbl_80377B70 + +.global lbl_803F0870 +lbl_803F0870: + # ROM: 0x3ED870 + .4byte lbl_80378158 + .4byte lbl_80378178 + .4byte lbl_80378198 + .4byte lbl_803781B8 + .4byte lbl_803781D8 + .4byte lbl_803781F0 + .4byte lbl_80378210 + +.global lbl_803F088C +lbl_803F088C: + # ROM: 0x3ED88C + .4byte lbl_80377FCC + .4byte lbl_80377FD8 + .4byte lbl_80377FE4 + .4byte lbl_80377FF0 + .4byte lbl_8037800C + .4byte lbl_80378014 + .4byte lbl_8037801C + .4byte lbl_80378024 + .4byte lbl_8037802C + .4byte lbl_80378034 + .4byte lbl_8037803C + .4byte lbl_80378044 + .4byte lbl_80378048 + .4byte lbl_80378048 + .4byte lbl_80378048 + .4byte lbl_80378048 + .4byte lbl_80378048 + .4byte lbl_80378048 + .4byte lbl_80378048 + .4byte lbl_80377FFC + .4byte lbl_80378004 + .section .sdata .balign 8 .global lbl_805A8AD0 @@ -143,12 +284,14 @@ GXSetVtxDesc: /* 80376F2C 00373E8C 7C 05 00 2E */ lwzx r0, r5, r0 /* 80376F30 00373E90 7C 09 03 A6 */ mtctr r0 /* 80376F34 00373E94 4E 80 04 20 */ bctr +lbl_80376F38: /* 80376F38 00373E98 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80376F3C 00373E9C 84 03 00 14 */ lwzu r0, 0x14(r3) /* 80376F40 00373EA0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80376F44 00373EA4 7C 00 23 78 */ or r0, r0, r4 /* 80376F48 00373EA8 90 03 00 00 */ stw r0, 0(r3) /* 80376F4C 00373EAC 48 00 02 C0 */ b lbl_8037720C +lbl_80376F50: /* 80376F50 00373EB0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80376F54 00373EB4 54 80 08 3C */ slwi r0, r4, 1 /* 80376F58 00373EB8 38 83 00 14 */ addi r4, r3, 0x14 @@ -157,6 +300,7 @@ GXSetVtxDesc: /* 80376F64 00373EC4 7C 60 03 78 */ or r0, r3, r0 /* 80376F68 00373EC8 90 04 00 00 */ stw r0, 0(r4) /* 80376F6C 00373ECC 48 00 02 A0 */ b lbl_8037720C +lbl_80376F70: /* 80376F70 00373ED0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80376F74 00373ED4 54 80 10 3A */ slwi r0, r4, 2 /* 80376F78 00373ED8 38 83 00 14 */ addi r4, r3, 0x14 @@ -165,6 +309,7 @@ GXSetVtxDesc: /* 80376F84 00373EE4 7C 60 03 78 */ or r0, r3, r0 /* 80376F88 00373EE8 90 04 00 00 */ stw r0, 0(r4) /* 80376F8C 00373EEC 48 00 02 80 */ b lbl_8037720C +lbl_80376F90: /* 80376F90 00373EF0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80376F94 00373EF4 54 80 18 38 */ slwi r0, r4, 3 /* 80376F98 00373EF8 38 83 00 14 */ addi r4, r3, 0x14 @@ -173,6 +318,7 @@ GXSetVtxDesc: /* 80376FA4 00373F04 7C 60 03 78 */ or r0, r3, r0 /* 80376FA8 00373F08 90 04 00 00 */ stw r0, 0(r4) /* 80376FAC 00373F0C 48 00 02 60 */ b lbl_8037720C +lbl_80376FB0: /* 80376FB0 00373F10 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80376FB4 00373F14 54 80 20 36 */ slwi r0, r4, 4 /* 80376FB8 00373F18 38 83 00 14 */ addi r4, r3, 0x14 @@ -181,6 +327,7 @@ GXSetVtxDesc: /* 80376FC4 00373F24 7C 60 03 78 */ or r0, r3, r0 /* 80376FC8 00373F28 90 04 00 00 */ stw r0, 0(r4) /* 80376FCC 00373F2C 48 00 02 40 */ b lbl_8037720C +lbl_80376FD0: /* 80376FD0 00373F30 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80376FD4 00373F34 54 80 28 34 */ slwi r0, r4, 5 /* 80376FD8 00373F38 38 83 00 14 */ addi r4, r3, 0x14 @@ -189,6 +336,7 @@ GXSetVtxDesc: /* 80376FE4 00373F44 7C 60 03 78 */ or r0, r3, r0 /* 80376FE8 00373F48 90 04 00 00 */ stw r0, 0(r4) /* 80376FEC 00373F4C 48 00 02 20 */ b lbl_8037720C +lbl_80376FF0: /* 80376FF0 00373F50 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80376FF4 00373F54 54 80 30 32 */ slwi r0, r4, 6 /* 80376FF8 00373F58 38 83 00 14 */ addi r4, r3, 0x14 @@ -197,6 +345,7 @@ GXSetVtxDesc: /* 80377004 00373F64 7C 60 03 78 */ or r0, r3, r0 /* 80377008 00373F68 90 04 00 00 */ stw r0, 0(r4) /* 8037700C 00373F6C 48 00 02 00 */ b lbl_8037720C +lbl_80377010: /* 80377010 00373F70 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377014 00373F74 54 80 38 30 */ slwi r0, r4, 7 /* 80377018 00373F78 38 83 00 14 */ addi r4, r3, 0x14 @@ -205,6 +354,7 @@ GXSetVtxDesc: /* 80377024 00373F84 7C 60 03 78 */ or r0, r3, r0 /* 80377028 00373F88 90 04 00 00 */ stw r0, 0(r4) /* 8037702C 00373F8C 48 00 01 E0 */ b lbl_8037720C +lbl_80377030: /* 80377030 00373F90 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377034 00373F94 54 80 40 2E */ slwi r0, r4, 8 /* 80377038 00373F98 38 83 00 14 */ addi r4, r3, 0x14 @@ -213,6 +363,7 @@ GXSetVtxDesc: /* 80377044 00373FA4 7C 60 03 78 */ or r0, r3, r0 /* 80377048 00373FA8 90 04 00 00 */ stw r0, 0(r4) /* 8037704C 00373FAC 48 00 01 C0 */ b lbl_8037720C +lbl_80377050: /* 80377050 00373FB0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377054 00373FB4 54 80 48 2C */ slwi r0, r4, 9 /* 80377058 00373FB8 38 83 00 14 */ addi r4, r3, 0x14 @@ -221,6 +372,7 @@ GXSetVtxDesc: /* 80377064 00373FC4 7C 60 03 78 */ or r0, r3, r0 /* 80377068 00373FC8 90 04 00 00 */ stw r0, 0(r4) /* 8037706C 00373FCC 48 00 01 A0 */ b lbl_8037720C +lbl_80377070: /* 80377070 00373FD0 2C 04 00 00 */ cmpwi r4, 0 /* 80377074 00373FD4 41 82 00 20 */ beq lbl_80377094 /* 80377078 00373FD8 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) @@ -235,6 +387,7 @@ lbl_80377094: /* 80377098 00373FF8 38 00 00 00 */ li r0, 0 /* 8037709C 00373FFC 98 03 04 1C */ stb r0, 0x41c(r3) /* 803770A0 00374000 48 00 01 6C */ b lbl_8037720C +lbl_803770A4: /* 803770A4 00374004 2C 04 00 00 */ cmpwi r4, 0 /* 803770A8 00374008 41 82 00 20 */ beq lbl_803770C8 /* 803770AC 0037400C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) @@ -249,6 +402,7 @@ lbl_803770C8: /* 803770CC 0037402C 38 00 00 00 */ li r0, 0 /* 803770D0 00374030 98 03 04 1D */ stb r0, 0x41d(r3) /* 803770D4 00374034 48 00 01 38 */ b lbl_8037720C +lbl_803770D8: /* 803770D8 00374038 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 803770DC 0037403C 54 80 68 24 */ slwi r0, r4, 0xd /* 803770E0 00374040 38 83 00 14 */ addi r4, r3, 0x14 @@ -257,6 +411,7 @@ lbl_803770C8: /* 803770EC 0037404C 7C 60 03 78 */ or r0, r3, r0 /* 803770F0 00374050 90 04 00 00 */ stw r0, 0(r4) /* 803770F4 00374054 48 00 01 18 */ b lbl_8037720C +lbl_803770F8: /* 803770F8 00374058 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 803770FC 0037405C 54 80 78 20 */ slwi r0, r4, 0xf /* 80377100 00374060 38 83 00 14 */ addi r4, r3, 0x14 @@ -265,12 +420,14 @@ lbl_803770C8: /* 8037710C 0037406C 7C 60 03 78 */ or r0, r3, r0 /* 80377110 00374070 90 04 00 00 */ stw r0, 0(r4) /* 80377114 00374074 48 00 00 F8 */ b lbl_8037720C +lbl_80377118: /* 80377118 00374078 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 8037711C 0037407C 84 03 00 18 */ lwzu r0, 0x18(r3) /* 80377120 00374080 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d /* 80377124 00374084 7C 00 23 78 */ or r0, r0, r4 /* 80377128 00374088 90 03 00 00 */ stw r0, 0(r3) /* 8037712C 0037408C 48 00 00 E0 */ b lbl_8037720C +lbl_80377130: /* 80377130 00374090 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377134 00374094 54 80 10 3A */ slwi r0, r4, 2 /* 80377138 00374098 38 83 00 18 */ addi r4, r3, 0x18 @@ -279,6 +436,7 @@ lbl_803770C8: /* 80377144 003740A4 7C 60 03 78 */ or r0, r3, r0 /* 80377148 003740A8 90 04 00 00 */ stw r0, 0(r4) /* 8037714C 003740AC 48 00 00 C0 */ b lbl_8037720C +lbl_80377150: /* 80377150 003740B0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377154 003740B4 54 80 20 36 */ slwi r0, r4, 4 /* 80377158 003740B8 38 83 00 18 */ addi r4, r3, 0x18 @@ -287,6 +445,7 @@ lbl_803770C8: /* 80377164 003740C4 7C 60 03 78 */ or r0, r3, r0 /* 80377168 003740C8 90 04 00 00 */ stw r0, 0(r4) /* 8037716C 003740CC 48 00 00 A0 */ b lbl_8037720C +lbl_80377170: /* 80377170 003740D0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377174 003740D4 54 80 30 32 */ slwi r0, r4, 6 /* 80377178 003740D8 38 83 00 18 */ addi r4, r3, 0x18 @@ -295,6 +454,7 @@ lbl_803770C8: /* 80377184 003740E4 7C 60 03 78 */ or r0, r3, r0 /* 80377188 003740E8 90 04 00 00 */ stw r0, 0(r4) /* 8037718C 003740EC 48 00 00 80 */ b lbl_8037720C +lbl_80377190: /* 80377190 003740F0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 80377194 003740F4 54 80 40 2E */ slwi r0, r4, 8 /* 80377198 003740F8 38 83 00 18 */ addi r4, r3, 0x18 @@ -303,6 +463,7 @@ lbl_803770C8: /* 803771A4 00374104 7C 60 03 78 */ or r0, r3, r0 /* 803771A8 00374108 90 04 00 00 */ stw r0, 0(r4) /* 803771AC 0037410C 48 00 00 60 */ b lbl_8037720C +lbl_803771B0: /* 803771B0 00374110 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 803771B4 00374114 54 80 50 2A */ slwi r0, r4, 0xa /* 803771B8 00374118 38 83 00 18 */ addi r4, r3, 0x18 @@ -311,6 +472,7 @@ lbl_803770C8: /* 803771C4 00374124 7C 60 03 78 */ or r0, r3, r0 /* 803771C8 00374128 90 04 00 00 */ stw r0, 0(r4) /* 803771CC 0037412C 48 00 00 40 */ b lbl_8037720C +lbl_803771D0: /* 803771D0 00374130 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 803771D4 00374134 54 80 60 26 */ slwi r0, r4, 0xc /* 803771D8 00374138 38 83 00 18 */ addi r4, r3, 0x18 @@ -319,6 +481,7 @@ lbl_803770C8: /* 803771E4 00374144 7C 60 03 78 */ or r0, r3, r0 /* 803771E8 00374148 90 04 00 00 */ stw r0, 0(r4) /* 803771EC 0037414C 48 00 00 20 */ b lbl_8037720C +lbl_803771F0: /* 803771F0 00374150 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) /* 803771F4 00374154 54 80 70 22 */ slwi r0, r4, 0xe /* 803771F8 00374158 38 83 00 18 */ addi r4, r3, 0x18 @@ -368,6 +531,7 @@ lbl_80377274: /* 80377288 003741E8 7C A4 28 2E */ lwzx r5, r4, r5 /* 8037728C 003741EC 7C A9 03 A6 */ mtctr r5 /* 80377290 003741F0 4E 80 04 20 */ bctr +lbl_80377294: /* 80377294 003741F4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377298 003741F8 38 C5 00 14 */ addi r6, r5, 0x14 /* 8037729C 003741FC 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -375,6 +539,7 @@ lbl_80377274: /* 803772A4 00374204 7C A0 03 78 */ or r0, r5, r0 /* 803772A8 00374208 90 06 00 00 */ stw r0, 0(r6) /* 803772AC 0037420C 48 00 02 C4 */ b lbl_80377570 +lbl_803772B0: /* 803772B0 00374210 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 803772B4 00374214 54 00 08 3C */ slwi r0, r0, 1 /* 803772B8 00374218 38 C5 00 14 */ addi r6, r5, 0x14 @@ -383,6 +548,7 @@ lbl_80377274: /* 803772C4 00374224 7C A0 03 78 */ or r0, r5, r0 /* 803772C8 00374228 90 06 00 00 */ stw r0, 0(r6) /* 803772CC 0037422C 48 00 02 A4 */ b lbl_80377570 +lbl_803772D0: /* 803772D0 00374230 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 803772D4 00374234 54 00 10 3A */ slwi r0, r0, 2 /* 803772D8 00374238 38 C5 00 14 */ addi r6, r5, 0x14 @@ -391,6 +557,7 @@ lbl_80377274: /* 803772E4 00374244 7C A0 03 78 */ or r0, r5, r0 /* 803772E8 00374248 90 06 00 00 */ stw r0, 0(r6) /* 803772EC 0037424C 48 00 02 84 */ b lbl_80377570 +lbl_803772F0: /* 803772F0 00374250 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 803772F4 00374254 54 00 18 38 */ slwi r0, r0, 3 /* 803772F8 00374258 38 C5 00 14 */ addi r6, r5, 0x14 @@ -399,6 +566,7 @@ lbl_80377274: /* 80377304 00374264 7C A0 03 78 */ or r0, r5, r0 /* 80377308 00374268 90 06 00 00 */ stw r0, 0(r6) /* 8037730C 0037426C 48 00 02 64 */ b lbl_80377570 +lbl_80377310: /* 80377310 00374270 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377314 00374274 54 00 20 36 */ slwi r0, r0, 4 /* 80377318 00374278 38 C5 00 14 */ addi r6, r5, 0x14 @@ -407,6 +575,7 @@ lbl_80377274: /* 80377324 00374284 7C A0 03 78 */ or r0, r5, r0 /* 80377328 00374288 90 06 00 00 */ stw r0, 0(r6) /* 8037732C 0037428C 48 00 02 44 */ b lbl_80377570 +lbl_80377330: /* 80377330 00374290 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377334 00374294 54 00 28 34 */ slwi r0, r0, 5 /* 80377338 00374298 38 C5 00 14 */ addi r6, r5, 0x14 @@ -415,6 +584,7 @@ lbl_80377274: /* 80377344 003742A4 7C A0 03 78 */ or r0, r5, r0 /* 80377348 003742A8 90 06 00 00 */ stw r0, 0(r6) /* 8037734C 003742AC 48 00 02 24 */ b lbl_80377570 +lbl_80377350: /* 80377350 003742B0 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377354 003742B4 54 00 30 32 */ slwi r0, r0, 6 /* 80377358 003742B8 38 C5 00 14 */ addi r6, r5, 0x14 @@ -423,6 +593,7 @@ lbl_80377274: /* 80377364 003742C4 7C A0 03 78 */ or r0, r5, r0 /* 80377368 003742C8 90 06 00 00 */ stw r0, 0(r6) /* 8037736C 003742CC 48 00 02 04 */ b lbl_80377570 +lbl_80377370: /* 80377370 003742D0 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377374 003742D4 54 00 38 30 */ slwi r0, r0, 7 /* 80377378 003742D8 38 C5 00 14 */ addi r6, r5, 0x14 @@ -431,6 +602,7 @@ lbl_80377274: /* 80377384 003742E4 7C A0 03 78 */ or r0, r5, r0 /* 80377388 003742E8 90 06 00 00 */ stw r0, 0(r6) /* 8037738C 003742EC 48 00 01 E4 */ b lbl_80377570 +lbl_80377390: /* 80377390 003742F0 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377394 003742F4 54 00 40 2E */ slwi r0, r0, 8 /* 80377398 003742F8 38 C5 00 14 */ addi r6, r5, 0x14 @@ -439,6 +611,7 @@ lbl_80377274: /* 803773A4 00374304 7C A0 03 78 */ or r0, r5, r0 /* 803773A8 00374308 90 06 00 00 */ stw r0, 0(r6) /* 803773AC 0037430C 48 00 01 C4 */ b lbl_80377570 +lbl_803773B0: /* 803773B0 00374310 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 803773B4 00374314 54 00 48 2C */ slwi r0, r0, 9 /* 803773B8 00374318 38 C5 00 14 */ addi r6, r5, 0x14 @@ -447,6 +620,7 @@ lbl_80377274: /* 803773C4 00374324 7C A0 03 78 */ or r0, r5, r0 /* 803773C8 00374328 90 06 00 00 */ stw r0, 0(r6) /* 803773CC 0037432C 48 00 01 A4 */ b lbl_80377570 +lbl_803773D0: /* 803773D0 00374330 2C 00 00 00 */ cmpwi r0, 0 /* 803773D4 00374334 41 82 00 20 */ beq lbl_803773F4 /* 803773D8 00374338 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) @@ -461,6 +635,7 @@ lbl_803773F4: /* 803773F8 00374358 38 00 00 00 */ li r0, 0 /* 803773FC 0037435C 98 05 04 1C */ stb r0, 0x41c(r5) /* 80377400 00374360 48 00 01 70 */ b lbl_80377570 +lbl_80377404: /* 80377404 00374364 2C 00 00 00 */ cmpwi r0, 0 /* 80377408 00374368 41 82 00 20 */ beq lbl_80377428 /* 8037740C 0037436C 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) @@ -475,6 +650,7 @@ lbl_80377428: /* 8037742C 0037438C 38 00 00 00 */ li r0, 0 /* 80377430 00374390 98 05 04 1D */ stb r0, 0x41d(r5) /* 80377434 00374394 48 00 01 3C */ b lbl_80377570 +lbl_80377438: /* 80377438 00374398 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 8037743C 0037439C 54 00 68 24 */ slwi r0, r0, 0xd /* 80377440 003743A0 38 C5 00 14 */ addi r6, r5, 0x14 @@ -483,6 +659,7 @@ lbl_80377428: /* 8037744C 003743AC 7C A0 03 78 */ or r0, r5, r0 /* 80377450 003743B0 90 06 00 00 */ stw r0, 0(r6) /* 80377454 003743B4 48 00 01 1C */ b lbl_80377570 +lbl_80377458: /* 80377458 003743B8 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 8037745C 003743BC 54 00 78 20 */ slwi r0, r0, 0xf /* 80377460 003743C0 38 C5 00 14 */ addi r6, r5, 0x14 @@ -491,6 +668,7 @@ lbl_80377428: /* 8037746C 003743CC 7C A0 03 78 */ or r0, r5, r0 /* 80377470 003743D0 90 06 00 00 */ stw r0, 0(r6) /* 80377474 003743D4 48 00 00 FC */ b lbl_80377570 +lbl_80377478: /* 80377478 003743D8 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 8037747C 003743DC 38 C5 00 18 */ addi r6, r5, 0x18 /* 80377480 003743E0 80 A5 00 18 */ lwz r5, 0x18(r5) @@ -498,6 +676,7 @@ lbl_80377428: /* 80377488 003743E8 7C A0 03 78 */ or r0, r5, r0 /* 8037748C 003743EC 90 06 00 00 */ stw r0, 0(r6) /* 80377490 003743F0 48 00 00 E0 */ b lbl_80377570 +lbl_80377494: /* 80377494 003743F4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377498 003743F8 54 00 10 3A */ slwi r0, r0, 2 /* 8037749C 003743FC 38 C5 00 18 */ addi r6, r5, 0x18 @@ -506,6 +685,7 @@ lbl_80377428: /* 803774A8 00374408 7C A0 03 78 */ or r0, r5, r0 /* 803774AC 0037440C 90 06 00 00 */ stw r0, 0(r6) /* 803774B0 00374410 48 00 00 C0 */ b lbl_80377570 +lbl_803774B4: /* 803774B4 00374414 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 803774B8 00374418 54 00 20 36 */ slwi r0, r0, 4 /* 803774BC 0037441C 38 C5 00 18 */ addi r6, r5, 0x18 @@ -514,6 +694,7 @@ lbl_80377428: /* 803774C8 00374428 7C A0 03 78 */ or r0, r5, r0 /* 803774CC 0037442C 90 06 00 00 */ stw r0, 0(r6) /* 803774D0 00374430 48 00 00 A0 */ b lbl_80377570 +lbl_803774D4: /* 803774D4 00374434 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 803774D8 00374438 54 00 30 32 */ slwi r0, r0, 6 /* 803774DC 0037443C 38 C5 00 18 */ addi r6, r5, 0x18 @@ -522,6 +703,7 @@ lbl_80377428: /* 803774E8 00374448 7C A0 03 78 */ or r0, r5, r0 /* 803774EC 0037444C 90 06 00 00 */ stw r0, 0(r6) /* 803774F0 00374450 48 00 00 80 */ b lbl_80377570 +lbl_803774F4: /* 803774F4 00374454 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 803774F8 00374458 54 00 40 2E */ slwi r0, r0, 8 /* 803774FC 0037445C 38 C5 00 18 */ addi r6, r5, 0x18 @@ -530,6 +712,7 @@ lbl_80377428: /* 80377508 00374468 7C A0 03 78 */ or r0, r5, r0 /* 8037750C 0037446C 90 06 00 00 */ stw r0, 0(r6) /* 80377510 00374470 48 00 00 60 */ b lbl_80377570 +lbl_80377514: /* 80377514 00374474 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377518 00374478 54 00 50 2A */ slwi r0, r0, 0xa /* 8037751C 0037447C 38 C5 00 18 */ addi r6, r5, 0x18 @@ -538,6 +721,7 @@ lbl_80377428: /* 80377528 00374488 7C A0 03 78 */ or r0, r5, r0 /* 8037752C 0037448C 90 06 00 00 */ stw r0, 0(r6) /* 80377530 00374490 48 00 00 40 */ b lbl_80377570 +lbl_80377534: /* 80377534 00374494 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377538 00374498 54 00 60 26 */ slwi r0, r0, 0xc /* 8037753C 0037449C 38 C5 00 18 */ addi r6, r5, 0x18 @@ -546,6 +730,7 @@ lbl_80377428: /* 80377548 003744A8 7C A0 03 78 */ or r0, r5, r0 /* 8037754C 003744AC 90 06 00 00 */ stw r0, 0(r6) /* 80377550 003744B0 48 00 00 20 */ b lbl_80377570 +lbl_80377554: /* 80377554 003744B4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) /* 80377558 003744B8 54 00 70 22 */ slwi r0, r0, 0xe /* 8037755C 003744BC 38 C5 00 18 */ addi r6, r5, 0x18 @@ -722,6 +907,7 @@ GXSetVtxAttrFmt: /* 803777BC 0037471C 7C 0A 00 2E */ lwzx r0, r10, r0 /* 803777C0 00374720 7C 09 03 A6 */ mtctr r0 /* 803777C4 00374724 4E 80 04 20 */ bctr +lbl_803777C8: /* 803777C8 00374728 80 04 00 00 */ lwz r0, 0(r4) /* 803777CC 0037472C 54 C6 08 3C */ slwi r6, r6, 1 /* 803777D0 00374730 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e @@ -737,6 +923,7 @@ GXSetVtxAttrFmt: /* 803777F8 00374758 7C A0 03 78 */ or r0, r5, r0 /* 803777FC 0037475C 90 04 00 00 */ stw r0, 0(r4) /* 80377800 00374760 48 00 02 B4 */ b lbl_80377AB4 +lbl_80377804: /* 80377804 00374764 80 E4 00 00 */ lwz r7, 0(r4) /* 80377808 00374768 54 C0 50 2A */ slwi r0, r6, 0xa /* 8037780C 0037476C 2C 05 00 02 */ cmpwi r5, 2 @@ -763,6 +950,7 @@ lbl_80377844: /* 8037785C 003747BC 54 00 00 7E */ clrlwi r0, r0, 1 /* 80377860 003747C0 90 04 00 00 */ stw r0, 0(r4) /* 80377864 003747C4 48 00 02 50 */ b lbl_80377AB4 +lbl_80377868: /* 80377868 003747C8 80 E4 00 00 */ lwz r7, 0(r4) /* 8037786C 003747CC 54 A5 68 24 */ slwi r5, r5, 0xd /* 80377870 003747D0 54 C0 70 22 */ slwi r0, r6, 0xe @@ -774,6 +962,7 @@ lbl_80377844: /* 80377888 003747E8 7C A0 03 78 */ or r0, r5, r0 /* 8037788C 003747EC 90 04 00 00 */ stw r0, 0(r4) /* 80377890 003747F0 48 00 02 24 */ b lbl_80377AB4 +lbl_80377894: /* 80377894 003747F4 80 E4 00 00 */ lwz r7, 0(r4) /* 80377898 003747F8 54 A5 88 1C */ slwi r5, r5, 0x11 /* 8037789C 003747FC 54 C0 90 1A */ slwi r0, r6, 0x12 @@ -785,6 +974,7 @@ lbl_80377844: /* 803778B4 00374814 7C A0 03 78 */ or r0, r5, r0 /* 803778B8 00374818 90 04 00 00 */ stw r0, 0(r4) /* 803778BC 0037481C 48 00 01 F8 */ b lbl_80377AB4 +lbl_803778C0: /* 803778C0 00374820 81 04 00 00 */ lwz r8, 0(r4) /* 803778C4 00374824 54 A0 A8 14 */ slwi r0, r5, 0x15 /* 803778C8 00374828 55 05 02 D2 */ rlwinm r5, r8, 0, 0xb, 9 @@ -801,6 +991,7 @@ lbl_80377844: /* 803778F4 00374854 7C A0 03 78 */ or r0, r5, r0 /* 803778F8 00374858 90 04 00 00 */ stw r0, 0(r4) /* 803778FC 0037485C 48 00 01 B8 */ b lbl_80377AB4 +lbl_80377900: /* 80377900 00374860 80 08 00 00 */ lwz r0, 0(r8) /* 80377904 00374864 54 C4 08 3C */ slwi r4, r6, 1 /* 80377908 00374868 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e @@ -816,6 +1007,7 @@ lbl_80377844: /* 80377930 00374890 7C 80 03 78 */ or r0, r4, r0 /* 80377934 00374894 90 08 00 00 */ stw r0, 0(r8) /* 80377938 00374898 48 00 01 7C */ b lbl_80377AB4 +lbl_8037793C: /* 8037793C 0037489C 80 88 00 00 */ lwz r4, 0(r8) /* 80377940 003748A0 54 A0 48 2C */ slwi r0, r5, 9 /* 80377944 003748A4 54 84 05 EA */ rlwinm r4, r4, 0, 0x17, 0x15 @@ -832,6 +1024,7 @@ lbl_80377844: /* 80377970 003748D0 7C 80 03 78 */ or r0, r4, r0 /* 80377974 003748D4 90 08 00 00 */ stw r0, 0(r8) /* 80377978 003748D8 48 00 01 3C */ b lbl_80377AB4 +lbl_8037797C: /* 8037797C 003748DC 80 88 00 00 */ lwz r4, 0(r8) /* 80377980 003748E0 54 A0 90 1A */ slwi r0, r5, 0x12 /* 80377984 003748E4 54 84 03 98 */ rlwinm r4, r4, 0, 0xe, 0xc @@ -848,6 +1041,7 @@ lbl_80377844: /* 803779B0 00374910 7C 80 03 78 */ or r0, r4, r0 /* 803779B4 00374914 90 08 00 00 */ stw r0, 0(r8) /* 803779B8 00374918 48 00 00 FC */ b lbl_80377AB4 +lbl_803779BC: /* 803779BC 0037491C 81 48 00 00 */ lwz r10, 0(r8) /* 803779C0 00374920 54 A0 D8 08 */ slwi r0, r5, 0x1b /* 803779C4 00374924 54 C4 E0 06 */ slwi r4, r6, 0x1c @@ -864,6 +1058,7 @@ lbl_80377844: /* 803779F0 00374950 7C 80 03 78 */ or r0, r4, r0 /* 803779F4 00374954 90 09 00 00 */ stw r0, 0(r9) /* 803779F8 00374958 48 00 00 BC */ b lbl_80377AB4 +lbl_803779FC: /* 803779FC 0037495C 80 89 00 00 */ lwz r4, 0(r9) /* 80377A00 00374960 54 A0 28 34 */ slwi r0, r5, 5 /* 80377A04 00374964 54 84 06 F2 */ rlwinm r4, r4, 0, 0x1b, 0x19 @@ -880,6 +1075,7 @@ lbl_80377844: /* 80377A30 00374990 7C 80 03 78 */ or r0, r4, r0 /* 80377A34 00374994 90 09 00 00 */ stw r0, 0(r9) /* 80377A38 00374998 48 00 00 7C */ b lbl_80377AB4 +lbl_80377A3C: /* 80377A3C 0037499C 80 89 00 00 */ lwz r4, 0(r9) /* 80377A40 003749A0 54 A0 70 22 */ slwi r0, r5, 0xe /* 80377A44 003749A4 54 84 04 A0 */ rlwinm r4, r4, 0, 0x12, 0x10 @@ -896,6 +1092,7 @@ lbl_80377844: /* 80377A70 003749D0 7C 80 03 78 */ or r0, r4, r0 /* 80377A74 003749D4 90 09 00 00 */ stw r0, 0(r9) /* 80377A78 003749D8 48 00 00 3C */ b lbl_80377AB4 +lbl_80377A7C: /* 80377A7C 003749DC 80 89 00 00 */ lwz r4, 0(r9) /* 80377A80 003749E0 54 A0 B8 10 */ slwi r0, r5, 0x17 /* 80377A84 003749E4 54 84 02 4E */ rlwinm r4, r4, 0, 9, 7 @@ -947,6 +1144,7 @@ lbl_80377B08: /* 80377B28 00374A88 7D 65 58 2E */ lwzx r11, r5, r11 /* 80377B2C 00374A8C 7D 69 03 A6 */ mtctr r11 /* 80377B30 00374A90 4E 80 04 20 */ bctr +lbl_80377B34: /* 80377B34 00374A94 81 88 00 00 */ lwz r12, 0(r8) /* 80377B38 00374A98 54 CB 08 3C */ slwi r11, r6, 1 /* 80377B3C 00374A9C 54 E6 20 36 */ slwi r6, r7, 4 @@ -962,6 +1160,7 @@ lbl_80377B08: /* 80377B64 00374AC4 7C 00 33 78 */ or r0, r0, r6 /* 80377B68 00374AC8 90 08 00 00 */ stw r0, 0(r8) /* 80377B6C 00374ACC 48 00 02 B0 */ b lbl_80377E1C +lbl_80377B70: /* 80377B70 00374AD0 80 E8 00 00 */ lwz r7, 0(r8) /* 80377B74 00374AD4 54 C6 50 2A */ slwi r6, r6, 0xa /* 80377B78 00374AD8 2C 00 00 02 */ cmpwi r0, 2 @@ -988,6 +1187,7 @@ lbl_80377BB0: /* 80377BC8 00374B28 54 00 00 7E */ clrlwi r0, r0, 1 /* 80377BCC 00374B2C 90 08 00 00 */ stw r0, 0(r8) /* 80377BD0 00374B30 48 00 02 4C */ b lbl_80377E1C +lbl_80377BD4: /* 80377BD4 00374B34 81 68 00 00 */ lwz r11, 0(r8) /* 80377BD8 00374B38 54 07 68 24 */ slwi r7, r0, 0xd /* 80377BDC 00374B3C 54 C0 70 22 */ slwi r0, r6, 0xe @@ -999,6 +1199,7 @@ lbl_80377BB0: /* 80377BF4 00374B54 7C C0 03 78 */ or r0, r6, r0 /* 80377BF8 00374B58 90 08 00 00 */ stw r0, 0(r8) /* 80377BFC 00374B5C 48 00 02 20 */ b lbl_80377E1C +lbl_80377C00: /* 80377C00 00374B60 81 68 00 00 */ lwz r11, 0(r8) /* 80377C04 00374B64 54 07 88 1C */ slwi r7, r0, 0x11 /* 80377C08 00374B68 54 C0 90 1A */ slwi r0, r6, 0x12 @@ -1010,6 +1211,7 @@ lbl_80377BB0: /* 80377C20 00374B80 7C C0 03 78 */ or r0, r6, r0 /* 80377C24 00374B84 90 08 00 00 */ stw r0, 0(r8) /* 80377C28 00374B88 48 00 01 F4 */ b lbl_80377E1C +lbl_80377C2C: /* 80377C2C 00374B8C 81 68 00 00 */ lwz r11, 0(r8) /* 80377C30 00374B90 54 00 A8 14 */ slwi r0, r0, 0x15 /* 80377C34 00374B94 54 C6 B0 12 */ slwi r6, r6, 0x16 @@ -1026,6 +1228,7 @@ lbl_80377BB0: /* 80377C60 00374BC0 7C C0 03 78 */ or r0, r6, r0 /* 80377C64 00374BC4 90 08 00 00 */ stw r0, 0(r8) /* 80377C68 00374BC8 48 00 01 B4 */ b lbl_80377E1C +lbl_80377C6C: /* 80377C6C 00374BCC 81 89 00 00 */ lwz r12, 0(r9) /* 80377C70 00374BD0 54 CB 08 3C */ slwi r11, r6, 1 /* 80377C74 00374BD4 54 E6 20 36 */ slwi r6, r7, 4 @@ -1041,6 +1244,7 @@ lbl_80377BB0: /* 80377C9C 00374BFC 7C 00 33 78 */ or r0, r0, r6 /* 80377CA0 00374C00 90 09 00 00 */ stw r0, 0(r9) /* 80377CA4 00374C04 48 00 01 78 */ b lbl_80377E1C +lbl_80377CA8: /* 80377CA8 00374C08 81 69 00 00 */ lwz r11, 0(r9) /* 80377CAC 00374C0C 54 00 48 2C */ slwi r0, r0, 9 /* 80377CB0 00374C10 54 C6 50 2A */ slwi r6, r6, 0xa @@ -1057,6 +1261,7 @@ lbl_80377BB0: /* 80377CDC 00374C3C 7C C0 03 78 */ or r0, r6, r0 /* 80377CE0 00374C40 90 09 00 00 */ stw r0, 0(r9) /* 80377CE4 00374C44 48 00 01 38 */ b lbl_80377E1C +lbl_80377CE8: /* 80377CE8 00374C48 81 69 00 00 */ lwz r11, 0(r9) /* 80377CEC 00374C4C 54 00 90 1A */ slwi r0, r0, 0x12 /* 80377CF0 00374C50 54 C6 98 18 */ slwi r6, r6, 0x13 @@ -1073,6 +1278,7 @@ lbl_80377BB0: /* 80377D1C 00374C7C 7C C0 03 78 */ or r0, r6, r0 /* 80377D20 00374C80 90 09 00 00 */ stw r0, 0(r9) /* 80377D24 00374C84 48 00 00 F8 */ b lbl_80377E1C +lbl_80377D28: /* 80377D28 00374C88 81 89 00 00 */ lwz r12, 0(r9) /* 80377D2C 00374C8C 54 0B D8 08 */ slwi r11, r0, 0x1b /* 80377D30 00374C90 54 C0 E0 06 */ slwi r0, r6, 0x1c @@ -1088,6 +1294,7 @@ lbl_80377BB0: /* 80377D58 00374CB8 7C 00 3B 78 */ or r0, r0, r7 /* 80377D5C 00374CBC 90 0A 00 00 */ stw r0, 0(r10) /* 80377D60 00374CC0 48 00 00 BC */ b lbl_80377E1C +lbl_80377D64: /* 80377D64 00374CC4 81 6A 00 00 */ lwz r11, 0(r10) /* 80377D68 00374CC8 54 00 28 34 */ slwi r0, r0, 5 /* 80377D6C 00374CCC 54 C6 30 32 */ slwi r6, r6, 6 @@ -1104,6 +1311,7 @@ lbl_80377BB0: /* 80377D98 00374CF8 7C C0 03 78 */ or r0, r6, r0 /* 80377D9C 00374CFC 90 0A 00 00 */ stw r0, 0(r10) /* 80377DA0 00374D00 48 00 00 7C */ b lbl_80377E1C +lbl_80377DA4: /* 80377DA4 00374D04 81 6A 00 00 */ lwz r11, 0(r10) /* 80377DA8 00374D08 54 00 70 22 */ slwi r0, r0, 0xe /* 80377DAC 00374D0C 54 C6 78 20 */ slwi r6, r6, 0xf @@ -1120,6 +1328,7 @@ lbl_80377BB0: /* 80377DD8 00374D38 7C C0 03 78 */ or r0, r6, r0 /* 80377DDC 00374D3C 90 0A 00 00 */ stw r0, 0(r10) /* 80377DE0 00374D40 48 00 00 3C */ b lbl_80377E1C +lbl_80377DE4: /* 80377DE4 00374D44 81 8A 00 00 */ lwz r12, 0(r10) /* 80377DE8 00374D48 54 0B B8 10 */ slwi r11, r0, 0x17 /* 80377DEC 00374D4C 54 C0 C0 0E */ slwi r0, r6, 0x18 @@ -1261,36 +1470,50 @@ GXSetTexCoordGen2: /* 80377FC0 00374F20 7C 09 00 2E */ lwzx r0, r9, r0 /* 80377FC4 00374F24 7C 09 03 A6 */ mtctr r0 /* 80377FC8 00374F28 4E 80 04 20 */ bctr +lbl_80377FCC: /* 80377FCC 00374F2C 39 40 00 00 */ li r10, 0 /* 80377FD0 00374F30 39 80 00 01 */ li r12, 1 /* 80377FD4 00374F34 48 00 00 74 */ b lbl_80378048 +lbl_80377FD8: /* 80377FD8 00374F38 39 40 00 01 */ li r10, 1 /* 80377FDC 00374F3C 39 80 00 01 */ li r12, 1 /* 80377FE0 00374F40 48 00 00 68 */ b lbl_80378048 +lbl_80377FE4: /* 80377FE4 00374F44 39 40 00 03 */ li r10, 3 /* 80377FE8 00374F48 39 80 00 01 */ li r12, 1 /* 80377FEC 00374F4C 48 00 00 5C */ b lbl_80378048 +lbl_80377FF0: /* 80377FF0 00374F50 39 40 00 04 */ li r10, 4 /* 80377FF4 00374F54 39 80 00 01 */ li r12, 1 /* 80377FF8 00374F58 48 00 00 50 */ b lbl_80378048 +lbl_80377FFC: /* 80377FFC 00374F5C 39 40 00 02 */ li r10, 2 /* 80378000 00374F60 48 00 00 48 */ b lbl_80378048 +lbl_80378004: /* 80378004 00374F64 39 40 00 02 */ li r10, 2 /* 80378008 00374F68 48 00 00 40 */ b lbl_80378048 +lbl_8037800C: /* 8037800C 00374F6C 39 40 00 05 */ li r10, 5 /* 80378010 00374F70 48 00 00 38 */ b lbl_80378048 +lbl_80378014: /* 80378014 00374F74 39 40 00 06 */ li r10, 6 /* 80378018 00374F78 48 00 00 30 */ b lbl_80378048 +lbl_8037801C: /* 8037801C 00374F7C 39 40 00 07 */ li r10, 7 /* 80378020 00374F80 48 00 00 28 */ b lbl_80378048 +lbl_80378024: /* 80378024 00374F84 39 40 00 08 */ li r10, 8 /* 80378028 00374F88 48 00 00 20 */ b lbl_80378048 +lbl_8037802C: /* 8037802C 00374F8C 39 40 00 09 */ li r10, 9 /* 80378030 00374F90 48 00 00 18 */ b lbl_80378048 +lbl_80378034: /* 80378034 00374F94 39 40 00 0A */ li r10, 0xa /* 80378038 00374F98 48 00 00 10 */ b lbl_80378048 +lbl_8037803C: /* 8037803C 00374F9C 39 40 00 0B */ li r10, 0xb /* 80378040 00374FA0 48 00 00 08 */ b lbl_80378048 +lbl_80378044: /* 80378044 00374FA4 39 40 00 0C */ li r10, 0xc lbl_80378048: /* 80378048 00374FA8 2C 04 00 01 */ cmpwi r4, 1 @@ -1369,6 +1592,7 @@ lbl_80378100: /* 8037814C 003750AC 7C 04 00 2E */ lwzx r0, r4, r0 /* 80378150 003750B0 7C 09 03 A6 */ mtctr r0 /* 80378154 003750B4 4E 80 04 20 */ bctr +lbl_80378158: /* 80378158 003750B8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) /* 8037815C 003750BC 54 C0 30 32 */ slwi r0, r6, 6 /* 80378160 003750C0 38 A4 00 80 */ addi r5, r4, 0x80 @@ -1377,6 +1601,7 @@ lbl_80378100: /* 8037816C 003750CC 7C 80 03 78 */ or r0, r4, r0 /* 80378170 003750D0 90 05 00 00 */ stw r0, 0(r5) /* 80378174 003750D4 48 00 00 D8 */ b lbl_8037824C +lbl_80378178: /* 80378178 003750D8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) /* 8037817C 003750DC 54 C0 60 26 */ slwi r0, r6, 0xc /* 80378180 003750E0 38 A4 00 80 */ addi r5, r4, 0x80 @@ -1385,6 +1610,7 @@ lbl_80378100: /* 8037818C 003750EC 7C 80 03 78 */ or r0, r4, r0 /* 80378190 003750F0 90 05 00 00 */ stw r0, 0(r5) /* 80378194 003750F4 48 00 00 B8 */ b lbl_8037824C +lbl_80378198: /* 80378198 003750F8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) /* 8037819C 003750FC 54 C0 90 1A */ slwi r0, r6, 0x12 /* 803781A0 00375100 38 A4 00 80 */ addi r5, r4, 0x80 @@ -1393,6 +1619,7 @@ lbl_80378100: /* 803781AC 0037510C 7C 80 03 78 */ or r0, r4, r0 /* 803781B0 00375110 90 05 00 00 */ stw r0, 0(r5) /* 803781B4 00375114 48 00 00 98 */ b lbl_8037824C +lbl_803781B8: /* 803781B8 00375118 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) /* 803781BC 0037511C 54 C0 C0 0E */ slwi r0, r6, 0x18 /* 803781C0 00375120 38 A4 00 80 */ addi r5, r4, 0x80 @@ -1401,12 +1628,14 @@ lbl_80378100: /* 803781CC 0037512C 7C 80 03 78 */ or r0, r4, r0 /* 803781D0 00375130 90 05 00 00 */ stw r0, 0(r5) /* 803781D4 00375134 48 00 00 78 */ b lbl_8037824C +lbl_803781D8: /* 803781D8 00375138 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) /* 803781DC 0037513C 84 04 00 84 */ lwzu r0, 0x84(r4) /* 803781E0 00375140 54 00 00 32 */ rlwinm r0, r0, 0, 0, 0x19 /* 803781E4 00375144 7C 00 33 78 */ or r0, r0, r6 /* 803781E8 00375148 90 04 00 00 */ stw r0, 0(r4) /* 803781EC 0037514C 48 00 00 60 */ b lbl_8037824C +lbl_803781F0: /* 803781F0 00375150 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) /* 803781F4 00375154 54 C0 30 32 */ slwi r0, r6, 6 /* 803781F8 00375158 38 A4 00 84 */ addi r5, r4, 0x84 @@ -1415,6 +1644,7 @@ lbl_80378100: /* 80378204 00375164 7C 80 03 78 */ or r0, r4, r0 /* 80378208 00375168 90 05 00 00 */ stw r0, 0(r5) /* 8037820C 0037516C 48 00 00 40 */ b lbl_8037824C +lbl_80378210: /* 80378210 00375170 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) /* 80378214 00375174 54 C0 60 26 */ slwi r0, r6, 0xc /* 80378218 00375178 38 A4 00 84 */ addi r5, r4, 0x84 diff --git a/asm/Dolphin/gx/GXFrameBuf.s b/asm/Dolphin/gx/GXFrameBuf.s index 7efff2b0..fb6bd837 100644 --- a/asm/Dolphin/gx/GXFrameBuf.s +++ b/asm/Dolphin/gx/GXFrameBuf.s @@ -1,5 +1,84 @@ .include "macros.inc" +.section .data +.balign 8 + +.global lbl_803F08E0 +lbl_803F08E0: + # ROM: 0x3ED8E0 + .4byte 0 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + +.global lbl_803F091C +lbl_803F091C: + # ROM: 0x3ED91C + .4byte 0x00000008 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + +.global lbl_803F0958 +lbl_803F0958: + # ROM: 0x3ED958 + .4byte 0x00000004 + .4byte 0x02800210 + .4byte 0x02100028 + .4byte 0x00170280 + .4byte 0x02100000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + +.global lbl_803F0994 +lbl_803F0994: + # ROM: 0x3ED994 + .4byte 0x00000014 + .4byte 0x028001E0 + .4byte 0x01E00028 + .4byte 0x00000280 + .4byte 0x01E00000 + .4byte 0x00000001 + .4byte 0x00000606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060606 + .4byte 0x06060808 + .4byte 0x0A0C0A08 + .4byte 0x08000000 + .section .sdata2 .balign 8 .global lbl_805AEB50 diff --git a/asm/Dolphin/gx/GXInit.s b/asm/Dolphin/gx/GXInit.s index bdc7cb0a..69cfc024 100644 --- a/asm/Dolphin/gx/GXInit.s +++ b/asm/Dolphin/gx/GXInit.s @@ -26,7 +26,7 @@ lbl_805A9844: .global lbl_805A8AC8 lbl_805A8AC8: # ROM: 0x3F6468 - .4byte 0x803F05E8 + .4byte lbl_803F05E8 .4byte 0 @@ -36,7 +36,7 @@ lbl_805A8AC8: .global lbl_805AEB28 lbl_805AEB28: # ROM: 0x3FB3C8 - .4byte 0x80540C88 + .4byte lbl_80540C88 .global lbl_805AEB2C lbl_805AEB2C: @@ -150,220 +150,6 @@ lbl_803F06FC: .4byte 0xC0000000 .4byte 0 -.global lbl_803F0718 -lbl_803F0718: - # ROM: 0x3ED718 - .4byte 0x80376F38 - .4byte 0x80376F50 - .4byte 0x80376F70 - .4byte 0x80376F90 - .4byte 0x80376FB0 - .4byte 0x80376FD0 - .4byte 0x80376FF0 - .4byte 0x80377010 - .4byte 0x80377030 - .4byte 0x80377050 - .4byte 0x80377070 - .4byte 0x803770D8 - .4byte 0x803770F8 - .4byte 0x80377118 - .4byte 0x80377130 - .4byte 0x80377150 - .4byte 0x80377170 - .4byte 0x80377190 - .4byte 0x803771B0 - .4byte 0x803771D0 - .4byte 0x803771F0 - .4byte 0x8037720C - .4byte 0x8037720C - .4byte 0x8037720C - .4byte 0x8037720C - .4byte 0x803770A4 - -.global lbl_803F0780 -lbl_803F0780: - # ROM: 0x3ED780 - .4byte 0x80377294 - .4byte 0x803772B0 - .4byte 0x803772D0 - .4byte 0x803772F0 - .4byte 0x80377310 - .4byte 0x80377330 - .4byte 0x80377350 - .4byte 0x80377370 - .4byte 0x80377390 - .4byte 0x803773B0 - .4byte 0x803773D0 - .4byte 0x80377438 - .4byte 0x80377458 - .4byte 0x80377478 - .4byte 0x80377494 - .4byte 0x803774B4 - .4byte 0x803774D4 - .4byte 0x803774F4 - .4byte 0x80377514 - .4byte 0x80377534 - .4byte 0x80377554 - .4byte 0x80377570 - .4byte 0x80377570 - .4byte 0x80377570 - .4byte 0x80377570 - .4byte 0x80377404 - -.global lbl_803F07E8 -lbl_803F07E8: - # ROM: 0x3ED7E8 - .4byte 0x803777C8 - .4byte 0x80377804 - .4byte 0x80377868 - .4byte 0x80377894 - .4byte 0x803778C0 - .4byte 0x80377900 - .4byte 0x8037793C - .4byte 0x8037797C - .4byte 0x803779BC - .4byte 0x803779FC - .4byte 0x80377A3C - .4byte 0x80377A7C - .4byte 0x80377AB4 - .4byte 0x80377AB4 - .4byte 0x80377AB4 - .4byte 0x80377AB4 - .4byte 0x80377804 - -.global lbl_803F082C -lbl_803F082C: - # ROM: 0x3ED82C - .4byte 0x80377B34 - .4byte 0x80377B70 - .4byte 0x80377BD4 - .4byte 0x80377C00 - .4byte 0x80377C2C - .4byte 0x80377C6C - .4byte 0x80377CA8 - .4byte 0x80377CE8 - .4byte 0x80377D28 - .4byte 0x80377D64 - .4byte 0x80377DA4 - .4byte 0x80377DE4 - .4byte 0x80377E1C - .4byte 0x80377E1C - .4byte 0x80377E1C - .4byte 0x80377E1C - .4byte 0x80377B70 - -.global lbl_803F0870 -lbl_803F0870: - # ROM: 0x3ED870 - .4byte 0x80378158 - .4byte 0x80378178 - .4byte 0x80378198 - .4byte 0x803781B8 - .4byte 0x803781D8 - .4byte 0x803781F0 - .4byte 0x80378210 - -.global lbl_803F088C -lbl_803F088C: - # ROM: 0x3ED88C - .4byte 0x80377FCC - .4byte 0x80377FD8 - .4byte 0x80377FE4 - .4byte 0x80377FF0 - .4byte 0x8037800C - .4byte 0x80378014 - .4byte 0x8037801C - .4byte 0x80378024 - .4byte 0x8037802C - .4byte 0x80378034 - .4byte 0x8037803C - .4byte 0x80378044 - .4byte 0x80378048 - .4byte 0x80378048 - .4byte 0x80378048 - .4byte 0x80378048 - .4byte 0x80378048 - .4byte 0x80378048 - .4byte 0x80378048 - .4byte 0x80377FFC - .4byte 0x80378004 - -.global lbl_803F08E0 -lbl_803F08E0: - # ROM: 0x3ED8E0 - .4byte 0 - .4byte 0x028001E0 - .4byte 0x01E00028 - .4byte 0x00000280 - .4byte 0x01E00000 - .4byte 0x00000001 - .4byte 0x00000606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060808 - .4byte 0x0A0C0A08 - .4byte 0x08000000 - -.global lbl_803F091C -lbl_803F091C: - # ROM: 0x3ED91C - .4byte 0x00000008 - .4byte 0x028001E0 - .4byte 0x01E00028 - .4byte 0x00000280 - .4byte 0x01E00000 - .4byte 0x00000001 - .4byte 0x00000606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060808 - .4byte 0x0A0C0A08 - .4byte 0x08000000 - -.global lbl_803F0958 -lbl_803F0958: - # ROM: 0x3ED958 - .4byte 0x00000004 - .4byte 0x02800210 - .4byte 0x02100028 - .4byte 0x00170280 - .4byte 0x02100000 - .4byte 0x00000001 - .4byte 0x00000606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060808 - .4byte 0x0A0C0A08 - .4byte 0x08000000 - -.global lbl_803F0994 -lbl_803F0994: - # ROM: 0x3ED994 - .4byte 0x00000014 - .4byte 0x028001E0 - .4byte 0x01E00028 - .4byte 0x00000280 - .4byte 0x01E00000 - .4byte 0x00000001 - .4byte 0x00000606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060606 - .4byte 0x06060808 - .4byte 0x0A0C0A08 - .4byte 0x08000000 - .section .text, "ax" diff --git a/asm/Dolphin/gx/GXLight.s b/asm/Dolphin/gx/GXLight.s index eaeadff5..79a4bac9 100644 --- a/asm/Dolphin/gx/GXLight.s +++ b/asm/Dolphin/gx/GXLight.s @@ -64,13 +64,13 @@ lbl_805AEB80: .global lbl_803F09D0 lbl_803F09D0: # ROM: 0x3ED9D0 - .4byte 0x80379864 - .4byte 0x80379774 - .4byte 0x80379788 - .4byte 0x803797A8 - .4byte 0x803797C8 - .4byte 0x803797F4 - .4byte 0x80379828 + .4byte lbl_80379864 + .4byte lbl_80379774 + .4byte lbl_80379788 + .4byte lbl_803797A8 + .4byte lbl_803797C8 + .4byte lbl_803797F4 + .4byte lbl_80379828 .4byte 0 @@ -118,11 +118,13 @@ lbl_80379740: /* 80379768 003766C8 7C 03 00 2E */ lwzx r0, r3, r0 /* 8037976C 003766CC 7C 09 03 A6 */ mtctr r0 /* 80379770 003766D0 4E 80 04 20 */ bctr +lbl_80379774: /* 80379774 003766D4 C0 02 CE 48 */ lfs f0, lbl_805AEB68@sda21(r2) /* 80379778 003766D8 C0 82 CE 4C */ lfs f4, lbl_805AEB6C@sda21(r2) /* 8037977C 003766DC EC 60 00 72 */ fmuls f3, f0, f1 /* 80379780 003766E0 C0 C2 CE 38 */ lfs f6, lbl_805AEB58@sda21(r2) /* 80379784 003766E4 48 00 00 EC */ b lbl_80379870 +lbl_80379788: /* 80379788 003766E8 C0 42 CE 50 */ lfs f2, lbl_805AEB70@sda21(r2) /* 8037978C 003766EC FC 00 08 50 */ fneg f0, f1 /* 80379790 003766F0 C0 C2 CE 38 */ lfs f6, lbl_805AEB58@sda21(r2) @@ -131,6 +133,7 @@ lbl_80379740: /* 8037979C 003766FC FC 80 08 90 */ fmr f4, f1 /* 803797A0 00376700 EC 60 00 72 */ fmuls f3, f0, f1 /* 803797A4 00376704 48 00 00 CC */ b lbl_80379870 +lbl_803797A8: /* 803797A8 00376708 C0 42 CE 50 */ lfs f2, lbl_805AEB70@sda21(r2) /* 803797AC 0037670C FC 00 08 50 */ fneg f0, f1 /* 803797B0 00376710 C0 62 CE 38 */ lfs f3, lbl_805AEB58@sda21(r2) @@ -139,6 +142,7 @@ lbl_80379740: /* 803797BC 0037671C FC C0 08 90 */ fmr f6, f1 /* 803797C0 00376720 EC 80 00 72 */ fmuls f4, f0, f1 /* 803797C4 00376724 48 00 00 AC */ b lbl_80379870 +lbl_803797C8: /* 803797C8 00376728 C0 82 CE 50 */ lfs f4, lbl_805AEB70@sda21(r2) /* 803797CC 0037672C C0 42 CE 54 */ lfs f2, lbl_805AEB74@sda21(r2) /* 803797D0 00376730 EC 64 08 28 */ fsubs f3, f4, f1 @@ -150,6 +154,7 @@ lbl_80379740: /* 803797E8 00376748 EC 82 00 72 */ fmuls f4, f2, f1 /* 803797EC 0037674C FC C0 08 50 */ fneg f6, f1 /* 803797F0 00376750 48 00 00 80 */ b lbl_80379870 +lbl_803797F4: /* 803797F4 00376754 C0 A2 CE 50 */ lfs f5, lbl_805AEB70@sda21(r2) /* 803797F8 00376758 C0 62 CE 58 */ lfs f3, lbl_805AEB78@sda21(r2) /* 803797FC 0037675C EC 85 08 28 */ fsubs f4, f5, f1 @@ -163,6 +168,7 @@ lbl_80379740: /* 8037981C 0037677C FC C0 10 90 */ fmr f6, f2 /* 80379820 00376780 EC 62 00 72 */ fmuls f3, f2, f1 /* 80379824 00376784 48 00 00 4C */ b lbl_80379870 +lbl_80379828: /* 80379828 00376788 C0 A2 CE 50 */ lfs f5, lbl_805AEB70@sda21(r2) /* 8037982C 0037678C C0 02 CE 54 */ lfs f0, lbl_805AEB74@sda21(r2) /* 80379830 00376790 EC 85 08 28 */ fsubs f4, f5, f1 diff --git a/asm/Dolphin/gx/GXPerf.s b/asm/Dolphin/gx/GXPerf.s index b57cf950..4a93a508 100644 --- a/asm/Dolphin/gx/GXPerf.s +++ b/asm/Dolphin/gx/GXPerf.s @@ -4,68 +4,68 @@ .balign 8 lbl_803F0CB0: # ROM: 0x3EDCB0 - .4byte 0x8037CD4C - .4byte 0x8037CD68 - .4byte 0x8037CD84 - .4byte 0x8037CDA0 - .4byte 0x8037CDF4 - .4byte 0x8037CE10 - .4byte 0x8037CE2C - .4byte 0x8037CE48 - .4byte 0x8037CDBC - .4byte 0x8037CE64 - .4byte 0x8037CE94 - .4byte 0x8037CEC4 - .4byte 0x8037CEF4 - .4byte 0x8037CF24 - .4byte 0x8037CF54 - .4byte 0x8037CF84 - .4byte 0x8037CFB4 - .4byte 0x8037CFE4 - .4byte 0x8037CFF4 - .4byte 0x8037D004 - .4byte 0x8037D014 - .4byte 0x8037CDD8 - .4byte 0x8037D020 + .4byte lbl_8037CD4C + .4byte lbl_8037CD68 + .4byte lbl_8037CD84 + .4byte lbl_8037CDA0 + .4byte lbl_8037CDF4 + .4byte lbl_8037CE10 + .4byte lbl_8037CE2C + .4byte lbl_8037CE48 + .4byte lbl_8037CDBC + .4byte lbl_8037CE64 + .4byte lbl_8037CE94 + .4byte lbl_8037CEC4 + .4byte lbl_8037CEF4 + .4byte lbl_8037CF24 + .4byte lbl_8037CF54 + .4byte lbl_8037CF84 + .4byte lbl_8037CFB4 + .4byte lbl_8037CFE4 + .4byte lbl_8037CFF4 + .4byte lbl_8037D004 + .4byte lbl_8037D014 + .4byte lbl_8037CDD8 + .4byte lbl_8037D020 lbl_803F0D0C: # ROM: 0x3EDD0C - .4byte 0x8037C920 - .4byte 0x8037C940 - .4byte 0x8037C960 - .4byte 0x8037C980 - .4byte 0x8037C9A0 - .4byte 0x8037C9C0 - .4byte 0x8037C9E0 - .4byte 0x8037CA00 - .4byte 0x8037CA20 - .4byte 0x8037CA40 - .4byte 0x8037CA80 - .4byte 0x8037CAA0 - .4byte 0x8037CABC - .4byte 0x8037CAD8 - .4byte 0x8037CAF4 - .4byte 0x8037CB10 - .4byte 0x8037CB2C - .4byte 0x8037CB48 - .4byte 0x8037CB64 - .4byte 0x8037CB80 - .4byte 0x8037CB9C - .4byte 0x8037CBB8 - .4byte 0x8037CBD4 - .4byte 0x8037CBF0 - .4byte 0x8037CC0C - .4byte 0x8037CC28 - .4byte 0x8037CC44 - .4byte 0x8037CC60 - .4byte 0x8037CC7C - .4byte 0x8037CC98 - .4byte 0x8037CCB4 - .4byte 0x8037CCD0 - .4byte 0x8037CCEC - .4byte 0x8037CD08 - .4byte 0x8037CA60 - .4byte 0x8037CD20 + .4byte lbl_8037C920 + .4byte lbl_8037C940 + .4byte lbl_8037C960 + .4byte lbl_8037C980 + .4byte lbl_8037C9A0 + .4byte lbl_8037C9C0 + .4byte lbl_8037C9E0 + .4byte lbl_8037CA00 + .4byte lbl_8037CA20 + .4byte lbl_8037CA40 + .4byte lbl_8037CA80 + .4byte lbl_8037CAA0 + .4byte lbl_8037CABC + .4byte lbl_8037CAD8 + .4byte lbl_8037CAF4 + .4byte lbl_8037CB10 + .4byte lbl_8037CB2C + .4byte lbl_8037CB48 + .4byte lbl_8037CB64 + .4byte lbl_8037CB80 + .4byte lbl_8037CB9C + .4byte lbl_8037CBB8 + .4byte lbl_8037CBD4 + .4byte lbl_8037CBF0 + .4byte lbl_8037CC0C + .4byte lbl_8037CC28 + .4byte lbl_8037CC44 + .4byte lbl_8037CC60 + .4byte lbl_8037CC7C + .4byte lbl_8037CC98 + .4byte lbl_8037CCB4 + .4byte lbl_8037CCD0 + .4byte lbl_8037CCEC + .4byte lbl_8037CD08 + .4byte lbl_8037CA60 + .4byte lbl_8037CD20 .4byte 0 @@ -161,6 +161,7 @@ lbl_8037C8F4: /* 8037C914 00379874 7C 03 00 2E */ lwzx r0, r3, r0 /* 8037C918 00379878 7C 09 03 A6 */ mtctr r0 /* 8037C91C 0037987C 4E 80 04 20 */ bctr +lbl_8037C920: /* 8037C920 00379880 38 00 00 10 */ li r0, 0x10 /* 8037C924 00379884 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C928 00379888 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -169,6 +170,7 @@ lbl_8037C8F4: /* 8037C934 00379894 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037C938 00379898 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037C93C 0037989C 48 00 03 E4 */ b lbl_8037CD20 +lbl_8037C940: /* 8037C940 003798A0 38 00 00 10 */ li r0, 0x10 /* 8037C944 003798A4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C948 003798A8 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -177,6 +179,7 @@ lbl_8037C8F4: /* 8037C954 003798B4 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037C958 003798B8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037C95C 003798BC 48 00 03 C4 */ b lbl_8037CD20 +lbl_8037C960: /* 8037C960 003798C0 38 00 00 10 */ li r0, 0x10 /* 8037C964 003798C4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C968 003798C8 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -185,6 +188,7 @@ lbl_8037C8F4: /* 8037C974 003798D4 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037C978 003798D8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037C97C 003798DC 48 00 03 A4 */ b lbl_8037CD20 +lbl_8037C980: /* 8037C980 003798E0 38 00 00 10 */ li r0, 0x10 /* 8037C984 003798E4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C988 003798E8 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -193,6 +197,7 @@ lbl_8037C8F4: /* 8037C994 003798F4 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037C998 003798F8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037C99C 003798FC 48 00 03 84 */ b lbl_8037CD20 +lbl_8037C9A0: /* 8037C9A0 00379900 38 00 00 10 */ li r0, 0x10 /* 8037C9A4 00379904 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C9A8 00379908 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -201,6 +206,7 @@ lbl_8037C8F4: /* 8037C9B4 00379914 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037C9B8 00379918 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037C9BC 0037991C 48 00 03 64 */ b lbl_8037CD20 +lbl_8037C9C0: /* 8037C9C0 00379920 38 00 00 10 */ li r0, 0x10 /* 8037C9C4 00379924 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C9C8 00379928 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -209,6 +215,7 @@ lbl_8037C8F4: /* 8037C9D4 00379934 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037C9D8 00379938 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037C9DC 0037993C 48 00 03 44 */ b lbl_8037CD20 +lbl_8037C9E0: /* 8037C9E0 00379940 38 00 00 10 */ li r0, 0x10 /* 8037C9E4 00379944 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C9E8 00379948 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -217,6 +224,7 @@ lbl_8037C8F4: /* 8037C9F4 00379954 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037C9F8 00379958 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037C9FC 0037995C 48 00 03 24 */ b lbl_8037CD20 +lbl_8037CA00: /* 8037CA00 00379960 38 00 00 10 */ li r0, 0x10 /* 8037CA04 00379964 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CA08 00379968 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -225,6 +233,7 @@ lbl_8037C8F4: /* 8037CA14 00379974 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037CA18 00379978 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CA1C 0037997C 48 00 03 04 */ b lbl_8037CD20 +lbl_8037CA20: /* 8037CA20 00379980 38 00 00 10 */ li r0, 0x10 /* 8037CA24 00379984 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CA28 00379988 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -233,6 +242,7 @@ lbl_8037C8F4: /* 8037CA34 00379994 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037CA38 00379998 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CA3C 0037999C 48 00 02 E4 */ b lbl_8037CD20 +lbl_8037CA40: /* 8037CA40 003799A0 38 00 00 10 */ li r0, 0x10 /* 8037CA44 003799A4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CA48 003799A8 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -241,6 +251,7 @@ lbl_8037C8F4: /* 8037CA54 003799B4 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037CA58 003799B8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CA5C 003799BC 48 00 02 C4 */ b lbl_8037CD20 +lbl_8037CA60: /* 8037CA60 003799C0 38 00 00 10 */ li r0, 0x10 /* 8037CA64 003799C4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CA68 003799C8 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -249,6 +260,7 @@ lbl_8037C8F4: /* 8037CA74 003799D4 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037CA78 003799D8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CA7C 003799DC 48 00 02 A4 */ b lbl_8037CD20 +lbl_8037CA80: /* 8037CA80 003799E0 38 00 00 10 */ li r0, 0x10 /* 8037CA84 003799E4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CA88 003799E8 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -257,6 +269,7 @@ lbl_8037C8F4: /* 8037CA94 003799F4 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037CA98 003799F8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CA9C 003799FC 48 00 02 84 */ b lbl_8037CD20 +lbl_8037CAA0: /* 8037CAA0 00379A00 38 00 00 61 */ li r0, 0x61 /* 8037CAA4 00379A04 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CAA8 00379A08 3C 60 23 01 */ lis r3, 0x2300AE7F@ha @@ -264,6 +277,7 @@ lbl_8037C8F4: /* 8037CAB0 00379A10 38 03 AE 7F */ addi r0, r3, 0x2300AE7F@l /* 8037CAB4 00379A14 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CAB8 00379A18 48 00 02 68 */ b lbl_8037CD20 +lbl_8037CABC: /* 8037CABC 00379A1C 38 00 00 61 */ li r0, 0x61 /* 8037CAC0 00379A20 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CAC4 00379A24 3C 60 23 01 */ lis r3, 0x23008E7F@ha @@ -271,6 +285,7 @@ lbl_8037C8F4: /* 8037CACC 00379A2C 38 03 8E 7F */ addi r0, r3, 0x23008E7F@l /* 8037CAD0 00379A30 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CAD4 00379A34 48 00 02 4C */ b lbl_8037CD20 +lbl_8037CAD8: /* 8037CAD8 00379A38 38 00 00 61 */ li r0, 0x61 /* 8037CADC 00379A3C 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CAE0 00379A40 3C 60 23 01 */ lis r3, 0x23009E7F@ha @@ -278,6 +293,7 @@ lbl_8037C8F4: /* 8037CAE8 00379A48 38 03 9E 7F */ addi r0, r3, 0x23009E7F@l /* 8037CAEC 00379A4C 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CAF0 00379A50 48 00 02 30 */ b lbl_8037CD20 +lbl_8037CAF4: /* 8037CAF4 00379A54 38 00 00 61 */ li r0, 0x61 /* 8037CAF8 00379A58 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CAFC 00379A5C 3C 60 23 00 */ lis r3, 0x23001E7F@ha @@ -285,6 +301,7 @@ lbl_8037C8F4: /* 8037CB04 00379A64 38 03 1E 7F */ addi r0, r3, 0x23001E7F@l /* 8037CB08 00379A68 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CB0C 00379A6C 48 00 02 14 */ b lbl_8037CD20 +lbl_8037CB10: /* 8037CB10 00379A70 38 00 00 61 */ li r0, 0x61 /* 8037CB14 00379A74 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CB18 00379A78 3C 60 23 01 */ lis r3, 0x2300AC3F@ha @@ -292,6 +309,7 @@ lbl_8037C8F4: /* 8037CB20 00379A80 38 03 AC 3F */ addi r0, r3, 0x2300AC3F@l /* 8037CB24 00379A84 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CB28 00379A88 48 00 01 F8 */ b lbl_8037CD20 +lbl_8037CB2C: /* 8037CB2C 00379A8C 38 00 00 61 */ li r0, 0x61 /* 8037CB30 00379A90 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CB34 00379A94 3C 60 23 01 */ lis r3, 0x2300AC7F@ha @@ -299,6 +317,7 @@ lbl_8037C8F4: /* 8037CB3C 00379A9C 38 03 AC 7F */ addi r0, r3, 0x2300AC7F@l /* 8037CB40 00379AA0 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CB44 00379AA4 48 00 01 DC */ b lbl_8037CD20 +lbl_8037CB48: /* 8037CB48 00379AA8 38 00 00 61 */ li r0, 0x61 /* 8037CB4C 00379AAC 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CB50 00379AB0 3C 60 23 01 */ lis r3, 0x2300ACBF@ha @@ -306,6 +325,7 @@ lbl_8037C8F4: /* 8037CB58 00379AB8 38 03 AC BF */ addi r0, r3, 0x2300ACBF@l /* 8037CB5C 00379ABC 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CB60 00379AC0 48 00 01 C0 */ b lbl_8037CD20 +lbl_8037CB64: /* 8037CB64 00379AC4 38 00 00 61 */ li r0, 0x61 /* 8037CB68 00379AC8 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CB6C 00379ACC 3C 60 23 01 */ lis r3, 0x2300ACFF@ha @@ -313,6 +333,7 @@ lbl_8037C8F4: /* 8037CB74 00379AD4 38 03 AC FF */ addi r0, r3, 0x2300ACFF@l /* 8037CB78 00379AD8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CB7C 00379ADC 48 00 01 A4 */ b lbl_8037CD20 +lbl_8037CB80: /* 8037CB80 00379AE0 38 00 00 61 */ li r0, 0x61 /* 8037CB84 00379AE4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CB88 00379AE8 3C 60 23 01 */ lis r3, 0x2300AD3F@ha @@ -320,6 +341,7 @@ lbl_8037C8F4: /* 8037CB90 00379AF0 38 03 AD 3F */ addi r0, r3, 0x2300AD3F@l /* 8037CB94 00379AF4 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CB98 00379AF8 48 00 01 88 */ b lbl_8037CD20 +lbl_8037CB9C: /* 8037CB9C 00379AFC 38 00 00 61 */ li r0, 0x61 /* 8037CBA0 00379B00 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CBA4 00379B04 3C 60 23 01 */ lis r3, 0x2300AD7F@ha @@ -327,6 +349,7 @@ lbl_8037C8F4: /* 8037CBAC 00379B0C 38 03 AD 7F */ addi r0, r3, 0x2300AD7F@l /* 8037CBB0 00379B10 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CBB4 00379B14 48 00 01 6C */ b lbl_8037CD20 +lbl_8037CBB8: /* 8037CBB8 00379B18 38 00 00 61 */ li r0, 0x61 /* 8037CBBC 00379B1C 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CBC0 00379B20 3C 60 23 01 */ lis r3, 0x2300ADBF@ha @@ -334,6 +357,7 @@ lbl_8037C8F4: /* 8037CBC8 00379B28 38 03 AD BF */ addi r0, r3, 0x2300ADBF@l /* 8037CBCC 00379B2C 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CBD0 00379B30 48 00 01 50 */ b lbl_8037CD20 +lbl_8037CBD4: /* 8037CBD4 00379B34 38 00 00 61 */ li r0, 0x61 /* 8037CBD8 00379B38 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CBDC 00379B3C 3C 60 23 01 */ lis r3, 0x2300ADFF@ha @@ -341,6 +365,7 @@ lbl_8037C8F4: /* 8037CBE4 00379B44 38 03 AD FF */ addi r0, r3, 0x2300ADFF@l /* 8037CBE8 00379B48 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CBEC 00379B4C 48 00 01 34 */ b lbl_8037CD20 +lbl_8037CBF0: /* 8037CBF0 00379B50 38 00 00 61 */ li r0, 0x61 /* 8037CBF4 00379B54 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CBF8 00379B58 3C 60 23 01 */ lis r3, 0x2300AE3F@ha @@ -348,6 +373,7 @@ lbl_8037C8F4: /* 8037CC00 00379B60 38 03 AE 3F */ addi r0, r3, 0x2300AE3F@l /* 8037CC04 00379B64 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CC08 00379B68 48 00 01 18 */ b lbl_8037CD20 +lbl_8037CC0C: /* 8037CC0C 00379B6C 38 00 00 61 */ li r0, 0x61 /* 8037CC10 00379B70 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CC14 00379B74 3C 60 23 01 */ lis r3, 0x2300A27F@ha @@ -355,6 +381,7 @@ lbl_8037C8F4: /* 8037CC1C 00379B7C 38 03 A2 7F */ addi r0, r3, 0x2300A27F@l /* 8037CC20 00379B80 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CC24 00379B84 48 00 00 FC */ b lbl_8037CD20 +lbl_8037CC28: /* 8037CC28 00379B88 38 00 00 61 */ li r0, 0x61 /* 8037CC2C 00379B8C 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CC30 00379B90 3C 60 23 01 */ lis r3, 0x2300A67F@ha @@ -362,6 +389,7 @@ lbl_8037C8F4: /* 8037CC38 00379B98 38 03 A6 7F */ addi r0, r3, 0x2300A67F@l /* 8037CC3C 00379B9C 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CC40 00379BA0 48 00 00 E0 */ b lbl_8037CD20 +lbl_8037CC44: /* 8037CC44 00379BA4 38 00 00 61 */ li r0, 0x61 /* 8037CC48 00379BA8 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CC4C 00379BAC 3C 60 23 01 */ lis r3, 0x2300AA7F@ha @@ -369,6 +397,7 @@ lbl_8037C8F4: /* 8037CC54 00379BB4 38 03 AA 7F */ addi r0, r3, 0x2300AA7F@l /* 8037CC58 00379BB8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CC5C 00379BBC 48 00 00 C4 */ b lbl_8037CD20 +lbl_8037CC60: /* 8037CC60 00379BC0 38 00 00 61 */ li r0, 0x61 /* 8037CC64 00379BC4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CC68 00379BC8 3C 60 24 03 */ lis r3, 0x2402C0C6@ha @@ -376,6 +405,7 @@ lbl_8037C8F4: /* 8037CC70 00379BD0 38 03 C0 C6 */ addi r0, r3, 0x2402C0C6@l /* 8037CC74 00379BD4 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CC78 00379BD8 48 00 00 A8 */ b lbl_8037CD20 +lbl_8037CC7C: /* 8037CC7C 00379BDC 38 00 00 61 */ li r0, 0x61 /* 8037CC80 00379BE0 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CC84 00379BE4 3C 60 24 03 */ lis r3, 0x2402C16B@ha @@ -383,6 +413,7 @@ lbl_8037C8F4: /* 8037CC8C 00379BEC 38 03 C1 6B */ addi r0, r3, 0x2402C16B@l /* 8037CC90 00379BF0 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CC94 00379BF4 48 00 00 8C */ b lbl_8037CD20 +lbl_8037CC98: /* 8037CC98 00379BF8 38 00 00 61 */ li r0, 0x61 /* 8037CC9C 00379BFC 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CCA0 00379C00 3C 60 24 03 */ lis r3, 0x2402C0E7@ha @@ -390,6 +421,7 @@ lbl_8037C8F4: /* 8037CCA8 00379C08 38 03 C0 E7 */ addi r0, r3, 0x2402C0E7@l /* 8037CCAC 00379C0C 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CCB0 00379C10 48 00 00 70 */ b lbl_8037CD20 +lbl_8037CCB4: /* 8037CCB4 00379C14 38 00 00 61 */ li r0, 0x61 /* 8037CCB8 00379C18 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CCBC 00379C1C 3C 60 24 03 */ lis r3, 0x2402C108@ha @@ -397,6 +429,7 @@ lbl_8037C8F4: /* 8037CCC4 00379C24 38 03 C1 08 */ addi r0, r3, 0x2402C108@l /* 8037CCC8 00379C28 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CCCC 00379C2C 48 00 00 54 */ b lbl_8037CD20 +lbl_8037CCD0: /* 8037CCD0 00379C30 38 00 00 61 */ li r0, 0x61 /* 8037CCD4 00379C34 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CCD8 00379C38 3C 60 24 03 */ lis r3, 0x2402C129@ha @@ -404,6 +437,7 @@ lbl_8037C8F4: /* 8037CCE0 00379C40 38 03 C1 29 */ addi r0, r3, 0x2402C129@l /* 8037CCE4 00379C44 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CCE8 00379C48 48 00 00 38 */ b lbl_8037CD20 +lbl_8037CCEC: /* 8037CCEC 00379C4C 38 00 00 61 */ li r0, 0x61 /* 8037CCF0 00379C50 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CCF4 00379C54 3C 60 24 03 */ lis r3, 0x2402C14A@ha @@ -411,6 +445,7 @@ lbl_8037C8F4: /* 8037CCFC 00379C5C 38 03 C1 4A */ addi r0, r3, 0x2402C14A@l /* 8037CD00 00379C60 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037CD04 00379C64 48 00 00 1C */ b lbl_8037CD20 +lbl_8037CD08: /* 8037CD08 00379C68 38 00 00 61 */ li r0, 0x61 /* 8037CD0C 00379C6C 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037CD10 00379C70 3C 60 24 03 */ lis r3, 0x2402C1AD@ha @@ -429,6 +464,7 @@ lbl_8037CD20: /* 8037CD40 00379CA0 7C 04 00 2E */ lwzx r0, r4, r0 /* 8037CD44 00379CA4 7C 09 03 A6 */ mtctr r0 /* 8037CD48 00379CA8 4E 80 04 20 */ bctr +lbl_8037CD4C: /* 8037CD4C 00379CAC 38 00 00 61 */ li r0, 0x61 /* 8037CD50 00379CB0 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CD54 00379CB4 3C 60 67 00 */ lis r3, 0x67000042@ha @@ -436,6 +472,7 @@ lbl_8037CD20: /* 8037CD5C 00379CBC 38 03 00 42 */ addi r0, r3, 0x67000042@l /* 8037CD60 00379CC0 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CD64 00379CC4 48 00 02 BC */ b lbl_8037D020 +lbl_8037CD68: /* 8037CD68 00379CC8 38 00 00 61 */ li r0, 0x61 /* 8037CD6C 00379CCC 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CD70 00379CD0 3C 60 67 00 */ lis r3, 0x67000084@ha @@ -443,6 +480,7 @@ lbl_8037CD20: /* 8037CD78 00379CD8 38 03 00 84 */ addi r0, r3, 0x67000084@l /* 8037CD7C 00379CDC 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CD80 00379CE0 48 00 02 A0 */ b lbl_8037D020 +lbl_8037CD84: /* 8037CD84 00379CE4 38 00 00 61 */ li r0, 0x61 /* 8037CD88 00379CE8 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CD8C 00379CEC 3C 60 67 00 */ lis r3, 0x67000063@ha @@ -450,6 +488,7 @@ lbl_8037CD20: /* 8037CD94 00379CF4 38 03 00 63 */ addi r0, r3, 0x67000063@l /* 8037CD98 00379CF8 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CD9C 00379CFC 48 00 02 84 */ b lbl_8037D020 +lbl_8037CDA0: /* 8037CDA0 00379D00 38 00 00 61 */ li r0, 0x61 /* 8037CDA4 00379D04 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CDA8 00379D08 3C 60 67 00 */ lis r3, 0x67000129@ha @@ -457,6 +496,7 @@ lbl_8037CD20: /* 8037CDB0 00379D10 38 03 01 29 */ addi r0, r3, 0x67000129@l /* 8037CDB4 00379D14 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CDB8 00379D18 48 00 02 68 */ b lbl_8037D020 +lbl_8037CDBC: /* 8037CDBC 00379D1C 38 00 00 61 */ li r0, 0x61 /* 8037CDC0 00379D20 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CDC4 00379D24 3C 60 67 00 */ lis r3, 0x67000252@ha @@ -464,6 +504,7 @@ lbl_8037CD20: /* 8037CDCC 00379D2C 38 03 02 52 */ addi r0, r3, 0x67000252@l /* 8037CDD0 00379D30 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CDD4 00379D34 48 00 02 4C */ b lbl_8037D020 +lbl_8037CDD8: /* 8037CDD8 00379D38 38 00 00 61 */ li r0, 0x61 /* 8037CDDC 00379D3C 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CDE0 00379D40 3C 60 67 00 */ lis r3, 0x67000021@ha @@ -471,6 +512,7 @@ lbl_8037CD20: /* 8037CDE8 00379D48 38 03 00 21 */ addi r0, r3, 0x67000021@l /* 8037CDEC 00379D4C 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CDF0 00379D50 48 00 02 30 */ b lbl_8037D020 +lbl_8037CDF4: /* 8037CDF4 00379D54 38 00 00 61 */ li r0, 0x61 /* 8037CDF8 00379D58 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CDFC 00379D5C 3C 60 67 00 */ lis r3, 0x6700014B@ha @@ -478,6 +520,7 @@ lbl_8037CD20: /* 8037CE04 00379D64 38 03 01 4B */ addi r0, r3, 0x6700014B@l /* 8037CE08 00379D68 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CE0C 00379D6C 48 00 02 14 */ b lbl_8037D020 +lbl_8037CE10: /* 8037CE10 00379D70 38 00 00 61 */ li r0, 0x61 /* 8037CE14 00379D74 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CE18 00379D78 3C 60 67 00 */ lis r3, 0x6700018D@ha @@ -485,6 +528,7 @@ lbl_8037CD20: /* 8037CE20 00379D80 38 03 01 8D */ addi r0, r3, 0x6700018D@l /* 8037CE24 00379D84 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CE28 00379D88 48 00 01 F8 */ b lbl_8037D020 +lbl_8037CE2C: /* 8037CE2C 00379D8C 38 00 00 61 */ li r0, 0x61 /* 8037CE30 00379D90 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CE34 00379D94 3C 60 67 00 */ lis r3, 0x670001CF@ha @@ -492,6 +536,7 @@ lbl_8037CD20: /* 8037CE3C 00379D9C 38 03 01 CF */ addi r0, r3, 0x670001CF@l /* 8037CE40 00379DA0 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CE44 00379DA4 48 00 01 DC */ b lbl_8037D020 +lbl_8037CE48: /* 8037CE48 00379DA8 38 00 00 61 */ li r0, 0x61 /* 8037CE4C 00379DAC 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037CE50 00379DB0 3C 60 67 00 */ lis r3, 0x67000211@ha @@ -499,6 +544,7 @@ lbl_8037CD20: /* 8037CE58 00379DB8 38 03 02 11 */ addi r0, r3, 0x67000211@l /* 8037CE5C 00379DBC 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CE60 00379DC0 48 00 01 C0 */ b lbl_8037D020 +lbl_8037CE64: /* 8037CE64 00379DC4 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CE68 00379DC8 38 A0 00 08 */ li r5, 8 /* 8037CE6C 00379DCC 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -511,6 +557,7 @@ lbl_8037CD20: /* 8037CE88 00379DE8 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CE8C 00379DEC 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CE90 00379DF0 48 00 01 90 */ b lbl_8037D020 +lbl_8037CE94: /* 8037CE94 00379DF4 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CE98 00379DF8 38 A0 00 08 */ li r5, 8 /* 8037CE9C 00379DFC 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -523,6 +570,7 @@ lbl_8037CD20: /* 8037CEB8 00379E18 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CEBC 00379E1C 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CEC0 00379E20 48 00 01 60 */ b lbl_8037D020 +lbl_8037CEC4: /* 8037CEC4 00379E24 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CEC8 00379E28 38 A0 00 08 */ li r5, 8 /* 8037CECC 00379E2C 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -535,6 +583,7 @@ lbl_8037CD20: /* 8037CEE8 00379E48 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CEEC 00379E4C 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CEF0 00379E50 48 00 01 30 */ b lbl_8037D020 +lbl_8037CEF4: /* 8037CEF4 00379E54 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CEF8 00379E58 38 A0 00 08 */ li r5, 8 /* 8037CEFC 00379E5C 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -547,6 +596,7 @@ lbl_8037CD20: /* 8037CF18 00379E78 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CF1C 00379E7C 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CF20 00379E80 48 00 01 00 */ b lbl_8037D020 +lbl_8037CF24: /* 8037CF24 00379E84 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CF28 00379E88 38 A0 00 08 */ li r5, 8 /* 8037CF2C 00379E8C 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -559,6 +609,7 @@ lbl_8037CD20: /* 8037CF48 00379EA8 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CF4C 00379EAC 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CF50 00379EB0 48 00 00 D0 */ b lbl_8037D020 +lbl_8037CF54: /* 8037CF54 00379EB4 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CF58 00379EB8 38 A0 00 08 */ li r5, 8 /* 8037CF5C 00379EBC 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -571,6 +622,7 @@ lbl_8037CD20: /* 8037CF78 00379ED8 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CF7C 00379EDC 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CF80 00379EE0 48 00 00 A0 */ b lbl_8037D020 +lbl_8037CF84: /* 8037CF84 00379EE4 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CF88 00379EE8 38 A0 00 08 */ li r5, 8 /* 8037CF8C 00379EEC 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -583,6 +635,7 @@ lbl_8037CD20: /* 8037CFA8 00379F08 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CFAC 00379F0C 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CFB0 00379F10 48 00 00 70 */ b lbl_8037D020 +lbl_8037CFB4: /* 8037CFB4 00379F14 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CFB8 00379F18 38 A0 00 08 */ li r5, 8 /* 8037CFBC 00379F1C 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -595,18 +648,22 @@ lbl_8037CD20: /* 8037CFD8 00379F38 80 03 04 EC */ lwz r0, 0x4ec(r3) /* 8037CFDC 00379F3C 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 8037CFE0 00379F40 48 00 00 40 */ b lbl_8037D020 +lbl_8037CFE4: /* 8037CFE4 00379F44 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 8037CFE8 00379F48 38 00 00 02 */ li r0, 2 /* 8037CFEC 00379F4C B0 03 00 06 */ sth r0, 6(r3) /* 8037CFF0 00379F50 48 00 00 30 */ b lbl_8037D020 +lbl_8037CFF4: /* 8037CFF4 00379F54 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 8037CFF8 00379F58 38 00 00 03 */ li r0, 3 /* 8037CFFC 00379F5C B0 03 00 06 */ sth r0, 6(r3) /* 8037D000 00379F60 48 00 00 20 */ b lbl_8037D020 +lbl_8037D004: /* 8037D004 00379F64 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 8037D008 00379F68 38 00 00 04 */ li r0, 4 /* 8037D00C 00379F6C B0 03 00 06 */ sth r0, 6(r3) /* 8037D010 00379F70 48 00 00 10 */ b lbl_8037D020 +lbl_8037D014: /* 8037D014 00379F74 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 8037D018 00379F78 38 00 00 05 */ li r0, 5 /* 8037D01C 00379F7C B0 03 00 06 */ sth r0, 6(r3) diff --git a/asm/Dolphin/gx/GXTexture.s b/asm/Dolphin/gx/GXTexture.s index a64aea51..d3098c8e 100644 --- a/asm/Dolphin/gx/GXTexture.s +++ b/asm/Dolphin/gx/GXTexture.s @@ -102,151 +102,151 @@ lbl_805AEBAC: .global lbl_803F09F0 lbl_803F09F0: # ROM: 0x3ED9F0 - .4byte 0x80379C68 - .4byte 0x80379C74 - .4byte 0x80379C74 - .4byte 0x80379C80 - .4byte 0x80379C80 - .4byte 0x80379C80 - .4byte 0x80379C80 - .4byte 0x80379C8C - .4byte 0x80379C68 - .4byte 0x80379C74 - .4byte 0x80379C80 - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C68 - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C74 - .4byte 0x80379C8C - .4byte 0x80379C80 - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C80 - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C68 - .4byte 0x80379C8C - .4byte 0x80379C74 - .4byte 0x80379C80 - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C74 - .4byte 0x80379C74 - .4byte 0x80379C74 - .4byte 0x80379C74 - .4byte 0x80379C80 - .4byte 0x80379C80 - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C68 - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C8C - .4byte 0x80379C74 - .4byte 0x80379C74 - .4byte 0x80379C8C - .4byte 0x80379C80 + .4byte lbl_80379C68 + .4byte lbl_80379C74 + .4byte lbl_80379C74 + .4byte lbl_80379C80 + .4byte lbl_80379C80 + .4byte lbl_80379C80 + .4byte lbl_80379C80 + .4byte lbl_80379C8C + .4byte lbl_80379C68 + .4byte lbl_80379C74 + .4byte lbl_80379C80 + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C68 + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C74 + .4byte lbl_80379C8C + .4byte lbl_80379C80 + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C80 + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C68 + .4byte lbl_80379C8C + .4byte lbl_80379C74 + .4byte lbl_80379C80 + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C74 + .4byte lbl_80379C74 + .4byte lbl_80379C74 + .4byte lbl_80379C74 + .4byte lbl_80379C80 + .4byte lbl_80379C80 + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C68 + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C8C + .4byte lbl_80379C74 + .4byte lbl_80379C74 + .4byte lbl_80379C8C + .4byte lbl_80379C80 .global lbl_803F0AE4 lbl_803F0AE4: # ROM: 0x3EDAE4 - .4byte 0x80379DBC - .4byte 0x80379DC8 - .4byte 0x80379DC8 - .4byte 0x80379DD4 - .4byte 0x80379DD4 - .4byte 0x80379DD4 - .4byte 0x80379DD4 - .4byte 0x80379DE0 - .4byte 0x80379DBC - .4byte 0x80379DC8 - .4byte 0x80379DD4 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DBC - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DC8 - .4byte 0x80379DE0 - .4byte 0x80379DD4 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DD4 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DBC - .4byte 0x80379DE0 - .4byte 0x80379DC8 - .4byte 0x80379DD4 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DC8 - .4byte 0x80379DC8 - .4byte 0x80379DC8 - .4byte 0x80379DC8 - .4byte 0x80379DD4 - .4byte 0x80379DD4 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DBC - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DE0 - .4byte 0x80379DC8 - .4byte 0x80379DC8 - .4byte 0x80379DE0 - .4byte 0x80379DD4 + .4byte lbl_80379DBC + .4byte lbl_80379DC8 + .4byte lbl_80379DC8 + .4byte lbl_80379DD4 + .4byte lbl_80379DD4 + .4byte lbl_80379DD4 + .4byte lbl_80379DD4 + .4byte lbl_80379DE0 + .4byte lbl_80379DBC + .4byte lbl_80379DC8 + .4byte lbl_80379DD4 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DBC + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DC8 + .4byte lbl_80379DE0 + .4byte lbl_80379DD4 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DD4 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DBC + .4byte lbl_80379DE0 + .4byte lbl_80379DC8 + .4byte lbl_80379DD4 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DC8 + .4byte lbl_80379DC8 + .4byte lbl_80379DC8 + .4byte lbl_80379DC8 + .4byte lbl_80379DD4 + .4byte lbl_80379DD4 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DBC + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DE0 + .4byte lbl_80379DC8 + .4byte lbl_80379DC8 + .4byte lbl_80379DE0 + .4byte lbl_80379DD4 .global lbl_803F0BD8 lbl_803F0BD8: # ROM: 0x3EDBD8 - .4byte 0x8037A00C - .4byte 0x8037A020 - .4byte 0x8037A020 - .4byte 0x8037A034 - .4byte 0x8037A034 - .4byte 0x8037A034 - .4byte 0x8037A048 - .4byte 0x8037A070 - .4byte 0x8037A00C - .4byte 0x8037A020 - .4byte 0x8037A034 - .4byte 0x8037A070 - .4byte 0x8037A070 - .4byte 0x8037A070 - .4byte 0x8037A05C + .4byte lbl_8037A00C + .4byte lbl_8037A020 + .4byte lbl_8037A020 + .4byte lbl_8037A034 + .4byte lbl_8037A034 + .4byte lbl_8037A034 + .4byte lbl_8037A048 + .4byte lbl_8037A070 + .4byte lbl_8037A00C + .4byte lbl_8037A020 + .4byte lbl_8037A034 + .4byte lbl_8037A070 + .4byte lbl_8037A070 + .4byte lbl_8037A070 + .4byte lbl_8037A05C .4byte 0 @@ -264,12 +264,15 @@ GXGetTexBufferSize: /* 80379C5C 00376BBC 7C 08 00 2E */ lwzx r0, r8, r0 /* 80379C60 00376BC0 7C 09 03 A6 */ mtctr r0 /* 80379C64 00376BC4 4E 80 04 20 */ bctr +lbl_80379C68: /* 80379C68 00376BC8 38 00 00 03 */ li r0, 3 /* 80379C6C 00376BCC 39 00 00 03 */ li r8, 3 /* 80379C70 00376BD0 48 00 00 24 */ b lbl_80379C94 +lbl_80379C74: /* 80379C74 00376BD4 38 00 00 03 */ li r0, 3 /* 80379C78 00376BD8 39 00 00 02 */ li r8, 2 /* 80379C7C 00376BDC 48 00 00 18 */ b lbl_80379C94 +lbl_80379C80: /* 80379C80 00376BE0 38 00 00 02 */ li r0, 2 /* 80379C84 00376BE4 39 00 00 02 */ li r8, 2 /* 80379C88 00376BE8 48 00 00 0C */ b lbl_80379C94 @@ -365,12 +368,15 @@ __GetImageTileCount: /* 80379DB0 00376D10 7C 09 00 2E */ lwzx r0, r9, r0 /* 80379DB4 00376D14 7C 09 03 A6 */ mtctr r0 /* 80379DB8 00376D18 4E 80 04 20 */ bctr +lbl_80379DBC: /* 80379DBC 00376D1C 39 60 00 03 */ li r11, 3 /* 80379DC0 00376D20 39 80 00 03 */ li r12, 3 /* 80379DC4 00376D24 48 00 00 24 */ b lbl_80379DE8 +lbl_80379DC8: /* 80379DC8 00376D28 39 60 00 03 */ li r11, 3 /* 80379DCC 00376D2C 39 80 00 02 */ li r12, 2 /* 80379DD0 00376D30 48 00 00 18 */ b lbl_80379DE8 +lbl_80379DD4: /* 80379DD4 00376D34 39 60 00 02 */ li r11, 2 /* 80379DD8 00376D38 39 80 00 02 */ li r12, 2 /* 80379DDC 00376D3C 48 00 00 0C */ b lbl_80379DE8 @@ -529,26 +535,31 @@ lbl_80379F8C: /* 8037A000 00376F60 7C 05 00 2E */ lwzx r0, r5, r0 /* 8037A004 00376F64 7C 09 03 A6 */ mtctr r0 /* 8037A008 00376F68 4E 80 04 20 */ bctr +lbl_8037A00C: /* 8037A00C 00376F6C 38 00 00 01 */ li r0, 1 /* 8037A010 00376F70 98 1F 00 1E */ stb r0, 0x1e(r31) /* 8037A014 00376F74 38 00 00 03 */ li r0, 3 /* 8037A018 00376F78 38 E0 00 03 */ li r7, 3 /* 8037A01C 00376F7C 48 00 00 64 */ b lbl_8037A080 +lbl_8037A020: /* 8037A020 00376F80 38 00 00 02 */ li r0, 2 /* 8037A024 00376F84 98 1F 00 1E */ stb r0, 0x1e(r31) /* 8037A028 00376F88 38 00 00 03 */ li r0, 3 /* 8037A02C 00376F8C 38 E0 00 02 */ li r7, 2 /* 8037A030 00376F90 48 00 00 50 */ b lbl_8037A080 +lbl_8037A034: /* 8037A034 00376F94 38 00 00 02 */ li r0, 2 /* 8037A038 00376F98 98 1F 00 1E */ stb r0, 0x1e(r31) /* 8037A03C 00376F9C 38 00 00 02 */ li r0, 2 /* 8037A040 00376FA0 38 E0 00 02 */ li r7, 2 /* 8037A044 00376FA4 48 00 00 3C */ b lbl_8037A080 +lbl_8037A048: /* 8037A048 00376FA8 38 00 00 03 */ li r0, 3 /* 8037A04C 00376FAC 98 1F 00 1E */ stb r0, 0x1e(r31) /* 8037A050 00376FB0 38 00 00 02 */ li r0, 2 /* 8037A054 00376FB4 38 E0 00 02 */ li r7, 2 /* 8037A058 00376FB8 48 00 00 28 */ b lbl_8037A080 +lbl_8037A05C: /* 8037A05C 00376FBC 38 00 00 00 */ li r0, 0 /* 8037A060 00376FC0 98 1F 00 1E */ stb r0, 0x1e(r31) /* 8037A064 00376FC4 38 00 00 03 */ li r0, 3 diff --git a/asm/Dolphin/os/OSThread.s b/asm/Dolphin/os/OSThread.s index 4e73ad5b..7922a199 100644 --- a/asm/Dolphin/os/OSThread.s +++ b/asm/Dolphin/os/OSThread.s @@ -20,7 +20,7 @@ lbl_805A9928: .global lbl_805A8B50 lbl_805A8B50: # ROM: 0x3F64F0 - .4byte 0x80384468 + .4byte DefaultSwitchThreadCallback .4byte 0 diff --git a/asm/Dolphin/si/SISamplingRate.s b/asm/Dolphin/si/SISamplingRate.s index cec89964..3ef7d700 100644 --- a/asm/Dolphin/si/SISamplingRate.s +++ b/asm/Dolphin/si/SISamplingRate.s @@ -33,23 +33,6 @@ lbl_803F6FB8: .asciz "SISetSamplingRate: unknown TV format. Use default." .balign 4 .4byte 0 - .asciz "<< Dolphin SDK - EXI\trelease build: Sep 5 2002 05:33:04 (0x2301) >>" - .balign 4 - .asciz "Memory Card 59" - .balign 4 - .asciz "Memory Card 123" - .asciz "Memory Card 251" - .asciz "Memory Card 507" - .asciz "USB Adapter" - .asciz "Net Card" - .balign 4 - .asciz "Artist Ether" - .balign 4 - .asciz "Stream Hanger" - .balign 4 - .asciz "IS Viewer" - .balign 4 - .4byte 0 .section .text, "ax" diff --git a/asm/Dolphin/thp/THPDec.s b/asm/Dolphin/thp/THPDec.s index 71b9da2f..195ed9eb 100644 --- a/asm/Dolphin/thp/THPDec.s +++ b/asm/Dolphin/thp/THPDec.s @@ -9,9 +9,9 @@ lbl_80569F60: __THPMCUBuffer: .skip 0x28 -.section .rodata, "a" # 0x803CB3A0 - 0x803D8D60 +.section .rodata, "a" .balign 8 -__THPJpegNaturalOrder: # local object +__THPJpegNaturalOrder: .4byte 0x00010810 .4byte 0x0902030A .4byte 0x11182019 @@ -32,7 +32,7 @@ __THPJpegNaturalOrder: # local object .4byte 0x3F3F3F3F .4byte 0x3F3F3F3F .4byte 0x3F3F3F3F -__THPAANScaleFactor: # local object +__THPAANScaleFactor: .double 1.0 .double 1.3870398998260498 .double 1.3065630197525024 @@ -292,7 +292,7 @@ lbl_803C1D90: /* 803C1D9C 003BECFC 7C 08 03 A6 */ mtlr r0 /* 803C1DA0 003BED00 4E 80 00 20 */ blr -__THPSetupBuffers: # local func +__THPSetupBuffers: /* 803C1DA4 003BED04 80 8D B1 4C */ lwz r4, __THPWorkArea@sda21(r13) /* 803C1DA8 003BED08 3C 60 80 57 */ lis r3, __THPMCUBuffer@ha /* 803C1DAC 003BED0C 38 A3 A0 78 */ addi r5, r3, __THPMCUBuffer@l @@ -311,7 +311,7 @@ __THPSetupBuffers: # local func /* 803C1DE0 003BED40 90 05 00 14 */ stw r0, 0x14(r5) /* 803C1DE4 003BED44 4E 80 00 20 */ blr -__THPReadFrameHeader: # local func +__THPReadFrameHeader: /* 803C1DE8 003BED48 80 8D B1 50 */ lwz r4, __THPInfo@sda21(r13) /* 803C1DEC 003BED4C 80 64 06 9C */ lwz r3, 0x69c(r4) /* 803C1DF0 003BED50 38 03 00 02 */ addi r0, r3, 2 @@ -399,7 +399,7 @@ lbl_803C1F10: /* 803C1F1C 003BEE7C 38 60 00 00 */ li r3, 0 /* 803C1F20 003BEE80 4E 80 00 20 */ blr -__THPReadScaneHeader: # local func +__THPReadScaneHeader: /* 803C1F24 003BEE84 80 8D B1 50 */ lwz r4, __THPInfo@sda21(r13) /* 803C1F28 003BEE88 80 64 06 9C */ lwz r3, 0x69c(r4) /* 803C1F2C 003BEE8C 38 03 00 02 */ addi r0, r3, 2 @@ -6591,7 +6591,7 @@ lbl_803C7BA0: /* 803C7C54 003C4BB4 7C 08 03 A6 */ mtlr r0 /* 803C7C58 003C4BB8 4E 80 00 20 */ blr -__THPHuffDecodeDCTCompY: #local func +__THPHuffDecodeDCTCompY: /* 803C7C5C 003C4BBC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803C7C60 003C4BC0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 803C7C64 003C4BC4 93 C1 00 18 */ stw r30, 0x18(r1) @@ -7056,7 +7056,7 @@ lbl_803C82BC: /* 803C82D0 003C5230 38 21 00 20 */ addi r1, r1, 0x20 /* 803C82D4 003C5234 4E 80 00 20 */ blr -__THPHuffDecodeDCTCompU: # local func +__THPHuffDecodeDCTCompU: /* 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) @@ -7533,7 +7533,7 @@ lbl_803C8970: /* 803C8978 003C58D8 38 21 00 18 */ addi r1, r1, 0x18 /* 803C897C 003C58DC 4E 80 00 20 */ blr -__THPHuffDecodeDCTCompV: # local func +__THPHuffDecodeDCTCompV: /* 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) diff --git a/asm/Dolphin/vi.s b/asm/Dolphin/vi.s index ce98b28c..99496723 100644 --- a/asm/Dolphin/vi.s +++ b/asm/Dolphin/vi.s @@ -125,33 +125,33 @@ lbl_803F23A8: .global lbl_803F259C lbl_803F259C: # ROM: 0x3EF59C - .4byte 0x80387964 - .4byte 0x8038796C - .4byte 0x803879A4 - .4byte 0x803879AC - .4byte 0x80387974 - .4byte 0x8038797C - .4byte 0x803879D4 - .4byte 0x803879D4 - .4byte 0x80387994 - .4byte 0x8038799C - .4byte 0x803879D4 - .4byte 0x803879D4 - .4byte 0x803879D4 - .4byte 0x803879D4 - .4byte 0x803879D4 - .4byte 0x803879D4 - .4byte 0x803879B4 - .4byte 0x803879BC - .4byte 0x803879D4 - .4byte 0x803879D4 - .4byte 0x80387984 - .4byte 0x8038798C - .4byte 0x803879D4 - .4byte 0x803879D4 - .4byte 0x803879C4 - .4byte 0x803879D4 - .4byte 0x803879CC + .4byte lbl_80387964 + .4byte lbl_8038796C + .4byte lbl_803879A4 + .4byte lbl_803879AC + .4byte lbl_80387974 + .4byte lbl_8038797C + .4byte lbl_803879D4 + .4byte lbl_803879D4 + .4byte lbl_80387994 + .4byte lbl_8038799C + .4byte lbl_803879D4 + .4byte lbl_803879D4 + .4byte lbl_803879D4 + .4byte lbl_803879D4 + .4byte lbl_803879D4 + .4byte lbl_803879D4 + .4byte lbl_803879B4 + .4byte lbl_803879BC + .4byte lbl_803879D4 + .4byte lbl_803879D4 + .4byte lbl_80387984 + .4byte lbl_8038798C + .4byte lbl_803879D4 + .4byte lbl_803879D4 + .4byte lbl_803879C4 + .4byte lbl_803879D4 + .4byte lbl_803879CC .asciz "***************************************\n" .balign 4 .asciz " ! ! ! C A U T I O N ! ! ! \n" @@ -170,13 +170,13 @@ lbl_803F259C: .global lbl_803F275C lbl_803F275C: # ROM: 0x3EF75C - .4byte 0x80389510 - .4byte 0x80389518 - .4byte 0x80389520 - .4byte 0x80389510 - .4byte 0x80389518 - .4byte 0x80389520 - .4byte 0x80389510 + .4byte lbl_80389510 + .4byte lbl_80389518 + .4byte lbl_80389520 + .4byte lbl_80389510 + .4byte lbl_80389518 + .4byte lbl_80389520 + .4byte lbl_80389510 .section .sdata @@ -185,7 +185,7 @@ lbl_803F275C: .global lbl_805A8B78 lbl_805A8B78: # ROM: 0x3F6518 - .4byte 0x803F23A8 + .4byte lbl_803F23A8 .global lbl_805A8B7C lbl_805A8B7C: @@ -454,32 +454,46 @@ getTiming: /* 80387958 003848B8 7C 04 00 2E */ lwzx r0, r4, r0 /* 8038795C 003848BC 7C 09 03 A6 */ mtctr r0 /* 80387960 003848C0 4E 80 04 20 */ bctr +lbl_80387964: /* 80387964 003848C4 38 65 00 44 */ addi r3, r5, 0x44 /* 80387968 003848C8 4E 80 00 20 */ blr +lbl_8038796C: /* 8038796C 003848CC 38 65 00 6A */ addi r3, r5, 0x6a /* 80387970 003848D0 4E 80 00 20 */ blr +lbl_80387974: /* 80387974 003848D4 38 65 00 90 */ addi r3, r5, 0x90 /* 80387978 003848D8 4E 80 00 20 */ blr +lbl_8038797C: /* 8038797C 003848DC 38 65 00 B6 */ addi r3, r5, 0xb6 /* 80387980 003848E0 4E 80 00 20 */ blr +lbl_80387984: /* 80387984 003848E4 38 65 00 44 */ addi r3, r5, 0x44 /* 80387988 003848E8 4E 80 00 20 */ blr +lbl_8038798C: /* 8038798C 003848EC 38 65 00 6A */ addi r3, r5, 0x6a /* 80387990 003848F0 4E 80 00 20 */ blr +lbl_80387994: /* 80387994 003848F4 38 65 00 DC */ addi r3, r5, 0xdc /* 80387998 003848F8 4E 80 00 20 */ blr +lbl_8038799C: /* 8038799C 003848FC 38 65 01 02 */ addi r3, r5, 0x102 /* 803879A0 00384900 4E 80 00 20 */ blr +lbl_803879A4: /* 803879A4 00384904 38 65 01 28 */ addi r3, r5, 0x128 /* 803879A8 00384908 4E 80 00 20 */ blr +lbl_803879AC: /* 803879AC 0038490C 38 65 01 4E */ addi r3, r5, 0x14e /* 803879B0 00384910 4E 80 00 20 */ blr +lbl_803879B4: /* 803879B4 00384914 38 65 00 90 */ addi r3, r5, 0x90 /* 803879B8 00384918 4E 80 00 20 */ blr +lbl_803879BC: /* 803879BC 0038491C 38 65 00 B6 */ addi r3, r5, 0xb6 /* 803879C0 00384920 4E 80 00 20 */ blr +lbl_803879C4: /* 803879C4 00384924 38 65 01 74 */ addi r3, r5, 0x174 /* 803879C8 00384928 4E 80 00 20 */ blr +lbl_803879CC: /* 803879CC 0038492C 38 65 01 9A */ addi r3, r5, 0x19a /* 803879D0 00384930 4E 80 00 20 */ blr lbl_803879D4: @@ -2408,10 +2422,13 @@ VIGetTvFormat: /* 80389504 00386464 7C 04 00 2E */ lwzx r0, r4, r0 /* 80389508 00386468 7C 09 03 A6 */ mtctr r0 /* 8038950C 0038646C 4E 80 04 20 */ bctr +lbl_80389510: /* 80389510 00386470 3B E0 00 00 */ li r31, 0 /* 80389514 00386474 48 00 00 10 */ b lbl_80389524 +lbl_80389518: /* 80389518 00386478 3B E0 00 01 */ li r31, 1 /* 8038951C 0038647C 48 00 00 08 */ b lbl_80389524 +lbl_80389520: /* 80389520 00386480 7C BF 2B 78 */ mr r31, r5 lbl_80389524: /* 80389524 00386484 4B FF 81 65 */ bl OSRestoreInterrupts diff --git a/asm/MetroidPrime/CAutoMapper.s b/asm/MetroidPrime/CAutoMapper.s index f9bad67d..9016cfb1 100644 --- a/asm/MetroidPrime/CAutoMapper.s +++ b/asm/MetroidPrime/CAutoMapper.s @@ -170,7 +170,7 @@ lbl_805A71BC: .global lbl_805AA880 lbl_805AA880: # ROM: 0x3F7120 - .4byte 0x803CD80C + .4byte lbl_803CD80C .global lbl_805AA884 lbl_805AA884: diff --git a/asm/MetroidPrime/CCredits.s b/asm/MetroidPrime/CCredits.s index bd65b576..697b800d 100644 --- a/asm/MetroidPrime/CCredits.s +++ b/asm/MetroidPrime/CCredits.s @@ -6,12 +6,12 @@ .global lbl_805AA030 lbl_805AA030: # ROM: 0x3F68D0 - .4byte 0x803CCC73 + .4byte lbl_803CCC73 .global lbl_805AA034 lbl_805AA034: # ROM: 0x3F68D4 - .4byte 0x803CCC85 + .4byte lbl_803CCC85 .global lbl_805AA038 lbl_805AA038: diff --git a/asm/MetroidPrime/CFrontEndUI.s b/asm/MetroidPrime/CFrontEndUI.s index 3a7a3791..c4348546 100644 --- a/asm/MetroidPrime/CFrontEndUI.s +++ b/asm/MetroidPrime/CFrontEndUI.s @@ -124,16 +124,12 @@ lbl_803CC540: .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 + .ascii "!#$MetroidBuildInfo!#$" +.global BuildString +BuildString: + .asciz "Build v1.088 10/29/2002 2:21:25" + .asciz "PAD" + .balign 4 .global lbl_803CC5C4 lbl_803CC5C4: @@ -447,22 +443,22 @@ lbl_805A6D0C: .global lbl_805A9FA8 lbl_805A9FA8: # ROM: 0x3F6848 - .4byte 0x803CC59E + .4byte BuildString .global lbl_805A9FAC lbl_805A9FAC: # ROM: 0x3F684C - .4byte 0x803CC720 + .4byte lbl_803CC720 .global lbl_805A9FB0 lbl_805A9FB0: # ROM: 0x3F6850 - .4byte 0x803CC735 + .4byte lbl_803CC735 .global lbl_805A9FB4 lbl_805A9FB4: # ROM: 0x3F6854 - .4byte 0x803CC74A + .4byte lbl_803CC74A .global lbl_805A9FB8 lbl_805A9FB8: diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s index fc4788c8..7c6a024e 100644 --- a/asm/MetroidPrime/CSamusDoll.s +++ b/asm/MetroidPrime/CSamusDoll.s @@ -129,22 +129,22 @@ lbl_805A731C: .global lbl_805AABA0 lbl_805AABA0: # ROM: 0x3F7440 - .4byte 0x803CE488 + .4byte lbl_803CE488 .global lbl_805AABA4 lbl_805AABA4: # ROM: 0x3F7444 - .4byte 0x803CE49C + .4byte lbl_803CE49C .global lbl_805AABA8 lbl_805AABA8: # ROM: 0x3F7448 - .4byte 0x803CE4A5 + .4byte lbl_803CE4A5 .global lbl_805AABAC lbl_805AABAC: # ROM: 0x3F744C - .4byte 0x803CE4B2 + .4byte lbl_803CE4B2 .global lbl_805AABB0 lbl_805AABB0: diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index 87783d4e..9c54135d 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -10,61 +10,61 @@ lbl_ctor: .global lbl_803DAF58 lbl_803DAF58: # ROM: 0x3D7F58 - .4byte 0x803CD968 - .4byte 0x803CD96F - .4byte 0x803CD97D - .4byte 0x803CD982 - .4byte 0x803CD98B - .4byte 0x803CD991 - .4byte 0x803CD99E - .4byte 0x803CD9AB - .4byte 0x803CD9B8 - .4byte 0x803CD9C4 - .4byte 0x803CD9C9 - .4byte 0x803CD9CE - .4byte 0x803CD9D2 - .4byte 0x803CD9DB - .4byte 0x803CD9E6 - .4byte 0x803CD9ED - .4byte 0x803CD9FA - .4byte 0x803CDA03 - .4byte 0x803CDA0E - .4byte 0x803CDA16 - .4byte 0x803CDA21 - .4byte 0x803CDA26 - .4byte 0x803CDA2D - .4byte 0x803CDA36 - .4byte 0x803CDA42 - .4byte 0x803CDA49 - .4byte 0x803CDA50 - .4byte 0x803CDA58 - .4byte 0x803CDA5E - .4byte 0x803CDA64 - .4byte 0x803CDA69 - .4byte 0x803CDA6E - .4byte 0x803CDA73 - .4byte 0x803CDA84 - .4byte 0x803CDA8B - .4byte 0x803CDA92 - .4byte 0x803CDAA2 - .4byte 0x803CDAA7 - .4byte 0x803CDAAF - .4byte 0x803CDAB5 - .4byte 0x803CDABD - .4byte 0x803CDAC3 - .4byte 0x803CDACC - .4byte 0x803CDAD5 - .4byte 0x803CDAE0 - .4byte 0x803CDAE8 - .4byte 0x803CDAF6 - .4byte 0x803CDAFD - .4byte 0x803CDB03 - .4byte 0x803CDB08 - .4byte 0x803CDB0F - .4byte 0x803CDB1A - .4byte 0x803CDB20 - .4byte 0x803CDB2E - .4byte 0x803CDB39 + .4byte lbl_803CD968 + .4byte lbl_803CD96F + .4byte lbl_803CD97D + .4byte lbl_803CD982 + .4byte lbl_803CD98B + .4byte lbl_803CD991 + .4byte lbl_803CD99E + .4byte lbl_803CD9AB + .4byte lbl_803CD9B8 + .4byte lbl_803CD9C4 + .4byte lbl_803CD9C9 + .4byte lbl_803CD9CE + .4byte lbl_803CD9D2 + .4byte lbl_803CD9DB + .4byte lbl_803CD9E6 + .4byte lbl_803CD9ED + .4byte lbl_803CD9FA + .4byte lbl_803CDA03 + .4byte lbl_803CDA0E + .4byte lbl_803CDA16 + .4byte lbl_803CDA21 + .4byte lbl_803CDA26 + .4byte lbl_803CDA2D + .4byte lbl_803CDA36 + .4byte lbl_803CDA42 + .4byte lbl_803CDA49 + .4byte lbl_803CDA50 + .4byte lbl_803CDA58 + .4byte lbl_803CDA5E + .4byte lbl_803CDA64 + .4byte lbl_803CDA69 + .4byte lbl_803CDA6E + .4byte lbl_803CDA73 + .4byte lbl_803CDA84 + .4byte lbl_803CDA8B + .4byte lbl_803CDA92 + .4byte lbl_803CDAA2 + .4byte lbl_803CDAA7 + .4byte lbl_803CDAAF + .4byte lbl_803CDAB5 + .4byte lbl_803CDABD + .4byte lbl_803CDAC3 + .4byte lbl_803CDACC + .4byte lbl_803CDAD5 + .4byte lbl_803CDAE0 + .4byte lbl_803CDAE8 + .4byte lbl_803CDAF6 + .4byte lbl_803CDAFD + .4byte lbl_803CDB03 + .4byte lbl_803CDB08 + .4byte lbl_803CDB0F + .4byte lbl_803CDB1A + .4byte lbl_803CDB20 + .4byte lbl_803CDB2E + .4byte lbl_803CDB39 .4byte 0 .4byte 0x000000A4 .4byte 0 @@ -395,74 +395,74 @@ lbl_803DAF58: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x803CDB43 - .4byte 0x803CDB54 - .4byte 0x803CDB5A - .4byte 0x803CDB62 - .4byte 0x803CDB6B - .4byte 0x803CDB77 - .4byte 0x803CDB80 - .4byte 0x803CDB8A - .4byte 0x803CDB93 - .4byte 0x803CDB9B - .4byte 0x803CDBA6 - .4byte 0x803CDBB7 - .4byte 0x803CDBC2 - .4byte 0x803CDBCD - .4byte 0x803CDBD9 - .4byte 0x803CDBE8 - .4byte 0x803CDBF9 - .4byte 0x803CDC07 - .4byte 0x803CDC19 - .4byte 0x803CDC1F - .4byte 0x803CDC2B - .4byte 0x803CDC36 - .4byte 0x803CDC3E - .4byte 0x803CDC47 - .4byte 0x803CDC54 - .4byte 0x803CDC65 - .4byte 0x803CDC70 - .4byte 0x803CDC7B - .4byte 0x803CDC88 - .4byte 0x803CDC97 - .4byte 0x803CDC9D - .4byte 0x803CDCA9 - .4byte 0x803CDCB0 - .4byte 0x803CDCB9 - .4byte 0x803CDCC4 - .4byte 0x803CDCCF - .4byte 0x803CDCD9 - .4byte 0x803CDCE4 - .4byte 0x803CDCF5 - .4byte 0x803CDD02 - .4byte 0x803CDD08 - .4byte 0x803CDD14 - .4byte 0x803CDD24 - .4byte 0x803CDD2F - .4byte 0x803CDD3B - .4byte 0x803CDD42 - .4byte 0x803CDD4D - .4byte 0x803CDD5A - .4byte 0x803CDD69 - .4byte 0x803CDD75 - .4byte 0x803CDD83 - .4byte 0x803CDD90 - .4byte 0x803CDD9B - .4byte 0x803CDDA2 - .4byte 0x803CDDB4 - .4byte 0x803CDDC3 - .4byte 0x803CDDCE - .4byte 0x803CDDD6 - .4byte 0x803CDDE2 - .4byte 0x803CDDEE - .4byte 0x803CDDFB - .4byte 0x803CDE0F - .4byte 0x803CDE1C - .4byte 0x803CDE28 - .4byte 0x803CDE33 - .4byte 0x803CDE3A - .4byte 0x803CDE46 - .4byte 0x803CDE4E + .4byte lbl_803CDB43 + .4byte lbl_803CDB54 + .4byte lbl_803CDB5A + .4byte lbl_803CDB62 + .4byte lbl_803CDB6B + .4byte lbl_803CDB77 + .4byte lbl_803CDB80 + .4byte lbl_803CDB8A + .4byte lbl_803CDB93 + .4byte lbl_803CDB9B + .4byte lbl_803CDBA6 + .4byte lbl_803CDBB7 + .4byte lbl_803CDBC2 + .4byte lbl_803CDBCD + .4byte lbl_803CDBD9 + .4byte lbl_803CDBE8 + .4byte lbl_803CDBF9 + .4byte lbl_803CDC07 + .4byte lbl_803CDC19 + .4byte lbl_803CDC1F + .4byte lbl_803CDC2B + .4byte lbl_803CDC36 + .4byte lbl_803CDC3E + .4byte lbl_803CDC47 + .4byte lbl_803CDC54 + .4byte lbl_803CDC65 + .4byte lbl_803CDC70 + .4byte lbl_803CDC7B + .4byte lbl_803CDC88 + .4byte lbl_803CDC97 + .4byte lbl_803CDC9D + .4byte lbl_803CDCA9 + .4byte lbl_803CDCB0 + .4byte lbl_803CDCB9 + .4byte lbl_803CDCC4 + .4byte lbl_803CDCCF + .4byte lbl_803CDCD9 + .4byte lbl_803CDCE4 + .4byte lbl_803CDCF5 + .4byte lbl_803CDD02 + .4byte lbl_803CDD08 + .4byte lbl_803CDD14 + .4byte lbl_803CDD24 + .4byte lbl_803CDD2F + .4byte lbl_803CDD3B + .4byte lbl_803CDD42 + .4byte lbl_803CDD4D + .4byte lbl_803CDD5A + .4byte lbl_803CDD69 + .4byte lbl_803CDD75 + .4byte lbl_803CDD83 + .4byte lbl_803CDD90 + .4byte lbl_803CDD9B + .4byte lbl_803CDDA2 + .4byte lbl_803CDDB4 + .4byte lbl_803CDDC3 + .4byte lbl_803CDDCE + .4byte lbl_803CDDD6 + .4byte lbl_803CDDE2 + .4byte lbl_803CDDEE + .4byte lbl_803CDDFB + .4byte lbl_803CDE0F + .4byte lbl_803CDE1C + .4byte lbl_803CDE28 + .4byte lbl_803CDE33 + .4byte lbl_803CDE3A + .4byte lbl_803CDE46 + .4byte lbl_803CDE4E .4byte 0 .4byte 0x00000180 .4byte 0 diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index 4feef101..1e06e594 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -296,17 +296,17 @@ lbl_805A8ECC: .global lbl_805AACE0 lbl_805AACE0: # ROM: 0x3F7580 - .4byte 0x803CE5D0 + .4byte lbl_803CE5D0 .global lbl_805AACE4 lbl_805AACE4: # ROM: 0x3F7584 - .4byte 0x803CE5DE + .4byte lbl_803CE5DE .global lbl_805AACE8 lbl_805AACE8: # ROM: 0x3F7588 - .4byte 0x803CE5DE + .4byte lbl_803CE5DE .global lbl_805AACEC lbl_805AACEC: diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index ee661564..589be1dd 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -6,9 +6,9 @@ .global lbl_803E0338 lbl_803E0338: # ROM: 0x3DD338 - .4byte 0x803CF2FF - .4byte 0x803CF305 - .4byte 0x803CF30B + .4byte lbl_803CF2FF + .4byte lbl_803CF305 + .4byte lbl_803CF30B .global lbl_803E0344 lbl_803E0344: diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index f6458fd2..38c3d0a2 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -225,7 +225,7 @@ lbl_803E7A18: .global lbl_805A80F8 lbl_805A80F8: # ROM: 0x3F5A98 - .4byte 0x803D3248 + .4byte lbl_803D3248 .4byte 0 .section .sbss, "wa" diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index c58efcb1..2348cdc3 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -9986,17 +9986,17 @@ lbl_805ABD90: .global lbl_805ABD94 lbl_805ABD94: # ROM: 0x3F8634 - .4byte 0x803D05E2 + .4byte lbl_803D05E2 .global lbl_805ABD98 lbl_805ABD98: # ROM: 0x3F8638 - .4byte 0x803D0550 + .4byte lbl_803D0550 .global lbl_805ABD9C lbl_805ABD9C: # ROM: 0x3F863C - .4byte 0x803D05F5 + .4byte lbl_803D05F5 .global lbl_805ABDA0 lbl_805ABDA0: diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index da9b9400..5d97171e 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -5035,7 +5035,7 @@ __sinit_CParasite_cpp: .global lbl_805ABB68 lbl_805ABB68: # ROM: 0x3F8408 - .4byte 0x803D0330 + .4byte lbl_803D0330 .float 0.4 .global lbl_805ABB70 diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 01c5d001..19b7f939 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -2893,7 +2893,7 @@ Accept__22CThardusRockProjectileFR8IVisitor: .global lbl_805ACD98 lbl_805ACD98: # ROM: 0x3F9638 - .4byte 0x803D2590 + .4byte lbl_803D2590 .float 1.5 .global lbl_805ACDA0 diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 63b52806..58773045 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -265,7 +265,7 @@ lbl_805A75E8: .global lbl_805AB1E0 lbl_805AB1E0: # ROM: 0x3F7A80 - .4byte 0x803CF1E4 + .4byte lbl_803CF1E4 .global lbl_805AB1E4 lbl_805AB1E4: diff --git a/asm/MetroidPrime/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s index db69b499..cefcba07 100644 --- a/asm/MetroidPrime/HUD/CHudDecoInterface.s +++ b/asm/MetroidPrime/HUD/CHudDecoInterface.s @@ -9960,45 +9960,45 @@ lbl_805AC31C: .global lbl_805AC320 lbl_805AC320: # ROM: 0x3F8BC0 - .4byte 0x803D0E58 - .4byte 0x803D0E6D + .4byte lbl_803D0E58 + .4byte lbl_803D0E6D .global lbl_805AC328 lbl_805AC328: # ROM: 0x3F8BC8 - .4byte 0x803D0E81 - .4byte 0x803D0E94 + .4byte lbl_803D0E81 + .4byte lbl_803D0E94 .global lbl_805AC330 lbl_805AC330: # ROM: 0x3F8BD0 - .4byte 0x803D0EA6 - .4byte 0x803D0EC0 + .4byte lbl_803D0EA6 + .4byte lbl_803D0EC0 .global lbl_805AC338 lbl_805AC338: # ROM: 0x3F8BD8 - .4byte 0x803D0ED9 + .4byte lbl_803D0ED9 .global lbl_805AC33C lbl_805AC33C: # ROM: 0x3F8BDC - .4byte 0x803D0EE5 + .4byte lbl_803D0EE5 .global lbl_805AC340 lbl_805AC340: # ROM: 0x3F8BE0 - .4byte 0x803D0EF0 + .4byte lbl_803D0EF0 .global lbl_805AC344 lbl_805AC344: # ROM: 0x3F8BE4 - .4byte 0x803D0EF4 + .4byte lbl_803D0EF4 .global lbl_805AC348 lbl_805AC348: # ROM: 0x3F8BE8 - .4byte 0x803D0EF9 + .4byte lbl_803D0EF9 .global lbl_805AC34C lbl_805AC34C: diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index 7f93581c..cebe8333 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -184,7 +184,7 @@ lbl_805A8D8C: .global lbl_805AA168 lbl_805AA168: # ROM: 0x3F6A08 - .4byte 0x803CCEB0 + .4byte lbl_803CCEB0 .global lbl_805AA16C lbl_805AA16C: diff --git a/asm/MetroidPrime/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s index eab89149..35ab461c 100644 --- a/asm/MetroidPrime/Player/CSamusFaceReflection.s +++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s @@ -734,7 +734,7 @@ __sinit_CSamusFaceReflection_cpp: .global lbl_805ABBC0 lbl_805ABBC0: # ROM: 0x3F8460 - .4byte 0x803D0340 + .4byte lbl_803D0340 .global lbl_805ABBC4 lbl_805ABBC4: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s index be49ee13..6f5e0498 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s @@ -2350,7 +2350,7 @@ lbl_801AC1DC: .global lbl_805AC558 lbl_805AC558: # ROM: 0x3F8DF8 - .4byte 0x803D14B8 + .4byte lbl_803D14B8 .global lbl_805AC55C lbl_805AC55C: diff --git a/asm/Runtime/alloc.s b/asm/Runtime/alloc.s index 543575b2..75414ecb 100644 --- a/asm/Runtime/alloc.s +++ b/asm/Runtime/alloc.s @@ -2,7 +2,7 @@ .section .bss .balign 8 -.lcomm "protopool$192", 0x338, 4 +.lcomm "protopool$192", 0x38, 4 .section .rodata .balign 8 diff --git a/asm/Runtime/ansi_files.s b/asm/Runtime/ansi_files.s index cc79cd00..d8b68057 100644 --- a/asm/Runtime/ansi_files.s +++ b/asm/Runtime/ansi_files.s @@ -1,5 +1,17 @@ .include "macros.inc" +.section .bss +.balign 8 +.global stderr_buff +stderr_buff: + .skip 0x100 +.global stdout_buff +stdout_buff: + .skip 0x100 +.global stdin_buff +stdin_buff: + .skip 0x100 + .section .text, "ax" .global __flush_all diff --git a/asm/Runtime/ansi_fp.s b/asm/Runtime/ansi_fp.s index 06b2fa38..9ad6aca3 100644 --- a/asm/Runtime/ansi_fp.s +++ b/asm/Runtime/ansi_fp.s @@ -1553,132 +1553,175 @@ __two_exp: /* 8038C620 00389580 7C 04 00 2E */ lwzx r0, r4, r0 /* 8038C624 00389584 7C 09 03 A6 */ mtctr r0 /* 8038C628 00389588 4E 80 04 20 */ bctr +.global lbl_8038C62C +lbl_8038C62C: /* 8038C62C 0038958C 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C630 00389590 38 A0 FF EC */ li r5, -20 /* 8038C634 00389594 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C638 00389598 38 84 00 25 */ addi r4, r4, 0x25 /* 8038C63C 0038959C 48 00 02 E9 */ bl __str2dec /* 8038C640 003895A0 48 00 02 C8 */ b lbl_8038C908 +.global lbl_8038C644 +lbl_8038C644: /* 8038C644 003895A4 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C648 003895A8 38 A0 FF F0 */ li r5, -16 /* 8038C64C 003895AC 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C650 003895B0 38 84 00 53 */ addi r4, r4, 0x53 /* 8038C654 003895B4 48 00 02 D1 */ bl __str2dec /* 8038C658 003895B8 48 00 02 B0 */ b lbl_8038C908 +.global lbl_8038C65C +lbl_8038C65C: /* 8038C65C 003895BC 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C660 003895C0 38 A0 FF F6 */ li r5, -10 /* 8038C664 003895C4 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C668 003895C8 38 84 00 7A */ addi r4, r4, 0x7a /* 8038C66C 003895CC 48 00 02 B9 */ bl __str2dec /* 8038C670 003895D0 48 00 02 98 */ b lbl_8038C908 +.global lbl_8038C674 +lbl_8038C674: /* 8038C674 003895D4 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C678 003895D8 38 A0 FF FB */ li r5, -5 /* 8038C67C 003895DC 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C680 003895E0 38 84 00 92 */ addi r4, r4, 0x92 /* 8038C684 003895E4 48 00 02 A1 */ bl __str2dec /* 8038C688 003895E8 48 00 02 80 */ b lbl_8038C908 +.global lbl_8038C68C +lbl_8038C68C: /* 8038C68C 003895EC 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C690 003895F0 38 A0 FF FD */ li r5, -3 /* 8038C694 003895F4 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C698 003895F8 38 84 00 9F */ addi r4, r4, 0x9f /* 8038C69C 003895FC 48 00 02 89 */ bl __str2dec /* 8038C6A0 00389600 48 00 02 68 */ b lbl_8038C908 +.global lbl_8038C6A4 +lbl_8038C6A4: /* 8038C6A4 00389604 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C6A8 00389608 38 A0 FF FD */ li r5, -3 /* 8038C6AC 0038960C 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C6B0 00389610 38 84 00 A6 */ addi r4, r4, 0xa6 /* 8038C6B4 00389614 48 00 02 71 */ bl __str2dec /* 8038C6B8 00389618 48 00 02 50 */ b lbl_8038C908 +.global lbl_8038C6BC +lbl_8038C6BC: /* 8038C6BC 0038961C 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C6C0 00389620 38 A0 FF FE */ li r5, -2 /* 8038C6C4 00389624 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C6C8 00389628 38 84 00 AC */ addi r4, r4, 0xac /* 8038C6CC 0038962C 48 00 02 59 */ bl __str2dec /* 8038C6D0 00389630 48 00 02 38 */ b lbl_8038C908 +.global lbl_8038C6D4 +lbl_8038C6D4: /* 8038C6D4 00389634 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C6D8 00389638 38 A0 FF FE */ li r5, -2 /* 8038C6DC 0038963C 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C6E0 00389640 38 84 00 B2 */ addi r4, r4, 0xb2 /* 8038C6E4 00389644 48 00 02 41 */ bl __str2dec /* 8038C6E8 00389648 48 00 02 20 */ b lbl_8038C908 +.global lbl_8038C6EC +lbl_8038C6EC: /* 8038C6EC 0038964C 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C6F0 00389650 38 A0 FF FE */ li r5, -2 /* 8038C6F4 00389654 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C6F8 00389658 38 84 00 B7 */ addi r4, r4, 0xb7 /* 8038C6FC 0038965C 48 00 02 29 */ bl __str2dec /* 8038C700 00389660 48 00 02 08 */ b lbl_8038C908 +.global lbl_8038C704 +lbl_8038C704: /* 8038C704 00389664 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C708 00389668 38 A0 FF FF */ li r5, -1 /* 8038C70C 0038966C 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C710 00389670 38 84 00 BB */ addi r4, r4, 0xbb /* 8038C714 00389674 48 00 02 11 */ bl __str2dec /* 8038C718 00389678 48 00 01 F0 */ b lbl_8038C908 +.global lbl_8038C71C +lbl_8038C71C: /* 8038C71C 0038967C 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C720 00389680 38 A0 FF FF */ li r5, -1 /* 8038C724 00389684 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C728 00389688 38 84 00 BF */ addi r4, r4, 0xbf /* 8038C72C 0038968C 48 00 01 F9 */ bl __str2dec /* 8038C730 00389690 48 00 01 D8 */ b lbl_8038C908 +.global lbl_8038C734 +lbl_8038C734: /* 8038C734 00389694 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C738 00389698 38 A0 FF FF */ li r5, -1 /* 8038C73C 0038969C 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C740 003896A0 38 84 00 C2 */ addi r4, r4, 0xc2 /* 8038C744 003896A4 48 00 01 E1 */ bl __str2dec /* 8038C748 003896A8 48 00 01 C0 */ b lbl_8038C908 +.global lbl_8038C74C +lbl_8038C74C: /* 8038C74C 003896AC 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C750 003896B0 38 A0 00 00 */ li r5, 0 /* 8038C754 003896B4 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C758 003896B8 38 84 00 C4 */ addi r4, r4, 0xc4 /* 8038C75C 003896BC 48 00 01 C9 */ bl __str2dec /* 8038C760 003896C0 48 00 01 A8 */ b lbl_8038C908 +.global lbl_8038C764 +lbl_8038C764: /* 8038C764 003896C4 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C768 003896C8 38 A0 00 00 */ li r5, 0 /* 8038C76C 003896CC 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C770 003896D0 38 84 00 C6 */ addi r4, r4, 0xc6 /* 8038C774 003896D4 48 00 01 B1 */ bl __str2dec /* 8038C778 003896D8 48 00 01 90 */ b lbl_8038C908 +.global lbl_8038C77C +lbl_8038C77C: /* 8038C77C 003896DC 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C780 003896E0 38 A0 00 00 */ li r5, 0 /* 8038C784 003896E4 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C788 003896E8 38 84 00 C8 */ addi r4, r4, 0xc8 /* 8038C78C 003896EC 48 00 01 99 */ bl __str2dec /* 8038C790 003896F0 48 00 01 78 */ b lbl_8038C908 +.global lbl_8038C794 +lbl_8038C794: /* 8038C794 003896F4 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C798 003896F8 38 A0 00 00 */ li r5, 0 /* 8038C79C 003896FC 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C7A0 00389700 38 84 00 CA */ addi r4, r4, 0xca /* 8038C7A4 00389704 48 00 01 81 */ bl __str2dec /* 8038C7A8 00389708 48 00 01 60 */ b lbl_8038C908 +.global lbl_8038C7AC +lbl_8038C7AC: /* 8038C7AC 0038970C 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C7B0 00389710 38 A0 00 01 */ li r5, 1 /* 8038C7B4 00389714 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C7B8 00389718 38 84 00 CC */ addi r4, r4, 0xcc /* 8038C7BC 0038971C 48 00 01 69 */ bl __str2dec /* 8038C7C0 00389720 48 00 01 48 */ b lbl_8038C908 +.global lbl_8038C7C4 +lbl_8038C7C4: /* 8038C7C4 00389724 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C7C8 00389728 38 A0 00 01 */ li r5, 1 /* 8038C7CC 0038972C 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C7D0 00389730 38 84 00 CF */ addi r4, r4, 0xcf /* 8038C7D4 00389734 48 00 01 51 */ bl __str2dec /* 8038C7D8 00389738 48 00 01 30 */ b lbl_8038C908 +.global lbl_8038C7DC +lbl_8038C7DC: /* 8038C7DC 0038973C 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C7E0 00389740 38 A0 00 01 */ li r5, 1 /* 8038C7E4 00389744 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C7E8 00389748 38 84 00 D2 */ addi r4, r4, 0xd2 /* 8038C7EC 0038974C 48 00 01 39 */ bl __str2dec /* 8038C7F0 00389750 48 00 01 18 */ b lbl_8038C908 +.global lbl_8038C7F4 +lbl_8038C7F4: /* 8038C7F4 00389754 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C7F8 00389758 38 A0 00 02 */ li r5, 2 /* 8038C7FC 0038975C 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C800 00389760 38 84 00 D5 */ addi r4, r4, 0xd5 /* 8038C804 00389764 48 00 01 21 */ bl __str2dec /* 8038C808 00389768 48 00 01 00 */ b lbl_8038C908 +.global lbl_8038C80C +lbl_8038C80C: /* 8038C80C 0038976C 3C 80 80 3E */ lis r4, lbl_803D85D8@ha /* 8038C810 00389770 38 A0 00 02 */ li r5, 2 /* 8038C814 00389774 38 84 85 D8 */ addi r4, r4, lbl_803D85D8@l /* 8038C818 00389778 38 84 00 D9 */ addi r4, r4, 0xd9 /* 8038C81C 0038977C 48 00 01 09 */ bl __str2dec /* 8038C820 00389780 48 00 00 E8 */ b lbl_8038C908 +.global lbl_8038C824 lbl_8038C824: /* 8038C824 00389784 57 C0 0F FE */ srwi r0, r30, 0x1f /* 8038C828 00389788 38 61 00 8C */ addi r3, r1, 0x8c diff --git a/asm/Runtime/printf.s b/asm/Runtime/printf.s index 073686b7..3354b918 100644 --- a/asm/Runtime/printf.s +++ b/asm/Runtime/printf.s @@ -30,19 +30,24 @@ lbl_803F2778: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x805424D0 + .4byte stdin_buff .4byte 0x00000100 - .4byte 0x805424D0 + .4byte stdin_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80003648 - .4byte 0x8039127C - .4byte 0x80391274 + .4byte __read_console + .4byte __write_console + .4byte __close_console .4byte 0 - .4byte 0x803F27C8 + .4byte lbl_803F27C8 + +.global lbl_803F27C8 +lbl_803F27C8: + + # ROM: 0x3EF7C8 .4byte 0x00000001 .4byte 0x12800000 .4byte 0 @@ -50,19 +55,24 @@ lbl_803F2778: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x805423D0 + .4byte stdout_buff .4byte 0x00000100 - .4byte 0x805423D0 + .4byte stdout_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80003648 - .4byte 0x8039127C - .4byte 0x80391274 + .4byte __read_console + .4byte __write_console + .4byte __close_console .4byte 0 - .4byte 0x803F2818 + .4byte lbl_803F2818 + +.global lbl_803F2818 +lbl_803F2818: + + # ROM: 0x3EF818 .4byte 0x00000002 .4byte 0x10800000 .4byte 0 @@ -70,19 +80,24 @@ lbl_803F2778: .4byte 0 .4byte 0 .4byte 0 - .4byte 0x805422D0 + .4byte stderr_buff .4byte 0x00000100 - .4byte 0x805422D0 + .4byte stderr_buff .4byte 0 .4byte 0 .4byte 0 .4byte 0 .4byte 0 - .4byte 0x80003648 - .4byte 0x8039127C - .4byte 0x80391274 + .4byte __read_console + .4byte __write_console + .4byte __close_console .4byte 0 - .4byte 0x803F2868 + .4byte lbl_803F2868 + +.global lbl_803F2868 +lbl_803F2868: + + # ROM: 0x3EF868 .4byte 0 .4byte 0 .4byte 0 @@ -127,79 +142,79 @@ lbl_803F28B8: .global lbl_803F28F8 lbl_803F28F8: # ROM: 0x3EF8F8 - .4byte 0x8038C62C - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C644 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C65C - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C674 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C824 - .4byte 0x8038C68C - .4byte 0x8038C6A4 - .4byte 0x8038C6BC - .4byte 0x8038C6D4 - .4byte 0x8038C6EC - .4byte 0x8038C704 - .4byte 0x8038C71C - .4byte 0x8038C734 - .4byte 0x8038C74C - .4byte 0x8038C764 - .4byte 0x8038C77C - .4byte 0x8038C794 - .4byte 0x8038C7AC - .4byte 0x8038C7C4 - .4byte 0x8038C7DC - .4byte 0x8038C7F4 - .4byte 0x8038C80C + .4byte lbl_8038C62C + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C644 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C65C + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C674 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C824 + .4byte lbl_8038C68C + .4byte lbl_8038C6A4 + .4byte lbl_8038C6BC + .4byte lbl_8038C6D4 + .4byte lbl_8038C6EC + .4byte lbl_8038C704 + .4byte lbl_8038C71C + .4byte lbl_8038C734 + .4byte lbl_8038C74C + .4byte lbl_8038C764 + .4byte lbl_8038C77C + .4byte lbl_8038C794 + .4byte lbl_8038C7AC + .4byte lbl_8038C7C4 + .4byte lbl_8038C7DC + .4byte lbl_8038C7F4 + .4byte lbl_8038C80C .4byte 0 .global lbl_803F2A20 @@ -409,182 +424,181 @@ lbl_803F2C20: .global lbl_803F2D20 lbl_803F2D20: # ROM: 0x3EFD20 - .4byte 0x803D86B8 - .4byte 0x803D86BA - .4byte 0x803D86BA - .4byte 0x803D86BA - .4byte 0x803D86BA - .4byte 0x803D86BA - .4byte 0x803D86BA - .4byte 0x803D86BA - .4byte 0x803D86BA + .4byte lbl_803D86B8 + .4byte lbl_803D86BA + .4byte lbl_803D86BA + .4byte lbl_803D86BA + .4byte lbl_803D86BA + .4byte lbl_803D86BA + .4byte lbl_803D86BA + .4byte lbl_803D86BA + .4byte lbl_803D86BA .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 - .4byte 0x803D86BA + .4byte lbl_803D86BA .4byte 0x7F7F7F7F .4byte 0x7F7F7F00 .global lbl_803F2D58 lbl_803F2D58: # ROM: 0x3EFD58 - .4byte 0x8038F3FC - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F39C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F39C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F3D4 - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F3E8 - .4byte 0x8038F40C - .4byte 0x8038F40C - .4byte 0x8038F3FC + .4byte lbl_8038F3FC + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F39C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F39C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F3D4 + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F3E8 + .4byte lbl_8038F40C + .4byte lbl_8038F40C + .4byte lbl_8038F3FC .global lbl_803F2DDC lbl_803F2DDC: # ROM: 0x3EFDDC - .4byte 0x8038F688 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F650 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F650 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F668 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F678 - .4byte 0x8038F694 - .4byte 0x8038F694 - .4byte 0x8038F688 + .4byte lbl_8038F688 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F650 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F650 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F668 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F678 + .4byte lbl_8038F694 + .4byte lbl_8038F694 + .4byte lbl_8038F688 .global lbl_803F2E60 lbl_803F2E60: # ROM: 0x3EFE60 - .4byte 0x8038FB8C - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FBDC - .4byte 0x8038FB54 - .4byte 0x8038FBC8 - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FB0C - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FB8C - .4byte 0x8038FCBC - .4byte 0x8038FC40 - .4byte 0x8038FB0C - .4byte 0x8038FBDC - .4byte 0x8038FB54 - .4byte 0x8038FBC8 - .4byte 0x8038FCBC - .4byte 0x8038FB0C - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FCA4 - .4byte 0x8038FB0C - .4byte 0x8038FC1C - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FC78 - .4byte 0x8038FCBC - .4byte 0x8038FB0C - .4byte 0x8038FCBC - .4byte 0x8038FCBC - .4byte 0x8038FB0C + .4byte lbl_8038FB8C + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FBDC + .4byte lbl_8038FB54 + .4byte lbl_8038FBC8 + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FB0C + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FB8C + .4byte lbl_8038FCBC + .4byte lbl_8038FC40 + .4byte lbl_8038FB0C + .4byte lbl_8038FBDC + .4byte lbl_8038FB54 + .4byte lbl_8038FBC8 + .4byte lbl_8038FCBC + .4byte lbl_8038FB0C + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FCA4 + .4byte lbl_8038FB0C + .4byte lbl_8038FC1C + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FC78 + .4byte lbl_8038FCBC + .4byte lbl_8038FB0C + .4byte lbl_8038FCBC + .4byte lbl_8038FCBC + .4byte lbl_8038FB0C .global lbl_803F2F40 lbl_803F2F40: # ROM: 0x3EFF40 - .4byte 0x8038F8BC - .4byte 0x8038F8F8 - .4byte 0x8038F8F8 - .4byte 0x8038F8D4 - .4byte 0x8038F8F8 - .4byte 0x8038F8F8 - .4byte 0x8038F8F8 - .4byte 0x8038F8F8 - .4byte 0x8038F8F8 - .4byte 0x8038F8F8 - .4byte 0x8038F8F8 - .4byte 0x8038F8B0 - .4byte 0x8038F8F8 - .4byte 0x8038F8A4 - .4byte 0x8038F8F8 - .4byte 0x8038F8F8 - .4byte 0x8038F8E0 + .4byte lbl_8038F8BC + .4byte lbl_8038F8F8 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8D4 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8B0 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8A4 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8F8 + .4byte lbl_8038F8E0 .4byte 0 .section .text, "ax" -/* TODO: Move __stdio_atexit to its own file (misc_io), - * it's here to work around a bug with CW - */ +# TODO: Move __stdio_atexit to its own file (misc_io), +# it's here to work around a bug with CW .global __stdio_atexit __stdio_atexit: /* 8038DCCC 0038AC2C 3C 60 80 39 */ lis r3, __close_all@ha @@ -2269,6 +2283,7 @@ lbl_8038F374: /* 8038F390 0038C2F0 7C 05 00 2E */ lwzx r0, r5, r0 /* 8038F394 0038C2F4 7C 09 03 A6 */ mtctr r0 /* 8038F398 0038C2F8 4E 80 04 20 */ bctr +lbl_8038F39C: /* 8038F39C 0038C2FC 38 00 00 00 */ li r0, 0 /* 8038F3A0 0038C300 6C 65 80 00 */ xoris r5, r3, 0x8000 /* 8038F3A4 0038C304 6C 03 80 00 */ xoris r3, r0, 0x8000 @@ -2283,16 +2298,19 @@ lbl_8038F374: /* 8038F3C8 0038C328 3B 20 00 01 */ li r25, 1 /* 8038F3CC 0038C32C 7F FF 01 90 */ subfze r31, r31 /* 8038F3D0 0038C330 48 00 00 3C */ b lbl_8038F40C +lbl_8038F3D4: /* 8038F3D4 0038C334 38 00 00 00 */ li r0, 0 /* 8038F3D8 0038C338 3B 80 00 08 */ li r28, 8 /* 8038F3DC 0038C33C 98 18 00 01 */ stb r0, 1(r24) /* 8038F3E0 0038C340 3B A0 00 00 */ li r29, 0 /* 8038F3E4 0038C344 48 00 00 28 */ b lbl_8038F40C +lbl_8038F3E8: /* 8038F3E8 0038C348 38 00 00 00 */ li r0, 0 /* 8038F3EC 0038C34C 3B 80 00 0A */ li r28, 0xa /* 8038F3F0 0038C350 98 18 00 01 */ stb r0, 1(r24) /* 8038F3F4 0038C354 3B A0 00 00 */ li r29, 0 /* 8038F3F8 0038C358 48 00 00 14 */ b lbl_8038F40C +lbl_8038F3FC: /* 8038F3FC 0038C35C 38 00 00 00 */ li r0, 0 /* 8038F400 0038C360 3B 80 00 10 */ li r28, 0x10 /* 8038F404 0038C364 98 18 00 01 */ stb r0, 1(r24) @@ -2463,20 +2481,24 @@ lbl_8038F628: /* 8038F644 0038C5A4 7D 29 50 2E */ lwzx r9, r9, r10 /* 8038F648 0038C5A8 7D 29 03 A6 */ mtctr r9 /* 8038F64C 0038C5AC 4E 80 04 20 */ bctr +lbl_8038F650: /* 8038F650 0038C5B0 2C 03 00 00 */ cmpwi r3, 0 /* 8038F654 0038C5B4 38 00 00 0A */ li r0, 0xa /* 8038F658 0038C5B8 40 80 00 3C */ bge lbl_8038F694 /* 8038F65C 0038C5BC 7C 63 00 D0 */ neg r3, r3 /* 8038F660 0038C5C0 39 00 00 01 */ li r8, 1 /* 8038F664 0038C5C4 48 00 00 30 */ b lbl_8038F694 +lbl_8038F668: /* 8038F668 0038C5C8 39 20 00 00 */ li r9, 0 /* 8038F66C 0038C5CC 38 00 00 08 */ li r0, 8 /* 8038F670 0038C5D0 99 25 00 01 */ stb r9, 1(r5) /* 8038F674 0038C5D4 48 00 00 20 */ b lbl_8038F694 +lbl_8038F678: /* 8038F678 0038C5D8 39 20 00 00 */ li r9, 0 /* 8038F67C 0038C5DC 38 00 00 0A */ li r0, 0xa /* 8038F680 0038C5E0 99 25 00 01 */ stb r9, 1(r5) /* 8038F684 0038C5E4 48 00 00 10 */ b lbl_8038F694 +lbl_8038F688: /* 8038F688 0038C5E8 39 20 00 00 */ li r9, 0 /* 8038F68C 0038C5EC 38 00 00 10 */ li r0, 0x10 /* 8038F690 0038C5F0 99 25 00 01 */ stb r9, 1(r5) @@ -2631,21 +2653,26 @@ lbl_8038F87C: /* 8038F898 0038C7F8 7C 03 00 2E */ lwzx r0, r3, r0 /* 8038F89C 0038C7FC 7C 09 03 A6 */ mtctr r0 /* 8038F8A0 0038C800 4E 80 04 20 */ bctr +lbl_8038F8A4: /* 8038F8A4 0038C804 38 00 00 00 */ li r0, 0 /* 8038F8A8 0038C808 98 01 00 08 */ stb r0, 8(r1) /* 8038F8AC 0038C80C 48 00 00 50 */ b lbl_8038F8FC +lbl_8038F8B0: /* 8038F8B0 0038C810 38 00 00 01 */ li r0, 1 /* 8038F8B4 0038C814 98 01 00 09 */ stb r0, 9(r1) /* 8038F8B8 0038C818 48 00 00 44 */ b lbl_8038F8FC +lbl_8038F8BC: /* 8038F8BC 0038C81C 88 01 00 09 */ lbz r0, 9(r1) /* 8038F8C0 0038C820 28 00 00 01 */ cmplwi r0, 1 /* 8038F8C4 0038C824 41 82 00 38 */ beq lbl_8038F8FC /* 8038F8C8 0038C828 38 00 00 02 */ li r0, 2 /* 8038F8CC 0038C82C 98 01 00 09 */ stb r0, 9(r1) /* 8038F8D0 0038C830 48 00 00 2C */ b lbl_8038F8FC +lbl_8038F8D4: /* 8038F8D4 0038C834 38 00 00 01 */ li r0, 1 /* 8038F8D8 0038C838 98 01 00 0B */ stb r0, 0xb(r1) /* 8038F8DC 0038C83C 48 00 00 20 */ b lbl_8038F8FC +lbl_8038F8E0: /* 8038F8E0 0038C840 88 01 00 08 */ lbz r0, 8(r1) /* 8038F8E4 0038C844 28 00 00 00 */ cmplwi r0, 0 /* 8038F8E8 0038C848 41 82 00 14 */ beq lbl_8038F8FC @@ -2806,6 +2833,7 @@ lbl_8038FAE4: /* 8038FB00 0038CA60 7C 03 00 2E */ lwzx r0, r3, r0 /* 8038FB04 0038CA64 7C 09 03 A6 */ mtctr r0 /* 8038FB08 0038CA68 4E 80 04 20 */ bctr +lbl_8038FB0C: /* 8038FB0C 0038CA6C 88 01 00 0C */ lbz r0, 0xc(r1) /* 8038FB10 0038CA70 28 00 00 05 */ cmplwi r0, 5 /* 8038FB14 0038CA74 40 82 00 10 */ bne lbl_8038FB24 @@ -2826,6 +2854,7 @@ lbl_8038FB3C: /* 8038FB48 0038CAA8 38 00 00 01 */ li r0, 1 /* 8038FB4C 0038CAAC 98 01 00 08 */ stb r0, 8(r1) /* 8038FB50 0038CAB0 48 00 01 74 */ b lbl_8038FCC4 +lbl_8038FB54: /* 8038FB54 0038CAB4 88 01 00 0C */ lbz r0, 0xc(r1) /* 8038FB58 0038CAB8 28 00 00 02 */ cmplwi r0, 2 /* 8038FB5C 0038CABC 41 82 00 0C */ beq lbl_8038FB68 @@ -2842,6 +2871,7 @@ lbl_8038FB74: /* 8038FB80 0038CAE0 38 00 00 06 */ li r0, 6 /* 8038FB84 0038CAE4 90 01 00 14 */ stw r0, 0x14(r1) /* 8038FB88 0038CAE8 48 00 01 3C */ b lbl_8038FCC4 +lbl_8038FB8C: /* 8038FB8C 0038CAEC 88 01 00 0A */ lbz r0, 0xa(r1) /* 8038FB90 0038CAF0 28 00 00 00 */ cmplwi r0, 0 /* 8038FB94 0038CAF4 40 82 00 0C */ bne lbl_8038FBA0 @@ -2859,6 +2889,7 @@ lbl_8038FBBC: /* 8038FBBC 0038CB1C 38 00 00 FF */ li r0, 0xff /* 8038FBC0 0038CB20 98 01 00 0D */ stb r0, 0xd(r1) /* 8038FBC4 0038CB24 48 00 01 00 */ b lbl_8038FCC4 +lbl_8038FBC8: /* 8038FBC8 0038CB28 80 01 00 14 */ lwz r0, 0x14(r1) /* 8038FBCC 0038CB2C 2C 00 00 00 */ cmpwi r0, 0 /* 8038FBD0 0038CB30 40 82 00 0C */ bne lbl_8038FBDC @@ -2883,6 +2914,7 @@ lbl_8038FC04: /* 8038FC10 0038CB70 38 00 00 06 */ li r0, 6 /* 8038FC14 0038CB74 90 01 00 14 */ stw r0, 0x14(r1) /* 8038FC18 0038CB78 48 00 00 AC */ b lbl_8038FCC4 +lbl_8038FC1C: /* 8038FC1C 0038CB7C 38 A0 00 78 */ li r5, 0x78 /* 8038FC20 0038CB80 38 80 00 01 */ li r4, 1 /* 8038FC24 0038CB84 38 60 00 03 */ li r3, 3 @@ -2892,6 +2924,7 @@ lbl_8038FC04: /* 8038FC34 0038CB94 98 61 00 0C */ stb r3, 0xc(r1) /* 8038FC38 0038CB98 90 01 00 14 */ stw r0, 0x14(r1) /* 8038FC3C 0038CB9C 48 00 00 88 */ b lbl_8038FCC4 +lbl_8038FC40: /* 8038FC40 0038CBA0 88 61 00 0C */ lbz r3, 0xc(r1) /* 8038FC44 0038CBA4 28 03 00 03 */ cmplwi r3, 3 /* 8038FC48 0038CBA8 40 82 00 10 */ bne lbl_8038FC58 @@ -2908,6 +2941,7 @@ lbl_8038FC6C: /* 8038FC6C 0038CBCC 38 00 00 FF */ li r0, 0xff /* 8038FC70 0038CBD0 98 01 00 0D */ stb r0, 0xd(r1) /* 8038FC74 0038CBD4 48 00 00 50 */ b lbl_8038FCC4 +lbl_8038FC78: /* 8038FC78 0038CBD8 88 01 00 0C */ lbz r0, 0xc(r1) /* 8038FC7C 0038CBDC 28 00 00 03 */ cmplwi r0, 3 /* 8038FC80 0038CBE0 40 82 00 10 */ bne lbl_8038FC90 @@ -2920,6 +2954,7 @@ lbl_8038FC90: /* 8038FC98 0038CBF8 38 00 00 FF */ li r0, 0xff /* 8038FC9C 0038CBFC 98 01 00 0D */ stb r0, 0xd(r1) /* 8038FCA0 0038CC00 48 00 00 24 */ b lbl_8038FCC4 +lbl_8038FCA4: /* 8038FCA4 0038CC04 88 01 00 0C */ lbz r0, 0xc(r1) /* 8038FCA8 0038CC08 28 00 00 05 */ cmplwi r0, 5 /* 8038FCAC 0038CC0C 40 82 00 18 */ bne lbl_8038FCC4 diff --git a/asm/musyx/chorus_fx.s b/asm/musyx/chorus_fx.s index 23a31f3d..c3d49b55 100644 --- a/asm/musyx/chorus_fx.s +++ b/asm/musyx/chorus_fx.s @@ -625,11 +625,11 @@ lbl_803B6E10: /* 803B6E14 003B3D74 FC 20 08 1E */ fctiwz f1, f1 /* 803B6E18 003B3D78 FC 40 10 1E */ fctiwz f2, f2 /* 803B6E1C 003B3D7C FC 60 18 1E */ fctiwz f3, f3 -/* 803B6E20 003B3D80 7C 20 4F AE */ stfiwx f1, 0, r9 +/* 803B6E20 003B3D80 7C 20 4F AE */ stfiwx f1, r0, r9 /* 803B6E24 003B3D84 39 49 00 04 */ addi r10, r9, 4 -/* 803B6E28 003B3D88 7C 40 57 AE */ stfiwx f2, 0, r10 +/* 803B6E28 003B3D88 7C 40 57 AE */ stfiwx f2, r0, r10 /* 803B6E2C 003B3D8C 39 49 00 08 */ addi r10, r9, 8 -/* 803B6E30 003B3D90 7C 60 57 AE */ stfiwx f3, 0, r10 +/* 803B6E30 003B3D90 7C 60 57 AE */ stfiwx f3, r0, r10 /* 803B6E34 003B3D94 90 83 00 0C */ stw r4, 0xc(r3) /* 803B6E38 003B3D98 90 A3 00 10 */ stw r5, 0x10(r3) /* 803B6E3C 003B3D9C BB 41 00 28 */ lmw r26, 0x28(r1) @@ -757,11 +757,11 @@ lbl_803B6FF4: /* 803B7000 003B3F60 FC 20 08 1E */ fctiwz f1, f1 /* 803B7004 003B3F64 FC 40 10 1E */ fctiwz f2, f2 /* 803B7008 003B3F68 FC 60 18 1E */ fctiwz f3, f3 -/* 803B700C 003B3F6C 7C 20 4F AE */ stfiwx f1, 0, r9 +/* 803B700C 003B3F6C 7C 20 4F AE */ stfiwx f1, r0, r9 /* 803B7010 003B3F70 39 49 00 04 */ addi r10, r9, 4 -/* 803B7014 003B3F74 7C 40 57 AE */ stfiwx f2, 0, r10 +/* 803B7014 003B3F74 7C 40 57 AE */ stfiwx f2, r0, r10 /* 803B7018 003B3F78 39 49 00 08 */ addi r10, r9, 8 -/* 803B701C 003B3F7C 7C 60 57 AE */ stfiwx f3, 0, r10 +/* 803B701C 003B3F7C 7C 60 57 AE */ stfiwx f3, r0, r10 /* 803B7020 003B3F80 90 83 00 0C */ stw r4, 0xc(r3) /* 803B7024 003B3F84 90 A3 00 10 */ stw r5, 0x10(r3) /* 803B7028 003B3F88 BB 41 00 28 */ lmw r26, 0x28(r1) diff --git a/asm/musyx/creverb.s b/asm/musyx/creverb.s index 773ea87b..be02e390 100644 --- a/asm/musyx/creverb.s +++ b/asm/musyx/creverb.s @@ -600,7 +600,7 @@ lbl_803B5994: lbl_803B599C: /* 803B599C 003B28FC 3B C4 00 00 */ addi r30, r4, 0 /* 803B59A0 003B2900 7F DE FA 14 */ add r30, r30, r31 -/* 803B59A4 003B2904 7D C0 1F AE */ stfiwx f14, 0, r3 +/* 803B59A4 003B2904 7D C0 1F AE */ stfiwx f14, r0, r3 /* 803B59A8 003B2908 92 BD 00 00 */ stw r21, 0(r29) /* 803B59AC 003B290C 92 9D 00 04 */ stw r20, 4(r29) /* 803B59B0 003B2910 92 7D 00 14 */ stw r19, 0x14(r29) diff --git a/asm/musyx/hardware.s b/asm/musyx/hardware.s index a3e680b3..6cac0668 100644 --- a/asm/musyx/hardware.s +++ b/asm/musyx/hardware.s @@ -1127,7 +1127,7 @@ hwInitStream: /* 803B3CA4 003B0C04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3CA8 003B0C08 7C 08 02 A6 */ mflr r0 /* 803B3CAC 003B0C0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 803B3CB0 003B0C10 48 00 0D 55 */ bl aramAllocateStreamBuffer +/* 803B3CB0 003B0C10 48 00 0D 55 */ bl aramAllocateStreamBuffer /* 803B3CB4 003B0C14 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B3CB8 003B0C18 7C 08 03 A6 */ mtlr r0 /* 803B3CBC 003B0C1C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/musyx/hw_aramdma.s b/asm/musyx/hw_aramdma.s index 7e0e1680..be73f597 100644 --- a/asm/musyx/hw_aramdma.s +++ b/asm/musyx/hw_aramdma.s @@ -773,8 +773,8 @@ lbl_803B49E0: /* 803B49FC 003B195C 90 0D AF A4 */ stw r0, aramStream@sda21(r13) /* 803B4A00 003B1960 4E 80 00 20 */ blr -.global aramAllocateStreamBuffer - aramAllocateStreamBuffer: +.global aramAllocateStreamBuffer +aramAllocateStreamBuffer: /* 803B4A04 003B1964 38 03 00 1F */ addi r0, r3, 0x1f /* 803B4A08 003B1968 80 6D AF 94 */ lwz r3, aramFreeStreamBuffers@sda21(r13) /* 803B4A0C 003B196C 54 07 00 34 */ rlwinm r7, r0, 0, 0, 0x1a diff --git a/asm/musyx/reverb.s b/asm/musyx/reverb.s index bea231bb..0111e89d 100644 --- a/asm/musyx/reverb.s +++ b/asm/musyx/reverb.s @@ -860,7 +860,7 @@ lbl_803B66C0: /* 803B66C0 003B3620 54 BE 08 3C */ slwi r30, r5, 1 /* 803B66C4 003B3624 7F DE 2A 14 */ add r30, r30, r5 /* 803B66C8 003B3628 1F FE 00 14 */ mulli r31, r30, 0x14 -/* 803B66CC 003B362C 7D C0 1F AE */ stfiwx f14, 0, r3 +/* 803B66CC 003B362C 7D C0 1F AE */ stfiwx f14, r0, r3 /* 803B66D0 003B3630 3B A4 00 B4 */ addi r29, r4, 0xb4 /* 803B66D4 003B3634 7F BD FA 14 */ add r29, r29, r31 /* 803B66D8 003B3638 92 BD 00 00 */ stw r21, 0(r29) diff --git a/src/os/__ppc_eabi_init.c b/src/os/__ppc_eabi_init.c index aa1a4c10..1d0a8468 100644 --- a/src/os/__ppc_eabi_init.c +++ b/src/os/__ppc_eabi_init.c @@ -28,9 +28,9 @@ asm void __flush_cache(register void* address, register unsigned int size) { add r4, r4, r3 loop: - dcbst 0, r5 + dcbst r0, r5 sync - icbi 0, r5 + icbi r0, r5 addic r5, r5, 8 subic. r4, r4, 8 bge loop