diff options
99 files changed, 1119 insertions, 1070 deletions
diff --git a/arm9/Makefile b/arm9/Makefile index f792c5bf..b53a5d3c 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -265,8 +265,10 @@ $(CXX_OBJS): $(BUILD_DIR)/%.o: %.cpp $$(dep) $(S_OBJS): $(BUILD_DIR)/%.o: %.s $$(dep) $(AS) $(ASFLAGS) -o $@ $< -$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) $(LD_TEMPLATE) undefined_syms.txt macros.lcf.inc - # $(MAKELSF) $(MAKELSF_FLAGS) $< $(LD_TEMPLATE) $@ +# $(BUILD_DIR)/$(LD_SCRIPT): $(LD_SPEC) $(LD_TEMPLATE) + # $(MAKELSF) $(MAKELSF_FLAGS) $^ $@ + +$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) $(CPP) $(VERSION_CFLAGS) -MMD -MP -MT $@ -MF $@.d -I include/ -I . -DBUILD_DIR=$(BUILD_DIR) -o $@ $< $(ROM): $(O_FILES) $(BUILD_DIR)/$(LD_SCRIPT) $(BIN_FILES) diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index ebad9dc6..e31740c2 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -1,4 +1,7 @@ -#include "macros.lcf.inc" +/* + * Linker command file for Metrowerks ARM Linker 2.0 + * TODO: Split .rodata, .data, .sbss, .bss sections in source + */ MEMORY { arm9 (RWX) : ORIGIN=0x02000000, LENGTH=0 > arm9.sbin @@ -110,7 +113,6 @@ MEMORY { } SECTIONS { -#include "undefined_syms.txt" .arm9 : { ALIGNALL(4); . = ALIGN(32); SDK_STATIC_START = .; @@ -3269,7 +3271,17 @@ SECTIONS { SDK_OVERLAY_MODULE_86_ID = 86; SDK_OVERLAY.MODULE_86.ID = 86; SDK_OVERLAY.MODULE_86.START = .; - FILE_30C600.o (.text) /* 0x308600 */ + module_86.o (.text) + module_86.o (.rodata) + module_86.o (.init) + SDK_OVERLAY.MODULE_86.SINIT_START = .; + module_86.o (.ctor) + module_86.o (.sinit) + WRITEW 0; + SDK_OVERLAY.MODULE_86.SINIT_END = .; + . = ALIGN(32); + module_86.o (.sdata) + module_86.o (.data) . = ALIGN(32); SDK_OVERLAY.MODULE_86.END = .; SDK_OVERLAY.MODULE_86.SIZE = SDK_OVERLAY.MODULE_86.END - SDK_OVERLAY.MODULE_86.START; @@ -3279,7 +3291,8 @@ SECTIONS { { ALIGNALL(4); . = ALIGN(32); SDK_OVERLAY.MODULE_86.BSS_START = .; - FILE_30C600.o (.bss) + module_86.o (.bss) + module_86.o (.sbss) . = ALIGN(32); SDK_OVERLAY.MODULE_86.BSS_END = .; SDK_OVERLAY.MODULE_86.BSS_SIZE = SDK_OVERLAY.MODULE_86.BSS_END - SDK_OVERLAY.MODULE_86.BSS_START; @@ -4184,7 +4197,15 @@ SECTIONS { WRITEW 85; WRITEW 0; - OVERLAY_TABLE(MODULE_86, 86) + WRITEW 86; + WRITEW ADDR(.MODULE_86); + WRITEW SDK_OVERLAY.MODULE_86.SIZE; + WRITEW SDK_OVERLAY.MODULE_86.BSS_SIZE; + WRITEW SDK_OVERLAY.MODULE_86.SINIT_START; + WRITEW SDK_OVERLAY.MODULE_86.SINIT_END; + WRITEW 86; + WRITEW 0; + } > arm9_table SDK_MAIN_ARENA_LO = SDK_SECTION_ARENA_START; diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index a0f6e04f..49e17956 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -2,110 +2,112 @@ Static arm9 { Address 0x02000000 - Object main.o - Object FUN_02000DF4.o - Object unk_02000E0C.o - Object rom2.o - Object string_util.o - Object unk_020023C0.o - Object filesystem.o - Object unk_02006864.o - Object script.o - Object unk_02038C78.o - Object scrcmd.o - Object unk_02046030.o - Object unk_0208AC14.o - Object FUN_020910A4.o - Object unk_020910EC.o - Object unk_020AF030.o - Object FX_mtx22.o - Object FX_mtx33.o - Object FX_mtx43.o - Object FX_mtx44.o - Object FX_cp.o - Object FX_vec.o - Object FX_atan.o - Object FX.o - Object GX.o - Object GX_state.o - Object GX_vramcnt.o - Object GX_bgcnt.o - Object GX_g2.o - Object GX_g3b.o - Object GX_g3imm.o - Object GX_g3x.o - Object GX_g3_util.o - Object GX_load2d.o - Object GX_load3d.o - Object GX_g3.o - Object GX_asm.o - Object OS_irqHandler.o - Object OS_irqTable.o - Object OS_interrupt.o - Object OS_spinLock.o - Object OS_printf.o - Object OS_thread.o - Object OS_context.o - Object OS_emulator.o - Object OS_message.o - Object OS_mutex.o - Object OS_cache.o - Object OS_init.o - Object OS_arena.o - Object OS_alloc.o - Object OS_tcm.o - Object OS_protectionUnit.o - Object OS_protectionRegion.o - Object OS_exception.o - Object OS_timer.o - Object OS_tick.o - Object OS_alarm.o - Object OS_valarm.o - Object OS_system.o - Object OS_reset.o - Object OS_ownerInfo.o - Object OS_vramExclusive.o - Object OS_entropy.o - Object OS_terminate_proc.o - Object MI_wram.o - Object MI_dma.o - Object MI_dma_hblank.o - Object MI_dma_gxcommand.o - Object MI_memory.o - Object MI_swap.o - Object MI_uncompress.o - Object MI_dma_card.o - Object MI_init.o - Object SND_interface.o - Object SND_main.o - Object SND_command.o - Object SND_alarm.o - Object SND_work.o - Object SND_util.o - Object SND_bank.o - Object PXI_init.o - Object PXI_fifo.o - Object rom2_2.o - Object FS_command.o - Object FS_command_default.o - Object FS_archive.o - Object FS_file.o - Object FS_rom.o - Object FS_overlay.o - Object libdgt.o - Object libcp.o - Object libspi.o - Object libpm.o - Object librtc.o - Object libcard.o - Object libwm.o - Object libctrdg.o - Object libmath.o - Object libstd.o - Object libc.o - Object rom2_3.o - Object libmwcc.o - Object rom2_4.o + Object main.o + Object FUN_02000DF4.o + Object unk_02000E0C.o + Object rom2.o + Object string_util.o + Object unk_020023C0.o + Object filesystem.o + Object unk_02006864.o + Object script.o + Object unk_02038C78.o + Object scrcmd.o + Object unk_02046030.o + Object unk_0208AC14.o + Object FUN_020910A4.o + Object unk_020910EC.o + Object unk_020AF030.o + Object FX_mtx22.o + Object FX_mtx33.o + Object FX_mtx43.o + Object FX_mtx44.o + Object FX_cp.o + Object FX_vec.o + Object FX_atan.o + Object FX.o + Object GX.o + Object GX_state.o + Object GX_vramcnt.o + Object GX_bgcnt.o + Object GX_g2.o + Object GX_g3b.o + Object GX_g3imm.o + Object GX_g3x.o + Object GX_g3_util.o + Object GX_load2d.o + Object GX_load3d.o + Object GX_g3.o + Object GX_asm.o + Object OS_irqHandler.o + Object OS_irqTable.o + Object OS_interrupt.o + Object OS_spinLock.o + Object OS_printf.o + Object OS_thread.o + Object OS_context.o + Object OS_emulator.o + Object OS_message.o + Object OS_mutex.o + Object OS_cache.o + Object OS_init.o + Object OS_arena.o + Object OS_alloc.o + Object OS_tcm.o + Object OS_protectionUnit.o + Object OS_protectionRegion.o + Object OS_exception.o + Object OS_timer.o + Object OS_tick.o + Object OS_alarm.o + Object OS_valarm.o + Object OS_system.o + Object OS_reset.o + Object OS_ownerInfo.o + Object OS_vramExclusive.o + Object OS_entropy.o + Object OS_terminate_proc.o + Object MI_wram.o + Object MI_dma.o + Object MI_dma_hblank.o + Object MI_dma_gxcommand.o + Object MI_memory.o + Object MI_swap.o + Object MI_uncompress.o + Object MI_dma_card.o + Object MI_init.o + Object SND_interface.o + Object SND_main.o + Object SND_command.o + Object SND_alarm.o + Object SND_work.o + Object SND_util.o + Object SND_bank.o + Object PXI_init.o + Object PXI_fifo.o + Object rom2_2.o + Object FS_command.o + Object FS_command_default.o + Object FS_archive.o + Object FS_file.o + Object FS_rom.o + Object FS_overlay.o + Object DGT_hash1.o + Object DGT_hash2.o + Object DGT_sha1s_arm4cw.o + Object libcp.o + Object libspi.o + Object libpm.o + Object librtc.o + Object libcard.o + Object libwm.o + Object libctrdg.o + Object libmath.o + Object libstd.o + Object libc.o + Object rom2_3.o + Object libmwcc.o + Object rom2_4.o } Autoload ITCM @@ -297,270 +299,270 @@ Overlay MODULE_32 Overlay MODULE_33 { Address 0x02254840 - Object FILE_28DE00.o + Object module_33.o } Overlay MODULE_34 { Address 0x02254840 - Object FILE_28E200.o + Object module_34.o } Overlay MODULE_35 { Address 0x02254840 - Object FILE_28E800.o + Object module_35.o } Overlay MODULE_36 { Address 0x02254840 - Object FILE_28F200.o + Object module_36.o } Overlay MODULE_37 { Address 0x02254840 - Object FILE_290000.o + Object module_37.o } Overlay MODULE_38 { Address 0x02254840 - Object FILE_290600.o + Object module_38.o } Overlay MODULE_39 { Address 0x02254840 - Object FILE_291200.o + Object module_39.o } Overlay MODULE_40 { Address 0x02254840 - Object FILE_292000.o + Object module_40.o } Overlay MODULE_41 { Address 0x02254840 - Object FILE_292E00.o + Object module_41.o } Overlay MODULE_42 { Address 0x02254840 - Object FILE_294000.o + Object module_42.o } Overlay MODULE_43 { Address 0x02254840 - Object FILE_294A00.o + Object module_43.o } Overlay MODULE_44 { Address 0x02254840 - Object FILE_295400.o + Object module_44.o } Overlay MODULE_45 { Address 0x02254840 - Object FILE_295A00.o + Object module_45.o } Overlay MODULE_46 { Address 0x02254840 - Object FILE_296400.o + Object module_46.o } Overlay MODULE_47 { Address 0x02254840 - Object FILE_296800.o + Object module_47.o } Overlay MODULE_48 { Address 0x02254840 - Object FILE_297600.o + Object module_48.o } Overlay MODULE_49 { Address 0x02254840 - Object FILE_298000.o + Object module_49.o } Overlay MODULE_50 { Address 0x02254840 - Object FILE_298600.o + Object module_50.o } Overlay MODULE_51 { Address 0x02254840 - Object FILE_298A00.o + Object module_51.o } Overlay MODULE_52 { Address 0x021D74E0 - Object FILE_299A00.o + Object module_52.o } Overlay MODULE_53 { Address 0x021D74E0 - Object FILE_299E00.o + Object module_53.o } Overlay MODULE_54 { Address 0x021D74E0 - Object FILE_29C400.o + Object module_54.o } Overlay MODULE_55 { Address 0x021D74E0 - Object FILE_29E800.o + Object module_55.o } Overlay MODULE_56 { Address 0x02211E60 - Object FILE_2A1A00.o + Object module_56.o } Overlay MODULE_57 { Address 0x021D74E0 - Object FILE_2A6200.o + Object module_57.o } Overlay MODULE_58 { Address 0x021D9A20 - Object FILE_2A8800.o + Object module_58.o } Overlay MODULE_59 { Address 0x021D74E0 - Object FILE_2A9E00.o + Object module_59.o } Overlay MODULE_60 { Address 0x021D74E0 - Object FILE_2ACC00.o + Object module_60.o } Overlay MODULE_61 { Address 0x021D74E0 - Object FILE_2ADA00.o + Object module_61.o } Overlay MODULE_62 { Address 0x0222D5C0 - Object FILE_2AEC00.o + Object module_62.o } Overlay MODULE_63 { Address 0x021D74E0 - Object FILE_2B2A00.o + Object module_63.o } Overlay MODULE_64 { Address 0x021D74E0 - Object FILE_2B7600.o + Object module_64.o } Overlay MODULE_65 { Address 0x021D74E0 - Object FILE_2B9400.o + Object module_65.o } Overlay MODULE_66 { Address 0x021D74E0 - Object FILE_2BC400.o + Object module_66.o } Overlay MODULE_67 { Address 0x021D74E0 - Object FILE_2BEC00.o + Object module_67.o } Overlay MODULE_68 { Address 0x021D74E0 - Object FILE_2C1200.o + Object module_68.o } Overlay MODULE_69 { Address 0x0222D5C0 - Object FILE_2C2800.o + Object module_69.o } Overlay MODULE_70 { Address 0x021D74E0 - Object FILE_2C4C00.o + Object module_70.o } Overlay MODULE_71 { Address 0x0222D5C0 - Object FILE_2C5C00.o + Object module_71.o } Overlay MODULE_72 { Address 0x021D74E0 - Object FILE_2C9C00.o + Object module_72.o } Overlay MODULE_73 { Address 0x021D74E0 - Object FILE_2C9E00.o + Object module_73.o } Overlay MODULE_74 { Address 0x021D74E0 - Object FILE_2CEA00.o + Object module_74.o } Overlay MODULE_75 { Address 0x021E6BA0 - Object FILE_2CFE00.o + Object module_75.o } Overlay MODULE_76 { Address 0x021D74E0 - Object FILE_2D5C00.o + Object module_76.o } Overlay MODULE_77 { Address 0x021D74E0 - Object FILE_2D7C00.o + Object module_77.o } Overlay MODULE_78 { Address 0x021D74E0 - Object FILE_2D9800.o + Object module_78.o } Overlay MODULE_79 { Address 0x02211E60 - Object FILE_2D9E00.o + Object module_79.o } Overlay MODULE_80 { Address 0x0222D5C0 - Object FILE_2DF200.o + Object module_80.o } Overlay MODULE_81 { Address 0x02237E40 - Object FILE_2E9A00.o + Object module_81.o } Overlay MODULE_82 { Address 0x0222D5C0 - Object FILE_2EF000.o + Object module_82.o } Overlay MODULE_83 { Address 0x0222D5C0 - Object FILE_2F1600.o + Object module_83.o } Overlay MODULE_84 { Address 0x021D74E0 - Object FILE_2FFA00.o + Object module_84.o } Overlay MODULE_85 { Address 0x021D74E0 - Object FILE_303400.o + Object module_85.o } Overlay MODULE_86 { Address 0x021D74E0 - Object FILE_30C600.o + Object module_86.o } diff --git a/arm9/files/FILE_10C400.s b/arm9/files/FILE_10C400.s deleted file mode 100644 index 254620ef..00000000 --- a/arm9/files/FILE_10C400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x10C400, 0x20 - diff --git a/arm9/files/FILE_10C600.s b/arm9/files/FILE_10C600.s deleted file mode 100644 index cc95b047..00000000 --- a/arm9/files/FILE_10C600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x10C600, 0x20 - diff --git a/arm9/files/FILE_10C800.s b/arm9/files/FILE_10C800.s deleted file mode 100644 index 74fe3237..00000000 --- a/arm9/files/FILE_10C800.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x10C800, 0x20 - diff --git a/arm9/files/FILE_10CA00.s b/arm9/files/FILE_10CA00.s deleted file mode 100644 index ecff1f01..00000000 --- a/arm9/files/FILE_10CA00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x10CA00, 0x20 - diff --git a/arm9/files/FILE_10CC00.s b/arm9/files/FILE_10CC00.s deleted file mode 100644 index b2a71be1..00000000 --- a/arm9/files/FILE_10CC00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x10CC00, 0x386E0 - diff --git a/arm9/files/FILE_145400.s b/arm9/files/FILE_145400.s deleted file mode 100644 index 69b7e8af..00000000 --- a/arm9/files/FILE_145400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x145400, 0x261A0 - diff --git a/arm9/files/FILE_16B600.s b/arm9/files/FILE_16B600.s deleted file mode 100644 index a6fe3459..00000000 --- a/arm9/files/FILE_16B600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x16B600, 0x18D80 - diff --git a/arm9/files/FILE_184400.s b/arm9/files/FILE_184400.s deleted file mode 100644 index ebfbae38..00000000 --- a/arm9/files/FILE_184400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x184400, 0x32E0 - diff --git a/arm9/files/FILE_187800.s b/arm9/files/FILE_187800.s deleted file mode 100644 index dc6a9524..00000000 --- a/arm9/files/FILE_187800.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x187800, 0x1B760 - diff --git a/arm9/files/FILE_1A3000.s b/arm9/files/FILE_1A3000.s deleted file mode 100644 index e9931349..00000000 --- a/arm9/files/FILE_1A3000.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x1A3000, 0xA1A0 - diff --git a/arm9/files/FILE_1AD200.s b/arm9/files/FILE_1AD200.s deleted file mode 100644 index ab9aa578..00000000 --- a/arm9/files/FILE_1AD200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x1AD200, 0x20 - diff --git a/arm9/files/FILE_1AD400.s b/arm9/files/FILE_1AD400.s deleted file mode 100644 index f4cbb321..00000000 --- a/arm9/files/FILE_1AD400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x1AD400, 0x329E0 - diff --git a/arm9/files/FILE_1DFE00.s b/arm9/files/FILE_1DFE00.s deleted file mode 100644 index edd9bbad..00000000 --- a/arm9/files/FILE_1DFE00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x1DFE00, 0x19260 - diff --git a/arm9/files/FILE_1F9200.s b/arm9/files/FILE_1F9200.s deleted file mode 100644 index 4cc1228a..00000000 --- a/arm9/files/FILE_1F9200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x1F9200, 0x2EBE0 - diff --git a/arm9/files/FILE_227E00.s b/arm9/files/FILE_227E00.s deleted file mode 100644 index 103ad10a..00000000 --- a/arm9/files/FILE_227E00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x227E00, 0xF520 - diff --git a/arm9/files/FILE_237400.s b/arm9/files/FILE_237400.s deleted file mode 100644 index a912c8e4..00000000 --- a/arm9/files/FILE_237400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x237400, 0x4680 - diff --git a/arm9/files/FILE_23BC00.s b/arm9/files/FILE_23BC00.s deleted file mode 100644 index ee3f7e21..00000000 --- a/arm9/files/FILE_23BC00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x23BC00, 0x28500 - diff --git a/arm9/files/FILE_264200.s b/arm9/files/FILE_264200.s deleted file mode 100644 index d4a20793..00000000 --- a/arm9/files/FILE_264200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x264200, 0x6E80 - diff --git a/arm9/files/FILE_26B200.s b/arm9/files/FILE_26B200.s deleted file mode 100644 index 66491b3a..00000000 --- a/arm9/files/FILE_26B200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x26B200, 0x17CE0 - diff --git a/arm9/files/FILE_283000.s b/arm9/files/FILE_283000.s deleted file mode 100644 index 09f585cf..00000000 --- a/arm9/files/FILE_283000.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x283000, 0x100 - diff --git a/arm9/files/FILE_283200.s b/arm9/files/FILE_283200.s deleted file mode 100644 index 68180b84..00000000 --- a/arm9/files/FILE_283200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x283200, 0x2400 - diff --git a/arm9/files/FILE_285600.s b/arm9/files/FILE_285600.s deleted file mode 100644 index ca6a17ed..00000000 --- a/arm9/files/FILE_285600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x285600, 0x5C0 - diff --git a/arm9/files/FILE_285C00.s b/arm9/files/FILE_285C00.s deleted file mode 100644 index 62f45299..00000000 --- a/arm9/files/FILE_285C00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x285C00, 0xF00 - diff --git a/arm9/files/FILE_286C00.s b/arm9/files/FILE_286C00.s deleted file mode 100644 index 65aaf12c..00000000 --- a/arm9/files/FILE_286C00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x286C00, 0x1900 - diff --git a/arm9/files/FILE_288600.s b/arm9/files/FILE_288600.s deleted file mode 100644 index 57c96796..00000000 --- a/arm9/files/FILE_288600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x288600, 0x9A0 - diff --git a/arm9/files/FILE_289000.s b/arm9/files/FILE_289000.s deleted file mode 100644 index eeffd74a..00000000 --- a/arm9/files/FILE_289000.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x289000, 0x560 - diff --git a/arm9/files/FILE_289600.s b/arm9/files/FILE_289600.s deleted file mode 100644 index 2a60cc62..00000000 --- a/arm9/files/FILE_289600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x289600, 0x800 - diff --git a/arm9/files/FILE_289E00.s b/arm9/files/FILE_289E00.s deleted file mode 100644 index f133baff..00000000 --- a/arm9/files/FILE_289E00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x289E00, 0xBA0 - diff --git a/arm9/files/FILE_28AA00.s b/arm9/files/FILE_28AA00.s deleted file mode 100644 index 4fa54cf0..00000000 --- a/arm9/files/FILE_28AA00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28AA00, 0x1780 - diff --git a/arm9/files/FILE_28C200.s b/arm9/files/FILE_28C200.s deleted file mode 100644 index ae636e3f..00000000 --- a/arm9/files/FILE_28C200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28C200, 0x900 - diff --git a/arm9/files/FILE_28CC00.s b/arm9/files/FILE_28CC00.s deleted file mode 100644 index 1382f7cf..00000000 --- a/arm9/files/FILE_28CC00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28CC00, 0x600 - diff --git a/arm9/files/FILE_28D200.s b/arm9/files/FILE_28D200.s deleted file mode 100644 index 8639f01a..00000000 --- a/arm9/files/FILE_28D200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28D200, 0x600 - diff --git a/arm9/files/FILE_28D800.s b/arm9/files/FILE_28D800.s deleted file mode 100644 index 01333fec..00000000 --- a/arm9/files/FILE_28D800.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28D800, 0x4A0 - diff --git a/arm9/files/FILE_28DE00.s b/arm9/files/FILE_28DE00.s deleted file mode 100644 index d75cd7de..00000000 --- a/arm9/files/FILE_28DE00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28DE00, 0x320 - diff --git a/arm9/files/FILE_28E200.s b/arm9/files/FILE_28E200.s deleted file mode 100644 index 78a01f74..00000000 --- a/arm9/files/FILE_28E200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28E200, 0x4C0 - diff --git a/arm9/files/FILE_28E800.s b/arm9/files/FILE_28E800.s deleted file mode 100644 index 37f22bb0..00000000 --- a/arm9/files/FILE_28E800.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28E800, 0x9A0 - diff --git a/arm9/files/FILE_28F200.s b/arm9/files/FILE_28F200.s deleted file mode 100644 index 7fbec89b..00000000 --- a/arm9/files/FILE_28F200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x28F200, 0xCC0 - diff --git a/arm9/files/FILE_290000.s b/arm9/files/FILE_290000.s deleted file mode 100644 index 63a6e035..00000000 --- a/arm9/files/FILE_290000.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x290000, 0x560 - .section .bss - .space 0x20 diff --git a/arm9/files/FILE_290600.s b/arm9/files/FILE_290600.s deleted file mode 100644 index 35fec2fd..00000000 --- a/arm9/files/FILE_290600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x290600, 0xB40 - diff --git a/arm9/files/FILE_291200.s b/arm9/files/FILE_291200.s deleted file mode 100644 index 9055004d..00000000 --- a/arm9/files/FILE_291200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x291200, 0xCC0 - diff --git a/arm9/files/FILE_292000.s b/arm9/files/FILE_292000.s deleted file mode 100644 index 27028058..00000000 --- a/arm9/files/FILE_292000.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x292000, 0xC60 - diff --git a/arm9/files/FILE_292E00.s b/arm9/files/FILE_292E00.s deleted file mode 100644 index f0c68d4e..00000000 --- a/arm9/files/FILE_292E00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x292E00, 0x1140 - diff --git a/arm9/files/FILE_294000.s b/arm9/files/FILE_294000.s deleted file mode 100644 index 920669f6..00000000 --- a/arm9/files/FILE_294000.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x294000, 0x900 - diff --git a/arm9/files/FILE_294A00.s b/arm9/files/FILE_294A00.s deleted file mode 100644 index ce644972..00000000 --- a/arm9/files/FILE_294A00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x294A00, 0x9C0 - diff --git a/arm9/files/FILE_295400.s b/arm9/files/FILE_295400.s deleted file mode 100644 index 7bc87c21..00000000 --- a/arm9/files/FILE_295400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x295400, 0x4A0 - diff --git a/arm9/files/FILE_295A00.s b/arm9/files/FILE_295A00.s deleted file mode 100644 index 25378684..00000000 --- a/arm9/files/FILE_295A00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x295A00, 0x940 - diff --git a/arm9/files/FILE_296400.s b/arm9/files/FILE_296400.s deleted file mode 100644 index 1f9defa1..00000000 --- a/arm9/files/FILE_296400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x296400, 0x320 - diff --git a/arm9/files/FILE_296800.s b/arm9/files/FILE_296800.s deleted file mode 100644 index 256bd99d..00000000 --- a/arm9/files/FILE_296800.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x296800, 0xCA0 - diff --git a/arm9/files/FILE_297600.s b/arm9/files/FILE_297600.s deleted file mode 100644 index 664db335..00000000 --- a/arm9/files/FILE_297600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x297600, 0x8A0 - diff --git a/arm9/files/FILE_298000.s b/arm9/files/FILE_298000.s deleted file mode 100644 index b7181b03..00000000 --- a/arm9/files/FILE_298000.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x298000, 0x600 - diff --git a/arm9/files/FILE_298600.s b/arm9/files/FILE_298600.s deleted file mode 100644 index 2a12d4fc..00000000 --- a/arm9/files/FILE_298600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x298600, 0x320 - diff --git a/arm9/files/FILE_298A00.s b/arm9/files/FILE_298A00.s deleted file mode 100644 index 796aa1a3..00000000 --- a/arm9/files/FILE_298A00.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x298A00, 0xFC0 - .section .bss - .space 0x20 diff --git a/arm9/files/FILE_299A00.s b/arm9/files/FILE_299A00.s deleted file mode 100644 index 07724718..00000000 --- a/arm9/files/FILE_299A00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x299A00, 0x400 - diff --git a/arm9/files/FILE_299E00.s b/arm9/files/FILE_299E00.s deleted file mode 100644 index 4de78184..00000000 --- a/arm9/files/FILE_299E00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x299E00, 0x2480 - diff --git a/arm9/files/FILE_29C400.s b/arm9/files/FILE_29C400.s deleted file mode 100644 index 51f17874..00000000 --- a/arm9/files/FILE_29C400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x29C400, 0x2380 - diff --git a/arm9/files/FILE_29E800.s b/arm9/files/FILE_29E800.s deleted file mode 100644 index 658eb523..00000000 --- a/arm9/files/FILE_29E800.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x29E800, 0x3040 - diff --git a/arm9/files/FILE_2A1A00.s b/arm9/files/FILE_2A1A00.s deleted file mode 100644 index f1bae30a..00000000 --- a/arm9/files/FILE_2A1A00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2A1A00, 0x47A0 - diff --git a/arm9/files/FILE_2A6200.s b/arm9/files/FILE_2A6200.s deleted file mode 100644 index 868864db..00000000 --- a/arm9/files/FILE_2A6200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2A6200, 0x2540 - diff --git a/arm9/files/FILE_2A8800.s b/arm9/files/FILE_2A8800.s deleted file mode 100644 index 5c379955..00000000 --- a/arm9/files/FILE_2A8800.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2A8800, 0x15A0 - diff --git a/arm9/files/FILE_2A9E00.s b/arm9/files/FILE_2A9E00.s deleted file mode 100644 index e89790e3..00000000 --- a/arm9/files/FILE_2A9E00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2A9E00, 0x2C20 - diff --git a/arm9/files/FILE_2ACC00.s b/arm9/files/FILE_2ACC00.s deleted file mode 100644 index 1b79ca62..00000000 --- a/arm9/files/FILE_2ACC00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2ACC00, 0xD00 - diff --git a/arm9/files/FILE_2ADA00.s b/arm9/files/FILE_2ADA00.s deleted file mode 100644 index 820b4821..00000000 --- a/arm9/files/FILE_2ADA00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2ADA00, 0x1080 - diff --git a/arm9/files/FILE_2AEC00.s b/arm9/files/FILE_2AEC00.s deleted file mode 100644 index 0a0062ff..00000000 --- a/arm9/files/FILE_2AEC00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2AEC00, 0x3DE0 - diff --git a/arm9/files/FILE_2B2A00.s b/arm9/files/FILE_2B2A00.s deleted file mode 100644 index c7542e17..00000000 --- a/arm9/files/FILE_2B2A00.s +++ /dev/null @@ -1,6 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2B2A00, 0x4AC0 - .section .bss - .space 0x20 - diff --git a/arm9/files/FILE_2B7600.s b/arm9/files/FILE_2B7600.s deleted file mode 100644 index f0f81a80..00000000 --- a/arm9/files/FILE_2B7600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2B7600, 0x1C40 - diff --git a/arm9/files/FILE_2B9400.s b/arm9/files/FILE_2B9400.s deleted file mode 100644 index e7245019..00000000 --- a/arm9/files/FILE_2B9400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2B9400, 0x3000 - diff --git a/arm9/files/FILE_2BC400.s b/arm9/files/FILE_2BC400.s deleted file mode 100644 index eb62b3a8..00000000 --- a/arm9/files/FILE_2BC400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2BC400, 0x2660 - diff --git a/arm9/files/FILE_2BEC00.s b/arm9/files/FILE_2BEC00.s deleted file mode 100644 index 8042a682..00000000 --- a/arm9/files/FILE_2BEC00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2BEC00, 0x2440 - diff --git a/arm9/files/FILE_2C1200.s b/arm9/files/FILE_2C1200.s deleted file mode 100644 index 332f0c01..00000000 --- a/arm9/files/FILE_2C1200.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2C1200, 0x1600 - diff --git a/arm9/files/FILE_2C2800.s b/arm9/files/FILE_2C2800.s deleted file mode 100644 index 6e38ff10..00000000 --- a/arm9/files/FILE_2C2800.s +++ /dev/null @@ -1,6 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2C2800, 0x23A0 - .section .bss - .space 0x20 - diff --git a/arm9/files/FILE_2C4C00.s b/arm9/files/FILE_2C4C00.s deleted file mode 100644 index 6764e3f8..00000000 --- a/arm9/files/FILE_2C4C00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2C4C00, 0xE20 - diff --git a/arm9/files/FILE_2C5C00.s b/arm9/files/FILE_2C5C00.s deleted file mode 100644 index d98bfcf3..00000000 --- a/arm9/files/FILE_2C5C00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2C5C00, 0x3EC0 - diff --git a/arm9/files/FILE_2C9C00.s b/arm9/files/FILE_2C9C00.s deleted file mode 100644 index 77531a9c..00000000 --- a/arm9/files/FILE_2C9C00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2C9C00, 0x20 - diff --git a/arm9/files/FILE_2C9E00.s b/arm9/files/FILE_2C9E00.s deleted file mode 100644 index 1da6375d..00000000 --- a/arm9/files/FILE_2C9E00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2C9E00, 0x4AE0 - diff --git a/arm9/files/FILE_2CEA00.s b/arm9/files/FILE_2CEA00.s deleted file mode 100644 index f1e5beab..00000000 --- a/arm9/files/FILE_2CEA00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2CEA00, 0x1220 - diff --git a/arm9/files/FILE_2CFE00.s b/arm9/files/FILE_2CFE00.s deleted file mode 100644 index ae6d4e43..00000000 --- a/arm9/files/FILE_2CFE00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2CFE00, 0x5DE0 - diff --git a/arm9/files/FILE_2D5C00.s b/arm9/files/FILE_2D5C00.s deleted file mode 100644 index 250d2a37..00000000 --- a/arm9/files/FILE_2D5C00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2D5C00, 0x1E20 - diff --git a/arm9/files/FILE_2D7C00.s b/arm9/files/FILE_2D7C00.s deleted file mode 100644 index 293a4962..00000000 --- a/arm9/files/FILE_2D7C00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2D7C00, 0x1BE0 - diff --git a/arm9/files/FILE_2D9800.s b/arm9/files/FILE_2D9800.s deleted file mode 100644 index 0c21e6e4..00000000 --- a/arm9/files/FILE_2D9800.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2D9800, 0x460 - diff --git a/arm9/files/FILE_2D9E00.s b/arm9/files/FILE_2D9E00.s deleted file mode 100644 index a358769d..00000000 --- a/arm9/files/FILE_2D9E00.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2D9E00, 0x52C0 - .section .bss - .space 0x40 diff --git a/arm9/files/FILE_2DF200.s b/arm9/files/FILE_2DF200.s deleted file mode 100644 index 93f5cfda..00000000 --- a/arm9/files/FILE_2DF200.s +++ /dev/null @@ -1,6 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2DF200, 0xA720 - .section .bss - .space 0x160 - diff --git a/arm9/files/FILE_2E9A00.s b/arm9/files/FILE_2E9A00.s deleted file mode 100644 index 1b03c961..00000000 --- a/arm9/files/FILE_2E9A00.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2E9A00, 0x5580 - .section .bss - .space 0xa0 diff --git a/arm9/files/FILE_2EF000.s b/arm9/files/FILE_2EF000.s deleted file mode 100644 index e29ca1e0..00000000 --- a/arm9/files/FILE_2EF000.s +++ /dev/null @@ -1,6 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2EF000, 0x2540 - .section .bss - .space 0x120 - diff --git a/arm9/files/FILE_2F1600.s b/arm9/files/FILE_2F1600.s deleted file mode 100644 index 7669a577..00000000 --- a/arm9/files/FILE_2F1600.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2F1600, 0xE2A0 - .section .bss - .space 0x1980 diff --git a/arm9/files/FILE_2FFA00.s b/arm9/files/FILE_2FFA00.s deleted file mode 100644 index 9e8819b8..00000000 --- a/arm9/files/FILE_2FFA00.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x2FFA00, 0x3920 - diff --git a/arm9/files/FILE_303400.s b/arm9/files/FILE_303400.s deleted file mode 100644 index 52f17ff8..00000000 --- a/arm9/files/FILE_303400.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x303400, 0x9100 - diff --git a/arm9/files/FILE_30C600.s b/arm9/files/FILE_30C600.s deleted file mode 100644 index faf88157..00000000 --- a/arm9/files/FILE_30C600.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .section .text - .incbin "baserom.nds", 0x30C600, 0x820 - diff --git a/arm9/global.inc b/arm9/global.inc index 9371266e..e418ef78 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -5802,7 +5802,7 @@ .extern MOD04_021D8640
.extern MOD04_021D8678
.extern FUN_02029B08
-.extern FUN_021EB550
+.extern MOD04_021EB550
.extern MOD04_021DD904
.extern MOD04_021DD944
.extern MOD04_021EB3B8
@@ -5938,7 +5938,7 @@ .extern CTRDG_TerminateForPulledOut
.extern CTRDG_WriteAndVerifyAgbFlashAsync
.extern SVC_GetCRC16
-.extern FUN_021DE330
+.extern MOD04_021DE330
.extern MOD04_021DDB40
.extern MOD04_021DDF40
.extern MOD04_021DE2D0
diff --git a/arm9/macros.lcf.inc b/arm9/macros.lcf.inc deleted file mode 100644 index f58c2432..00000000 --- a/arm9/macros.lcf.inc +++ /dev/null @@ -1,9 +0,0 @@ -#define OVERLAY_TABLE(module, number) \ -WRITEW number; \ -WRITEW SDK_OVERLAY_##module##_START; \ -WRITEW SDK_OVERLAY_##module##_SIZE; \ -WRITEW SDK_OVERLAY_##module##_BSSSIZE; \ -WRITEW SDK_OVERLAY_##module##_STATIC_INIT_START; \ -WRITEW SDK_OVERLAY_##module##_STATIC_INIT_END; \ -WRITEW number; \ -WRITEW 0; diff --git a/arm9/modules/04/asm/arm_04.s b/arm9/modules/04/asm/arm_04.s index 83993b5d..eb42dcb1 100644 --- a/arm9/modules/04/asm/arm_04.s +++ b/arm9/modules/04/asm/arm_04.s @@ -6128,6 +6128,9 @@ MOD04_021DE308: ; 0x021DE308 bl MOD04_02207158 add sp, sp, #4 ldmfd sp!, {pc} + + arm_func_start MOD04_021DE330 +MOD04_021DE330: ; 0x021DE330 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r5, r1 @@ -21284,6 +21287,9 @@ MOD04_021EB524: ; 0x021EB524 mov r0, #1 add sp, sp, #4 ldmfd sp!, {pc} + + arm_func_start MOD04_021EB550 +MOD04_021EB550: stmdb sp!, {lr} sub sp, sp, #4 ldr r0, _021EB598 ; =0x02210E44 diff --git a/arm9/modules/79/asm/module_79_thumb.s b/arm9/modules/79/asm/module_79_thumb.s index ac0c1188..26c700af 100644 --- a/arm9/modules/79/asm/module_79_thumb.s +++ b/arm9/modules/79/asm/module_79_thumb.s @@ -811,7 +811,7 @@ MOD79_0221244C: ; 0x0221244C mov r1, #0 str r1, [r0, #0x24] _02212464: - blx FUN_021EB550 + bl MOD04_021EB550 ldr r0, _02212470 ; =0x02216760 mov r1, #1 str r1, [r0] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 555f3678..45c6e1e3 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -18609,7 +18609,7 @@ _0223696C: str r0, [r4, #0x2c] b _02236986 _02236972: - blx FUN_021EB550 + bl MOD04_021EB550 mov r0, #0x15 str r0, [r4, #0x2c] b _02236986 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 98afbcaa..962ebed4 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -2232,7 +2232,7 @@ _0222E768: str r0, [r4, #0x1c] b _0222E782 _0222E76E: - blx FUN_021EB550 + bl MOD04_021EB550 mov r0, #0x35 str r0, [r4, #0x1c] b _0222E782 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 1ab49f6e..1eda08dc 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -26210,7 +26210,7 @@ _0223A14E: ldr r0, _0223A2AC ; =0x0223CAEC add r1, r4, r1 add r2, r3, #0 - blx FUN_021DE330 + bl MOD04_021DE330 cmp r0, #0 bne _0223A168 add r0, r4, #0 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s new file mode 100644 index 00000000..922a98f3 --- /dev/null +++ b/arm9/modules/86/asm/module_86.s @@ -0,0 +1,917 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + .balign 4, 0 + + thumb_func_start MOD86_021D74E0 +MOD86_021D74E0: ; 0x021D74E0 + push {r3, r4, r5, lr} + mov r2, #2 + add r5, r0, #0 + mov r0, #3 + mov r1, #0x54 + lsl r2, r2, #0x10 + bl FUN_0201681C + add r0, r5, #0 + mov r1, #0x44 + mov r2, #0x54 + bl FUN_02006268 + mov r1, #0 + mov r2, #0x44 + add r4, r0, #0 + bl Call_FillMemWithValue + mov r0, #0x54 + str r0, [r4] + add r0, r5, #0 + bl FUN_0200628C + ldr r1, [r0] + str r1, [r4, #8] + ldr r0, [r0, #4] + str r0, [r4, #4] + ldr r0, [r4, #8] + bl FUN_020238F4 + str r0, [r4, #0xc] + mov r0, #0 + add r1, r0, #0 + bl FUN_0200E3A0 + mov r0, #1 + mov r1, #0 + bl FUN_0200E3A0 + mov r0, #0 + add r1, r0, #0 + bl FUN_02015F10 + mov r0, #0 + add r1, r0, #0 + bl FUN_02015F34 + bl FUN_0201E6D8 + bl FUN_0201E740 + mov r2, #1 + lsl r2, r2, #0x1a + ldr r1, [r2] + ldr r0, _021D7580 ; =0xFFFFE0FF + and r1, r0 + str r1, [r2] + ldr r2, _021D7584 ; =0x04001000 + ldr r1, [r2] + and r0, r1 + str r0, [r2] + mov r0, #4 + mov r1, #8 + bl FUN_0201669C + add r0, r4, #0 + bl MOD86_021D76EC + add r0, r4, #0 + bl MOD86_021D78D4 + ldr r0, _021D7588 ; =MOD86_021D76E0 + add r1, r4, #0 + bl FUN_02015F10 + bl FUN_0201E788 + mov r0, #1 + pop {r3, r4, r5, pc} + nop +_021D7580: .word 0xFFFFE0FF +_021D7584: .word 0x04001000 +_021D7588: .word MOD86_021D76E0 + thumb_func_end MOD86_021D74E0 + + thumb_func_start MOD86_021D758C +MOD86_021D758C: ; 0x021D758C + push {r3, r4, r5, r6, lr} + sub sp, #0xc + add r5, r1, #0 + bl FUN_02006278 + ldr r1, [r5] + add r4, r0, #0 + mov r6, #0 + cmp r1, #5 + bhi _021D76A0 + add r1, r1, r1 + add r1, pc + ldrh r1, [r1, #6] + lsl r1, r1, #0x10 + asr r1, r1, #0x10 + add pc, r1 +_021D75AC: ; jump table + .short _021D75B8 - _021D75AC - 2 ; case 0 + .short _021D7614 - _021D75AC - 2 ; case 1 + .short _021D7626 - _021D75AC - 2 ; case 2 + .short _021D7638 - _021D75AC - 2 ; case 3 + .short _021D765C - _021D75AC - 2 ; case 4 + .short _021D7696 - _021D75AC - 2 ; case 5 +_021D75B8: + bl MOD86_021D7984 + add r0, r4, #0 + bl MOD86_021D79D4 + add r0, r4, #0 + bl MOD86_021D7B80 + add r0, r6, #0 + mov r1, #1 + bl FUN_0201797C + mov r0, #1 + add r1, r0, #0 + bl FUN_0201797C + mov r0, #3 + mov r1, #1 + bl FUN_0201797C + mov r0, #4 + mov r1, #1 + bl FUN_0201797C + mov r0, #5 + mov r1, #1 + bl FUN_0201797C + mov r0, #7 + mov r1, #1 + bl FUN_0201797C + mov r0, #6 + mov r1, #1 + str r0, [sp] + str r1, [sp, #4] + ldr r0, [r4] + add r2, r1, #0 + str r0, [sp, #8] + add r0, r6, #0 + add r3, r0, #0 + bl FUN_0200E1D0 + mov r0, #1 + str r0, [r5] + b _021D76A0 +_021D7614: + bl FUN_0200E308 + cmp r0, #1 + bne _021D76A0 + add r0, r6, #0 + str r0, [r4, #0x40] + mov r0, #2 + str r0, [r5] + b _021D76A0 +_021D7626: + ldr r0, [r4, #0x40] + cmp r0, #0x3c + bge _021D7632 + add r0, r0, #1 + str r0, [r4, #0x40] + b _021D76A0 +_021D7632: + mov r0, #3 + str r0, [r5] + b _021D76A0 +_021D7638: + mov r2, #0x3c + ldrsh r3, [r4, r2] + add r1, r2, #0 + sub r1, #0xfc + cmp r3, r1 + ble _021D764E + sub r1, r3, #4 + strh r1, [r4, #0x3c] + bl MOD86_021D7990 + b _021D76A0 +_021D764E: + sub r2, #0xfc + strh r2, [r4, #0x3c] + bl MOD86_021D7990 + mov r0, #4 + str r0, [r5] + b _021D76A0 +_021D765C: + ldr r0, _021D76A8 ; =0x021C48B8 + ldr r1, [r0, #0x48] + mov r0, #1 + and r0, r1 + cmp r0, #1 + beq _021D7678 + mov r0, #2 + and r0, r1 + cmp r0, #2 + beq _021D7678 + ldr r0, _021D76AC ; =0x021C48F8 + ldrh r0, [r0, #0x20] + cmp r0, #0 + beq _021D76A0 +_021D7678: + mov r0, #6 + str r0, [sp] + mov r0, #1 + str r0, [sp, #4] + ldr r0, [r4] + str r0, [sp, #8] + mov r0, #0 + add r1, r0, #0 + add r2, r0, #0 + add r3, r0, #0 + bl FUN_0200E1D0 + mov r0, #5 + str r0, [r5] + b _021D76A0 +_021D7696: + bl FUN_0200E308 + cmp r0, #1 + bne _021D76A0 + mov r6, #1 +_021D76A0: + add r0, r6, #0 + add sp, #0xc + pop {r3, r4, r5, r6, pc} + nop +_021D76A8: .word 0x021C48B8 +_021D76AC: .word 0x021C48F8 + thumb_func_end MOD86_021D758C + + thumb_func_start MOD86_021D76B0 +MOD86_021D76B0: ; 0x021D76B0 + push {r4, r5, r6, lr} + add r5, r0, #0 + bl FUN_02006278 + add r6, r0, #0 + ldr r4, [r6] + bl MOD86_021D7964 + add r0, r6, #0 + bl MOD86_021D7858 + mov r0, #0 + add r1, r0, #0 + bl FUN_02015F10 + add r0, r5, #0 + bl FUN_0200627C + add r0, r4, #0 + bl FUN_020168D0 + mov r0, #1 + pop {r4, r5, r6, pc} + .align 2, 0 + thumb_func_end MOD86_021D76B0 + + thumb_func_start MOD86_021D76E0 +MOD86_021D76E0: ; 0x021D76E0 + ldr r3, _021D76E8 ; =FUN_0201AB60 + ldr r0, [r0, #0x10] + bx r3 + nop +_021D76E8: .word FUN_0201AB60 + thumb_func_end MOD86_021D76E0 + + thumb_func_start MOD86_021D76EC +MOD86_021D76EC: ; 0x021D76EC + push {r4, r5, lr} + sub sp, #0x54 + ldr r5, _021D784C ; =0x021D7CBC + add r4, r0, #0 + add r3, sp, #0x2c + mov r2, #5 +_021D76F8: + ldmia r5!, {r0, r1} + stmia r3!, {r0, r1} + sub r2, r2, #1 + bne _021D76F8 + add r0, sp, #0x2c + bl FUN_0201E66C + ldr r0, [r4] + bl FUN_02016B94 + add r3, sp, #0x1c + ldr r5, _021D7850 ; =0x021D7C90 + str r0, [r4, #0x10] + add r2, r3, #0 + ldmia r5!, {r0, r1} + stmia r3!, {r0, r1} + ldmia r5!, {r0, r1} + stmia r3!, {r0, r1} + add r0, r2, #0 + bl FUN_02016BBC + ldr r5, _021D7854 ; =0x021D7CA0 + add r3, sp, #0 + ldmia r5!, {r0, r1} + add r2, r3, #0 + stmia r3!, {r0, r1} + ldmia r5!, {r0, r1} + stmia r3!, {r0, r1} + ldmia r5!, {r0, r1} + stmia r3!, {r0, r1} + ldr r0, [r5] + mov r1, #0 + str r0, [r3] + add r0, sp, #0 + strb r1, [r0, #0x12] + mov r3, #4 + strb r3, [r0, #0x13] + lsl r3, r3, #0xa + str r3, [sp, #8] + mov r3, #2 + strb r3, [r0, #0x10] + ldr r0, [r4, #0x10] + add r3, r1, #0 + bl FUN_02016C18 + ldr r0, [r4, #0x10] + mov r1, #0 + bl FUN_02018744 + mov r2, #2 + add r0, sp, #0 + strb r2, [r0, #0x12] + strb r2, [r0, #0x13] + lsl r1, r2, #0xb + str r1, [sp, #8] + strb r2, [r0, #0x10] + ldr r0, [r4, #0x10] + mov r1, #1 + add r2, sp, #0 + mov r3, #0 + bl FUN_02016C18 + ldr r0, [r4, #0x10] + mov r1, #1 + bl FUN_02018744 + mov r1, #4 + add r0, sp, #0 + strb r1, [r0, #0x12] + mov r2, #1 + strb r2, [r0, #0x13] + lsl r1, r2, #0xb + str r1, [sp, #8] + strb r2, [r0, #0x10] + ldr r0, [r4, #0x10] + mov r1, #3 + add r2, sp, #0 + mov r3, #0 + bl FUN_02016C18 + ldr r0, [r4, #0x10] + mov r1, #3 + bl FUN_02018744 + mov r1, #4 + mov r3, #0 + add r0, sp, #0 + strb r3, [r0, #0x12] + strb r1, [r0, #0x13] + lsl r2, r1, #0xa + str r2, [sp, #8] + mov r2, #2 + strb r2, [r0, #0x10] + ldr r0, [r4, #0x10] + add r2, sp, #0 + bl FUN_02016C18 + ldr r0, [r4, #0x10] + mov r1, #4 + bl FUN_02018744 + mov r2, #2 + add r0, sp, #0 + strb r2, [r0, #0x12] + strb r2, [r0, #0x13] + lsl r1, r2, #0xb + str r1, [sp, #8] + strb r2, [r0, #0x10] + ldr r0, [r4, #0x10] + mov r1, #5 + add r2, sp, #0 + mov r3, #0 + bl FUN_02016C18 + ldr r0, [r4, #0x10] + mov r1, #5 + bl FUN_02018744 + mov r1, #4 + add r0, sp, #0 + strb r1, [r0, #0x12] + mov r2, #1 + strb r2, [r0, #0x13] + lsl r1, r2, #0xb + str r1, [sp, #8] + strb r2, [r0, #0x10] + ldr r0, [r4, #0x10] + mov r1, #7 + add r2, sp, #0 + mov r3, #0 + bl FUN_02016C18 + ldr r0, [r4, #0x10] + mov r1, #7 + bl FUN_02018744 + mov r0, #0 + add r1, r0, #0 + bl FUN_0201797C + mov r0, #1 + mov r1, #0 + bl FUN_0201797C + mov r0, #2 + mov r1, #0 + bl FUN_0201797C + mov r0, #3 + mov r1, #0 + bl FUN_0201797C + mov r0, #4 + mov r1, #0 + bl FUN_0201797C + mov r0, #5 + mov r1, #0 + bl FUN_0201797C + mov r0, #6 + mov r1, #0 + bl FUN_0201797C + mov r0, #7 + mov r1, #0 + bl FUN_0201797C + add sp, #0x54 + pop {r4, r5, pc} + .align 2, 0 +_021D784C: .word 0x021D7CBC +_021D7850: .word 0x021D7C90 +_021D7854: .word 0x021D7CA0 + thumb_func_end MOD86_021D76EC + + thumb_func_start MOD86_021D7858 +MOD86_021D7858: ; 0x021D7858 + push {r4, lr} + add r4, r0, #0 + mov r0, #0 + add r1, r0, #0 + bl FUN_0201797C + mov r0, #1 + mov r1, #0 + bl FUN_0201797C + mov r0, #2 + mov r1, #0 + bl FUN_0201797C + mov r0, #3 + mov r1, #0 + bl FUN_0201797C + mov r0, #4 + mov r1, #0 + bl FUN_0201797C + mov r0, #5 + mov r1, #0 + bl FUN_0201797C + mov r0, #6 + mov r1, #0 + bl FUN_0201797C + mov r0, #7 + mov r1, #0 + bl FUN_0201797C + ldr r0, [r4, #0x10] + mov r1, #0 + bl FUN_020178A0 + ldr r0, [r4, #0x10] + mov r1, #1 + bl FUN_020178A0 + ldr r0, [r4, #0x10] + mov r1, #3 + bl FUN_020178A0 + ldr r0, [r4, #0x10] + mov r1, #4 + bl FUN_020178A0 + ldr r0, [r4, #0x10] + mov r1, #5 + bl FUN_020178A0 + ldr r0, [r4, #0x10] + mov r1, #7 + bl FUN_020178A0 + ldr r0, [r4, #0x10] + bl FUN_02016A18 + pop {r4, pc} + thumb_func_end MOD86_021D7858 + + thumb_func_start MOD86_021D78D4 +MOD86_021D78D4: ; 0x021D78D4 + push {r4, lr} + sub sp, #0x10 + ldr r1, _021D7960 ; =0x021D7C88 + add r4, r0, #0 + ldrh r2, [r1] + add r0, sp, #8 + strh r2, [r0] + ldrh r2, [r1, #2] + strh r2, [r0, #2] + ldrh r2, [r1, #4] + ldrh r1, [r1, #6] + strh r2, [r0, #4] + strh r1, [r0, #6] + bl FUN_0201BD5C + mov r0, #1 + ldr r3, [r4] + mov r1, #0x1a + add r2, r0, #0 + bl FUN_0200A86C + str r0, [r4, #0x34] + ldr r0, [r4] + bl FUN_0200AA80 + str r0, [r4, #0x38] + mov r1, #0 + add r0, sp, #8 + strb r1, [r0] + add r1, r4, #0 + ldr r0, [r4, #0x10] + add r1, #0x14 + add r2, sp, #8 + bl FUN_02019150 + mov r1, #0 + mov r0, #1 + lsl r0, r0, #8 + str r0, [sp] + mov r0, #0xc0 + str r0, [sp, #4] + add r0, r4, #0 + add r0, #0x14 + add r2, r1, #0 + add r3, r1, #0 + bl FUN_020196F4 + mov r1, #4 + add r0, sp, #8 + strb r1, [r0] + add r1, r4, #0 + ldr r0, [r4, #0x10] + add r1, #0x24 + add r2, sp, #8 + bl FUN_02019150 + mov r1, #0 + mov r0, #1 + lsl r0, r0, #8 + str r0, [sp] + mov r0, #0xc0 + add r4, #0x24 + str r0, [sp, #4] + add r0, r4, #0 + add r2, r1, #0 + add r3, r1, #0 + bl FUN_020196F4 + add sp, #0x10 + pop {r4, pc} + .align 2, 0 +_021D7960: .word 0x021D7C88 + thumb_func_end MOD86_021D78D4 + + thumb_func_start MOD86_021D7964 +MOD86_021D7964: ; 0x021D7964 + push {r4, lr} + add r4, r0, #0 + add r0, #0x24 + bl FUN_02019178 + add r0, r4, #0 + add r0, #0x14 + bl FUN_02019178 + ldr r0, [r4, #0x38] + bl FUN_0200AB18 + ldr r0, [r4, #0x34] + bl FUN_0200A8B8 + pop {r4, pc} + thumb_func_end MOD86_021D7964 + + thumb_func_start MOD86_021D7984 +MOD86_021D7984: ; 0x021D7984 + ldr r3, _021D798C ; =MOD86_021D7990 + mov r1, #0 + strh r1, [r0, #0x3c] + bx r3 + .align 2, 0 +_021D798C: .word MOD86_021D7990 + thumb_func_end MOD86_021D7984 + + thumb_func_start MOD86_021D7990 +MOD86_021D7990: ; 0x021D7990 + push {r4, lr} + add r4, r0, #0 + mov r3, #0x3c + ldrsh r3, [r4, r3] + ldr r0, [r4, #0x10] + mov r1, #1 + mov r2, #3 + bl FUN_020179E0 + mov r3, #0x3c + ldrsh r3, [r4, r3] + ldr r0, [r4, #0x10] + mov r1, #5 + mov r2, #3 + add r3, #0xc0 + bl FUN_020179E0 + mov r3, #0x3c + ldrsh r3, [r4, r3] + ldr r0, [r4, #0x10] + mov r1, #0 + mov r2, #3 + bl FUN_020179E0 + mov r3, #0x3c + ldrsh r3, [r4, r3] + ldr r0, [r4, #0x10] + mov r1, #4 + mov r2, #3 + add r3, #0xc0 + bl FUN_020179E0 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD86_021D7990 + + thumb_func_start MOD86_021D79D4 +MOD86_021D79D4: ; 0x021D79D4 + push {r4, r5, r6, r7, lr} + sub sp, #0x1c + add r5, r0, #0 + ldr r0, [r5, #4] + cmp r0, #0 + bne _021D79F4 + mov r0, #2 + str r0, [sp, #0x18] + mov r0, #6 + str r0, [sp, #0x14] + mov r0, #8 + mov r7, #0xa + str r0, [sp, #0x10] + mov r6, #0 + mov r4, #4 + b _021D7A06 +_021D79F4: + mov r0, #3 + str r0, [sp, #0x18] + mov r0, #7 + str r0, [sp, #0x14] + mov r0, #9 + mov r7, #0xb + str r0, [sp, #0x10] + mov r6, #1 + mov r4, #5 +_021D7A06: + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + ldr r0, [r5] + add r1, r7, #0 + str r0, [sp, #0xc] + ldr r2, [r5, #0x10] + mov r0, #0x84 + mov r3, #3 + bl FUN_020068C8 + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + ldr r0, [r5] + ldr r1, [sp, #0x18] + str r0, [sp, #0xc] + ldr r2, [r5, #0x10] + mov r0, #0x84 + mov r3, #3 + bl FUN_0200687C + mov r0, #0x20 + str r0, [sp] + ldr r0, [r5] + mov r2, #0 + str r0, [sp, #4] + ldr r1, [sp, #0x14] + mov r0, #0x84 + add r3, r2, #0 + bl FUN_02006930 + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + ldr r0, [r5] + add r1, r7, #0 + str r0, [sp, #0xc] + ldr r2, [r5, #0x10] + mov r0, #0x84 + mov r3, #7 + bl FUN_020068C8 + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + ldr r0, [r5] + ldr r1, [sp, #0x18] + str r0, [sp, #0xc] + ldr r2, [r5, #0x10] + mov r0, #0x84 + mov r3, #7 + bl FUN_0200687C + mov r0, #0x20 + str r0, [sp] + ldr r0, [r5] + ldr r1, [sp, #0x14] + str r0, [sp, #4] + mov r0, #0x84 + mov r2, #4 + mov r3, #0 + bl FUN_02006930 + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + ldr r0, [r5] + ldr r1, [sp, #0x10] + str r0, [sp, #0xc] + ldr r2, [r5, #0x10] + mov r0, #0x84 + mov r3, #1 + bl FUN_020068C8 + mov r0, #0x20 + str r0, [sp] + mov r0, #0x18 + str r0, [sp, #4] + mov r1, #1 + str r1, [sp, #8] + mov r2, #0 + ldr r0, [r5, #0x10] + add r3, r2, #0 + bl FUN_020186B4 + ldr r0, [r5, #0x10] + mov r1, #1 + bl FUN_02017CD0 + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + ldr r0, [r5] + add r1, r6, #0 + str r0, [sp, #0xc] + ldr r2, [r5, #0x10] + mov r0, #0x84 + mov r3, #1 + bl FUN_0200687C + mov r3, #0x20 + str r3, [sp] + ldr r0, [r5] + add r1, r4, #0 + str r0, [sp, #4] + mov r0, #0x84 + mov r2, #0 + bl FUN_02006930 + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + ldr r0, [r5] + ldr r1, [sp, #0x10] + str r0, [sp, #0xc] + ldr r2, [r5, #0x10] + mov r0, #0x84 + mov r3, #5 + bl FUN_020068C8 + mov r0, #0x20 + str r0, [sp] + mov r0, #0x18 + str r0, [sp, #4] + mov r0, #1 + str r0, [sp, #8] + mov r2, #0 + ldr r0, [r5, #0x10] + mov r1, #5 + add r3, r2, #0 + bl FUN_020186B4 + ldr r0, [r5, #0x10] + mov r1, #5 + bl FUN_02017CD0 + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + ldr r0, [r5] + add r1, r6, #0 + str r0, [sp, #0xc] + ldr r2, [r5, #0x10] + mov r0, #0x84 + mov r3, #5 + bl FUN_0200687C + mov r3, #0x20 + str r3, [sp] + ldr r0, [r5] + add r1, r4, #0 + str r0, [sp, #4] + mov r0, #0x84 + mov r2, #4 + bl FUN_02006930 + mov r0, #0 + ldr r3, [r5] + mov r1, #0x20 + add r2, r0, #0 + bl FUN_02017F18 + ldr r3, [r5] + mov r0, #4 + mov r1, #0x20 + mov r2, #0 + bl FUN_02017F18 + ldr r2, [r5] + mov r0, #0 + mov r1, #0x40 + bl FUN_02002ED0 + ldr r2, [r5] + mov r0, #4 + mov r1, #0x40 + bl FUN_02002ED0 + add sp, #0x1c + pop {r4, r5, r6, r7, pc} + thumb_func_end MOD86_021D79D4 + + thumb_func_start MOD86_021D7B80 +MOD86_021D7B80: ; 0x021D7B80 + push {r4, r5, r6, lr} + sub sp, #0x10 + add r5, r0, #0 + mov r0, #2 + ldr r1, [r5] + lsl r0, r0, #8 + bl FUN_020219F4 + add r4, r0, #0 + mov r0, #2 + ldr r1, [r5] + lsl r0, r0, #8 + bl FUN_020219F4 + add r6, r0, #0 + ldr r0, [r5, #0x34] + mov r1, #0 + add r2, r6, #0 + bl FUN_0200A8E0 + ldr r0, [r5, #0x38] + ldr r2, [r5, #0xc] + mov r1, #0 + bl FUN_0200ABC0 + ldr r0, [r5, #0x38] + add r1, r4, #0 + add r2, r6, #0 + bl FUN_0200B7B8 + mov r0, #0x20 + str r0, [sp] + mov r1, #0 + ldr r0, _021D7C84 ; =0x00010200 + str r1, [sp, #4] + str r0, [sp, #8] + add r0, r5, #0 + add r0, #0x14 + add r2, r4, #0 + mov r3, #0x30 + str r1, [sp, #0xc] + bl FUN_0201BDE0 + mov r0, #0x20 + str r0, [sp] + mov r1, #0 + ldr r0, _021D7C84 ; =0x00010200 + str r1, [sp, #4] + str r0, [sp, #8] + add r0, r5, #0 + add r0, #0x24 + add r2, r4, #0 + mov r3, #0x30 + str r1, [sp, #0xc] + bl FUN_0201BDE0 + add r0, r6, #0 + bl FUN_02021A20 + ldr r0, [r5, #4] + cmp r0, #0 + bne _021D7C00 + mov r1, #1 + b _021D7C02 +_021D7C00: + mov r1, #2 +_021D7C02: + ldr r0, [r5, #0x34] + add r2, r4, #0 + bl FUN_0200A8E0 + mov r3, #0x40 + str r3, [sp] + mov r1, #0 + ldr r0, _021D7C84 ; =0x00010200 + str r1, [sp, #4] + str r0, [sp, #8] + add r0, r5, #0 + add r0, #0x14 + add r2, r4, #0 + str r1, [sp, #0xc] + bl FUN_0201BDE0 + mov r3, #0x40 + str r3, [sp] + mov r1, #0 + ldr r0, _021D7C84 ; =0x00010200 + str r1, [sp, #4] + str r0, [sp, #8] + add r0, r5, #0 + str r1, [sp, #0xc] + add r0, #0x24 + add r2, r4, #0 + bl FUN_0201BDE0 + ldr r0, [r5, #0x34] + mov r1, #3 + add r2, r4, #0 + bl FUN_0200A8E0 + mov r0, #0x90 + str r0, [sp] + mov r1, #0 + ldr r0, _021D7C84 ; =0x00010200 + str r1, [sp, #4] + str r0, [sp, #8] + add r0, r5, #0 + add r0, #0x14 + add r2, r4, #0 + mov r3, #0x8a + str r1, [sp, #0xc] + bl FUN_0201BDE0 + mov r0, #0x90 + str r0, [sp] + mov r1, #0 + ldr r0, _021D7C84 ; =0x00010200 + str r1, [sp, #4] + str r0, [sp, #8] + add r5, #0x24 + add r0, r5, #0 + add r2, r4, #0 + mov r3, #0x8a + str r1, [sp, #0xc] + bl FUN_0201BDE0 + add r0, r4, #0 + bl FUN_02021A20 + add sp, #0x10 + pop {r4, r5, r6, pc} + nop +_021D7C84: .word 0x00010200 + thumb_func_end MOD86_021D7B80 + + .section .rodata + ; 0x021D7C88 + .incbin "baserom.nds", 0x30CDA8, 0x5C diff --git a/arm9/undefined_syms.txt b/arm9/undefined_syms.txt deleted file mode 100644 index ab2eb871..00000000 --- a/arm9/undefined_syms.txt +++ /dev/null @@ -1,529 +0,0 @@ - -// Overlay -FUN_021DE330 = 0x021DE330; -FUN_021EB550 = 0x021EB550; - -// Overlay - -SDK_OVERLAY_MODULE_00_ID = 0; -SDK_OVERLAY_MODULE_00_START = 0x021D74E0; -SDK_OVERLAY_MODULE_00_SIZE = 0x00000020; -SDK_OVERLAY_MODULE_00_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_00_STATIC_INIT_START = 0x021D74E0; -SDK_OVERLAY_MODULE_00_STATIC_INIT_END = 0x021D74E4; -SDK_OVERLAY_MODULE_01_ID = 1; -SDK_OVERLAY_MODULE_01_START = 0x021D74E0; -SDK_OVERLAY_MODULE_01_SIZE = 0x00000020; -SDK_OVERLAY_MODULE_01_BSSSIZE = 0x00000020; -SDK_OVERLAY_MODULE_01_STATIC_INIT_START = 0x021D74F0; -SDK_OVERLAY_MODULE_01_STATIC_INIT_END = 0x021D74F8; -SDK_OVERLAY_MODULE_02_ID = 2; -SDK_OVERLAY_MODULE_02_START = 0x021D7520; -SDK_OVERLAY_MODULE_02_SIZE = 0x00000020; -SDK_OVERLAY_MODULE_02_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_02_STATIC_INIT_START = 0x021D7520; -SDK_OVERLAY_MODULE_02_STATIC_INIT_END = 0x021D7524; -SDK_OVERLAY_MODULE_03_ID = 3; -SDK_OVERLAY_MODULE_03_START = 0x01FF8700; -SDK_OVERLAY_MODULE_03_SIZE = 0x00000020; -SDK_OVERLAY_MODULE_03_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_03_STATIC_INIT_START = 0x01FF8700; -SDK_OVERLAY_MODULE_03_STATIC_INIT_END = 0x01FF8704; -SDK_OVERLAY_MODULE_04_ID = 4; -SDK_OVERLAY_MODULE_04_START = 0x021D74E0; -SDK_OVERLAY_MODULE_04_SIZE = 0x000386E0; -SDK_OVERLAY_MODULE_04_BSSSIZE = 0x000022A0; -SDK_OVERLAY_MODULE_04_STATIC_INIT_START = 0x0220BE94; -SDK_OVERLAY_MODULE_04_STATIC_INIT_END = 0x0220BE98; -SDK_OVERLAY_MODULE_05_ID = 5; -SDK_OVERLAY_MODULE_05_START = 0x021D74E0; -SDK_OVERLAY_MODULE_05_SIZE = 0x000261A0; -SDK_OVERLAY_MODULE_05_BSSSIZE = 0x0003C020; -SDK_OVERLAY_MODULE_05_STATIC_INIT_START = 0x021FD1C8; -SDK_OVERLAY_MODULE_05_STATIC_INIT_END = 0x021FD1CC; -SDK_OVERLAY_MODULE_06_ID = 6; -SDK_OVERLAY_MODULE_06_START = 0x022396A0; -SDK_OVERLAY_MODULE_06_SIZE = 0x00018D80; -SDK_OVERLAY_MODULE_06_BSSSIZE = 0x00000020; -SDK_OVERLAY_MODULE_06_STATIC_INIT_START = 0x02252228; -SDK_OVERLAY_MODULE_06_STATIC_INIT_END = 0x0225222C; -SDK_OVERLAY_MODULE_07_ID = 7; -SDK_OVERLAY_MODULE_07_START = 0x02211E60; -SDK_OVERLAY_MODULE_07_SIZE = 0x000032E0; -SDK_OVERLAY_MODULE_07_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_07_STATIC_INIT_START = 0x02215134; -SDK_OVERLAY_MODULE_07_STATIC_INIT_END = 0x02215138; -SDK_OVERLAY_MODULE_08_ID = 8; -SDK_OVERLAY_MODULE_08_START = 0x02211E60; -SDK_OVERLAY_MODULE_08_SIZE = 0x0001B760; -SDK_OVERLAY_MODULE_08_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_08_STATIC_INIT_START = 0x0222D598; -SDK_OVERLAY_MODULE_08_STATIC_INIT_END = 0x0222D59C; -SDK_OVERLAY_MODULE_09_ID = 9; -SDK_OVERLAY_MODULE_09_START = 0x02211E60; -SDK_OVERLAY_MODULE_09_SIZE = 0x0000A1A0; -SDK_OVERLAY_MODULE_09_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_09_STATIC_INIT_START = 0x0221BFE8; -SDK_OVERLAY_MODULE_09_STATIC_INIT_END = 0x0221BFEC; -SDK_OVERLAY_MODULE_10_ID = 10; -SDK_OVERLAY_MODULE_10_START = 0x021D74E0; -SDK_OVERLAY_MODULE_10_SIZE = 0x00000020; -SDK_OVERLAY_MODULE_10_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_10_STATIC_INIT_START = 0x021D74E0; -SDK_OVERLAY_MODULE_10_STATIC_INIT_END = 0x021D74E4; -SDK_OVERLAY_MODULE_11_ID = 11; -SDK_OVERLAY_MODULE_11_START = 0x0222D5C0; -SDK_OVERLAY_MODULE_11_SIZE = 0x000329E0; -SDK_OVERLAY_MODULE_11_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_11_STATIC_INIT_START = 0x0225FF18; -SDK_OVERLAY_MODULE_11_STATIC_INIT_END = 0x0225FF20; -SDK_OVERLAY_MODULE_12_ID = 12; -SDK_OVERLAY_MODULE_12_START = 0x0222D5C0; -SDK_OVERLAY_MODULE_12_SIZE = 0x00019260; -SDK_OVERLAY_MODULE_12_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_12_STATIC_INIT_START = 0x02246810; -SDK_OVERLAY_MODULE_12_STATIC_INIT_END = 0x02246818; -SDK_OVERLAY_MODULE_13_ID = 13; -SDK_OVERLAY_MODULE_13_START = 0x02211E60; -SDK_OVERLAY_MODULE_13_SIZE = 0x0002EBE0; -SDK_OVERLAY_MODULE_13_BSSSIZE = 0x000027E0; -SDK_OVERLAY_MODULE_13_STATIC_INIT_START = 0x0223F768; -SDK_OVERLAY_MODULE_13_STATIC_INIT_END = 0x0223F76C; -SDK_OVERLAY_MODULE_14_ID = 14; -SDK_OVERLAY_MODULE_14_START = 0x021D74E0; -SDK_OVERLAY_MODULE_14_SIZE = 0x0000F520; -SDK_OVERLAY_MODULE_14_BSSSIZE = 0x000001A0; -SDK_OVERLAY_MODULE_14_STATIC_INIT_START = 0x021E69C8; -SDK_OVERLAY_MODULE_14_STATIC_INIT_END = 0x021E69CC; -SDK_OVERLAY_MODULE_15_ID = 15; -SDK_OVERLAY_MODULE_15_START = 0x021D74E0; -SDK_OVERLAY_MODULE_15_SIZE = 0x00004680; -SDK_OVERLAY_MODULE_15_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_15_STATIC_INIT_START = 0x021DBB5C; -SDK_OVERLAY_MODULE_15_STATIC_INIT_END = 0x021DBB60; -SDK_OVERLAY_MODULE_16_ID = 16; -SDK_OVERLAY_MODULE_16_START = 0x021D74E0; -SDK_OVERLAY_MODULE_16_SIZE = 0x00028500; -SDK_OVERLAY_MODULE_16_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_16_STATIC_INIT_START = 0x021FF9C4; -SDK_OVERLAY_MODULE_16_STATIC_INIT_END = 0x021FF9C8; -SDK_OVERLAY_MODULE_17_ID = 17; -SDK_OVERLAY_MODULE_17_START = 0x021D74E0; -SDK_OVERLAY_MODULE_17_SIZE = 0x00006E80; -SDK_OVERLAY_MODULE_17_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_17_STATIC_INIT_START = 0x021DE354; -SDK_OVERLAY_MODULE_17_STATIC_INIT_END = 0x021DE358; -SDK_OVERLAY_MODULE_18_ID = 18; -SDK_OVERLAY_MODULE_18_START = 0x022396A0; -SDK_OVERLAY_MODULE_18_SIZE = 0x00017CE0; -SDK_OVERLAY_MODULE_18_BSSSIZE = 0x00000080; -SDK_OVERLAY_MODULE_18_STATIC_INIT_START = 0x02250858; -SDK_OVERLAY_MODULE_18_STATIC_INIT_END = 0x0225085C; -SDK_OVERLAY_MODULE_19_ID = 19; -SDK_OVERLAY_MODULE_19_START = 0x02252440; -SDK_OVERLAY_MODULE_19_SIZE = 0x00000100; -SDK_OVERLAY_MODULE_19_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_19_STATIC_INIT_START = 0x02252524; -SDK_OVERLAY_MODULE_19_STATIC_INIT_END = 0x02252528; -SDK_OVERLAY_MODULE_20_ID = 20; -SDK_OVERLAY_MODULE_20_START = 0x02252440; -SDK_OVERLAY_MODULE_20_SIZE = 0x00002400; -SDK_OVERLAY_MODULE_20_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_20_STATIC_INIT_START = 0x02254838; -SDK_OVERLAY_MODULE_20_STATIC_INIT_END = 0x0225483C; -SDK_OVERLAY_MODULE_21_ID = 21; -SDK_OVERLAY_MODULE_21_START = 0x02254840; -SDK_OVERLAY_MODULE_21_SIZE = 0x000005C0; -SDK_OVERLAY_MODULE_21_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_21_STATIC_INIT_START = 0x02254DE8; -SDK_OVERLAY_MODULE_21_STATIC_INIT_END = 0x02254DF0; -SDK_OVERLAY_MODULE_22_ID = 22; -SDK_OVERLAY_MODULE_22_START = 0x02254840; -SDK_OVERLAY_MODULE_22_SIZE = 0x00000F00; -SDK_OVERLAY_MODULE_22_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_22_STATIC_INIT_START = 0x02255730; -SDK_OVERLAY_MODULE_22_STATIC_INIT_END = 0x02255738; -SDK_OVERLAY_MODULE_23_ID = 23; -SDK_OVERLAY_MODULE_23_START = 0x02254840; -SDK_OVERLAY_MODULE_23_SIZE = 0x00001900; -SDK_OVERLAY_MODULE_23_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_23_STATIC_INIT_START = 0x02256128; -SDK_OVERLAY_MODULE_23_STATIC_INIT_END = 0x02256130; -SDK_OVERLAY_MODULE_24_ID = 24; -SDK_OVERLAY_MODULE_24_START = 0x02254840; -SDK_OVERLAY_MODULE_24_SIZE = 0x000009A0; -SDK_OVERLAY_MODULE_24_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_24_STATIC_INIT_START = 0x022551C0; -SDK_OVERLAY_MODULE_24_STATIC_INIT_END = 0x022551C8; -SDK_OVERLAY_MODULE_25_ID = 25; -SDK_OVERLAY_MODULE_25_START = 0x02254840; -SDK_OVERLAY_MODULE_25_SIZE = 0x00000560; -SDK_OVERLAY_MODULE_25_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_25_STATIC_INIT_START = 0x02254D80; -SDK_OVERLAY_MODULE_25_STATIC_INIT_END = 0x02254D88; -SDK_OVERLAY_MODULE_26_ID = 26; -SDK_OVERLAY_MODULE_26_START = 0x02254840; -SDK_OVERLAY_MODULE_26_SIZE = 0x00000800; -SDK_OVERLAY_MODULE_26_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_26_STATIC_INIT_START = 0x02255020; -SDK_OVERLAY_MODULE_26_STATIC_INIT_END = 0x02255028; -SDK_OVERLAY_MODULE_27_ID = 27; -SDK_OVERLAY_MODULE_27_START = 0x02254840; -SDK_OVERLAY_MODULE_27_SIZE = 0x00000BA0; -SDK_OVERLAY_MODULE_27_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_27_STATIC_INIT_START = 0x022553C4; -SDK_OVERLAY_MODULE_27_STATIC_INIT_END = 0x022553CC; -SDK_OVERLAY_MODULE_28_ID = 28; -SDK_OVERLAY_MODULE_28_START = 0x02254840; -SDK_OVERLAY_MODULE_28_SIZE = 0x00001780; -SDK_OVERLAY_MODULE_28_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_28_STATIC_INIT_START = 0x02255F18; -SDK_OVERLAY_MODULE_28_STATIC_INIT_END = 0x02255F20; -SDK_OVERLAY_MODULE_29_ID = 29; -SDK_OVERLAY_MODULE_29_START = 0x02254840; -SDK_OVERLAY_MODULE_29_SIZE = 0x00000900; -SDK_OVERLAY_MODULE_29_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_29_STATIC_INIT_START = 0x0225512C; -SDK_OVERLAY_MODULE_29_STATIC_INIT_END = 0x02255134; -SDK_OVERLAY_MODULE_30_ID = 30; -SDK_OVERLAY_MODULE_30_START = 0x02254840; -SDK_OVERLAY_MODULE_30_SIZE = 0x00000600; -SDK_OVERLAY_MODULE_30_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_30_STATIC_INIT_START = 0x02254E28; -SDK_OVERLAY_MODULE_30_STATIC_INIT_END = 0x02254E30; -SDK_OVERLAY_MODULE_31_ID = 31; -SDK_OVERLAY_MODULE_31_START = 0x02254840; -SDK_OVERLAY_MODULE_31_SIZE = 0x00000600; -SDK_OVERLAY_MODULE_31_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_31_STATIC_INIT_START = 0x02254E20; -SDK_OVERLAY_MODULE_31_STATIC_INIT_END = 0x02254E28; -SDK_OVERLAY_MODULE_32_ID = 32; -SDK_OVERLAY_MODULE_32_START = 0x02254840; -SDK_OVERLAY_MODULE_32_SIZE = 0x000004A0; -SDK_OVERLAY_MODULE_32_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_32_STATIC_INIT_START = 0x02254CC4; -SDK_OVERLAY_MODULE_32_STATIC_INIT_END = 0x02254CCC; -SDK_OVERLAY_MODULE_33_ID = 33; -SDK_OVERLAY_MODULE_33_START = 0x02254840; -SDK_OVERLAY_MODULE_33_SIZE = 0x00000320; -SDK_OVERLAY_MODULE_33_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_33_STATIC_INIT_START = 0x02254B40; -SDK_OVERLAY_MODULE_33_STATIC_INIT_END = 0x02254B48; -SDK_OVERLAY_MODULE_34_ID = 34; -SDK_OVERLAY_MODULE_34_START = 0x02254840; -SDK_OVERLAY_MODULE_34_SIZE = 0x000004C0; -SDK_OVERLAY_MODULE_34_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_34_STATIC_INIT_START = 0x02254CF8; -SDK_OVERLAY_MODULE_34_STATIC_INIT_END = 0x02254D00; -SDK_OVERLAY_MODULE_35_ID = 35; -SDK_OVERLAY_MODULE_35_START = 0x02254840; -SDK_OVERLAY_MODULE_35_SIZE = 0x000009A0; -SDK_OVERLAY_MODULE_35_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_35_STATIC_INIT_START = 0x022551C0; -SDK_OVERLAY_MODULE_35_STATIC_INIT_END = 0x022551C8; -SDK_OVERLAY_MODULE_36_ID = 36; -SDK_OVERLAY_MODULE_36_START = 0x02254840; -SDK_OVERLAY_MODULE_36_SIZE = 0x00000CC0; -SDK_OVERLAY_MODULE_36_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_36_STATIC_INIT_START = 0x022554F8; -SDK_OVERLAY_MODULE_36_STATIC_INIT_END = 0x02255500; -SDK_OVERLAY_MODULE_37_ID = 37; -SDK_OVERLAY_MODULE_37_START = 0x02254840; -SDK_OVERLAY_MODULE_37_SIZE = 0x00000560; -SDK_OVERLAY_MODULE_37_BSSSIZE = 0x00000020; -SDK_OVERLAY_MODULE_37_STATIC_INIT_START = 0x02254D90; -SDK_OVERLAY_MODULE_37_STATIC_INIT_END = 0x02254D98; -SDK_OVERLAY_MODULE_38_ID = 38; -SDK_OVERLAY_MODULE_38_START = 0x02254840; -SDK_OVERLAY_MODULE_38_SIZE = 0x00000B40; -SDK_OVERLAY_MODULE_38_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_38_STATIC_INIT_START = 0x02255360; -SDK_OVERLAY_MODULE_38_STATIC_INIT_END = 0x02255368; -SDK_OVERLAY_MODULE_39_ID = 39; -SDK_OVERLAY_MODULE_39_START = 0x02254840; -SDK_OVERLAY_MODULE_39_SIZE = 0x00000CC0; -SDK_OVERLAY_MODULE_39_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_39_STATIC_INIT_START = 0x022554E4; -SDK_OVERLAY_MODULE_39_STATIC_INIT_END = 0x022554EC; -SDK_OVERLAY_MODULE_40_ID = 40; -SDK_OVERLAY_MODULE_40_START = 0x02254840; -SDK_OVERLAY_MODULE_40_SIZE = 0x00000C60; -SDK_OVERLAY_MODULE_40_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_40_STATIC_INIT_START = 0x02255480; -SDK_OVERLAY_MODULE_40_STATIC_INIT_END = 0x02255488; -SDK_OVERLAY_MODULE_41_ID = 41; -SDK_OVERLAY_MODULE_41_START = 0x02254840; -SDK_OVERLAY_MODULE_41_SIZE = 0x00001140; -SDK_OVERLAY_MODULE_41_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_41_STATIC_INIT_START = 0x02255974; -SDK_OVERLAY_MODULE_41_STATIC_INIT_END = 0x0225597C; -SDK_OVERLAY_MODULE_42_ID = 42; -SDK_OVERLAY_MODULE_42_START = 0x02254840; -SDK_OVERLAY_MODULE_42_SIZE = 0x00000900; -SDK_OVERLAY_MODULE_42_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_42_STATIC_INIT_START = 0x0225511C; -SDK_OVERLAY_MODULE_42_STATIC_INIT_END = 0x02255124; -SDK_OVERLAY_MODULE_43_ID = 43; -SDK_OVERLAY_MODULE_43_START = 0x02254840; -SDK_OVERLAY_MODULE_43_SIZE = 0x000009C0; -SDK_OVERLAY_MODULE_43_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_43_STATIC_INIT_START = 0x022551EC; -SDK_OVERLAY_MODULE_43_STATIC_INIT_END = 0x022551F4; -SDK_OVERLAY_MODULE_44_ID = 44; -SDK_OVERLAY_MODULE_44_START = 0x02254840; -SDK_OVERLAY_MODULE_44_SIZE = 0x000004A0; -SDK_OVERLAY_MODULE_44_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_44_STATIC_INIT_START = 0x02254CBC; -SDK_OVERLAY_MODULE_44_STATIC_INIT_END = 0x02254CC4; -SDK_OVERLAY_MODULE_45_ID = 45; -SDK_OVERLAY_MODULE_45_START = 0x02254840; -SDK_OVERLAY_MODULE_45_SIZE = 0x00000940; -SDK_OVERLAY_MODULE_45_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_45_STATIC_INIT_START = 0x02255170; -SDK_OVERLAY_MODULE_45_STATIC_INIT_END = 0x02255178; -SDK_OVERLAY_MODULE_46_ID = 46; -SDK_OVERLAY_MODULE_46_START = 0x02254840; -SDK_OVERLAY_MODULE_46_SIZE = 0x00000320; -SDK_OVERLAY_MODULE_46_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_46_STATIC_INIT_START = 0x02254B40; -SDK_OVERLAY_MODULE_46_STATIC_INIT_END = 0x02254B48; -SDK_OVERLAY_MODULE_47_ID = 47; -SDK_OVERLAY_MODULE_47_START = 0x02254840; -SDK_OVERLAY_MODULE_47_SIZE = 0x00000CA0; -SDK_OVERLAY_MODULE_47_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_47_STATIC_INIT_START = 0x022554BC; -SDK_OVERLAY_MODULE_47_STATIC_INIT_END = 0x022554C4; -SDK_OVERLAY_MODULE_48_ID = 48; -SDK_OVERLAY_MODULE_48_START = 0x02254840; -SDK_OVERLAY_MODULE_48_SIZE = 0x000008A0; -SDK_OVERLAY_MODULE_48_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_48_STATIC_INIT_START = 0x022550D0; -SDK_OVERLAY_MODULE_48_STATIC_INIT_END = 0x022550D8; -SDK_OVERLAY_MODULE_49_ID = 49; -SDK_OVERLAY_MODULE_49_START = 0x02254840; -SDK_OVERLAY_MODULE_49_SIZE = 0x00000600; -SDK_OVERLAY_MODULE_49_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_49_STATIC_INIT_START = 0x02254E20; -SDK_OVERLAY_MODULE_49_STATIC_INIT_END = 0x02254E28; -SDK_OVERLAY_MODULE_50_ID = 50; -SDK_OVERLAY_MODULE_50_START = 0x02254840; -SDK_OVERLAY_MODULE_50_SIZE = 0x00000320; -SDK_OVERLAY_MODULE_50_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_50_STATIC_INIT_START = 0x02254B50; -SDK_OVERLAY_MODULE_50_STATIC_INIT_END = 0x02254B58; -SDK_OVERLAY_MODULE_51_ID = 51; -SDK_OVERLAY_MODULE_51_START = 0x02254840; -SDK_OVERLAY_MODULE_51_SIZE = 0x00000FC0; -SDK_OVERLAY_MODULE_51_BSSSIZE = 0x00000020; -SDK_OVERLAY_MODULE_51_STATIC_INIT_START = 0x022557E0; -SDK_OVERLAY_MODULE_51_STATIC_INIT_END = 0x022557E4; -SDK_OVERLAY_MODULE_52_ID = 52; -SDK_OVERLAY_MODULE_52_START = 0x021D74E0; -SDK_OVERLAY_MODULE_52_SIZE = 0x00000400; -SDK_OVERLAY_MODULE_52_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_52_STATIC_INIT_START = 0x021D78D0; -SDK_OVERLAY_MODULE_52_STATIC_INIT_END = 0x021D78D4; -SDK_OVERLAY_MODULE_53_ID = 53; -SDK_OVERLAY_MODULE_53_START = 0x021D74E0; -SDK_OVERLAY_MODULE_53_SIZE = 0x00002480; -SDK_OVERLAY_MODULE_53_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_53_STATIC_INIT_START = 0x021D9888; -SDK_OVERLAY_MODULE_53_STATIC_INIT_END = 0x021D988C; -SDK_OVERLAY_MODULE_54_ID = 54; -SDK_OVERLAY_MODULE_54_START = 0x021D74E0; -SDK_OVERLAY_MODULE_54_SIZE = 0x00002380; -SDK_OVERLAY_MODULE_54_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_54_STATIC_INIT_START = 0x021D97D4; -SDK_OVERLAY_MODULE_54_STATIC_INIT_END = 0x021D97D8; -SDK_OVERLAY_MODULE_55_ID = 55; -SDK_OVERLAY_MODULE_55_START = 0x021D74E0; -SDK_OVERLAY_MODULE_55_SIZE = 0x00003040; -SDK_OVERLAY_MODULE_55_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_55_STATIC_INIT_START = 0x021DA480; -SDK_OVERLAY_MODULE_55_STATIC_INIT_END = 0x021DA484; -SDK_OVERLAY_MODULE_56_ID = 56; -SDK_OVERLAY_MODULE_56_START = 0x02211E60; -SDK_OVERLAY_MODULE_56_SIZE = 0x000047A0; -SDK_OVERLAY_MODULE_56_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_56_STATIC_INIT_START = 0x0221647C; -SDK_OVERLAY_MODULE_56_STATIC_INIT_END = 0x02216480; -SDK_OVERLAY_MODULE_57_ID = 57; -SDK_OVERLAY_MODULE_57_START = 0x021D74E0; -SDK_OVERLAY_MODULE_57_SIZE = 0x00002540; -SDK_OVERLAY_MODULE_57_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_57_STATIC_INIT_START = 0x021D9A10; -SDK_OVERLAY_MODULE_57_STATIC_INIT_END = 0x021D9A14; -SDK_OVERLAY_MODULE_58_ID = 58; -SDK_OVERLAY_MODULE_58_START = 0x021D9A20; -SDK_OVERLAY_MODULE_58_SIZE = 0x000015A0; -SDK_OVERLAY_MODULE_58_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_58_STATIC_INIT_START = 0x021DAF94; -SDK_OVERLAY_MODULE_58_STATIC_INIT_END = 0x021DAF98; -SDK_OVERLAY_MODULE_59_ID = 59; -SDK_OVERLAY_MODULE_59_START = 0x021D74E0; -SDK_OVERLAY_MODULE_59_SIZE = 0x00002C20; -SDK_OVERLAY_MODULE_59_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_59_STATIC_INIT_START = 0x021DA0FC; -SDK_OVERLAY_MODULE_59_STATIC_INIT_END = 0x021DA100; -SDK_OVERLAY_MODULE_60_ID = 60; -SDK_OVERLAY_MODULE_60_START = 0x021D74E0; -SDK_OVERLAY_MODULE_60_SIZE = 0x00000D00; -SDK_OVERLAY_MODULE_60_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_60_STATIC_INIT_START = 0x021D81D8; -SDK_OVERLAY_MODULE_60_STATIC_INIT_END = 0x021D81DC; -SDK_OVERLAY_MODULE_61_ID = 61; -SDK_OVERLAY_MODULE_61_START = 0x021D74E0; -SDK_OVERLAY_MODULE_61_SIZE = 0x00001080; -SDK_OVERLAY_MODULE_61_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_61_STATIC_INIT_START = 0x021D8554; -SDK_OVERLAY_MODULE_61_STATIC_INIT_END = 0x021D8558; -SDK_OVERLAY_MODULE_62_ID = 62; -SDK_OVERLAY_MODULE_62_START = 0x0222D5C0; -SDK_OVERLAY_MODULE_62_SIZE = 0x00003DE0; -SDK_OVERLAY_MODULE_62_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_62_STATIC_INIT_START = 0x02231380; -SDK_OVERLAY_MODULE_62_STATIC_INIT_END = 0x02231388; -SDK_OVERLAY_MODULE_63_ID = 63; -SDK_OVERLAY_MODULE_63_START = 0x021D74E0; -SDK_OVERLAY_MODULE_63_SIZE = 0x00004AC0; -SDK_OVERLAY_MODULE_63_BSSSIZE = 0x00000020; -SDK_OVERLAY_MODULE_63_STATIC_INIT_START = 0x021DBF20; -SDK_OVERLAY_MODULE_63_STATIC_INIT_END = 0x021DBF24; -SDK_OVERLAY_MODULE_64_ID = 64; -SDK_OVERLAY_MODULE_64_START = 0x021D74E0; -SDK_OVERLAY_MODULE_64_SIZE = 0x00001C40; -SDK_OVERLAY_MODULE_64_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_64_STATIC_INIT_START = 0x021D9110; -SDK_OVERLAY_MODULE_64_STATIC_INIT_END = 0x021D9114; -SDK_OVERLAY_MODULE_65_ID = 65; -SDK_OVERLAY_MODULE_65_START = 0x021D74E0; -SDK_OVERLAY_MODULE_65_SIZE = 0x00003000; -SDK_OVERLAY_MODULE_65_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_65_STATIC_INIT_START = 0x021DA428; -SDK_OVERLAY_MODULE_65_STATIC_INIT_END = 0x021DA42C; -SDK_OVERLAY_MODULE_66_ID = 66; -SDK_OVERLAY_MODULE_66_START = 0x021D74E0; -SDK_OVERLAY_MODULE_66_SIZE = 0x00002660; -SDK_OVERLAY_MODULE_66_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_66_STATIC_INIT_START = 0x021D9A9C; -SDK_OVERLAY_MODULE_66_STATIC_INIT_END = 0x021D9AA0; -SDK_OVERLAY_MODULE_67_ID = 67; -SDK_OVERLAY_MODULE_67_START = 0x021D74E0; -SDK_OVERLAY_MODULE_67_SIZE = 0x00002440; -SDK_OVERLAY_MODULE_67_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_67_STATIC_INIT_START = 0x021D9918; -SDK_OVERLAY_MODULE_67_STATIC_INIT_END = 0x021D991C; -SDK_OVERLAY_MODULE_68_ID = 68; -SDK_OVERLAY_MODULE_68_START = 0x021D74E0; -SDK_OVERLAY_MODULE_68_SIZE = 0x00001600; -SDK_OVERLAY_MODULE_68_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_68_STATIC_INIT_START = 0x021D8AD4; -SDK_OVERLAY_MODULE_68_STATIC_INIT_END = 0x021D8AD8; -SDK_OVERLAY_MODULE_69_ID = 69; -SDK_OVERLAY_MODULE_69_START = 0x0222D5C0; -SDK_OVERLAY_MODULE_69_SIZE = 0x000023A0; -SDK_OVERLAY_MODULE_69_BSSSIZE = 0x00000020; -SDK_OVERLAY_MODULE_69_STATIC_INIT_START = 0x0222F93C; -SDK_OVERLAY_MODULE_69_STATIC_INIT_END = 0x0222F940; -SDK_OVERLAY_MODULE_70_ID = 70; -SDK_OVERLAY_MODULE_70_START = 0x021D74E0; -SDK_OVERLAY_MODULE_70_SIZE = 0x00000E20; -SDK_OVERLAY_MODULE_70_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_70_STATIC_INIT_START = 0x021D82DC; -SDK_OVERLAY_MODULE_70_STATIC_INIT_END = 0x021D82E0; -SDK_OVERLAY_MODULE_71_ID = 71; -SDK_OVERLAY_MODULE_71_START = 0x0222D5C0; -SDK_OVERLAY_MODULE_71_SIZE = 0x00003EC0; -SDK_OVERLAY_MODULE_71_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_71_STATIC_INIT_START = 0x0223147C; -SDK_OVERLAY_MODULE_71_STATIC_INIT_END = 0x02231480; -SDK_OVERLAY_MODULE_72_ID = 72; -SDK_OVERLAY_MODULE_72_START = 0x021D74E0; -SDK_OVERLAY_MODULE_72_SIZE = 0x00000020; -SDK_OVERLAY_MODULE_72_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_72_STATIC_INIT_START = 0x021D74E0; -SDK_OVERLAY_MODULE_72_STATIC_INIT_END = 0x021D74E4; -SDK_OVERLAY_MODULE_73_ID = 73; -SDK_OVERLAY_MODULE_73_START = 0x021D74E0; -SDK_OVERLAY_MODULE_73_SIZE = 0x00004AE0; -SDK_OVERLAY_MODULE_73_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_73_STATIC_INIT_START = 0x021DBF70; -SDK_OVERLAY_MODULE_73_STATIC_INIT_END = 0x021DBF74; -SDK_OVERLAY_MODULE_74_ID = 74; -SDK_OVERLAY_MODULE_74_START = 0x021D74E0; -SDK_OVERLAY_MODULE_74_SIZE = 0x00001220; -SDK_OVERLAY_MODULE_74_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_74_STATIC_INIT_START = 0x021D8664; -SDK_OVERLAY_MODULE_74_STATIC_INIT_END = 0x021D8668; -SDK_OVERLAY_MODULE_75_ID = 75; -SDK_OVERLAY_MODULE_75_START = 0x021E6BA0; -SDK_OVERLAY_MODULE_75_SIZE = 0x00005DE0; -SDK_OVERLAY_MODULE_75_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_75_STATIC_INIT_START = 0x021EC97C; -SDK_OVERLAY_MODULE_75_STATIC_INIT_END = 0x021EC980; -SDK_OVERLAY_MODULE_76_ID = 76; -SDK_OVERLAY_MODULE_76_START = 0x021D74E0; -SDK_OVERLAY_MODULE_76_SIZE = 0x00001E20; -SDK_OVERLAY_MODULE_76_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_76_STATIC_INIT_START = 0x021D92E0; -SDK_OVERLAY_MODULE_76_STATIC_INIT_END = 0x021D92E4; -SDK_OVERLAY_MODULE_77_ID = 77; -SDK_OVERLAY_MODULE_77_START = 0x021D74E0; -SDK_OVERLAY_MODULE_77_SIZE = 0x00001BE0; -SDK_OVERLAY_MODULE_77_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_77_STATIC_INIT_START = 0x021D90AC; -SDK_OVERLAY_MODULE_77_STATIC_INIT_END = 0x021D90B0; -SDK_OVERLAY_MODULE_78_ID = 78; -SDK_OVERLAY_MODULE_78_START = 0x021D74E0; -SDK_OVERLAY_MODULE_78_SIZE = 0x00000460; -SDK_OVERLAY_MODULE_78_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_78_STATIC_INIT_START = 0x021D78F8; -SDK_OVERLAY_MODULE_78_STATIC_INIT_END = 0x021D78FC; -SDK_OVERLAY_MODULE_79_ID = 79; -SDK_OVERLAY_MODULE_79_START = 0x02211E60; -SDK_OVERLAY_MODULE_79_SIZE = 0x000052C0; -SDK_OVERLAY_MODULE_79_BSSSIZE = 0x00000040; -SDK_OVERLAY_MODULE_79_STATIC_INIT_START = 0x02216748; -SDK_OVERLAY_MODULE_79_STATIC_INIT_END = 0x0221674C; -SDK_OVERLAY_MODULE_80_ID = 80; -SDK_OVERLAY_MODULE_80_START = 0x0222D5C0; -SDK_OVERLAY_MODULE_80_SIZE = 0x0000A720; -SDK_OVERLAY_MODULE_80_BSSSIZE = 0x00000160; -SDK_OVERLAY_MODULE_80_STATIC_INIT_START = 0x02237670; -SDK_OVERLAY_MODULE_80_STATIC_INIT_END = 0x02237674; -SDK_OVERLAY_MODULE_81_ID = 81; -SDK_OVERLAY_MODULE_81_START = 0x02237E40; -SDK_OVERLAY_MODULE_81_SIZE = 0x00005580; -SDK_OVERLAY_MODULE_81_BSSSIZE = 0x000000A0; -SDK_OVERLAY_MODULE_81_STATIC_INIT_START = 0x0223D39C; -SDK_OVERLAY_MODULE_81_STATIC_INIT_END = 0x0223D3A0; -SDK_OVERLAY_MODULE_82_ID = 82; -SDK_OVERLAY_MODULE_82_START = 0x0222D5C0; -SDK_OVERLAY_MODULE_82_SIZE = 0x00002540; -SDK_OVERLAY_MODULE_82_BSSSIZE = 0x00000120; -SDK_OVERLAY_MODULE_82_STATIC_INIT_START = 0x0222F8CC; -SDK_OVERLAY_MODULE_82_STATIC_INIT_END = 0x0222F8D0; -SDK_OVERLAY_MODULE_83_ID = 83; -SDK_OVERLAY_MODULE_83_START = 0x0222D5C0; -SDK_OVERLAY_MODULE_83_SIZE = 0x0000E2A0; -SDK_OVERLAY_MODULE_83_BSSSIZE = 0x00001980; -SDK_OVERLAY_MODULE_83_STATIC_INIT_START = 0x0223A77C; -SDK_OVERLAY_MODULE_83_STATIC_INIT_END = 0x0223A780; -SDK_OVERLAY_MODULE_84_ID = 84; -SDK_OVERLAY_MODULE_84_START = 0x021D74E0; -SDK_OVERLAY_MODULE_84_SIZE = 0x00003920; -SDK_OVERLAY_MODULE_84_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_84_STATIC_INIT_START = 0x021DADE4; -SDK_OVERLAY_MODULE_84_STATIC_INIT_END = 0x021DADE8; -SDK_OVERLAY_MODULE_85_ID = 85; -SDK_OVERLAY_MODULE_85_START = 0x021D74E0; -SDK_OVERLAY_MODULE_85_SIZE = 0x00009100; -SDK_OVERLAY_MODULE_85_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_85_STATIC_INIT_START = 0x021E05A0; -SDK_OVERLAY_MODULE_85_STATIC_INIT_END = 0x021E05A4; -SDK_OVERLAY_MODULE_86_ID = 86; -SDK_OVERLAY_MODULE_86_START = 0x021D74E0; -SDK_OVERLAY_MODULE_86_SIZE = 0x00000820; -SDK_OVERLAY_MODULE_86_BSSSIZE = 0x00000000; -SDK_OVERLAY_MODULE_86_STATIC_INIT_START = 0x021D7CE4; -SDK_OVERLAY_MODULE_86_STATIC_INIT_END = 0x021D7CE8; |