From 2316eb01d34857912f58a4075bc85cafc73fd454 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 6 Apr 2022 03:04:03 -0700 Subject: [PATCH] Split more section data --- asm/Dolphin/CARD/CARDBios.s | 2 +- asm/Dolphin/DSP/dsp.s | 10 + asm/Dolphin/DSP/dsp_task.s | 17 + asm/Dolphin/DVD/dvd.s | 21 + asm/Dolphin/DVD/dvderror.s | 5 + asm/Dolphin/DVD/dvdfatal.s | 4 + asm/Dolphin/DVD/dvdfs.s | 11 + asm/Dolphin/DVD/fstload.s | 6 +- asm/Dolphin/GBA/GBA.s | 3 +- asm/Dolphin/GBA/GBAXfer.s | 7 +- asm/Dolphin/GX/GXInit.s | 38 ++ asm/Dolphin/GX/GXLight.s | 5 + asm/Dolphin/GX/GXPerf.s | 6 + asm/Dolphin/GX/GXPixel.s | 5 + asm/Dolphin/GX/GXTev.s | 8 + asm/Dolphin/GX/GXTexture.s | 11 + asm/Dolphin/OS/OS.s | 5 + asm/Dolphin/OS/OSAudioSystem.s | 39 +- asm/Dolphin/OS/OSCache.s | 31 ++ asm/Dolphin/OS/OSContext.s | 32 ++ asm/Dolphin/OS/OSError.s | 61 ++- asm/Dolphin/OS/OSFont.s | 717 +++++++++++++++++++++++++++++++++ asm/Dolphin/OS/OSInterrupt.s | 17 + asm/Dolphin/OS/OSLink.s | 11 + asm/Dolphin/OS/OSMemory.s | 7 + asm/Dolphin/OS/OSTime.s | 36 +- asm/Dolphin/PAD/PadClamp.s | 9 + asm/Dolphin/PAD/pad.s | 9 +- asm/Dolphin/SI/SIBios.s | 2 +- asm/Dolphin/THP/THPDec.s | 4 +- asm/Dolphin/db.s | 5 + asm/Runtime/NMWException.s | 4 +- asm/Runtime/alloc.s | 6 + asm/Runtime/ansi_fp.s | 5 + asm/Runtime/e_exp.s | 5 + asm/Runtime/e_fmod.s | 5 + asm/Runtime/e_pow.s | 5 + asm/Runtime/e_rem_pio2.s | 9 + asm/Runtime/k_rem_pio2.s | 8 + asm/Runtime/k_tan.s | 5 + asm/Runtime/printf.s | 5 + asm/Runtime/runtime.s | 5 + asm/Runtime/s_atan.s | 5 + asm/Runtime/strtold.s | 9 + asm/ctors.s | 2 +- asm/data.s | 151 ------- asm/extab.s | 2 +- asm/extabindex.s | 2 +- asm/musyx/hardware.s | 5 + asm/musyx/hw_dspctrl.s | 9 +- asm/musyx/snd_midictrl.s | 11 +- asm/rodata.s | 78 +--- asm/text.s | 4 +- 53 files changed, 1237 insertions(+), 247 deletions(-) diff --git a/asm/Dolphin/CARD/CARDBios.s b/asm/Dolphin/CARD/CARDBios.s index 4739910f..3e231a6c 100644 --- a/asm/Dolphin/CARD/CARDBios.s +++ b/asm/Dolphin/CARD/CARDBios.s @@ -2,7 +2,7 @@ .section .data, "wa" lbl_803F6C90: - .asciz "<< Dolphin SDK - CARD release build: Sep 5 2002 05:35:20 (0x2301) >>" + .asciz "<< Dolphin SDK - CARD\trelease build: Sep 5 2002 05:35:20 (0x2301) >>" .balign 4 .global lbl_803F6CD8 diff --git a/asm/Dolphin/DSP/dsp.s b/asm/Dolphin/DSP/dsp.s index cfa2d7ce..dac5cbaf 100644 --- a/asm/Dolphin/DSP/dsp.s +++ b/asm/Dolphin/DSP/dsp.s @@ -1,5 +1,15 @@ .include "macros.inc" +.section .data +lbl_803EF9D0: + .asciz "<< Dolphin SDK - DSP\trelease build: Sep 5 2002 05:35:13 (0x2301) >>" + .balign 4 + .asciz "DSPInit(): Build Date: %s %s\n" + .balign 4 + .asciz "Sep 5 2002" + .asciz "05:35:13" + .balign 4 + .section .text, "ax" .global DSPCheckMailToDSP diff --git a/asm/Dolphin/DSP/dsp_task.s b/asm/Dolphin/DSP/dsp_task.s index 26365f4b..c90fb011 100644 --- a/asm/Dolphin/DSP/dsp_task.s +++ b/asm/Dolphin/DSP/dsp_task.s @@ -1,5 +1,22 @@ .include "macros.inc" +.section .data +.balign 8 +lbl_803EFA50: + .asciz "DSP is booting task: 0x%08X\n" +.balign 4 + .asciz "__DSP_boot_task() : IRAM MMEM ADDR: 0x%08X\n" +.balign 4 + .asciz "__DSP_boot_task() : IRAM DSP ADDR : 0x%08X\n" +.balign 4 + .asciz "__DSP_boot_task() : IRAM LENGTH : 0x%08X\n" +.balign 4 + .asciz "__DSP_boot_task() : DRAM MMEM ADDR: 0x%08X\n" +.balign 4 + .asciz "__DSP_boot_task() : Start Vector : 0x%08X\n" +.balign 4 + .asciz "__DSP_add_task() : Added task : 0x%08X\n" + .section .text, "ax" .global __DSPHandler diff --git a/asm/Dolphin/DVD/dvd.s b/asm/Dolphin/DVD/dvd.s index ab78e476..1431503c 100644 --- a/asm/Dolphin/DVD/dvd.s +++ b/asm/Dolphin/DVD/dvd.s @@ -1,5 +1,26 @@ .include "macros.inc" +.section .data +.balign 8 +.global lbl_803EFFC8 +lbl_803EFFC8: + .incbin "baserom.dol", 0x3ECFC8, 0xC +.global lbl_803EFFD4 +lbl_803EFFD4: + .incbin "baserom.dol", 0x3ECFD4, 0x30 +.global lbl_803F0004 +lbl_803F0004: + .incbin "baserom.dol", 0x3ED004, 0x4 +.global lbl_803F0008 +lbl_803F0008: + .incbin "baserom.dol", 0x3ED008, 0x90 +.global lbl_803F0098 +lbl_803F0098: + .incbin "baserom.dol", 0x3ED098, 0x34 +.global lbl_803F00CC +lbl_803F00CC: + .incbin "baserom.dol", 0x3ED0CC, 0x34 + .section .text, "ax" .global DVDInit diff --git a/asm/Dolphin/DVD/dvderror.s b/asm/Dolphin/DVD/dvderror.s index 20164861..c330041c 100644 --- a/asm/Dolphin/DVD/dvderror.s +++ b/asm/Dolphin/DVD/dvderror.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .data +.global lbl_803F0100 +lbl_803F0100: + .incbin "baserom.dol", 0x3ED100, 0x478 + .section .text, "ax" .global ErrorCode2Num diff --git a/asm/Dolphin/DVD/dvdfatal.s b/asm/Dolphin/DVD/dvdfatal.s index 78aba828..029f62cb 100644 --- a/asm/Dolphin/DVD/dvdfatal.s +++ b/asm/Dolphin/DVD/dvdfatal.s @@ -1,5 +1,9 @@ .include "macros.inc" +.section .rodata +lbl_803D8570: + .incbin "baserom.dol", 0x3D5570, 0x18 + .section .text, "ax" .global ShowMessage diff --git a/asm/Dolphin/DVD/dvdfs.s b/asm/Dolphin/DVD/dvdfs.s index dd2e8fc0..9b88e42e 100644 --- a/asm/Dolphin/DVD/dvdfs.s +++ b/asm/Dolphin/DVD/dvdfs.s @@ -1,5 +1,16 @@ .include "macros.inc" +.section .data +.balign 8 +lbl_803EFB90: + .asciz "DVDConvertEntrynumToPath(possibly DVDOpen or DVDChangeDir or DVDOpenDir): specified directory or file (%s) doesn't match standard 8.3 format. This is a temporary restriction and will be removed soon\n" +.balign 4 +lbl_803EFC58: + .asciz "Warning: DVDOpen(): file '%s' was not found under %s.\n" +.balign 4 +lbl_803EFC90: + .incbin "baserom.dol", 0x3ECC90, 0x338 + .section .text, "ax" .global __DVDFSInit diff --git a/asm/Dolphin/DVD/fstload.s b/asm/Dolphin/DVD/fstload.s index 3e01c3a2..a5f5bbf7 100644 --- a/asm/Dolphin/DVD/fstload.s +++ b/asm/Dolphin/DVD/fstload.s @@ -1,8 +1,12 @@ .include "macros.inc" +.section .data +.balign 8 +lbl_803F0578: + .incbin "baserom.dol", 0x3ED578, 0xB4 + .section .text, "ax" -.global cb cb: /* 80374E6C 00371DCC 7C 08 02 A6 */ mflr r0 /* 80374E70 00371DD0 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/Dolphin/GBA/GBA.s b/asm/Dolphin/GBA/GBA.s index 368d7faf..82e3eac2 100644 --- a/asm/Dolphin/GBA/GBA.s +++ b/asm/Dolphin/GBA/GBA.s @@ -24,8 +24,7 @@ lbl_803F7170: .byte 0x3f .byte 0x01 .byte 0x00 - .ascii "// Coded by Kawasedo" - .byte 0x00 + .asciz "// Coded by Kawasedo" .byte 0x00 .byte 0x02 .byte 0x03 diff --git a/asm/Dolphin/GBA/GBAXfer.s b/asm/Dolphin/GBA/GBAXfer.s index 6dd3b443..f444e496 100644 --- a/asm/Dolphin/GBA/GBAXfer.s +++ b/asm/Dolphin/GBA/GBAXfer.s @@ -61,12 +61,11 @@ lbl_803F71A0: .byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 lbl_803F7520: - .ascii "GBAKey.c" - .skip 4 + .asciz "GBAKey.c" + .balign 4 lbl_803F752C: - .ascii "GBA - unexpected dsp call" - .skip 1 + .asciz "GBA - unexpected dsp call" .section .text, "ax" # 0x80003640 - 0x803CB1C0 diff --git a/asm/Dolphin/GX/GXInit.s b/asm/Dolphin/GX/GXInit.s index 939c987e..df6cc431 100644 --- a/asm/Dolphin/GX/GXInit.s +++ b/asm/Dolphin/GX/GXInit.s @@ -1,5 +1,43 @@ .include "macros.inc" +.section .data +.global lbl_803F062C +lbl_803F062C: + .incbin "baserom.dol", 0x3ED62C, 0xD0 +.global lbl_803F06FC +lbl_803F06FC: + .incbin "baserom.dol", 0x3ED6FC, 0x1C +.global lbl_803F0718 +lbl_803F0718: + .incbin "baserom.dol", 0x3ED718, 0x68 +.global lbl_803F0780 +lbl_803F0780: + .incbin "baserom.dol", 0x3ED780, 0x68 +.global lbl_803F07E8 +lbl_803F07E8: + .incbin "baserom.dol", 0x3ED7E8, 0x44 +.global lbl_803F082C +lbl_803F082C: + .incbin "baserom.dol", 0x3ED82C, 0x44 +.global lbl_803F0870 +lbl_803F0870: + .incbin "baserom.dol", 0x3ED870, 0x1C +.global lbl_803F088C +lbl_803F088C: + .incbin "baserom.dol", 0x3ED88C, 0x54 +.global lbl_803F08E0 +lbl_803F08E0: + .incbin "baserom.dol", 0x3ED8E0, 0x3C +.global lbl_803F091C +lbl_803F091C: + .incbin "baserom.dol", 0x3ED91C, 0x3C +.global lbl_803F0958 +lbl_803F0958: + .incbin "baserom.dol", 0x3ED958, 0x3C +.global lbl_803F0994 +lbl_803F0994: + .incbin "baserom.dol", 0x3ED994, 0x3C + .section .text, "ax" .global __GXDefaultTexRegionCallback diff --git a/asm/Dolphin/GX/GXLight.s b/asm/Dolphin/GX/GXLight.s index 22278b85..8c8bd078 100644 --- a/asm/Dolphin/GX/GXLight.s +++ b/asm/Dolphin/GX/GXLight.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .data +.global lbl_803F09D0 +lbl_803F09D0: + .incbin "baserom.dol", 0x3ED9D0, 0x20 + .section .text, "ax" .global GXInitLightAttn diff --git a/asm/Dolphin/GX/GXPerf.s b/asm/Dolphin/GX/GXPerf.s index 067c9cf3..7dca0692 100644 --- a/asm/Dolphin/GX/GXPerf.s +++ b/asm/Dolphin/GX/GXPerf.s @@ -1,5 +1,11 @@ .include "macros.inc" +.section .data +lbl_803F0CB0: + .incbin "baserom.dol", 0x3EDCB0, 0x5C +lbl_803F0D0C: + .incbin "baserom.dol", 0x3EDD0C, 0x94 + .section .text, "ax" .global GXSetGPMetric diff --git a/asm/Dolphin/GX/GXPixel.s b/asm/Dolphin/GX/GXPixel.s index c67d1cc5..dc1ff7d1 100644 --- a/asm/Dolphin/GX/GXPixel.s +++ b/asm/Dolphin/GX/GXPixel.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .data +.global lbl_803F0C90 +lbl_803F0C90: + .incbin "baserom.dol", 0x3EDC90, 0x20 + .section .text, "ax" .global GXSetFog diff --git a/asm/Dolphin/GX/GXTev.s b/asm/Dolphin/GX/GXTev.s index f1eade2e..5f2933ee 100644 --- a/asm/Dolphin/GX/GXTev.s +++ b/asm/Dolphin/GX/GXTev.s @@ -1,5 +1,13 @@ .include "macros.inc" +.section .data +.global lbl_803F0C18 +lbl_803F0C18: + .incbin "baserom.dol", 0x3EDC18, 0x50 +.global lbl_803F0C68 +lbl_803F0C68: + .incbin "baserom.dol", 0x3EDC68, 0x28 + .section .text, "ax" .global GXSetTevOp diff --git a/asm/Dolphin/GX/GXTexture.s b/asm/Dolphin/GX/GXTexture.s index 53200a6b..38262743 100644 --- a/asm/Dolphin/GX/GXTexture.s +++ b/asm/Dolphin/GX/GXTexture.s @@ -1,5 +1,16 @@ .include "macros.inc" +.section .data +.global lbl_803F09F0 +lbl_803F09F0: + .incbin "baserom.dol", 0x3ED9F0, 0xF4 +.global lbl_803F0AE4 +lbl_803F0AE4: + .incbin "baserom.dol", 0x3EDAE4, 0xF4 +.global lbl_803F0BD8 +lbl_803F0BD8: + .incbin "baserom.dol", 0x3EDBD8, 0x40 + .section .text, "ax" .global GXGetTexBufferSize diff --git a/asm/Dolphin/OS/OS.s b/asm/Dolphin/OS/OS.s index 0a8a717e..4b9a87e1 100644 --- a/asm/Dolphin/OS/OS.s +++ b/asm/Dolphin/OS/OS.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .data +.global lbl_803F0DA0 +lbl_803F0DA0: + .incbin "baserom.dol", 0x3EDDA0, 0x208 + .section .text, "ax" .global OSGetConsoleType diff --git a/asm/Dolphin/OS/OSAudioSystem.s b/asm/Dolphin/OS/OSAudioSystem.s index 42e99217..7f4d500c 100644 --- a/asm/Dolphin/OS/OSAudioSystem.s +++ b/asm/Dolphin/OS/OSAudioSystem.s @@ -1,5 +1,40 @@ .include "macros.inc" +.section .data +DSPInitCode: + .4byte 0x029F0010 + .4byte 0x029F0033 + .4byte 0x029F0034 + .4byte 0x029F0035 + .4byte 0x029F0036 + .4byte 0x029F0037 + .4byte 0x029F0038 + .4byte 0x029F0039 + .4byte 0x12061203 + .4byte 0x12041205 + .4byte 0x00808000 + .4byte 0x0088FFFF + .4byte 0x00841000 + .4byte 0x0064001D + .4byte 0x02180000 + .4byte 0x81001C1E + .4byte 0x00441B1E + .4byte 0x00840800 + .4byte 0x00640027 + .4byte 0x191E0000 + .4byte 0x00DEFFFC + .4byte 0x02A08000 + .4byte 0x029C0028 + .4byte 0x16FC0054 + .4byte 0x16FD4348 + .4byte 0x002102FF + .4byte 0x02FF02FF + .4byte 0x02FF02FF + .4byte 0x02FF02FF + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .section .text, "ax" .global __OSInitAudioSystem @@ -13,8 +48,8 @@ __OSInitAudioSystem: /* 8037E7F4 0037B754 38 A0 00 80 */ li r5, 0x80 /* 8037E7F8 0037B758 38 63 FF 80 */ addi r3, r3, -128 /* 8037E7FC 0037B75C 4B C8 4C 95 */ bl memcpy -/* 8037E800 0037B760 3C 60 80 3F */ lis r3, lbl_803F0FA8@ha -/* 8037E804 0037B764 38 83 0F A8 */ addi r4, r3, lbl_803F0FA8@l +/* 8037E800 0037B760 3C 60 80 3F */ lis r3, DSPInitCode@ha +/* 8037E804 0037B764 38 83 0F A8 */ addi r4, r3, DSPInitCode@l /* 8037E808 0037B768 3C 60 81 00 */ lis r3, 0x8100 /* 8037E80C 0037B76C 38 A0 00 80 */ li r5, 0x80 /* 8037E810 0037B770 4B C8 4C 81 */ bl memcpy diff --git a/asm/Dolphin/OS/OSCache.s b/asm/Dolphin/OS/OSCache.s index b87bbb8a..ffa05bf5 100644 --- a/asm/Dolphin/OS/OSCache.s +++ b/asm/Dolphin/OS/OSCache.s @@ -1,5 +1,36 @@ .include "macros.inc" +.section .data +.balign 8 +lbl_803F1028: + .asciz ">>> L2 INVALIDATE : SHOULD NEVER HAPPEN\n" +.balign 4 + .asciz "Machine check received\n" +.balign 4 + .asciz "HID2 = 0x%x SRR1 = 0x%x\n" +.balign 4 + .asciz "Machine check was not DMA/locked cache related\n" +.balign 4 + .asciz "DMAErrorHandler(): An error occurred while processing DMA.\n" +.balign 4 + .asciz "The following errors have been detected and cleared :\n" +.balign 4 + .asciz "\t- Requested a locked cache tag that was already in the cache\n" +.balign 4 + .asciz "\t- DMA attempted to access normal cache\n" +.balign 4 + .asciz "\t- DMA missed in data cache\n" +.balign 4 + .asciz "\t- DMA queue overflowed\n" +.balign 4 + .asciz "L1 i-caches initialized\n" +.balign 4 + .asciz "L1 d-caches initialized\n" +.balign 4 + .asciz "L2 cache initialized\n" +.balign 4 + .asciz "Locked cache machine check handler installed\n" + .section .text, "ax" .global DCEnable diff --git a/asm/Dolphin/OS/OSContext.s b/asm/Dolphin/OS/OSContext.s index 94127705..cba6fe3e 100644 --- a/asm/Dolphin/OS/OSContext.s +++ b/asm/Dolphin/OS/OSContext.s @@ -1,5 +1,37 @@ .include "macros.inc" +.section .data +.balign 8 +lbl_803F1258: + .asciz "------------------------- Context 0x%08x -------------------------\n" +.balign 4 + .asciz "r%-2d = 0x%08x (%14d) r%-2d = 0x%08x (%14d)\n" +.balign 4 + .asciz "LR = 0x%08x CR = 0x%08x\n" +.balign 4 + .asciz "SRR0 = 0x%08x SRR1 = 0x%08x\n" +.balign 4 + .asciz "\nGQRs----------\n" +.balign 4 + .asciz "gqr%d = 0x%08x \t gqr%d = 0x%08x\n" +.balign 4 + .asciz "\n\nFPRs----------\n" +.balign 4 + .asciz "fr%d \t= %d \t fr%d \t= %d\n" +.balign 4 + .asciz "\n\nPSFs----------\n" +.balign 4 + .asciz "ps%d \t= 0x%x \t ps%d \t= 0x%x\n" +.balign 4 + .asciz "\nAddress: Back Chain LR Save\n" +.balign 4 + .asciz "0x%08x: 0x%08x 0x%08x\n" +.balign 4 + +lbl_803F140C: + .asciz "FPU-unavailable handler installed\n" + .balign 4 + .section .text, "ax" .global __OSLoadFPUContext diff --git a/asm/Dolphin/OS/OSError.s b/asm/Dolphin/OS/OSError.s index 2bb75523..3726cd51 100644 --- a/asm/Dolphin/OS/OSError.s +++ b/asm/Dolphin/OS/OSError.s @@ -1,5 +1,59 @@ .include "macros.inc" +.section .data +.balign 8 + +.global lbl_803F1430 +lbl_803F1430: + .asciz " in \"%s\" on line %d.\n" +.balign 4 + .asciz "\nAddress: Back Chain LR Save\n" +.balign 4 + .asciz "0x%08x: 0x%08x 0x%08x\n" +.balign 4 + .asciz "Non-recoverable Exception %d" +.balign 4 + .asciz "Unhandled Exception %d" +.balign 4 + .asciz "\nDSISR = 0x%08x DAR = 0x%08x\n" +.balign 4 + .asciz "TB = 0x%016llx\n" +.balign 4 + .asciz "\nInstruction at 0x%x (read from SRR0) attempted to access invalid address 0x%x (read from DAR)\n" +.balign 4 + .asciz "\nAttempted to fetch instruction from invalid address 0x%x (read from SRR0)\n" +.balign 4 + .asciz "\nInstruction at 0x%x (read from SRR0) attempted to access unaligned address 0x%x (read from DAR)\n" +.balign 4 + .asciz "\nProgram exception : Possible illegal instruction/operation at or around 0x%x (read from SRR0)\n" +.balign 4 + .asciz "AI DMA Address = 0x%04x%04x\n" +.balign 4 + .asciz "ARAM DMA Address = 0x%04x%04x\n" +.balign 4 + .asciz "DI DMA Address = 0x%08x\n" +.balign 4 + .asciz "\nLast interrupt (%d): SRR0 = 0x%08x TB = 0x%016llx\n" +.balign 4 +.global lbl_803F170C +lbl_803F170C: + .4byte lbl_80380024 + .4byte lbl_80380024 + .4byte lbl_8037FF7C + .4byte lbl_8037FF94 + .4byte lbl_80380024 + .4byte lbl_8037FFA8 + .4byte lbl_8037FFC0 + .4byte lbl_80380024 + .4byte lbl_80380024 + .4byte lbl_80380024 + .4byte lbl_80380024 + .4byte lbl_80380024 + .4byte lbl_80380024 + .4byte lbl_80380024 + .4byte lbl_80380024 + .4byte lbl_8037FFD8 + .section .text, "ax" .global OSReport @@ -406,30 +460,35 @@ lbl_8037FF1C: /* 8037FF6C 0037CECC 54 00 10 3A */ slwi r0, r0, 2 /* 8037FF70 0037CED0 7C 03 00 2E */ lwzx r0, r3, r0 /* 8037FF74 0037CED4 7C 09 03 A6 */ mtctr r0 -/* 8037FF78 0037CED8 4E 80 04 20 */ bctr +/* 8037FF78 0037CED8 4E 80 04 20 */ bctr +lbl_8037FF7C: /* 8037FF7C 0037CEDC 80 99 01 98 */ lwz r4, 0x198(r25) /* 8037FF80 0037CEE0 38 BB 00 00 */ addi r5, r27, 0 /* 8037FF84 0037CEE4 38 7F 00 D8 */ addi r3, r31, 0xd8 /* 8037FF88 0037CEE8 4C C6 31 82 */ crclr 6 /* 8037FF8C 0037CEEC 4B FF FA 21 */ bl OSReport /* 8037FF90 0037CEF0 48 00 00 94 */ b lbl_80380024 +lbl_8037FF94: /* 8037FF94 0037CEF4 80 99 01 98 */ lwz r4, 0x198(r25) /* 8037FF98 0037CEF8 38 7F 01 38 */ addi r3, r31, 0x138 /* 8037FF9C 0037CEFC 4C C6 31 82 */ crclr 6 /* 8037FFA0 0037CF00 4B FF FA 0D */ bl OSReport /* 8037FFA4 0037CF04 48 00 00 80 */ b lbl_80380024 +lbl_8037FFA8: /* 8037FFA8 0037CF08 80 99 01 98 */ lwz r4, 0x198(r25) /* 8037FFAC 0037CF0C 38 BB 00 00 */ addi r5, r27, 0 /* 8037FFB0 0037CF10 38 7F 01 84 */ addi r3, r31, 0x184 /* 8037FFB4 0037CF14 4C C6 31 82 */ crclr 6 /* 8037FFB8 0037CF18 4B FF F9 F5 */ bl OSReport /* 8037FFBC 0037CF1C 48 00 00 68 */ b lbl_80380024 +lbl_8037FFC0: /* 8037FFC0 0037CF20 80 99 01 98 */ lwz r4, 0x198(r25) /* 8037FFC4 0037CF24 38 BB 00 00 */ addi r5, r27, 0 /* 8037FFC8 0037CF28 38 7F 01 E8 */ addi r3, r31, 0x1e8 /* 8037FFCC 0037CF2C 4C C6 31 82 */ crclr 6 /* 8037FFD0 0037CF30 4B FF F9 DD */ bl OSReport /* 8037FFD4 0037CF34 48 00 00 50 */ b lbl_80380024 +lbl_8037FFD8: /* 8037FFD8 0037CF38 38 6D 9F 7C */ addi r3, r13, lbl_805A8B3C@sda21 /* 8037FFDC 0037CF3C 4C C6 31 82 */ crclr 6 /* 8037FFE0 0037CF40 4B FF F9 CD */ bl OSReport diff --git a/asm/Dolphin/OS/OSFont.s b/asm/Dolphin/OS/OSFont.s index 1baffa51..905ac548 100644 --- a/asm/Dolphin/OS/OSFont.s +++ b/asm/Dolphin/OS/OSFont.s @@ -1,5 +1,722 @@ .include "macros.inc" +.section .data +.balign 8 +.global lbl_803F1750 +lbl_803F1750: + .4byte 0x020C020D + .4byte 0x020E020F + .4byte 0x02100211 + .4byte 0x02120213 + .4byte 0x02140215 + .4byte 0x02160217 + .4byte 0x02180219 + .4byte 0x021A021B + .4byte 0x021C021D + .4byte 0x021E021F + .4byte 0x02200221 + .4byte 0x02220223 + .4byte 0x02240225 + .4byte 0x02260227 + .4byte 0x02280229 + .4byte 0x022A022B + .4byte 0x022C022D + .4byte 0x022E022F + .4byte 0x02300231 + .4byte 0x02320233 + .4byte 0x02340235 + .4byte 0x02360237 + .4byte 0x02380239 + .4byte 0x023A023B + .4byte 0x023C023D + .4byte 0x023E023F + .4byte 0x02400241 + .4byte 0x02420243 + .4byte 0x02440245 + .4byte 0x02460247 + .4byte 0x02480249 + .4byte 0x024A024B + .4byte 0x024C024D + .4byte 0x024E024F + .4byte 0x02500251 + .4byte 0x02520253 + .4byte 0x02540255 + .4byte 0x02560257 + .4byte 0x02580259 + .4byte 0x025A025B + .4byte 0x025C025D + .4byte 0x025E025F + .4byte 0x02600261 + .4byte 0x02620263 + .4byte 0x02640265 + .4byte 0x02660267 + .4byte 0x02680269 + .4byte 0x026A020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C020C + .4byte 0x020C026B + .4byte 0x026C026D + .4byte 0x026E026F + .4byte 0x02700271 + .4byte 0x02720273 + .4byte 0x02740275 + .4byte 0x02760277 + .4byte 0x02780279 + .4byte 0x027A027B + .4byte 0x027C027D + .4byte 0x027E027F + .4byte 0x02800281 + .4byte 0x02820283 + .4byte 0x02840285 + .4byte 0x02860287 + .4byte 0x02880289 + .4byte 0x028A028B + .4byte 0x028C028D + .4byte 0x028E028F + .4byte 0x02900291 + .4byte 0x02920293 + .4byte 0x02940295 + .4byte 0x02960297 + .4byte 0x02980299 + .4byte 0x029A029B + .4byte 0x029C029D + .4byte 0x029E029F + .4byte 0x02A002A1 + .4byte 0x02A202A3 + .4byte 0x02A402A5 + .4byte 0x02A602A7 + .4byte 0x02A802A9 + +.global lbl_803F18D0 +lbl_803F18D0: + + .4byte 0x00000001 + .4byte 0x00020003 + .4byte 0x00040005 + .4byte 0x00060007 + .4byte 0x00080009 + .4byte 0x000A000B + .4byte 0x000C000D + .4byte 0x000E000F + .4byte 0x00100011 + .4byte 0x00120013 + .4byte 0x00140015 + .4byte 0x00160017 + .4byte 0x00180019 + .4byte 0x001A001B + .4byte 0x001C001D + .4byte 0x001E001F + .4byte 0x00200021 + .4byte 0x00220023 + .4byte 0x00240025 + .4byte 0x00260027 + .4byte 0x00280029 + .4byte 0x002A002B + .4byte 0x002C002D + .4byte 0x002E002F + .4byte 0x00300031 + .4byte 0x00320033 + .4byte 0x00340035 + .4byte 0x00360037 + .4byte 0x00380039 + .4byte 0x003A003B + .4byte 0x003C003D + .4byte 0x003E003F + .4byte 0x00400041 + .4byte 0x00420043 + .4byte 0x00440045 + .4byte 0x00460047 + .4byte 0x00480049 + .4byte 0x004A004B + .4byte 0x004C004D + .4byte 0x004E004F + .4byte 0x00500051 + .4byte 0x00520053 + .4byte 0x00540055 + .4byte 0x00560057 + .4byte 0x00580059 + .4byte 0x005A005B + .4byte 0x005C005D + .4byte 0x005E005F + .4byte 0x00600061 + .4byte 0x00620063 + .4byte 0x00640065 + .4byte 0x00660067 + .4byte 0x00680069 + .4byte 0x006A006B + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x0000006C + .4byte 0x006D006E + .4byte 0x006F0070 + .4byte 0x00710072 + .4byte 0x00730000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000074 + .4byte 0x00750076 + .4byte 0x00770078 + .4byte 0x0079007A + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x0000007B + .4byte 0x007C007D + .4byte 0x007E007F + .4byte 0x00800081 + .4byte 0x00820083 + .4byte 0x00840085 + .4byte 0x00860087 + .4byte 0x00880089 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x0000008A + .4byte 0x008B008C + .4byte 0x008D008E + .4byte 0x008F0090 + .4byte 0x00910000 + .4byte 0x00000000 + .4byte 0x00000092 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000093 + .4byte 0x00940095 + .4byte 0x00960097 + .4byte 0x00980099 + .4byte 0x009A009B + .4byte 0x009C0000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x009D009E + .4byte 0x009F00A0 + .4byte 0x00A100A2 + .4byte 0x00A300A4 + .4byte 0x00A500A6 + .4byte 0x00A700A8 + .4byte 0x00A900AA + .4byte 0x00AB00AC + .4byte 0x00AD00AE + .4byte 0x00AF00B0 + .4byte 0x00B100B2 + .4byte 0x00B300B4 + .4byte 0x00B500B6 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00B700B8 + .4byte 0x00B900BA + .4byte 0x00BB00BC + .4byte 0x00BD00BE + .4byte 0x00BF00C0 + .4byte 0x00C100C2 + .4byte 0x00C300C4 + .4byte 0x00C500C6 + .4byte 0x00C700C8 + .4byte 0x00C900CA + .4byte 0x00CB00CC + .4byte 0x00CD00CE + .4byte 0x00CF00D0 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00D100D2 + .4byte 0x00D300D4 + .4byte 0x00D500D6 + .4byte 0x00D700D8 + .4byte 0x00D900DA + .4byte 0x00DB00DC + .4byte 0x00DD00DE + .4byte 0x00DF00E0 + .4byte 0x00E100E2 + .4byte 0x00E300E4 + .4byte 0x00E500E6 + .4byte 0x00E700E8 + .4byte 0x00E900EA + .4byte 0x00EB00EC + .4byte 0x00ED00EE + .4byte 0x00EF00F0 + .4byte 0x00F100F2 + .4byte 0x00F300F4 + .4byte 0x00F500F6 + .4byte 0x00F700F8 + .4byte 0x00F900FA + .4byte 0x00FB00FC + .4byte 0x00FD00FE + .4byte 0x00FF0100 + .4byte 0x01010102 + .4byte 0x01030104 + .4byte 0x01050106 + .4byte 0x01070108 + .4byte 0x0109010A + .4byte 0x010B010C + .4byte 0x010D010E + .4byte 0x010F0110 + .4byte 0x01110112 + .4byte 0x01130114 + .4byte 0x01150116 + .4byte 0x01170118 + .4byte 0x0119011A + .4byte 0x011B011C + .4byte 0x011D011E + .4byte 0x011F0120 + .4byte 0x01210122 + .4byte 0x01230000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x01240125 + .4byte 0x01260127 + .4byte 0x01280129 + .4byte 0x012A012B + .4byte 0x012C012D + .4byte 0x012E012F + .4byte 0x01300131 + .4byte 0x01320133 + .4byte 0x01340135 + .4byte 0x01360137 + .4byte 0x01380139 + .4byte 0x013A013B + .4byte 0x013C013D + .4byte 0x013E013F + .4byte 0x01400141 + .4byte 0x01420143 + .4byte 0x01440145 + .4byte 0x01460147 + .4byte 0x01480149 + .4byte 0x014A014B + .4byte 0x014C014D + .4byte 0x014E014F + .4byte 0x01500151 + .4byte 0x01520153 + .4byte 0x01540155 + .4byte 0x01560157 + .4byte 0x01580159 + .4byte 0x015A015B + .4byte 0x015C015D + .4byte 0x015E015F + .4byte 0x01600161 + .4byte 0x01620163 + .4byte 0x01640165 + .4byte 0x01660167 + .4byte 0x01680169 + .4byte 0x016A016B + .4byte 0x016C016D + .4byte 0x016E016F + .4byte 0x01700171 + .4byte 0x01720173 + .4byte 0x01740175 + .4byte 0x01760177 + .4byte 0x01780179 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x017A017B + .4byte 0x017C017D + .4byte 0x017E017F + .4byte 0x01800181 + .4byte 0x01820183 + .4byte 0x01840185 + .4byte 0x01860187 + .4byte 0x01880189 + .4byte 0x018A018B + .4byte 0x018C018D + .4byte 0x018E018F + .4byte 0x01900191 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x01920193 + .4byte 0x01940195 + .4byte 0x01960197 + .4byte 0x01980199 + .4byte 0x019A019B + .4byte 0x019C019D + .4byte 0x019E019F + .4byte 0x01A001A1 + .4byte 0x01A201A3 + .4byte 0x01A401A5 + .4byte 0x01A601A7 + .4byte 0x01A801A9 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x01AA01AB + .4byte 0x01AC01AD + .4byte 0x01AE01AF + .4byte 0x01B001B1 + .4byte 0x01B201B3 + .4byte 0x01B401B5 + .4byte 0x01B601B7 + .4byte 0x01B801B9 + .4byte 0x01BA01BB + .4byte 0x01BC01BD + .4byte 0x01BE01BF + .4byte 0x01C001C1 + .4byte 0x01C201C3 + .4byte 0x01C401C5 + .4byte 0x01C601C7 + .4byte 0x01C801C9 + .4byte 0x01CA0000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x01CB01CC + .4byte 0x01CD01CE + .4byte 0x01CF01D0 + .4byte 0x01D101D2 + .4byte 0x01D301D4 + .4byte 0x01D501D6 + .4byte 0x01D701D8 + .4byte 0x01D901DA + .4byte 0x01DB01DC + .4byte 0x01DD01DE + .4byte 0x01DF01E0 + .4byte 0x01E101E2 + .4byte 0x01E301E4 + .4byte 0x01E501E6 + .4byte 0x01E701E8 + .4byte 0x01E901EA + .4byte 0x01EB0000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x01EC01ED + .4byte 0x01EE01EF + .4byte 0x01F001F1 + .4byte 0x01F201F3 + .4byte 0x01F401F5 + .4byte 0x01F601F7 + .4byte 0x01F801F9 + .4byte 0x01FA01FB + .4byte 0x01FC01FD + .4byte 0x01FE01FF + .4byte 0x02000201 + .4byte 0x02020203 + .4byte 0x02040205 + .4byte 0x02060207 + .4byte 0x02080209 + .4byte 0x020A020B + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x0000020C + .4byte 0x020D020E + .4byte 0x020F0210 + .4byte 0x02110212 + .4byte 0x02130214 + .4byte 0x02150216 + .4byte 0x02170218 + .4byte 0x0219021A + .4byte 0x021B021C + .4byte 0x021D021E + .4byte 0x021F0220 + .4byte 0x02210222 + .4byte 0x02230224 + .4byte 0x02250226 + .4byte 0x02270228 + .4byte 0x0229022A + .4byte 0x022B022C + .4byte 0x022D022E + .4byte 0x022F0230 + .4byte 0x02310232 + .4byte 0x02330234 + .4byte 0x02350236 + .4byte 0x02370238 + .4byte 0x0239023A + .4byte 0x023B023C + .4byte 0x023D023E + .4byte 0x023F0240 + .4byte 0x02410242 + .4byte 0x02430244 + .4byte 0x02450246 + .4byte 0x02470248 + .4byte 0x0249024A + .4byte 0x024B024C + .4byte 0x024D024E + .4byte 0x024F0250 + .4byte 0x02510252 + .4byte 0x02530254 + .4byte 0x02550256 + .4byte 0x02570258 + .4byte 0x0259025A + .4byte 0x025B025C + .4byte 0x025D025E + .4byte 0x025F0260 + .4byte 0x02610262 + .4byte 0x02630264 + .4byte 0x02650266 + .4byte 0x02670268 + .4byte 0x0269026A + .4byte 0x026B026C + .4byte 0x026D026E + .4byte 0x026F0270 + .4byte 0x02710272 + .4byte 0x02730274 + .4byte 0x02750276 + .4byte 0x02770278 + .4byte 0x0279027A + .4byte 0x027B027C + .4byte 0x027D027E + .4byte 0x027F0280 + .4byte 0x02810282 + .4byte 0x02830284 + .4byte 0x02850286 + .4byte 0x02870288 + .4byte 0x0289028A + .4byte 0x028B028C + .4byte 0x028D028E + .4byte 0x028F0290 + .4byte 0x02910292 + .4byte 0x02930294 + .4byte 0x02950296 + .4byte 0x02970298 + .4byte 0x0299029A + .4byte 0x029B029C + .4byte 0x029D029E + .4byte 0x029F02A0 + .4byte 0x02A102A2 + .4byte 0x02A302A4 + .4byte 0x02A502A6 + .4byte 0x02A702A8 + .4byte 0x02A902AA + .4byte 0x02AB02AC + .4byte 0x02AD02AE + .4byte 0x02AF02B0 + .4byte 0x02B102B2 + .4byte 0x02B302B4 + .4byte 0x02B502B6 + .4byte 0x02B702B8 + .4byte 0x02B902BA + .4byte 0x02BB02BC + .4byte 0x02BD02BE + .4byte 0x02BF02C0 + .4byte 0x02C102C2 + .4byte 0x02C302C4 + .4byte 0x02C502C6 + .4byte 0x02C702C8 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x02C902CA + .4byte 0x02CB02CC + .4byte 0x02CD02CE + .4byte 0x02CF02D0 + .4byte 0x02D102D2 + .4byte 0x02D302D4 + .4byte 0x02D502D6 + .4byte 0x02D702D8 + .4byte 0x02D902DA + .4byte 0x02DB02DC + .4byte 0x02DD02DE + .4byte 0x02DF02E0 + .4byte 0x02E102E2 + .4byte 0x02E302E4 + .4byte 0x02E502E6 + .4byte 0x000002E7 + .4byte 0x02E802E9 + .4byte 0x02EA02EB + .4byte 0x02EC02ED + .4byte 0x02EE02EF + .4byte 0x02F002F1 + .4byte 0x02F202F3 + .4byte 0x02F402F5 + .4byte 0x02F602F7 + .4byte 0x02F802F9 + .4byte 0x02FA02FB + .4byte 0x02FC02FD + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x00000000 + .4byte 0x02FE02FF + .4byte 0x03000301 + .4byte 0x03020303 + .4byte 0x03040305 + .4byte 0x03060307 + .4byte 0x03080309 + .4byte 0x030A030B + .4byte 0x030C030D + .4byte 0x030E030F + .4byte 0x03100311 + .4byte 0x03120313 + .4byte 0x03140315 + .4byte 0x03160317 + .4byte 0x03180319 + .4byte 0x031A031B + .4byte 0x00000000 + .4byte 0x00000000 + .section .text, "ax" .global sub_80380c34 diff --git a/asm/Dolphin/OS/OSInterrupt.s b/asm/Dolphin/OS/OSInterrupt.s index bb2e6466..62e0ff2d 100644 --- a/asm/Dolphin/OS/OSInterrupt.s +++ b/asm/Dolphin/OS/OSInterrupt.s @@ -1,5 +1,22 @@ .include "macros.inc" +.section .data +.balign 8 +.global lbl_803F2260 +lbl_803F2260: + .4byte 0x00000100 + .4byte 0x00000040 + .4byte 0xF8000000 + .4byte 0x00000200 + .4byte 0x00000080 + .4byte 0x00003000 + .4byte 0x00000020 + .4byte 0x03FF8C00 + .4byte 0x04000000 + .4byte 0x00004000 + .4byte 0xFFFFFFFF + .4byte 0x00000000 + .section .text, "ax" .global OSDisableInterrupts diff --git a/asm/Dolphin/OS/OSLink.s b/asm/Dolphin/OS/OSLink.s index d923b86f..d3d355dd 100644 --- a/asm/Dolphin/OS/OSLink.s +++ b/asm/Dolphin/OS/OSLink.s @@ -1,5 +1,16 @@ .include "macros.inc" +.section .data +.global lbl_803F2290 +lbl_803F2290: + .asciz "OSLink: unknown relocation type %3d\n" + .balign 4 + +.global lbl_803F22B8 +lbl_803F22B8: + .asciz "OSUnlink: unknown relocation type %3d\n" + .balign 4 + .section .text, "ax" .global OSNotifyLink diff --git a/asm/Dolphin/OS/OSMemory.s b/asm/Dolphin/OS/OSMemory.s index a9b76fa4..024c3bdf 100644 --- a/asm/Dolphin/OS/OSMemory.s +++ b/asm/Dolphin/OS/OSMemory.s @@ -1,5 +1,12 @@ .include "macros.inc" +.section .data +lbl_803F22E0: + .4byte OnReset + .4byte 0x7f + .4byte 0 + .4byte 0 + .section .text, "ax" .global sub_80382810 diff --git a/asm/Dolphin/OS/OSTime.s b/asm/Dolphin/OS/OSTime.s index 68cf42f8..be580a68 100644 --- a/asm/Dolphin/OS/OSTime.s +++ b/asm/Dolphin/OS/OSTime.s @@ -1,5 +1,37 @@ .include "macros.inc" +.section .data +.balign 8 +.global YearDays +YearDays: + .4byte 0x00000000 + .4byte 0x0000001F + .4byte 0x0000003B + .4byte 0x0000005A + .4byte 0x00000078 + .4byte 0x00000097 + .4byte 0x000000B5 + .4byte 0x000000D4 + .4byte 0x000000F3 + .4byte 0x00000111 + .4byte 0x00000130 + .4byte 0x0000014E + +.global lbl_803F2320 +lbl_803F2320: + .4byte 0x00000000 + .4byte 0x0000001F + .4byte 0x0000003C + .4byte 0x0000005B + .4byte 0x00000079 + .4byte 0x00000098 + .4byte 0x000000B6 + .4byte 0x000000D5 + .4byte 0x000000F4 + .4byte 0x00000112 + .4byte 0x00000131 + .4byte 0x0000014F + .section .text, "ax" .global OSGetTime @@ -166,8 +198,8 @@ lbl_803855C8: /* 803855D4 00382534 38 C3 23 20 */ addi r6, r3, lbl_803F2320@l /* 803855D8 00382538 48 00 00 0C */ b lbl_803855E4 lbl_803855DC: -/* 803855DC 0038253C 3C 60 80 3F */ lis r3, lbl_803F22F0@ha -/* 803855E0 00382540 38 C3 22 F0 */ addi r6, r3, lbl_803F22F0@l +/* 803855DC 0038253C 3C 60 80 3F */ lis r3, YearDays@ha +/* 803855E0 00382540 38 C3 22 F0 */ addi r6, r3, YearDays@l lbl_803855E4: /* 803855E4 00382544 38 E0 00 0C */ li r7, 0xc /* 803855E8 00382548 38 60 00 30 */ li r3, 0x30 diff --git a/asm/Dolphin/PAD/PadClamp.s b/asm/Dolphin/PAD/PadClamp.s index 423189cb..899a26ed 100644 --- a/asm/Dolphin/PAD/PadClamp.s +++ b/asm/Dolphin/PAD/PadClamp.s @@ -1,5 +1,14 @@ .include "macros.inc" +.section .rodata + +lbl_803D8588: + .incbin "baserom.dol", 0x3D5588, 0x10 +.global lbl_803D8598 +lbl_803D8598: + .incbin "baserom.dol", 0x3D5598, 0x10 + + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global ClampStick diff --git a/asm/Dolphin/PAD/pad.s b/asm/Dolphin/PAD/pad.s index 0cd58b9f..0ff04efe 100644 --- a/asm/Dolphin/PAD/pad.s +++ b/asm/Dolphin/PAD/pad.s @@ -1,9 +1,16 @@ .include "macros.inc" .section .data, "wa" +PAD_VERSION_STR: + .asciz "<< Dolphin SDK - PAD\trelease build: Sep 5 2002 05:34:02 (0x2301) >>" + +.balign 4 .global lbl_803F2398 lbl_803F2398: - .incbin "baserom.dol", 0x3EF398, 0x10 + .4byte OnReset + .4byte 0x7f + .4byte 0 + .4byte 0 .section .text, "ax" # 0x80003640 - 0x803CB1C0 diff --git a/asm/Dolphin/SI/SIBios.s b/asm/Dolphin/SI/SIBios.s index aac8b496..e7610f45 100644 --- a/asm/Dolphin/SI/SIBios.s +++ b/asm/Dolphin/SI/SIBios.s @@ -4,7 +4,7 @@ .global lbl_803F6EA0 lbl_803F6EA0: - .asciz "<< Dolphin SDK - SI release build: Sep 5 2002 05:33:08 (0x2301) >>" + .asciz "<< Dolphin SDK - SI\trelease build: Sep 5 2002 05:33:08 (0x2301) >>" .balign 4 diff --git a/asm/Dolphin/THP/THPDec.s b/asm/Dolphin/THP/THPDec.s index caf2d3cd..5507f0e3 100644 --- a/asm/Dolphin/THP/THPDec.s +++ b/asm/Dolphin/THP/THPDec.s @@ -101,8 +101,8 @@ __THPInitFlag: .section .data, "wa" THPVersionStr: - .ascii "<< Dolphin SDK - THP release build: Aug 27 2002 20:42:01 >>" - .skip 5 + .asciz "<< Dolphin SDK - THP\trelease build: Aug 27 2002 20:42:01 >>" + .skip 4 .section .sdata, "wa" THPVersion: diff --git a/asm/Dolphin/db.s b/asm/Dolphin/db.s index 57e5a377..a7599c15 100644 --- a/asm/Dolphin/db.s +++ b/asm/Dolphin/db.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .data +.global lbl_803EF9B8 +lbl_803EF9B8: + .asciz "DBExceptionDestination\n" + .section .text, "ax" .global DBInit diff --git a/asm/Runtime/NMWException.s b/asm/Runtime/NMWException.s index 9e10555e..dab5ee0e 100644 --- a/asm/Runtime/NMWException.s +++ b/asm/Runtime/NMWException.s @@ -108,8 +108,8 @@ lbl_80389824: /* 8038983C 0038679C 38 21 00 30 */ addi r1, r1, 0x30 /* 80389840 003867A0 4E 80 00 20 */ blr -.global __partial_array_destructor -__partial_array_destructor: +.global __dt__26__partial_array_destructorFv +__dt__26__partial_array_destructorFv: /* 80389844 003867A4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80389848 003867A8 7C 08 02 A6 */ mflr r0 /* 8038984C 003867AC 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/Runtime/alloc.s b/asm/Runtime/alloc.s index 11496bd2..8889215f 100644 --- a/asm/Runtime/alloc.s +++ b/asm/Runtime/alloc.s @@ -1,5 +1,11 @@ .include "macros.inc" +.section .rodata +.global lbl_803D85C0 +lbl_803D85C0: + .incbin "baserom.dol", 0x3D55C0, 0x18 + + .section .text, "ax" .global calloc diff --git a/asm/Runtime/ansi_fp.s b/asm/Runtime/ansi_fp.s index ede7f691..02944270 100644 --- a/asm/Runtime/ansi_fp.s +++ b/asm/Runtime/ansi_fp.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .rodata +.global lbl_803D85D8 +lbl_803D85D8: + .incbin "baserom.dol", 0x3D55D8, 0xE8 + .section .text, "ax" .global __dec2num __dec2num: diff --git a/asm/Runtime/e_exp.s b/asm/Runtime/e_exp.s index 4808f6dc..1165c474 100644 --- a/asm/Runtime/e_exp.s +++ b/asm/Runtime/e_exp.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .rodata +.global lbl_803D8720 +lbl_803D8720: + .incbin "baserom.dol", 0x3D5720, 0x30 + .section .text, "ax" .global __ieee754_exp diff --git a/asm/Runtime/e_fmod.s b/asm/Runtime/e_fmod.s index 94416b44..3b658d3d 100644 --- a/asm/Runtime/e_fmod.s +++ b/asm/Runtime/e_fmod.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .rodata +.global lbl_803D8750 +lbl_803D8750: + .incbin "baserom.dol", 0x3D5750, 0x10 + .section .text, "ax" .global __ieee754_fmod diff --git a/asm/Runtime/e_pow.s b/asm/Runtime/e_pow.s index 557e68a0..7c1bc5c8 100644 --- a/asm/Runtime/e_pow.s +++ b/asm/Runtime/e_pow.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .rodata +.global lbl_803D8760 +lbl_803D8760: + .incbin "baserom.dol", 0x3D5760, 0x30 + .section .text, "ax" .global __ieee754_pow diff --git a/asm/Runtime/e_rem_pio2.s b/asm/Runtime/e_rem_pio2.s index 136e76ba..8f33461f 100644 --- a/asm/Runtime/e_rem_pio2.s +++ b/asm/Runtime/e_rem_pio2.s @@ -1,5 +1,14 @@ .include "macros.inc" +.section .rodata +.global lbl_803D8790 +lbl_803D8790: + .incbin "baserom.dol", 0x3D5790, 0x108 +.global lbl_803D8898 +lbl_803D8898: + .incbin "baserom.dol", 0x3D5898, 0x80 + + .section .text, "ax" .global __ieee754_rem_pio2 diff --git a/asm/Runtime/k_rem_pio2.s b/asm/Runtime/k_rem_pio2.s index 71deaca4..3fed621d 100644 --- a/asm/Runtime/k_rem_pio2.s +++ b/asm/Runtime/k_rem_pio2.s @@ -1,5 +1,13 @@ .include "macros.inc" +.section .rodata +.global lbl_803D8918 +lbl_803D8918: + .incbin "baserom.dol", 0x3D5918, 0x10 +.global lbl_803D8928 +lbl_803D8928: + .incbin "baserom.dol", 0x3D5928, 0x40 + .section .text, "ax" .global __kernel_rem_pio2 diff --git a/asm/Runtime/k_tan.s b/asm/Runtime/k_tan.s index 918db14c..e49b0269 100644 --- a/asm/Runtime/k_tan.s +++ b/asm/Runtime/k_tan.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .rodata +.global lbl_803D8968 +lbl_803D8968: + .incbin "baserom.dol", 0x3D5968, 0x68 + .section .text, "ax" .global __kernel_tan diff --git a/asm/Runtime/printf.s b/asm/Runtime/printf.s index db486dc2..4a340f9c 100644 --- a/asm/Runtime/printf.s +++ b/asm/Runtime/printf.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .rodata +.global lbl_803D86C0 +lbl_803D86C0: + .incbin "baserom.dol", 0x3D56C0, 0x28 + .section .data, "wa" # TODO: Move these where they actually belong .global lbl_803F2778 diff --git a/asm/Runtime/runtime.s b/asm/Runtime/runtime.s index 37377b38..5293833f 100644 --- a/asm/Runtime/runtime.s +++ b/asm/Runtime/runtime.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .rodata +.global lbl_803D85A8 +lbl_803D85A8: + .incbin "baserom.dol", 0x3D55A8, 0x18 + .section .text, "ax" .global __cvt_fp2unsigned diff --git a/asm/Runtime/s_atan.s b/asm/Runtime/s_atan.s index 59ee4aa3..24409b37 100644 --- a/asm/Runtime/s_atan.s +++ b/asm/Runtime/s_atan.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .rodata +.global lbl_803D89D0 +lbl_803D89D0: + .incbin "baserom.dol", 0x3D59D0, 0x98 + .section .text, "ax" .global atan diff --git a/asm/Runtime/strtold.s b/asm/Runtime/strtold.s index c4efcf3a..67032f50 100644 --- a/asm/Runtime/strtold.s +++ b/asm/Runtime/strtold.s @@ -1,5 +1,14 @@ .include "macros.inc" +.section .rodata +.global lbl_803D86E8 +lbl_803D86E8: + .incbin "baserom.dol", 0x3D56E8, 0x2C + +.global lbl_803D8714 +lbl_803D8714: + .incbin "baserom.dol", 0x3D5714, 0xC + .section .text, "ax" .global atof diff --git a/asm/ctors.s b/asm/ctors.s index da08604b..85473dd2 100644 --- a/asm/ctors.s +++ b/asm/ctors.s @@ -70,7 +70,7 @@ __init_cpp_exceptions_reference: .4byte __sinit_CBurrower_cpp .4byte __sinit_CMetroidPrimeExo_cpp .4byte __sinit_CMetroidPrimeEssence_cpp - .4byte sub_802886f0 + .4byte __sinit_CPlayerDynamics_cpp .4byte __sinit_CSlideShow_cpp .4byte __sinit_CArtifactDoll_cpp .4byte __sinit_CWorldLight_cpp diff --git a/asm/data.s b/asm/data.s index 826fa1e0..9ed8c0c5 100644 --- a/asm/data.s +++ b/asm/data.s @@ -2603,157 +2603,6 @@ lbl_803EF830: .global lbl_803EF840 lbl_803EF840: .incbin "baserom.dol", 0x3EC840, 0x178 -.global lbl_803EF9B8 -lbl_803EF9B8: - .incbin "baserom.dol", 0x3EC9B8, 0x18 -.global lbl_803EF9D0 -lbl_803EF9D0: - .incbin "baserom.dol", 0x3EC9D0, 0x80 -.global lbl_803EFA50 -lbl_803EFA50: - .incbin "baserom.dol", 0x3ECA50, 0x140 -.global lbl_803EFB90 -lbl_803EFB90: - .incbin "baserom.dol", 0x3ECB90, 0xC8 -.global lbl_803EFC58 -lbl_803EFC58: - .incbin "baserom.dol", 0x3ECC58, 0x38 -.global lbl_803EFC90 -lbl_803EFC90: - .incbin "baserom.dol", 0x3ECC90, 0x338 -.global lbl_803EFFC8 -lbl_803EFFC8: - .incbin "baserom.dol", 0x3ECFC8, 0xC -.global lbl_803EFFD4 -lbl_803EFFD4: - .incbin "baserom.dol", 0x3ECFD4, 0x30 -.global lbl_803F0004 -lbl_803F0004: - .incbin "baserom.dol", 0x3ED004, 0x4 -.global lbl_803F0008 -lbl_803F0008: - .incbin "baserom.dol", 0x3ED008, 0x90 -.global lbl_803F0098 -lbl_803F0098: - .incbin "baserom.dol", 0x3ED098, 0x34 -.global lbl_803F00CC -lbl_803F00CC: - .incbin "baserom.dol", 0x3ED0CC, 0x34 -.global lbl_803F0100 -lbl_803F0100: - .incbin "baserom.dol", 0x3ED100, 0x478 -.global lbl_803F0578 -lbl_803F0578: - .incbin "baserom.dol", 0x3ED578, 0xB4 -.global lbl_803F062C -lbl_803F062C: - .incbin "baserom.dol", 0x3ED62C, 0xD0 -.global lbl_803F06FC -lbl_803F06FC: - .incbin "baserom.dol", 0x3ED6FC, 0x1C -.global lbl_803F0718 -lbl_803F0718: - .incbin "baserom.dol", 0x3ED718, 0x68 -.global lbl_803F0780 -lbl_803F0780: - .incbin "baserom.dol", 0x3ED780, 0x68 -.global lbl_803F07E8 -lbl_803F07E8: - .incbin "baserom.dol", 0x3ED7E8, 0x44 -.global lbl_803F082C -lbl_803F082C: - .incbin "baserom.dol", 0x3ED82C, 0x44 -.global lbl_803F0870 -lbl_803F0870: - .incbin "baserom.dol", 0x3ED870, 0x1C -.global lbl_803F088C -lbl_803F088C: - .incbin "baserom.dol", 0x3ED88C, 0x54 -.global lbl_803F08E0 -lbl_803F08E0: - .incbin "baserom.dol", 0x3ED8E0, 0x3C -.global lbl_803F091C -lbl_803F091C: - .incbin "baserom.dol", 0x3ED91C, 0x3C -.global lbl_803F0958 -lbl_803F0958: - .incbin "baserom.dol", 0x3ED958, 0x3C -.global lbl_803F0994 -lbl_803F0994: - .incbin "baserom.dol", 0x3ED994, 0x3C -.global lbl_803F09D0 -lbl_803F09D0: - .incbin "baserom.dol", 0x3ED9D0, 0x20 -.global lbl_803F09F0 -lbl_803F09F0: - .incbin "baserom.dol", 0x3ED9F0, 0xF4 -.global lbl_803F0AE4 -lbl_803F0AE4: - .incbin "baserom.dol", 0x3EDAE4, 0xF4 -.global lbl_803F0BD8 -lbl_803F0BD8: - .incbin "baserom.dol", 0x3EDBD8, 0x40 -.global lbl_803F0C18 -lbl_803F0C18: - .incbin "baserom.dol", 0x3EDC18, 0x50 -.global lbl_803F0C68 -lbl_803F0C68: - .incbin "baserom.dol", 0x3EDC68, 0x28 -.global lbl_803F0C90 -lbl_803F0C90: - .incbin "baserom.dol", 0x3EDC90, 0x20 -.global lbl_803F0CB0 -lbl_803F0CB0: - .incbin "baserom.dol", 0x3EDCB0, 0x5C -.global lbl_803F0D0C -lbl_803F0D0C: - .incbin "baserom.dol", 0x3EDD0C, 0x94 -.global lbl_803F0DA0 -lbl_803F0DA0: - .incbin "baserom.dol", 0x3EDDA0, 0x208 -.global lbl_803F0FA8 -lbl_803F0FA8: - .incbin "baserom.dol", 0x3EDFA8, 0x80 -.global lbl_803F1028 -lbl_803F1028: - .incbin "baserom.dol", 0x3EE028, 0x230 -.global lbl_803F1258 -lbl_803F1258: - .incbin "baserom.dol", 0x3EE258, 0x1B4 -.global lbl_803F140C -lbl_803F140C: - .incbin "baserom.dol", 0x3EE40C, 0x24 -.global lbl_803F1430 -lbl_803F1430: - .incbin "baserom.dol", 0x3EE430, 0x2DC -.global lbl_803F170C -lbl_803F170C: - .incbin "baserom.dol", 0x3EE70C, 0x44 -.global lbl_803F1750 -lbl_803F1750: - .incbin "baserom.dol", 0x3EE750, 0x180 -.global lbl_803F18D0 -lbl_803F18D0: - .incbin "baserom.dol", 0x3EE8D0, 0x990 -.global lbl_803F2260 -lbl_803F2260: - .incbin "baserom.dol", 0x3EF260, 0x30 -.global lbl_803F2290 -lbl_803F2290: - .incbin "baserom.dol", 0x3EF290, 0x28 -.global lbl_803F22B8 -lbl_803F22B8: - .incbin "baserom.dol", 0x3EF2B8, 0x28 -.global lbl_803F22E0 -lbl_803F22E0: - .incbin "baserom.dol", 0x3EF2E0, 0x10 -.global lbl_803F22F0 -lbl_803F22F0: - .incbin "baserom.dol", 0x3EF2F0, 0x30 -.global lbl_803F2320 -lbl_803F2320: - .incbin "baserom.dol", 0x3EF320, 0x78 - diff --git a/asm/extab.s b/asm/extab.s index 4e077a6c..53890eae 100644 --- a/asm/extab.s +++ b/asm/extab.s @@ -13,7 +13,7 @@ __construct_array_extab: .4byte 0x00000010 .4byte 0 .4byte 0x82000008 - .4byte 0x80389844 + .4byte __dt__26__partial_array_destructorFv .global __partial_array_destructor_extab __partial_array_destructor_extab: .4byte 0x18080000 diff --git a/asm/extabindex.s b/asm/extabindex.s index 9ed65857..821c5ce3 100644 --- a/asm/extabindex.s +++ b/asm/extabindex.s @@ -9,7 +9,7 @@ lbl_extabindex: .4byte __construct_array .4byte 0x000000F8 .4byte __construct_array_extab - .4byte __partial_array_destructor + .4byte __dt__26__partial_array_destructorFv .4byte 0x000000B8 .4byte __partial_array_destructor_extab diff --git a/asm/musyx/hardware.s b/asm/musyx/hardware.s index 06dede57..01456f18 100644 --- a/asm/musyx/hardware.s +++ b/asm/musyx/hardware.s @@ -14,6 +14,11 @@ lbl_805A8BE0: .2byte 1 .2byte 2 .balign 4 + +.section .rodata +.global lbl_803D8BD0 +lbl_803D8BD0: + .incbin "baserom.dol", 0x3D5BD0, 0x100 .section .text, "ax" diff --git a/asm/musyx/hw_dspctrl.s b/asm/musyx/hw_dspctrl.s index 53c5d2e6..04de9c4b 100644 --- a/asm/musyx/hw_dspctrl.s +++ b/asm/musyx/hw_dspctrl.s @@ -21,7 +21,14 @@ lbl_805A9B4E: lbl_805A9B4F: .skip 0x1 - +.section .rodata +.global lbl_803D8A68 +lbl_803D8A68: + .incbin "baserom.dol", 0x3D5A68, 0x40 +.global lbl_803D8AA8 +lbl_803D8AA8: + .incbin "baserom.dol", 0x3D5AA8, 0x18 + .section .text, "ax" .global salInitDspCtrl diff --git a/asm/musyx/snd_midictrl.s b/asm/musyx/snd_midictrl.s index 1e7296da..311c597b 100644 --- a/asm/musyx/snd_midictrl.s +++ b/asm/musyx/snd_midictrl.s @@ -26,7 +26,16 @@ lbl_803F4250: .4byte lbl_803B2C64 .4byte lbl_803B2C6C .skip 4 - + +.section .rodata +.global lbl_803D8AC0 +lbl_803D8AC0: + .incbin "baserom.dol", 0x3D5AC0, 0x88 +.global lbl_803D8B48 +lbl_803D8B48: + .incbin "baserom.dol", 0x3D5B48, 0x88 + + .section .text, "ax" .global inpSetGlobalMIDIDirtyFlag diff --git a/asm/rodata.s b/asm/rodata.s index 503cbcf9..2945fd20 100644 --- a/asm/rodata.s +++ b/asm/rodata.s @@ -1697,73 +1697,11 @@ lbl_803D8560: .global lbl_803D8568 lbl_803D8568: .incbin "baserom.dol", 0x3D5568, 0x8 -# -- END TEXT -- -.global lbl_803D8570 -lbl_803D8570: - .incbin "baserom.dol", 0x3D5570, 0x18 -.global lbl_803D8588 -lbl_803D8588: - .incbin "baserom.dol", 0x3D5588, 0x10 -.global lbl_803D8598 -lbl_803D8598: - .incbin "baserom.dol", 0x3D5598, 0x10 -.global lbl_803D85A8 -lbl_803D85A8: - .incbin "baserom.dol", 0x3D55A8, 0x18 -.global lbl_803D85C0 -lbl_803D85C0: - .incbin "baserom.dol", 0x3D55C0, 0x18 -.global lbl_803D85D8 -lbl_803D85D8: - .incbin "baserom.dol", 0x3D55D8, 0xE8 -.global lbl_803D86C0 -lbl_803D86C0: - .incbin "baserom.dol", 0x3D56C0, 0x28 -.global lbl_803D86E8 -lbl_803D86E8: - .incbin "baserom.dol", 0x3D56E8, 0x2C -.global lbl_803D8714 -lbl_803D8714: - .incbin "baserom.dol", 0x3D5714, 0xC -.global lbl_803D8720 -lbl_803D8720: - .incbin "baserom.dol", 0x3D5720, 0x30 -.global lbl_803D8750 -lbl_803D8750: - .incbin "baserom.dol", 0x3D5750, 0x10 -.global lbl_803D8760 -lbl_803D8760: - .incbin "baserom.dol", 0x3D5760, 0x30 -.global lbl_803D8790 -lbl_803D8790: - .incbin "baserom.dol", 0x3D5790, 0x108 -.global lbl_803D8898 -lbl_803D8898: - .incbin "baserom.dol", 0x3D5898, 0x80 -.global lbl_803D8918 -lbl_803D8918: - .incbin "baserom.dol", 0x3D5918, 0x10 -.global lbl_803D8928 -lbl_803D8928: - .incbin "baserom.dol", 0x3D5928, 0x40 -.global lbl_803D8968 -lbl_803D8968: - .incbin "baserom.dol", 0x3D5968, 0x68 -.global lbl_803D89D0 -lbl_803D89D0: - .incbin "baserom.dol", 0x3D59D0, 0x98 -.global lbl_803D8A68 -lbl_803D8A68: - .incbin "baserom.dol", 0x3D5A68, 0x40 -.global lbl_803D8AA8 -lbl_803D8AA8: - .incbin "baserom.dol", 0x3D5AA8, 0x18 -.global lbl_803D8AC0 -lbl_803D8AC0: - .incbin "baserom.dol", 0x3D5AC0, 0x88 -.global lbl_803D8B48 -lbl_803D8B48: - .incbin "baserom.dol", 0x3D5B48, 0x88 -.global lbl_803D8BD0 -lbl_803D8BD0: - .incbin "baserom.dol", 0x3D5BD0, 0x100 + + + + + + + + diff --git a/asm/text.s b/asm/text.s index 351cdc98..ff911f11 100644 --- a/asm/text.s +++ b/asm/text.s @@ -722168,8 +722168,8 @@ lbl_802886C0: /* 802886E8 00285648 38 21 00 50 */ addi r1, r1, 0x50 /* 802886EC 0028564C 4E 80 00 20 */ blr -.global sub_802886f0 -sub_802886f0: +.global __sinit_CPlayerDynamics_cpp +__sinit_CPlayerDynamics_cpp: /* 802886F0 00285650 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802886F4 00285654 7C 08 02 A6 */ mflr r0 /* 802886F8 00285658 38 60 00 00 */ li r3, 0