From e19fd8c70e5009cc1a00393db341ac83226f62e8 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 7 Apr 2022 23:24:37 -0700 Subject: [PATCH] Split sdata and sdata2 (we can now start splitting game code!) Former-commit-id: 44d7e93e642c7952144c04eaa49b17a7b2b801ce --- asm/Dolphin/ai.s | 39 ++ asm/Dolphin/ar/ar.s | 31 + asm/Dolphin/ar/arq.s | 38 ++ asm/Dolphin/db.s | 7 + asm/Dolphin/dsp/dsp.s | 28 + asm/Dolphin/dvd/dvd.s | 59 ++ asm/Dolphin/dvd/dvdfatal.s | 21 + asm/Dolphin/dvd/dvdfs.s | 25 + asm/Dolphin/dvd/dvdlow.s | 61 ++ asm/Dolphin/dvd/fstload.s | 19 + asm/Dolphin/gx/GXAttr.s | 11 + asm/Dolphin/gx/GXBump.s | 5 + asm/Dolphin/gx/GXFifo.s | 18 + asm/Dolphin/gx/GXFrameBuf.s | 5 + asm/Dolphin/gx/GXInit.s | 46 ++ asm/Dolphin/gx/GXLight.s | 35 ++ asm/Dolphin/gx/GXMisc.s | 15 + asm/Dolphin/gx/GXPixel.s | 23 + asm/Dolphin/gx/GXTexture.s | 53 ++ asm/Dolphin/gx/GXTransform.s | 12 + asm/Dolphin/mtx/mtx.s | 14 + asm/Dolphin/mtx/mtx44.s | 14 + asm/Dolphin/mtx/vec.s | 8 + asm/Dolphin/os/OS.s | 46 +- asm/Dolphin/os/OSAlarm.s | 5 + asm/Dolphin/os/OSArena.s | 10 + asm/Dolphin/os/OSError.s | 9 +- asm/Dolphin/os/OSFatal.s | 47 +- asm/Dolphin/os/OSFont.s | 31 +- asm/Dolphin/os/OSInterrupt.s | 17 + asm/Dolphin/os/OSReboot.s | 8 + asm/Dolphin/os/OSReset.s | 4 + asm/Dolphin/os/OSResetSW.s | 24 + asm/Dolphin/os/OSThread.s | 16 +- asm/Dolphin/pad/pad.s | 30 +- asm/Dolphin/vi.s | 11 +- asm/Runtime/s_tan.s | 7 +- asm/Runtime/sdata.s | 34 ++ asm/Runtime/sdata2.s | 549 ++++++++++++++++++ asm/musyx/chorus_fx.s | 5 + asm/musyx/creverb.s | 43 ++ asm/musyx/hardware.s | 14 + asm/musyx/hw_volconv.s | 29 + asm/musyx/reverb.s | 44 ++ asm/musyx/seq.s | 17 + asm/musyx/snd3d.s | 49 +- asm/musyx/snd_math.s | 14 + asm/musyx/stream.s | 13 +- asm/musyx/synth.s | 41 ++ asm/musyx/synth_ac.s | 11 + asm/musyx/synth_adsr.s | 21 + asm/musyx/synthmacros.s | 22 + asm/sbss.s | 427 -------------- asm/sdata.s | 174 ------ asm/sdata2.s | 1037 ---------------------------------- obj_files.mk | 2 + 56 files changed, 1750 insertions(+), 1648 deletions(-) create mode 100644 asm/Runtime/sdata.s create mode 100644 asm/Runtime/sdata2.s diff --git a/asm/Dolphin/ai.s b/asm/Dolphin/ai.s index 13602149..3e34f5f7 100644 --- a/asm/Dolphin/ai.s +++ b/asm/Dolphin/ai.s @@ -1,5 +1,44 @@ .include "macros.inc" +.section .sdata +.global lbl_805A8A68 +lbl_805A8A68: + .incbin "baserom.dol", 0x3F6408, 0x8 + +.section .sbss +lbl_805A96B8: + .skip 0x4 +lbl_805A96BC: + .skip 0x4 +lbl_805A96C0: + .skip 0x4 +lbl_805A96C4: + .skip 0x4 +lbl_805A96C8: + .skip 0x4 +lbl_805A96CC: + .skip 0x4 +lbl_805A96D0: + .skip 0x4 +lbl_805A96D4: + .skip 0x4 +lbl_805A96D8: + .skip 0x4 +lbl_805A96DC: + .skip 0x4 +lbl_805A96E0: + .skip 0x4 +lbl_805A96E4: + .skip 0x4 +lbl_805A96E8: + .skip 0x4 +lbl_805A96EC: + .skip 0x4 +lbl_805A96F0: + .skip 0x4 +lbl_805A96F4: + .skip 0x4 + .section .text, "ax" .global AIRegisterDMACallback diff --git a/asm/Dolphin/ar/ar.s b/asm/Dolphin/ar/ar.s index 7c2b9bf5..5b13f831 100644 --- a/asm/Dolphin/ar/ar.s +++ b/asm/Dolphin/ar/ar.s @@ -1,5 +1,36 @@ .include "macros.inc" +.section .sdata +.global lbl_805A8A70 +lbl_805A8A70: + .incbin "baserom.dol", 0x3F6410, 0x8 + +.section .sbss +.global lbl_805A96F8 +lbl_805A96F8: + .skip 0x4 +.global lbl_805A96FC +lbl_805A96FC: + .skip 0x4 +.global lbl_805A9700 +lbl_805A9700: + .skip 0x4 +.global lbl_805A9704 +lbl_805A9704: + .skip 0x4 +.global lbl_805A9708 +lbl_805A9708: + .skip 0x4 +.global lbl_805A970C +lbl_805A970C: + .skip 0x4 +.global lbl_805A9710 +lbl_805A9710: + .skip 0x4 +.global lbl_805A9714 +lbl_805A9714: + .skip 0x4 + .section .text, "ax" .global ARRegisterDMACallback diff --git a/asm/Dolphin/ar/arq.s b/asm/Dolphin/ar/arq.s index d8c4d25c..9e23cc90 100644 --- a/asm/Dolphin/ar/arq.s +++ b/asm/Dolphin/ar/arq.s @@ -1,5 +1,43 @@ .include "macros.inc" +.section .sdata + +.global lbl_805A8A78 +lbl_805A8A78: + .incbin "baserom.dol", 0x3F6418, 0x8 + +.section .sbss +.global lbl_805A9718 +lbl_805A9718: + .skip 0x4 +.global lbl_805A971C +lbl_805A971C: + .skip 0x4 +.global lbl_805A9720 +lbl_805A9720: + .skip 0x4 +.global lbl_805A9724 +lbl_805A9724: + .skip 0x4 +.global lbl_805A9728 +lbl_805A9728: + .skip 0x4 +.global lbl_805A972C +lbl_805A972C: + .skip 0x4 +.global lbl_805A9730 +lbl_805A9730: + .skip 0x4 +.global lbl_805A9734 +lbl_805A9734: + .skip 0x4 +.global lbl_805A9738 +lbl_805A9738: + .skip 0x4 +.global lbl_805A973C +lbl_805A973C: + .skip 0x4 + .section .text, "ax" .global __ARQServiceQueueLo diff --git a/asm/Dolphin/db.s b/asm/Dolphin/db.s index a7599c15..2a0906ed 100644 --- a/asm/Dolphin/db.s +++ b/asm/Dolphin/db.s @@ -1,5 +1,12 @@ .include "macros.inc" +.section .sbss +lbl_805A9740: + .skip 0x4 +lbl_805A9744: + .skip 0x4 + + .section .data .global lbl_803EF9B8 lbl_803EF9B8: diff --git a/asm/Dolphin/dsp/dsp.s b/asm/Dolphin/dsp/dsp.s index dac5cbaf..7a3215a1 100644 --- a/asm/Dolphin/dsp/dsp.s +++ b/asm/Dolphin/dsp/dsp.s @@ -1,5 +1,33 @@ .include "macros.inc" +.section .sdata +.global lbl_805A8A80 +lbl_805A8A80: + .incbin "baserom.dol", 0x3F6420, 0x8 + +.section .sbss +.global lbl_805A9748 +lbl_805A9748: + .skip 0x8 +.global lbl_805A9750 +lbl_805A9750: + .skip 0x4 +.global lbl_805A9754 +lbl_805A9754: + .skip 0x4 +.global lbl_805A9758 +lbl_805A9758: + .skip 0x4 +.global lbl_805A975C +lbl_805A975C: + .skip 0x4 +.global lbl_805A9760 +lbl_805A9760: + .skip 0x4 +.global lbl_805A9764 +lbl_805A9764: + .skip 0x4 + .section .data lbl_803EF9D0: .asciz "<< Dolphin SDK - DSP\trelease build: Sep 5 2002 05:35:13 (0x2301) >>" diff --git a/asm/Dolphin/dvd/dvd.s b/asm/Dolphin/dvd/dvd.s index 786fc96c..d9390ed6 100644 --- a/asm/Dolphin/dvd/dvd.s +++ b/asm/Dolphin/dvd/dvd.s @@ -1,5 +1,23 @@ .include "macros.inc" +.section .sdata + +.global lbl_805A8A98 +lbl_805A8A98: + .incbin "baserom.dol", 0x3F6438, 0x4 +.global lbl_805A8A9C +lbl_805A8A9C: + .incbin "baserom.dol", 0x3F643C, 0x4 +.global lbl_805A8AA0 +lbl_805A8AA0: + .incbin "baserom.dol", 0x3F6440, 0x4 +.global lbl_805A8AA4 +lbl_805A8AA4: + .incbin "baserom.dol", 0x3F6444, 0x8 +.global lbl_805A8AAC +lbl_805A8AAC: + .incbin "baserom.dol", 0x3F644C, 0x4 + .section .bss .global lbl_80540B60 lbl_80540B60: @@ -10,6 +28,47 @@ lbl_80540B80: .global lbl_80540BA0 lbl_80540BA0: .skip 0x58 +.section .sbss +lbl_805A97C8: + .skip 0x8 +lbl_805A97D0: + .skip 0x4 +lbl_805A97D4: + .skip 0x4 +lbl_805A97D8: + .skip 0x4 +lbl_805A97DC: + .skip 0x4 +lbl_805A97E0: + .skip 0x4 +lbl_805A97E4: + .skip 0x4 +lbl_805A97E8: + .skip 0x4 +lbl_805A97EC: + .skip 0x4 +lbl_805A97F0: + .skip 0x4 +lbl_805A97F4: + .skip 0x4 +lbl_805A97F8: + .skip 0x4 +lbl_805A97FC: + .skip 0x4 +lbl_805A9800: + .skip 0x4 +lbl_805A9804: + .skip 0x4 +lbl_805A9808: + .skip 0x4 +lbl_805A980C: + .skip 0x4 +lbl_805A9810: + .skip 0x4 +lbl_805A9814: + .skip 0x4 +lbl_805A9818: + .skip 0x8 .section .data .balign 8 diff --git a/asm/Dolphin/dvd/dvdfatal.s b/asm/Dolphin/dvd/dvdfatal.s index 029f62cb..36f3beed 100644 --- a/asm/Dolphin/dvd/dvdfatal.s +++ b/asm/Dolphin/dvd/dvdfatal.s @@ -1,5 +1,26 @@ .include "macros.inc" +.section .sdata +.global lbl_805A8AB0 +lbl_805A8AB0: + .incbin "baserom.dol", 0x3F6450, 0x4 +.global lbl_805A8AB4 +lbl_805A8AB4: + .incbin "baserom.dol", 0x3F6454, 0x4 + +.section .sbss +.global lbl_805A9820 +lbl_805A9820: + .skip 0x8 + +.section .sdata2 +.global lbl_805AEB20 +lbl_805AEB20: + .incbin "baserom.dol", 0x3FB3C0, 0x4 +.global lbl_805AEB24 +lbl_805AEB24: + .incbin "baserom.dol", 0x3FB3C4, 0x4 + .section .rodata lbl_803D8570: .incbin "baserom.dol", 0x3D5570, 0x18 diff --git a/asm/Dolphin/dvd/dvdfs.s b/asm/Dolphin/dvd/dvdfs.s index 9b88e42e..1db5c504 100644 --- a/asm/Dolphin/dvd/dvdfs.s +++ b/asm/Dolphin/dvd/dvdfs.s @@ -1,5 +1,30 @@ .include "macros.inc" +.section .sbss +.global lbl_805A97B0 +lbl_805A97B0: + .skip 0x4 +.global lbl_805A97B4 +lbl_805A97B4: + .skip 0x4 +.global lbl_805A97B8 +lbl_805A97B8: + .skip 0x4 +.global lbl_805A97BC +lbl_805A97BC: + .skip 0x4 +.global lbl_805A97C0 +lbl_805A97C0: + .skip 0x4 +.global lbl_805A97C4 +lbl_805A97C4: + .skip 0x4 + +.section .sdata +.global lbl_805A8A90 +lbl_805A8A90: + .incbin "baserom.dol", 0x3F6430, 0x8 + .section .data .balign 8 lbl_803EFB90: diff --git a/asm/Dolphin/dvd/dvdlow.s b/asm/Dolphin/dvd/dvdlow.s index 2aca7eac..93157124 100644 --- a/asm/Dolphin/dvd/dvdlow.s +++ b/asm/Dolphin/dvd/dvdlow.s @@ -1,10 +1,71 @@ .include "macros.inc" +.section .sdata + +.global lbl_805A8A88 +lbl_805A8A88: + .incbin "baserom.dol", 0x3F6428, 0x8 + .section .bss + lbl_80540A80: .skip 0x68 lbl_80540AE8: .skip 0x78 + +.section .sbss + +.global lbl_805A9768 +lbl_805A9768: + .skip 0x4 +.global lbl_805A976C +lbl_805A976C: + .skip 0x4 +.global lbl_805A9770 +lbl_805A9770: + .skip 0x4 +.global lbl_805A9774 +lbl_805A9774: + .skip 0x4 +.global lbl_805A9778 +lbl_805A9778: + .skip 0x4 +.global lbl_805A977C +lbl_805A977C: + .skip 0x4 +.global lbl_805A9780 +lbl_805A9780: + .skip 0x4 +.global lbl_805A9784 +lbl_805A9784: + .skip 0x4 +.global lbl_805A9788 +lbl_805A9788: + .skip 0x4 +.global lbl_805A978C +lbl_805A978C: + .skip 0x4 +.global lbl_805A9790 +lbl_805A9790: + .skip 0x8 +.global lbl_805A9798 +lbl_805A9798: + .skip 0x4 +.global lbl_805A979C +lbl_805A979C: + .skip 0x4 +.global lbl_805A97A0 +lbl_805A97A0: + .skip 0x4 +.global lbl_805A97A4 +lbl_805A97A4: + .skip 0x4 +.global lbl_805A97A8 +lbl_805A97A8: + .skip 0x4 +.global lbl_805A97AC +lbl_805A97AC: + .skip 0x4 .section .text, "ax" diff --git a/asm/Dolphin/dvd/fstload.s b/asm/Dolphin/dvd/fstload.s index 70bbe3a0..caa1ddc8 100644 --- a/asm/Dolphin/dvd/fstload.s +++ b/asm/Dolphin/dvd/fstload.s @@ -5,6 +5,25 @@ lbl_80540C18: .skip 0x40 lbl_80540C58: .skip 0x30 +.section .sbss +lbl_805A9828: + .skip 0x4 +lbl_805A982C: + .skip 0x4 +lbl_805A9830: + .skip 0x8 + +.section .sdata + +.global lbl_805A8AB8 +lbl_805A8AB8: + .incbin "baserom.dol", 0x3F6458, 0x4 +.global lbl_805A8ABC +lbl_805A8ABC: + .incbin "baserom.dol", 0x3F645C, 0x4 +.global lbl_805A8AC0 +lbl_805A8AC0: + .incbin "baserom.dol", 0x3F6460, 0x8 .section .data .balign 8 diff --git a/asm/Dolphin/gx/GXAttr.s b/asm/Dolphin/gx/GXAttr.s index ab0b5086..df0724e6 100644 --- a/asm/Dolphin/gx/GXAttr.s +++ b/asm/Dolphin/gx/GXAttr.s @@ -1,5 +1,16 @@ .include "macros.inc" +.section .sdata +.global lbl_805A8AD0 +lbl_805A8AD0: + .incbin "baserom.dol", 0x3F6470, 0x4 +.global lbl_805A8AD4 +lbl_805A8AD4: + .incbin "baserom.dol", 0x3F6474, 0x4 +.global lbl_805A8AD8 +lbl_805A8AD8: + .incbin "baserom.dol", 0x3F6478, 0x8 + .section .text, "ax" .global __GXXfVtxSpecs diff --git a/asm/Dolphin/gx/GXBump.s b/asm/Dolphin/gx/GXBump.s index f0552f3e..611bda4c 100644 --- a/asm/Dolphin/gx/GXBump.s +++ b/asm/Dolphin/gx/GXBump.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AEBB0 +lbl_805AEBB0: + .incbin "baserom.dol", 0x3FB450, 0x8 + .section .text, "ax" .global GXSetTevIndirect diff --git a/asm/Dolphin/gx/GXFifo.s b/asm/Dolphin/gx/GXFifo.s index 0f7da70a..eff02e96 100644 --- a/asm/Dolphin/gx/GXFifo.s +++ b/asm/Dolphin/gx/GXFifo.s @@ -1,5 +1,23 @@ .include "macros.inc" +.section .sbss +lbl_805A9848: + .skip 0x4 +lbl_805A984C: + .skip 0x4 +lbl_805A9850: + .skip 0x4 +lbl_805A9854: + .skip 0x4 +lbl_805A9858: + .skip 0x4 +lbl_805A985C: + .skip 0x4 +lbl_805A9860: + .skip 0x4 +lbl_805A9864: + .skip 0x4 + .section .text, "ax" .global GXCPInterruptHandler diff --git a/asm/Dolphin/gx/GXFrameBuf.s b/asm/Dolphin/gx/GXFrameBuf.s index cba0d95a..11f97754 100644 --- a/asm/Dolphin/gx/GXFrameBuf.s +++ b/asm/Dolphin/gx/GXFrameBuf.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AEB50 +lbl_805AEB50: + .incbin "baserom.dol", 0x3FB3F0, 0x8 + .section .text, "ax" .global GXAdjustForOverscan diff --git a/asm/Dolphin/gx/GXInit.s b/asm/Dolphin/gx/GXInit.s index ee55181f..34330ec7 100644 --- a/asm/Dolphin/gx/GXInit.s +++ b/asm/Dolphin/gx/GXInit.s @@ -1,9 +1,55 @@ .include "macros.inc" .section .bss + .global lbl_80540C88 lbl_80540C88: .skip 0x578 +.section .sbss +.global lbl_805A9838 +lbl_805A9838: + .skip 0x4 +.global lbl_805A983C +lbl_805A983C: + .skip 0x4 +.global lbl_805A9840 +lbl_805A9840: + .skip 0x4 +.global lbl_805A9844 +lbl_805A9844: + .skip 0x4 + +.section .sdata +.global lbl_805A8AC8 +lbl_805A8AC8: + .incbin "baserom.dol", 0x3F6468, 0x8 + +.section .sdata2 + +.global lbl_805AEB28 +lbl_805AEB28: + .incbin "baserom.dol", 0x3FB3C8, 0x4 +.global lbl_805AEB2C +lbl_805AEB2C: + .incbin "baserom.dol", 0x3FB3CC, 0x4 +.global lbl_805AEB30 +lbl_805AEB30: + .incbin "baserom.dol", 0x3FB3D0, 0x4 +.global lbl_805AEB34 +lbl_805AEB34: + .incbin "baserom.dol", 0x3FB3D4, 0x4 +.global lbl_805AEB38 +lbl_805AEB38: + .incbin "baserom.dol", 0x3FB3D8, 0x4 +.global lbl_805AEB3C +lbl_805AEB3C: + .incbin "baserom.dol", 0x3FB3DC, 0x4 +.global lbl_805AEB40 +lbl_805AEB40: + .incbin "baserom.dol", 0x3FB3E0, 0x8 +.global lbl_805AEB48 +lbl_805AEB48: + .incbin "baserom.dol", 0x3FB3E8, 0x8 .section .data .global lbl_803F062C diff --git a/asm/Dolphin/gx/GXLight.s b/asm/Dolphin/gx/GXLight.s index 8c8bd078..11c25067 100644 --- a/asm/Dolphin/gx/GXLight.s +++ b/asm/Dolphin/gx/GXLight.s @@ -1,5 +1,40 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AEB58 +lbl_805AEB58: + .incbin "baserom.dol", 0x3FB3F8, 0x4 +.global lbl_805AEB5C +lbl_805AEB5C: + .incbin "baserom.dol", 0x3FB3FC, 0x4 +.global lbl_805AEB60 +lbl_805AEB60: + .incbin "baserom.dol", 0x3FB400, 0x4 +.global lbl_805AEB64 +lbl_805AEB64: + .incbin "baserom.dol", 0x3FB404, 0x4 +.global lbl_805AEB68 +lbl_805AEB68: + .incbin "baserom.dol", 0x3FB408, 0x4 +.global lbl_805AEB6C +lbl_805AEB6C: + .incbin "baserom.dol", 0x3FB40C, 0x4 +.global lbl_805AEB70 +lbl_805AEB70: + .incbin "baserom.dol", 0x3FB410, 0x4 +.global lbl_805AEB74 +lbl_805AEB74: + .incbin "baserom.dol", 0x3FB414, 0x4 +.global lbl_805AEB78 +lbl_805AEB78: + .incbin "baserom.dol", 0x3FB418, 0x4 +.global lbl_805AEB7C +lbl_805AEB7C: + .incbin "baserom.dol", 0x3FB41C, 0x4 +.global lbl_805AEB80 +lbl_805AEB80: + .incbin "baserom.dol", 0x3FB420, 0x8 + .section .data .global lbl_803F09D0 lbl_803F09D0: diff --git a/asm/Dolphin/gx/GXMisc.s b/asm/Dolphin/gx/GXMisc.s index c71b20bc..dc7468d1 100644 --- a/asm/Dolphin/gx/GXMisc.s +++ b/asm/Dolphin/gx/GXMisc.s @@ -1,5 +1,20 @@ .include "macros.inc" +.section .sbss +.global lbl_805A9868 +lbl_805A9868: + .skip 0x4 +.global lbl_805A986C +lbl_805A986C: + .skip 0x4 +.global lbl_805A9870 +lbl_805A9870: + .skip 0x4 +.global lbl_805A9874 +lbl_805A9874: + .skip 0xC + + .section .text, "ax" .global GXSetMisc diff --git a/asm/Dolphin/gx/GXPixel.s b/asm/Dolphin/gx/GXPixel.s index dc1ff7d1..5bd4ecd8 100644 --- a/asm/Dolphin/gx/GXPixel.s +++ b/asm/Dolphin/gx/GXPixel.s @@ -1,5 +1,28 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AEBB8 +lbl_805AEBB8: + .incbin "baserom.dol", 0x3FB458, 0x4 +.global lbl_805AEBBC +lbl_805AEBBC: + .incbin "baserom.dol", 0x3FB45C, 0x4 +.global lbl_805AEBC0 +lbl_805AEBC0: + .incbin "baserom.dol", 0x3FB460, 0x8 +.global lbl_805AEBC8 +lbl_805AEBC8: + .incbin "baserom.dol", 0x3FB468, 0x8 +.global lbl_805AEBD0 +lbl_805AEBD0: + .incbin "baserom.dol", 0x3FB470, 0x8 +.global lbl_805AEBD8 +lbl_805AEBD8: + .incbin "baserom.dol", 0x3FB478, 0x8 +.global lbl_805AEBE0 +lbl_805AEBE0: + .incbin "baserom.dol", 0x3FB480, 0x8 + .section .data .global lbl_803F0C90 lbl_803F0C90: diff --git a/asm/Dolphin/gx/GXTexture.s b/asm/Dolphin/gx/GXTexture.s index 38262743..b44dabb8 100644 --- a/asm/Dolphin/gx/GXTexture.s +++ b/asm/Dolphin/gx/GXTexture.s @@ -1,5 +1,58 @@ .include "macros.inc" +.section .sdata +.global lbl_805A8AE0 +lbl_805A8AE0: + .incbin "baserom.dol", 0x3F6480, 0x8 +.global lbl_805A8AE8 +lbl_805A8AE8: + .incbin "baserom.dol", 0x3F6488, 0x8 +.global lbl_805A8AF0 +lbl_805A8AF0: + .incbin "baserom.dol", 0x3F6490, 0x8 +.global lbl_805A8AF8 +lbl_805A8AF8: + .incbin "baserom.dol", 0x3F6498, 0x8 +.global lbl_805A8B00 +lbl_805A8B00: + .incbin "baserom.dol", 0x3F64A0, 0x8 +.global lbl_805A8B08 +lbl_805A8B08: + .incbin "baserom.dol", 0x3F64A8, 0x8 +.global lbl_805A8B10 +lbl_805A8B10: + .incbin "baserom.dol", 0x3F64B0, 0x8 +.global lbl_805A8B18 +lbl_805A8B18: + .incbin "baserom.dol", 0x3F64B8, 0x8 + +.section .sdata2 +.global lbl_805AEB88 +lbl_805AEB88: + .incbin "baserom.dol", 0x3FB428, 0x8 +.global lbl_805AEB90 +lbl_805AEB90: + .incbin "baserom.dol", 0x3FB430, 0x8 +.global lbl_805AEB98 +lbl_805AEB98: + .incbin "baserom.dol", 0x3FB438, 0x4 +.global lbl_805AEB9C +lbl_805AEB9C: + .incbin "baserom.dol", 0x3FB43C, 0x4 +.global lbl_805AEBA0 +lbl_805AEBA0: + .incbin "baserom.dol", 0x3FB440, 0x4 +.global lbl_805AEBA4 +lbl_805AEBA4: + .incbin "baserom.dol", 0x3FB444, 0x4 +.global lbl_805AEBA8 +lbl_805AEBA8: + .incbin "baserom.dol", 0x3FB448, 0x4 +.global lbl_805AEBAC +lbl_805AEBAC: + .incbin "baserom.dol", 0x3FB44C, 0x4 + + .section .data .global lbl_803F09F0 lbl_803F09F0: diff --git a/asm/Dolphin/gx/GXTransform.s b/asm/Dolphin/gx/GXTransform.s index b83966df..0b849854 100644 --- a/asm/Dolphin/gx/GXTransform.s +++ b/asm/Dolphin/gx/GXTransform.s @@ -1,5 +1,17 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AEBE8 +lbl_805AEBE8: + .incbin "baserom.dol", 0x3FB488, 0x4 +.global lbl_805AEBEC +lbl_805AEBEC: + .incbin "baserom.dol", 0x3FB48C, 0x4 +.global lbl_805AEBF0 +lbl_805AEBF0: + .incbin "baserom.dol", 0x3FB490, 0x8 + + .section .text, "ax" .global GXSetProjection diff --git a/asm/Dolphin/mtx/mtx.s b/asm/Dolphin/mtx/mtx.s index 54deb28d..eb69ee57 100644 --- a/asm/Dolphin/mtx/mtx.s +++ b/asm/Dolphin/mtx/mtx.s @@ -1,5 +1,19 @@ .include "macros.inc" +.section .sdata + +.global lbl_805A8B20 +lbl_805A8B20: + .incbin "baserom.dol", 0x3F64C0, 0x8 + +.section .sdata2 +.global lbl_805AEBF8 +lbl_805AEBF8: + .incbin "baserom.dol", 0x3FB498, 0x4 +.global lbl_805AEBFC +lbl_805AEBFC: + .incbin "baserom.dol", 0x3FB49C, 0x4 + .section .text, "ax" .global PSMTXIdentity diff --git a/asm/Dolphin/mtx/mtx44.s b/asm/Dolphin/mtx/mtx44.s index f83870b6..96388308 100644 --- a/asm/Dolphin/mtx/mtx44.s +++ b/asm/Dolphin/mtx/mtx44.s @@ -1,5 +1,19 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AEC00 +lbl_805AEC00: + .incbin "baserom.dol", 0x3FB4A0, 0x4 +.global lbl_805AEC04 +lbl_805AEC04: + .incbin "baserom.dol", 0x3FB4A4, 0x4 +.global lbl_805AEC08 +lbl_805AEC08: + .incbin "baserom.dol", 0x3FB4A8, 0x4 +.global lbl_805AEC0C +lbl_805AEC0C: + .incbin "baserom.dol", 0x3FB4AC, 0x4 + .section .text, "ax" .global C_MTXFrustum diff --git a/asm/Dolphin/mtx/vec.s b/asm/Dolphin/mtx/vec.s index 850b6234..4d8716f1 100644 --- a/asm/Dolphin/mtx/vec.s +++ b/asm/Dolphin/mtx/vec.s @@ -1,5 +1,13 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AEC10 +lbl_805AEC10: + .incbin "baserom.dol", 0x3FB4B0, 0x4 +.global lbl_805AEC14 +lbl_805AEC14: + .incbin "baserom.dol", 0x3FB4B4, 0x4 + .section .text, "ax" .global C_VECNormalize diff --git a/asm/Dolphin/os/OS.s b/asm/Dolphin/os/OS.s index 411943c3..8de24073 100644 --- a/asm/Dolphin/os/OS.s +++ b/asm/Dolphin/os/OS.s @@ -4,12 +4,56 @@ .global DriveInfo DriveInfo: .skip 0x50 + +.section .sbss +.global lbl_805A9880 +lbl_805A9880: + .skip 0x4 +.global lbl_805A9884 +lbl_805A9884: + .skip 0x4 +.global lbl_805A9888 +lbl_805A9888: + .skip 0x4 +.global lbl_805A988C +lbl_805A988C: + .skip 0x4 +.global AreWeInitialized +AreWeInitialized: + .skip 0x4 +.global lbl_805A9894 +lbl_805A9894: + .skip 0x4 +.global lbl_805A9898 +lbl_805A9898: + .skip 0x4 +.global lbl_805A989C +lbl_805A989C: + .skip 0x4 +.global lbl_805A98A0 +lbl_805A98A0: + .skip 0x8 +.global lbl_805A98A8 +lbl_805A98A8: + .skip 0x4 +.global lbl_805A98AC +lbl_805A98AC: + .skip 0x4 .section .data .global lbl_803F0DA0 lbl_803F0DA0: .incbin "baserom.dol", 0x3EDDA0, 0x208 - + +.section .sdata + +.global lbl_805A8B28 +lbl_805A8B28: + .incbin "baserom.dol", 0x3F64C8, 0x4 +.global lbl_805A8B2C +lbl_805A8B2C: + .incbin "baserom.dol", 0x3F64CC, 0x4 + .section .text, "ax" .global OSGetConsoleType diff --git a/asm/Dolphin/os/OSAlarm.s b/asm/Dolphin/os/OSAlarm.s index 69211324..f7eb61f4 100644 --- a/asm/Dolphin/os/OSAlarm.s +++ b/asm/Dolphin/os/OSAlarm.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .sbss +.global lbl_805A98B0 +lbl_805A98B0: + .skip 0x8 + .section .text, "ax" .global OSInitAlarm diff --git a/asm/Dolphin/os/OSArena.s b/asm/Dolphin/os/OSArena.s index bb8d8102..6ffe20f3 100644 --- a/asm/Dolphin/os/OSArena.s +++ b/asm/Dolphin/os/OSArena.s @@ -1,5 +1,15 @@ .include "macros.inc" +.section .sdata +.global lbl_805A8B30 +lbl_805A8B30: + .incbin "baserom.dol", 0x3F64D0, 0x8 + +.section .sbss +.global lbl_805A98B8 +lbl_805A98B8: + .skip 0x8 + .section .text, "ax" .global OSGetArenaHi diff --git a/asm/Dolphin/os/OSError.s b/asm/Dolphin/os/OSError.s index 1f3c031f..13745e92 100644 --- a/asm/Dolphin/os/OSError.s +++ b/asm/Dolphin/os/OSError.s @@ -58,7 +58,14 @@ lbl_803F170C: .4byte lbl_80380024 .4byte lbl_80380024 .4byte lbl_8037FFD8 - +.section .sdata +.global lbl_805A8B38 +lbl_805A8B38: + .incbin "baserom.dol", 0x3F64D8, 0x4 +.global lbl_805A8B3C +lbl_805A8B3C: + .incbin "baserom.dol", 0x3F64DC, 0x4 + .section .text, "ax" .global OSReport diff --git a/asm/Dolphin/os/OSFatal.s b/asm/Dolphin/os/OSFatal.s index 90b5d877..0aebb236 100644 --- a/asm/Dolphin/os/OSFatal.s +++ b/asm/Dolphin/os/OSFatal.s @@ -4,7 +4,52 @@ .global lbl_80541298 lbl_80541298: .skip 0x2E8 - + +.section .sdata + +.global lbl_805A8B40 +lbl_805A8B40: + .incbin "baserom.dol", 0x3F64E0, 0x8 + +.section .sdata2 + +.global lbl_805AEC18 +lbl_805AEC18: + .incbin "baserom.dol", 0x3FB4B8, 0x4 +.global lbl_805AEC1C +lbl_805AEC1C: + .incbin "baserom.dol", 0x3FB4BC, 0x4 +.global lbl_805AEC20 +lbl_805AEC20: + .incbin "baserom.dol", 0x3FB4C0, 0x4 +.global lbl_805AEC24 +lbl_805AEC24: + .incbin "baserom.dol", 0x3FB4C4, 0x4 +.global lbl_805AEC28 +lbl_805AEC28: + .incbin "baserom.dol", 0x3FB4C8, 0x4 +.global lbl_805AEC2C +lbl_805AEC2C: + .incbin "baserom.dol", 0x3FB4CC, 0x4 +.global lbl_805AEC30 +lbl_805AEC30: + .incbin "baserom.dol", 0x3FB4D0, 0x4 +.global lbl_805AEC34 +lbl_805AEC34: + .incbin "baserom.dol", 0x3FB4D4, 0x4 +.global lbl_805AEC38 +lbl_805AEC38: + .incbin "baserom.dol", 0x3FB4D8, 0x4 +.global lbl_805AEC3C +lbl_805AEC3C: + .incbin "baserom.dol", 0x3FB4DC, 0x4 +.global lbl_805AEC40 +lbl_805AEC40: + .incbin "baserom.dol", 0x3FB4E0, 0x4 +.global lbl_805AEC44 +lbl_805AEC44: + .incbin "baserom.dol", 0x3FB4E4, 0x4 + .section .text, "ax" .global ScreenReport diff --git a/asm/Dolphin/os/OSFont.s b/asm/Dolphin/os/OSFont.s index 905ac548..aefa2165 100644 --- a/asm/Dolphin/os/OSFont.s +++ b/asm/Dolphin/os/OSFont.s @@ -1,5 +1,20 @@ .include "macros.inc" +.section .sdata +.global lbl_805A8B48 +lbl_805A8B48: + .incbin "baserom.dol", 0x3F64E8, 0x8 + +.section .sbss +lbl_805A98C0: + .skip 0x4 +lbl_805A98C4: + .skip 0x4 +lbl_805A98C8: + .skip 0x4 +lbl_805A98CC: + .skip 0x4 + .section .data .balign 8 .global lbl_803F1750 @@ -716,7 +731,21 @@ lbl_803F18D0: .4byte 0x031A031B .4byte 0x00000000 .4byte 0x00000000 - + +.section .sdata2 +.global lbl_805AEC48 +lbl_805AEC48: + .incbin "baserom.dol", 0x3FB4E8, 0x8 +.global lbl_805AEC50 +lbl_805AEC50: + .incbin "baserom.dol", 0x3FB4F0, 0x8 +.global lbl_805AEC58 +lbl_805AEC58: + .incbin "baserom.dol", 0x3FB4F8, 0x4 +.global lbl_805AEC5C +lbl_805AEC5C: + .incbin "baserom.dol", 0x3FB4FC, 0x4 + .section .text, "ax" .global sub_80380c34 diff --git a/asm/Dolphin/os/OSInterrupt.s b/asm/Dolphin/os/OSInterrupt.s index 62e0ff2d..01e00f64 100644 --- a/asm/Dolphin/os/OSInterrupt.s +++ b/asm/Dolphin/os/OSInterrupt.s @@ -1,5 +1,22 @@ .include "macros.inc" +.section .sbss +.global lbl_805A98D0 +lbl_805A98D0: + .skip 0x4 +.global lbl_805A98D4 +lbl_805A98D4: + .skip 0x4 +.global lbl_805A98D8 +lbl_805A98D8: + .skip 0x8 +.global lbl_805A98E0 +lbl_805A98E0: + .skip 0x4 +.global lbl_805A98E4 +lbl_805A98E4: + .skip 0x4 + .section .data .balign 8 .global lbl_803F2260 diff --git a/asm/Dolphin/os/OSReboot.s b/asm/Dolphin/os/OSReboot.s index 14a309a7..e4f8451e 100644 --- a/asm/Dolphin/os/OSReboot.s +++ b/asm/Dolphin/os/OSReboot.s @@ -4,6 +4,14 @@ .global lbl_80541580 lbl_80541580: .skip 0x20 + +.section .sbss +lbl_805A98E8: + .skip 0x4 +lbl_805A98EC: + .skip 0x4 +lbl_805A98F0: + .skip 0x8 .section .text, "ax" diff --git a/asm/Dolphin/os/OSReset.s b/asm/Dolphin/os/OSReset.s index 664ee3a4..fbf785e2 100644 --- a/asm/Dolphin/os/OSReset.s +++ b/asm/Dolphin/os/OSReset.s @@ -1,5 +1,9 @@ .include "macros.inc" +.section .sbss +lbl_805A98F8: + .skip 0x8 + .section .text, "ax" .global OSRegisterResetFunction diff --git a/asm/Dolphin/os/OSResetSW.s b/asm/Dolphin/os/OSResetSW.s index 0c9824a3..e6b72a5b 100644 --- a/asm/Dolphin/os/OSResetSW.s +++ b/asm/Dolphin/os/OSResetSW.s @@ -1,5 +1,29 @@ .include "macros.inc" +.section .sbss +.global lbl_805A9900 +lbl_805A9900: + .skip 0x4 +.global lbl_805A9904 +lbl_805A9904: + .skip 0x4 +.global lbl_805A9908 +lbl_805A9908: + .skip 0x8 +.global lbl_805A9910 +lbl_805A9910: + .skip 0x4 +.global lbl_805A9914 +lbl_805A9914: + .skip 0x4 +.global lbl_805A9918 +lbl_805A9918: + .skip 0x4 +.global lbl_805A991C +lbl_805A991C: + .skip 0x4 + + .section .text, "ax" .global __OSResetSWInterruptHandler diff --git a/asm/Dolphin/os/OSThread.s b/asm/Dolphin/os/OSThread.s index 284d540b..8fa22c77 100644 --- a/asm/Dolphin/os/OSThread.s +++ b/asm/Dolphin/os/OSThread.s @@ -3,7 +3,21 @@ .section .bss lbl_805415F8: .skip 0x9F8 - + +.section .sbss +lbl_805A9920: + .skip 0x4 +lbl_805A9924: + .skip 0x4 +lbl_805A9928: + .skip 0x8 + +.section .sdata + +.global lbl_805A8B50 +lbl_805A8B50: + .incbin "baserom.dol", 0x3F64F0, 0x8 + .section .text, "ax" .global DefaultSwitchThreadCallback diff --git a/asm/Dolphin/pad/pad.s b/asm/Dolphin/pad/pad.s index 99d2a581..500256fb 100644 --- a/asm/Dolphin/pad/pad.s +++ b/asm/Dolphin/pad/pad.s @@ -7,6 +7,7 @@ lbl_80542000: .skip 0x40 .section .sbss + .balign 4 .global lbl_805A9930 lbl_805A9930: @@ -50,7 +51,34 @@ lbl_803F2398: .4byte 0x7f .4byte 0 .4byte 0 - + +.section .sdata + +.global lbl_805A8B58 +lbl_805A8B58: + .incbin "baserom.dol", 0x3F64F8, 0x4 +.global lbl_805A8B5C +lbl_805A8B5C: + .incbin "baserom.dol", 0x3F64FC, 0x4 +.global lbl_805A8B60 +lbl_805A8B60: + .incbin "baserom.dol", 0x3F6500, 0x4 +.global lbl_805A8B64 +lbl_805A8B64: + .incbin "baserom.dol", 0x3F6504, 0x4 +.global lbl_805A8B68 +lbl_805A8B68: + .incbin "baserom.dol", 0x3F6508, 0x4 +.global lbl_805A8B6C +lbl_805A8B6C: + .incbin "baserom.dol", 0x3F650C, 0x4 +.global lbl_805A8B70 +lbl_805A8B70: + .incbin "baserom.dol", 0x3F6510, 0x4 +.global lbl_805A8B74 +lbl_805A8B74: + .incbin "baserom.dol", 0x3F6514, 0x4 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 .global UpdateOrigin diff --git a/asm/Dolphin/vi.s b/asm/Dolphin/vi.s index 2e817cee..489df08c 100644 --- a/asm/Dolphin/vi.s +++ b/asm/Dolphin/vi.s @@ -16,7 +16,16 @@ lbl_803F259C: .global lbl_803F275C lbl_803F275C: .incbin "baserom.dol", 0x3EF75C, 0x1C - + +.section .sdata + +.global lbl_805A8B78 +lbl_805A8B78: + .incbin "baserom.dol", 0x3F6518, 0x4 +.global lbl_805A8B7C +lbl_805A8B7C: + .incbin "baserom.dol", 0x3F651C, 0xC + .section .sbss, "wa" .balign 4 lbl_805A9958: diff --git a/asm/Runtime/s_tan.s b/asm/Runtime/s_tan.s index 5ad315aa..9b14ad28 100644 --- a/asm/Runtime/s_tan.s +++ b/asm/Runtime/s_tan.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AF208 +lbl_805AF208: + .incbin "baserom.dol", 0x3FBAA8, 0x8 + .section .text, "ax" .global tan @@ -36,4 +41,4 @@ lbl_80394C1C: /* 80394C1C 00391B7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80394C20 00391B80 7C 08 03 A6 */ mtlr r0 /* 80394C24 00391B84 38 21 00 20 */ addi r1, r1, 0x20 -/* 80394C28 00391B88 4E 80 00 20 */ blr \ No newline at end of file +/* 80394C28 00391B88 4E 80 00 20 */ blr diff --git a/asm/Runtime/sdata.s b/asm/Runtime/sdata.s new file mode 100644 index 00000000..1e107f3b --- /dev/null +++ b/asm/Runtime/sdata.s @@ -0,0 +1,34 @@ +.section .sdata + +# TODO: Split this +.global lbl_805A8B88 +lbl_805A8B88: + .incbin "baserom.dol", 0x3F6528, 0x8 +.global lbl_805A8B90 +lbl_805A8B90: + .incbin "baserom.dol", 0x3F6530, 0x8 +.global lbl_805A8B98 +lbl_805A8B98: + .incbin "baserom.dol", 0x3F6538, 0x8 +.global lbl_805A8BA0 +lbl_805A8BA0: + .incbin "baserom.dol", 0x3F6540, 0x4 +.global lbl_805A8BA4 +lbl_805A8BA4: + .incbin "baserom.dol", 0x3F6544, 0x4 +.global lbl_805A8BA8 +lbl_805A8BA8: + .incbin "baserom.dol", 0x3F6548, 0x8 +.global lbl_805A8BB0 +lbl_805A8BB0: + .incbin "baserom.dol", 0x3F6550, 0x8 +.global lbl_805A8BB8 +lbl_805A8BB8: + .incbin "baserom.dol", 0x3F6558, 0x8 +.global lbl_805A8BC0 +lbl_805A8BC0: + .incbin "baserom.dol", 0x3F6560, 0x8 +.global lbl_805A8BC8 +lbl_805A8BC8: + .incbin "baserom.dol", 0x3F6568, 0x8 + diff --git a/asm/Runtime/sdata2.s b/asm/Runtime/sdata2.s new file mode 100644 index 00000000..074b2f41 --- /dev/null +++ b/asm/Runtime/sdata2.s @@ -0,0 +1,549 @@ +.section .sdata2 + +# TODO: Split this +.global lbl_805AEC60 +lbl_805AEC60: + .incbin "baserom.dol", 0x3FB500, 0x8 +.global lbl_805AEC68 +lbl_805AEC68: + .incbin "baserom.dol", 0x3FB508, 0x8 +.global lbl_805AEC70 +lbl_805AEC70: + .incbin "baserom.dol", 0x3FB510, 0x8 +.global lbl_805AEC78 +lbl_805AEC78: + .incbin "baserom.dol", 0x3FB518, 0x8 +.global lbl_805AEC80 +lbl_805AEC80: + .incbin "baserom.dol", 0x3FB520, 0x8 +.global lbl_805AEC88 +lbl_805AEC88: + .incbin "baserom.dol", 0x3FB528, 0x8 +.global lbl_805AEC90 +lbl_805AEC90: + .incbin "baserom.dol", 0x3FB530, 0x8 +.global lbl_805AEC98 +lbl_805AEC98: + .incbin "baserom.dol", 0x3FB538, 0x8 +.global lbl_805AECA0 +lbl_805AECA0: + .incbin "baserom.dol", 0x3FB540, 0x4 +.global lbl_805AECA4 +lbl_805AECA4: + .incbin "baserom.dol", 0x3FB544, 0x4 +.global lbl_805AECA8 +lbl_805AECA8: + .incbin "baserom.dol", 0x3FB548, 0x8 +.global lbl_805AECB0 +lbl_805AECB0: + .incbin "baserom.dol", 0x3FB550, 0x8 +.global lbl_805AECB8 +lbl_805AECB8: + .incbin "baserom.dol", 0x3FB558, 0x8 +.global lbl_805AECC0 +lbl_805AECC0: + .incbin "baserom.dol", 0x3FB560, 0x8 +.global lbl_805AECC8 +lbl_805AECC8: + .incbin "baserom.dol", 0x3FB568, 0x8 +.global lbl_805AECD0 +lbl_805AECD0: + .incbin "baserom.dol", 0x3FB570, 0x8 +.global lbl_805AECD8 +lbl_805AECD8: + .incbin "baserom.dol", 0x3FB578, 0x8 +.global lbl_805AECE0 +lbl_805AECE0: + .incbin "baserom.dol", 0x3FB580, 0x8 +.global lbl_805AECE8 +lbl_805AECE8: + .incbin "baserom.dol", 0x3FB588, 0x8 +.global lbl_805AECF0 +lbl_805AECF0: + .incbin "baserom.dol", 0x3FB590, 0x8 +.global lbl_805AECF8 +lbl_805AECF8: + .incbin "baserom.dol", 0x3FB598, 0x8 +.global lbl_805AED00 +lbl_805AED00: + .incbin "baserom.dol", 0x3FB5A0, 0x8 +.global lbl_805AED08 +lbl_805AED08: + .incbin "baserom.dol", 0x3FB5A8, 0x8 +.global lbl_805AED10 +lbl_805AED10: + .incbin "baserom.dol", 0x3FB5B0, 0x8 +.global lbl_805AED18 +lbl_805AED18: + .incbin "baserom.dol", 0x3FB5B8, 0x8 +.global lbl_805AED20 +lbl_805AED20: + .incbin "baserom.dol", 0x3FB5C0, 0x8 +.global lbl_805AED28 +lbl_805AED28: + .incbin "baserom.dol", 0x3FB5C8, 0x8 +.global lbl_805AED30 +lbl_805AED30: + .incbin "baserom.dol", 0x3FB5D0, 0x8 +.global lbl_805AED38 +lbl_805AED38: + .incbin "baserom.dol", 0x3FB5D8, 0x8 +.global lbl_805AED40 +lbl_805AED40: + .incbin "baserom.dol", 0x3FB5E0, 0x8 +.global lbl_805AED48 +lbl_805AED48: + .incbin "baserom.dol", 0x3FB5E8, 0x8 +.global lbl_805AED50 +lbl_805AED50: + .incbin "baserom.dol", 0x3FB5F0, 0x8 +.global lbl_805AED58 +lbl_805AED58: + .incbin "baserom.dol", 0x3FB5F8, 0x8 +.global lbl_805AED60 +lbl_805AED60: + .incbin "baserom.dol", 0x3FB600, 0x8 +.global lbl_805AED68 +lbl_805AED68: + .incbin "baserom.dol", 0x3FB608, 0x8 +.global lbl_805AED70 +lbl_805AED70: + .incbin "baserom.dol", 0x3FB610, 0x8 +.global lbl_805AED78 +lbl_805AED78: + .incbin "baserom.dol", 0x3FB618, 0x8 +.global lbl_805AED80 +lbl_805AED80: + .incbin "baserom.dol", 0x3FB620, 0x8 +.global lbl_805AED88 +lbl_805AED88: + .incbin "baserom.dol", 0x3FB628, 0x8 +.global lbl_805AED90 +lbl_805AED90: + .incbin "baserom.dol", 0x3FB630, 0x8 +.global lbl_805AED98 +lbl_805AED98: + .incbin "baserom.dol", 0x3FB638, 0x8 +.global lbl_805AEDA0 +lbl_805AEDA0: + .incbin "baserom.dol", 0x3FB640, 0x8 +.global lbl_805AEDA8 +lbl_805AEDA8: + .incbin "baserom.dol", 0x3FB648, 0x8 +.global lbl_805AEDB0 +lbl_805AEDB0: + .incbin "baserom.dol", 0x3FB650, 0x8 +.global lbl_805AEDB8 +lbl_805AEDB8: + .incbin "baserom.dol", 0x3FB658, 0x8 +.global lbl_805AEDC0 +lbl_805AEDC0: + .incbin "baserom.dol", 0x3FB660, 0x8 +.global lbl_805AEDC8 +lbl_805AEDC8: + .incbin "baserom.dol", 0x3FB668, 0x8 +.global lbl_805AEDD0 +lbl_805AEDD0: + .incbin "baserom.dol", 0x3FB670, 0x8 +.global lbl_805AEDD8 +lbl_805AEDD8: + .incbin "baserom.dol", 0x3FB678, 0x8 +.global lbl_805AEDE0 +lbl_805AEDE0: + .incbin "baserom.dol", 0x3FB680, 0x8 +.global lbl_805AEDE8 +lbl_805AEDE8: + .incbin "baserom.dol", 0x3FB688, 0x8 +.global lbl_805AEDF0 +lbl_805AEDF0: + .incbin "baserom.dol", 0x3FB690, 0x8 +.global lbl_805AEDF8 +lbl_805AEDF8: + .incbin "baserom.dol", 0x3FB698, 0x8 +.global lbl_805AEE00 +lbl_805AEE00: + .incbin "baserom.dol", 0x3FB6A0, 0x8 +.global lbl_805AEE08 +lbl_805AEE08: + .incbin "baserom.dol", 0x3FB6A8, 0x8 +.global lbl_805AEE10 +lbl_805AEE10: + .incbin "baserom.dol", 0x3FB6B0, 0x8 +.global lbl_805AEE18 +lbl_805AEE18: + .incbin "baserom.dol", 0x3FB6B8, 0x8 +.global lbl_805AEE20 +lbl_805AEE20: + .incbin "baserom.dol", 0x3FB6C0, 0x8 +.global lbl_805AEE28 +lbl_805AEE28: + .incbin "baserom.dol", 0x3FB6C8, 0x8 +.global lbl_805AEE30 +lbl_805AEE30: + .incbin "baserom.dol", 0x3FB6D0, 0x8 +.global lbl_805AEE38 +lbl_805AEE38: + .incbin "baserom.dol", 0x3FB6D8, 0x8 +.global lbl_805AEE40 +lbl_805AEE40: + .incbin "baserom.dol", 0x3FB6E0, 0x8 +.global lbl_805AEE48 +lbl_805AEE48: + .incbin "baserom.dol", 0x3FB6E8, 0x8 +.global lbl_805AEE50 +lbl_805AEE50: + .incbin "baserom.dol", 0x3FB6F0, 0x8 +.global lbl_805AEE58 +lbl_805AEE58: + .incbin "baserom.dol", 0x3FB6F8, 0x8 +.global lbl_805AEE60 +lbl_805AEE60: + .incbin "baserom.dol", 0x3FB700, 0x8 +.global lbl_805AEE68 +lbl_805AEE68: + .incbin "baserom.dol", 0x3FB708, 0x8 +.global lbl_805AEE70 +lbl_805AEE70: + .incbin "baserom.dol", 0x3FB710, 0x8 +.global lbl_805AEE78 +lbl_805AEE78: + .incbin "baserom.dol", 0x3FB718, 0x8 +.global lbl_805AEE80 +lbl_805AEE80: + .incbin "baserom.dol", 0x3FB720, 0x8 +.global lbl_805AEE88 +lbl_805AEE88: + .incbin "baserom.dol", 0x3FB728, 0x8 +.global lbl_805AEE90 +lbl_805AEE90: + .incbin "baserom.dol", 0x3FB730, 0x8 +.global lbl_805AEE98 +lbl_805AEE98: + .incbin "baserom.dol", 0x3FB738, 0x8 +.global lbl_805AEEA0 +lbl_805AEEA0: + .incbin "baserom.dol", 0x3FB740, 0x8 +.global lbl_805AEEA8 +lbl_805AEEA8: + .incbin "baserom.dol", 0x3FB748, 0x8 +.global lbl_805AEEB0 +lbl_805AEEB0: + .incbin "baserom.dol", 0x3FB750, 0x8 +.global lbl_805AEEB8 +lbl_805AEEB8: + .incbin "baserom.dol", 0x3FB758, 0x8 +.global lbl_805AEEC0 +lbl_805AEEC0: + .incbin "baserom.dol", 0x3FB760, 0x8 +.global lbl_805AEEC8 +lbl_805AEEC8: + .incbin "baserom.dol", 0x3FB768, 0x8 +.global lbl_805AEED0 +lbl_805AEED0: + .incbin "baserom.dol", 0x3FB770, 0x8 +.global lbl_805AEED8 +lbl_805AEED8: + .incbin "baserom.dol", 0x3FB778, 0x8 +.global lbl_805AEEE0 +lbl_805AEEE0: + .incbin "baserom.dol", 0x3FB780, 0x8 +.global lbl_805AEEE8 +lbl_805AEEE8: + .incbin "baserom.dol", 0x3FB788, 0x8 +.global lbl_805AEEF0 +lbl_805AEEF0: + .incbin "baserom.dol", 0x3FB790, 0x8 +.global lbl_805AEEF8 +lbl_805AEEF8: + .incbin "baserom.dol", 0x3FB798, 0x8 +.global lbl_805AEF00 +lbl_805AEF00: + .incbin "baserom.dol", 0x3FB7A0, 0x8 +.global lbl_805AEF08 +lbl_805AEF08: + .incbin "baserom.dol", 0x3FB7A8, 0x8 +.global lbl_805AEF10 +lbl_805AEF10: + .incbin "baserom.dol", 0x3FB7B0, 0x8 +.global lbl_805AEF18 +lbl_805AEF18: + .incbin "baserom.dol", 0x3FB7B8, 0x8 +.global lbl_805AEF20 +lbl_805AEF20: + .incbin "baserom.dol", 0x3FB7C0, 0x8 +.global lbl_805AEF28 +lbl_805AEF28: + .incbin "baserom.dol", 0x3FB7C8, 0x8 +.global lbl_805AEF30 +lbl_805AEF30: + .incbin "baserom.dol", 0x3FB7D0, 0x8 +.global lbl_805AEF38 +lbl_805AEF38: + .incbin "baserom.dol", 0x3FB7D8, 0x8 +.global lbl_805AEF40 +lbl_805AEF40: + .incbin "baserom.dol", 0x3FB7E0, 0x8 +.global lbl_805AEF48 +lbl_805AEF48: + .incbin "baserom.dol", 0x3FB7E8, 0x8 +.global lbl_805AEF50 +lbl_805AEF50: + .incbin "baserom.dol", 0x3FB7F0, 0x8 +.global lbl_805AEF58 +lbl_805AEF58: + .incbin "baserom.dol", 0x3FB7F8, 0x8 +.global lbl_805AEF60 +lbl_805AEF60: + .incbin "baserom.dol", 0x3FB800, 0x8 +.global lbl_805AEF68 +lbl_805AEF68: + .incbin "baserom.dol", 0x3FB808, 0x8 +.global lbl_805AEF70 +lbl_805AEF70: + .incbin "baserom.dol", 0x3FB810, 0x8 +.global lbl_805AEF78 +lbl_805AEF78: + .incbin "baserom.dol", 0x3FB818, 0x8 +.global lbl_805AEF80 +lbl_805AEF80: + .incbin "baserom.dol", 0x3FB820, 0x8 +.global lbl_805AEF88 +lbl_805AEF88: + .incbin "baserom.dol", 0x3FB828, 0x8 +.global lbl_805AEF90 +lbl_805AEF90: + .incbin "baserom.dol", 0x3FB830, 0x8 +.global lbl_805AEF98 +lbl_805AEF98: + .incbin "baserom.dol", 0x3FB838, 0x8 +.global lbl_805AEFA0 +lbl_805AEFA0: + .incbin "baserom.dol", 0x3FB840, 0x8 +.global lbl_805AEFA8 +lbl_805AEFA8: + .incbin "baserom.dol", 0x3FB848, 0x8 +.global lbl_805AEFB0 +lbl_805AEFB0: + .incbin "baserom.dol", 0x3FB850, 0x8 +.global lbl_805AEFB8 +lbl_805AEFB8: + .incbin "baserom.dol", 0x3FB858, 0x8 +.global lbl_805AEFC0 +lbl_805AEFC0: + .incbin "baserom.dol", 0x3FB860, 0x8 +.global lbl_805AEFC8 +lbl_805AEFC8: + .incbin "baserom.dol", 0x3FB868, 0x8 +.global lbl_805AEFD0 +lbl_805AEFD0: + .incbin "baserom.dol", 0x3FB870, 0x8 +.global lbl_805AEFD8 +lbl_805AEFD8: + .incbin "baserom.dol", 0x3FB878, 0x8 +.global lbl_805AEFE0 +lbl_805AEFE0: + .incbin "baserom.dol", 0x3FB880, 0x8 +.global lbl_805AEFE8 +lbl_805AEFE8: + .incbin "baserom.dol", 0x3FB888, 0x8 +.global lbl_805AEFF0 +lbl_805AEFF0: + .incbin "baserom.dol", 0x3FB890, 0x8 +.global lbl_805AEFF8 +lbl_805AEFF8: + .incbin "baserom.dol", 0x3FB898, 0x8 +.global lbl_805AF000 +lbl_805AF000: + .incbin "baserom.dol", 0x3FB8A0, 0x8 +.global lbl_805AF008 +lbl_805AF008: + .incbin "baserom.dol", 0x3FB8A8, 0x8 +.global lbl_805AF010 +lbl_805AF010: + .incbin "baserom.dol", 0x3FB8B0, 0x8 +.global lbl_805AF018 +lbl_805AF018: + .incbin "baserom.dol", 0x3FB8B8, 0x8 +.global lbl_805AF020 +lbl_805AF020: + .incbin "baserom.dol", 0x3FB8C0, 0x8 +.global lbl_805AF028 +lbl_805AF028: + .incbin "baserom.dol", 0x3FB8C8, 0x8 +.global lbl_805AF030 +lbl_805AF030: + .incbin "baserom.dol", 0x3FB8D0, 0x8 +.global lbl_805AF038 +lbl_805AF038: + .incbin "baserom.dol", 0x3FB8D8, 0x8 +.global lbl_805AF040 +lbl_805AF040: + .incbin "baserom.dol", 0x3FB8E0, 0x8 +.global lbl_805AF048 +lbl_805AF048: + .incbin "baserom.dol", 0x3FB8E8, 0x8 +.global lbl_805AF050 +lbl_805AF050: + .incbin "baserom.dol", 0x3FB8F0, 0x8 +.global lbl_805AF058 +lbl_805AF058: + .incbin "baserom.dol", 0x3FB8F8, 0x8 +.global lbl_805AF060 +lbl_805AF060: + .incbin "baserom.dol", 0x3FB900, 0x8 +.global lbl_805AF068 +lbl_805AF068: + .incbin "baserom.dol", 0x3FB908, 0x8 +.global lbl_805AF070 +lbl_805AF070: + .incbin "baserom.dol", 0x3FB910, 0x8 +.global lbl_805AF078 +lbl_805AF078: + .incbin "baserom.dol", 0x3FB918, 0x8 +.global lbl_805AF080 +lbl_805AF080: + .incbin "baserom.dol", 0x3FB920, 0x8 +.global lbl_805AF088 +lbl_805AF088: + .incbin "baserom.dol", 0x3FB928, 0x8 +.global lbl_805AF090 +lbl_805AF090: + .incbin "baserom.dol", 0x3FB930, 0x8 +.global lbl_805AF098 +lbl_805AF098: + .incbin "baserom.dol", 0x3FB938, 0x8 +.global lbl_805AF0A0 +lbl_805AF0A0: + .incbin "baserom.dol", 0x3FB940, 0x8 +.global lbl_805AF0A8 +lbl_805AF0A8: + .incbin "baserom.dol", 0x3FB948, 0x8 +.global lbl_805AF0B0 +lbl_805AF0B0: + .incbin "baserom.dol", 0x3FB950, 0x8 +.global lbl_805AF0B8 +lbl_805AF0B8: + .incbin "baserom.dol", 0x3FB958, 0x8 +.global lbl_805AF0C0 +lbl_805AF0C0: + .incbin "baserom.dol", 0x3FB960, 0x8 +.global lbl_805AF0C8 +lbl_805AF0C8: + .incbin "baserom.dol", 0x3FB968, 0x8 +.global lbl_805AF0D0 +lbl_805AF0D0: + .incbin "baserom.dol", 0x3FB970, 0x8 +.global lbl_805AF0D8 +lbl_805AF0D8: + .incbin "baserom.dol", 0x3FB978, 0x8 +.global lbl_805AF0E0 +lbl_805AF0E0: + .incbin "baserom.dol", 0x3FB980, 0x8 +.global lbl_805AF0E8 +lbl_805AF0E8: + .incbin "baserom.dol", 0x3FB988, 0x8 +.global lbl_805AF0F0 +lbl_805AF0F0: + .incbin "baserom.dol", 0x3FB990, 0x8 +.global lbl_805AF0F8 +lbl_805AF0F8: + .incbin "baserom.dol", 0x3FB998, 0x8 +.global lbl_805AF100 +lbl_805AF100: + .incbin "baserom.dol", 0x3FB9A0, 0x8 +.global lbl_805AF108 +lbl_805AF108: + .incbin "baserom.dol", 0x3FB9A8, 0x8 +.global lbl_805AF110 +lbl_805AF110: + .incbin "baserom.dol", 0x3FB9B0, 0x8 +.global lbl_805AF118 +lbl_805AF118: + .incbin "baserom.dol", 0x3FB9B8, 0x8 +.global lbl_805AF120 +lbl_805AF120: + .incbin "baserom.dol", 0x3FB9C0, 0x8 +.global lbl_805AF128 +lbl_805AF128: + .incbin "baserom.dol", 0x3FB9C8, 0x8 +.global lbl_805AF130 +lbl_805AF130: + .incbin "baserom.dol", 0x3FB9D0, 0x8 +.global lbl_805AF138 +lbl_805AF138: + .incbin "baserom.dol", 0x3FB9D8, 0x8 +.global lbl_805AF140 +lbl_805AF140: + .incbin "baserom.dol", 0x3FB9E0, 0x8 +.global lbl_805AF148 +lbl_805AF148: + .incbin "baserom.dol", 0x3FB9E8, 0x8 +.global lbl_805AF150 +lbl_805AF150: + .incbin "baserom.dol", 0x3FB9F0, 0x8 +.global lbl_805AF158 +lbl_805AF158: + .incbin "baserom.dol", 0x3FB9F8, 0x8 +.global lbl_805AF160 +lbl_805AF160: + .incbin "baserom.dol", 0x3FBA00, 0x8 +.global lbl_805AF168 +lbl_805AF168: + .incbin "baserom.dol", 0x3FBA08, 0x8 +.global lbl_805AF170 +lbl_805AF170: + .incbin "baserom.dol", 0x3FBA10, 0x8 +.global lbl_805AF178 +lbl_805AF178: + .incbin "baserom.dol", 0x3FBA18, 0x8 +.global lbl_805AF180 +lbl_805AF180: + .incbin "baserom.dol", 0x3FBA20, 0x8 +.global lbl_805AF188 +lbl_805AF188: + .incbin "baserom.dol", 0x3FBA28, 0x8 +.global lbl_805AF190 +lbl_805AF190: + .incbin "baserom.dol", 0x3FBA30, 0x8 +.global lbl_805AF198 +lbl_805AF198: + .incbin "baserom.dol", 0x3FBA38, 0x8 +.global lbl_805AF1A0 +lbl_805AF1A0: + .incbin "baserom.dol", 0x3FBA40, 0x8 +.global lbl_805AF1A8 +lbl_805AF1A8: + .incbin "baserom.dol", 0x3FBA48, 0x8 +.global lbl_805AF1B0 +lbl_805AF1B0: + .incbin "baserom.dol", 0x3FBA50, 0x8 +.global lbl_805AF1B8 +lbl_805AF1B8: + .incbin "baserom.dol", 0x3FBA58, 0x8 +.global lbl_805AF1C0 +lbl_805AF1C0: + .incbin "baserom.dol", 0x3FBA60, 0x8 +.global lbl_805AF1C8 +lbl_805AF1C8: + .incbin "baserom.dol", 0x3FBA68, 0x8 +.global lbl_805AF1D0 +lbl_805AF1D0: + .incbin "baserom.dol", 0x3FBA70, 0x8 +.global lbl_805AF1D8 +lbl_805AF1D8: + .incbin "baserom.dol", 0x3FBA78, 0x8 +.global lbl_805AF1E0 +lbl_805AF1E0: + .incbin "baserom.dol", 0x3FBA80, 0x8 +.global lbl_805AF1E8 +lbl_805AF1E8: + .incbin "baserom.dol", 0x3FBA88, 0x8 +.global lbl_805AF1F0 +lbl_805AF1F0: + .incbin "baserom.dol", 0x3FBA90, 0x8 +.global lbl_805AF1F8 +lbl_805AF1F8: + .incbin "baserom.dol", 0x3FBA98, 0x8 +.global lbl_805AF200 +lbl_805AF200: + .incbin "baserom.dol", 0x3FBAA0, 0x8 diff --git a/asm/musyx/chorus_fx.s b/asm/musyx/chorus_fx.s index f5514a4c..c9165de3 100644 --- a/asm/musyx/chorus_fx.s +++ b/asm/musyx/chorus_fx.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .sdata2 +.global i2fMagic +i2fMagic: + .double 4.503601774854144E15 + .section .data, "wa" .global rsmpTab12khz diff --git a/asm/musyx/creverb.s b/asm/musyx/creverb.s index df9a2832..e641bbef 100644 --- a/asm/musyx/creverb.s +++ b/asm/musyx/creverb.s @@ -1,5 +1,48 @@ .include "macros.inc" +.section .sdata2 + +.global lbl_805AF3B0 +lbl_805AF3B0: + .incbin "baserom.dol", 0x3FBC50, 0x4 +.global lbl_805AF3B4 +lbl_805AF3B4: + .incbin "baserom.dol", 0x3FBC54, 0x4 +.global lbl_805AF3B8 +lbl_805AF3B8: + .incbin "baserom.dol", 0x3FBC58, 0x4 +.global lbl_805AF3BC +lbl_805AF3BC: + .incbin "baserom.dol", 0x3FBC5C, 0x4 +.global lbl_805AF3C0 +lbl_805AF3C0: + .incbin "baserom.dol", 0x3FBC60, 0x4 +.global lbl_805AF3C4 +lbl_805AF3C4: + .incbin "baserom.dol", 0x3FBC64, 0x4 +.global lbl_805AF3C8 +lbl_805AF3C8: + .incbin "baserom.dol", 0x3FBC68, 0x8 +.global lbl_805AF3D0 +lbl_805AF3D0: + .incbin "baserom.dol", 0x3FBC70, 0x4 +.global lbl_805AF3D4 +lbl_805AF3D4: + .incbin "baserom.dol", 0x3FBC74, 0x4 +.global lbl_805AF3D8 +lbl_805AF3D8: + .incbin "baserom.dol", 0x3FBC78, 0x8 +.global lbl_805AF3E0 +lbl_805AF3E0: + .incbin "baserom.dol", 0x3FBC80, 0x4 +.global lbl_805AF3E4 +lbl_805AF3E4: + .incbin "baserom.dol", 0x3FBC84, 0x4 +.global lbl_805AF3E8 +lbl_805AF3E8: + .incbin "baserom.dol", 0x3FBC88, 0x8 + + .section .data, "wa" lbl_803F6460: .4byte 0x000006FD diff --git a/asm/musyx/hardware.s b/asm/musyx/hardware.s index 603353c8..9234652a 100644 --- a/asm/musyx/hardware.s +++ b/asm/musyx/hardware.s @@ -1,5 +1,19 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AF398 +lbl_805AF398: + .incbin "baserom.dol", 0x3FBC38, 0x4 +.global lbl_805AF39C +lbl_805AF39C: + .incbin "baserom.dol", 0x3FBC3C, 0x4 +.global lbl_805AF3A0 +lbl_805AF3A0: + .incbin "baserom.dol", 0x3FBC40, 0x8 +.global lbl_805AF3A8 +lbl_805AF3A8: + .incbin "baserom.dol", 0x3FBC48, 0x8 + .section .sbss .balign 4 .global salTimeOffset diff --git a/asm/musyx/hw_volconv.s b/asm/musyx/hw_volconv.s index 21a6f608..61580971 100644 --- a/asm/musyx/hw_volconv.s +++ b/asm/musyx/hw_volconv.s @@ -1,5 +1,34 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AF2F0 +lbl_805AF2F0: + .incbin "baserom.dol", 0x3FBB90, 0x4 +.global lbl_805AF2F4 +lbl_805AF2F4: + .incbin "baserom.dol", 0x3FBB94, 0x4 +.global lbl_805AF2F8 +lbl_805AF2F8: + .incbin "baserom.dol", 0x3FBB98, 0x8 +.global lbl_805AF300 +lbl_805AF300: + .incbin "baserom.dol", 0x3FBBA0, 0x8 +.global lbl_805AF308 +lbl_805AF308: + .incbin "baserom.dol", 0x3FBBA8, 0x8 +.global lbl_805AF310 +lbl_805AF310: + .incbin "baserom.dol", 0x3FBBB0, 0x8 +.global lbl_805AF318 +lbl_805AF318: + .incbin "baserom.dol", 0x3FBBB8, 0x4 +.global lbl_805AF31C +lbl_805AF31C: + .incbin "baserom.dol", 0x3FBBBC, 0x4 +.global lbl_805AF320 +lbl_805AF320: + .incbin "baserom.dol", 0x3FBBC0, 0x8 + .section .data, "wa" .global lbl_803F3FC0 diff --git a/asm/musyx/reverb.s b/asm/musyx/reverb.s index 53857874..d468b221 100644 --- a/asm/musyx/reverb.s +++ b/asm/musyx/reverb.s @@ -1,5 +1,49 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AF3F0 +lbl_805AF3F0: + .incbin "baserom.dol", 0x3FBC90, 0x4 +.global lbl_805AF3F4 +lbl_805AF3F4: + .incbin "baserom.dol", 0x3FBC94, 0x4 +.global lbl_805AF3F8 +lbl_805AF3F8: + .incbin "baserom.dol", 0x3FBC98, 0x4 +.global lbl_805AF3FC +lbl_805AF3FC: + .incbin "baserom.dol", 0x3FBC9C, 0x4 +.global lbl_805AF400 +lbl_805AF400: + .incbin "baserom.dol", 0x3FBCA0, 0x4 +.global lbl_805AF404 +lbl_805AF404: + .incbin "baserom.dol", 0x3FBCA4, 0x4 +.global lbl_805AF408 +lbl_805AF408: + .incbin "baserom.dol", 0x3FBCA8, 0x8 +.global lbl_805AF410 +lbl_805AF410: + .incbin "baserom.dol", 0x3FBCB0, 0x4 +.global lbl_805AF414 +lbl_805AF414: + .incbin "baserom.dol", 0x3FBCB4, 0x4 +.global lbl_805AF418 +lbl_805AF418: + .incbin "baserom.dol", 0x3FBCB8, 0x8 +.global lbl_805AF420 +lbl_805AF420: + .incbin "baserom.dol", 0x3FBCC0, 0x8 +.global lbl_805AF428 +lbl_805AF428: + .incbin "baserom.dol", 0x3FBCC8, 0x4 +.global lbl_805AF42C +lbl_805AF42C: + .incbin "baserom.dol", 0x3FBCCC, 0x4 +.global lbl_805AF430 +lbl_805AF430: + .incbin "baserom.dol", 0x3FBCD0, 0x8 + .section .data, "wa" lbl_803F6470: .4byte 0x000006FD diff --git a/asm/musyx/seq.s b/asm/musyx/seq.s index 805ae33c..00b56f66 100644 --- a/asm/musyx/seq.s +++ b/asm/musyx/seq.s @@ -29,6 +29,23 @@ seqPausedRoot: seqActiveRoot: .skip 0x4 +.section .sdata2 +.global lbl_805AF210 +lbl_805AF210: + .incbin "baserom.dol", 0x3FBAB0, 0x4 +.global lbl_805AF214 +lbl_805AF214: + .incbin "baserom.dol", 0x3FBAB4, 0x4 +.global lbl_805AF218 +lbl_805AF218: + .incbin "baserom.dol", 0x3FBAB8, 0x8 +.global lbl_805AF220 +lbl_805AF220: + .incbin "baserom.dol", 0x3FBAC0, 0x8 +.global lbl_805AF228 +lbl_805AF228: + .incbin "baserom.dol", 0x3FBAC8, 0x8 + .section .data, "wa" .global lbl_803F2F88 diff --git a/asm/musyx/snd3d.s b/asm/musyx/snd3d.s index c514f5d7..628f528e 100644 --- a/asm/musyx/snd3d.s +++ b/asm/musyx/snd3d.s @@ -52,7 +52,54 @@ s3dEmitterRoot: .global s3dCallCnt s3dCallCnt: .skip 0x4 - + +.section .sdata2 +.global lbl_805AF328 +lbl_805AF328: + .incbin "baserom.dol", 0x3FBBC8, 0x8 +.global lbl_805AF330 +lbl_805AF330: + .incbin "baserom.dol", 0x3FBBD0, 0x8 +.global lbl_805AF338 +lbl_805AF338: + .incbin "baserom.dol", 0x3FBBD8, 0x4 +.global lbl_805AF33C +lbl_805AF33C: + .incbin "baserom.dol", 0x3FBBDC, 0x4 +.global lbl_805AF340 +lbl_805AF340: + .incbin "baserom.dol", 0x3FBBE0, 0x8 +.global lbl_805AF348 +lbl_805AF348: + .incbin "baserom.dol", 0x3FBBE8, 0x4 +.global lbl_805AF34C +lbl_805AF34C: + .incbin "baserom.dol", 0x3FBBEC, 0x4 +.global lbl_805AF350 +lbl_805AF350: + .incbin "baserom.dol", 0x3FBBF0, 0x8 +.global lbl_805AF358 +lbl_805AF358: + .incbin "baserom.dol", 0x3FBBF8, 0x4 +.global lbl_805AF35C +lbl_805AF35C: + .incbin "baserom.dol", 0x3FBBFC, 0x4 +.global lbl_805AF360 +lbl_805AF360: + .incbin "baserom.dol", 0x3FBC00, 0x4 +.global lbl_805AF364 +lbl_805AF364: + .incbin "baserom.dol", 0x3FBC04, 0x4 +.global lbl_805AF368 +lbl_805AF368: + .incbin "baserom.dol", 0x3FBC08, 0x4 +.global lbl_805AF36C +lbl_805AF36C: + .incbin "baserom.dol", 0x3FBC0C, 0x4 +.global lbl_805AF370 +lbl_805AF370: + .incbin "baserom.dol", 0x3FBC10, 0x8 + .section .text, "ax" .global sub_803ae800 diff --git a/asm/musyx/snd_math.s b/asm/musyx/snd_math.s index 8cfbe061..cd0d5b52 100644 --- a/asm/musyx/snd_math.s +++ b/asm/musyx/snd_math.s @@ -1,5 +1,19 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AF378 +lbl_805AF378: + .incbin "baserom.dol", 0x3FBC18, 0x8 +.global lbl_805AF380 +lbl_805AF380: + .incbin "baserom.dol", 0x3FBC20, 0x8 +.global lbl_805AF388 +lbl_805AF388: + .incbin "baserom.dol", 0x3FBC28, 0x8 +.global lbl_805AF390 +lbl_805AF390: + .incbin "baserom.dol", 0x3FBC30, 0x8 + .section .text, "ax" .global salApplyMatrix diff --git a/asm/musyx/stream.s b/asm/musyx/stream.s index a391751a..4c937a56 100644 --- a/asm/musyx/stream.s +++ b/asm/musyx/stream.s @@ -13,7 +13,18 @@ streamCallDelay: .skip 0x1 streamCallCnt: .skip 0x3 - + +.section .sdata2 +.global lbl_805AF270 +lbl_805AF270: + .incbin "baserom.dol", 0x3FBB10, 0x8 +.global lbl_805AF278 +lbl_805AF278: + .incbin "baserom.dol", 0x3FBB18, 0x8 +.global lbl_805AF280 +lbl_805AF280: + .incbin "baserom.dol", 0x3FBB20, 0x8 + .section .text, "ax" .global streamInit diff --git a/asm/musyx/synth.s b/asm/musyx/synth.s index d7fe4e13..6fac4c1a 100644 --- a/asm/musyx/synth.s +++ b/asm/musyx/synth.s @@ -1,5 +1,46 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AF230 +lbl_805AF230: + .incbin "baserom.dol", 0x3FBAD0, 0x4 +.global lbl_805AF234 +lbl_805AF234: + .incbin "baserom.dol", 0x3FBAD4, 0x4 +.global lbl_805AF238 +lbl_805AF238: + .incbin "baserom.dol", 0x3FBAD8, 0x4 +.global lbl_805AF23C +lbl_805AF23C: + .incbin "baserom.dol", 0x3FBADC, 0x4 +.global lbl_805AF240 +lbl_805AF240: + .incbin "baserom.dol", 0x3FBAE0, 0x4 +.global lbl_805AF244 +lbl_805AF244: + .incbin "baserom.dol", 0x3FBAE4, 0x4 +.global lbl_805AF248 +lbl_805AF248: + .incbin "baserom.dol", 0x3FBAE8, 0x4 +.global lbl_805AF24C +lbl_805AF24C: + .incbin "baserom.dol", 0x3FBAEC, 0x4 +.global lbl_805AF250 +lbl_805AF250: + .incbin "baserom.dol", 0x3FBAF0, 0x8 +.global lbl_805AF258 +lbl_805AF258: + .incbin "baserom.dol", 0x3FBAF8, 0x8 +.global lbl_805AF260 +lbl_805AF260: + .incbin "baserom.dol", 0x3FBB00, 0x8 +.global lbl_805AF268 +lbl_805AF268: + .incbin "baserom.dol", 0x3FBB08, 0x4 +.global lbl_805AF26C +lbl_805AF26C: + .incbin "baserom.dol", 0x3FBB0C, 0x4 + .section .bss .global synthTicksPerSecond synthTicksPerSecond: diff --git a/asm/musyx/synth_ac.s b/asm/musyx/synth_ac.s index 65ef7e4a..e9ae2fc6 100644 --- a/asm/musyx/synth_ac.s +++ b/asm/musyx/synth_ac.s @@ -1,5 +1,16 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AF2B0 +lbl_805AF2B0: + .incbin "baserom.dol", 0x3FBB50, 0x8 +.global lbl_805AF2B8 +lbl_805AF2B8: + .incbin "baserom.dol", 0x3FBB58, 0x8 +.global lbl_805AF2C0 +lbl_805AF2C0: + .incbin "baserom.dol", 0x3FBB60, 0x8 + .section .text, "ax" .global sndPitchUpOne diff --git a/asm/musyx/synth_adsr.s b/asm/musyx/synth_adsr.s index b16bc1f1..b8f856ce 100644 --- a/asm/musyx/synth_adsr.s +++ b/asm/musyx/synth_adsr.s @@ -1,5 +1,26 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805AF2C8 +lbl_805AF2C8: + .incbin "baserom.dol", 0x3FBB68, 0x8 +.global lbl_805AF2D0 +lbl_805AF2D0: + .incbin "baserom.dol", 0x3FBB70, 0x4 +.global lbl_805AF2D4 +lbl_805AF2D4: + .incbin "baserom.dol", 0x3FBB74, 0x4 +.global lbl_805AF2D8 +lbl_805AF2D8: + .incbin "baserom.dol", 0x3FBB78, 0x8 +.global lbl_805AF2E0 +lbl_805AF2E0: + .incbin "baserom.dol", 0x3FBB80, 0x8 +.global lbl_805AF2E8 +lbl_805AF2E8: + .incbin "baserom.dol", 0x3FBB88, 0x8 + + .section .text, "ax" .global adsrConvertTimeCents diff --git a/asm/musyx/synthmacros.s b/asm/musyx/synthmacros.s index 8eceafe9..8b978e9f 100644 --- a/asm/musyx/synthmacros.s +++ b/asm/musyx/synthmacros.s @@ -17,6 +17,28 @@ macActiveMacroRoot: DebugMacroSteps: .skip 0x8 +.section .sdata2 +.global lbl_805AF288 +lbl_805AF288: + .incbin "baserom.dol", 0x3FBB28, 0x4 +.global lbl_805AF28C +lbl_805AF28C: + .incbin "baserom.dol", 0x3FBB2C, 0x4 +.global lbl_805AF290 +lbl_805AF290: + .incbin "baserom.dol", 0x3FBB30, 0x8 +.global lbl_805AF298 +lbl_805AF298: + .incbin "baserom.dol", 0x3FBB38, 0x8 +.global lbl_805AF2A0 +lbl_805AF2A0: + .incbin "baserom.dol", 0x3FBB40, 0x8 +.global lbl_805AF2A8 +lbl_805AF2A8: + .incbin "baserom.dol", 0x3FBB48, 0x4 +.global lbl_805AF2AC +lbl_805AF2AC: + .incbin "baserom.dol", 0x3FBB4C, 0x4 .section .text, "ax" .global mcmdWait diff --git a/asm/sbss.s b/asm/sbss.s index b4c4bfa7..1a9171bb 100644 --- a/asm/sbss.s +++ b/asm/sbss.s @@ -1923,430 +1923,3 @@ lbl_805A96AC: .global lbl_805A96B0 lbl_805A96B0: .skip 0x8 -# -- END .TEXT -- # -.global lbl_805A96B8 -lbl_805A96B8: - .skip 0x4 -.global lbl_805A96BC -lbl_805A96BC: - .skip 0x4 -.global lbl_805A96C0 -lbl_805A96C0: - .skip 0x4 -.global lbl_805A96C4 -lbl_805A96C4: - .skip 0x4 -.global lbl_805A96C8 -lbl_805A96C8: - .skip 0x4 -.global lbl_805A96CC -lbl_805A96CC: - .skip 0x4 -.global lbl_805A96D0 -lbl_805A96D0: - .skip 0x4 -.global lbl_805A96D4 -lbl_805A96D4: - .skip 0x4 -.global lbl_805A96D8 -lbl_805A96D8: - .skip 0x4 -.global lbl_805A96DC -lbl_805A96DC: - .skip 0x4 -.global lbl_805A96E0 -lbl_805A96E0: - .skip 0x4 -.global lbl_805A96E4 -lbl_805A96E4: - .skip 0x4 -.global lbl_805A96E8 -lbl_805A96E8: - .skip 0x4 -.global lbl_805A96EC -lbl_805A96EC: - .skip 0x4 -.global lbl_805A96F0 -lbl_805A96F0: - .skip 0x4 -.global lbl_805A96F4 -lbl_805A96F4: - .skip 0x4 -.global lbl_805A96F8 -lbl_805A96F8: - .skip 0x4 -.global lbl_805A96FC -lbl_805A96FC: - .skip 0x4 -.global lbl_805A9700 -lbl_805A9700: - .skip 0x4 -.global lbl_805A9704 -lbl_805A9704: - .skip 0x4 -.global lbl_805A9708 -lbl_805A9708: - .skip 0x4 -.global lbl_805A970C -lbl_805A970C: - .skip 0x4 -.global lbl_805A9710 -lbl_805A9710: - .skip 0x4 -.global lbl_805A9714 -lbl_805A9714: - .skip 0x4 -.global lbl_805A9718 -lbl_805A9718: - .skip 0x4 -.global lbl_805A971C -lbl_805A971C: - .skip 0x4 -.global lbl_805A9720 -lbl_805A9720: - .skip 0x4 -.global lbl_805A9724 -lbl_805A9724: - .skip 0x4 -.global lbl_805A9728 -lbl_805A9728: - .skip 0x4 -.global lbl_805A972C -lbl_805A972C: - .skip 0x4 -.global lbl_805A9730 -lbl_805A9730: - .skip 0x4 -.global lbl_805A9734 -lbl_805A9734: - .skip 0x4 -.global lbl_805A9738 -lbl_805A9738: - .skip 0x4 -.global lbl_805A973C -lbl_805A973C: - .skip 0x4 -.global lbl_805A9740 -lbl_805A9740: - .skip 0x4 -.global lbl_805A9744 -lbl_805A9744: - .skip 0x4 -.global lbl_805A9748 -lbl_805A9748: - .skip 0x8 -.global lbl_805A9750 -lbl_805A9750: - .skip 0x4 -.global lbl_805A9754 -lbl_805A9754: - .skip 0x4 -.global lbl_805A9758 -lbl_805A9758: - .skip 0x4 -.global lbl_805A975C -lbl_805A975C: - .skip 0x4 -.global lbl_805A9760 -lbl_805A9760: - .skip 0x4 -.global lbl_805A9764 -lbl_805A9764: - .skip 0x4 -.global lbl_805A9768 -lbl_805A9768: - .skip 0x4 -.global lbl_805A976C -lbl_805A976C: - .skip 0x4 -.global lbl_805A9770 -lbl_805A9770: - .skip 0x4 -.global lbl_805A9774 -lbl_805A9774: - .skip 0x4 -.global lbl_805A9778 -lbl_805A9778: - .skip 0x4 -.global lbl_805A977C -lbl_805A977C: - .skip 0x4 -.global lbl_805A9780 -lbl_805A9780: - .skip 0x4 -.global lbl_805A9784 -lbl_805A9784: - .skip 0x4 -.global lbl_805A9788 -lbl_805A9788: - .skip 0x4 -.global lbl_805A978C -lbl_805A978C: - .skip 0x4 -.global lbl_805A9790 -lbl_805A9790: - .skip 0x8 -.global lbl_805A9798 -lbl_805A9798: - .skip 0x4 -.global lbl_805A979C -lbl_805A979C: - .skip 0x4 -.global lbl_805A97A0 -lbl_805A97A0: - .skip 0x4 -.global lbl_805A97A4 -lbl_805A97A4: - .skip 0x4 -.global lbl_805A97A8 -lbl_805A97A8: - .skip 0x4 -.global lbl_805A97AC -lbl_805A97AC: - .skip 0x4 -.global lbl_805A97B0 -lbl_805A97B0: - .skip 0x4 -.global lbl_805A97B4 -lbl_805A97B4: - .skip 0x4 -.global lbl_805A97B8 -lbl_805A97B8: - .skip 0x4 -.global lbl_805A97BC -lbl_805A97BC: - .skip 0x4 -.global lbl_805A97C0 -lbl_805A97C0: - .skip 0x4 -.global lbl_805A97C4 -lbl_805A97C4: - .skip 0x4 -.global lbl_805A97C8 -lbl_805A97C8: - .skip 0x8 -.global lbl_805A97D0 -lbl_805A97D0: - .skip 0x4 -.global lbl_805A97D4 -lbl_805A97D4: - .skip 0x4 -.global lbl_805A97D8 -lbl_805A97D8: - .skip 0x4 -.global lbl_805A97DC -lbl_805A97DC: - .skip 0x4 -.global lbl_805A97E0 -lbl_805A97E0: - .skip 0x4 -.global lbl_805A97E4 -lbl_805A97E4: - .skip 0x4 -.global lbl_805A97E8 -lbl_805A97E8: - .skip 0x4 -.global lbl_805A97EC -lbl_805A97EC: - .skip 0x4 -.global lbl_805A97F0 -lbl_805A97F0: - .skip 0x4 -.global lbl_805A97F4 -lbl_805A97F4: - .skip 0x4 -.global lbl_805A97F8 -lbl_805A97F8: - .skip 0x4 -.global lbl_805A97FC -lbl_805A97FC: - .skip 0x4 -.global lbl_805A9800 -lbl_805A9800: - .skip 0x4 -.global lbl_805A9804 -lbl_805A9804: - .skip 0x4 -.global lbl_805A9808 -lbl_805A9808: - .skip 0x4 -.global lbl_805A980C -lbl_805A980C: - .skip 0x4 -.global lbl_805A9810 -lbl_805A9810: - .skip 0x4 -.global lbl_805A9814 -lbl_805A9814: - .skip 0x4 -.global lbl_805A9818 -lbl_805A9818: - .skip 0x8 -.global lbl_805A9820 -lbl_805A9820: - .skip 0x8 -.global lbl_805A9828 -lbl_805A9828: - .skip 0x4 -.global lbl_805A982C -lbl_805A982C: - .skip 0x4 -.global lbl_805A9830 -lbl_805A9830: - .skip 0x8 -.global lbl_805A9838 -lbl_805A9838: - .skip 0x4 -.global lbl_805A983C -lbl_805A983C: - .skip 0x4 -.global lbl_805A9840 -lbl_805A9840: - .skip 0x4 -.global lbl_805A9844 -lbl_805A9844: - .skip 0x4 -.global lbl_805A9848 -lbl_805A9848: - .skip 0x4 -.global lbl_805A984C -lbl_805A984C: - .skip 0x4 -.global lbl_805A9850 -lbl_805A9850: - .skip 0x4 -.global lbl_805A9854 -lbl_805A9854: - .skip 0x4 -.global lbl_805A9858 -lbl_805A9858: - .skip 0x4 -.global lbl_805A985C -lbl_805A985C: - .skip 0x4 -.global lbl_805A9860 -lbl_805A9860: - .skip 0x4 -.global lbl_805A9864 -lbl_805A9864: - .skip 0x4 -.global lbl_805A9868 -lbl_805A9868: - .skip 0x4 -.global lbl_805A986C -lbl_805A986C: - .skip 0x4 -.global lbl_805A9870 -lbl_805A9870: - .skip 0x4 -.global lbl_805A9874 -lbl_805A9874: - .skip 0xC -.global lbl_805A9880 -lbl_805A9880: - .skip 0x4 -.global lbl_805A9884 -lbl_805A9884: - .skip 0x4 -.global lbl_805A9888 -lbl_805A9888: - .skip 0x4 -.global lbl_805A988C -lbl_805A988C: - .skip 0x4 -.global AreWeInitialized -AreWeInitialized: - .skip 0x4 -.global lbl_805A9894 -lbl_805A9894: - .skip 0x4 -.global lbl_805A9898 -lbl_805A9898: - .skip 0x4 -.global lbl_805A989C -lbl_805A989C: - .skip 0x4 -.global lbl_805A98A0 -lbl_805A98A0: - .skip 0x8 -.global lbl_805A98A8 -lbl_805A98A8: - .skip 0x4 -.global lbl_805A98AC -lbl_805A98AC: - .skip 0x4 -.global lbl_805A98B0 -lbl_805A98B0: - .skip 0x8 -.global lbl_805A98B8 -lbl_805A98B8: - .skip 0x8 -.global lbl_805A98C0 -lbl_805A98C0: - .skip 0x4 -.global lbl_805A98C4 -lbl_805A98C4: - .skip 0x4 -.global lbl_805A98C8 -lbl_805A98C8: - .skip 0x4 -.global lbl_805A98CC -lbl_805A98CC: - .skip 0x4 -.global lbl_805A98D0 -lbl_805A98D0: - .skip 0x4 -.global lbl_805A98D4 -lbl_805A98D4: - .skip 0x4 -.global lbl_805A98D8 -lbl_805A98D8: - .skip 0x8 -.global lbl_805A98E0 -lbl_805A98E0: - .skip 0x4 -.global lbl_805A98E4 -lbl_805A98E4: - .skip 0x4 -.global lbl_805A98E8 -lbl_805A98E8: - .skip 0x4 -.global lbl_805A98EC -lbl_805A98EC: - .skip 0x4 -.global lbl_805A98F0 -lbl_805A98F0: - .skip 0x8 -.global lbl_805A98F8 -lbl_805A98F8: - .skip 0x8 -.global lbl_805A9900 -lbl_805A9900: - .skip 0x4 -.global lbl_805A9904 -lbl_805A9904: - .skip 0x4 -.global lbl_805A9908 -lbl_805A9908: - .skip 0x8 -.global lbl_805A9910 -lbl_805A9910: - .skip 0x4 -.global lbl_805A9914 -lbl_805A9914: - .skip 0x4 -.global lbl_805A9918 -lbl_805A9918: - .skip 0x4 -.global lbl_805A991C -lbl_805A991C: - .skip 0x4 -.global lbl_805A9920 -lbl_805A9920: - .skip 0x4 -.global lbl_805A9924 -lbl_805A9924: - .skip 0x4 -.global lbl_805A9928 -lbl_805A9928: - .skip 0x8 diff --git a/asm/sdata.s b/asm/sdata.s index f8111210..d650dc2a 100644 --- a/asm/sdata.s +++ b/asm/sdata.s @@ -5594,177 +5594,3 @@ lbl_805A8A5D: .global lbl_805A8A60 lbl_805A8A60: .incbin "baserom.dol", 0x3F6400, 0x8 -# -- END .TEXT -- # -.global lbl_805A8A68 -lbl_805A8A68: - .incbin "baserom.dol", 0x3F6408, 0x8 -.global lbl_805A8A70 -lbl_805A8A70: - .incbin "baserom.dol", 0x3F6410, 0x8 -.global lbl_805A8A78 -lbl_805A8A78: - .incbin "baserom.dol", 0x3F6418, 0x8 -.global lbl_805A8A80 -lbl_805A8A80: - .incbin "baserom.dol", 0x3F6420, 0x8 -.global lbl_805A8A88 -lbl_805A8A88: - .incbin "baserom.dol", 0x3F6428, 0x8 -.global lbl_805A8A90 -lbl_805A8A90: - .incbin "baserom.dol", 0x3F6430, 0x8 -.global lbl_805A8A98 -lbl_805A8A98: - .incbin "baserom.dol", 0x3F6438, 0x4 -.global lbl_805A8A9C -lbl_805A8A9C: - .incbin "baserom.dol", 0x3F643C, 0x4 -.global lbl_805A8AA0 -lbl_805A8AA0: - .incbin "baserom.dol", 0x3F6440, 0x4 -.global lbl_805A8AA4 -lbl_805A8AA4: - .incbin "baserom.dol", 0x3F6444, 0x8 -.global lbl_805A8AAC -lbl_805A8AAC: - .incbin "baserom.dol", 0x3F644C, 0x4 -.global lbl_805A8AB0 -lbl_805A8AB0: - .incbin "baserom.dol", 0x3F6450, 0x4 -.global lbl_805A8AB4 -lbl_805A8AB4: - .incbin "baserom.dol", 0x3F6454, 0x4 -.global lbl_805A8AB8 -lbl_805A8AB8: - .incbin "baserom.dol", 0x3F6458, 0x4 -.global lbl_805A8ABC -lbl_805A8ABC: - .incbin "baserom.dol", 0x3F645C, 0x4 -.global lbl_805A8AC0 -lbl_805A8AC0: - .incbin "baserom.dol", 0x3F6460, 0x8 -.global lbl_805A8AC8 -lbl_805A8AC8: - .incbin "baserom.dol", 0x3F6468, 0x8 -.global lbl_805A8AD0 -lbl_805A8AD0: - .incbin "baserom.dol", 0x3F6470, 0x4 -.global lbl_805A8AD4 -lbl_805A8AD4: - .incbin "baserom.dol", 0x3F6474, 0x4 -.global lbl_805A8AD8 -lbl_805A8AD8: - .incbin "baserom.dol", 0x3F6478, 0x8 -.global lbl_805A8AE0 -lbl_805A8AE0: - .incbin "baserom.dol", 0x3F6480, 0x8 -.global lbl_805A8AE8 -lbl_805A8AE8: - .incbin "baserom.dol", 0x3F6488, 0x8 -.global lbl_805A8AF0 -lbl_805A8AF0: - .incbin "baserom.dol", 0x3F6490, 0x8 -.global lbl_805A8AF8 -lbl_805A8AF8: - .incbin "baserom.dol", 0x3F6498, 0x8 -.global lbl_805A8B00 -lbl_805A8B00: - .incbin "baserom.dol", 0x3F64A0, 0x8 -.global lbl_805A8B08 -lbl_805A8B08: - .incbin "baserom.dol", 0x3F64A8, 0x8 -.global lbl_805A8B10 -lbl_805A8B10: - .incbin "baserom.dol", 0x3F64B0, 0x8 -.global lbl_805A8B18 -lbl_805A8B18: - .incbin "baserom.dol", 0x3F64B8, 0x8 -.global lbl_805A8B20 -lbl_805A8B20: - .incbin "baserom.dol", 0x3F64C0, 0x8 -.global lbl_805A8B28 -lbl_805A8B28: - .incbin "baserom.dol", 0x3F64C8, 0x4 -.global lbl_805A8B2C -lbl_805A8B2C: - .incbin "baserom.dol", 0x3F64CC, 0x4 -.global lbl_805A8B30 -lbl_805A8B30: - .incbin "baserom.dol", 0x3F64D0, 0x8 -.global lbl_805A8B38 -lbl_805A8B38: - .incbin "baserom.dol", 0x3F64D8, 0x4 -.global lbl_805A8B3C -lbl_805A8B3C: - .incbin "baserom.dol", 0x3F64DC, 0x4 -.global lbl_805A8B40 -lbl_805A8B40: - .incbin "baserom.dol", 0x3F64E0, 0x8 -.global lbl_805A8B48 -lbl_805A8B48: - .incbin "baserom.dol", 0x3F64E8, 0x8 -.global lbl_805A8B50 -lbl_805A8B50: - .incbin "baserom.dol", 0x3F64F0, 0x8 -.global lbl_805A8B58 -lbl_805A8B58: - .incbin "baserom.dol", 0x3F64F8, 0x4 -.global lbl_805A8B5C -lbl_805A8B5C: - .incbin "baserom.dol", 0x3F64FC, 0x4 -.global lbl_805A8B60 -lbl_805A8B60: - .incbin "baserom.dol", 0x3F6500, 0x4 -.global lbl_805A8B64 -lbl_805A8B64: - .incbin "baserom.dol", 0x3F6504, 0x4 -.global lbl_805A8B68 -lbl_805A8B68: - .incbin "baserom.dol", 0x3F6508, 0x4 -.global lbl_805A8B6C -lbl_805A8B6C: - .incbin "baserom.dol", 0x3F650C, 0x4 -.global lbl_805A8B70 -lbl_805A8B70: - .incbin "baserom.dol", 0x3F6510, 0x4 -.global lbl_805A8B74 -lbl_805A8B74: - .incbin "baserom.dol", 0x3F6514, 0x4 -.global lbl_805A8B78 -lbl_805A8B78: - .incbin "baserom.dol", 0x3F6518, 0x4 -.global lbl_805A8B7C -lbl_805A8B7C: - .incbin "baserom.dol", 0x3F651C, 0xC -.global lbl_805A8B88 -lbl_805A8B88: - .incbin "baserom.dol", 0x3F6528, 0x8 -.global lbl_805A8B90 -lbl_805A8B90: - .incbin "baserom.dol", 0x3F6530, 0x8 -.global lbl_805A8B98 -lbl_805A8B98: - .incbin "baserom.dol", 0x3F6538, 0x8 -.global lbl_805A8BA0 -lbl_805A8BA0: - .incbin "baserom.dol", 0x3F6540, 0x4 -.global lbl_805A8BA4 -lbl_805A8BA4: - .incbin "baserom.dol", 0x3F6544, 0x4 -.global lbl_805A8BA8 -lbl_805A8BA8: - .incbin "baserom.dol", 0x3F6548, 0x8 -.global lbl_805A8BB0 -lbl_805A8BB0: - .incbin "baserom.dol", 0x3F6550, 0x8 -.global lbl_805A8BB8 -lbl_805A8BB8: - .incbin "baserom.dol", 0x3F6558, 0x8 -.global lbl_805A8BC0 -lbl_805A8BC0: - .incbin "baserom.dol", 0x3F6560, 0x8 -.global lbl_805A8BC8 -lbl_805A8BC8: - .incbin "baserom.dol", 0x3F6568, 0x8 - - diff --git a/asm/sdata2.s b/asm/sdata2.s index a700d44d..e8265f88 100644 --- a/asm/sdata2.s +++ b/asm/sdata2.s @@ -12998,1040 +12998,3 @@ lbl_805AEB18: .global lbl_805AEB1C lbl_805AEB1C: .incbin "baserom.dol", 0x3FB3BC, 0x4 -#-- END .TEXT --# -.global lbl_805AEB20 -lbl_805AEB20: - .incbin "baserom.dol", 0x3FB3C0, 0x4 -.global lbl_805AEB24 -lbl_805AEB24: - .incbin "baserom.dol", 0x3FB3C4, 0x4 -.global lbl_805AEB28 -lbl_805AEB28: - .incbin "baserom.dol", 0x3FB3C8, 0x4 -.global lbl_805AEB2C -lbl_805AEB2C: - .incbin "baserom.dol", 0x3FB3CC, 0x4 -.global lbl_805AEB30 -lbl_805AEB30: - .incbin "baserom.dol", 0x3FB3D0, 0x4 -.global lbl_805AEB34 -lbl_805AEB34: - .incbin "baserom.dol", 0x3FB3D4, 0x4 -.global lbl_805AEB38 -lbl_805AEB38: - .incbin "baserom.dol", 0x3FB3D8, 0x4 -.global lbl_805AEB3C -lbl_805AEB3C: - .incbin "baserom.dol", 0x3FB3DC, 0x4 -.global lbl_805AEB40 -lbl_805AEB40: - .incbin "baserom.dol", 0x3FB3E0, 0x8 -.global lbl_805AEB48 -lbl_805AEB48: - .incbin "baserom.dol", 0x3FB3E8, 0x8 -.global lbl_805AEB50 -lbl_805AEB50: - .incbin "baserom.dol", 0x3FB3F0, 0x8 -.global lbl_805AEB58 -lbl_805AEB58: - .incbin "baserom.dol", 0x3FB3F8, 0x4 -.global lbl_805AEB5C -lbl_805AEB5C: - .incbin "baserom.dol", 0x3FB3FC, 0x4 -.global lbl_805AEB60 -lbl_805AEB60: - .incbin "baserom.dol", 0x3FB400, 0x4 -.global lbl_805AEB64 -lbl_805AEB64: - .incbin "baserom.dol", 0x3FB404, 0x4 -.global lbl_805AEB68 -lbl_805AEB68: - .incbin "baserom.dol", 0x3FB408, 0x4 -.global lbl_805AEB6C -lbl_805AEB6C: - .incbin "baserom.dol", 0x3FB40C, 0x4 -.global lbl_805AEB70 -lbl_805AEB70: - .incbin "baserom.dol", 0x3FB410, 0x4 -.global lbl_805AEB74 -lbl_805AEB74: - .incbin "baserom.dol", 0x3FB414, 0x4 -.global lbl_805AEB78 -lbl_805AEB78: - .incbin "baserom.dol", 0x3FB418, 0x4 -.global lbl_805AEB7C -lbl_805AEB7C: - .incbin "baserom.dol", 0x3FB41C, 0x4 -.global lbl_805AEB80 -lbl_805AEB80: - .incbin "baserom.dol", 0x3FB420, 0x8 -.global lbl_805AEB88 -lbl_805AEB88: - .incbin "baserom.dol", 0x3FB428, 0x8 -.global lbl_805AEB90 -lbl_805AEB90: - .incbin "baserom.dol", 0x3FB430, 0x8 -.global lbl_805AEB98 -lbl_805AEB98: - .incbin "baserom.dol", 0x3FB438, 0x4 -.global lbl_805AEB9C -lbl_805AEB9C: - .incbin "baserom.dol", 0x3FB43C, 0x4 -.global lbl_805AEBA0 -lbl_805AEBA0: - .incbin "baserom.dol", 0x3FB440, 0x4 -.global lbl_805AEBA4 -lbl_805AEBA4: - .incbin "baserom.dol", 0x3FB444, 0x4 -.global lbl_805AEBA8 -lbl_805AEBA8: - .incbin "baserom.dol", 0x3FB448, 0x4 -.global lbl_805AEBAC -lbl_805AEBAC: - .incbin "baserom.dol", 0x3FB44C, 0x4 -.global lbl_805AEBB0 -lbl_805AEBB0: - .incbin "baserom.dol", 0x3FB450, 0x8 -.global lbl_805AEBB8 -lbl_805AEBB8: - .incbin "baserom.dol", 0x3FB458, 0x4 -.global lbl_805AEBBC -lbl_805AEBBC: - .incbin "baserom.dol", 0x3FB45C, 0x4 -.global lbl_805AEBC0 -lbl_805AEBC0: - .incbin "baserom.dol", 0x3FB460, 0x8 -.global lbl_805AEBC8 -lbl_805AEBC8: - .incbin "baserom.dol", 0x3FB468, 0x8 -.global lbl_805AEBD0 -lbl_805AEBD0: - .incbin "baserom.dol", 0x3FB470, 0x8 -.global lbl_805AEBD8 -lbl_805AEBD8: - .incbin "baserom.dol", 0x3FB478, 0x8 -.global lbl_805AEBE0 -lbl_805AEBE0: - .incbin "baserom.dol", 0x3FB480, 0x8 -.global lbl_805AEBE8 -lbl_805AEBE8: - .incbin "baserom.dol", 0x3FB488, 0x4 -.global lbl_805AEBEC -lbl_805AEBEC: - .incbin "baserom.dol", 0x3FB48C, 0x4 -.global lbl_805AEBF0 -lbl_805AEBF0: - .incbin "baserom.dol", 0x3FB490, 0x8 -.global lbl_805AEBF8 -lbl_805AEBF8: - .incbin "baserom.dol", 0x3FB498, 0x4 -.global lbl_805AEBFC -lbl_805AEBFC: - .incbin "baserom.dol", 0x3FB49C, 0x4 -.global lbl_805AEC00 -lbl_805AEC00: - .incbin "baserom.dol", 0x3FB4A0, 0x4 -.global lbl_805AEC04 -lbl_805AEC04: - .incbin "baserom.dol", 0x3FB4A4, 0x4 -.global lbl_805AEC08 -lbl_805AEC08: - .incbin "baserom.dol", 0x3FB4A8, 0x4 -.global lbl_805AEC0C -lbl_805AEC0C: - .incbin "baserom.dol", 0x3FB4AC, 0x4 -.global lbl_805AEC10 -lbl_805AEC10: - .incbin "baserom.dol", 0x3FB4B0, 0x4 -.global lbl_805AEC14 -lbl_805AEC14: - .incbin "baserom.dol", 0x3FB4B4, 0x4 -.global lbl_805AEC18 -lbl_805AEC18: - .incbin "baserom.dol", 0x3FB4B8, 0x4 -.global lbl_805AEC1C -lbl_805AEC1C: - .incbin "baserom.dol", 0x3FB4BC, 0x4 -.global lbl_805AEC20 -lbl_805AEC20: - .incbin "baserom.dol", 0x3FB4C0, 0x4 -.global lbl_805AEC24 -lbl_805AEC24: - .incbin "baserom.dol", 0x3FB4C4, 0x4 -.global lbl_805AEC28 -lbl_805AEC28: - .incbin "baserom.dol", 0x3FB4C8, 0x4 -.global lbl_805AEC2C -lbl_805AEC2C: - .incbin "baserom.dol", 0x3FB4CC, 0x4 -.global lbl_805AEC30 -lbl_805AEC30: - .incbin "baserom.dol", 0x3FB4D0, 0x4 -.global lbl_805AEC34 -lbl_805AEC34: - .incbin "baserom.dol", 0x3FB4D4, 0x4 -.global lbl_805AEC38 -lbl_805AEC38: - .incbin "baserom.dol", 0x3FB4D8, 0x4 -.global lbl_805AEC3C -lbl_805AEC3C: - .incbin "baserom.dol", 0x3FB4DC, 0x4 -.global lbl_805AEC40 -lbl_805AEC40: - .incbin "baserom.dol", 0x3FB4E0, 0x4 -.global lbl_805AEC44 -lbl_805AEC44: - .incbin "baserom.dol", 0x3FB4E4, 0x4 -.global lbl_805AEC48 -lbl_805AEC48: - .incbin "baserom.dol", 0x3FB4E8, 0x8 -.global lbl_805AEC50 -lbl_805AEC50: - .incbin "baserom.dol", 0x3FB4F0, 0x8 -.global lbl_805AEC58 -lbl_805AEC58: - .incbin "baserom.dol", 0x3FB4F8, 0x4 -.global lbl_805AEC5C -lbl_805AEC5C: - .incbin "baserom.dol", 0x3FB4FC, 0x4 -.global lbl_805AEC60 -lbl_805AEC60: - .incbin "baserom.dol", 0x3FB500, 0x8 -.global lbl_805AEC68 -lbl_805AEC68: - .incbin "baserom.dol", 0x3FB508, 0x8 -.global lbl_805AEC70 -lbl_805AEC70: - .incbin "baserom.dol", 0x3FB510, 0x8 -.global lbl_805AEC78 -lbl_805AEC78: - .incbin "baserom.dol", 0x3FB518, 0x8 -.global lbl_805AEC80 -lbl_805AEC80: - .incbin "baserom.dol", 0x3FB520, 0x8 -.global lbl_805AEC88 -lbl_805AEC88: - .incbin "baserom.dol", 0x3FB528, 0x8 -.global lbl_805AEC90 -lbl_805AEC90: - .incbin "baserom.dol", 0x3FB530, 0x8 -.global lbl_805AEC98 -lbl_805AEC98: - .incbin "baserom.dol", 0x3FB538, 0x8 -.global lbl_805AECA0 -lbl_805AECA0: - .incbin "baserom.dol", 0x3FB540, 0x4 -.global lbl_805AECA4 -lbl_805AECA4: - .incbin "baserom.dol", 0x3FB544, 0x4 -.global lbl_805AECA8 -lbl_805AECA8: - .incbin "baserom.dol", 0x3FB548, 0x8 -.global lbl_805AECB0 -lbl_805AECB0: - .incbin "baserom.dol", 0x3FB550, 0x8 -.global lbl_805AECB8 -lbl_805AECB8: - .incbin "baserom.dol", 0x3FB558, 0x8 -.global lbl_805AECC0 -lbl_805AECC0: - .incbin "baserom.dol", 0x3FB560, 0x8 -.global lbl_805AECC8 -lbl_805AECC8: - .incbin "baserom.dol", 0x3FB568, 0x8 -.global lbl_805AECD0 -lbl_805AECD0: - .incbin "baserom.dol", 0x3FB570, 0x8 -.global lbl_805AECD8 -lbl_805AECD8: - .incbin "baserom.dol", 0x3FB578, 0x8 -.global lbl_805AECE0 -lbl_805AECE0: - .incbin "baserom.dol", 0x3FB580, 0x8 -.global lbl_805AECE8 -lbl_805AECE8: - .incbin "baserom.dol", 0x3FB588, 0x8 -.global lbl_805AECF0 -lbl_805AECF0: - .incbin "baserom.dol", 0x3FB590, 0x8 -.global lbl_805AECF8 -lbl_805AECF8: - .incbin "baserom.dol", 0x3FB598, 0x8 -.global lbl_805AED00 -lbl_805AED00: - .incbin "baserom.dol", 0x3FB5A0, 0x8 -.global lbl_805AED08 -lbl_805AED08: - .incbin "baserom.dol", 0x3FB5A8, 0x8 -.global lbl_805AED10 -lbl_805AED10: - .incbin "baserom.dol", 0x3FB5B0, 0x8 -.global lbl_805AED18 -lbl_805AED18: - .incbin "baserom.dol", 0x3FB5B8, 0x8 -.global lbl_805AED20 -lbl_805AED20: - .incbin "baserom.dol", 0x3FB5C0, 0x8 -.global lbl_805AED28 -lbl_805AED28: - .incbin "baserom.dol", 0x3FB5C8, 0x8 -.global lbl_805AED30 -lbl_805AED30: - .incbin "baserom.dol", 0x3FB5D0, 0x8 -.global lbl_805AED38 -lbl_805AED38: - .incbin "baserom.dol", 0x3FB5D8, 0x8 -.global lbl_805AED40 -lbl_805AED40: - .incbin "baserom.dol", 0x3FB5E0, 0x8 -.global lbl_805AED48 -lbl_805AED48: - .incbin "baserom.dol", 0x3FB5E8, 0x8 -.global lbl_805AED50 -lbl_805AED50: - .incbin "baserom.dol", 0x3FB5F0, 0x8 -.global lbl_805AED58 -lbl_805AED58: - .incbin "baserom.dol", 0x3FB5F8, 0x8 -.global lbl_805AED60 -lbl_805AED60: - .incbin "baserom.dol", 0x3FB600, 0x8 -.global lbl_805AED68 -lbl_805AED68: - .incbin "baserom.dol", 0x3FB608, 0x8 -.global lbl_805AED70 -lbl_805AED70: - .incbin "baserom.dol", 0x3FB610, 0x8 -.global lbl_805AED78 -lbl_805AED78: - .incbin "baserom.dol", 0x3FB618, 0x8 -.global lbl_805AED80 -lbl_805AED80: - .incbin "baserom.dol", 0x3FB620, 0x8 -.global lbl_805AED88 -lbl_805AED88: - .incbin "baserom.dol", 0x3FB628, 0x8 -.global lbl_805AED90 -lbl_805AED90: - .incbin "baserom.dol", 0x3FB630, 0x8 -.global lbl_805AED98 -lbl_805AED98: - .incbin "baserom.dol", 0x3FB638, 0x8 -.global lbl_805AEDA0 -lbl_805AEDA0: - .incbin "baserom.dol", 0x3FB640, 0x8 -.global lbl_805AEDA8 -lbl_805AEDA8: - .incbin "baserom.dol", 0x3FB648, 0x8 -.global lbl_805AEDB0 -lbl_805AEDB0: - .incbin "baserom.dol", 0x3FB650, 0x8 -.global lbl_805AEDB8 -lbl_805AEDB8: - .incbin "baserom.dol", 0x3FB658, 0x8 -.global lbl_805AEDC0 -lbl_805AEDC0: - .incbin "baserom.dol", 0x3FB660, 0x8 -.global lbl_805AEDC8 -lbl_805AEDC8: - .incbin "baserom.dol", 0x3FB668, 0x8 -.global lbl_805AEDD0 -lbl_805AEDD0: - .incbin "baserom.dol", 0x3FB670, 0x8 -.global lbl_805AEDD8 -lbl_805AEDD8: - .incbin "baserom.dol", 0x3FB678, 0x8 -.global lbl_805AEDE0 -lbl_805AEDE0: - .incbin "baserom.dol", 0x3FB680, 0x8 -.global lbl_805AEDE8 -lbl_805AEDE8: - .incbin "baserom.dol", 0x3FB688, 0x8 -.global lbl_805AEDF0 -lbl_805AEDF0: - .incbin "baserom.dol", 0x3FB690, 0x8 -.global lbl_805AEDF8 -lbl_805AEDF8: - .incbin "baserom.dol", 0x3FB698, 0x8 -.global lbl_805AEE00 -lbl_805AEE00: - .incbin "baserom.dol", 0x3FB6A0, 0x8 -.global lbl_805AEE08 -lbl_805AEE08: - .incbin "baserom.dol", 0x3FB6A8, 0x8 -.global lbl_805AEE10 -lbl_805AEE10: - .incbin "baserom.dol", 0x3FB6B0, 0x8 -.global lbl_805AEE18 -lbl_805AEE18: - .incbin "baserom.dol", 0x3FB6B8, 0x8 -.global lbl_805AEE20 -lbl_805AEE20: - .incbin "baserom.dol", 0x3FB6C0, 0x8 -.global lbl_805AEE28 -lbl_805AEE28: - .incbin "baserom.dol", 0x3FB6C8, 0x8 -.global lbl_805AEE30 -lbl_805AEE30: - .incbin "baserom.dol", 0x3FB6D0, 0x8 -.global lbl_805AEE38 -lbl_805AEE38: - .incbin "baserom.dol", 0x3FB6D8, 0x8 -.global lbl_805AEE40 -lbl_805AEE40: - .incbin "baserom.dol", 0x3FB6E0, 0x8 -.global lbl_805AEE48 -lbl_805AEE48: - .incbin "baserom.dol", 0x3FB6E8, 0x8 -.global lbl_805AEE50 -lbl_805AEE50: - .incbin "baserom.dol", 0x3FB6F0, 0x8 -.global lbl_805AEE58 -lbl_805AEE58: - .incbin "baserom.dol", 0x3FB6F8, 0x8 -.global lbl_805AEE60 -lbl_805AEE60: - .incbin "baserom.dol", 0x3FB700, 0x8 -.global lbl_805AEE68 -lbl_805AEE68: - .incbin "baserom.dol", 0x3FB708, 0x8 -.global lbl_805AEE70 -lbl_805AEE70: - .incbin "baserom.dol", 0x3FB710, 0x8 -.global lbl_805AEE78 -lbl_805AEE78: - .incbin "baserom.dol", 0x3FB718, 0x8 -.global lbl_805AEE80 -lbl_805AEE80: - .incbin "baserom.dol", 0x3FB720, 0x8 -.global lbl_805AEE88 -lbl_805AEE88: - .incbin "baserom.dol", 0x3FB728, 0x8 -.global lbl_805AEE90 -lbl_805AEE90: - .incbin "baserom.dol", 0x3FB730, 0x8 -.global lbl_805AEE98 -lbl_805AEE98: - .incbin "baserom.dol", 0x3FB738, 0x8 -.global lbl_805AEEA0 -lbl_805AEEA0: - .incbin "baserom.dol", 0x3FB740, 0x8 -.global lbl_805AEEA8 -lbl_805AEEA8: - .incbin "baserom.dol", 0x3FB748, 0x8 -.global lbl_805AEEB0 -lbl_805AEEB0: - .incbin "baserom.dol", 0x3FB750, 0x8 -.global lbl_805AEEB8 -lbl_805AEEB8: - .incbin "baserom.dol", 0x3FB758, 0x8 -.global lbl_805AEEC0 -lbl_805AEEC0: - .incbin "baserom.dol", 0x3FB760, 0x8 -.global lbl_805AEEC8 -lbl_805AEEC8: - .incbin "baserom.dol", 0x3FB768, 0x8 -.global lbl_805AEED0 -lbl_805AEED0: - .incbin "baserom.dol", 0x3FB770, 0x8 -.global lbl_805AEED8 -lbl_805AEED8: - .incbin "baserom.dol", 0x3FB778, 0x8 -.global lbl_805AEEE0 -lbl_805AEEE0: - .incbin "baserom.dol", 0x3FB780, 0x8 -.global lbl_805AEEE8 -lbl_805AEEE8: - .incbin "baserom.dol", 0x3FB788, 0x8 -.global lbl_805AEEF0 -lbl_805AEEF0: - .incbin "baserom.dol", 0x3FB790, 0x8 -.global lbl_805AEEF8 -lbl_805AEEF8: - .incbin "baserom.dol", 0x3FB798, 0x8 -.global lbl_805AEF00 -lbl_805AEF00: - .incbin "baserom.dol", 0x3FB7A0, 0x8 -.global lbl_805AEF08 -lbl_805AEF08: - .incbin "baserom.dol", 0x3FB7A8, 0x8 -.global lbl_805AEF10 -lbl_805AEF10: - .incbin "baserom.dol", 0x3FB7B0, 0x8 -.global lbl_805AEF18 -lbl_805AEF18: - .incbin "baserom.dol", 0x3FB7B8, 0x8 -.global lbl_805AEF20 -lbl_805AEF20: - .incbin "baserom.dol", 0x3FB7C0, 0x8 -.global lbl_805AEF28 -lbl_805AEF28: - .incbin "baserom.dol", 0x3FB7C8, 0x8 -.global lbl_805AEF30 -lbl_805AEF30: - .incbin "baserom.dol", 0x3FB7D0, 0x8 -.global lbl_805AEF38 -lbl_805AEF38: - .incbin "baserom.dol", 0x3FB7D8, 0x8 -.global lbl_805AEF40 -lbl_805AEF40: - .incbin "baserom.dol", 0x3FB7E0, 0x8 -.global lbl_805AEF48 -lbl_805AEF48: - .incbin "baserom.dol", 0x3FB7E8, 0x8 -.global lbl_805AEF50 -lbl_805AEF50: - .incbin "baserom.dol", 0x3FB7F0, 0x8 -.global lbl_805AEF58 -lbl_805AEF58: - .incbin "baserom.dol", 0x3FB7F8, 0x8 -.global lbl_805AEF60 -lbl_805AEF60: - .incbin "baserom.dol", 0x3FB800, 0x8 -.global lbl_805AEF68 -lbl_805AEF68: - .incbin "baserom.dol", 0x3FB808, 0x8 -.global lbl_805AEF70 -lbl_805AEF70: - .incbin "baserom.dol", 0x3FB810, 0x8 -.global lbl_805AEF78 -lbl_805AEF78: - .incbin "baserom.dol", 0x3FB818, 0x8 -.global lbl_805AEF80 -lbl_805AEF80: - .incbin "baserom.dol", 0x3FB820, 0x8 -.global lbl_805AEF88 -lbl_805AEF88: - .incbin "baserom.dol", 0x3FB828, 0x8 -.global lbl_805AEF90 -lbl_805AEF90: - .incbin "baserom.dol", 0x3FB830, 0x8 -.global lbl_805AEF98 -lbl_805AEF98: - .incbin "baserom.dol", 0x3FB838, 0x8 -.global lbl_805AEFA0 -lbl_805AEFA0: - .incbin "baserom.dol", 0x3FB840, 0x8 -.global lbl_805AEFA8 -lbl_805AEFA8: - .incbin "baserom.dol", 0x3FB848, 0x8 -.global lbl_805AEFB0 -lbl_805AEFB0: - .incbin "baserom.dol", 0x3FB850, 0x8 -.global lbl_805AEFB8 -lbl_805AEFB8: - .incbin "baserom.dol", 0x3FB858, 0x8 -.global lbl_805AEFC0 -lbl_805AEFC0: - .incbin "baserom.dol", 0x3FB860, 0x8 -.global lbl_805AEFC8 -lbl_805AEFC8: - .incbin "baserom.dol", 0x3FB868, 0x8 -.global lbl_805AEFD0 -lbl_805AEFD0: - .incbin "baserom.dol", 0x3FB870, 0x8 -.global lbl_805AEFD8 -lbl_805AEFD8: - .incbin "baserom.dol", 0x3FB878, 0x8 -.global lbl_805AEFE0 -lbl_805AEFE0: - .incbin "baserom.dol", 0x3FB880, 0x8 -.global lbl_805AEFE8 -lbl_805AEFE8: - .incbin "baserom.dol", 0x3FB888, 0x8 -.global lbl_805AEFF0 -lbl_805AEFF0: - .incbin "baserom.dol", 0x3FB890, 0x8 -.global lbl_805AEFF8 -lbl_805AEFF8: - .incbin "baserom.dol", 0x3FB898, 0x8 -.global lbl_805AF000 -lbl_805AF000: - .incbin "baserom.dol", 0x3FB8A0, 0x8 -.global lbl_805AF008 -lbl_805AF008: - .incbin "baserom.dol", 0x3FB8A8, 0x8 -.global lbl_805AF010 -lbl_805AF010: - .incbin "baserom.dol", 0x3FB8B0, 0x8 -.global lbl_805AF018 -lbl_805AF018: - .incbin "baserom.dol", 0x3FB8B8, 0x8 -.global lbl_805AF020 -lbl_805AF020: - .incbin "baserom.dol", 0x3FB8C0, 0x8 -.global lbl_805AF028 -lbl_805AF028: - .incbin "baserom.dol", 0x3FB8C8, 0x8 -.global lbl_805AF030 -lbl_805AF030: - .incbin "baserom.dol", 0x3FB8D0, 0x8 -.global lbl_805AF038 -lbl_805AF038: - .incbin "baserom.dol", 0x3FB8D8, 0x8 -.global lbl_805AF040 -lbl_805AF040: - .incbin "baserom.dol", 0x3FB8E0, 0x8 -.global lbl_805AF048 -lbl_805AF048: - .incbin "baserom.dol", 0x3FB8E8, 0x8 -.global lbl_805AF050 -lbl_805AF050: - .incbin "baserom.dol", 0x3FB8F0, 0x8 -.global lbl_805AF058 -lbl_805AF058: - .incbin "baserom.dol", 0x3FB8F8, 0x8 -.global lbl_805AF060 -lbl_805AF060: - .incbin "baserom.dol", 0x3FB900, 0x8 -.global lbl_805AF068 -lbl_805AF068: - .incbin "baserom.dol", 0x3FB908, 0x8 -.global lbl_805AF070 -lbl_805AF070: - .incbin "baserom.dol", 0x3FB910, 0x8 -.global lbl_805AF078 -lbl_805AF078: - .incbin "baserom.dol", 0x3FB918, 0x8 -.global lbl_805AF080 -lbl_805AF080: - .incbin "baserom.dol", 0x3FB920, 0x8 -.global lbl_805AF088 -lbl_805AF088: - .incbin "baserom.dol", 0x3FB928, 0x8 -.global lbl_805AF090 -lbl_805AF090: - .incbin "baserom.dol", 0x3FB930, 0x8 -.global lbl_805AF098 -lbl_805AF098: - .incbin "baserom.dol", 0x3FB938, 0x8 -.global lbl_805AF0A0 -lbl_805AF0A0: - .incbin "baserom.dol", 0x3FB940, 0x8 -.global lbl_805AF0A8 -lbl_805AF0A8: - .incbin "baserom.dol", 0x3FB948, 0x8 -.global lbl_805AF0B0 -lbl_805AF0B0: - .incbin "baserom.dol", 0x3FB950, 0x8 -.global lbl_805AF0B8 -lbl_805AF0B8: - .incbin "baserom.dol", 0x3FB958, 0x8 -.global lbl_805AF0C0 -lbl_805AF0C0: - .incbin "baserom.dol", 0x3FB960, 0x8 -.global lbl_805AF0C8 -lbl_805AF0C8: - .incbin "baserom.dol", 0x3FB968, 0x8 -.global lbl_805AF0D0 -lbl_805AF0D0: - .incbin "baserom.dol", 0x3FB970, 0x8 -.global lbl_805AF0D8 -lbl_805AF0D8: - .incbin "baserom.dol", 0x3FB978, 0x8 -.global lbl_805AF0E0 -lbl_805AF0E0: - .incbin "baserom.dol", 0x3FB980, 0x8 -.global lbl_805AF0E8 -lbl_805AF0E8: - .incbin "baserom.dol", 0x3FB988, 0x8 -.global lbl_805AF0F0 -lbl_805AF0F0: - .incbin "baserom.dol", 0x3FB990, 0x8 -.global lbl_805AF0F8 -lbl_805AF0F8: - .incbin "baserom.dol", 0x3FB998, 0x8 -.global lbl_805AF100 -lbl_805AF100: - .incbin "baserom.dol", 0x3FB9A0, 0x8 -.global lbl_805AF108 -lbl_805AF108: - .incbin "baserom.dol", 0x3FB9A8, 0x8 -.global lbl_805AF110 -lbl_805AF110: - .incbin "baserom.dol", 0x3FB9B0, 0x8 -.global lbl_805AF118 -lbl_805AF118: - .incbin "baserom.dol", 0x3FB9B8, 0x8 -.global lbl_805AF120 -lbl_805AF120: - .incbin "baserom.dol", 0x3FB9C0, 0x8 -.global lbl_805AF128 -lbl_805AF128: - .incbin "baserom.dol", 0x3FB9C8, 0x8 -.global lbl_805AF130 -lbl_805AF130: - .incbin "baserom.dol", 0x3FB9D0, 0x8 -.global lbl_805AF138 -lbl_805AF138: - .incbin "baserom.dol", 0x3FB9D8, 0x8 -.global lbl_805AF140 -lbl_805AF140: - .incbin "baserom.dol", 0x3FB9E0, 0x8 -.global lbl_805AF148 -lbl_805AF148: - .incbin "baserom.dol", 0x3FB9E8, 0x8 -.global lbl_805AF150 -lbl_805AF150: - .incbin "baserom.dol", 0x3FB9F0, 0x8 -.global lbl_805AF158 -lbl_805AF158: - .incbin "baserom.dol", 0x3FB9F8, 0x8 -.global lbl_805AF160 -lbl_805AF160: - .incbin "baserom.dol", 0x3FBA00, 0x8 -.global lbl_805AF168 -lbl_805AF168: - .incbin "baserom.dol", 0x3FBA08, 0x8 -.global lbl_805AF170 -lbl_805AF170: - .incbin "baserom.dol", 0x3FBA10, 0x8 -.global lbl_805AF178 -lbl_805AF178: - .incbin "baserom.dol", 0x3FBA18, 0x8 -.global lbl_805AF180 -lbl_805AF180: - .incbin "baserom.dol", 0x3FBA20, 0x8 -.global lbl_805AF188 -lbl_805AF188: - .incbin "baserom.dol", 0x3FBA28, 0x8 -.global lbl_805AF190 -lbl_805AF190: - .incbin "baserom.dol", 0x3FBA30, 0x8 -.global lbl_805AF198 -lbl_805AF198: - .incbin "baserom.dol", 0x3FBA38, 0x8 -.global lbl_805AF1A0 -lbl_805AF1A0: - .incbin "baserom.dol", 0x3FBA40, 0x8 -.global lbl_805AF1A8 -lbl_805AF1A8: - .incbin "baserom.dol", 0x3FBA48, 0x8 -.global lbl_805AF1B0 -lbl_805AF1B0: - .incbin "baserom.dol", 0x3FBA50, 0x8 -.global lbl_805AF1B8 -lbl_805AF1B8: - .incbin "baserom.dol", 0x3FBA58, 0x8 -.global lbl_805AF1C0 -lbl_805AF1C0: - .incbin "baserom.dol", 0x3FBA60, 0x8 -.global lbl_805AF1C8 -lbl_805AF1C8: - .incbin "baserom.dol", 0x3FBA68, 0x8 -.global lbl_805AF1D0 -lbl_805AF1D0: - .incbin "baserom.dol", 0x3FBA70, 0x8 -.global lbl_805AF1D8 -lbl_805AF1D8: - .incbin "baserom.dol", 0x3FBA78, 0x8 -.global lbl_805AF1E0 -lbl_805AF1E0: - .incbin "baserom.dol", 0x3FBA80, 0x8 -.global lbl_805AF1E8 -lbl_805AF1E8: - .incbin "baserom.dol", 0x3FBA88, 0x8 -.global lbl_805AF1F0 -lbl_805AF1F0: - .incbin "baserom.dol", 0x3FBA90, 0x8 -.global lbl_805AF1F8 -lbl_805AF1F8: - .incbin "baserom.dol", 0x3FBA98, 0x8 -.global lbl_805AF200 -lbl_805AF200: - .incbin "baserom.dol", 0x3FBAA0, 0x8 -.global lbl_805AF208 -lbl_805AF208: - .incbin "baserom.dol", 0x3FBAA8, 0x8 -.global lbl_805AF210 -lbl_805AF210: - .incbin "baserom.dol", 0x3FBAB0, 0x4 -.global lbl_805AF214 -lbl_805AF214: - .incbin "baserom.dol", 0x3FBAB4, 0x4 -.global lbl_805AF218 -lbl_805AF218: - .incbin "baserom.dol", 0x3FBAB8, 0x8 -.global lbl_805AF220 -lbl_805AF220: - .incbin "baserom.dol", 0x3FBAC0, 0x8 -.global lbl_805AF228 -lbl_805AF228: - .incbin "baserom.dol", 0x3FBAC8, 0x8 -.global lbl_805AF230 -lbl_805AF230: - .incbin "baserom.dol", 0x3FBAD0, 0x4 -.global lbl_805AF234 -lbl_805AF234: - .incbin "baserom.dol", 0x3FBAD4, 0x4 -.global lbl_805AF238 -lbl_805AF238: - .incbin "baserom.dol", 0x3FBAD8, 0x4 -.global lbl_805AF23C -lbl_805AF23C: - .incbin "baserom.dol", 0x3FBADC, 0x4 -.global lbl_805AF240 -lbl_805AF240: - .incbin "baserom.dol", 0x3FBAE0, 0x4 -.global lbl_805AF244 -lbl_805AF244: - .incbin "baserom.dol", 0x3FBAE4, 0x4 -.global lbl_805AF248 -lbl_805AF248: - .incbin "baserom.dol", 0x3FBAE8, 0x4 -.global lbl_805AF24C -lbl_805AF24C: - .incbin "baserom.dol", 0x3FBAEC, 0x4 -.global lbl_805AF250 -lbl_805AF250: - .incbin "baserom.dol", 0x3FBAF0, 0x8 -.global lbl_805AF258 -lbl_805AF258: - .incbin "baserom.dol", 0x3FBAF8, 0x8 -.global lbl_805AF260 -lbl_805AF260: - .incbin "baserom.dol", 0x3FBB00, 0x8 -.global lbl_805AF268 -lbl_805AF268: - .incbin "baserom.dol", 0x3FBB08, 0x4 -.global lbl_805AF26C -lbl_805AF26C: - .incbin "baserom.dol", 0x3FBB0C, 0x4 -.global lbl_805AF270 -lbl_805AF270: - .incbin "baserom.dol", 0x3FBB10, 0x8 -.global lbl_805AF278 -lbl_805AF278: - .incbin "baserom.dol", 0x3FBB18, 0x8 -.global lbl_805AF280 -lbl_805AF280: - .incbin "baserom.dol", 0x3FBB20, 0x8 -.global lbl_805AF288 -lbl_805AF288: - .incbin "baserom.dol", 0x3FBB28, 0x4 -.global lbl_805AF28C -lbl_805AF28C: - .incbin "baserom.dol", 0x3FBB2C, 0x4 -.global lbl_805AF290 -lbl_805AF290: - .incbin "baserom.dol", 0x3FBB30, 0x8 -.global lbl_805AF298 -lbl_805AF298: - .incbin "baserom.dol", 0x3FBB38, 0x8 -.global lbl_805AF2A0 -lbl_805AF2A0: - .incbin "baserom.dol", 0x3FBB40, 0x8 -.global lbl_805AF2A8 -lbl_805AF2A8: - .incbin "baserom.dol", 0x3FBB48, 0x4 -.global lbl_805AF2AC -lbl_805AF2AC: - .incbin "baserom.dol", 0x3FBB4C, 0x4 -.global lbl_805AF2B0 -lbl_805AF2B0: - .incbin "baserom.dol", 0x3FBB50, 0x8 -.global lbl_805AF2B8 -lbl_805AF2B8: - .incbin "baserom.dol", 0x3FBB58, 0x8 -.global lbl_805AF2C0 -lbl_805AF2C0: - .incbin "baserom.dol", 0x3FBB60, 0x8 -.global lbl_805AF2C8 -lbl_805AF2C8: - .incbin "baserom.dol", 0x3FBB68, 0x8 -.global lbl_805AF2D0 -lbl_805AF2D0: - .incbin "baserom.dol", 0x3FBB70, 0x4 -.global lbl_805AF2D4 -lbl_805AF2D4: - .incbin "baserom.dol", 0x3FBB74, 0x4 -.global lbl_805AF2D8 -lbl_805AF2D8: - .incbin "baserom.dol", 0x3FBB78, 0x8 -.global lbl_805AF2E0 -lbl_805AF2E0: - .incbin "baserom.dol", 0x3FBB80, 0x8 -.global lbl_805AF2E8 -lbl_805AF2E8: - .incbin "baserom.dol", 0x3FBB88, 0x8 -.global lbl_805AF2F0 -lbl_805AF2F0: - .incbin "baserom.dol", 0x3FBB90, 0x4 -.global lbl_805AF2F4 -lbl_805AF2F4: - .incbin "baserom.dol", 0x3FBB94, 0x4 -.global lbl_805AF2F8 -lbl_805AF2F8: - .incbin "baserom.dol", 0x3FBB98, 0x8 -.global lbl_805AF300 -lbl_805AF300: - .incbin "baserom.dol", 0x3FBBA0, 0x8 -.global lbl_805AF308 -lbl_805AF308: - .incbin "baserom.dol", 0x3FBBA8, 0x8 -.global lbl_805AF310 -lbl_805AF310: - .incbin "baserom.dol", 0x3FBBB0, 0x8 -.global lbl_805AF318 -lbl_805AF318: - .incbin "baserom.dol", 0x3FBBB8, 0x4 -.global lbl_805AF31C -lbl_805AF31C: - .incbin "baserom.dol", 0x3FBBBC, 0x4 -.global lbl_805AF320 -lbl_805AF320: - .incbin "baserom.dol", 0x3FBBC0, 0x8 -.global lbl_805AF328 -lbl_805AF328: - .incbin "baserom.dol", 0x3FBBC8, 0x8 -.global lbl_805AF330 -lbl_805AF330: - .incbin "baserom.dol", 0x3FBBD0, 0x8 -.global lbl_805AF338 -lbl_805AF338: - .incbin "baserom.dol", 0x3FBBD8, 0x4 -.global lbl_805AF33C -lbl_805AF33C: - .incbin "baserom.dol", 0x3FBBDC, 0x4 -.global lbl_805AF340 -lbl_805AF340: - .incbin "baserom.dol", 0x3FBBE0, 0x8 -.global lbl_805AF348 -lbl_805AF348: - .incbin "baserom.dol", 0x3FBBE8, 0x4 -.global lbl_805AF34C -lbl_805AF34C: - .incbin "baserom.dol", 0x3FBBEC, 0x4 -.global lbl_805AF350 -lbl_805AF350: - .incbin "baserom.dol", 0x3FBBF0, 0x8 -.global lbl_805AF358 -lbl_805AF358: - .incbin "baserom.dol", 0x3FBBF8, 0x4 -.global lbl_805AF35C -lbl_805AF35C: - .incbin "baserom.dol", 0x3FBBFC, 0x4 -.global lbl_805AF360 -lbl_805AF360: - .incbin "baserom.dol", 0x3FBC00, 0x4 -.global lbl_805AF364 -lbl_805AF364: - .incbin "baserom.dol", 0x3FBC04, 0x4 -.global lbl_805AF368 -lbl_805AF368: - .incbin "baserom.dol", 0x3FBC08, 0x4 -.global lbl_805AF36C -lbl_805AF36C: - .incbin "baserom.dol", 0x3FBC0C, 0x4 -.global lbl_805AF370 -lbl_805AF370: - .incbin "baserom.dol", 0x3FBC10, 0x8 -.global lbl_805AF378 -lbl_805AF378: - .incbin "baserom.dol", 0x3FBC18, 0x8 -.global lbl_805AF380 -lbl_805AF380: - .incbin "baserom.dol", 0x3FBC20, 0x8 -.global lbl_805AF388 -lbl_805AF388: - .incbin "baserom.dol", 0x3FBC28, 0x8 -.global lbl_805AF390 -lbl_805AF390: - .incbin "baserom.dol", 0x3FBC30, 0x8 -.global lbl_805AF398 -lbl_805AF398: - .incbin "baserom.dol", 0x3FBC38, 0x4 -.global lbl_805AF39C -lbl_805AF39C: - .incbin "baserom.dol", 0x3FBC3C, 0x4 -.global lbl_805AF3A0 -lbl_805AF3A0: - .incbin "baserom.dol", 0x3FBC40, 0x8 -.global lbl_805AF3A8 -lbl_805AF3A8: - .incbin "baserom.dol", 0x3FBC48, 0x8 -.global lbl_805AF3B0 -lbl_805AF3B0: - .incbin "baserom.dol", 0x3FBC50, 0x4 -.global lbl_805AF3B4 -lbl_805AF3B4: - .incbin "baserom.dol", 0x3FBC54, 0x4 -.global lbl_805AF3B8 -lbl_805AF3B8: - .incbin "baserom.dol", 0x3FBC58, 0x4 -.global lbl_805AF3BC -lbl_805AF3BC: - .incbin "baserom.dol", 0x3FBC5C, 0x4 -.global lbl_805AF3C0 -lbl_805AF3C0: - .incbin "baserom.dol", 0x3FBC60, 0x4 -.global lbl_805AF3C4 -lbl_805AF3C4: - .incbin "baserom.dol", 0x3FBC64, 0x4 -.global lbl_805AF3C8 -lbl_805AF3C8: - .incbin "baserom.dol", 0x3FBC68, 0x8 -.global lbl_805AF3D0 -lbl_805AF3D0: - .incbin "baserom.dol", 0x3FBC70, 0x4 -.global lbl_805AF3D4 -lbl_805AF3D4: - .incbin "baserom.dol", 0x3FBC74, 0x4 -.global lbl_805AF3D8 -lbl_805AF3D8: - .incbin "baserom.dol", 0x3FBC78, 0x8 -.global lbl_805AF3E0 -lbl_805AF3E0: - .incbin "baserom.dol", 0x3FBC80, 0x4 -.global lbl_805AF3E4 -lbl_805AF3E4: - .incbin "baserom.dol", 0x3FBC84, 0x4 -.global lbl_805AF3E8 -lbl_805AF3E8: - .incbin "baserom.dol", 0x3FBC88, 0x8 -.global lbl_805AF3F0 -lbl_805AF3F0: - .incbin "baserom.dol", 0x3FBC90, 0x4 -.global lbl_805AF3F4 -lbl_805AF3F4: - .incbin "baserom.dol", 0x3FBC94, 0x4 -.global lbl_805AF3F8 -lbl_805AF3F8: - .incbin "baserom.dol", 0x3FBC98, 0x4 -.global lbl_805AF3FC -lbl_805AF3FC: - .incbin "baserom.dol", 0x3FBC9C, 0x4 -.global lbl_805AF400 -lbl_805AF400: - .incbin "baserom.dol", 0x3FBCA0, 0x4 -.global lbl_805AF404 -lbl_805AF404: - .incbin "baserom.dol", 0x3FBCA4, 0x4 -.global lbl_805AF408 -lbl_805AF408: - .incbin "baserom.dol", 0x3FBCA8, 0x8 -.global lbl_805AF410 -lbl_805AF410: - .incbin "baserom.dol", 0x3FBCB0, 0x4 -.global lbl_805AF414 -lbl_805AF414: - .incbin "baserom.dol", 0x3FBCB4, 0x4 -.global lbl_805AF418 -lbl_805AF418: - .incbin "baserom.dol", 0x3FBCB8, 0x8 -.global lbl_805AF420 -lbl_805AF420: - .incbin "baserom.dol", 0x3FBCC0, 0x8 -.global lbl_805AF428 -lbl_805AF428: - .incbin "baserom.dol", 0x3FBCC8, 0x4 -.global lbl_805AF42C -lbl_805AF42C: - .incbin "baserom.dol", 0x3FBCCC, 0x4 -.global lbl_805AF430 -lbl_805AF430: - .incbin "baserom.dol", 0x3FBCD0, 0x8 -.global i2fMagic -i2fMagic: - .double 4.503601774854144E15 - diff --git a/obj_files.mk b/obj_files.mk index ff0f9244..8cd307c1 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -93,6 +93,8 @@ VI_FILES :=\ $(BUILD_DIR)/asm/Dolphin/vi.o MSL_PPCEABI_BARE_H :=\ + $(BUILD_DIR)/asm/Runtime/sdata.o\ + $(BUILD_DIR)/asm/Runtime/sdata2.o\ $(BUILD_DIR)/asm/Runtime/__va_arg.o\ $(BUILD_DIR)/asm/Runtime/global_destructor_chain.o\ $(BUILD_DIR)/asm/Runtime/CPlusLibPPC.o\