diff options
280 files changed, 3332 insertions, 1039 deletions
@@ -1,6 +1,7 @@ # Makefile to build Pokemon Diamond image include config.mk +include graphics_rules.mk HOSTCC = $(CC) HOSTCXX = $(CXX) @@ -65,8 +66,9 @@ BNR := $(BUILD_DIR)/$(TARGET).bnr SRC_DIRS := src ASM_DIRS := asm data files -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) +# sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds +C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) +S_FILES := $(foreach dir,$(ASM_DIRS),$(sort $(wildcard $(dir)/*.s))) # Object files O_FILES := $(foreach file,$(C_FILES),$(BUILD_DIR)/$(file:.c=.o)) \ @@ -156,6 +158,7 @@ clean: mostlyclean clean-fs clean-fs: $(RM) $(filter %.narc %.arc,$(HOSTFS_FILES)) + $(RM) $(NCGR_CLEAN_LIST) $(NCLR_CLEAN_LIST) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} + mostlyclean: tidy @@ -240,6 +243,27 @@ PADDED_LZ_FILES := $(addsuffix .lz,$(wildcard \ $(PADDED_LZ_FILES): %.lz: % $(NTRCOMP) -l2 -s -A4 -o $@ $< +%.NCGR: %.png + $(GFX) $< $@ + +$(CLOBBER_SIZE_NCGR_FILES): %.NCGR: %.png + $(GFX) $< $@ -clobbersize + +$(CLOBBER_SIZE_VERSION101_NCGR_FILES): %.NCGR: %.png + $(GFX) $< $@ -clobbersize -version101 + +$(VERSION101_SOPC_8BPP_NCGR_FILES): %.NCGR: %.png + $(GFX) $< $@ -version101 -sopc -bitdepth 8 + +%.NCLR: %.png + $(GFX) $< $@ + +%.NCLR: %.pal + $(GFX) $< $@ + +$(IR_NCLR_FILES): %.NCLR: %.pal + $(GFX) $< $@ -ir + %.png: ; %.pal: ; diff --git a/arm7/Makefile b/arm7/Makefile index abb7cf03..88f796a0 100644 --- a/arm7/Makefile +++ b/arm7/Makefile @@ -49,8 +49,9 @@ LD_TEMPLATE := ARM7-TS.lcf.template SRC_DIRS := src lib lib/src ASM_DIRS := asm data files -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) +# sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds +C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) +S_FILES := $(foreach dir,$(ASM_DIRS),$(sort $(wildcard $(dir)/*.s))) C_OBJS = $(C_FILES:%.c=$(BUILD_DIR)/%.o) S_OBJS = $(S_FILES:%.s=$(BUILD_DIR)/%.o) diff --git a/arm9/Makefile b/arm9/Makefile index 4d4b553c..42228747 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -48,14 +48,16 @@ LD_SPEC := $(TARGET).lsf LD_TEMPLATE := ARM9-TS.lcf.template # Directories containing source files -SRC_DIRS := src lib lib/src $(wildcard modules/*/src) -ASM_DIRS := asm data files $(wildcard modules/*/asm) + +# sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds +SRC_DIRS := src lib lib/src $(sort $(wildcard modules/*/src)) +ASM_DIRS := asm data files $(sort $(wildcard modules/*/asm)) LIBASM_DIRS := lib/syscall -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) -CXX_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp)) -S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) -LIBS_FILES := $(foreach dir,$(LIBASM_DIRS),$(wildcard $(dir)/*.s)) +C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) +CXX_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.cpp))) +S_FILES := $(foreach dir,$(ASM_DIRS),$(sort $(wildcard $(dir)/*.s))) +LIBS_FILES := $(foreach dir,$(LIBASM_DIRS),$(sort $(wildcard $(dir)/*.s))) C_OBJS = $(C_FILES:%.c=$(BUILD_DIR)/%.o) CXX_OBJS = $(CXX_FILES:%.cpp=$(BUILD_DIR)/%.o) diff --git a/arm9/global.inc b/arm9/global.inc index 1a77046c..9cfbdec2 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2004,6 +2004,7 @@ .extern FUN_0202A170 .extern FUN_0202A1B8 .extern FUN_0202A1C4 +.extern FUN_0202A1E0 .extern FUN_0202A1E4 .extern FUN_0202A240 .extern FUN_0202A2C4 @@ -2145,6 +2146,7 @@ .extern FUN_0202B8B8 .extern FUN_0202B8E4 .extern FUN_0202B8F0 +.extern FUN_0202B934 .extern FUN_0202B9EC .extern FUN_0202BCF4 .extern FUN_0202BD6C @@ -7261,6 +7263,18 @@ .extern MOD79_02213D80 .extern MOD79_02213DBC .extern MOD79_02213E24 +.extern MOD79_02216858 +.extern MOD79_02217124 +.extern MOD79_02217128 +.extern MOD79_0221712C +.extern MOD79_02217130 +.extern MOD79_02217134 +.extern MOD79_02217138 +.extern MOD79_0221713C +.extern MOD79_02217140 +.extern MOD79_02217144 +.extern MOD79_02217148 +.extern MOD79_0221714C .extern MOD80_0222DFD0 .extern MOD80_0222E134 .extern MOD80_0222E25C diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index 8ec9903c..ccf6c969 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -92,7 +92,7 @@ _022548E0: pop {r3, r4, r5, pc} .align 2, 0 _022548E4: .word 0x000016F0 -_022548E8: .word 0x022550F8 +_022548E8: .word MOD24_022550F8 _022548EC: .word MOD24_02254960 _022548F0: .word 0x000016FC thumb_func_end MOD24_0225489C @@ -131,7 +131,7 @@ MOD24_02254918: ; 0x02254918 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _0225495C ; =0x02255100 + ldr r1, _0225495C ; =MOD24_02255100 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -147,7 +147,7 @@ _02254954: pop {r3, r4, r5, pc} nop _02254958: .word 0x000016F8 -_0225495C: .word 0x02255100 +_0225495C: .word MOD24_02255100 thumb_func_end MOD24_02254918 thumb_func_start MOD24_02254960 @@ -679,7 +679,7 @@ MOD24_02254D00: ; 0x02254D00 add r1, r0, #0 beq _02254D3C ldr r0, [r4, #4] - ldr r2, _02254D40 ; =0x0225510C + ldr r2, _02254D40 ; =MOD24_0225510C bl FUN_02019150 mov r2, #0xbe ldr r1, [r4] @@ -701,7 +701,7 @@ _02254D3C: mov r0, #0 pop {r4, pc} .align 2, 0 -_02254D40: .word 0x0225510C +_02254D40: .word MOD24_0225510C _02254D44: .word 0x000016E8 thumb_func_end MOD24_02254D00 @@ -750,13 +750,13 @@ MOD24_02254D8C: ; 0x02254D8C str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254DAC ; =0x0225516C + ldr r0, _02254DAC ; =MOD24_0225516C ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254DAC: .word 0x0225516C +_02254DAC: .word MOD24_0225516C thumb_func_end MOD24_02254D8C thumb_func_start MOD24_02254DB0 @@ -804,12 +804,12 @@ _02254DF0: bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254ED0 ; =0x02255114 + ldr r2, _02254ED0 ; =MOD24_02255114 mov r1, #6 mov r3, #0 bl FUN_02016C18 ldr r0, [r5, #4] - ldr r2, _02254ED4 ; =0x02255130 + ldr r2, _02254ED4 ; =MOD24_02255130 mov r1, #7 mov r3, #0 bl FUN_02016C18 @@ -897,8 +897,8 @@ _02254ECC: add sp, #0x14 pop {r4, r5, pc} .align 2, 0 -_02254ED0: .word 0x02255114 -_02254ED4: .word 0x02255130 +_02254ED0: .word MOD24_02255114 +_02254ED4: .word MOD24_02255130 _02254ED8: .word 0x04001000 _02254EDC: .word 0xFFFFE0FF thumb_func_end MOD24_02254DDC @@ -1136,7 +1136,7 @@ MOD24_02255078: ; 0x02255078 add r0, r7, #0 str r0, [sp, #0xc] add r0, #0x54 - ldr r4, _022550D0 ; =0x0225514C + ldr r4, _022550D0 ; =MOD24_0225514C mov r6, #0 add r5, r7, #0 str r0, [sp, #0xc] @@ -1155,7 +1155,7 @@ _022550CC: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022550D0: .word 0x0225514C +_022550D0: .word MOD24_0225514C thumb_func_end MOD24_02255078 thumb_func_start MOD24_022550D4 @@ -1180,20 +1180,45 @@ _022550DC: thumb_func_end MOD24_022550D4 .section .rodata - ; 0x022550F8 - .byte 0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC, 0xAD, 0x49, 0x25, 0x02, 0xF9, 0x49, 0x25, 0x02 - .byte 0x65, 0x4C, 0x25, 0x02, 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00 + .global MOD24_022550F8 +MOD24_022550F8: ; 0x022550F8 + .byte 0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC + + .global MOD24_02255100 +MOD24_02255100: ; 0x02255100 + .word MOD24_022549AC, MOD24_022549F8, MOD24_02254C64 + + .global MOD24_0225510C +MOD24_0225510C: ; 0x0225510C + .byte 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C, 0x00 + + .global MOD24_02255114 +MOD24_02255114: ; 0x02255114 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD24_02255130 +MOD24_02255130: ; 0x02255130 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD24_0225514C +MOD24_0225514C: ; 0x0225514C + .byte 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x08, 0x00, 0x03, 0x00, 0x00, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0xE1, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x29, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x41, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x39, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x51, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD24_0225516C +MOD24_0225516C: ; 0x0225516C + .word 0x00, MOD24_02254DDC, 0x00 + .word 0x01, MOD24_02254EE0, 0x00 + .word 0x02, MOD24_02254F28, 0x00 + .word 0x03, MOD24_02254F40, 0x00 + .word 0x04, MOD24_02255038, 0x00 + .word 0x05, MOD24_02255050, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD24_02254840 diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index cf57dc32..ba331a34 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -94,7 +94,7 @@ _022548E6: strb r0, [r5, #5] mov r0, #8 str r0, [sp] - ldr r0, _02254914 ; =0x02254CF8 + ldr r0, _02254914 ; =MOD25_02254CF8 mov r1, #1 add r3, r5, #0 bl MOD20_02254130 @@ -112,7 +112,7 @@ _0225490A: pop {r3, r4, r5, pc} nop _02254910: .word MOD25_02254974 -_02254914: .word 0x02254CF8 +_02254914: .word MOD25_02254CF8 thumb_func_end MOD25_0225489C thumb_func_start MOD25_02254918 @@ -142,7 +142,7 @@ MOD25_02254930: ; 0x02254930 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254968 ; =0x02254CFC + ldr r1, _02254968 ; =MOD25_02254CFC ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -156,7 +156,7 @@ MOD25_02254930: ; 0x02254930 _02254966: pop {r3, r4, r5, pc} .align 2, 0 -_02254968: .word 0x02254CFC +_02254968: .word MOD25_02254CFC thumb_func_end MOD25_02254930 thumb_func_start MOD25_0225496C @@ -389,13 +389,13 @@ MOD25_02254AE4: ; 0x02254AE4 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254B04 ; =0x02254D44 + ldr r0, _02254B04 ; =MOD25_02254D44 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254B04: .word 0x02254D44 +_02254B04: .word MOD25_02254D44 thumb_func_end MOD25_02254AE4 thumb_func_start MOD25_02254B08 @@ -437,7 +437,7 @@ MOD25_02254B34: ; 0x02254B34 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254BBC ; =0x02254D08 + ldr r2, _02254BBC ; =MOD25_02254D08 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -491,7 +491,7 @@ MOD25_02254B34: ; 0x02254B34 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 -_02254BBC: .word 0x02254D08 +_02254BBC: .word MOD25_02254D08 _02254BC0: .word 0x04001000 _02254BC4: .word 0xFFFFE0FF thumb_func_end MOD25_02254B34 @@ -613,7 +613,7 @@ MOD25_02254C74: ; 0x02254C74 add r0, r7, #0 str r0, [sp, #0xc] add r0, #0x34 - ldr r4, _02254CD4 ; =0x02254D24 + ldr r4, _02254CD4 ; =MOD25_02254D24 mov r6, #0 add r5, r7, #0 str r0, [sp, #0xc] @@ -636,7 +636,7 @@ _02254CCE: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254CD4: .word 0x02254D24 +_02254CD4: .word MOD25_02254D24 thumb_func_end MOD25_02254C74 thumb_func_start MOD25_02254CD8 @@ -659,16 +659,33 @@ _02254CE6: thumb_func_end MOD25_02254CD8 .section .rodata - ; 0x02254CF8 - .byte 0x10, 0xAF, 0x10, 0xCF, 0xA5, 0x49, 0x25, 0x02, 0xE5, 0x49, 0x25, 0x02, 0x39, 0x4A, 0x25, 0x02 + + .global MOD25_02254CF8 +MOD25_02254CF8: ; 0x02254CF8 + .byte 0x10, 0xAF, 0x10, 0xCF + + .global MOD25_02254CFC +MOD25_02254CFC: ; 0x02254CFC + .word MOD25_022549A4, MOD25_022549E4, MOD25_02254A38 + + .global MOD25_02254D08 +MOD25_02254D08: ; 0x02254D08 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x07, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD25_02254D24 +MOD25_02254D24: ; 0x02254D24 + .byte 0x00, 0x40, 0x07, 0x00 .byte 0x00, 0x40, 0x06, 0x00, 0x3C, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x40, 0x07, 0x00 - .byte 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x35, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC9, 0x4B, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x40, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00 + + .global MOD25_02254D44 +MOD25_02254D44: ; 0x02254D44 + .word 0x00, MOD25_02254B34, 0x00 + .word 0x01, MOD25_02254BC8, 0x00 + .word 0x02, MOD25_02254BE8, 0x00 + .word 0x03, MOD25_02254C14, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD25_02254840 diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s index bba03256..12d880aa 100644 --- a/arm9/modules/26/asm/module_26.s +++ b/arm9/modules/26/asm/module_26.s @@ -228,7 +228,7 @@ _0225498A: MOD26_022549DC: ; 0x022549DC push {r4, r5} mov r4, #0 - ldr r5, _02254A00 ; =0x02254DF0 + ldr r5, _02254A00 ; =MOD26_02254DF0 add r2, r4, #0 _022549E4: add r3, r2, #0 @@ -246,7 +246,7 @@ _022549E6: pop {r4, r5} bx lr nop -_02254A00: .word 0x02254DF0 +_02254A00: .word MOD26_02254DF0 thumb_func_end MOD26_022549DC thumb_func_start MOD26_02254A04 @@ -296,7 +296,7 @@ MOD26_02254A4C: ; 0x02254A4C cmp r1, #3 bhs _02254A7C lsl r2, r1, #2 - ldr r1, _02254A80 ; =0x02254DE4 + ldr r1, _02254A80 ; =MOD26_02254DE4 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -313,7 +313,7 @@ MOD26_02254A4C: ; 0x02254A4C _02254A7C: pop {r3, r4, r5, pc} nop -_02254A80: .word 0x02254DE4 +_02254A80: .word MOD26_02254DE4 thumb_func_end MOD26_02254A4C thumb_func_start MOD26_02254A84 @@ -552,13 +552,13 @@ MOD26_02254C10: ; 0x02254C10 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254C30 ; =0x02254FF0 + ldr r0, _02254C30 ; =MOD26_02254FF0 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254C30: .word 0x02254FF0 +_02254C30: .word MOD26_02254FF0 thumb_func_end MOD26_02254C10 thumb_func_start MOD26_02254C34 @@ -599,7 +599,7 @@ MOD26_02254C60: ; 0x02254C60 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254CB8 ; =0x02254FD4 + ldr r2, _02254CB8 ; =MOD26_02254FD4 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -631,7 +631,7 @@ MOD26_02254C60: ; 0x02254C60 bl MOD26_02254C4C pop {r3, r4, r5, pc} .align 2, 0 -_02254CB8: .word 0x02254FD4 +_02254CB8: .word MOD26_02254FD4 _02254CBC: .word 0x04001000 _02254CC0: .word 0xFFFFE0FF thumb_func_end MOD26_02254C60 @@ -762,7 +762,7 @@ MOD26_02254DAC: ; 0x02254DAC mov r1, #6 bl FUN_0201886C mov r5, #0 - ldr r1, _02254DE0 ; =0x02254FD0 + ldr r1, _02254DE0 ; =MOD26_02254FD0 add r0, #0x84 add r2, r5, #0 _02254DBE: @@ -785,12 +785,18 @@ _02254DC2: blt _02254DBE pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254DE0: .word 0x02254FD0 +_02254DE0: .word MOD26_02254FD0 thumb_func_end MOD26_02254DAC .section .rodata - ; 0x02254DE4 - .byte 0xA1, 0x4A, 0x25, 0x02, 0xED, 0x4A, 0x25, 0x02, 0x99, 0x4B, 0x25, 0x02, 0x01, 0x01, 0x01, 0x01 + + .global MOD26_02254DE4 +MOD26_02254DE4: ; 0x02254DE4 + .word MOD26_02254AA0, MOD26_02254AEC, MOD26_02254B98 + + .global MOD26_02254DF0 +MOD26_02254DF0: ; 0x02254DF0 + .byte 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 @@ -820,12 +826,23 @@ _02254DE0: .word 0x02254FD0 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x04, 0x0F, 0x08, 0x01 + .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + + .global MOD26_02254FD0 +MOD26_02254FD0: ; 0x02254FD0 + .byte 0x04, 0x0F, 0x08, 0x01 + + .global MOD26_02254FD4 +MOD26_02254FD4: ; 0x02254FD4 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x61, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x6D, 0x4D, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x91, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD26_02254FF0 +MOD26_02254FF0: ; 0x02254FF0 + .word 0x00, MOD26_02254C60, 0x00 + .word 0x01, MOD26_02254D6C, 0x00 + .word 0x02, MOD26_02254D90, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD26_02254840 diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 1b731add..d11eeb44 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -110,7 +110,7 @@ MOD27_022548F8: ; 0x022548F8 cmp r1, #3 bhs _02254924 lsl r2, r1, #2 - ldr r1, _02254928 ; =0x0225533C + ldr r1, _02254928 ; =MOD27_0225533C add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -125,7 +125,7 @@ MOD27_022548F8: ; 0x022548F8 _02254924: pop {r3, r4, r5, pc} nop -_02254928: .word 0x0225533C +_02254928: .word MOD27_0225533C thumb_func_end MOD27_022548F8 thumb_func_start MOD27_0225492C @@ -477,13 +477,13 @@ MOD27_02254BB8: ; 0x02254BB8 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254BD8 ; =0x02255394 + ldr r0, _02254BD8 ; =MOD27_02255394 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254BD8: .word 0x02255394 +_02254BD8: .word MOD27_02255394 thumb_func_end MOD27_02254BB8 thumb_func_start MOD27_02254BDC @@ -525,7 +525,7 @@ MOD27_02254C08: ; 0x02254C08 bl MOD20_022538A0 add r4, r0, #0 ldr r0, [r4, #4] - ldr r2, _02254CBC ; =0x02255378 + ldr r2, _02254CBC ; =MOD27_02255378 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -595,7 +595,7 @@ MOD27_02254C08: ; 0x02254C08 add sp, #0x14 pop {r3, r4, r5, r6, pc} nop -_02254CBC: .word 0x02255378 +_02254CBC: .word MOD27_02255378 _02254CC0: .word 0x04001000 _02254CC4: .word 0xFFFFE0FF thumb_func_end MOD27_02254C08 @@ -615,7 +615,7 @@ MOD27_02254CC8: ; 0x02254CC8 ble _02254D54 ldr r4, [sp, #0x14] ldr r7, [sp, #0x20] - ldr r5, _02254D5C ; =0x02255360 + ldr r5, _02254D5C ; =MOD27_02255360 ldr r6, [sp, #0x18] add r4, #0x3c _02254CE8: @@ -673,7 +673,7 @@ _02254D54: add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 -_02254D5C: .word 0x02255360 +_02254D5C: .word MOD27_02255360 thumb_func_end MOD27_02254CC8 thumb_func_start MOD27_02254D60 @@ -927,7 +927,7 @@ MOD27_02254F18: ; 0x02254F18 add r0, r7, #0 str r0, [sp, #0x14] add r0, #0xe0 - ldr r5, _02254FA8 ; =0x02255348 + ldr r5, _02254FA8 ; =MOD27_02255348 str r0, [sp, #0x14] _02254F58: ldrh r0, [r6, #0xe] @@ -972,7 +972,7 @@ _02254FA2: add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} nop -_02254FA8: .word 0x02255348 +_02254FA8: .word MOD27_02255348 thumb_func_end MOD27_02254F18 thumb_func_start MOD27_02254FAC @@ -1013,7 +1013,7 @@ MOD27_02254FAC: ; 0x02254FAC str r0, [sp, #0x1c] add r0, #0xcc ldr r4, [sp, #8] - ldr r6, _022550C4 ; =0x02255348 + ldr r6, _022550C4 ; =MOD27_02255348 add r7, #0xff str r0, [sp, #0x1c] _02254FFC: @@ -1112,7 +1112,7 @@ _022550C0: add sp, #0x34 pop {r4, r5, r6, r7, pc} .align 2, 0 -_022550C4: .word 0x02255348 +_022550C4: .word MOD27_02255348 thumb_func_end MOD27_02254FAC thumb_func_start MOD27_022550C8 @@ -1218,8 +1218,8 @@ _02255164: beq _022551A6 _02255186: ldrb r0, [r5, #0xa] - ldr r1, _022551EC ; =0x02255348 - ldr r3, _022551F0 ; =0x0225534A + ldr r1, _022551EC ; =MOD27_02255348 + ldr r3, _022551F0 ; =MOD27_02255348 + 2 lsl r2, r0, #2 add r0, r6, r2 ldrh r1, [r1, r2] @@ -1237,8 +1237,8 @@ _022551A6: cmp r0, #0 bne _022551E6 ldrb r0, [r5, #0xa] - ldr r1, _022551EC ; =0x02255348 - ldr r3, _022551F0 ; =0x0225534A + ldr r1, _022551EC ; =MOD27_02255348 + ldr r3, _022551F0 ; =MOD27_02255348 + 2 lsl r2, r0, #2 add r0, r6, r2 ldrh r1, [r1, r2] @@ -1271,8 +1271,8 @@ _022551E6: _022551EA: pop {r4, r5, r6, pc} .align 2, 0 -_022551EC: .word 0x02255348 -_022551F0: .word 0x0225534A +_022551EC: .word MOD27_02255348 +_022551F0: .word MOD27_02255348 + 2 thumb_func_end MOD27_022550F8 thumb_func_start MOD27_022551F4 @@ -1283,7 +1283,7 @@ MOD27_022551F4: ; 0x022551F4 add r7, r2, #0 ldr r6, _02255248 ; =0x00000000 beq _02255242 - ldr r3, _0225524C ; =0x02255348 + ldr r3, _0225524C ; =MOD27_02255348 _02255202: ldrh r1, [r3] ldrh r4, [r3, #2] @@ -1327,7 +1327,7 @@ _02255242: pop {r3, r4, r5, r6, r7, pc} nop _02255248: .word 0x00000000 -_0225524C: .word 0x02255348 +_0225524C: .word MOD27_02255348 thumb_func_end MOD27_022551F4 thumb_func_start MOD27_02255250 @@ -1449,13 +1449,30 @@ _02255338: .word 0x00000669 thumb_func_end MOD27_022552D0 .section .rodata - ; 0x0225533C - .byte 0x49, 0x49, 0x25, 0x02, 0x89, 0x49, 0x25, 0x02, 0x15, 0x4A, 0x25, 0x02, 0x40, 0x00, 0x24, 0x00 - .byte 0xA0, 0x00, 0x24, 0x00, 0x40, 0x00, 0x54, 0x00, 0xA0, 0x00, 0x54, 0x00, 0x40, 0x00, 0x84, 0x00 - .byte 0xA0, 0x00, 0x84, 0x00, 0x04, 0x00, 0x08, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04, 0x00, 0x0E, 0x00 - .byte 0x10, 0x00, 0x0E, 0x00, 0x04, 0x00, 0x14, 0x00, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD27_0225533C +MOD27_0225533C: ; 0x0225533C + .word MOD27_02254948, MOD27_02254988, MOD27_02254A14 + + .global MOD27_02255348 +MOD27_02255348: ; 0x02255348 + .short 0x40, 0x24, 0xA0, 0x24, 0x40, 0x54, 0xA0, 0x54 + .short 0x40, 0x84, 0xA0, 0x84 + + .global MOD27_02255360 +MOD27_02255360: ; 0x02255360 + .short 0x04, 0x08, 0x10, 0x08, 0x04, 0x0E, 0x10, 0x0E + .short 0x04, 0x14, 0x10, 0x14 + + .global MOD27_02255378 +MOD27_02255378: ; 0x02255378 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB5, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0xD1, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD27_02255394 +MOD27_02255394: ; 0x02255394 + .word 0x00, MOD27_02254C08, 0x00 + .word 0x01, MOD27_022552B4, 0x00 + .word 0x02, MOD27_022552D0, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 847028e6..dba3ebba 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -176,7 +176,7 @@ _02254986: thumb_func_start MOD28_0225498C MOD28_0225498C: ; 0x0225498C - ldr r3, _022549A8 ; =0x02255E78 + ldr r3, _022549A8 ; =MOD28_02255E78 mov r2, #0 _02254990: ldrb r1, [r3] @@ -192,7 +192,7 @@ _0225499A: mov r0, #6 bx lr nop -_022549A8: .word 0x02255E78 +_022549A8: .word MOD28_02255E78 thumb_func_end MOD28_0225498C thumb_func_start MOD28_022549AC @@ -216,7 +216,7 @@ MOD28_022549C0: ; 0x022549C0 cmp r1, #3 bhs _022549EC lsl r2, r1, #2 - ldr r1, _022549F0 ; =0x02255E80 + ldr r1, _022549F0 ; =MOD28_02255E80 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -231,7 +231,7 @@ MOD28_022549C0: ; 0x022549C0 _022549EC: pop {r3, r4, r5, pc} nop -_022549F0: .word 0x02255E80 +_022549F0: .word MOD28_02255E80 thumb_func_end MOD28_022549C0 thumb_func_start MOD28_022549F4 @@ -508,13 +508,13 @@ MOD28_02254BC8: ; 0x02254BC8 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254BE8 ; =0x02255EF4 + ldr r0, _02254BE8 ; =MOD28_02255EF4 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254BE8: .word 0x02255EF4 +_02254BE8: .word MOD28_02255EF4 thumb_func_end MOD28_02254BC8 thumb_func_start MOD28_02254BEC @@ -556,7 +556,7 @@ MOD28_02254C18: ; 0x02254C18 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254CA8 ; =0x02255ED8 + ldr r2, _02254CA8 ; =MOD28_02255ED8 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -613,7 +613,7 @@ MOD28_02254C18: ; 0x02254C18 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 -_02254CA8: .word 0x02255ED8 +_02254CA8: .word MOD28_02255ED8 _02254CAC: .word 0x04001000 _02254CB0: .word 0xFFFFE0FF thumb_func_end MOD28_02254C18 @@ -673,7 +673,7 @@ _02254D08: str r0, [sp, #0x28] add r0, #0x48 ldr r4, [sp, #0x10] - ldr r6, _02254E4C ; =0x02255EC0 + ldr r6, _02254E4C ; =MOD28_02255EC0 str r0, [sp, #0x28] _02254D24: ldr r0, [sp, #0x1c] @@ -812,7 +812,7 @@ _02254E46: add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} nop -_02254E4C: .word 0x02255EC0 +_02254E4C: .word MOD28_02255EC0 _02254E50: .word 0x00000165 thumb_func_end MOD28_02254CB4 @@ -1062,7 +1062,7 @@ _0225500C: ldr r2, [r2] add r0, r5, #0 lsl r3, r2, #2 - ldr r2, _0225503C ; =0x02255E94 + ldr r2, _0225503C ; =MOD28_02255E94 add r1, r4, #0 ldr r2, [r2, r3] blx r2 @@ -1080,7 +1080,7 @@ _0225500C: _02255038: pop {r3, r4, r5, pc} nop -_0225503C: .word 0x02255E94 +_0225503C: .word MOD28_02255E94 thumb_func_end MOD28_02254F84 thumb_func_start MOD28_02255040 @@ -1334,7 +1334,7 @@ _022551D4: ldr r0, _0225521C ; =0x00000163 strb r1, [r5, r0] ldrb r2, [r5, r2] - ldr r0, _02255220 ; =0x02255F20 + ldr r0, _02255220 ; =MOD28_02255F20 add r1, r4, #0 bl MOD28_022551BC b _02255208 @@ -1345,7 +1345,7 @@ _022551F4: ldr r0, [sp] add r1, r7, #0 lsl r6, r3, #2 - ldr r3, _02255224 ; =0x02255EA8 + ldr r3, _02255224 ; =MOD28_02255EA8 add r2, r4, #0 ldr r3, [r3, r6] blx r3 @@ -1356,14 +1356,14 @@ _02255208: cmp r4, r0 blt _022551D4 _02255212: - ldr r0, _02255228 ; =0x02255F34 + ldr r0, _02255228 ; =MOD28_02255F34 bl MOD28_022551BC pop {r3, r4, r5, r6, r7, pc} nop _0225521C: .word 0x00000163 -_02255220: .word 0x02255F20 -_02255224: .word 0x02255EA8 -_02255228: .word 0x02255F34 +_02255220: .word MOD28_02255F20 +_02255224: .word MOD28_02255EA8 +_02255228: .word MOD28_02255F34 thumb_func_end MOD28_022551C4 thumb_func_start MOD28_0225522C @@ -1594,7 +1594,7 @@ MOD28_022553B4: ; 0x022553B4 add r5, r0, #0 add r4, r2, #0 add r6, r1, #0 - ldr r0, _02255498 ; =0x02255F44 + ldr r0, _02255498 ; =MOD28_02255F44 add r1, r4, #0 bl MOD28_022551BC add r0, r6, #0 @@ -1699,7 +1699,7 @@ _0225548A: _02255494: pop {r3, r4, r5, r6, r7, pc} nop -_02255498: .word 0x02255F44 +_02255498: .word MOD28_02255F44 thumb_func_end MOD28_022553B4 thumb_func_start MOD28_0225549C @@ -1709,7 +1709,7 @@ MOD28_0225549C: ; 0x0225549C add r5, r0, #0 add r4, r2, #0 add r6, r1, #0 - ldr r0, _022555AC ; =0x02255F58 + ldr r0, _022555AC ; =MOD28_02255F58 add r1, r4, #0 bl MOD28_022551BC add r0, r6, #0 @@ -1787,7 +1787,7 @@ _02255516: mul r7, r0 add r6, #0xf ldrb r2, [r6, r7] - ldr r0, _022555B0 ; =0x02255E90 + ldr r0, _022555B0 ; =MOD28_02255E90 ldr r1, [sp, #4] ldrb r0, [r0, r2] mul r0, r1 @@ -1795,7 +1795,7 @@ _02255516: bl _s32_div_f str r0, [sp, #4] ldrb r2, [r6, r7] - ldr r0, _022555B0 ; =0x02255E90 + ldr r0, _022555B0 ; =MOD28_02255E90 ldr r1, [sp, #8] ldrb r0, [r0, r2] mul r0, r1 @@ -1835,8 +1835,8 @@ _022555A6: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop -_022555AC: .word 0x02255F58 -_022555B0: .word 0x02255E90 +_022555AC: .word MOD28_02255F58 +_022555B0: .word MOD28_02255E90 thumb_func_end MOD28_0225549C thumb_func_start MOD28_022555B4 @@ -1846,7 +1846,7 @@ MOD28_022555B4: ; 0x022555B4 add r5, r0, #0 add r6, r2, #0 add r4, r1, #0 - ldr r0, _02255688 ; =0x02255F6C + ldr r0, _02255688 ; =MOD28_02255F6C add r1, r6, #0 bl MOD28_022551BC add r0, r4, #0 @@ -1895,7 +1895,7 @@ MOD28_022555B4: ; 0x022555B4 mul r7, r0 add r4, #0xf ldrb r2, [r4, r7] - ldr r0, _0225568C ; =0x02255E8C + ldr r0, _0225568C ; =MOD28_02255E8C ldr r1, [sp, #4] ldrb r0, [r0, r2] mul r0, r1 @@ -1903,7 +1903,7 @@ MOD28_022555B4: ; 0x022555B4 bl _s32_div_f str r0, [sp, #4] ldrb r2, [r4, r7] - ldr r0, _0225568C ; =0x02255E8C + ldr r0, _0225568C ; =MOD28_02255E8C ldr r1, [sp, #8] ldrb r0, [r0, r2] mul r0, r1 @@ -1942,8 +1942,8 @@ _0225567A: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02255688: .word 0x02255F6C -_0225568C: .word 0x02255E8C +_02255688: .word MOD28_02255F6C +_0225568C: .word MOD28_02255E8C thumb_func_end MOD28_022555B4 thumb_func_start MOD28_02255690 @@ -1953,7 +1953,7 @@ MOD28_02255690: ; 0x02255690 add r5, r0, #0 add r7, r2, #0 add r4, r1, #0 - ldr r0, _02255764 ; =0x02255F80 + ldr r0, _02255764 ; =MOD28_02255F80 add r1, r7, #0 bl MOD28_022551BC add r4, #0x4c @@ -2050,7 +2050,7 @@ _02255756: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_02255764: .word 0x02255F80 +_02255764: .word MOD28_02255F80 thumb_func_end MOD28_02255690 thumb_func_start MOD28_02255768 @@ -2059,7 +2059,7 @@ MOD28_02255768: ; 0x02255768 add r5, r0, #0 add r7, r2, #0 add r4, r1, #0 - ldr r0, _02255808 ; =0x02255F94 + ldr r0, _02255808 ; =MOD28_02255F94 add r1, r7, #0 bl MOD28_022551BC add r4, #0x4c @@ -2131,7 +2131,7 @@ _022557FA: bl MOD28_0225522C pop {r3, r4, r5, r6, r7, pc} nop -_02255808: .word 0x02255F94 +_02255808: .word MOD28_02255F94 thumb_func_end MOD28_02255768 thumb_func_start MOD28_0225580C @@ -2145,7 +2145,7 @@ MOD28_0225580C: ; 0x0225580C mov r0, #0x38 mul r0, r6 add r4, r1, r0 - ldr r0, _02255918 ; =0x02255FA8 + ldr r0, _02255918 ; =MOD28_02255FA8 add r1, r6, #0 bl MOD28_022551BC add r0, r4, #0 @@ -2266,7 +2266,7 @@ _022558A6: _02255916: pop {r4, r5, r6, pc} .align 2, 0 -_02255918: .word 0x02255FA8 +_02255918: .word MOD28_02255FA8 _0225591C: .word 0x00000669 thumb_func_end MOD28_0225580C @@ -2965,27 +2965,86 @@ _02255E74: .word 0x00000163 thumb_func_end MOD28_02255920 .section .rodata - ; 0x02255E78 - .byte 0x01, 0x23, 0x46, 0x96, 0xC8, 0xFF, 0x00, 0x00, 0x11, 0x4A, 0x25, 0x02, 0x51, 0x4A, 0x25, 0x02 - .byte 0xC1, 0x4A, 0x25, 0x02, 0x64, 0x96, 0xAF, 0xC8, 0x64, 0x96, 0xAF, 0xC8, 0xC5, 0x50, 0x25, 0x02 - .byte 0xE5, 0x50, 0x25, 0x02, 0x29, 0x51, 0x25, 0x02, 0x3D, 0x51, 0x25, 0x02, 0x89, 0x51, 0x25, 0x02 - .byte 0xB5, 0x53, 0x25, 0x02, 0x9D, 0x54, 0x25, 0x02, 0xB5, 0x55, 0x25, 0x02, 0x91, 0x56, 0x25, 0x02 - .byte 0x69, 0x57, 0x25, 0x02, 0x0D, 0x58, 0x25, 0x02, 0x30, 0x00, 0x2C, 0x00, 0xB0, 0x00, 0x2C, 0x00 - .byte 0x30, 0x00, 0x5C, 0x00, 0xB0, 0x00, 0x5C, 0x00, 0x30, 0x00, 0x8C, 0x00, 0xB0, 0x00, 0x8C, 0x00 + + .global MOD28_02255E78 +MOD28_02255E78: ; 0x02255E78 + .byte 0x01, 0x23, 0x46, 0x96, 0xC8, 0xFF, 0x00, 0x00 + + .global MOD28_02255E80 +MOD28_02255E80: ; 0x02255E80 + .word MOD28_02254A10, MOD28_02254A50, MOD28_02254AC0 + + .global MOD28_02255E8C +MOD28_02255E8C: ; 0x02255E8C + .byte 0x64, 0x96, 0xAF, 0xC8 + + .global MOD28_02255E90 +MOD28_02255E90: ; 0x02255E90 + .byte 0x64, 0x96, 0xAF, 0xC8 + + .global MOD28_02255E94 +MOD28_02255E94: ; 0x02255E94 + .word MOD28_022550C4, MOD28_022550E4, MOD28_02255128, MOD28_0225513C + .word MOD28_02255188 + + .global MOD28_02255EA8 +MOD28_02255EA8: ; 0x02255EA8 + .word MOD28_022553B4, MOD28_0225549C, MOD28_022555B4, MOD28_02255690 + .word MOD28_02255768, MOD28_0225580C + + .global MOD28_02255EC0 +MOD28_02255EC0: ; 0x02255EC0 + .short 0x30, 0x2C, 0xB0, 0x2C, 0x30, 0x5C, 0xB0, 0x5C + .short 0x30, 0x8C, 0xB0, 0x8C + + .global MOD28_02255ED8 +MOD28_02255ED8: ; 0x02255ED8 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x19, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD28_02255EF4 +MOD28_02255EF4: ; 0x02255EF4 + .word 0x00, MOD28_02254C18, 0x00 + .word 0x01, MOD28_02254F18, 0x00 + .word 0x00, 0x00000000, 0x00 .section .data - ; 0x02255F20 - .byte 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x52, 0x45, 0x46, 0x5B, 0x25, 0x64, 0x5D - .byte 0x0A, 0x00, 0x00, 0x00, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2D - .byte 0x0A, 0x00, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x44, 0x65 - .byte 0x66, 0x61, 0x75, 0x6C, 0x74, 0x0A, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64 - .byte 0x5D, 0x20, 0x52, 0x65, 0x61, 0x4C, 0x69, 0x6B, 0x65, 0x0A, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F - .byte 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x52, 0x65, 0x61, 0x48, 0x61, 0x74, 0x65, 0x0A, 0x00, 0x00 - .byte 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x54, 0x63, 0x67, 0x4C, 0x69, 0x6B - .byte 0x65, 0x0A, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64, 0x5D, 0x20, 0x54, 0x63 - .byte 0x68, 0x48, 0x61, 0x74, 0x65, 0x0A, 0x00, 0x00, 0x20, 0x69, 0x63, 0x6F, 0x6E, 0x5B, 0x25, 0x64 - .byte 0x5D, 0x20, 0x52, 0x65, 0x73, 0x65, 0x74, 0x21, 0x21, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD28_02255F20 +MOD28_02255F20: ; 0x02255F20 + .asciz "icon[%d] REF[%d]\n" + + .balign 4 + .global MOD28_02255F34 +MOD28_02255F34: ; 0x02255F34 + .asciz "------------\n" + + .balign 4 + .global MOD28_02255F44 +MOD28_02255F44: ; 0x02255F44 + .asciz " icon[%d] Default\n" + + .balign 4 + .global MOD28_02255F58 +MOD28_02255F58: ; 0x02255F58 + .asciz " icon[%d] ReaLike\n" + + .balign 4 + .global MOD28_02255F6C +MOD28_02255F6C: ; 0x02255F6C + .asciz " icon[%d] ReaHate\n" + + .balign 4 + .global MOD28_02255F80 +MOD28_02255F80: ; 0x02255F80 + .asciz " icon[%d] TcgLike\n" + + .balign 4 + .global MOD28_02255F94 +MOD28_02255F94: ; 0x02255F94 + .asciz " icon[%d] TchHate\n" + + .balign 4 + .global MOD28_02255FA8 +MOD28_02255FA8: ; 0x02255FA8 + .asciz " icon[%d] Reset!!\n" diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index 80e5d5b9..6473d5da 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -101,7 +101,7 @@ MOD29_022548E0: ; 0x022548E0 cmp r1, #3 bhs _0225490C lsl r2, r1, #2 - ldr r1, _02254910 ; =0x0225509C + ldr r1, _02254910 ; =MOD29_0225509C add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -116,7 +116,7 @@ MOD29_022548E0: ; 0x022548E0 _0225490C: pop {r3, r4, r5, pc} nop -_02254910: .word 0x0225509C +_02254910: .word MOD29_0225509C thumb_func_end MOD29_022548E0 thumb_func_start MOD29_02254914 @@ -386,7 +386,7 @@ _02254AE0: bl FX_Sqrt ldrb r1, [r5, #4] lsl r2, r1, #2 - ldr r1, _02254B6C ; =0x022550A8 + ldr r1, _02254B6C ; =MOD29_022550A8 ldr r1, [r1, r2] cmp r0, r1 bgt _02254B46 @@ -438,7 +438,7 @@ _02254B66: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop -_02254B6C: .word 0x022550A8 +_02254B6C: .word MOD29_022550A8 thumb_func_end MOD29_02254AA8 thumb_func_start MOD29_02254B70 @@ -554,7 +554,7 @@ MOD29_02254C08: ; 0x02254C08 bl FUN_02006A34 add r2, r6, #0 ldr r0, [r6, #0x30] - ldr r1, _02254C7C ; =0x022550C0 + ldr r1, _02254C7C ; =MOD29_022550C0 add r2, #0x58 bl MOD20_02253E74 mov r1, #1 @@ -566,7 +566,7 @@ MOD29_02254C08: ; 0x02254C08 add r7, #0x58 _02254C54: ldr r0, [r6, #0x30] - ldr r1, _02254C80 ; =0x022550D0 + ldr r1, _02254C80 ; =MOD29_022550D0 add r2, r7, #0 bl MOD20_02253E74 mov r1, #1 @@ -584,8 +584,8 @@ _02254C74: add sp, #0xc pop {r4, r5, r6, r7, pc} nop -_02254C7C: .word 0x022550C0 -_02254C80: .word 0x022550D0 +_02254C7C: .word MOD29_022550C0 +_02254C80: .word MOD29_022550D0 thumb_func_end MOD29_02254C08 thumb_func_start MOD29_02254C84 @@ -633,13 +633,13 @@ MOD29_02254CC0: ; 0x02254CC0 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254CE0 ; =0x022550FC + ldr r0, _02254CE0 ; =MOD29_022550FC ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254CE0: .word 0x022550FC +_02254CE0: .word MOD29_022550FC thumb_func_end MOD29_02254CC0 thumb_func_start MOD29_02254CE4 @@ -681,7 +681,7 @@ MOD29_02254D10: ; 0x02254D10 bl MOD20_022538A0 add r4, r0, #0 ldr r0, [r4, #4] - ldr r2, _02254DE8 ; =0x022550E0 + ldr r2, _02254DE8 ; =MOD29_022550E0 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -770,7 +770,7 @@ MOD29_02254D10: ; 0x02254D10 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 -_02254DE8: .word 0x022550E0 +_02254DE8: .word MOD29_022550E0 _02254DEC: .word 0x04001000 _02254DF0: .word 0xFFFFE0FF thumb_func_end MOD29_02254D10 @@ -816,13 +816,13 @@ _02254E40: ldr r2, [r4] ldr r0, [sp] lsl r3, r2, #2 - ldr r2, _02254E50 ; =0x022550B4 + ldr r2, _02254E50 ; =MOD29_022550B4 add r1, r5, #0 ldr r2, [r2, r3] blx r2 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254E50: .word 0x022550B4 +_02254E50: .word MOD29_022550B4 thumb_func_end MOD29_02254E10 thumb_func_start MOD29_02254E54 @@ -1122,13 +1122,38 @@ MOD29_0225508C: ; 0x0225508C thumb_func_end MOD29_0225508C .section .rodata - ; 0x0225509C - .byte 0x31, 0x49, 0x25, 0x02, 0x71, 0x49, 0x25, 0x02, 0x8D, 0x4B, 0x25, 0x02, 0x00, 0x80, 0x00, 0x00 - .byte 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x55, 0x4E, 0x25, 0x02, 0xCD, 0x4E, 0x25, 0x02 - .byte 0x41, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 - .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + + .global MOD29_0225509C +MOD29_0225509C: ; 0x0225509C + .word MOD29_02254930, MOD29_02254970, MOD29_02254B8C + + .global MOD29_022550A8 +MOD29_022550A8: ; 0x022550A8 + .byte 0x00, 0x80, 0x00, 0x00 + .byte 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00 + + .global MOD29_022550B4 +MOD29_022550B4: ; 0x022550B4 + .word MOD29_02254E54, MOD29_02254ECC, MOD29_02254F40 + + .global MOD29_022550C0 +MOD29_022550C0: ; 0x022550C0 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 + .byte 0x00, 0x01, 0x00, 0x00 + + .global MOD29_022550D0 +MOD29_022550D0: ; 0x022550D0 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02 + .byte 0x01, 0x00, 0x00, 0x00 + + .global MOD29_022550E0 +MOD29_022550E0: ; 0x022550E0 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x11, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0xF5, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x11, 0x4E, 0x25, 0x02 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD29_022550FC +MOD29_022550FC: ; 0x022550FC + .word 0x00, MOD29_02254D10, 0x00 + .word 0x01, MOD29_02254DF4, 0x00 + .word 0x02, MOD29_02254E10, 0x04 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s index eadbd751..3be3474f 100644 --- a/arm9/modules/30/asm/module_30.s +++ b/arm9/modules/30/asm/module_30.s @@ -86,7 +86,7 @@ _022548BE: strb r0, [r5, #2] mov r0, #8 str r0, [sp] - ldr r0, _022548FC ; =0x02254DA0 + ldr r0, _022548FC ; =MOD30_02254DA0 ldr r2, _02254900 ; =MOD30_02254904 mov r1, #1 add r3, r5, #0 @@ -101,7 +101,7 @@ _022548F6: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} nop -_022548FC: .word 0x02254DA0 +_022548FC: .word MOD30_02254DA0 _02254900: .word MOD30_02254904 thumb_func_end MOD30_0225489C @@ -146,7 +146,7 @@ MOD30_02254930: ; 0x02254930 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254968 ; =0x02254DA4 + ldr r1, _02254968 ; =MOD30_02254DA4 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -160,7 +160,7 @@ MOD30_02254930: ; 0x02254930 _02254966: pop {r3, r4, r5, pc} .align 2, 0 -_02254968: .word 0x02254DA4 +_02254968: .word MOD30_02254DA4 thumb_func_end MOD30_02254930 thumb_func_start MOD30_0225496C @@ -418,7 +418,7 @@ MOD30_02254AE0: ; 0x02254AE0 bl MOD20_02253FBC add r2, r7, #0 ldr r0, [r7, #0x20] - ldr r1, _02254B8C ; =0x02254DB0 + ldr r1, _02254B8C ; =MOD30_02254DB0 add r2, #0x38 bl MOD20_02253E74 mov r1, #0x50 @@ -434,7 +434,7 @@ MOD30_02254AE0: ; 0x02254AE0 str r0, [sp, #0x10] _02254B5C: ldr r0, [r7, #0x20] - ldr r1, _02254B90 ; =0x02254DC0 + ldr r1, _02254B90 ; =MOD30_02254DC0 ldr r2, [sp, #0x10] bl MOD20_02253E74 mov r2, #1 @@ -455,8 +455,8 @@ _02254B5C: add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 -_02254B8C: .word 0x02254DB0 -_02254B90: .word 0x02254DC0 +_02254B8C: .word MOD30_02254DB0 +_02254B90: .word MOD30_02254DC0 thumb_func_end MOD30_02254AE0 thumb_func_start MOD30_02254B94 @@ -497,13 +497,13 @@ MOD30_02254BC8: ; 0x02254BC8 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254BE8 ; =0x02254DEC + ldr r0, _02254BE8 ; =MOD30_02254DEC ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254BE8: .word 0x02254DEC +_02254BE8: .word MOD30_02254DEC thumb_func_end MOD30_02254BC8 thumb_func_start MOD30_02254BEC @@ -545,7 +545,7 @@ MOD30_02254C18: ; 0x02254C18 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254C9C ; =0x02254DD0 + ldr r2, _02254C9C ; =MOD30_02254DD0 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -597,7 +597,7 @@ MOD30_02254C18: ; 0x02254C18 add sp, #0x14 pop {r4, r5, pc} nop -_02254C9C: .word 0x02254DD0 +_02254C9C: .word MOD30_02254DD0 _02254CA0: .word 0x04001000 _02254CA4: .word 0xFFFFE0FF thumb_func_end MOD30_02254C18 @@ -730,13 +730,32 @@ _02254D9C: .word 0x040002A8 thumb_func_end MOD30_02254D28 .section .rodata - ; 0x02254DA0 - .byte 0x64, 0x9C, 0x52, 0x92, 0x89, 0x49, 0x25, 0x02, 0xC9, 0x49, 0x25, 0x02, 0x5D, 0x4A, 0x25, 0x02 + + .global MOD30_02254DA0 +MOD30_02254DA0: ; 0x02254DA0 + .byte 0x64, 0x9C, 0x52, 0x92 + + .global MOD30_02254DA4 +MOD30_02254DA4: ; 0x02254DA4 + .word MOD30_02254988, MOD30_022549C8, MOD30_02254A5C + + .global MOD30_02254DB0 +MOD30_02254DB0: ; 0x02254DB0 .byte 0x00, 0x20, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD30_02254DC0 +MOD30_02254DC0: ; 0x02254DC0 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD30_02254DD0 +MOD30_02254DD0: ; 0x02254DD0 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x19, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xA9, 0x4C, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xC5, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x05, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD30_02254DEC +MOD30_02254DEC: ; 0x02254DEC + .word 0x00, MOD30_02254C18, 0x00 + .word 0x01, MOD30_02254CA8, 0x00 + .word 0x02, MOD30_02254CC4, 0x00 + .word 0x03, MOD30_02254D04, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s index 5a5feeea..6b884f10 100644 --- a/arm9/modules/32/asm/module_32.s +++ b/arm9/modules/32/asm/module_32.s @@ -84,7 +84,7 @@ _022548BA: strb r0, [r5, #2] mov r0, #8 str r0, [sp] - ldr r0, _022548F8 ; =0x02254C54 + ldr r0, _022548F8 ; =MOD32_02254C54 ldr r2, _022548FC ; =MOD32_02254918 mov r1, #2 add r3, r5, #0 @@ -101,7 +101,7 @@ _022548F2: add sp, #8 pop {r4, r5, r6, pc} .align 2, 0 -_022548F8: .word 0x02254C54 +_022548F8: .word MOD32_02254C54 _022548FC: .word MOD32_02254918 thumb_func_end MOD32_0225489C @@ -140,7 +140,7 @@ MOD32_02254920: ; 0x02254920 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254958 ; =0x02254C5C + ldr r1, _02254958 ; =MOD32_02254C5C ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -154,7 +154,7 @@ MOD32_02254920: ; 0x02254920 _02254956: pop {r3, r4, r5, pc} .align 2, 0 -_02254958: .word 0x02254C5C +_02254958: .word MOD32_02254C5C thumb_func_end MOD32_02254920 thumb_func_start MOD32_0225495C @@ -372,7 +372,7 @@ MOD32_02254A9C: ; 0x02254A9C bl MOD20_02253FBC add r2, r5, #0 ldr r0, [r5, #0x20] - ldr r1, _02254AEC ; =0x02254C68 + ldr r1, _02254AEC ; =MOD32_02254C68 add r2, #0x28 bl MOD20_02253E74 str r0, [r5, #0x24] @@ -386,7 +386,7 @@ _02254AE6: add sp, #0xc pop {r4, r5, pc} nop -_02254AEC: .word 0x02254C68 +_02254AEC: .word MOD32_02254C68 thumb_func_end MOD32_02254A9C thumb_func_start MOD32_02254AF0 @@ -414,13 +414,13 @@ MOD32_02254B08: ; 0x02254B08 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254B28 ; =0x02254C94 + ldr r0, _02254B28 ; =MOD32_02254C94 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254B28: .word 0x02254C94 +_02254B28: .word MOD32_02254C94 thumb_func_end MOD32_02254B08 thumb_func_start MOD32_02254B2C @@ -462,7 +462,7 @@ MOD32_02254B58: ; 0x02254B58 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254BDC ; =0x02254C78 + ldr r2, _02254BDC ; =MOD32_02254C78 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -514,7 +514,7 @@ MOD32_02254B58: ; 0x02254B58 add sp, #0x14 pop {r4, r5, pc} nop -_02254BDC: .word 0x02254C78 +_02254BDC: .word MOD32_02254C78 _02254BE0: .word 0x04001000 _02254BE4: .word 0xFFFFE0FF thumb_func_end MOD32_02254B58 @@ -572,11 +572,28 @@ _02254C50: .word 0x00000663 thumb_func_end MOD32_02254C08 .section .rodata - ; 0x02254C54 - .byte 0x48, 0x68, 0x5C, 0x84, 0x68, 0x88, 0x5C, 0x84, 0x79, 0x49, 0x25, 0x02, 0xB9, 0x49, 0x25, 0x02 - .byte 0x21, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + + .global MOD32_02254C54 +MOD32_02254C54: ; 0x02254C54 + .byte 0x48, 0x68, 0x5C, 0x84, 0x68, 0x88, 0x5C, 0x84 + + .global MOD32_02254C5C +MOD32_02254C5C: ; 0x02254C5C + .word MOD32_02254978, MOD32_022549B8, MOD32_02254A20 + + .global MOD32_02254C68 +MOD32_02254C68: ; 0x02254C68 + .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00, 0x02 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD32_02254C78 +MOD32_02254C78: ; 0x02254C78 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x59, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x09, 0x4C, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD32_02254C94 +MOD32_02254C94: ; 0x02254C94 + .word 0x00, MOD32_02254B58, 0x00 + .word 0x01, MOD32_02254BE8, 0x00 + .word 0x02, MOD32_02254C08, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s index 83b48eba..e7d626bc 100644 --- a/arm9/modules/33/asm/module_33.s +++ b/arm9/modules/33/asm/module_33.s @@ -95,7 +95,7 @@ MOD33_022548D4: ; 0x022548D4 cmp r1, #3 bhs _02254900 lsl r2, r1, #2 - ldr r1, _02254904 ; =0x02254AF4 + ldr r1, _02254904 ; =MOD33_02254AF4 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -110,7 +110,7 @@ MOD33_022548D4: ; 0x022548D4 _02254900: pop {r3, r4, r5, pc} nop -_02254904: .word 0x02254AF4 +_02254904: .word MOD33_02254AF4 thumb_func_end MOD33_022548D4 thumb_func_start MOD33_02254908 @@ -264,13 +264,13 @@ MOD33_022549E8: ; 0x022549E8 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254A08 ; =0x02254B1C + ldr r0, _02254A08 ; =MOD33_02254B1C ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254A08: .word 0x02254B1C +_02254A08: .word MOD33_02254B1C thumb_func_end MOD33_022549E8 thumb_func_start MOD33_02254A0C @@ -312,7 +312,7 @@ MOD33_02254A38: ; 0x02254A38 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254ACC ; =0x02254B00 + ldr r2, _02254ACC ; =MOD33_02254B00 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -371,7 +371,7 @@ MOD33_02254A38: ; 0x02254A38 add sp, #0x14 pop {r4, r5, pc} nop -_02254ACC: .word 0x02254B00 +_02254ACC: .word MOD33_02254B00 _02254AD0: .word 0x04001000 _02254AD4: .word 0xFFFFE0FF thumb_func_end MOD33_02254A38 @@ -392,12 +392,22 @@ MOD33_02254AD8: ; 0x02254AD8 thumb_func_end MOD33_02254AD8 .section .rodata - ; 0x02254AF4 - .byte 0x25, 0x49, 0x25, 0x02, 0x65, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD33_02254AF4 +MOD33_02254AF4: ; 0x02254AF4 + .word MOD33_02254924, MOD33_02254964, MOD33_02254978 + + .global MOD33_02254B00 +MOD33_02254B00: ; 0x02254B00 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x4A, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD33_02254B1C +MOD33_02254B1C: ; 0x02254B1C + .word 0x00, MOD33_02254A38, 0x00 + .word 0x01, MOD33_02254AD8, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD33_02254840 diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s index d53be79b..4a439bd8 100644 --- a/arm9/modules/34/asm/module_34.s +++ b/arm9/modules/34/asm/module_34.s @@ -69,7 +69,7 @@ MOD34_0225489C: ; 0x0225489C str r4, [r5, #0x28] mov r0, #8 str r0, [sp] - ldr r0, _022548E0 ; =0x02254C7C + ldr r0, _022548E0 ; =MOD34_02254C7C ldr r2, _022548E4 ; =MOD34_02254904 mov r1, #6 add r3, r5, #0 @@ -89,7 +89,7 @@ _022548DC: mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 -_022548E0: .word 0x02254C7C +_022548E0: .word MOD34_02254C7C _022548E4: .word MOD34_02254904 thumb_func_end MOD34_0225489C @@ -131,7 +131,7 @@ MOD34_0225490C: ; 0x0225490C ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254944 ; =0x02254C70 + ldr r1, _02254944 ; =MOD34_02254C70 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -145,7 +145,7 @@ MOD34_0225490C: ; 0x0225490C _02254942: pop {r3, r4, r5, pc} .align 2, 0 -_02254944: .word 0x02254C70 +_02254944: .word MOD34_02254C70 thumb_func_end MOD34_0225490C thumb_func_start MOD34_02254948 @@ -353,13 +353,13 @@ MOD34_02254A98: ; 0x02254A98 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254AB8 ; =0x02254CBC + ldr r0, _02254AB8 ; =MOD34_02254CBC ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254AB8: .word 0x02254CBC +_02254AB8: .word MOD34_02254CBC thumb_func_end MOD34_02254A98 thumb_func_start MOD34_02254ABC @@ -404,7 +404,7 @@ MOD34_02254AE8: ; 0x02254AE8 bl MOD20_022538A4 add r5, r0, #0 ldr r0, [r6, #4] - ldr r2, _02254B8C ; =0x02254CA0 + ldr r2, _02254B8C ; =MOD34_02254CA0 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -469,7 +469,7 @@ _02254B4A: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254B8C: .word 0x02254CA0 +_02254B8C: .word MOD34_02254CA0 _02254B90: .word 0x04001000 _02254B94: .word 0xFFFFE0FF thumb_func_end MOD34_02254AE8 @@ -548,7 +548,7 @@ MOD34_02254C1C: ; 0x02254C1C add r4, r2, #0 add r6, r3, #0 bl FUN_0201886C - ldr r1, _02254C6C ; =0x02254C94 + ldr r1, _02254C6C ; =MOD34_02254C94 lsl r2, r5, #1 ldrh r1, [r1, r2] lsl r1, r1, #1 @@ -585,17 +585,34 @@ _02254C54: blt _02254C50 pop {r4, r5, r6, pc} nop -_02254C6C: .word 0x02254C94 +_02254C6C: .word MOD34_02254C94 thumb_func_end MOD34_02254C1C .section .rodata - ; 0x02254C70 - .byte 0x65, 0x49, 0x25, 0x02, 0xA5, 0x49, 0x25, 0x02, 0x29, 0x4A, 0x25, 0x02, 0x10, 0x40, 0x10, 0x40 + + .global MOD34_02254C70 +MOD34_02254C70: ; 0x02254C70 + .word MOD34_02254964, MOD34_022549A4, MOD34_02254A28 + + .global MOD34_02254C7C +MOD34_02254C7C: ; 0x02254C7C + .byte 0x10, 0x40, 0x10, 0x40 .byte 0x10, 0x40, 0xA0, 0xD0, 0x48, 0x78, 0x10, 0x40, 0x48, 0x78, 0xA0, 0xD0, 0x80, 0xB0, 0x10, 0x40 - .byte 0x80, 0xB0, 0xA0, 0xD0, 0x42, 0x00, 0x54, 0x00, 0x22, 0x01, 0x34, 0x01, 0x02, 0x02, 0x14, 0x02 + .byte 0x80, 0xB0, 0xA0, 0xD0 + + .global MOD34_02254C94 +MOD34_02254C94: ; 0x02254C94 + .short 0x42, 0x54, 0x122, 0x134, 0x202, 0x214 + + .global MOD34_02254CA0 +MOD34_02254CA0: ; 0x02254CA0 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xE9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x99, 0x4B, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xB5, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD34_02254CBC +MOD34_02254CBC: ; 0x02254CBC + .word 0x00, MOD34_02254AE8, 0x00 + .word 0x01, MOD34_02254B98, 0x00 + .word 0x02, MOD34_02254BB4, 0x00 + .word 0x03, MOD34_02254BE8, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index dfdc8530..48953e9f 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -106,7 +106,7 @@ MOD35_022548F0: ; 0x022548F0 cmp r1, #3 bhs _0225491C lsl r2, r1, #2 - ldr r1, _02254920 ; =0x022550B8 + ldr r1, _02254920 ; =MOD35_022550B8 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -121,7 +121,7 @@ MOD35_022548F0: ; 0x022548F0 _0225491C: pop {r3, r4, r5, pc} nop -_02254920: .word 0x022550B8 +_02254920: .word MOD35_022550B8 thumb_func_end MOD35_022548F0 thumb_func_start MOD35_02254924 @@ -474,7 +474,7 @@ MOD35_02254B54: ; 0x02254B54 mov r4, #0 str r0, [sp, #0x18] add r0, #0x64 - ldr r6, _02254C14 ; =0x02255110 + ldr r6, _02254C14 ; =MOD35_02255110 add r5, r7, #0 str r4, [sp, #0x10] str r0, [sp, #0x18] @@ -517,7 +517,7 @@ _02254BEE: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop -_02254C14: .word 0x02255110 +_02254C14: .word MOD35_02255110 thumb_func_end MOD35_02254B54 thumb_func_start MOD35_02254C18 @@ -558,13 +558,13 @@ MOD35_02254C48: ; 0x02254C48 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254C68 ; =0x022550E0 + ldr r0, _02254C68 ; =MOD35_022550E0 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254C68: .word 0x022550E0 +_02254C68: .word MOD35_022550E0 thumb_func_end MOD35_02254C48 thumb_func_start MOD35_02254C6C @@ -606,7 +606,7 @@ MOD35_02254C98: ; 0x02254C98 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254D24 ; =0x022550C4 + ldr r2, _02254D24 ; =MOD35_022550C4 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -662,7 +662,7 @@ MOD35_02254C98: ; 0x02254C98 add sp, #0x14 pop {r4, r5, pc} nop -_02254D24: .word 0x022550C4 +_02254D24: .word MOD35_022550C4 _02254D28: .word 0x0400104C _02254D2C: .word 0xFFFFE0FF thumb_func_end MOD35_02254C98 @@ -1135,13 +1135,27 @@ _022550B0: thumb_func_end MOD35_02255094 .section .rodata - ; 0x022550B8 - .byte 0x41, 0x49, 0x25, 0x02, 0x81, 0x49, 0x25, 0x02, 0xD5, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD35_022550B8 +MOD35_022550B8: ; 0x022550B8 + .word MOD35_02254940, MOD35_02254980, MOD35_022549D4 + + .global MOD35_022550C4 +MOD35_022550C4: ; 0x022550C4 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x4C, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x31, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x85, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + + .global MOD35_022550E0 +MOD35_022550E0: ; 0x022550E0 + .word 0x00, MOD35_02254C98, 0x00 + .word 0x01, MOD35_02254D30, 0x00 + .word 0x02, MOD35_02254D84, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD35_02255110 +MOD35_02255110: ; 0x02255110 + .byte 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x07, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x80, 0x0A, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x06, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x80, 0x08, 0x00 .byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x02, 0x00 diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index d5ba87c7..528f376a 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -83,7 +83,7 @@ MOD36_022548A0: ; 0x022548A0 bl MOD36_02254E10 mov r0, #8 str r0, [sp] - ldr r0, _02254908 ; =0x022553E8 + ldr r0, _02254908 ; =MOD36_022553E8 ldr r2, _0225490C ; =MOD36_02254980 mov r1, #3 add r3, r5, #0 @@ -104,7 +104,7 @@ _022548FC: pop {r3, r4, r5, r6, pc} nop _02254904: .word 0x00005B78 -_02254908: .word 0x022553E8 +_02254908: .word MOD36_022553E8 _0225490C: .word MOD36_02254980 _02254910: .word 0x00005B84 thumb_func_end MOD36_022548A0 @@ -143,7 +143,7 @@ MOD36_02254938: ; 0x02254938 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _0225497C ; =0x022553F4 + ldr r1, _0225497C ; =MOD36_022553F4 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -159,7 +159,7 @@ _02254974: pop {r3, r4, r5, pc} nop _02254978: .word 0x00005B80 -_0225497C: .word 0x022553F4 +_0225497C: .word MOD36_022553F4 thumb_func_end MOD36_02254938 thumb_func_start MOD36_02254980 @@ -892,7 +892,7 @@ MOD36_02254E8C: ; 0x02254E8C add r0, r7, #0 str r0, [sp, #0xc] add r0, #0x34 - ldr r4, _02254EE0 ; =0x02255440 + ldr r4, _02254EE0 ; =MOD36_02255440 mov r6, #0 add r5, r7, #0 str r0, [sp, #0xc] @@ -910,7 +910,7 @@ _02254EC6: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254EE0: .word 0x02255440 +_02254EE0: .word MOD36_02255440 thumb_func_end MOD36_02254E8C thumb_func_start MOD36_02254EE4 @@ -948,13 +948,13 @@ MOD36_02254F0C: ; 0x02254F0C str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254F2C ; =0x02255480 + ldr r0, _02254F2C ; =MOD36_02255480 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254F2C: .word 0x02255480 +_02254F2C: .word MOD36_02255480 thumb_func_end MOD36_02254F0C thumb_func_start MOD36_02254F30 @@ -1002,12 +1002,12 @@ _02254F70: bl MOD20_022538A0 add r4, r0, #0 ldr r0, [r4, #4] - ldr r2, _0225502C ; =0x02255408 + ldr r2, _0225502C ; =MOD36_02255408 mov r1, #6 mov r3, #0 bl FUN_02016C18 ldr r0, [r4, #4] - ldr r2, _02255030 ; =0x02255424 + ldr r2, _02255030 ; =MOD36_02255424 mov r1, #7 mov r3, #0 bl FUN_02016C18 @@ -1081,8 +1081,8 @@ _02255028: add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 -_0225502C: .word 0x02255408 -_02255030: .word 0x02255424 +_0225502C: .word MOD36_02255408 +_02255030: .word MOD36_02255424 _02255034: .word 0x04001000 _02255038: .word 0xFFFFE0FF thumb_func_end MOD36_02254F5C @@ -1091,7 +1091,7 @@ _02255038: .word 0xFFFFE0FF MOD36_0225503C: ; 0x0225503C push {r3, r4, r5, lr} sub sp, #8 - ldr r3, _02255098 ; =0x02255400 + ldr r3, _02255098 ; =MOD36_02255400 add r4, r0, #0 ldrh r5, [r3] add r0, sp, #0 @@ -1131,7 +1131,7 @@ _02255082: add sp, #8 pop {r3, r4, r5, pc} nop -_02255098: .word 0x02255400 +_02255098: .word MOD36_02255400 thumb_func_end MOD36_0225503C thumb_func_start MOD36_0225509C @@ -1559,21 +1559,47 @@ _022553E4: .word 0x0000066A thumb_func_end MOD36_0225539C .section .rodata - ; 0x022553E8 - .byte 0x22, 0x42, 0xA7, 0xCF, 0x50, 0x70, 0xA7, 0xCF, 0x7E, 0x9E, 0xA7, 0xCF, 0xAD, 0x49, 0x25, 0x02 - .byte 0xF9, 0x49, 0x25, 0x02, 0xD5, 0x4D, 0x25, 0x02, 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x00, 0x00 + + .global MOD36_022553E8 +MOD36_022553E8: ; 0x022553E8 + .byte 0x22, 0x42, 0xA7, 0xCF, 0x50, 0x70, 0xA7, 0xCF, 0x7E, 0x9E, 0xA7, 0xCF + + .global MOD36_022553F4 +MOD36_022553F4: ; 0x022553F4 + .word MOD36_022549AC, MOD36_022549F8, MOD36_02254DD4 + + .global MOD36_02255400 +MOD36_02255400: ; 0x02255400 + .byte 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x00, 0x00 + + .global MOD36_02255408 +MOD36_02255408: ; 0x02255408 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD36_02255424 +MOD36_02255424: ; 0x02255424 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00 - .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00 + .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD36_02255440 +MOD36_02255440: ; 0x02255440 + .byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00 .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0x20, 0x03, 0x00 .byte 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00 .byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x0B, 0x00, 0x00, 0xE0, 0x08, 0x00 - .byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x9D, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0xF5, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x0D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x65, 0x51, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x7D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0xE1, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 - .byte 0x0D, 0x52, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x9D, 0x53, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD36_02255480 +MOD36_02255480: ; 0x02255480 + .word 0x00, MOD36_02254F5C, 0x00 + .word 0x01, MOD36_0225509C, 0x00 + .word 0x02, MOD36_022550F4, 0x00 + .word 0x03, MOD36_0225510C, 0x00 + .word 0x04, MOD36_02255164, 0x00 + .word 0x05, MOD36_0225517C, 0x00 + .word 0x06, MOD36_022551E0, 0x00 + .word 0x07, MOD36_0225520C, 0x00 + .word 0x08, MOD36_0225539C, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s index f4d426db..8135b43b 100644 --- a/arm9/modules/37/asm/module_37.s +++ b/arm9/modules/37/asm/module_37.s @@ -116,7 +116,7 @@ MOD37_02254900: ; 0x02254900 cmp r1, #3 bhs _0225492C lsl r2, r1, #2 - ldr r1, _02254930 ; =0x02254D28 + ldr r1, _02254930 ; =MOD37_02254D28 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -131,7 +131,7 @@ MOD37_02254900: ; 0x02254900 _0225492C: pop {r3, r4, r5, pc} nop -_02254930: .word 0x02254D28 +_02254930: .word MOD37_02254D28 thumb_func_end MOD37_02254900 thumb_func_start MOD37_02254934 @@ -324,7 +324,7 @@ MOD37_02254A54: ; 0x02254A54 add r0, r4, #0 bl MOD37_02254AA0 ldr r1, _02254A98 ; =0xFFFF5800 - ldr r0, _02254A9C ; =0x02254DA0 + ldr r0, _02254A9C ; =MOD37_02254DA0 str r1, [r0] mov r1, #0xb lsl r1, r1, #8 @@ -337,7 +337,7 @@ _02254A94: pop {r4, r5, r6, pc} .align 2, 0 _02254A98: .word 0xFFFF5800 -_02254A9C: .word 0x02254DA0 +_02254A9C: .word MOD37_02254DA0 thumb_func_end MOD37_02254A54 thumb_func_start MOD37_02254AA0 @@ -364,7 +364,7 @@ MOD37_02254AA0: ; 0x02254AA0 bl MOD20_02253FBC add r2, r4, #0 ldr r0, [r4, #0x20] - ldr r1, _02254AF0 ; =0x02254D34 + ldr r1, _02254AF0 ; =MOD37_02254D34 add r2, #0x28 bl MOD20_02253E74 str r0, [r4, #0x24] @@ -379,7 +379,7 @@ _02254AEA: add sp, #0xc pop {r3, r4, pc} nop -_02254AF0: .word 0x02254D34 +_02254AF0: .word MOD37_02254D34 thumb_func_end MOD37_02254AA0 thumb_func_start MOD37_02254AF4 @@ -420,13 +420,13 @@ MOD37_02254B20: ; 0x02254B20 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254B40 ; =0x02254D60 + ldr r0, _02254B40 ; =MOD37_02254D60 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254B40: .word 0x02254D60 +_02254B40: .word MOD37_02254D60 thumb_func_end MOD37_02254B20 thumb_func_start MOD37_02254B44 @@ -468,7 +468,7 @@ MOD37_02254B70: ; 0x02254B70 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254BF4 ; =0x02254D44 + ldr r2, _02254BF4 ; =MOD37_02254D44 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -520,7 +520,7 @@ MOD37_02254B70: ; 0x02254B70 add sp, #0x14 pop {r4, r5, pc} nop -_02254BF4: .word 0x02254D44 +_02254BF4: .word MOD37_02254D44 _02254BF8: .word 0x04001000 _02254BFC: .word 0xFFFFE0FF thumb_func_end MOD37_02254B70 @@ -588,7 +588,7 @@ _02254C6C: mov r0, #9 lsl r0, r0, #0x10 str r0, [r4, #0x3c] - ldr r0, _02254D1C ; =0x02254DA0 + ldr r0, _02254D1C ; =MOD37_02254DA0 ldr r0, [r0] str r0, [r4, #0x40] mov r0, #0 @@ -607,7 +607,7 @@ _02254C9E: ldr r0, [r4, #0x40] add r0, r1, r0 str r0, [r4, #0x3c] - ldr r0, _02254D1C ; =0x02254DA0 + ldr r0, _02254D1C ; =MOD37_02254DA0 ldr r1, [r4, #0x40] ldr r0, [r0, #4] add r1, r1, r0 @@ -664,24 +664,39 @@ _02254D10: pop {r4, r5, r6, pc} .align 2, 0 _02254D18: .word 0x00000675 -_02254D1C: .word 0x02254DA0 +_02254D1C: .word MOD37_02254DA0 _02254D20: .word 0xFFFFE000 _02254D24: .word 0x00000676 thumb_func_end MOD37_02254C44 .section .rodata - ; 0x02254D28 - .byte 0x51, 0x49, 0x25, 0x02, 0x91, 0x49, 0x25, 0x02, 0xE5, 0x49, 0x25, 0x02, 0x00, 0x00, 0x07, 0x00 - .byte 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD37_02254D28 +MOD37_02254D28: ; 0x02254D28 + .word MOD37_02254950, MOD37_02254990, MOD37_022549E4 + + .global MOD37_02254D34 +MOD37_02254D34: ; 0x02254D34 + .byte 0x00, 0x00, 0x07, 0x00 + .byte 0x00, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD37_02254D44 +MOD37_02254D44: ; 0x02254D44 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x4B, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x45, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD37_02254D60 +MOD37_02254D60: ; 0x02254D60 + .word 0x00, MOD37_02254B70, 0x00 + .word 0x01, MOD37_02254C00, 0x00 + .word 0x02, MOD37_02254C44, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD37_02254840 .section .bss - ; 0x02254DA0 + .global MOD37_02254DA0 +MOD37_02254DA0: ; 0x02254DA0 .space 8 diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index 46391ca3..59871d4a 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -85,7 +85,7 @@ _022548C0: strb r0, [r5, #2] mov r0, #8 str r0, [sp] - ldr r0, _02254900 ; =0x0225511C + ldr r0, _02254900 ; =MOD38_0225511C ldr r2, _02254904 ; =MOD38_02254988 mov r1, #6 add r3, r5, #0 @@ -102,7 +102,7 @@ _022548F8: add sp, #4 pop {r3, r4, r5, r6, pc} nop -_02254900: .word 0x0225511C +_02254900: .word MOD38_0225511C _02254904: .word MOD38_02254988 thumb_func_end MOD38_0225489C @@ -157,7 +157,7 @@ MOD38_0225494C: ; 0x0225494C ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254984 ; =0x02255110 + ldr r1, _02254984 ; =MOD38_02255110 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -171,7 +171,7 @@ MOD38_0225494C: ; 0x0225494C _02254982: pop {r3, r4, r5, pc} .align 2, 0 -_02254984: .word 0x02255110 +_02254984: .word MOD38_02255110 thumb_func_end MOD38_0225494C thumb_func_start MOD38_02254988 @@ -414,7 +414,7 @@ _02254B26: thumb_func_start MOD38_02254B2C MOD38_02254B2C: ; 0x02254B2C push {r4, r5} - ldr r5, _02254B68 ; =0x02255134 + ldr r5, _02254B68 ; =MOD38_02255134 mov r3, #0x12 add r4, r0, #0 mul r4, r3 @@ -447,13 +447,13 @@ _02254B64: pop {r4, r5} bx lr .align 2, 0 -_02254B68: .word 0x02255134 +_02254B68: .word MOD38_02255134 thumb_func_end MOD38_02254B2C thumb_func_start MOD38_02254B6C MOD38_02254B6C: ; 0x02254B6C push {r4, r5} - ldr r5, _02254BC0 ; =0x02255278 + ldr r5, _02254BC0 ; =MOD38_02255278 mov r4, #0 _02254B72: ldrb r3, [r5] @@ -497,12 +497,12 @@ _02254BA6: _02254BB4: mov r4, #0x10 _02254BB6: - ldr r0, _02254BC0 ; =0x02255278 + ldr r0, _02254BC0 ; =MOD38_02255278 ldrb r0, [r0, r4] pop {r4, r5} bx lr nop -_02254BC0: .word 0x02255278 +_02254BC0: .word MOD38_02255278 thumb_func_end MOD38_02254B6C thumb_func_start MOD38_02254BC4 @@ -583,7 +583,7 @@ MOD38_02254C38: ; 0x02254C38 add r0, r6, #0 str r0, [sp, #0xc] add r0, #0x60 - ldr r4, _02254CBC ; =0x02255300 + ldr r4, _02254CBC ; =MOD38_02255300 mov r7, #0 add r5, r6, #0 str r0, [sp, #0xc] @@ -607,7 +607,7 @@ _02254C72: str r0, [sp, #0x10] _02254C96: ldr r0, [r6, #0x30] - ldr r1, _02254CC0 ; =0x0225528C + ldr r1, _02254CC0 ; =MOD38_0225528C ldr r2, [sp, #0x10] bl MOD20_02253E74 mov r2, #3 @@ -623,8 +623,8 @@ _02254C96: add sp, #0x14 pop {r4, r5, r6, r7, pc} nop -_02254CBC: .word 0x02255300 -_02254CC0: .word 0x0225528C +_02254CBC: .word MOD38_02255300 +_02254CC0: .word MOD38_0225528C thumb_func_end MOD38_02254C38 thumb_func_start MOD38_02254CC4 @@ -699,13 +699,13 @@ MOD38_02254D34: ; 0x02254D34 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254D54 ; =0x022552B8 + ldr r0, _02254D54 ; =MOD38_022552B8 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254D54: .word 0x022552B8 +_02254D54: .word MOD38_022552B8 thumb_func_end MOD38_02254D34 thumb_func_start MOD38_02254D58 @@ -750,7 +750,7 @@ MOD38_02254D84: ; 0x02254D84 bl MOD20_022538A4 add r7, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254E1C ; =0x0225529C + ldr r2, _02254E1C ; =MOD38_0225529C mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -807,7 +807,7 @@ MOD38_02254D84: ; 0x02254D84 add sp, #0x14 pop {r4, r5, r6, r7, pc} nop -_02254E1C: .word 0x0225529C +_02254E1C: .word MOD38_0225529C _02254E20: .word 0x04001000 _02254E24: .word 0xFFFFE0FF thumb_func_end MOD38_02254D84 @@ -1186,10 +1186,20 @@ _0225510C: .word 0x00000000 thumb_func_end MOD38_022550D0 .section .rodata - ; 0x02255110 - .byte 0xAD, 0x49, 0x25, 0x02, 0xED, 0x49, 0x25, 0x02, 0xF9, 0x4A, 0x25, 0x02, 0x70, 0x90, 0x10, 0x28 + + .global MOD38_02255110 +MOD38_02255110: ; 0x02255110 + .word MOD38_022549AC, MOD38_022549EC, MOD38_02254AF8 + + .global MOD38_0225511C +MOD38_0225511C: ; 0x0225511C + .byte 0x70, 0x90, 0x10, 0x28 .byte 0x70, 0x90, 0x68, 0x80, 0x18, 0x38, 0x60, 0x78, 0x18, 0x38, 0xB8, 0xD0, 0x38, 0x58, 0x60, 0x78 - .byte 0x38, 0x58, 0xB8, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF6, 0xFF, 0x00, 0x00, 0x00 + .byte 0x38, 0x58, 0xB8, 0xD0 + + .global MOD38_02255134 +MOD38_02255134: ; 0x02255134 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xF6, 0xFF, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x01, 0xFF, 0xF6, 0x01, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x01, 0x00 .byte 0xFF, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF @@ -1209,15 +1219,35 @@ _0225510C: .word 0x00000000 .byte 0x00, 0xF6, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x01, 0x00 .byte 0x00, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF, 0x00, 0x0A, 0x0B, 0x0D, 0x0C, 0x0F, 0x01, 0x03 - .byte 0x04, 0x02, 0x0E, 0x06, 0x05, 0x07, 0x10, 0x11, 0x08, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x02, 0x00 - .byte 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF + + .global MOD38_02255278 +MOD38_02255278: ; 0x02255278 + .byte 0x00, 0x0A, 0x0B, 0x0D, 0x0C, 0x0F, 0x01, 0x03 + .byte 0x04, 0x02, 0x0E, 0x06, 0x05, 0x07, 0x10, 0x11, 0x08, 0x00, 0x00, 0x00 + + .global MOD38_0225528C +MOD38_0225528C: ; 0x0225528C + .byte 0x00, 0xC0, 0x02, 0x00 + .byte 0x00, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD38_0225529C +MOD38_0225529C: ; 0x0225529C + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x4D, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x19, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x39, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x75, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xA9, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD38_022552B8 +MOD38_022552B8: ; 0x022552B8 + .word 0x00, MOD38_02254D84, 0x00 + .word 0x01, MOD38_02254F18, 0x00 + .word 0x02, MOD38_02254F38, 0x00 + .word 0x03, MOD38_02254F74, 0x00 + .word 0x04, MOD38_02254FA8, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD38_02255300 +MOD38_02255300: ; 0x02255300 .byte 0x00, 0xC0, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x40, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index 27675b6d..abd624df 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -131,7 +131,7 @@ _0225491A: strb r1, [r0, #2] mov r0, #8 str r0, [sp] - ldr r0, _0225496C ; =0x02255300 + ldr r0, _0225496C ; =MOD39_02255300 ldr r2, _02254970 ; =MOD39_0225498C ldr r3, [sp, #4] mov r1, #3 @@ -153,7 +153,7 @@ _02254964: add sp, #0x14 pop {r4, r5, r6, r7, pc} nop -_0225496C: .word 0x02255300 +_0225496C: .word MOD39_02255300 _02254970: .word MOD39_0225498C thumb_func_end MOD39_0225489C @@ -194,7 +194,7 @@ MOD39_02254998: ; 0x02254998 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _022549D0 ; =0x0225530C + ldr r1, _022549D0 ; =MOD39_0225530C ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -208,7 +208,7 @@ MOD39_02254998: ; 0x02254998 _022549CE: pop {r3, r4, r5, pc} .align 2, 0 -_022549D0: .word 0x0225530C +_022549D0: .word MOD39_0225530C thumb_func_end MOD39_02254998 thumb_func_start MOD39_022549D4 @@ -627,7 +627,7 @@ MOD39_02254C6C: ; 0x02254C6C add r0, r5, #0 str r0, [sp, #0x10] add r0, #0x3c - ldr r7, _02254D74 ; =0x02255408 + ldr r7, _02254D74 ; =MOD39_02255408 mov r4, #0 add r6, r5, #0 str r0, [sp, #0x10] @@ -644,7 +644,7 @@ _02254CD6: blt _02254CD6 cmp r4, #6 bge _02254D18 - ldr r1, _02254D74 ; =0x02255408 + ldr r1, _02254D74 ; =MOD39_02255408 lsl r0, r4, #4 add r7, r1, r0 lsl r0, r4, #2 @@ -708,7 +708,7 @@ _02254D70: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254D74: .word 0x02255408 +_02254D74: .word MOD39_02255408 thumb_func_end MOD39_02254C6C thumb_func_start MOD39_02254D78 @@ -747,13 +747,13 @@ MOD39_02254DA4: ; 0x02254DA4 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254DC4 ; =0x022553A8 + ldr r0, _02254DC4 ; =MOD39_022553A8 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254DC4: .word 0x022553A8 +_02254DC4: .word MOD39_022553A8 thumb_func_end MOD39_02254DA4 thumb_func_start MOD39_02254DC8 @@ -797,7 +797,7 @@ MOD39_02254DF4: ; 0x02254DF4 add r0, r4, #0 bl MOD20_022538A4 ldr r0, [r5, #4] - ldr r2, _02254E7C ; =0x02255330 + ldr r2, _02254E7C ; =MOD39_02255330 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -849,7 +849,7 @@ MOD39_02254DF4: ; 0x02254DF4 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 -_02254E7C: .word 0x02255330 +_02254E7C: .word MOD39_02255330 _02254E80: .word 0x04001000 _02254E84: .word 0xFFFFE0FF thumb_func_end MOD39_02254DF4 @@ -1143,25 +1143,25 @@ _022550C4: ; jump table .short _022550D2 - _022550C4 - 2 ; case 2 .short _022550CC - _022550C4 - 2 ; case 3 _022550CC: - ldr r0, _02255104 ; =0x02255378 + ldr r0, _02255104 ; =MOD39_02255378 str r0, [r4, #0x6c] b _022550FA _022550D2: - ldr r0, _02255108 ; =0x02255318 + ldr r0, _02255108 ; =MOD39_02255318 mov r1, #1 str r0, [r4, #0x6c] ldr r0, [r4, #0x28] bl MOD20_02253F28 b _022550FA _022550E0: - ldr r0, _0225510C ; =0x0225534C + ldr r0, _0225510C ; =MOD39_0225534C mov r1, #2 str r0, [r4, #0x6c] ldr r0, [r4, #0x28] bl MOD20_02253F28 b _022550FA _022550EE: - ldr r0, _02255110 ; =0x02255468 + ldr r0, _02255110 ; =MOD39_02255468 mov r1, #3 str r0, [r4, #0x6c] ldr r0, [r4, #0x28] @@ -1172,10 +1172,10 @@ _022550FA: bl MOD39_02255114 pop {r3, r4, r5, pc} .align 2, 0 -_02255104: .word 0x02255378 -_02255108: .word 0x02255318 -_0225510C: .word 0x0225534C -_02255110: .word 0x02255468 +_02255104: .word MOD39_02255378 +_02255108: .word MOD39_02255318 +_0225510C: .word MOD39_0225534C +_02255110: .word MOD39_02255468 thumb_func_end MOD39_0225509C thumb_func_start MOD39_02255114 @@ -1445,35 +1445,65 @@ _022552FA: thumb_func_end MOD39_02255114 .section .rodata - ; 0x02255300 - .byte 0x80, 0xA8, 0x5C, 0x84, 0x82, 0xA4, 0x18, 0x48, 0x82, 0xA4, 0x98, 0xC8, 0xF1, 0x49, 0x25, 0x02 - .byte 0x31, 0x4A, 0x25, 0x02, 0xE9, 0x4B, 0x25, 0x02, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF + + .global MOD39_02255300 +MOD39_02255300: ; 0x02255300 + .byte 0x80, 0xA8, 0x5C, 0x84, 0x82, 0xA4, 0x18, 0x48, 0x82, 0xA4, 0x98, 0xC8 + + .global MOD39_0225530C +MOD39_0225530C: ; 0x0225530C + .word MOD39_022549F0, MOD39_02254A30, MOD39_02254BE8 + + .global MOD39_02255318 +MOD39_02255318: ; 0x02255318 + .word -2, 0x10, 0x10, -5 + .word 0x66B, -1 + + .global MOD39_02255330 +MOD39_02255330: ; 0x02255330 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF - .byte 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00 - .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF - .byte 0x6B, 0x06, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0xFA, 0xFF, 0xFF, 0xFF - .byte 0xFB, 0xFF, 0xFF, 0xFF, 0x6C, 0x06, 0x00, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xF5, 0x4D, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x89, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0xCD, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0xF9, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1D, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x61, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x31, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x40, 0x09, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD39_0225534C +MOD39_0225534C: ; 0x0225534C + .word -2, 0x10, 0x10, -5 + .word 0x66B, -2, 0x10, 0x10 + .word -5, 0x66B, -1 + + .global MOD39_02255378 +MOD39_02255378: ; 0x02255378 + .word -2, 0x10, 0x10, -4 + .word 0x10, -6, -5, 0x66C + .word -3, 0x10, 0x10, -1 + + .global MOD39_022553A8 +MOD39_022553A8: ; 0x022553A8 + .word 0x00, MOD39_02254DF4, 0x00 + .word 0x01, MOD39_02254E88, 0x00 + .word 0x02, MOD39_02254ECC, 0x00 + .word 0x03, MOD39_02254EF8, 0x00 + .word 0x04, MOD39_02254F1C, 0x00 + .word 0x05, MOD39_02254F60, 0x00 + .word 0x06, MOD39_02255030, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD39_02255408 +MOD39_02255408: ; 0x02255408 + .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x40, 0x09, 0x00 .byte 0x09, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x02, 0x00 .byte 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x05, 0x00 .byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x80, 0x05, 0x00 .byte 0x06, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xC0, 0x08, 0x00 .byte 0x05, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0xC0, 0x08, 0x00 - .byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF - .byte 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0x6B, 0x06, 0x00, 0x00 - .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF - .byte 0x6B, 0x06, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0xFF, 0xFF - .byte 0x6D, 0x06, 0x00, 0x00, 0xF9, 0xFF, 0xFF, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00 - .byte 0xF9, 0xFF, 0xFF, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0xF9, 0xFF, 0xFF, 0xFF - .byte 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00 - .byte 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00 + + .global MOD39_02255468 +MOD39_02255468: ; 0x02255468 + .word -2, 0x10, 0x10, -5 + .word 0x066B, -2, 0x10, 0x10 + .word -5, 0x66B, -2, 0x10 + .word 0x10, -5, 0x66B, -4 + .word 0x10, -5, 0x66D, -7 + .word 0x02, 0x07, -7, 0x03 + .word 0x08, -7, 0x01, 0x04 + .word -4, 0x10, -1 diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index 02f648c8..e46b1f2a 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -87,7 +87,7 @@ MOD40_0225489C: ; 0x0225489C strb r0, [r5, #2] mov r0, #8 str r0, [sp] - ldr r0, _02254938 ; =0x02255328 + ldr r0, _02254938 ; =MOD40_02255328 ldr r2, _0225493C ; =MOD40_02254990 mov r1, #6 add r3, r5, #0 @@ -123,7 +123,7 @@ _02254930: add sp, #0xc pop {r3, r4, r5, r6, pc} nop -_02254938: .word 0x02255328 +_02254938: .word MOD40_02255328 _0225493C: .word MOD40_02254990 thumb_func_end MOD40_0225489C @@ -193,7 +193,7 @@ MOD40_02254998: ; 0x02254998 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _022549D0 ; =0x02255314 + ldr r1, _022549D0 ; =MOD40_02255314 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -207,7 +207,7 @@ MOD40_02254998: ; 0x02254998 _022549CE: pop {r3, r4, r5, pc} .align 2, 0 -_022549D0: .word 0x02255314 +_022549D0: .word MOD40_02255314 thumb_func_end MOD40_02254998 thumb_func_start MOD40_022549D4 @@ -806,7 +806,7 @@ MOD40_02254DBC: ; 0x02254DBC add r0, r5, #0 str r0, [sp, #0x10] add r0, #0x7c - ldr r7, _02254EE0 ; =0x022553B0 + ldr r7, _02254EE0 ; =MOD40_022553B0 mov r4, #0 add r6, r5, #0 str r0, [sp, #0x10] @@ -890,7 +890,7 @@ _02254EB2: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop -_02254EE0: .word 0x022553B0 +_02254EE0: .word MOD40_022553B0 thumb_func_end MOD40_02254DBC thumb_func_start MOD40_02254EE4 @@ -999,13 +999,13 @@ MOD40_02254F98: ; 0x02254F98 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254FB8 ; =0x0225535C + ldr r0, _02254FB8 ; =MOD40_0225535C ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254FB8: .word 0x0225535C +_02254FB8: .word MOD40_0225535C thumb_func_end MOD40_02254F98 thumb_func_start MOD40_02254FBC @@ -1047,7 +1047,7 @@ MOD40_02254FE8: ; 0x02254FE8 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _0225506C ; =0x02255340 + ldr r2, _0225506C ; =MOD40_02255340 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -1099,7 +1099,7 @@ MOD40_02254FE8: ; 0x02254FE8 add sp, #0x14 pop {r4, r5, pc} nop -_0225506C: .word 0x02255340 +_0225506C: .word MOD40_02255340 _02255070: .word 0x04001000 _02255074: .word 0xFFFFE0FF thumb_func_end MOD40_02254FE8 @@ -1410,17 +1410,36 @@ MOD40_0225530C: ; 0x0225530C thumb_func_end MOD40_0225530C .section .rodata - ; 0x02255314 - .byte 0xF1, 0x49, 0x25, 0x02, 0x41, 0x4A, 0x25, 0x02, 0x51, 0x4B, 0x25, 0x02, 0x1D, 0x4C, 0x25, 0x02 - .byte 0x19, 0x4D, 0x25, 0x02, 0x48, 0x68, 0xB0, 0xD0, 0x68, 0x88, 0xB0, 0xD0, 0x70, 0x80, 0x40, 0x50 - .byte 0xA0, 0xB0, 0x40, 0x50, 0x70, 0x80, 0x70, 0x80, 0xA0, 0xB0, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00 + + .global MOD40_02255314 +MOD40_02255314: ; 0x02255314 + .word MOD40_022549F0, MOD40_02254A40, MOD40_02254B50, MOD40_02254C1C + .word MOD40_02254D18 + + .global MOD40_02255328 +MOD40_02255328: ; 0x02255328 + .byte 0x48, 0x68, 0xB0, 0xD0, 0x68, 0x88, 0xB0, 0xD0, 0x70, 0x80, 0x40, 0x50 + .byte 0xA0, 0xB0, 0x40, 0x50, 0x70, 0x80, 0x70, 0x80, 0xA0, 0xB0, 0x70, 0x80 + + .global MOD40_02255340 +MOD40_02255340: ; 0x02255340 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE9, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x79, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0xC1, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x3D, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB9, 0x51, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0xF9, 0x51, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD40_0225535C +MOD40_0225535C: ; 0x0225535C + .word 0x00, MOD40_02254FE8, 0x00 + .word 0x01, MOD40_02255078, 0x00 + .word 0x02, MOD40_022550C0, 0x00 + .word 0x03, MOD40_0225513C, 0x00 + .word 0x04, MOD40_022551B8, 0x00 + .word 0x05, MOD40_022551F8, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD40_022553B0 +MOD40_022553B0: ; 0x022553B0 + .byte 0x00, 0x00, 0x0C, 0x00 .byte 0x00, 0x80, 0x06, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00 diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s index 0e9851e2..13762a02 100644 --- a/arm9/modules/41/asm/module_41.s +++ b/arm9/modules/41/asm/module_41.s @@ -219,7 +219,7 @@ MOD41_02254990: ; 0x02254990 strb r0, [r5, #3] mov r0, #8 str r0, [sp] - ldr r0, _02254A30 ; =0x022557B0 + ldr r0, _02254A30 ; =MOD41_022557B0 ldr r2, _02254A34 ; =MOD41_02254A58 mov r1, #0xb add r3, r5, #0 @@ -268,7 +268,7 @@ _02254A28: add sp, #4 pop {r3, r4, r5, r6, pc} nop -_02254A30: .word 0x022557B0 +_02254A30: .word MOD41_022557B0 _02254A34: .word MOD41_02254A58 thumb_func_end MOD41_02254990 @@ -339,7 +339,7 @@ _02254AAE: ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254AD4 ; =0x02255794 + ldr r1, _02254AD4 ; =MOD41_02255794 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -353,7 +353,7 @@ _02254AAE: _02254AD0: pop {r3, r4, r5, pc} nop -_02254AD4: .word 0x02255794 +_02254AD4: .word MOD41_02255794 thumb_func_end MOD41_02254A88 thumb_func_start MOD41_02254AD8 @@ -1429,7 +1429,7 @@ MOD41_022552A0: ; 0x022552A0 add r0, r7, #0 str r0, [sp, #0x10] add r0, #0x8c - ldr r6, _02255370 ; =0x02255864 + ldr r6, _02255370 ; =MOD41_02255864 mov r4, #0 add r5, r7, #0 str r0, [sp, #0x10] @@ -1481,7 +1481,7 @@ _0225535E: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop -_02255370: .word 0x02255864 +_02255370: .word MOD41_02255864 thumb_func_end MOD41_022552A0 thumb_func_start MOD41_02255374 @@ -1522,13 +1522,13 @@ MOD41_022553A4: ; 0x022553A4 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _022553C4 ; =0x022557F8 + ldr r0, _022553C4 ; =MOD41_022557F8 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_022553C4: .word 0x022557F8 +_022553C4: .word MOD41_022557F8 thumb_func_end MOD41_022553A4 thumb_func_start MOD41_022553C8 @@ -1570,7 +1570,7 @@ MOD41_022553F4: ; 0x022553F4 bl MOD20_022538A0 add r4, r0, #0 ldr r0, [r4, #4] - ldr r2, _022554CC ; =0x022557DC + ldr r2, _022554CC ; =MOD41_022557DC mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -1662,7 +1662,7 @@ _022554C0: add sp, #0x14 pop {r4, r5, pc} nop -_022554CC: .word 0x022557DC +_022554CC: .word MOD41_022557DC _022554D0: .word 0x04001000 _022554D4: .word 0xFFFFE0FF thumb_func_end MOD41_022553F4 @@ -2020,20 +2020,39 @@ MOD41_0225578C: ; 0x0225578C thumb_func_end MOD41_0225578C .section .rodata - ; 0x02255794 - .byte 0x59, 0x4B, 0x25, 0x02, 0x99, 0x4B, 0x25, 0x02, 0x21, 0x4D, 0x25, 0x02, 0x0D, 0x4E, 0x25, 0x02 - .byte 0xB9, 0x4E, 0x25, 0x02, 0x61, 0x4F, 0x25, 0x02, 0x19, 0x50, 0x25, 0x02, 0x90, 0xB0, 0x10, 0x50 + + .global MOD41_02255794 +MOD41_02255794: ; 0x02255794 + .word MOD41_02254B58, MOD41_02254B98, MOD41_02254D20, MOD41_02254E0C + .word MOD41_02254EB8, MOD41_02254F60, MOD41_02255018 + + .global MOD41_022557B0 +MOD41_022557B0: ; 0x022557B0 + .byte 0x90, 0xB0, 0x10, 0x50 .byte 0x90, 0xB0, 0x50, 0x90, 0x90, 0xB0, 0x90, 0xD0, 0x50, 0x60, 0x48, 0x58, 0x50, 0x60, 0x58, 0x68 .byte 0x80, 0x90, 0x48, 0x58, 0x80, 0x90, 0x58, 0x68, 0x50, 0x60, 0x78, 0x88, 0x50, 0x60, 0x88, 0x98 - .byte 0x80, 0x90, 0x78, 0x88, 0x80, 0x90, 0x88, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x80, 0x90, 0x78, 0x88, 0x80, 0x90, 0x88, 0x98 + + .global MOD41_022557DC +MOD41_022557DC: ; 0x022557DC + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF5, 0x53, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0xD9, 0x54, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x25, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x59, 0x55, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x8D, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0xB1, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0xD5, 0x55, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x91, 0x56, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD41_022557F8 +MOD41_022557F8: ; 0x022557F8 + .word 0x00, MOD41_022553F4, 0x00 + .word 0x01, MOD41_022554D8, 0x00 + .word 0x02, MOD41_02255524, 0x00 + .word 0x03, MOD41_02255558, 0x00 + .word 0x04, MOD41_0225558C, 0x00 + .word 0x05, MOD41_022555B0, 0x00 + .word 0x06, MOD41_022555D4, 0x00 + .word 0x07, MOD41_02255690, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD41_02255864 +MOD41_02255864: ; 0x02255864 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x80, 0x03, 0x00, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x0B, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x05, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index f13fb22c..b4e4e4d8 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -239,7 +239,7 @@ MOD42_02254A04: ; 0x02254A04 cmp r1, #4 bhs _02254A30 lsl r2, r1, #2 - ldr r1, _02254A34 ; =0x022550CC + ldr r1, _02254A34 ; =MOD42_022550CC add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -254,7 +254,7 @@ MOD42_02254A04: ; 0x02254A04 _02254A30: pop {r3, r4, r5, pc} nop -_02254A34: .word 0x022550CC +_02254A34: .word MOD42_022550CC thumb_func_end MOD42_02254A04 thumb_func_start MOD42_02254A38 @@ -914,13 +914,13 @@ MOD42_02254EEC: ; 0x02254EEC str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254F0C ; =0x022550F8 + ldr r0, _02254F0C ; =MOD42_022550F8 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254F0C: .word 0x022550F8 +_02254F0C: .word MOD42_022550F8 thumb_func_end MOD42_02254EEC thumb_func_start MOD42_02254F10 @@ -962,7 +962,7 @@ MOD42_02254F3C: ; 0x02254F3C bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254FC0 ; =0x022550DC + ldr r2, _02254FC0 ; =MOD42_022550DC mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -1014,7 +1014,7 @@ MOD42_02254F3C: ; 0x02254F3C add sp, #0x14 pop {r4, r5, pc} nop -_02254FC0: .word 0x022550DC +_02254FC0: .word MOD42_022550DC _02254FC4: .word 0x04001000 _02254FC8: .word 0xFFFFE0FF thumb_func_end MOD42_02254F3C @@ -1149,9 +1149,18 @@ _022550C8: thumb_func_end MOD42_02254FE8 .section .rodata - ; 0x022550CC - .byte 0x55, 0x4A, 0x25, 0x02, 0x95, 0x4A, 0x25, 0x02, 0x29, 0x4B, 0x25, 0x02, 0x81, 0x4B, 0x25, 0x02 + + .global MOD42_022550CC +MOD42_022550CC: ; 0x022550CC + .word MOD42_02254A54, MOD42_02254A94, MOD42_02254B28, MOD42_02254B80 + + .global MOD42_022550DC +MOD42_022550DC: ; 0x022550DC .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x3D, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xCD, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD42_022550F8 +MOD42_022550F8: ; 0x022550F8 + .word 0x00, MOD42_02254F3C, 0x00 + .word 0x01, MOD42_02254FCC, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index b4667463..c9bbedfd 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -143,7 +143,7 @@ MOD43_0225493C: ; 0x0225493C cmp r1, #3 bhs _0225496A lsl r2, r1, #2 - ldr r1, _0225496C ; =0x022550A8 + ldr r1, _0225496C ; =MOD43_022550A8 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -159,7 +159,7 @@ MOD43_0225493C: ; 0x0225493C _0225496A: pop {r3, r4, r5, pc} .align 2, 0 -_0225496C: .word 0x022550A8 +_0225496C: .word MOD43_022550A8 thumb_func_end MOD43_0225493C thumb_func_start MOD43_02254970 @@ -346,9 +346,9 @@ _02254A9E: bl FUN_02025238 cmp r0, #5 bne _02254AEA - ldr r1, _02254AF4 ; =0x022550B4 + ldr r1, _02254AF4 ; =MOD43_022550B4 lsl r0, r4, #1 - ldr r2, _02254AF4 ; =0x022550B4 + ldr r2, _02254AF4 ; =MOD43_022550B4 add r1, r1, r0 ldrb r0, [r2, r0] strb r0, [r5, #0x10] @@ -383,7 +383,7 @@ _02254AF0: add r0, r7, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254AF4: .word 0x022550B4 +_02254AF4: .word MOD43_022550B4 thumb_func_end MOD43_02254A88 thumb_func_start MOD43_02254AF8 @@ -519,13 +519,13 @@ MOD43_02254BD8: ; 0x02254BD8 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254BF8 ; =0x022551BC + ldr r0, _02254BF8 ; =MOD43_022551BC ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254BF8: .word 0x022551BC +_02254BF8: .word MOD43_022551BC thumb_func_end MOD43_02254BD8 thumb_func_start MOD43_02254BFC @@ -571,7 +571,7 @@ MOD43_02254C28: ; 0x02254C28 strb r3, [r0] strb r3, [r0, #1] ldr r0, [r5, #4] - ldr r2, _02254CC4 ; =0x022551A0 + ldr r2, _02254CC4 ; =MOD43_022551A0 mov r1, #6 bl FUN_02016C18 mov r0, #0 @@ -629,7 +629,7 @@ MOD43_02254C28: ; 0x02254C28 pop {r3, r4, r5, r6, pc} .align 2, 0 _02254CC0: .word 0x0400104C -_02254CC4: .word 0x022551A0 +_02254CC4: .word MOD43_022551A0 _02254CC8: .word 0x04001000 _02254CCC: .word 0xFFFFE0FF thumb_func_end MOD43_02254C28 @@ -1128,25 +1128,141 @@ _022550A2: thumb_func_end MOD43_02255078 .section .rodata - ; 0x022550A8 - .byte 0x8D, 0x49, 0x25, 0x02, 0xD9, 0x49, 0x25, 0x02, 0x51, 0x4A, 0x25, 0x02, 0x05, 0x14, 0x05, 0x14 - .byte 0x06, 0x14, 0x06, 0x14, 0x06, 0x13, 0x06, 0x13, 0x07, 0x11, 0x07, 0x11, 0x07, 0x11, 0x07, 0x11 - .byte 0x05, 0x12, 0x05, 0x12, 0x05, 0x12, 0x05, 0x12, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10 - .byte 0x09, 0x13, 0x09, 0x13, 0x09, 0x15, 0x09, 0x15, 0x09, 0x16, 0x09, 0x16, 0x09, 0x16, 0x09, 0x16 - .byte 0x0D, 0x16, 0x0D, 0x16, 0x0D, 0x16, 0x0D, 0x16, 0x10, 0x16, 0x10, 0x16, 0x11, 0x15, 0x11, 0x15 - .byte 0x11, 0x14, 0x11, 0x14, 0x11, 0x14, 0x11, 0x14, 0x11, 0x13, 0x11, 0x13, 0x11, 0x13, 0x11, 0x13 - .byte 0x0F, 0x10, 0x0F, 0x10, 0x0F, 0x10, 0x0F, 0x10, 0x0D, 0x10, 0x0D, 0x10, 0x0D, 0x10, 0x0D, 0x10 - .byte 0x0E, 0x18, 0x0E, 0x18, 0x0E, 0x19, 0x0E, 0x19, 0x11, 0x1A, 0x11, 0x1A, 0x11, 0x1A, 0x11, 0x1A - .byte 0x13, 0x19, 0x13, 0x19, 0x13, 0x19, 0x13, 0x19, 0x14, 0x19, 0x14, 0x19, 0x14, 0x19, 0x14, 0x19 - .byte 0x16, 0x14, 0x16, 0x14, 0x16, 0x14, 0x16, 0x14, 0x13, 0x12, 0x13, 0x12, 0x14, 0x12, 0x14, 0x12 - .byte 0x02, 0x17, 0x02, 0x17, 0x02, 0x17, 0x02, 0x17, 0x08, 0x1C, 0x08, 0x1C, 0x08, 0x1C, 0x08, 0x1C - .byte 0x17, 0x18, 0x17, 0x18, 0x17, 0x18, 0x17, 0x18, 0x1C, 0x10, 0x1C, 0x10, 0x1C, 0x10, 0x1C, 0x10 - .byte 0x13, 0x0D, 0x14, 0x0D, 0x14, 0x0D, 0x14, 0x0D, 0x13, 0x0A, 0x13, 0x0A, 0x13, 0x0A, 0x13, 0x0A - .byte 0x15, 0x0A, 0x15, 0x0A, 0x15, 0x0A, 0x15, 0x0A, 0x18, 0x0C, 0x18, 0x0C, 0x18, 0x0C, 0x18, 0x0C - .byte 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0D, 0x19, 0x0E, 0x19, 0x0E, 0x19, 0x0E, 0x19, 0x0E - .byte 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D, 0x15, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD43_022550A8 +MOD43_022550A8: ; 0x022550A8 + .word MOD43_0225498C, MOD43_022549D8, MOD43_02254A50 + + .global MOD43_022550B4 +MOD43_022550B4: ; 0x022550B4 + .byte 0x05, 0x14 + .byte 0x05, 0x14 + .byte 0x06, 0x14 + .byte 0x06, 0x14 + .byte 0x06, 0x13 + .byte 0x06, 0x13 + .byte 0x07, 0x11 + .byte 0x07, 0x11 + .byte 0x07, 0x11 + .byte 0x07, 0x11 + .byte 0x05, 0x12 + .byte 0x05, 0x12 + .byte 0x05, 0x12 + .byte 0x05, 0x12 + .byte 0x08, 0x10 + .byte 0x08, 0x10 + .byte 0x08, 0x10 + .byte 0x08, 0x10 + .byte 0x09, 0x13 + .byte 0x09, 0x13 + .byte 0x09, 0x15 + .byte 0x09, 0x15 + .byte 0x09, 0x16 + .byte 0x09, 0x16 + .byte 0x09, 0x16 + .byte 0x09, 0x16 + .byte 0x0D, 0x16 + .byte 0x0D, 0x16 + .byte 0x0D, 0x16 + .byte 0x0D, 0x16 + .byte 0x10, 0x16 + .byte 0x10, 0x16 + .byte 0x11, 0x15 + .byte 0x11, 0x15 + .byte 0x11, 0x14 + .byte 0x11, 0x14 + .byte 0x11, 0x14 + .byte 0x11, 0x14 + .byte 0x11, 0x13 + .byte 0x11, 0x13 + .byte 0x11, 0x13 + .byte 0x11, 0x13 + .byte 0x0F, 0x10 + .byte 0x0F, 0x10 + .byte 0x0F, 0x10 + .byte 0x0F, 0x10 + .byte 0x0D, 0x10 + .byte 0x0D, 0x10 + .byte 0x0D, 0x10 + .byte 0x0D, 0x10 + .byte 0x0E, 0x18 + .byte 0x0E, 0x18 + .byte 0x0E, 0x19 + .byte 0x0E, 0x19 + .byte 0x11, 0x1A + .byte 0x11, 0x1A + .byte 0x11, 0x1A + .byte 0x11, 0x1A + .byte 0x13, 0x19 + .byte 0x13, 0x19 + .byte 0x13, 0x19 + .byte 0x13, 0x19 + .byte 0x14, 0x19 + .byte 0x14, 0x19 + .byte 0x14, 0x19 + .byte 0x14, 0x19 + .byte 0x16, 0x14 + .byte 0x16, 0x14 + .byte 0x16, 0x14 + .byte 0x16, 0x14 + .byte 0x13, 0x12 + .byte 0x13, 0x12 + .byte 0x14, 0x12 + .byte 0x14, 0x12 + .byte 0x02, 0x17 + .byte 0x02, 0x17 + .byte 0x02, 0x17 + .byte 0x02, 0x17 + .byte 0x08, 0x1C + .byte 0x08, 0x1C + .byte 0x08, 0x1C + .byte 0x08, 0x1C + .byte 0x17, 0x18 + .byte 0x17, 0x18 + .byte 0x17, 0x18 + .byte 0x17, 0x18 + .byte 0x1C, 0x10 + .byte 0x1C, 0x10 + .byte 0x1C, 0x10 + .byte 0x1C, 0x10 + .byte 0x13, 0x0D + .byte 0x14, 0x0D + .byte 0x14, 0x0D + .byte 0x14, 0x0D + .byte 0x13, 0x0A + .byte 0x13, 0x0A + .byte 0x13, 0x0A + .byte 0x13, 0x0A + .byte 0x15, 0x0A + .byte 0x15, 0x0A + .byte 0x15, 0x0A + .byte 0x15, 0x0A + .byte 0x18, 0x0C + .byte 0x18, 0x0C + .byte 0x18, 0x0C + .byte 0x18, 0x0C + .byte 0x19, 0x0D + .byte 0x19, 0x0D + .byte 0x19, 0x0D + .byte 0x19, 0x0D + .byte 0x19, 0x0E + .byte 0x19, 0x0E + .byte 0x19, 0x0E + .byte 0x19, 0x0E + .byte 0x15, 0x0D + .byte 0x15, 0x0D + .byte 0x15, 0x0D + .byte 0x15, 0x0D + + .global MOD43_022551A0 +MOD43_022551A0: ; 0x022551A0 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x4D, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0xA9, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00 + + .global MOD43_022551BC +MOD43_022551BC: ; 0x022551BC + .word 0x00, MOD43_02254C28, 0x00 + .word 0x01, MOD43_02254D4C, 0x00 + .word 0x02, MOD43_02254DA8, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s index dfb28de6..bcee6542 100644 --- a/arm9/modules/44/asm/module_44.s +++ b/arm9/modules/44/asm/module_44.s @@ -105,7 +105,7 @@ MOD44_022548EC: ; 0x022548EC cmp r1, #3 bhs _02254918 lsl r2, r1, #2 - ldr r1, _0225491C ; =0x02254C54 + ldr r1, _0225491C ; =MOD44_02254C54 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -120,7 +120,7 @@ MOD44_022548EC: ; 0x022548EC _02254918: pop {r3, r4, r5, pc} nop -_0225491C: .word 0x02254C54 +_0225491C: .word MOD44_02254C54 thumb_func_end MOD44_022548EC thumb_func_start MOD44_02254920 @@ -357,7 +357,7 @@ MOD44_02254A90: ; 0x02254A90 bl MOD20_02253FBC add r2, r5, #0 ldr r0, [r5, #0x20] - ldr r1, _02254AE0 ; =0x02254C60 + ldr r1, _02254AE0 ; =MOD44_02254C60 add r2, #0x28 bl MOD20_02253E74 str r0, [r5, #0x24] @@ -371,7 +371,7 @@ MOD44_02254A90: ; 0x02254A90 add sp, #0xc pop {r4, r5, pc} .align 2, 0 -_02254AE0: .word 0x02254C60 +_02254AE0: .word MOD44_02254C60 thumb_func_end MOD44_02254A90 thumb_func_start MOD44_02254AE4 @@ -415,13 +415,13 @@ MOD44_02254B14: ; 0x02254B14 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254B34 ; =0x02254C8C + ldr r0, _02254B34 ; =MOD44_02254C8C ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254B34: .word 0x02254C8C +_02254B34: .word MOD44_02254C8C thumb_func_end MOD44_02254B14 thumb_func_start MOD44_02254B38 @@ -465,7 +465,7 @@ MOD44_02254B64: ; 0x02254B64 add r0, r4, #0 bl MOD20_022538A4 ldr r0, [r5, #4] - ldr r2, _02254BEC ; =0x02254C70 + ldr r2, _02254BEC ; =MOD44_02254C70 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -517,7 +517,7 @@ MOD44_02254B64: ; 0x02254B64 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 -_02254BEC: .word 0x02254C70 +_02254BEC: .word MOD44_02254C70 _02254BF0: .word 0x04001000 _02254BF4: .word 0xFFFFE0FF thumb_func_end MOD44_02254B64 @@ -568,11 +568,25 @@ _02254C50: .word 0x00000663 thumb_func_end MOD44_02254C14 .section .rodata - ; 0x02254C54 - .byte 0x3D, 0x49, 0x25, 0x02, 0x7D, 0x49, 0x25, 0x02, 0x21, 0x4A, 0x25, 0x02, 0x00, 0x80, 0x03, 0x00 - .byte 0x00, 0x40, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD44_02254C54 +MOD44_02254C54: ; 0x02254C54 + .word MOD44_0225493C, MOD44_0225497C, MOD44_02254A20 + + .global MOD44_02254C60 +MOD44_02254C60: ; 0x02254C60 + .byte 0x00, 0x80, 0x03, 0x00 + .byte 0x00, 0x40, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD44_02254C70 +MOD44_02254C70: ; 0x02254C70 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x4B, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xF9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x15, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD44_02254C8C +MOD44_02254C8C: ; 0x02254C8C + .word 0x00, MOD44_02254B64, 0x00 + .word 0x01, MOD44_02254BF8, 0x00 + .word 0x02, MOD44_02254C14, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index 7f47eb2f..effe8de8 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -96,7 +96,7 @@ MOD45_0225489C: ; 0x0225489C strb r0, [r5, #2] mov r0, #8 str r0, [sp] - ldr r0, _02254924 ; =0x02255018 + ldr r0, _02254924 ; =MOD45_02255018 ldr r2, _02254928 ; =MOD45_022549E0 mov r1, #0x25 add r3, r5, #0 @@ -118,7 +118,7 @@ _0225491C: add sp, #0x14 pop {r3, r4, r5, r6, pc} nop -_02254924: .word 0x02255018 +_02254924: .word MOD45_02255018 _02254928: .word MOD45_022549E0 thumb_func_end MOD45_0225489C @@ -133,7 +133,7 @@ MOD45_0225492C: ; 0x0225492C ldr r0, [r4, #8] str r0, [r6, #8] ldr r1, [r6] - ldr r0, _022549BC ; =0x022550AB + ldr r0, _022549BC ; =MOD45_022550AB ldrb r0, [r0, r1] str r0, [r6, #4] ldr r0, [r6] @@ -197,7 +197,7 @@ _0225499A: _022549BA: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_022549BC: .word 0x022550AB +_022549BC: .word MOD45_022550AB thumb_func_end MOD45_0225492C thumb_func_start MOD45_022549C0 @@ -244,7 +244,7 @@ MOD45_022549EC: ; 0x022549EC ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254A2C ; =0x0225500C + ldr r1, _02254A2C ; =MOD45_0225500C ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -259,7 +259,7 @@ MOD45_022549EC: ; 0x022549EC _02254A2A: pop {r3, r4, r5, pc} .align 2, 0 -_02254A2C: .word 0x0225500C +_02254A2C: .word MOD45_0225500C thumb_func_end MOD45_022549EC thumb_func_start MOD45_02254A30 @@ -528,7 +528,7 @@ MOD45_02254BE0: ; 0x02254BE0 bl MOD20_02253FBC add r2, r5, #0 ldr r0, [r5, #0x20] - ldr r1, _02254C2C ; =0x022550B8 + ldr r1, _02254C2C ; =MOD45_022550B8 add r2, #0x28 bl MOD20_02253E74 str r0, [r5, #0x24] @@ -540,7 +540,7 @@ MOD45_02254BE0: ; 0x02254BE0 add sp, #0xc pop {r4, r5, pc} .align 2, 0 -_02254C2C: .word 0x022550B8 +_02254C2C: .word MOD45_022550B8 thumb_func_end MOD45_02254BE0 thumb_func_start MOD45_02254C30 @@ -595,13 +595,13 @@ MOD45_02254C7C: ; 0x02254C7C str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254C9C ; =0x02255140 + ldr r0, _02254C9C ; =MOD45_02255140 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254C9C: .word 0x02255140 +_02254C9C: .word MOD45_02255140 thumb_func_end MOD45_02254C7C thumb_func_start MOD45_02254CA0 @@ -646,12 +646,12 @@ MOD45_02254CCC: ; 0x02254CCC bl MOD20_022538A4 add r4, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254D60 ; =0x022550FC + ldr r2, _02254D60 ; =MOD45_022550FC mov r1, #6 mov r3, #0 bl FUN_02016C18 ldr r0, [r5, #4] - ldr r2, _02254D64 ; =0x022550E0 + ldr r2, _02254D64 ; =MOD45_022550E0 mov r1, #7 mov r3, #0 bl FUN_02016C18 @@ -700,8 +700,8 @@ MOD45_02254CCC: ; 0x02254CCC add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 -_02254D60: .word 0x022550FC -_02254D64: .word 0x022550E0 +_02254D60: .word MOD45_022550FC +_02254D64: .word MOD45_022550E0 _02254D68: .word 0x04001000 _02254D6C: .word 0xFFFFE0FF thumb_func_end MOD45_02254CCC @@ -887,7 +887,7 @@ MOD45_02254EBC: ; 0x02254EBC push {r4, r5, r6, r7, lr} sub sp, #0x14 add r7, r0, #0 - ldr r0, _02254F10 ; =0x022550C6 + ldr r0, _02254F10 ; =MOD45_022550C6 lsl r1, r1, #1 ldrh r4, [r0, r1] mov r0, #0 @@ -927,7 +927,7 @@ _02254ED6: add sp, #0x14 pop {r4, r5, r6, r7, pc} nop -_02254F10: .word 0x022550C6 +_02254F10: .word MOD45_022550C6 thumb_func_end MOD45_02254EBC thumb_func_start MOD45_02254F14 @@ -970,7 +970,7 @@ _02254F46: mov r0, #0x14 add r2, r6, #0 mul r2, r0 - ldr r0, _02255008 ; =0x02255118 + ldr r0, _02255008 ; =MOD45_02255118 lsl r1, r7, #1 add r0, r0, r2 ldrh r7, [r1, r0] @@ -1010,7 +1010,7 @@ _02254FAE: add r3, r6, #0 mul r3, r0 ldr r0, [sp, #0x18] - ldr r2, _02255008 ; =0x02255118 + ldr r2, _02255008 ; =MOD45_02255118 lsl r1, r0, #1 add r0, r2, r3 ldrh r6, [r1, r0] @@ -1050,12 +1050,18 @@ _02254FAE: add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 -_02255008: .word 0x02255118 +_02255008: .word MOD45_02255118 thumb_func_end MOD45_02254F14 .section .rodata - ; 0x0225500C - .byte 0x4D, 0x4A, 0x25, 0x02, 0x99, 0x4A, 0x25, 0x02, 0x59, 0x4B, 0x25, 0x02, 0x28, 0x38, 0x20, 0x30 + + .global MOD45_0225500C +MOD45_0225500C: ; 0x0225500C + .word MOD45_02254A4C, MOD45_02254A98, MOD45_02254B58 + + .global MOD45_02255018 +MOD45_02255018: ; 0x02255018 + .byte 0x28, 0x38, 0x20, 0x30 .byte 0x28, 0x38, 0x38, 0x48, 0x28, 0x38, 0x50, 0x60, 0x28, 0x38, 0x68, 0x78, 0x28, 0x38, 0x80, 0x90 .byte 0x28, 0x38, 0x98, 0xA8, 0x28, 0x38, 0xB0, 0xC0, 0x40, 0x50, 0x20, 0x30, 0x40, 0x50, 0x38, 0x48 .byte 0x40, 0x50, 0x50, 0x60, 0x40, 0x50, 0x68, 0x78, 0x40, 0x50, 0x80, 0x90, 0x40, 0x50, 0x98, 0xA8 @@ -1064,20 +1070,46 @@ _02255008: .word 0x02255118 .byte 0x70, 0x80, 0x20, 0x30, 0x70, 0x80, 0x38, 0x48, 0x70, 0x80, 0x50, 0x60, 0x70, 0x80, 0x68, 0x78 .byte 0x70, 0x80, 0x80, 0x90, 0x70, 0x80, 0x98, 0xA8, 0x70, 0x80, 0xB0, 0xC0, 0x88, 0x98, 0x20, 0x30 .byte 0x88, 0x98, 0x38, 0x48, 0x88, 0x98, 0x50, 0x60, 0x88, 0x98, 0x68, 0x78, 0x88, 0x98, 0x80, 0x90 - .byte 0x88, 0x98, 0x98, 0xA8, 0x88, 0x98, 0xB0, 0xC0, 0xA0, 0xB0, 0x20, 0x30, 0xA0, 0xB0, 0x38, 0x48 - .byte 0x1F, 0x1C, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00 - .byte 0x08, 0x00, 0x18, 0x00, 0x1C, 0x00, 0x20, 0x00, 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x48, 0x00 - .byte 0x4C, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + .byte 0x88, 0x98, 0x98, 0xA8, 0x88, 0x98, 0xB0, 0xC0, 0xA0, 0xB0, 0x20, 0x30, 0xA0, 0xB0, 0x38 + + .global MOD45_022550AB +MOD45_022550AB: ; 0x022550AB + .byte 0x48 + .byte 0x1F, 0x1C, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F, 0x1F, 0x1E, 0x1F, 0x1E, 0x1F + + .global MOD45_022550B8 +MOD45_022550B8: ; 0x022550B8 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00 + + .global MOD45_022550C6 +MOD45_022550C6: ; 0x022550C6 + .short 0x00, 0x00, 0x04, 0x08, 0x18, 0x1C, 0x20, 0x30 + .short 0x34, 0x38, 0x48, 0x4C, 0x50 + + .global MOD45_022550E0 +MOD45_022550E0: ; 0x022550E0 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD45_022550FC +MOD45_022550FC: ; 0x022550FC .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x61, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD45_02255118 +MOD45_02255118: ; 0x02255118 + .byte 0x60, 0x00, 0x61, 0x00 .byte 0x62, 0x00, 0x63, 0x00, 0x64, 0x00, 0x65, 0x00, 0x66, 0x00, 0x67, 0x00, 0x68, 0x00, 0x69, 0x00 .byte 0x78, 0x00, 0x79, 0x00, 0x7A, 0x00, 0x7B, 0x00, 0x7C, 0x00, 0x7D, 0x00, 0x7E, 0x00, 0x7F, 0x00 - .byte 0x80, 0x00, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0x4C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x71, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0x95, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x80, 0x00, 0x81, 0x00 + + .global MOD45_02255140 +MOD45_02255140: ; 0x02255140 + .word 0x00, MOD45_02254CCC, 0x00 + .word 0x01, MOD45_02254D70, 0x00 + .word 0x02, MOD45_02254D94, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD45_02254840 diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s index fce37ff3..02956d4b 100644 --- a/arm9/modules/46/asm/module_46.s +++ b/arm9/modules/46/asm/module_46.s @@ -95,7 +95,7 @@ MOD46_022548D4: ; 0x022548D4 cmp r1, #3 bhs _02254900 lsl r2, r1, #2 - ldr r1, _02254904 ; =0x02254AF4 + ldr r1, _02254904 ; =MOD46_02254AF4 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -110,7 +110,7 @@ MOD46_022548D4: ; 0x022548D4 _02254900: pop {r3, r4, r5, pc} nop -_02254904: .word 0x02254AF4 +_02254904: .word MOD46_02254AF4 thumb_func_end MOD46_022548D4 thumb_func_start MOD46_02254908 @@ -264,13 +264,13 @@ MOD46_022549E8: ; 0x022549E8 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254A08 ; =0x02254B1C + ldr r0, _02254A08 ; =MOD46_02254B1C ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254A08: .word 0x02254B1C +_02254A08: .word MOD46_02254B1C thumb_func_end MOD46_022549E8 thumb_func_start MOD46_02254A0C @@ -312,7 +312,7 @@ MOD46_02254A38: ; 0x02254A38 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254ACC ; =0x02254B00 + ldr r2, _02254ACC ; =MOD46_02254B00 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -371,7 +371,7 @@ MOD46_02254A38: ; 0x02254A38 add sp, #0x14 pop {r4, r5, pc} nop -_02254ACC: .word 0x02254B00 +_02254ACC: .word MOD46_02254B00 _02254AD0: .word 0x04001000 _02254AD4: .word 0xFFFFE0FF thumb_func_end MOD46_02254A38 @@ -392,12 +392,22 @@ MOD46_02254AD8: ; 0x02254AD8 thumb_func_end MOD46_02254AD8 .section .rodata - ; 0x02254AF4 - .byte 0x25, 0x49, 0x25, 0x02, 0x65, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD46_02254AF4 +MOD46_02254AF4: ; 0x02254AF4 + .word MOD46_02254924, MOD46_02254964, MOD46_02254978 + + .global MOD46_02254B00 +MOD46_02254B00: ; 0x02254B00 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0x4A, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xD9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD46_02254B1C +MOD46_02254B1C: ; 0x02254B1C + .word 0x00, MOD46_02254A38, 0x00 + .word 0x01, MOD46_02254AD8, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD46_02254840 diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index 63e10ef6..549b6c3a 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -105,7 +105,7 @@ MOD47_022548E0: ; 0x022548E0 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254918 ; =0x022553B8 + ldr r1, _02254918 ; =MOD47_022553B8 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -119,7 +119,7 @@ MOD47_022548E0: ; 0x022548E0 _02254914: pop {r3, r4, r5, pc} nop -_02254918: .word 0x022553B8 +_02254918: .word MOD47_022553B8 thumb_func_end MOD47_022548E0 thumb_func_start MOD47_0225491C @@ -543,7 +543,7 @@ MOD47_02254C1C: ; 0x02254C1C sub sp, #8 add r7, r0, #0 mov r0, #0 - ldr r5, _02254C68 ; =0x022553D0 + ldr r5, _02254C68 ; =MOD47_022553D0 str r0, [sp] str r0, [sp, #4] _02254C2A: @@ -580,7 +580,7 @@ _02254C52: add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop -_02254C68: .word 0x022553D0 +_02254C68: .word MOD47_022553D0 thumb_func_end MOD47_02254C1C thumb_func_start MOD47_02254C6C @@ -773,7 +773,7 @@ MOD47_02254D8C: ; 0x02254D8C add r0, r6, #0 str r0, [sp, #0xc] add r0, #0x44 - ldr r4, _02254DF8 ; =0x02255410 + ldr r4, _02254DF8 ; =MOD47_02255410 mov r7, #0 add r5, r6, #0 str r0, [sp, #0xc] @@ -800,7 +800,7 @@ _02254DC6: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254DF8: .word 0x02255410 +_02254DF8: .word MOD47_02255410 thumb_func_end MOD47_02254D8C thumb_func_start MOD47_02254DFC @@ -838,13 +838,13 @@ MOD47_02254E24: ; 0x02254E24 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254E44 ; =0x02255450 + ldr r0, _02254E44 ; =MOD47_02255450 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254E44: .word 0x02255450 +_02254E44: .word MOD47_02255450 thumb_func_end MOD47_02254E24 thumb_func_start MOD47_02254E48 @@ -886,7 +886,7 @@ MOD47_02254E74: ; 0x02254E74 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254F28 ; =0x022553F4 + ldr r2, _02254F28 ; =MOD47_022553F4 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -960,7 +960,7 @@ MOD47_02254E74: ; 0x02254E74 add sp, #0x18 pop {r4, r5, r6, pc} .align 2, 0 -_02254F28: .word 0x022553F4 +_02254F28: .word MOD47_022553F4 _02254F2C: .word 0x04001000 _02254F30: .word 0xFFFFE0FF thumb_func_end MOD47_02254E74 @@ -1481,26 +1481,67 @@ _0225532C: pop {r3, r4, r5, r6, r7, pc} nop _02255398: .word 0x00010104 -_0225539C: .word 0x022553F0 +_0225539C: .word MOD47_022553F0 thumb_func_end MOD47_022552D8 .section .rodata - ; 0x022553A0 - .byte 0x0A, 0x00, 0x00, 0x00, 0x09, 0x0D, 0x07, 0x12, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00 - .byte 0x00, 0x06, 0x08, 0x0B, 0x0C, 0x0E, 0x00, 0x00, 0x39, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02 - .byte 0xE5, 0x49, 0x25, 0x02, 0xD5, 0x4A, 0x25, 0x02, 0x39, 0x4B, 0x25, 0x02, 0x89, 0x4B, 0x25, 0x02 - .byte 0xA4, 0x53, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0xA0, 0x53, 0x25, 0x02, 0x01, 0x00, 0x00, 0x00 - .byte 0xA8, 0x53, 0x25, 0x02, 0x05, 0x00, 0x00, 0x00, 0xB0, 0x53, 0x25, 0x02, 0x06, 0x00, 0x00, 0x00 - .byte 0x06, 0x07, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + + .global MOD47_022553A0 +MOD47_022553A0: ; 0x022553A0 + .byte 0x0A + + .balign 4, 0 + .global MOD47_022553A4 +MOD47_022553A4: ; 0x022553A4 + .byte 0x09, 0x0D, 0x07, 0x12 + + .balign 4, 0 + .global MOD47_022553A8 +MOD47_022553A8: ; 0x022553A8 + .byte 0x01, 0x02, 0x03, 0x04, 0x05 + + .balign 4, 0 + .global MOD47_022553B0 +MOD47_022553B0: ; 0x022553B0 + .byte 0x00, 0x06, 0x08, 0x0B, 0x0C, 0x0E + + .balign 4, 0 + .global MOD47_022553B8 +MOD47_022553B8: ; 0x022553B8 + .word MOD47_02254938, MOD47_02254978, MOD47_022549E4, MOD47_02254AD4 + .word MOD47_02254B38, MOD47_02254B88 + + .global MOD47_022553D0 +MOD47_022553D0: ; 0x022553D0 + .word MOD47_022553A4, 0x00000004 + .word MOD47_022553A0, 0x00000001 + .word MOD47_022553A8, 0x00000005 + .word MOD47_022553B0, 0x00000006 + + .global MOD47_022553F0 +MOD47_022553F0: ; 0x022553F0 + .byte 0x06, 0x07, 0x08, 0x09 + + .global MOD47_022553F4 +MOD47_022553F4: ; 0x022553F4 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD47_02255410 +MOD47_02255410: ; 0x02255410 .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x09, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x06, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x06, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x60, 0x09, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x75, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x35, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x59, 0x4F, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x9D, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0xE9, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .byte 0x35, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x81, 0x50, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0xD9, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD47_02255450 +MOD47_02255450: ; 0x02255450 + .word 0x00, MOD47_02254E74, 0x00 + .word 0x01, MOD47_02254F34, 0x00 + .word 0x02, MOD47_02254F58, 0x00 + .word 0x03, MOD47_02254F9C, 0x00 + .word 0x04, MOD47_02254FE8, 0x00 + .word 0x05, MOD47_02255034, 0x00 + .word 0x06, MOD47_02255080, 0x00 + .word 0x07, MOD47_022550D8, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index 661529fd..32b5d3c8 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -106,7 +106,7 @@ _022548C8: strb r0, [r7, #2] mov r0, #8 str r0, [sp] - ldr r0, _02254930 ; =0x02254F60 + ldr r0, _02254930 ; =MOD48_02254F60 ldr r2, _02254934 ; =MOD48_02254994 mov r1, #3 add r3, r7, #0 @@ -125,7 +125,7 @@ _0225492A: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_02254930: .word 0x02254F60 +_02254930: .word MOD48_02254F60 _02254934: .word MOD48_02254994 thumb_func_end MOD48_0225489C @@ -156,7 +156,7 @@ MOD48_02254950: ; 0x02254950 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254988 ; =0x02254F6C + ldr r1, _02254988 ; =MOD48_02254F6C ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -170,7 +170,7 @@ MOD48_02254950: ; 0x02254950 _02254986: pop {r3, r4, r5, pc} .align 2, 0 -_02254988: .word 0x02254F6C +_02254988: .word MOD48_02254F6C thumb_func_end MOD48_02254950 thumb_func_start MOD48_0225498C @@ -384,13 +384,13 @@ MOD48_02254AE0: ; 0x02254AE0 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254B00 ; =0x02254F94 + ldr r0, _02254B00 ; =MOD48_02254F94 ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254B00: .word 0x02254F94 +_02254B00: .word MOD48_02254F94 thumb_func_end MOD48_02254AE0 thumb_func_start MOD48_02254B04 @@ -435,7 +435,7 @@ MOD48_02254B30: ; 0x02254B30 bl MOD20_022538A4 add r6, r0, #0 ldr r0, [r4, #4] - ldr r2, _02254BBC ; =0x02254F78 + ldr r2, _02254BBC ; =MOD48_02254F78 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -487,7 +487,7 @@ MOD48_02254B30: ; 0x02254B30 add sp, #0x14 pop {r3, r4, r5, r6, pc} nop -_02254BBC: .word 0x02254F78 +_02254BBC: .word MOD48_02254F78 _02254BC0: .word 0x04001000 _02254BC4: .word 0xFFFFE0FF thumb_func_end MOD48_02254B30 @@ -750,7 +750,7 @@ _02254DD2: add r1, r1, #4 cmp r2, #0x10 blt _02254DD2 - ldr r0, _02254EBC ; =0x02254FD0 + ldr r0, _02254EBC ; =MOD48_02254FD0 str r4, [sp, #0x20] str r0, [sp, #0x24] ldr r0, [sp, #0x10] @@ -779,7 +779,7 @@ _02254DF2: str r0, [sp, #0x2c] _02254E16: add r7, r5, r6 - ldr r1, _02254EBC ; =0x02254FD0 + ldr r1, _02254EBC ; =MOD48_02254FD0 lsl r2, r7, #4 add r1, r1, r2 ldr r0, [r4, #0x20] @@ -861,7 +861,7 @@ _02254E8E: add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254EBC: .word 0x02254FD0 +_02254EBC: .word MOD48_02254FD0 thumb_func_end MOD48_02254D2C thumb_func_start MOD48_02254EC0 @@ -953,14 +953,33 @@ _02254F5C: .word 0x000003E7 thumb_func_end MOD48_02254EF4 .section .rodata - ; 0x02254F60 - .byte 0x3E, 0x62, 0x58, 0x88, 0x4E, 0x72, 0x98, 0xC8, 0x56, 0x7A, 0x18, 0x48, 0xB1, 0x49, 0x25, 0x02 - .byte 0xF1, 0x49, 0x25, 0x02, 0x6D, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD48_02254F60 +MOD48_02254F60: ; 0x02254F60 + .byte 0x3E, 0x62, 0x58, 0x88 + .byte 0x4E, 0x72, 0x98, 0xC8 + .byte 0x56, 0x7A, 0x18, 0x48 + + .global MOD48_02254F6C +MOD48_02254F6C: ; 0x02254F6C + .word MOD48_022549B0, MOD48_022549F0, MOD48_02254A6C + + .global MOD48_02254F78 +MOD48_02254F78: ; 0x02254F78 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0xC9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 - .byte 0xE9, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x61, 0x4C, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD48_02254F94 +MOD48_02254F94: ; 0x02254F94 + .word 0x00, MOD48_02254B30, 0x00 + .word 0x01, MOD48_02254BC8, 0x00 + .word 0x02, MOD48_02254BE8, 0x00 + .word 0x03, MOD48_02254C60, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD48_02254FD0 +MOD48_02254FD0: ; 0x02254FD0 .byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0A, 0x01, 0x00, 0x00 .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00 .byte 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x04, 0x00, 0x00, 0x02, 0x01, 0x01, 0x00, 0x00 diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index d829718b..a3ab2dcf 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -96,7 +96,7 @@ _022548D8: strb r0, [r7, #2] mov r0, #8 str r0, [sp] - ldr r0, _02254918 ; =0x02254CF0 + ldr r0, _02254918 ; =MOD49_02254CF0 ldr r2, _0225491C ; =MOD49_0225497C mov r1, #0xc add r3, r7, #0 @@ -115,7 +115,7 @@ _02254912: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02254918: .word 0x02254CF0 +_02254918: .word MOD49_02254CF0 _0225491C: .word MOD49_0225497C thumb_func_end MOD49_0225489C @@ -146,7 +146,7 @@ MOD49_02254938: ; 0x02254938 ldrb r1, [r4] add r0, r4, #0 lsl r2, r1, #2 - ldr r1, _02254970 ; =0x02254CE4 + ldr r1, _02254970 ; =MOD49_02254CE4 ldr r1, [r1, r2] blx r1 cmp r0, #0 @@ -160,7 +160,7 @@ MOD49_02254938: ; 0x02254938 _0225496E: pop {r3, r4, r5, pc} .align 2, 0 -_02254970: .word 0x02254CE4 +_02254970: .word MOD49_02254CE4 thumb_func_end MOD49_02254938 thumb_func_start MOD49_02254974 @@ -342,13 +342,13 @@ MOD49_02254A84: ; 0x02254A84 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254AA4 ; =0x02254D3C + ldr r0, _02254AA4 ; =MOD49_02254D3C ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254AA4: .word 0x02254D3C +_02254AA4: .word MOD49_02254D3C thumb_func_end MOD49_02254A84 thumb_func_start MOD49_02254AA8 @@ -393,7 +393,7 @@ MOD49_02254AD4: ; 0x02254AD4 bl MOD20_022538A4 str r0, [sp, #0x14] ldr r0, [r5, #4] - ldr r2, _02254BD0 ; =0x02254D20 + ldr r2, _02254BD0 ; =MOD49_02254D20 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -492,7 +492,7 @@ _02254B94: add sp, #0x2c pop {r4, r5, r6, r7, pc} nop -_02254BD0: .word 0x02254D20 +_02254BD0: .word MOD49_02254D20 _02254BD4: .word 0x00000197 _02254BD8: .word 0x00010104 _02254BDC: .word 0x04001000 @@ -541,7 +541,7 @@ MOD49_02254C04: ; 0x02254C04 add r0, r5, #0 str r0, [sp, #0x10] add r0, #0x54 - ldr r7, _02254CB4 ; =0x02254D60 + ldr r7, _02254CB4 ; =MOD49_02254D60 str r4, [sp, #0xc] str r0, [sp, #0x10] _02254C3E: @@ -601,7 +601,7 @@ _02254C9C: add sp, #0x14 pop {r4, r5, r6, r7, pc} nop -_02254CB4: .word 0x02254D60 +_02254CB4: .word MOD49_02254D60 thumb_func_end MOD49_02254C04 thumb_func_start MOD49_02254CB8 @@ -631,15 +631,33 @@ _02254CD0: thumb_func_end MOD49_02254CB8 .section .rodata - ; 0x02254CE4 - .byte 0x99, 0x49, 0x25, 0x02, 0xD9, 0x49, 0x25, 0x02, 0x11, 0x4A, 0x25, 0x02, 0x7E, 0xA2, 0x90, 0xC0 + + .global MOD49_02254CE4 +MOD49_02254CE4: ; 0x02254CE4 + .word MOD49_02254998, MOD49_022549D8, MOD49_02254A10 + + .global MOD49_02254CF0 +MOD49_02254CF0: ; 0x02254CF0 + .byte 0x7E, 0xA2, 0x90, 0xC0 .byte 0x7E, 0xA2, 0x68, 0x98, 0x7E, 0xA2, 0x40, 0x70, 0x7E, 0xA2, 0x18, 0x48, 0x4E, 0x72, 0x90, 0xC0 .byte 0x4E, 0x72, 0x68, 0x98, 0x4E, 0x72, 0x40, 0x70, 0x4E, 0x72, 0x18, 0x48, 0x1E, 0x42, 0x90, 0xC0 - .byte 0x1E, 0x42, 0x68, 0x98, 0x1E, 0x42, 0x40, 0x70, 0x1E, 0x42, 0x18, 0x48, 0x00, 0x00, 0x00, 0x00 + .byte 0x1E, 0x42, 0x68, 0x98, 0x1E, 0x42, 0x40, 0x70, 0x1E, 0x42, 0x18, 0x48 + + .global MOD49_02254D20 +MOD49_02254D20: ; 0x02254D20 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x4A, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xE5, 0x4B, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD49_02254D3C +MOD49_02254D3C: ; 0x02254D3C + .word 0x00, MOD49_02254AD4, 0x00 + .word 0x01, MOD49_02254BE4, 0x00 + .word 0x00, 0x00000000, 0x00 + + .global MOD49_02254D60 +MOD49_02254D60: ; 0x02254D60 + .byte 0x00, 0x00, 0x03, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x80, 0x05, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0B, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00 .byte 0x00, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x02, 0x0A, 0x01, 0x00, 0x00, 0x00, 0x80, 0x0A, 0x00 diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s index 31f6263d..ad870e7a 100644 --- a/arm9/modules/50/asm/module_50.s +++ b/arm9/modules/50/asm/module_50.s @@ -96,7 +96,7 @@ MOD50_022548D4: ; 0x022548D4 cmp r1, #3 bhs _02254900 lsl r2, r1, #2 - ldr r1, _02254904 ; =0x02254B04 + ldr r1, _02254904 ; =MOD50_02254B04 add r0, r4, #0 ldr r1, [r1, r2] blx r1 @@ -111,7 +111,7 @@ MOD50_022548D4: ; 0x022548D4 _02254900: pop {r3, r4, r5, pc} nop -_02254904: .word 0x02254B04 +_02254904: .word MOD50_02254B04 thumb_func_end MOD50_022548D4 thumb_func_start MOD50_02254908 @@ -273,13 +273,13 @@ MOD50_022549F8: ; 0x022549F8 str r0, [sp, #4] mov r0, #8 str r0, [sp, #8] - ldr r0, _02254A18 ; =0x02254B2C + ldr r0, _02254A18 ; =MOD50_02254B2C ldr r3, [r2] bl MOD20_022537E0 add sp, #0xc pop {pc} nop -_02254A18: .word 0x02254B2C +_02254A18: .word MOD50_02254B2C thumb_func_end MOD50_022549F8 thumb_func_start MOD50_02254A1C @@ -321,7 +321,7 @@ MOD50_02254A48: ; 0x02254A48 bl MOD20_022538A0 add r5, r0, #0 ldr r0, [r5, #4] - ldr r2, _02254ADC ; =0x02254B10 + ldr r2, _02254ADC ; =MOD50_02254B10 mov r1, #6 mov r3, #0 bl FUN_02016C18 @@ -381,7 +381,7 @@ MOD50_02254A48: ; 0x02254A48 add sp, #0x14 pop {r4, r5, pc} .align 2, 0 -_02254ADC: .word 0x02254B10 +_02254ADC: .word MOD50_02254B10 _02254AE0: .word 0x04001000 _02254AE4: .word 0xFFFFE0FF thumb_func_end MOD50_02254A48 @@ -402,12 +402,22 @@ MOD50_02254AE8: ; 0x02254AE8 thumb_func_end MOD50_02254AE8 .section .rodata - ; 0x02254B04 - .byte 0x25, 0x49, 0x25, 0x02, 0x65, 0x49, 0x25, 0x02, 0x79, 0x49, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 + + .global MOD50_02254B04 +MOD50_02254B04: ; 0x02254B04 + .word MOD50_02254924, MOD50_02254964, MOD50_02254978 + + .global MOD50_02254B10 +MOD50_02254B10: ; 0x02254B10 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x4A, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xE9, 0x4A, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD50_02254B2C +MOD50_02254B2C: ; 0x02254B2C + .word 0x00, MOD50_02254A48, 0x00 + .word 0x01, MOD50_02254AE8, 0x00 + .word 0x00, 0x00000000, 0x00 .section .sinit .word MOD50_02254840 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 8dfb9b59..d46aaf36 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -222,7 +222,7 @@ _021D76D2: lsl r0, r0, #2 ldr r0, [r4, r0] lsl r2, r0, #3 - ldr r0, _021D7754 ; =0x021D98A0 + ldr r0, _021D7754 ; =MOD53_021D98A0 ldr r2, [r0, r2] cmp r2, #0 beq _021D76E8 @@ -256,11 +256,11 @@ _021D7718: lsl r0, r0, #2 ldr r0, [r4, r0] lsl r3, r0, #3 - ldr r0, _021D7754 ; =0x021D98A0 + ldr r0, _021D7754 ; =MOD53_021D98A0 ldr r2, [r0, r3] cmp r2, #0 beq _021D7744 - ldr r0, _021D7760 ; =0x021D98A4 + ldr r0, _021D7760 ; =MOD53_021D98A0 + 4 ldr r0, [r0, r3] cmp r0, #0 beq _021D7744 @@ -284,7 +284,7 @@ _021D7750: .word 0x000093B4 _021D7754: .word MOD53_021D98A0 _021D7758: .word 0x000E0D0F _021D775C: .word 0x00004374 -_021D7760: .word MOD53_021D98A4 +_021D7760: .word MOD53_021D98A0 + 4 thumb_func_end MOD53_021D7654 thumb_func_start MOD53_021D7764 @@ -3907,7 +3907,7 @@ MOD53_021D93E8: ; 0x021D93E8 pop {r3, r4} bx lr _021D9404: - ldr r1, _021D9418 ; =0x021D98A4 + ldr r1, _021D9418 ; =MOD53_021D98A0 + 4 lsl r4, r2, #3 ldr r1, [r1, r4] cmp r1, #0 @@ -3918,7 +3918,7 @@ _021D9412: pop {r3, r4} bx lr nop -_021D9418: .word MOD53_021D98A4 +_021D9418: .word MOD53_021D98A0 + 4 thumb_func_end MOD53_021D93E8 thumb_func_start MOD53_021D941C @@ -4147,21 +4147,29 @@ MOD53_021D9648: ; 0x021D9648 .data .global MOD53_021D98A0 MOD53_021D98A0: ; 0x021D98A0 - .byte 0x00, 0x00, 0x00, 0x00 - - .global MOD53_021D98A4 -MOD53_021D98A4: ; 0x021D98A4 - .byte 0x01, 0x00, 0x00, 0x00, 0x95, 0x84, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xED, 0x84, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xF9, 0x84, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x25, 0x84, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x2D, 0x85, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x7D, 0x85, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0xE1, 0x86, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x05, 0x87, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0x9D, 0x87, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0xD9, 0x87, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0xF9, 0x87, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x25, 0x88, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0x61, 0x88, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0xB1, 0x88, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0x6D, 0x89, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0xA1, 0x89, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0xC9, 0x89, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x09, 0x8A, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0x0D, 0x8A, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x2D, 0x8A, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0x51, 0x8A, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0xB1, 0x8A, 0x1D, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0xF9, 0x8A, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00 + .word 0x00000000, 0x01 + .word MOD53_021D8494, 0x00 + .word MOD53_021D84EC, 0x00 + .word MOD53_021D84F8, 0x00 + .word MOD53_021D8424, 0x00 + .word MOD53_021D852C, 0x01 + .word MOD53_021D857C, 0x01 + .word MOD53_021D86E0, 0x01 + .word MOD53_021D8704, 0x01 + .word MOD53_021D879C, 0x01 + .word MOD53_021D87D8, 0x01 + .word MOD53_021D87F8, 0x01 + .word MOD53_021D8824, 0x01 + .word MOD53_021D8860, 0x01 + .word MOD53_021D88B0, 0x01 + .word MOD53_021D896C, 0x01 + .word MOD53_021D89A0, 0x01 + .word MOD53_021D89C8, 0x01 + .word MOD53_021D8A08, 0x01 + .word MOD53_021D8A0C, 0x01 + .word MOD53_021D8A2C, 0x01 + .word MOD53_021D8A50, 0x01 + .word MOD53_021D8AB0, 0x01 + .word MOD53_021D8AF8, 0x01 .bss diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 752e8f3c..132efee7 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -4436,23 +4436,23 @@ MOD54_021D9758: ; 0x021D9758 .global MOD54_021D9780 MOD54_021D9780: ; 0x021D9780 - .byte 0x31, 0x94, 0x1D, 0x02, 0x3D, 0x94, 0x1D, 0x02, 0x65, 0x94, 0x1D, 0x02, 0x7D, 0x94, 0x1D, 0x02 - .byte 0x89, 0x94, 0x1D, 0x02, 0xB5, 0x94, 0x1D, 0x02, 0xB5, 0x91, 0x1D, 0x02, 0x75, 0x92, 0x1D, 0x02 - .byte 0xD1, 0x94, 0x1D, 0x02, 0xBD, 0x91, 0x1D, 0x02, 0xAD, 0x92, 0x1D, 0x02, 0xE9, 0x94, 0x1D, 0x02 - .byte 0xAD, 0x91, 0x1D, 0x02, 0x39, 0x92, 0x1D, 0x02, 0x01, 0x95, 0x1D, 0x02, 0x35, 0xB9, 0x02, 0x02 - .byte 0x19, 0x95, 0x1D, 0x02, 0x21, 0x95, 0x1D, 0x02, 0xE1, 0xA1, 0x02, 0x02, 0x45, 0x95, 0x1D, 0x02 - .byte 0x6D, 0x95, 0x1D, 0x02 + .word MOD54_021D9430, MOD54_021D943C, MOD54_021D9464, MOD54_021D947C + .word MOD54_021D9488, MOD54_021D94B4, MOD54_021D91B4, MOD54_021D9274 + .word MOD54_021D94D0, MOD54_021D91BC, MOD54_021D92AC, MOD54_021D94E8 + .word MOD54_021D91AC, MOD54_021D9238, MOD54_021D9500, FUN_0202B934 + .word MOD54_021D9518, MOD54_021D9520, FUN_0202A1E0, MOD54_021D9544 + .word MOD54_021D956C .data .global MOD54_021D97E0 MOD54_021D97E0: ; 0x021D97E0 - .byte 0x0D, 0x7F, 0x1D, 0x02, 0xA5, 0x80, 0x1D, 0x02, 0xF1, 0x80, 0x1D, 0x02, 0x45, 0x7F, 0x1D, 0x02 - .byte 0x21, 0x81, 0x1D, 0x02, 0x51, 0x81, 0x1D, 0x02, 0x81, 0x82, 0x1D, 0x02, 0x99, 0x82, 0x1D, 0x02 - .byte 0x21, 0x83, 0x1D, 0x02, 0xA5, 0x85, 0x1D, 0x02, 0xC5, 0x85, 0x1D, 0x02, 0x01, 0x86, 0x1D, 0x02 - .byte 0x31, 0x86, 0x1D, 0x02, 0xDD, 0x86, 0x1D, 0x02, 0x2D, 0x87, 0x1D, 0x02, 0x51, 0x87, 0x1D, 0x02 - .byte 0x71, 0x87, 0x1D, 0x02, 0xB1, 0x87, 0x1D, 0x02, 0xD1, 0x87, 0x1D, 0x02, 0xF5, 0x87, 0x1D, 0x02 - .byte 0x4D, 0x88, 0x1D, 0x02, 0x89, 0x88, 0x1D, 0x02, 0x41, 0x83, 0x1D, 0x02, 0x71, 0x83, 0x1D, 0x02 - .byte 0x21, 0x84, 0x1D, 0x02, 0x7D, 0x84, 0x1D, 0x02, 0xAD, 0x84, 0x1D, 0x02, 0xD5, 0x84, 0x1D, 0x02 - .byte 0x19, 0x85, 0x1D, 0x02, 0x89, 0x85, 0x1D, 0x02, 0xCD, 0x80, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 + .word MOD54_021D7F0C, MOD54_021D80A4, MOD54_021D80F0, MOD54_021D7F44 + .word MOD54_021D8120, MOD54_021D8150, MOD54_021D8280, MOD54_021D8298 + .word MOD54_021D8320, MOD54_021D85A4, MOD54_021D85C4, MOD54_021D8600 + .word MOD54_021D8630, MOD54_021D86DC, MOD54_021D872C, MOD54_021D8750 + .word MOD54_021D8770, MOD54_021D87B0, MOD54_021D87D0, MOD54_021D87F4 + .word MOD54_021D884C, MOD54_021D8888, MOD54_021D8340, MOD54_021D8370 + .word MOD54_021D8420, MOD54_021D847C, MOD54_021D84AC, MOD54_021D84D4 + .word MOD54_021D8518, MOD54_021D8588, MOD54_021D80CC, 0x00000000 .bss diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 1aff4965..58137f3d 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -5680,13 +5680,13 @@ MOD55_021DA458: ; 0x021DA458 .data .global MOD55_021DA4A0 MOD55_021DA4A0: ; 0x021DA4A0 - .byte 0xD1, 0x81, 0x1D, 0x02, 0xDD, 0x81, 0x1D, 0x02, 0x7D, 0x8A, 0x1D, 0x02, 0x15, 0x8D, 0x1D, 0x02 - .byte 0x6D, 0x8E, 0x1D, 0x02, 0xE5, 0x8F, 0x1D, 0x02, 0x89, 0x9D, 0x1D, 0x02, 0xC1, 0x82, 0x1D, 0x02 - .byte 0x21, 0x83, 0x1D, 0x02, 0x71, 0x83, 0x1D, 0x02, 0x05, 0x84, 0x1D, 0x02, 0x41, 0x84, 0x1D, 0x02 - .byte 0xC9, 0x84, 0x1D, 0x02, 0x45, 0x85, 0x1D, 0x02, 0x85, 0x85, 0x1D, 0x02, 0x81, 0x86, 0x1D, 0x02 - .byte 0x8D, 0x86, 0x1D, 0x02, 0x81, 0xA0, 0x1D, 0x02, 0x85, 0x91, 0x1D, 0x02, 0xDD, 0x93, 0x1D, 0x02 - .byte 0xED, 0x95, 0x1D, 0x02, 0x51, 0x9C, 0x1D, 0x02, 0xC5, 0x9C, 0x1D, 0x02, 0x05, 0x9E, 0x1D, 0x02 - .byte 0x41, 0x9E, 0x1D, 0x02, 0xC9, 0x9E, 0x1D, 0x02, 0x71, 0x9F, 0x1D, 0x02, 0x8D, 0x9F, 0x1D, 0x02 - .byte 0xDD, 0x9F, 0x1D, 0x02, 0x1D, 0xA0, 0x1D, 0x02, 0xD9, 0x90, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 + .word MOD55_021D81D0, MOD55_021D81DC, MOD55_021D8A7C, MOD55_021D8D14 + .word MOD55_021D8E6C, MOD55_021D8FE4, MOD55_021D9D88, MOD55_021D82C0 + .word MOD55_021D8320, MOD55_021D8370, MOD55_021D8404, MOD55_021D8440 + .word MOD55_021D84C8, MOD55_021D8544, MOD55_021D8584, MOD55_021D8680 + .word MOD55_021D868C, MOD55_021DA080, MOD55_021D9184, MOD55_021D93DC + .word MOD55_021D95EC, MOD55_021D9C50, MOD55_021D9CC4, MOD55_021D9E04 + .word MOD55_021D9E40, MOD55_021D9EC8, MOD55_021D9F70, MOD55_021D9F8C + .word MOD55_021D9FDC, MOD55_021DA01C, MOD55_021D90D8, 0x00000000 .bss diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index ef4e11b1..ab9f8f3d 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -8742,17 +8742,17 @@ MOD56_022163D8: ; 0x022163D8 .global MOD56_022163F4 MOD56_022163F4: ; 0x022163F4 - .byte 0x00, 0x00, 0x00, 0x00, 0x25, 0x39, 0x21, 0x02, 0x25, 0x36, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD56_02213924, MOD56_02213624, 0x00000000 .byte 0x22, 0x00, 0x05, 0x00, 0x00, 0x08, 0x00, 0x10, 0x20, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00 .global MOD56_02216414 MOD56_02216414: ; 0x02216414 - .byte 0x00, 0x00, 0x00, 0x00, 0x25, 0x39, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD56_02213924, 0x00000000, 0x00000000 .byte 0x04, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x10, 0x2F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00 .global MOD56_02216434 MOD56_02216434: ; 0x02216434 - .byte 0x00, 0x00, 0x00, 0x00, 0x25, 0x39, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD56_02213924, 0x00000000, 0x00000000 .byte 0x03, 0x00, 0x03, 0x00, 0x00, 0x08, 0x00, 0x10, 0x2F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00 .global MOD56_02216454 @@ -8779,23 +8779,23 @@ MOD56_022164C0: ; 0x022164C0 .global MOD56_022164E0 MOD56_022164E0: ; 0x022164E0 - .byte 0x1D, 0x2A, 0x21, 0x02, 0x3D, 0x2B, 0x21, 0x02, 0x85, 0x2B, 0x21, 0x02, 0xE9, 0x2B, 0x21, 0x02 - .byte 0x51, 0x2C, 0x21, 0x02, 0xCD, 0x2C, 0x21, 0x02, 0x55, 0x2D, 0x21, 0x02, 0x49, 0x30, 0x21, 0x02 - .byte 0x8D, 0x30, 0x21, 0x02, 0x99, 0x30, 0x21, 0x02, 0xA5, 0x30, 0x21, 0x02, 0xF5, 0x30, 0x21, 0x02 - .byte 0x3D, 0x31, 0x21, 0x02, 0x95, 0x31, 0x21, 0x02, 0xD9, 0x2D, 0x21, 0x02, 0x7D, 0x32, 0x21, 0x02 - .byte 0x69, 0x33, 0x21, 0x02, 0x89, 0x33, 0x21, 0x02, 0x95, 0x3A, 0x21, 0x02, 0x99, 0x3D, 0x21, 0x02 - .byte 0x91, 0x3F, 0x21, 0x02, 0xCD, 0x3F, 0x21, 0x02, 0xA5, 0x40, 0x21, 0x02, 0xDD, 0x40, 0x21, 0x02 - .byte 0x21, 0x41, 0x21, 0x02, 0x39, 0x42, 0x21, 0x02, 0x8D, 0x42, 0x21, 0x02, 0x2D, 0x43, 0x21, 0x02 - .byte 0xB5, 0x43, 0x21, 0x02, 0x05, 0x44, 0x21, 0x02, 0x65, 0x44, 0x21, 0x02, 0x69, 0x44, 0x21, 0x02 - .byte 0x6D, 0x44, 0x21, 0x02, 0x7D, 0x54, 0x21, 0x02, 0x75, 0x5E, 0x21, 0x02, 0xDD, 0x44, 0x21, 0x02 - .byte 0xD5, 0x45, 0x21, 0x02, 0xCD, 0x46, 0x21, 0x02, 0x21, 0x49, 0x21, 0x02, 0x05, 0x45, 0x21, 0x02 - .byte 0x21, 0x45, 0x21, 0x02, 0x69, 0x45, 0x21, 0x02, 0xD9, 0x49, 0x21, 0x02, 0xFD, 0x4B, 0x21, 0x02 - .byte 0x29, 0x4E, 0x21, 0x02, 0xD9, 0x4F, 0x21, 0x02, 0x21, 0x50, 0x21, 0x02, 0xA5, 0x50, 0x21, 0x02 - .byte 0x01, 0x52, 0x21, 0x02, 0xA9, 0x52, 0x21, 0x02, 0xE1, 0x52, 0x21, 0x02, 0x51, 0x53, 0x21, 0x02 - .byte 0x89, 0x53, 0x21, 0x02, 0xBD, 0x54, 0x21, 0x02, 0x69, 0x59, 0x21, 0x02, 0xB1, 0x59, 0x21, 0x02 - .byte 0x8D, 0x5A, 0x21, 0x02, 0xD5, 0x5A, 0x21, 0x02, 0x39, 0x5B, 0x21, 0x02, 0x91, 0x5B, 0x21, 0x02 - .byte 0xD5, 0x5B, 0x21, 0x02, 0x31, 0x5C, 0x21, 0x02, 0x21, 0x5D, 0x21, 0x02, 0x69, 0x5D, 0x21, 0x02 - .byte 0xFD, 0x32, 0x21, 0x02, 0x0D, 0x4F, 0x21, 0x02, 0x55, 0x4F, 0x21, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word MOD56_02212A1C, MOD56_02212B3C, MOD56_02212B84, MOD56_02212BE8 + .word MOD56_02212C50, MOD56_02212CCC, MOD56_02212D54, MOD56_02213048 + .word MOD56_0221308C, MOD56_02213098, MOD56_022130A4, MOD56_022130F4 + .word MOD56_0221313C, MOD56_02213194, MOD56_02212DD8, MOD56_0221327C + .word MOD56_02213368, MOD56_02213388, MOD56_02213A94, MOD56_02213D98 + .word MOD56_02213F90, MOD56_02213FCC, MOD56_022140A4, MOD56_022140DC + .word MOD56_02214120, MOD56_02214238, MOD56_0221428C, MOD56_0221432C + .word MOD56_022143B4, MOD56_02214404, MOD56_02214464, MOD56_02214468 + .word MOD56_0221446C, MOD56_0221547C, MOD56_02215E74, MOD56_022144DC + .word MOD56_022145D4, MOD56_022146CC, MOD56_02214920, MOD56_02214504 + .word MOD56_02214520, MOD56_02214568, MOD56_022149D8, MOD56_02214BFC + .word MOD56_02214E28, MOD56_02214FD8, MOD56_02215020, MOD56_022150A4 + .word MOD56_02215200, MOD56_022152A8, MOD56_022152E0, MOD56_02215350 + .word MOD56_02215388, MOD56_022154BC, MOD56_02215968, MOD56_022159B0 + .word MOD56_02215A8C, MOD56_02215AD4, MOD56_02215B38, MOD56_02215B90 + .word MOD56_02215BD4, MOD56_02215C30, MOD56_02215D20, MOD56_02215D68 + .word MOD56_022132FC, MOD56_02214F0C, MOD56_02214F54, 0x00000000 + .word 0x00000000, 0x00000000, 0x00000000, 0x00000000 .bss diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index e32e80d6..4f170e87 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -2546,7 +2546,7 @@ MOD58_021DAE94: ; 0x021DAE94 .data .global MOD58_021DAFA0 MOD58_021DAFA0: ; 0x021DAFA0 - .byte 0x00, 0x00, 0x00, 0x00, 0x2D, 0xA6, 0x1D, 0x02, 0xC5, 0xA6, 0x1D, 0x02, 0xF5, 0xA6, 0x1D, 0x02 - .byte 0xF5, 0xA7, 0x1D, 0x02, 0x15, 0xA8, 0x1D, 0x02, 0x8D, 0xA7, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD58_021DA62C, MOD58_021DA6C4, MOD58_021DA6F4 + .word MOD58_021DA7F4, MOD58_021DA814, MOD58_021DA78C, 0x00000000 .bss diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 950a5689..fb9ea05a 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -1913,7 +1913,7 @@ MOD61_021D8434: ; 0x021D8434 .global MOD61_021D8444 MOD61_021D8444: ; 0x021D8444 - .byte 0xAD, 0x75, 0x1D, 0x02, 0xD1, 0x75, 0x1D, 0x02, 0xF1, 0x76, 0x1D, 0x02, 0xDD, 0x77, 0x1D, 0x02 + .word MOD61_021D75AC, MOD61_021D75D0, MOD61_021D76F0, MOD61_021D77DC .global MOD61_021D8454 MOD61_021D8454: ; 0x021D8454 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 2504e001..33e331d3 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1444,7 +1444,7 @@ _0222E04A: stmia r6!, {r0} cmp r4, #8 blt _0222E04A - ldr r3, _0222E0C4 ; =0x02231158 + ldr r3, _0222E0C4 ; =MOD62_02231158 add r2, sp, #4 mov r1, #0x10 _0222E068: @@ -1489,7 +1489,7 @@ _0222E0B4: .word 0x000066B4 _0222E0B8: .word 0x00006A2C _0222E0BC: .word 0x00006DB8 _0222E0C0: .word 0x000061A8 -_0222E0C4: .word 0x02231158 +_0222E0C4: .word MOD62_02231158 thumb_func_end MOD62_0222E004 thumb_func_start MOD62_0222E0C8 @@ -1987,13 +1987,13 @@ _0222E49A: ldr r1, [r5] ldr r0, [sp, #0x20] lsl r2, r1, #3 - ldr r1, _0222E538 ; =0x02231358 + ldr r1, _0222E538 ; =MOD62_02231358 ldr r1, [r1, r2] bl NewString_ReadMsgData ldr r2, [r5] add r4, r0, #0 lsl r3, r2, #3 - ldr r2, _0222E538 ; =0x02231358 + ldr r2, _0222E538 ; =MOD62_02231358 mov r0, #0x67 add r2, r2, r3 ldr r1, [sp, #0x1c] @@ -2058,7 +2058,7 @@ _0222E4D0: add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} nop -_0222E538: .word 0x02231358 +_0222E538: .word MOD62_02231358 thumb_func_end MOD62_0222E3C4 thumb_func_start MOD62_0222E53C @@ -2424,7 +2424,7 @@ MOD62_0222E7E8: ; 0x0222E7E8 mov r0, #0x35 bl FUN_0200BB14 add r2, sp, #0x2c - ldr r5, _0222E868 ; =0x02231138 + ldr r5, _0222E868 ; =MOD62_02231138 str r0, [r4, #8] ldmia r5!, {r0, r1} add r3, r2, #0 @@ -2434,7 +2434,7 @@ MOD62_0222E7E8: ; 0x0222E7E8 ldmia r5!, {r0, r1} stmia r2!, {r0, r1} ldmia r5!, {r0, r1} - ldr r6, _0222E86C ; =0x0223110C + ldr r6, _0222E86C ; =MOD62_0223110C stmia r2!, {r0, r1} add r5, sp, #0x18 ldmia r6!, {r0, r1} @@ -2448,7 +2448,7 @@ MOD62_0222E7E8: ; 0x0222E7E8 ldr r0, [r4, #8] mov r3, #0x20 bl FUN_0200BB6C - ldr r3, _0222E870 ; =0x02231120 + ldr r3, _0222E870 ; =MOD62_02231120 add r2, sp, #0 ldmia r3!, {r0, r1} stmia r2!, {r0, r1} @@ -2478,9 +2478,9 @@ _0222E864: add sp, #0x4c pop {r3, r4, r5, r6, pc} .align 2, 0 -_0222E868: .word 0x02231138 -_0222E86C: .word 0x0223110C -_0222E870: .word 0x02231120 +_0222E868: .word MOD62_02231138 +_0222E86C: .word MOD62_0223110C +_0222E870: .word MOD62_02231120 thumb_func_end MOD62_0222E7E8 thumb_func_start MOD62_0222E874 @@ -2553,7 +2553,7 @@ _0222E8F4: .word 0x0000BB80 MOD62_0222E8F8: ; 0x0222E8F8 push {r4, r5, r6, r7, lr} sub sp, #0x64 - ldr r4, _0222E97C ; =0x02231178 + ldr r4, _0222E97C ; =MOD62_02231178 add r6, r0, #0 add r3, sp, #0 mov r2, #6 @@ -2618,7 +2618,7 @@ _0222E912: add sp, #0x64 pop {r4, r5, r6, r7, pc} .align 2, 0 -_0222E97C: .word 0x02231178 +_0222E97C: .word MOD62_02231178 _0222E980: .word 0x0000AFC8 _0222E984: .word 0x000066B2 _0222E988: .word 0x0000B798 @@ -4237,7 +4237,7 @@ MOD62_0222F5B0: ; 0x0222F5B0 add r1, r5, #0 add r2, sp, #0x6c bl FUN_0200C154 - ldr r3, _0222F730 ; =0x022311A8 + ldr r3, _0222F730 ; =MOD62_022311A8 str r0, [r4, #0x30] add r2, sp, #0x38 mov r1, #0x1a @@ -4248,7 +4248,7 @@ _0222F676: add r2, r2, #2 sub r1, r1, #1 bne _0222F676 - ldr r3, _0222F734 ; =0x022311DC + ldr r3, _0222F734 ; =MOD62_022311DC add r2, sp, #4 mov r1, #0x1a _0222F688: @@ -4320,8 +4320,8 @@ _0222F720: .word 0x00006DB4 _0222F724: .word 0x000062B6 _0222F728: .word 0x00006A27 _0222F72C: .word 0x00006DB3 -_0222F730: .word 0x022311A8 -_0222F734: .word 0x022311DC +_0222F730: .word MOD62_022311A8 +_0222F734: .word MOD62_022311DC thumb_func_end MOD62_0222F5B0 thumb_func_start MOD62_0222F738 @@ -4691,7 +4691,7 @@ MOD62_0222F990: ; 0x0222F990 lsl r1, r1, #2 ldr r1, [r4, r1] lsl r2, r1, #2 - ldr r1, _0222F9B0 ; =0x02231220 + ldr r1, _0222F9B0 ; =MOD62_02231220 ldr r1, [r1, r2] blx r1 add r4, #0xe0 @@ -4701,7 +4701,7 @@ MOD62_0222F990: ; 0x0222F990 add r0, r5, #0 pop {r3, r4, r5, pc} .align 2, 0 -_0222F9B0: .word 0x02231220 +_0222F9B0: .word MOD62_02231220 thumb_func_end MOD62_0222F990 thumb_func_start MOD62_0222F9B4 @@ -5596,7 +5596,7 @@ MOD62_022300E4: ; 0x022300E4 mov r7, #0x1d lsl r7, r7, #4 strb r0, [r1, #3] - ldr r1, _022301A0 ; =0x02231260 + ldr r1, _022301A0 ; =MOD62_02231260 ldr r2, [sp, #4] add r3, r7, #1 add r4, r7, #2 @@ -5682,7 +5682,7 @@ _0223017E: add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 -_022301A0: .word 0x02231260 +_022301A0: .word MOD62_02231260 _022301A4: .word 0x000001D2 _022301A8: .word MOD62_0222FE58 thumb_func_end MOD62_022300E4 @@ -7367,7 +7367,7 @@ MOD62_02230F80: ; 0x02230F80 sub sp, #0xfc add r4, r0, #0 bl FUN_0201E6D8 - ldr r5, _022310B8 ; =0x02231238 + ldr r5, _022310B8 ; =MOD62_02231238 add r3, sp, #0x10 mov r2, #5 _02230F90: @@ -7401,7 +7401,7 @@ _02230F90: lsl r1, r1, #0x14 lsl r2, r2, #0x10 bl MIi_CpuClear32 - ldr r5, _022310BC ; =0x02231210 + ldr r5, _022310BC ; =MOD62_02231210 add r3, sp, #0 add r2, r3, #0 ldmia r5!, {r0, r1} @@ -7410,7 +7410,7 @@ _02230F90: stmia r3!, {r0, r1} add r0, r2, #0 bl FUN_02016BBC - ldr r5, _022310C0 ; =0x02231294 + ldr r5, _022310C0 ; =MOD62_02231294 add r3, sp, #0xa8 mov r2, #0xa _02230FF0: @@ -7453,7 +7453,7 @@ _02230FF0: strh r2, [r1] add r1, r0, #0 bl FUN_0201E6E4 - ldr r5, _022310C8 ; =0x022312E8 + ldr r5, _022310C8 ; =MOD62_022312E8 add r3, sp, #0x38 mov r2, #0xe _02231052: @@ -7499,11 +7499,11 @@ _02231052: add sp, #0xfc pop {r4, r5, pc} nop -_022310B8: .word 0x02231238 -_022310BC: .word 0x02231210 -_022310C0: .word 0x02231294 +_022310B8: .word MOD62_02231238 +_022310BC: .word MOD62_02231210 +_022310C0: .word MOD62_02231294 _022310C4: .word 0x04000008 -_022310C8: .word 0x022312E8 +_022310C8: .word MOD62_022312E8 thumb_func_end MOD62_02230F80 thumb_func_start MOD62_022310CC @@ -7536,47 +7536,101 @@ _02231108: .word 0x00003FF8 thumb_func_end MOD62_022310CC .section .rodata - ; 0x0223110C + + .global MOD62_0223110C +MOD62_0223110C: ; 0x0223110C .byte 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 - .byte 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x10, 0x00, 0x00, 0x00 + + .global MOD62_02231120 +MOD62_02231120: ; 0x02231120 + .byte 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 + .byte 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + + .global MOD62_02231138 +MOD62_02231138: ; 0x02231138 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x13, 0x00, 0x17, 0x00 + .byte 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 + + .global MOD62_02231158 +MOD62_02231158: ; 0x02231158 + .byte 0x13, 0x00, 0x17, 0x00 .byte 0x4B, 0x00, 0x17, 0x00, 0x13, 0x00, 0x2F, 0x00, 0x4B, 0x00, 0x2F, 0x00, 0x13, 0x00, 0x47, 0x00 - .byte 0x4B, 0x00, 0x47, 0x00, 0x13, 0x00, 0x5F, 0x00, 0x4B, 0x00, 0x5F, 0x00, 0x88, 0x00, 0x00, 0x00 + .byte 0x4B, 0x00, 0x47, 0x00, 0x13, 0x00, 0x5F, 0x00, 0x4B, 0x00, 0x5F, 0x00 + + .global MOD62_02231178 +MOD62_02231178: ; 0x02231178 + .byte 0x88, 0x00, 0x00, 0x00 .byte 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xF0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x17, 0x00 + .byte 0xF0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + + .global MOD62_022311A8 +MOD62_022311A8: ; 0x022311A8 + .byte 0x14, 0x00, 0x17, 0x00 .byte 0x14, 0x00, 0x2F, 0x00, 0x14, 0x00, 0x47, 0x00, 0x14, 0x00, 0x5F, 0x00, 0x4C, 0x00, 0x17, 0x00 .byte 0x4C, 0x00, 0x2F, 0x00, 0x4C, 0x00, 0x47, 0x00, 0x4C, 0x00, 0x5F, 0x00, 0x1B, 0x00, 0x7C, 0x00 .byte 0x43, 0x00, 0x7C, 0x00, 0x20, 0x00, 0xAB, 0x00, 0x68, 0x00, 0xAB, 0x00, 0xC0, 0x00, 0xAB, 0x00 + + .global MOD62_022311DC +MOD62_022311DC: ; 0x022311DC .byte 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00 .byte 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00 .byte 0x0D, 0x00, 0x0A, 0x00, 0x0D, 0x00, 0x0A, 0x00, 0x10, 0x00, 0x0C, 0x00, 0x1C, 0x00, 0x0C, 0x00 - .byte 0x1C, 0x00, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0xB5, 0xFA, 0x22, 0x02, 0xAD, 0x03, 0x23, 0x02, 0xC1, 0x0C, 0x23, 0x02 - .byte 0x6D, 0x0D, 0x23, 0x02, 0xE1, 0x0D, 0x23, 0x02, 0x39, 0x0F, 0x23, 0x02, 0x01, 0x00, 0x00, 0x00 + .byte 0x1C, 0x00, 0x0C, 0x00 + + .global MOD62_02231210 +MOD62_02231210: ; 0x02231210 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00 + + .global MOD62_02231220 +MOD62_02231220: ; 0x02231220 + .word MOD62_0222FAB4, MOD62_022303AC, MOD62_02230CC0, MOD62_02230D6C + .word MOD62_02230DE0, MOD62_02230F38 + + .global MOD62_02231238 +MOD62_02231238: ; 0x02231238 + .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 - .byte 0x60, 0x00, 0x00, 0x00, 0x10, 0x20, 0x08, 0x18, 0x10, 0x20, 0x40, 0x50, 0x28, 0x38, 0x08, 0x18 + .byte 0x60, 0x00, 0x00, 0x00 + + .global MOD62_02231260 +MOD62_02231260: ; 0x02231260 + .byte 0x10, 0x20, 0x08, 0x18, 0x10, 0x20, 0x40, 0x50, 0x28, 0x38, 0x08, 0x18 .byte 0x28, 0x38, 0x40, 0x50, 0x40, 0x50, 0x08, 0x18, 0x40, 0x50, 0x40, 0x50, 0x58, 0x68, 0x08, 0x18 .byte 0x58, 0x68, 0x40, 0x50, 0x68, 0x80, 0x08, 0x30, 0x68, 0x80, 0x38, 0x60, 0xA8, 0xBC, 0x12, 0x4D - .byte 0xA8, 0xBC, 0x61, 0x9C, 0xA8, 0xBC, 0xB2, 0xED, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xA8, 0xBC, 0x61, 0x9C, 0xA8, 0xBC, 0xB2, 0xED + + .global MOD62_02231294 +MOD62_02231294: ; 0x02231294 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x06, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x06, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD62_022312E8 +MOD62_022312E8: ; 0x022312E8 + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0D, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x01, 0x00, 0x02, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0C, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0F, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x3D, 0xF9, 0x22, 0x02, 0x01, 0x00, 0x00, 0x00, 0x05, 0xF9, 0x22, 0x02, 0x02, 0x00, 0x00, 0x00 - .byte 0x4D, 0xF9, 0x22, 0x02, 0x03, 0x00, 0x00, 0x00, 0x71, 0xF9, 0x22, 0x02, 0x04, 0x00, 0x00, 0x00 - .byte 0x81, 0xF9, 0x22, 0x02 + .byte 0x01, 0x00, 0x0F, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD62_02231358 +MOD62_02231358: ; 0x02231358 + .word 0x00, MOD62_0222F93C + .word 0x01, MOD62_0222F904 + .word 0x02, MOD62_0222F94C + .word 0x03, MOD62_0222F970 + .word 0x04, MOD62_0222F980 .section .sinit .word MOD62_0222D5C0 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 2c54f2b5..1c7adbed 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -5508,8 +5508,8 @@ MOD65_021DA064: ; 0x021DA064 .global MOD65_021DA07C MOD65_021DA07C: ; 0x021DA07C - .byte 0x4D, 0x77, 0x1D, 0x02, 0x01, 0x78, 0x1D, 0x02, 0x19, 0x78, 0x1D, 0x02, 0xAD, 0x78, 0x1D, 0x02 - .byte 0xCD, 0x78, 0x1D, 0x02, 0x21, 0x79, 0x1D, 0x02 + .word MOD65_021D774C, MOD65_021D7800, MOD65_021D7818, MOD65_021D78AC + .word MOD65_021D78CC, MOD65_021D7920 .global MOD65_021DA094 MOD65_021DA094: ; 0x021DA094 @@ -5579,12 +5579,12 @@ MOD65_021DA2B8: ; 0x021DA2B8 .global MOD65_021DA2C0 MOD65_021DA2C0: ; 0x021DA2C0 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x87, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD65_021D8704, 0x00000000, 0x00000000 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x08, 0x00, 0x10, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .global MOD65_021DA2E0 MOD65_021DA2E0: ; 0x021DA2E0 - .byte 0x00, 0x00, 0x00, 0x00, 0xF1, 0x84, 0x1D, 0x02, 0xE5, 0x84, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD65_021D84F0, MOD65_021D84E4, 0x00000000 .byte 0x00, 0x00, 0x06, 0x00, 0x00, 0x08, 0x00, 0x10, 0x20, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00 .global MOD65_021DA300 @@ -5594,8 +5594,8 @@ MOD65_021DA300: ; 0x021DA300 .global MOD65_021DA314 MOD65_021DA314: ; 0x021DA314 - .byte 0x5C, 0xA4, 0x1D, 0x02, 0x40, 0xA4, 0x1D, 0x02, 0x94, 0xA4, 0x1D, 0x02, 0x78, 0xA4, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xA4, 0x1D, 0x02 + .word MOD65_021DA45C, MOD65_021DA440, MOD65_021DA494, MOD65_021DA478 + .word 0x00000000, 0x00000000, MOD65_021DA4B0 .global MOD65_021DA330 MOD65_021DA330: ; 0x021DA330 @@ -5646,15 +5646,26 @@ MOD65_021DA41C: ; 0x021DA41C .data .global MOD65_021DA440 MOD65_021DA440: ; 0x021DA440 - .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x70, 0x6F, 0x72, 0x75, 0x63, 0x61, 0x73, 0x65, 0x5F, 0x70, 0x61 - .byte 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61 - .byte 0x2F, 0x70, 0x6F, 0x72, 0x75, 0x63, 0x61, 0x73, 0x65, 0x5F, 0x63, 0x68, 0x72, 0x2E, 0x72, 0x65 - .byte 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x70, 0x6F, 0x72 - .byte 0x75, 0x63, 0x61, 0x73, 0x65, 0x5F, 0x63, 0x61, 0x6E, 0x6D, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61 - .byte 0x74, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x70, 0x6F, 0x72, 0x75, 0x63, 0x61, 0x73 - .byte 0x65, 0x5F, 0x63, 0x65, 0x6C, 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00 - .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x70, 0x6F, 0x72, 0x75, 0x63, 0x61, 0x73, 0x65, 0x5F, 0x63, 0x65 - .byte 0x6C, 0x61, 0x63, 0x74, 0x2E, 0x63, 0x6C, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .asciz "data/porucase_pal.resdat" + + .balign 4, 0 + .global MOD65_021DA45C +MOD65_021DA45C: ; 0x021DA45C + .asciz "data/porucase_chr.resdat" + + .balign 4, 0 + .global MOD65_021DA478 +MOD65_021DA478: ; 0x021DA478 + .asciz "data/porucase_canm.resdat" + + .balign 4, 0 + .global MOD65_021DA494 +MOD65_021DA494: ; 0x021DA494 + .asciz "data/porucase_cell.resdat" + + .balign 4, 0 + .global MOD65_021DA4B0 +MOD65_021DA4B0: ; 0x021DA4B0 + .asciz "data/porucase_celact.cldat" .bss diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index f4b87636..7af50ac6 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -1727,7 +1727,7 @@ MOD70_021D82AC: ; 0x021D82AC .data .global MOD70_021D82E0 MOD70_021D82E0: ; 0x021D82E0 - .byte 0x71, 0x79, 0x1D, 0x02, 0xC1, 0x79, 0x1D, 0x02, 0x21, 0x7A, 0x1D, 0x02, 0x8D, 0x7A, 0x1D, 0x02 - .byte 0xDD, 0x7A, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word MOD70_021D7970, MOD70_021D79C0, MOD70_021D7A20, MOD70_021D7A8C + .word MOD70_021D7ADC .bss diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 107b6334..8c3ed755 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -9467,13 +9467,20 @@ MOD73_021DBC8A: ; 0x021DBC8A .global MOD73_021DBC9C MOD73_021DBC9C: ; 0x021DBC9C - .byte 0x9D, 0x76, 0x1D, 0x02, 0x01, 0x00, 0x00, 0x00, 0x31, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x59, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x5D, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x59, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x69, 0x7F, 0x1D, 0x02, 0x02, 0x00, 0x00, 0x00 - .byte 0xB9, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0xE9, 0x79, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0xAD, 0x7A, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x59, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x9D, 0x7C, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x59, 0x78, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x75, 0x7F, 0x1D, 0x02, 0x03, 0x00, 0x00, 0x00, 0x6D, 0x80, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 + .word MOD73_021D769C, 0x01 + .word MOD73_021D7830, 0x00 + .word MOD73_021D7858, 0x00 + .word MOD73_021D785C, 0x00 + .word MOD73_021D7858, 0x00 + .word MOD73_021D7F68, 0x02 + .word MOD73_021D78B8, 0x00 + .word MOD73_021D79E8, 0x00 + .word MOD73_021D7AAC, 0x00 + .word MOD73_021D7858, 0x00 + .word MOD73_021D7C9C, 0x00 + .word MOD73_021D7858, 0x00 + .word MOD73_021D7F74, 0x03 + .word MOD73_021D806C, 0x00 .global MOD73_021DBD0C MOD73_021DBD0C: ; 0x021DBD0C diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index bbf859db..b0608987 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -2030,8 +2030,8 @@ MOD74_021D84C4: ; 0x021D84C4 .global MOD74_021D84DC MOD74_021D84DC: ; 0x021D84DC - .byte 0x98, 0x86, 0x1D, 0x02, 0x80, 0x86, 0x1D, 0x02, 0xB0, 0x86, 0x1D, 0x02, 0xC8, 0x86, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x86, 0x1D, 0x02 + .word MOD74_021D8698, MOD74_021D8680, MOD74_021D86B0, MOD74_021D86C8 + .word 0x00000000, 0x00000000, MOD74_021D86E0 .global MOD74_021D84F8 MOD74_021D84F8: ; 0x021D84F8 @@ -2075,13 +2075,26 @@ MOD74_021D85C4: ; 0x021D85C4 .data .global MOD74_021D8680 MOD74_021D8680: ; 0x021D8680 - .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F, 0x77, 0x65, 0x72, 0x5F, 0x70, 0x61, 0x6C, 0x2E - .byte 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F - .byte 0x77, 0x65, 0x72, 0x5F, 0x63, 0x68, 0x72, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00 - .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F, 0x77, 0x65, 0x72, 0x5F, 0x63, 0x65, 0x6C, 0x6C - .byte 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F - .byte 0x77, 0x65, 0x72, 0x5F, 0x63, 0x61, 0x6E, 0x6D, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00 - .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x62, 0x74, 0x6F, 0x77, 0x65, 0x72, 0x5F, 0x63, 0x65, 0x6C, 0x61 - .byte 0x63, 0x74, 0x2E, 0x63, 0x6C, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .asciz "data/btower_pal.resdat" + + .balign 4, 0 + .global MOD74_021D8698 +MOD74_021D8698: ; 0x021D8698 + .asciz "data/btower_chr.resdat" + + .balign 4, 0 + .global MOD74_021D86B0 +MOD74_021D86B0: ; 0x021D86B0 + .asciz "data/btower_cell.resdat" + + .balign 4, 0 + .global MOD74_021D86C8 +MOD74_021D86C8: ; 0x021D86C8 + .asciz "data/btower_canm.resdat" + + .balign 4, 0 + .global MOD74_021D86E0 +MOD74_021D86E0: ; 0x021D86E0 + .asciz "data/btower_celact.cldat" .bss diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 1667166f..be189441 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -3262,18 +3262,18 @@ MOD76_021D8EDC: ; 0x021D8EDC .global MOD76_021D8EFC MOD76_021D8EFC: ; 0x021D8EFC - .byte 0x00, 0x00, 0x00, 0x00, 0xD1, 0x7F, 0x1D, 0x02, 0x09, 0x80, 0x1D, 0x02, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD76_021D7FD0, MOD76_021D8008, 0x00000000 .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x02, 0x00, 0x10, 0x20, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00 .global MOD76_021D8F1C MOD76_021D8F1C: ; 0x021D8F1C - .byte 0x0D, 0x86, 0x1D, 0x02 + .word MOD76_021D860C .global MOD76_021D8F20 MOD76_021D8F20: ; 0x021D8F20 - .byte 0x2D, 0x86, 0x1D, 0x02, 0x7D, 0x86, 0x1D, 0x02, 0x89, 0x86, 0x1D, 0x02, 0xD9, 0x86, 0x1D, 0x02 - .byte 0xE5, 0x86, 0x1D, 0x02, 0x01, 0x87, 0x1D, 0x02, 0x1D, 0x87, 0x1D, 0x02, 0x39, 0x87, 0x1D, 0x02 - .byte 0x4D, 0x87, 0x1D, 0x02 + .word MOD76_021D862C, MOD76_021D867C, MOD76_021D8688, MOD76_021D86D8 + .word MOD76_021D86E4, MOD76_021D8700, MOD76_021D871C, MOD76_021D8738 + .word MOD76_021D874C .global MOD76_021D8F44 MOD76_021D8F44: ; 0x021D8F44 diff --git a/arm9/modules/79/asm/module_79_arm.s b/arm9/modules/79/asm/module_79_arm.s index 810b818f..24356937 100644 --- a/arm9/modules/79/asm/module_79_arm.s +++ b/arm9/modules/79/asm/module_79_arm.s @@ -11,7 +11,7 @@ MOD79_0221248C: ; 0x0221248C mov r6, r1 mov r5, r2 bne _022124B8 - ldr r0, _02212544 ; =0x02216858 + ldr r0, _02212544 ; =MOD79_02216858 ldr r1, _02212548 ; =0x0221686C ldr r3, _0221254C ; =0x000001B7 mov r2, #0 @@ -54,7 +54,7 @@ _022124D4: add sp, sp, #4 ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_02212544: .word 0x02216858 +_02212544: .word MOD79_02216858 _02212548: .word MOD79_0221686C _0221254C: .word 0x000001B7 _02212550: .word MOD79_0221687C @@ -1118,18 +1118,18 @@ MOD79_02213380: ; 0x02213380 arm_func_start MOD79_02213384 MOD79_02213384: ; 0x02213384 stmdb sp!, {r4, r5, r6, lr} - ldr r0, _02213400 ; =0x02217138 + ldr r0, _02213400 ; =MOD79_02217138 ldr r0, [r0] cmp r0, #0 ldmeqia sp!, {r4, r5, r6, pc} ldr r0, _02213404 ; =MOD79_02213638 bl MOD79_02213510 - ldr r5, _02213408 ; =0x0221712C + ldr r5, _02213408 ; =MOD79_0221712C mov r6, #0 ldr r0, [r5] cmp r0, #0 ble _022133D4 - ldr r4, _02213400 ; =0x02217138 + ldr r4, _02213400 ; =MOD79_02217138 _022133B8: ldr r0, [r4] ldr r0, [r0, r6, lsl #2] @@ -1139,22 +1139,22 @@ _022133B8: cmp r6, r0 blt _022133B8 _022133D4: - ldr r0, _02213400 ; =0x02217138 + ldr r0, _02213400 ; =MOD79_02217138 ldr r0, [r0] bl MOD04_021DD82C - ldr r2, _02213400 ; =0x02217138 + ldr r2, _02213400 ; =MOD79_02217138 mov r3, #0 - ldr r1, _02213408 ; =0x0221712C - ldr r0, _0221340C ; =0x02217130 + ldr r1, _02213408 ; =MOD79_0221712C + ldr r0, _0221340C ; =MOD79_02217130 str r3, [r2] str r3, [r1] str r3, [r0] ldmia sp!, {r4, r5, r6, pc} .align 2, 0 -_02213400: .word 0x02217138 +_02213400: .word MOD79_02217138 _02213404: .word MOD79_02213638 -_02213408: .word 0x0221712C -_0221340C: .word 0x02217130 +_02213408: .word MOD79_0221712C +_0221340C: .word MOD79_02217130 arm_func_end MOD79_02213384 arm_func_start MOD79_02213410 @@ -1232,19 +1232,19 @@ _0221350C: .word 0x00000133 MOD79_02213510: ; 0x02213510 stmdb sp!, {r4, r5, r6, r7, lr} sub sp, sp, #4 - ldr r1, _02213580 ; =0x02217130 + ldr r1, _02213580 ; =MOD79_02217130 mov r5, r0 ldr r0, [r1] cmp r0, #0 addle sp, sp, #4 ldmleia sp!, {r4, r5, r6, r7, pc} bl MOD79_02213378 - ldr r7, _02213584 ; =0x0221712C + ldr r7, _02213584 ; =MOD79_0221712C mov r4, #0 ldr r0, [r7] cmp r0, #0 ble _02213574 - ldr r6, _02213588 ; =0x02217138 + ldr r6, _02213588 ; =MOD79_02217138 _0221354C: ldr r0, [r6] ldr r0, [r0, r4, lsl #2] @@ -1262,9 +1262,9 @@ _02213574: add sp, sp, #4 ldmia sp!, {r4, r5, r6, r7, pc} .align 2, 0 -_02213580: .word 0x02217130 -_02213584: .word 0x0221712C -_02213588: .word 0x02217138 +_02213580: .word MOD79_02217130 +_02213584: .word MOD79_0221712C +_02213588: .word MOD79_02217138 arm_func_end MOD79_02213510 arm_func_start MOD79_0221358C @@ -1278,7 +1278,7 @@ MOD79_0221358C: ; 0x0221358C mov r2, #0 bl __msl_assertion_failed _022135AC: - ldr r0, _02213628 ; =0x0221712C + ldr r0, _02213628 ; =MOD79_0221712C ldr r0, [r0] cmp r4, r0 blt _022135D0 @@ -1291,7 +1291,7 @@ _022135D0: bl MOD79_02213378 cmp r4, #0 blt _022135EC - ldr r0, _02213628 ; =0x0221712C + ldr r0, _02213628 ; =MOD79_0221712C ldr r0, [r0] cmp r4, r0 blt _022135F8 @@ -1300,7 +1300,7 @@ _022135EC: mov r0, #0 ldmia sp!, {r4, pc} _022135F8: - ldr r0, _02213634 ; =0x02217138 + ldr r0, _02213634 ; =MOD79_02217138 ldr r0, [r0] ldr r4, [r0, r4, lsl #2] ldr r0, [r4] @@ -1313,10 +1313,10 @@ _022135F8: _0221361C: .word MOD79_02216998 _02213620: .word MOD79_0221696C _02213624: .word 0x00000101 -_02213628: .word 0x0221712C +_02213628: .word MOD79_0221712C _0221362C: .word MOD79_022169A8 _02213630: .word 0x00000102 -_02213634: .word 0x02217138 +_02213634: .word MOD79_02217138 arm_func_end MOD79_0221358C arm_func_start MOD79_02213638 @@ -1339,7 +1339,7 @@ _02213658: mov r3, #0xb4 bl __msl_assertion_failed _02213678: - ldr r0, _0221380C ; =0x0221712C + ldr r0, _0221380C ; =MOD79_0221712C ldr r1, [r4, #4] ldr r0, [r0] cmp r1, r0 @@ -1370,7 +1370,7 @@ _022136C0: cmp r1, #0 movlt r0, #0 ldmltia sp!, {r4, pc} - ldr r0, _0221380C ; =0x0221712C + ldr r0, _0221380C ; =MOD79_0221712C ldr r0, [r0] cmp r1, r0 movge r0, #0 @@ -1436,7 +1436,7 @@ _022137D4: str r0, [r4, #0x16c] _022137DC: mov r1, #0 - ldr r0, _02213818 ; =0x02217130 + ldr r0, _02213818 ; =MOD79_02217130 str r1, [r4] ldr r1, [r0] sub r1, r1, #1 @@ -1448,10 +1448,10 @@ _022137DC: _02213800: .word MOD79_02216960 _02213804: .word MOD79_0221696C _02213808: .word MOD79_022169C4 -_0221380C: .word 0x0221712C +_0221380C: .word MOD79_0221712C _02213810: .word MOD79_022169E0 _02213814: .word MOD79_02216A08 -_02213818: .word 0x02217130 +_02213818: .word MOD79_02217130 arm_func_end MOD79_02213638 arm_func_start MOD79_0221381C @@ -1469,7 +1469,7 @@ MOD79_0221381C: ; 0x0221381C mov r0, #0 ldmia sp!, {r4, r5, pc} _0221384C: - ldr r0, _022139C0 ; =0x02217138 + ldr r0, _022139C0 ; =MOD79_02217138 mov r1, #0 ldr r0, [r0] mov r2, #0x184 @@ -1478,7 +1478,7 @@ _0221384C: bl memset mov r0, #1 str r0, [r4] - ldr r0, _022139C4 ; =0x02217134 + ldr r0, _022139C4 ; =MOD79_02217134 str r5, [r4, #4] ldr r2, [r0] mov ip, #0 @@ -1557,7 +1557,7 @@ _02213980: mov r0, #0 ldmia sp!, {r4, r5, pc} _022139A0: - ldr r0, _022139C8 ; =0x02217130 + ldr r0, _022139C8 ; =MOD79_02217130 ldr r1, [r0] add r1, r1, #1 str r1, [r0] @@ -1566,21 +1566,21 @@ _022139A0: add sp, sp, #4 ldmia sp!, {r4, r5, pc} .align 2, 0 -_022139C0: .word 0x02217138 -_022139C4: .word 0x02217134 -_022139C8: .word 0x02217130 +_022139C0: .word MOD79_02217138 +_022139C4: .word MOD79_02217134 +_022139C8: .word MOD79_02217130 arm_func_end MOD79_0221381C arm_func_start MOD79_022139CC MOD79_022139CC: ; 0x022139CC stmdb sp!, {r4, r5, r6, r7, r8, sb, lr} sub sp, sp, #4 - ldr r1, _02213AF4 ; =0x0221712C + ldr r1, _02213AF4 ; =MOD79_0221712C mov r0, #0 ldr r2, [r1] cmp r2, #0 ble _02213A10 - ldr r1, _02213AF8 ; =0x02217138 + ldr r1, _02213AF8 ; =MOD79_02217138 ldr r3, [r1] _022139F0: ldr r1, [r3, r0, lsl #2] @@ -1592,7 +1592,7 @@ _022139F0: cmp r0, r2 blt _022139F0 _02213A10: - ldr r0, _02213AFC ; =0x02217130 + ldr r0, _02213AFC ; =MOD79_02217130 ldr r0, [r0] cmp r0, r2 beq _02213A34 @@ -1602,8 +1602,8 @@ _02213A10: mov r3, #0x33 bl __msl_assertion_failed _02213A34: - ldr r1, _02213AF4 ; =0x0221712C - ldr r0, _02213AF8 ; =0x02217138 + ldr r1, _02213AF4 ; =MOD79_0221712C + ldr r0, _02213AF8 ; =MOD79_02217138 ldr r7, [r1] ldr r0, [r0] add r6, r7, #4 @@ -1613,7 +1613,7 @@ _02213A34: addeq sp, sp, #4 mvneq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, sb, pc} - ldr r8, _02213AF8 ; =0x02217138 + ldr r8, _02213AF8 ; =MOD79_02217138 mov r5, r7 str r0, [r8] cmp r7, r6 @@ -1632,7 +1632,7 @@ _02213A7C: sub r5, r5, #1 cmp r5, r7 blt _02213AC4 - ldr r4, _02213AF8 ; =0x02217138 + ldr r4, _02213AF8 ; =MOD79_02217138 _02213AAC: ldr r0, [r4] ldr r0, [r0, r5, lsl #2] @@ -1650,15 +1650,15 @@ _02213AD0: cmp r5, r6 blt _02213A7C _02213AE0: - ldr r1, _02213AF4 ; =0x0221712C + ldr r1, _02213AF4 ; =MOD79_0221712C mov r0, r7 str r6, [r1] add sp, sp, #4 ldmia sp!, {r4, r5, r6, r7, r8, sb, pc} .align 2, 0 -_02213AF4: .word 0x0221712C -_02213AF8: .word 0x02217138 -_02213AFC: .word 0x02217130 +_02213AF4: .word MOD79_0221712C +_02213AF8: .word MOD79_02217138 +_02213AFC: .word MOD79_02217130 _02213B00: .word MOD79_02216A1C _02213B04: .word MOD79_0221696C arm_func_end MOD79_022139CC @@ -1727,7 +1727,7 @@ _02213BB0: mvneq r0, #0 ldmeqia sp!, {r4, r5, r6, r7, r8, pc} _02213BD0: - ldr r0, _02213D7C ; =0x0221713C + ldr r0, _02213D7C ; =MOD79_0221713C ldr r0, [r0] cmp r0, #0 bne _02213BE4 @@ -1845,7 +1845,7 @@ _02213D6C: .word MOD79_02216A60 _02213D70: .word 0x00000129 _02213D74: .word MOD79_02216A70 _02213D78: .word 0x0000012A -_02213D7C: .word 0x0221713C +_02213D7C: .word MOD79_0221713C arm_func_end MOD79_02213B1C arm_func_start MOD79_02213D80 @@ -1872,18 +1872,18 @@ MOD79_02213DBC: ; 0x02213DBC stmdb sp!, {lr} sub sp, sp, #4 bl MOD79_02213378 - ldr r0, _02213E1C ; =0x0221713C + ldr r0, _02213E1C ; =MOD79_0221713C ldr r1, [r0] subs r1, r1, #1 str r1, [r0] bne _02213E10 bl MOD79_02213384 - ldr r0, _02213E20 ; =0x02217128 + ldr r0, _02213E20 ; =MOD79_02217128 ldr r0, [r0] cmp r0, #0 beq _02213E00 bl MOD04_021DD82C - ldr r0, _02213E20 ; =0x02217128 + ldr r0, _02213E20 ; =MOD79_02217128 mov r1, #0 str r1, [r0] _02213E00: @@ -1896,8 +1896,8 @@ _02213E10: add sp, sp, #4 ldmia sp!, {pc} .align 2, 0 -_02213E1C: .word 0x0221713C -_02213E20: .word 0x02217128 +_02213E1C: .word MOD79_0221713C +_02213E20: .word MOD79_02217128 arm_func_end MOD79_02213DBC arm_func_start MOD79_02213E24 @@ -1905,7 +1905,7 @@ MOD79_02213E24: ; 0x02213E24 stmdb sp!, {lr} sub sp, sp, #4 bl MOD79_02213378 - ldr r0, _02213E78 ; =0x0221713C + ldr r0, _02213E78 ; =MOD79_0221713C ldr r1, [r0] add r1, r1, #1 str r1, [r0] @@ -1925,7 +1925,7 @@ _02213E6C: add sp, sp, #4 ldmia sp!, {pc} .align 2, 0 -_02213E78: .word 0x0221713C +_02213E78: .word MOD79_0221713C _02213E7C: .word MOD79_0221695C _02213E80: .word MOD79_02216958 arm_func_end MOD79_02213E24 @@ -3030,7 +3030,7 @@ _02214D78: .word MOD79_02216ADC MOD79_02214D7C: ; 0x02214D7C stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, fp, lr} sub sp, sp, #4 - ldr r1, _02214F24 ; =0x0221714C + ldr r1, _02214F24 ; =MOD79_0221714C mov r8, r0 ldr r0, [r1] ldr r7, [r8, #0x13c] @@ -3039,12 +3039,12 @@ MOD79_02214D7C: ; 0x02214D7C bne _02214DD4 ldr r0, _02214F28 ; =0x02216EB0 bl strlen - ldr r5, _02214F24 ; =0x0221714C - ldr r3, _02214F2C ; =0x02217148 + ldr r5, _02214F24 ; =MOD79_0221714C + ldr r3, _02214F2C ; =MOD79_02217148 add sl, r0, #0x2f - ldr r2, _02214F30 ; =0x02217144 + ldr r2, _02214F30 ; =MOD79_02217144 add sb, r0, #0x4c - ldr r1, _02214F34 ; =0x02217140 + ldr r1, _02214F34 ; =MOD79_02217140 add r6, r0, #4 str r0, [r5] str sl, [r3] @@ -3067,7 +3067,7 @@ _02214DF4: ldr r0, [sl] cmp r0, #0 bne _02214E34 - ldr r0, _02214F2C ; =0x02217148 + ldr r0, _02214F2C ; =MOD79_02217148 ldr r1, [r0] ldr r0, [sl, #4] add r4, r4, r1 @@ -3079,7 +3079,7 @@ _02214DF4: _02214E34: cmp r0, #1 bne _02214EA0 - ldr r0, _02214F30 ; =0x02217144 + ldr r0, _02214F30 ; =MOD79_02217144 ldr r1, [r0] ldr r0, [sl, #4] add r4, r4, r1 @@ -3108,7 +3108,7 @@ _02214E94: _02214EA0: cmp r0, #2 bne _02214EE4 - ldr r0, _02214F30 ; =0x02217144 + ldr r0, _02214F30 ; =MOD79_02217144 ldr r1, [r0] ldr r0, [sl, #4] add r4, r4, r1 @@ -3137,17 +3137,17 @@ _02214F04: cmp r6, r5 blt _02214DF4 _02214F10: - ldr r0, _02214F34 ; =0x02217140 + ldr r0, _02214F34 ; =MOD79_02217140 ldr r0, [r0] add r0, r4, r0 add sp, sp, #4 ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 -_02214F24: .word 0x0221714C +_02214F24: .word MOD79_0221714C _02214F28: .word MOD79_02216EB0 -_02214F2C: .word 0x02217148 -_02214F30: .word 0x02217144 -_02214F34: .word 0x02217140 +_02214F2C: .word MOD79_02217148 +_02214F30: .word MOD79_02217144 +_02214F34: .word MOD79_02217140 _02214F38: .word MOD79_02216ED8 _02214F3C: .word MOD79_02216ADC _02214F40: .word MOD79_02216D4C @@ -3438,7 +3438,7 @@ _022152DC: cmp r0, #0 beq _02215448 add r4, r0, #9 - ldr r1, _0221562C ; =0x0210430C + ldr r1, _0221562C ; =UNK_0210430C mov r2, #0 b _02215330 _0221532C: @@ -3460,7 +3460,7 @@ _02215358: cmp r0, #0 bne _0221532C mov r3, r4 - ldr r1, _0221562C ; =0x0210430C + ldr r1, _0221562C ; =UNK_0210430C mov r2, #0 b _02215374 _02215370: @@ -3655,7 +3655,7 @@ _0221561C: .word MOD79_02216F64 _02215620: .word MOD79_02216F6C _02215624: .word 0x51EB851F _02215628: .word MOD79_02216F70 -_0221562C: .word 0x0210430C +_0221562C: .word UNK_0210430C _02215630: .word MOD79_02216F7C _02215634: .word MOD79_02216F8C _02215638: .word MOD79_0221673C @@ -4101,7 +4101,7 @@ _02215C1C: bl sscanf mov r3, #0 mov ip, #1 - ldr r2, _02215D24 ; =0x0210430C + ldr r2, _02215D24 ; =UNK_0210430C b _02215C5C _02215C50: ldr r1, [sp, #0x14] @@ -4163,7 +4163,7 @@ _02215D14: .word 0x0000024E _02215D18: .word MOD79_02217000 _02215D1C: .word 0x0000024F _02215D20: .word MOD79_02217020 -_02215D24: .word 0x0210430C +_02215D24: .word UNK_0210430C arm_func_end MOD79_02215BD8 arm_func_start MOD79_02215D28 @@ -4274,7 +4274,7 @@ _02215E7C: ldr r0, [r5, #0x15c] cmp r0, #0 bne _02215EA4 - ldr r0, _0221608C ; =0x02217128 + ldr r0, _0221608C ; =MOD79_02217128 ldr r0, [r0] cmp r0, #0 beq _02215EB8 @@ -4413,7 +4413,7 @@ _02216020: _02216080: .word MOD79_0221705C _02216084: .word MOD79_02217064 _02216088: .word MOD79_0221706C -_0221608C: .word 0x02217128 +_0221608C: .word MOD79_02217128 _02216090: .word MOD79_02217074 _02216094: .word MOD79_02217080 _02216098: .word MOD79_02217088 @@ -4593,11 +4593,11 @@ _022162D0: strh r0, [sp, #2] b _02216368 _02216318: - ldr r0, _02216470 ; =0x02217128 + ldr r0, _02216470 ; =MOD79_02217128 ldr r0, [r0] cmp r0, #0 beq _0221634C - ldr r0, _02216474 ; =0x02217124 + ldr r0, _02216474 ; =MOD79_02217124 ldrh r0, [r0] mov r1, r0, asr #8 mov r0, r0, lsl #8 @@ -4685,8 +4685,8 @@ _0221643C: ldmia sp!, {r4, pc} .align 2, 0 _0221646C: .word MOD79_0221695C -_02216470: .word 0x02217128 -_02216474: .word 0x02217124 +_02216470: .word MOD79_02217128 +_02216474: .word MOD79_02217124 arm_func_end MOD79_0221621C arm_func_start MOD79_02216478 @@ -4710,7 +4710,7 @@ MOD79_02216478: ; 0x02216478 ldr r5, [r4, #0x15c] cmp r5, #0 bne _022164D4 - ldr r0, _02216544 ; =0x02217128 + ldr r0, _02216544 ; =MOD79_02217128 ldr r5, [r0] cmp r5, #0 ldreq r5, [r4, #0x18] @@ -4745,7 +4745,7 @@ _02216524: add sp, sp, #4 ldmia sp!, {r4, r5, pc} .align 2, 0 -_02216544: .word 0x02217128 +_02216544: .word MOD79_02217128 arm_func_end MOD79_02216478 arm_func_start MOD79_02216548 diff --git a/arm9/modules/79/asm/module_79_thumb.s b/arm9/modules/79/asm/module_79_thumb.s index 6d9f33fe..fc4b1dd6 100644 --- a/arm9/modules/79/asm/module_79_thumb.s +++ b/arm9/modules/79/asm/module_79_thumb.s @@ -897,11 +897,58 @@ MOD79_02216834: ; 0x02216834 .global MOD79_0221684C MOD79_0221684C: ; 0x0221684C - .byte 0x25, 0x73, 0x3F, 0x70, 0x69, 0x64, 0x3D, 0x25, 0x64, 0x00, 0x00, 0x00, 0x62, 0x75, 0x66, 0x66 - .byte 0x65, 0x72, 0x49, 0x6E, 0x20, 0x21, 0x3D, 0x20, 0x4E, 0x55, 0x4C, 0x4C, 0x00, 0x00, 0x00, 0x00 + .asciz "%s?pid=%d" + + .balign 4, 0 + .global MOD79_02216858 +MOD79_02216858: ; 0x02216858 + .asciz "bufferIn != NULL" .bss .global MOD79_02217120 MOD79_02217120: ; 0x02217120 - .space 0x40 + .space 0x04 + + .global MOD79_02217124 +MOD79_02217124: ; 0x02217124 + .space 0x04 + + .global MOD79_02217128 +MOD79_02217128: ; 0x02217128 + .space 0x04 + + .global MOD79_0221712C +MOD79_0221712C: ; 0x0221712C + .space 0x04 + + .global MOD79_02217130 +MOD79_02217130: ; 0x02217130 + .space 0x04 + + .global MOD79_02217134 +MOD79_02217134: ; 0x02217134 + .space 0x04 + + .global MOD79_02217138 +MOD79_02217138: ; 0x02217138 + .space 0x04 + + .global MOD79_0221713C +MOD79_0221713C: ; 0x0221713C + .space 0x04 + + .global MOD79_02217140 +MOD79_02217140: ; 0x02217140 + .space 0x04 + + .global MOD79_02217144 +MOD79_02217144: ; 0x02217144 + .space 0x04 + + .global MOD79_02217148 +MOD79_02217148: ; 0x02217148 + .space 0x04 + .global MOD79_0221714C +MOD79_0221714C: ; 0x0221714C + .space 0x14 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index f1234b9a..a8c9541d 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -19597,7 +19597,7 @@ MOD80_022375E4: ; 0x022375E4 .global MOD80_022375F0 MOD80_022375F0: ; 0x022375F0 - .byte 0x41, 0x7E, 0x23, 0x02, 0x65, 0x80, 0x23, 0x02, 0x05, 0x80, 0x23, 0x02, 0x51, 0x00, 0x00, 0x00 + .word MOD81_02237E40, MOD81_02238064, MOD81_02238004, 0x00000051 .global MOD80_02237600 MOD80_02237600: ; 0x02237600 @@ -19703,28 +19703,28 @@ MOD80_02237938: ; 0x02237938 .global MOD80_02237984 MOD80_02237984: ; 0x02237984 - .byte 0x85, 0x62, 0x23, 0x02 + .word MOD80_02236284 .global MOD80_02237988 MOD80_02237988: ; 0x02237988 - .byte 0x31, 0x63, 0x23, 0x02 + .word MOD80_02236330 .global MOD80_0223798C MOD80_0223798C: ; 0x0223798C - .byte 0x51, 0x63, 0x23, 0x02, 0xF5, 0xE8, 0x22, 0x02, 0xB9, 0xE9, 0x22, 0x02, 0xD9, 0xE9, 0x22, 0x02 - .byte 0x95, 0xF3, 0x22, 0x02, 0x5D, 0xF4, 0x22, 0x02, 0x71, 0xF4, 0x22, 0x02, 0x61, 0xFE, 0x22, 0x02 - .byte 0x35, 0xFF, 0x22, 0x02, 0x49, 0xFF, 0x22, 0x02, 0x5D, 0x06, 0x23, 0x02, 0x29, 0x07, 0x23, 0x02 - .byte 0x3D, 0x07, 0x23, 0x02, 0xF1, 0x19, 0x23, 0x02, 0x65, 0x1A, 0x23, 0x02, 0x85, 0x1A, 0x23, 0x02 - .byte 0x19, 0x32, 0x23, 0x02, 0xA9, 0x32, 0x23, 0x02, 0xC9, 0x32, 0x23, 0x02, 0xFD, 0x46, 0x23, 0x02 - .byte 0x41, 0x47, 0x23, 0x02, 0x61, 0x47, 0x23, 0x02, 0x35, 0x5D, 0x23, 0x02, 0xD5, 0x5D, 0x23, 0x02 - .byte 0xFD, 0x5D, 0x23, 0x02, 0x09, 0x5E, 0x23, 0x02, 0xBD, 0x5F, 0x23, 0x02, 0x89, 0x61, 0x23, 0x02 + .word MOD80_02236350, MOD80_0222E8F4, MOD80_0222E9B8, MOD80_0222E9D8 + .word MOD80_0222F394, MOD80_0222F45C, MOD80_0222F470, MOD80_0222FE60 + .word MOD80_0222FF34, MOD80_0222FF48, MOD80_0223065C, MOD80_02230728 + .word MOD80_0223073C, MOD80_022319F0, MOD80_02231A64, MOD80_02231A84 + .word MOD80_02233218, MOD80_022332A8, MOD80_022332C8, MOD80_022346FC + .word MOD80_02234740, MOD80_02234760, MOD80_02235D34, MOD80_02235DD4 + .word MOD80_02235DFC, MOD80_02235E08, MOD80_02235FBC, MOD80_02236188 .global MOD80_022379FC MOD80_022379FC: ; 0x022379FC - .byte 0x25, 0xEE, 0x22, 0x02, 0x65, 0xEE, 0x22, 0x02, 0x75, 0xEE, 0x22, 0x02, 0x99, 0xEE, 0x22, 0x02 - .byte 0xAD, 0xEE, 0x22, 0x02, 0xC1, 0xEE, 0x22, 0x02, 0xFD, 0xEE, 0x22, 0x02, 0xA9, 0xF0, 0x22, 0x02 - .byte 0xD1, 0xF0, 0x22, 0x02, 0xE5, 0xF0, 0x22, 0x02, 0xB9, 0xF1, 0x22, 0x02, 0xD9, 0xF1, 0x22, 0x02 - .byte 0x2D, 0xF1, 0x22, 0x02, 0x4D, 0xF1, 0x22, 0x02 + .word MOD80_0222EE24, MOD80_0222EE64, MOD80_0222EE74, MOD80_0222EE98 + .word MOD80_0222EEAC, MOD80_0222EEC0, MOD80_0222EEFC, MOD80_0222F0A8 + .word MOD80_0222F0D0, MOD80_0222F0E4, MOD80_0222F1B8, MOD80_0222F1D8 + .word MOD80_0222F12C, MOD80_0222F14C .global MOD80_02237A34 MOD80_02237A34: ; 0x02237A34 @@ -19732,14 +19732,14 @@ MOD80_02237A34: ; 0x02237A34 .global MOD80_02237A40 MOD80_02237A40: ; 0x02237A40 - .byte 0x65, 0xF8, 0x22, 0x02, 0x6D, 0xF8, 0x22, 0x02, 0xCD, 0xF8, 0x22, 0x02, 0xE9, 0xFA, 0x22, 0x02 - .byte 0x09, 0xFB, 0x22, 0x02, 0xF5, 0xF8, 0x22, 0x02, 0x19, 0xF9, 0x22, 0x02, 0x6D, 0xF9, 0x22, 0x02 - .byte 0x05, 0xFA, 0x22, 0x02 + .word MOD80_0222F864, MOD80_0222F86C, MOD80_0222F8CC, MOD80_0222FAE8 + .word MOD80_0222FB08, MOD80_0222F8F4, MOD80_0222F918, MOD80_0222F96C + .word MOD80_0222FA04 .global MOD80_02237A64 MOD80_02237A64: ; 0x02237A64 - .byte 0xF1, 0x02, 0x23, 0x02, 0xF9, 0x02, 0x23, 0x02, 0x95, 0x03, 0x23, 0x02, 0xD9, 0x04, 0x23, 0x02 - .byte 0xD9, 0x03, 0x23, 0x02, 0xF9, 0x03, 0x23, 0x02, 0xC9, 0x04, 0x23, 0x02 + .word MOD80_022302F0, MOD80_022302F8, MOD80_02230394, MOD80_022304D8 + .word MOD80_022303D8, MOD80_022303F8, MOD80_022304C8 .global MOD80_02237A80 MOD80_02237A80: ; 0x02237A80 @@ -19752,21 +19752,21 @@ MOD80_02237A82: ; 0x02237A82 .global MOD80_02237A94 MOD80_02237A94: ; 0x02237A94 - .byte 0x6D, 0x0B, 0x23, 0x02, 0x95, 0x0B, 0x23, 0x02, 0x15, 0x11, 0x23, 0x02, 0x3D, 0x11, 0x23, 0x02 - .byte 0xC9, 0x11, 0x23, 0x02, 0x01, 0x12, 0x23, 0x02, 0xCD, 0x12, 0x23, 0x02, 0x1D, 0x13, 0x23, 0x02 - .byte 0x91, 0x14, 0x23, 0x02, 0xED, 0x14, 0x23, 0x02, 0x25, 0x15, 0x23, 0x02, 0x15, 0x16, 0x23, 0x02 - .byte 0x71, 0x16, 0x23, 0x02, 0xA9, 0x16, 0x23, 0x02, 0xC9, 0x0C, 0x23, 0x02, 0xB9, 0x0D, 0x23, 0x02 - .byte 0x15, 0x0E, 0x23, 0x02, 0x9D, 0x0E, 0x23, 0x02, 0xFD, 0x0E, 0x23, 0x02, 0x3D, 0x0F, 0x23, 0x02 - .byte 0x29, 0x18, 0x23, 0x02, 0x49, 0x18, 0x23, 0x02, 0x91, 0x17, 0x23, 0x02, 0xB5, 0x17, 0x23, 0x02 - .byte 0xF9, 0x17, 0x23, 0x02, 0x01, 0x18, 0x23, 0x02, 0x79, 0x0F, 0x23, 0x02, 0xB5, 0x0F, 0x23, 0x02 + .word MOD80_02230B6C, MOD80_02230B94, MOD80_02231114, MOD80_0223113C + .word MOD80_022311C8, MOD80_02231200, MOD80_022312CC, MOD80_0223131C + .word MOD80_02231490, MOD80_022314EC, MOD80_02231524, MOD80_02231614 + .word MOD80_02231670, MOD80_022316A8, MOD80_02230CC8, MOD80_02230DB8 + .word MOD80_02230E14, MOD80_02230E9C, MOD80_02230EFC, MOD80_02230F3C + .word MOD80_02231828, MOD80_02231848, MOD80_02231790, MOD80_022317B4 + .word MOD80_022317F8, MOD80_02231800, MOD80_02230F78, MOD80_02230FB4 .global MOD80_02237B04 MOD80_02237B04: ; 0x02237B04 - .byte 0x29, 0x21, 0x23, 0x02, 0x3D, 0x21, 0x23, 0x02, 0x4D, 0x28, 0x23, 0x02, 0xE9, 0x2A, 0x23, 0x02 - .byte 0x09, 0x2B, 0x23, 0x02, 0xA5, 0x28, 0x23, 0x02, 0xC9, 0x28, 0x23, 0x02, 0x71, 0x24, 0x23, 0x02 - .byte 0x19, 0x25, 0x23, 0x02, 0x71, 0x26, 0x23, 0x02, 0x19, 0x27, 0x23, 0x02, 0x01, 0x29, 0x23, 0x02 - .byte 0x2D, 0x29, 0x23, 0x02, 0x51, 0x29, 0x23, 0x02, 0x35, 0x2A, 0x23, 0x02, 0x61, 0x2A, 0x23, 0x02 - .byte 0x85, 0x2A, 0x23, 0x02 + .word MOD80_02232128, MOD80_0223213C, MOD80_0223284C, MOD80_02232AE8 + .word MOD80_02232B08, MOD80_022328A4, MOD80_022328C8, MOD80_02232470 + .word MOD80_02232518, MOD80_02232670, MOD80_02232718, MOD80_02232900 + .word MOD80_0223292C, MOD80_02232950, MOD80_02232A34, MOD80_02232A60 + .word MOD80_02232A84 .global MOD80_02237B48 MOD80_02237B48: ; 0x02237B48 @@ -19784,35 +19784,35 @@ MOD80_02237B64: ; 0x02237B64 .global MOD80_02237B84 MOD80_02237B84: ; 0x02237B84 - .byte 0xC5, 0x36, 0x23, 0x02, 0xF9, 0x36, 0x23, 0x02, 0x31, 0x3E, 0x23, 0x02, 0x85, 0x37, 0x23, 0x02 - .byte 0xBD, 0x37, 0x23, 0x02, 0x91, 0x38, 0x23, 0x02, 0x0D, 0x39, 0x23, 0x02, 0x6D, 0x3A, 0x23, 0x02 - .byte 0xC9, 0x3A, 0x23, 0x02, 0x01, 0x3B, 0x23, 0x02, 0xE9, 0x3B, 0x23, 0x02, 0x45, 0x3C, 0x23, 0x02 - .byte 0x7D, 0x3C, 0x23, 0x02, 0x8D, 0x3D, 0x23, 0x02, 0xB5, 0x3D, 0x23, 0x02, 0xD9, 0x3D, 0x23, 0x02 - .byte 0x85, 0x3E, 0x23, 0x02 + .word MOD80_022336C4, MOD80_022336F8, MOD80_02233E30, MOD80_02233784 + .word MOD80_022337BC, MOD80_02233890, MOD80_0223390C, MOD80_02233A6C + .word MOD80_02233AC8, MOD80_02233B00, MOD80_02233BE8, MOD80_02233C44 + .word MOD80_02233C7C, MOD80_02233D8C, MOD80_02233DB4, MOD80_02233DD8 + .word MOD80_02233E84 .global MOD80_02237BC8 MOD80_02237BC8: ; 0x02237BC8 - .byte 0xCD, 0x49, 0x23, 0x02, 0xCD, 0x51, 0x23, 0x02, 0xC1, 0x4A, 0x23, 0x02, 0xE5, 0x4A, 0x23, 0x02 - .byte 0x61, 0x4B, 0x23, 0x02, 0x75, 0x4B, 0x23, 0x02, 0xD1, 0x51, 0x23, 0x02, 0xD9, 0x4B, 0x23, 0x02 - .byte 0xF5, 0x4B, 0x23, 0x02, 0x8D, 0x4C, 0x23, 0x02, 0x9D, 0x4C, 0x23, 0x02, 0xE9, 0x51, 0x23, 0x02 - .byte 0xFD, 0x4C, 0x23, 0x02, 0x3D, 0x4D, 0x23, 0x02, 0xF9, 0x4D, 0x23, 0x02, 0x09, 0x4E, 0x23, 0x02 - .byte 0x01, 0x52, 0x23, 0x02, 0xAD, 0x52, 0x23, 0x02, 0xF1, 0x50, 0x23, 0x02, 0x59, 0x51, 0x23, 0x02 - .byte 0x69, 0x51, 0x23, 0x02, 0x15, 0x52, 0x23, 0x02, 0x2D, 0x52, 0x23, 0x02, 0x3D, 0x52, 0x23, 0x02 - .byte 0x69, 0x4E, 0x23, 0x02, 0x7D, 0x4E, 0x23, 0x02, 0x2D, 0x50, 0x23, 0x02, 0x41, 0x50, 0x23, 0x02 - .byte 0x19, 0x50, 0x23, 0x02, 0x99, 0x53, 0x23, 0x02, 0xB5, 0x53, 0x23, 0x02, 0xF5, 0x53, 0x23, 0x02 - .byte 0x11, 0x54, 0x23, 0x02, 0x31, 0x54, 0x23, 0x02, 0x55, 0x54, 0x23, 0x02, 0x71, 0x54, 0x23, 0x02 - .byte 0xBD, 0x54, 0x23, 0x02, 0x15, 0x55, 0x23, 0x02, 0x49, 0x53, 0x23, 0x02, 0x71, 0x53, 0x23, 0x02 + .word MOD80_022349CC, MOD80_022351CC, MOD80_02234AC0, MOD80_02234AE4 + .word MOD80_02234B60, MOD80_02234B74, MOD80_022351D0, MOD80_02234BD8 + .word MOD80_02234BF4, MOD80_02234C8C, MOD80_02234C9C, MOD80_022351E8 + .word MOD80_02234CFC, MOD80_02234D3C, MOD80_02234DF8, MOD80_02234E08 + .word MOD80_02235200, MOD80_022352AC, MOD80_022350F0, MOD80_02235158 + .word MOD80_02235168, MOD80_02235214, MOD80_0223522C, MOD80_0223523C + .word MOD80_02234E68, MOD80_02234E7C, MOD80_0223502C, MOD80_02235040 + .word MOD80_02235018, MOD80_02235398, MOD80_022353B4, MOD80_022353F4 + .word MOD80_02235410, MOD80_02235430, MOD80_02235454, MOD80_02235470 + .word MOD80_022354BC, MOD80_02235514, MOD80_02235348, MOD80_02235370 .global MOD80_02237C68 MOD80_02237C68: ; 0x02237C68 - .byte 0xC5, 0x66, 0x23, 0x02, 0xFD, 0x66, 0x23, 0x02, 0x71, 0x68, 0x23, 0x02, 0x91, 0x68, 0x23, 0x02 - .byte 0xFD, 0x68, 0x23, 0x02, 0x11, 0x69, 0x23, 0x02, 0xA9, 0x69, 0x23, 0x02, 0xF1, 0x69, 0x23, 0x02 - .byte 0x01, 0x6A, 0x23, 0x02, 0xDD, 0x6A, 0x23, 0x02, 0xE9, 0x6B, 0x23, 0x02, 0x3D, 0x6C, 0x23, 0x02 - .byte 0x19, 0x6B, 0x23, 0x02, 0x65, 0x67, 0x23, 0x02, 0x95, 0x67, 0x23, 0x02, 0xF9, 0x67, 0x23, 0x02 - .byte 0x25, 0x68, 0x23, 0x02, 0x45, 0x68, 0x23, 0x02, 0x09, 0x6C, 0x23, 0x02, 0x51, 0x6B, 0x23, 0x02 - .byte 0xC9, 0x6B, 0x23, 0x02, 0x8D, 0x6A, 0x23, 0x02, 0xAD, 0x6A, 0x23, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word MOD80_022366C4, MOD80_022366FC, MOD80_02236870, MOD80_02236890 + .word MOD80_022368FC, MOD80_02236910, MOD80_022369A8, MOD80_022369F0 + .word MOD80_02236A00, MOD80_02236ADC, MOD80_02236BE8, MOD80_02236C3C + .word MOD80_02236B18, MOD80_02236764, MOD80_02236794, MOD80_022367F8 + .word MOD80_02236824, MOD80_02236844, MOD80_02236C08, MOD80_02236B50 + .word MOD80_02236BC8, MOD80_02236A8C, MOD80_02236AAC, 0x00000000 + .word 0x00000000, 0x00000000, 0x00000000, 0x00000000 + .word 0x00000000, 0x00000000 .bss .global MOD80_02237CE0 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 33b046b7..8057d633 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -316,10 +316,10 @@ _022380E0: mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 -_022380E4: .word MOD81_0223CF90 +_022380E4: .word MOD81_0223CF84 + 0xC _022380E8: .word MOD81_0223CF84 -_022380EC: .word MOD81_0223CF88 -_022380F0: .word MOD81_0223CF8C +_022380EC: .word MOD81_0223CF84 + 4 +_022380F0: .word MOD81_0223CF84 + 8 thumb_func_end MOD81_02238064 thumb_func_start MOD81_022380F4 @@ -10351,25 +10351,13 @@ MOD81_0223CF74: ; 0x0223CF74 .global MOD81_0223CF84 MOD81_0223CF84: ; 0x0223CF84 - .byte 0x19, 0x8D, 0x23, 0x02 - - .global MOD81_0223CF88 -MOD81_0223CF88: ; 0x0223CF88 - .byte 0xC5, 0x8D, 0x23, 0x02 - - .global MOD81_0223CF8C -MOD81_0223CF8C: ; 0x0223CF8C - .byte 0x65, 0x8D, 0x23, 0x02 - - .global MOD81_0223CF90 -MOD81_0223CF90: ; 0x0223CF90 - .byte 0x03, 0x00, 0x00, 0x00, 0xE9, 0x96, 0x23, 0x02, 0xA9, 0x97, 0x23, 0x02, 0x55, 0x97, 0x23, 0x02 - .byte 0x03, 0x00, 0x00, 0x00, 0x99, 0xA8, 0x23, 0x02, 0xF9, 0xA8, 0x23, 0x02, 0xC9, 0xA8, 0x23, 0x02 - .byte 0x03, 0x00, 0x00, 0x00, 0xE9, 0xB0, 0x23, 0x02, 0x21, 0xB1, 0x23, 0x02, 0x0D, 0xB1, 0x23, 0x02 - .byte 0x01, 0x00, 0x00, 0x00, 0xE9, 0xB4, 0x23, 0x02, 0x55, 0xB5, 0x23, 0x02, 0x25, 0xB5, 0x23, 0x02 - .byte 0x05, 0x00, 0x00, 0x00, 0x19, 0xBD, 0x23, 0x02, 0x85, 0xBD, 0x23, 0x02, 0x4D, 0xBD, 0x23, 0x02 - .byte 0x05, 0x00, 0x00, 0x00, 0x31, 0xC5, 0x23, 0x02, 0xD5, 0xC5, 0x23, 0x02, 0x81, 0xC5, 0x23, 0x02 - .byte 0x05, 0x00, 0x00, 0x00 + .word MOD81_02238D18, MOD81_02238DC4, MOD81_02238D64, 0x00000003 + .word MOD81_022396E8, MOD81_022397A8, MOD81_02239754, 0x00000003 + .word MOD81_0223A898, MOD81_0223A8F8, MOD81_0223A8C8, 0x00000003 + .word MOD81_0223B0E8, MOD81_0223B120, MOD81_0223B10C, 0x00000001 + .word MOD81_0223B4E8, MOD81_0223B554, MOD81_0223B524, 0x00000005 + .word MOD81_0223BD18, MOD81_0223BD84, MOD81_0223BD4C, 0x00000005 + .word MOD81_0223C530, MOD81_0223C5D4, MOD81_0223C580, 0x00000005 .global MOD81_0223CFF4 MOD81_0223CFF4: ; 0x0223CFF4 @@ -10377,7 +10365,7 @@ MOD81_0223CFF4: ; 0x0223CFF4 .global MOD81_0223CFFC MOD81_0223CFFC: ; 0x0223CFFC - .byte 0x45, 0x8E, 0x23, 0x02, 0x69, 0x90, 0x23, 0x02, 0x95, 0x90, 0x23, 0x02, 0xF5, 0x91, 0x23, 0x02 + .word MOD81_02238E44, MOD81_02239068, MOD81_02239094, MOD81_022391F4 .global MOD81_0223D00C MOD81_0223D00C: ; 0x0223D00C @@ -10409,7 +10397,7 @@ MOD81_0223D084: ; 0x0223D084 .global MOD81_0223D094 MOD81_0223D094: ; 0x0223D094 - .byte 0x05, 0x98, 0x23, 0x02, 0x39, 0x98, 0x23, 0x02, 0x81, 0x98, 0x23, 0x02, 0x2D, 0x99, 0x23, 0x02 + .word MOD81_02239804, MOD81_02239838, MOD81_02239880, MOD81_0223992C .global MOD81_0223D0A4 MOD81_0223D0A4: ; 0x0223D0A4 @@ -10433,7 +10421,7 @@ MOD81_0223D0EC: ; 0x0223D0EC .global MOD81_0223D114 MOD81_0223D114: ; 0x0223D114 - .byte 0x51, 0xA9, 0x23, 0x02, 0x99, 0xA9, 0x23, 0x02 + .word MOD81_0223A950, MOD81_0223A998 .global MOD81_0223D11C MOD81_0223D11C: ; 0x0223D11C @@ -10456,7 +10444,7 @@ MOD81_0223D158: ; 0x0223D158 .global MOD81_0223D180 MOD81_0223D180: ; 0x0223D180 - .byte 0x51, 0xB1, 0x23, 0x02, 0x79, 0xB1, 0x23, 0x02 + .word MOD81_0223B150, MOD81_0223B178 .global MOD81_0223D188 MOD81_0223D188: ; 0x0223D188 @@ -10485,7 +10473,7 @@ MOD81_0223D1EC: ; 0x0223D1EC .global MOD81_0223D214 MOD81_0223D214: ; 0x0223D214 - .byte 0x85, 0xB5, 0x23, 0x02, 0xBD, 0xB5, 0x23, 0x02 + .word MOD81_0223B584, MOD81_0223B5BC .global MOD81_0223D21C MOD81_0223D21C: ; 0x0223D21C @@ -10512,7 +10500,7 @@ MOD81_0223D280: ; 0x0223D280 .global MOD81_0223D288 MOD81_0223D288: ; 0x0223D288 - .byte 0xF1, 0xBD, 0x23, 0x02, 0x21, 0xBE, 0x23, 0x02, 0xF1, 0xBE, 0x23, 0x02 + .word MOD81_0223BDF0, MOD81_0223BE20, MOD81_0223BEF0 .global MOD81_0223D294 MOD81_0223D294: ; 0x0223D294 @@ -10544,7 +10532,7 @@ MOD81_0223D314: ; 0x0223D314 .global MOD81_0223D31C MOD81_0223D31C: ; 0x0223D31C - .byte 0x59, 0xC6, 0x23, 0x02, 0x29, 0xC8, 0x23, 0x02, 0x55, 0xC8, 0x23, 0x02, 0x21, 0xC9, 0x23, 0x02 + .word MOD81_0223C658, MOD81_0223C828, MOD81_0223C854, MOD81_0223C920 .global MOD81_0223D32C MOD81_0223D32C: ; 0x0223D32C diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index b2a8f127..0d510f44 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -4520,33 +4520,33 @@ MOD82_0222F9C4: ; 0x0222F9C4 .global MOD82_0222FA0C MOD82_0222FA0C: ; 0x0222FA0C - .byte 0x51, 0xE0, 0x22, 0x02 + .word MOD82_0222E050 .global MOD82_0222FA10 MOD82_0222FA10: ; 0x0222FA10 - .byte 0x19, 0xE1, 0x22, 0x02 + .word MOD82_0222E118 .global MOD82_0222FA14 MOD82_0222FA14: ; 0x0222FA14 - .byte 0x39, 0xE1, 0x22, 0x02 + .word MOD82_0222E138 .global MOD82_0222FA18 MOD82_0222FA18: ; 0x0222FA18 - .byte 0x45, 0xE5, 0x22, 0x02, 0x75, 0xE5, 0x22, 0x02, 0x5D, 0xE6, 0x22, 0x02, 0x7D, 0xE6, 0x22, 0x02 - .byte 0xF5, 0xE6, 0x22, 0x02, 0x09, 0xE7, 0x22, 0x02, 0xA9, 0xE7, 0x22, 0x02, 0xE9, 0xE7, 0x22, 0x02 - .byte 0xF9, 0xE7, 0x22, 0x02, 0xB1, 0xE8, 0x22, 0x02, 0xC9, 0xE8, 0x22, 0x02, 0x59, 0xE9, 0x22, 0x02 - .byte 0x89, 0xE9, 0x22, 0x02, 0xCD, 0xE9, 0x22, 0x02, 0xA5, 0xEA, 0x22, 0x02, 0x41, 0xEB, 0x22, 0x02 - .byte 0x61, 0xEB, 0x22, 0x02, 0x4D, 0xEC, 0x22, 0x02, 0x11, 0xEB, 0x22, 0x02, 0x11, 0xF2, 0x22, 0x02 - .byte 0x41, 0xF2, 0x22, 0x02, 0x75, 0xF2, 0x22, 0x02, 0xA5, 0xF2, 0x22, 0x02, 0x89, 0xEC, 0x22, 0x02 - .byte 0xBD, 0xEC, 0x22, 0x02, 0x01, 0xED, 0x22, 0x02, 0xBD, 0xED, 0x22, 0x02, 0xF9, 0xED, 0x22, 0x02 - .byte 0x29, 0xEE, 0x22, 0x02, 0x75, 0xEE, 0x22, 0x02, 0x25, 0xEF, 0x22, 0x02, 0x55, 0xEF, 0x22, 0x02 - .byte 0x9D, 0xEF, 0x22, 0x02, 0x49, 0xF0, 0x22, 0x02, 0xA9, 0xF0, 0x22, 0x02, 0xC9, 0xF0, 0x22, 0x02 - .byte 0x95, 0xF1, 0x22, 0x02, 0xD9, 0xF1, 0x22, 0x02, 0xF1, 0xF1, 0x22, 0x02, 0xD9, 0xF2, 0x22, 0x02 - .byte 0x09, 0xF3, 0x22, 0x02, 0x25, 0xF3, 0x22, 0x02, 0x5D, 0xF3, 0x22, 0x02, 0xD1, 0xF1, 0x22, 0x02 - .byte 0x61, 0xF3, 0x22, 0x02, 0x51, 0xF4, 0x22, 0x02, 0xA5, 0xF4, 0x22, 0x02, 0x71, 0xF4, 0x22, 0x02 - .byte 0x91, 0xF3, 0x22, 0x02, 0xD9, 0xE5, 0x22, 0x02, 0x05, 0xE6, 0x22, 0x02, 0xBD, 0xF3, 0x22, 0x02 - .byte 0x31, 0xF4, 0x22, 0x02, 0x49, 0xF5, 0x22, 0x02, 0x71, 0xF5, 0x22, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word MOD82_0222E544, MOD82_0222E574, MOD82_0222E65C, MOD82_0222E67C + .word MOD82_0222E6F4, MOD82_0222E708, MOD82_0222E7A8, MOD82_0222E7E8 + .word MOD82_0222E7F8, MOD82_0222E8B0, MOD82_0222E8C8, MOD82_0222E958 + .word MOD82_0222E988, MOD82_0222E9CC, MOD82_0222EAA4, MOD82_0222EB40 + .word MOD82_0222EB60, MOD82_0222EC4C, MOD82_0222EB10, MOD82_0222F210 + .word MOD82_0222F240, MOD82_0222F274, MOD82_0222F2A4, MOD82_0222EC88 + .word MOD82_0222ECBC, MOD82_0222ED00, MOD82_0222EDBC, MOD82_0222EDF8 + .word MOD82_0222EE28, MOD82_0222EE74, MOD82_0222EF24, MOD82_0222EF54 + .word MOD82_0222EF9C, MOD82_0222F048, MOD82_0222F0A8, MOD82_0222F0C8 + .word MOD82_0222F194, MOD82_0222F1D8, MOD82_0222F1F0, MOD82_0222F2D8 + .word MOD82_0222F308, MOD82_0222F324, MOD82_0222F35C, MOD82_0222F1D0 + .word MOD82_0222F360, MOD82_0222F450, MOD82_0222F4A4, MOD82_0222F470 + .word MOD82_0222F390, MOD82_0222E5D8, MOD82_0222E604, MOD82_0222F3BC + .word MOD82_0222F430, MOD82_0222F548, MOD82_0222F570, 0x00000000 + .word 0x00000000, 0x00000000 .bss .global MOD82_0222FB00 diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index d3ee54a2..76c469d4 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -16199,54 +16199,106 @@ MOD85_021DED60: ; 0x021DED60 MOD85_021DED7C: ; 0x021DED7C .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xB0, 0x1D, 0x02, 0x7D, 0xB3, 0x1D, 0x02 - .byte 0x05, 0xB0, 0x1D, 0x02, 0x59, 0xB2, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02, 0x61, 0xB3, 0x1D, 0x02 - .byte 0x05, 0xB0, 0x1D, 0x02, 0x45, 0xB3, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD85_021DEDA4 +MOD85_021DEDA4: ; 0x021DEDA4 + .word MOD85_021DB004 + + .global MOD85_021DEDA8 +MOD85_021DEDA8: ; 0x021DEDA8 + .word MOD85_021DB37C + .word MOD85_021DB004 + + .global MOD85_021DEDB0 +MOD85_021DEDB0: ; 0x021DEDB0 + .word MOD85_021DB258, MOD85_021DB004 + + .global MOD85_021DEDB8 +MOD85_021DEDB8: ; 0x021DEDB8 + .word MOD85_021DB360 + .word MOD85_021DB004 + + .global MOD85_021DEDC0 +MOD85_021DEDC0: ; 0x021DEDC0 + .word MOD85_021DB344, MOD85_021DB004 .global MOD85_021DEDC8 MOD85_021DEDC8: ; 0x021DEDC8 - .byte 0x00, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x09, 0xB0, 0x1D, 0x02 - .byte 0x21, 0xB0, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02, 0xE9, 0xB1, 0x1D, 0x02, 0x15, 0xB2, 0x1D, 0x02 - .byte 0x05, 0xB0, 0x1D, 0x02, 0xA1, 0xAF, 0x1D, 0x02, 0xB9, 0xAF, 0x1D, 0x02, 0xDD, 0xAF, 0x1D, 0x02 - .byte 0x05, 0xB0, 0x1D, 0x02, 0x6D, 0xB1, 0x1D, 0x02, 0x8D, 0xB1, 0x1D, 0x02, 0xB9, 0xB1, 0x1D, 0x02 - .byte 0x05, 0xB0, 0x1D, 0x02 + .byte 0x00, 0x08, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + + .global MOD85_021DEDD4 +MOD85_021DEDD4: ; 0x021DEDD4 + .word MOD85_021DB008 + .word MOD85_021DB020, MOD85_021DB004 + + .global MOD85_021DEDE0 +MOD85_021DEDE0: ; 0x021DEDE0 + .word MOD85_021DB1E8, MOD85_021DB214 + .word MOD85_021DB004 + + .global MOD85_021DEDEC +MOD85_021DEDEC: ; 0x021DEDEC + .word MOD85_021DAFA0, MOD85_021DAFB8, MOD85_021DAFDC + .word MOD85_021DB004 + + .global MOD85_021DEDFC +MOD85_021DEDFC: ; 0x021DEDFC + .word MOD85_021DB16C, MOD85_021DB18C, MOD85_021DB1B8 + .word MOD85_021DB004 .global MOD85_021DEE0C MOD85_021DEE0C: ; 0x021DEE0C - .byte 0x24, 0x00, 0x00, 0x00, 0xC5, 0xB7, 0x1D, 0x02, 0xE9, 0xB7, 0x1D, 0x02, 0xF5, 0xB7, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000024, MOD85_021DB7C4, MOD85_021DB7E8, MOD85_021DB7F4 + .word FUN_02064794 .global MOD85_021DEE20 MOD85_021DEE20: ; 0x021DEE20 - .byte 0x8D, 0x93, 0x1D, 0x02, 0x91, 0x93, 0x1D, 0x02, 0xA9, 0x93, 0x1D, 0x02, 0x05, 0x94, 0x1D, 0x02 - .byte 0xAD, 0x94, 0x1D, 0x02 + .word MOD85_021D938C, MOD85_021D9390, MOD85_021D93A8, MOD85_021D9404 + .word MOD85_021D94AC .global MOD85_021DEE34 MOD85_021DEE34: ; 0x021DEE34 .byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00 - .byte 0x00, 0x00, 0x01, 0x00, 0xD5, 0xB0, 0x1D, 0x02, 0xF5, 0xB0, 0x1D, 0x02, 0x29, 0xB1, 0x1D, 0x02 - .byte 0x49, 0xB1, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02 + .byte 0x00, 0x00, 0x01, 0x00 + + .global MOD85_021DEE48 +MOD85_021DEE48: ; 0x021DEE48 + .word MOD85_021DB0D4, MOD85_021DB0F4, MOD85_021DB128 + .word MOD85_021DB148, MOD85_021DB004 .global MOD85_021DEE5C MOD85_021DEE5C: ; 0x021DEE5C - .byte 0x30, 0x00, 0x00, 0x00, 0xE5, 0xBA, 0x1D, 0x02, 0xFD, 0xBA, 0x1D, 0x02, 0x01, 0xBB, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02, 0x45, 0xB0, 0x1D, 0x02, 0x5D, 0xB0, 0x1D, 0x02, 0x89, 0xB0, 0x1D, 0x02 - .byte 0xB1, 0xB0, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02, 0x71, 0xB2, 0x1D, 0x02, 0x95, 0xB2, 0x1D, 0x02 - .byte 0xC9, 0xB2, 0x1D, 0x02, 0xFD, 0xB2, 0x1D, 0x02, 0x21, 0xB3, 0x1D, 0x02, 0x05, 0xB0, 0x1D, 0x02 + .word 0x00000030, MOD85_021DBAE4, MOD85_021DBAFC, MOD85_021DBB00 + .word FUN_02064794 + + .global MOD85_021DEE70 +MOD85_021DEE70: ; 0x021DEE70 + .word MOD85_021DB044, MOD85_021DB05C, MOD85_021DB088 + .word MOD85_021DB0B0, MOD85_021DB004 + + .global MOD85_021DEE84 +MOD85_021DEE84: ; 0x021DEE84 + .word MOD85_021DB270, MOD85_021DB294 + .word MOD85_021DB2C8, MOD85_021DB2FC, MOD85_021DB320, MOD85_021DB004 .global MOD85_021DEE9C MOD85_021DEE9C: ; 0x021DEE9C .byte 0x07, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00 - .byte 0x16, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x99, 0xB3, 0x1D, 0x02, 0xBD, 0xB3, 0x1D, 0x02 - .byte 0xF5, 0xB3, 0x1D, 0x02, 0x19, 0xB4, 0x1D, 0x02, 0x49, 0xB4, 0x1D, 0x02, 0x71, 0xB4, 0x1D, 0x02 - .byte 0x05, 0xB0, 0x1D, 0x02 + .byte 0x16, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00 + + .global MOD85_021DEEB4 +MOD85_021DEEB4: ; 0x021DEEB4 + .word MOD85_021DB398, MOD85_021DB3BC + .word MOD85_021DB3F4, MOD85_021DB418, MOD85_021DB448, MOD85_021DB470 + .word MOD85_021DB004 .global MOD85_021DEED0 MOD85_021DEED0: ; 0x021DEED0 - .byte 0xA4, 0xED, 0x1D, 0x02, 0xEC, 0xED, 0x1D, 0x02, 0xD4, 0xED, 0x1D, 0x02, 0x70, 0xEE, 0x1D, 0x02 - .byte 0x48, 0xEE, 0x1D, 0x02, 0xFC, 0xED, 0x1D, 0x02, 0xE0, 0xED, 0x1D, 0x02, 0xB0, 0xED, 0x1D, 0x02 - .byte 0x84, 0xEE, 0x1D, 0x02, 0xC0, 0xED, 0x1D, 0x02, 0xB8, 0xED, 0x1D, 0x02, 0xA8, 0xED, 0x1D, 0x02 - .byte 0xB4, 0xEE, 0x1D, 0x02 + .word MOD85_021DEDA4, MOD85_021DEDEC, MOD85_021DEDD4, MOD85_021DEE70 + .word MOD85_021DEE48, MOD85_021DEDFC, MOD85_021DEDE0, MOD85_021DEDB0 + .word MOD85_021DEE84, MOD85_021DEDC0, MOD85_021DEDB8, MOD85_021DEDA8 + .word MOD85_021DEEB4 .global MOD85_021DEF04 MOD85_021DEF04: ; 0x021DEF04 @@ -16262,22 +16314,22 @@ MOD85_021DEF04: ; 0x021DEF04 .global MOD85_021DEF94 MOD85_021DEF94: ; 0x021DEF94 - .byte 0x31, 0x82, 0x1D, 0x02, 0xA1, 0x82, 0x1D, 0x02, 0xFD, 0x82, 0x1D, 0x02, 0x31, 0x83, 0x1D, 0x02 - .byte 0xFD, 0x83, 0x1D, 0x02, 0x1D, 0x84, 0x1D, 0x02, 0x15, 0x85, 0x1D, 0x02, 0x4D, 0x85, 0x1D, 0x02 - .byte 0xB5, 0x85, 0x1D, 0x02, 0xC9, 0x85, 0x1D, 0x02, 0xE5, 0x85, 0x1D, 0x02, 0xFD, 0x85, 0x1D, 0x02 - .byte 0x1D, 0x86, 0x1D, 0x02, 0x4D, 0x86, 0x1D, 0x02, 0x95, 0x86, 0x1D, 0x02, 0xB5, 0x86, 0x1D, 0x02 - .byte 0x01, 0x87, 0x1D, 0x02, 0x29, 0x87, 0x1D, 0x02, 0x55, 0x87, 0x1D, 0x02, 0x6D, 0x87, 0x1D, 0x02 - .byte 0x9D, 0x87, 0x1D, 0x02, 0xE9, 0x87, 0x1D, 0x02, 0x11, 0x88, 0x1D, 0x02, 0x5D, 0x88, 0x1D, 0x02 - .byte 0x75, 0x88, 0x1D, 0x02, 0x8D, 0x88, 0x1D, 0x02, 0xF9, 0x88, 0x1D, 0x02, 0x55, 0x89, 0x1D, 0x02 - .byte 0x89, 0x89, 0x1D, 0x02, 0x31, 0x8A, 0x1D, 0x02, 0x51, 0x8A, 0x1D, 0x02, 0x49, 0x8B, 0x1D, 0x02 - .byte 0x81, 0x8B, 0x1D, 0x02, 0xC5, 0x8B, 0x1D, 0x02, 0xE1, 0x8B, 0x1D, 0x02, 0x01, 0x8C, 0x1D, 0x02 - .byte 0x31, 0x8C, 0x1D, 0x02, 0x51, 0x8C, 0x1D, 0x02, 0x71, 0x8C, 0x1D, 0x02, 0xAD, 0x8C, 0x1D, 0x02 - .byte 0xF9, 0x8C, 0x1D, 0x02, 0x25, 0x8D, 0x1D, 0x02, 0x3D, 0x8D, 0x1D, 0x02, 0x89, 0x8D, 0x1D, 0x02 - .byte 0xFD, 0x8D, 0x1D, 0x02, 0x65, 0x8E, 0x1D, 0x02, 0x99, 0x8E, 0x1D, 0x02, 0x89, 0x8F, 0x1D, 0x02 - .byte 0xB1, 0x8F, 0x1D, 0x02, 0xB1, 0x90, 0x1D, 0x02, 0xE9, 0x90, 0x1D, 0x02, 0x21, 0x91, 0x1D, 0x02 - .byte 0x45, 0x91, 0x1D, 0x02, 0x79, 0x91, 0x1D, 0x02, 0xA5, 0x91, 0x1D, 0x02, 0xD9, 0x91, 0x1D, 0x02 - .byte 0x25, 0x92, 0x1D, 0x02, 0x3D, 0x92, 0x1D, 0x02, 0x55, 0x92, 0x1D, 0x02, 0x85, 0x92, 0x1D, 0x02 - .byte 0x99, 0x92, 0x1D, 0x02, 0xAD, 0x92, 0x1D, 0x02, 0xC1, 0x92, 0x1D, 0x02, 0xDD, 0x92, 0x1D, 0x02 + .word MOD85_021D8230, MOD85_021D82A0, MOD85_021D82FC, MOD85_021D8330 + .word MOD85_021D83FC, MOD85_021D841C, MOD85_021D8514, MOD85_021D854C + .word MOD85_021D85B4, MOD85_021D85C8, MOD85_021D85E4, MOD85_021D85FC + .word MOD85_021D861C, MOD85_021D864C, MOD85_021D8694, MOD85_021D86B4 + .word MOD85_021D8700, MOD85_021D8728, MOD85_021D8754, MOD85_021D876C + .word MOD85_021D879C, MOD85_021D87E8, MOD85_021D8810, MOD85_021D885C + .word MOD85_021D8874, MOD85_021D888C, MOD85_021D88F8, MOD85_021D8954 + .word MOD85_021D8988, MOD85_021D8A30, MOD85_021D8A50, MOD85_021D8B48 + .word MOD85_021D8B80, MOD85_021D8BC4, MOD85_021D8BE0, MOD85_021D8C00 + .word MOD85_021D8C30, MOD85_021D8C50, MOD85_021D8C70, MOD85_021D8CAC + .word MOD85_021D8CF8, MOD85_021D8D24, MOD85_021D8D3C, MOD85_021D8D88 + .word MOD85_021D8DFC, MOD85_021D8E64, MOD85_021D8E98, MOD85_021D8F88 + .word MOD85_021D8FB0, MOD85_021D90B0, MOD85_021D90E8, MOD85_021D9120 + .word MOD85_021D9144, MOD85_021D9178, MOD85_021D91A4, MOD85_021D91D8 + .word MOD85_021D9224, MOD85_021D923C, MOD85_021D9254, MOD85_021D9284 + .word MOD85_021D9298, MOD85_021D92AC, MOD85_021D92C0, MOD85_021D92DC .global MOD85_021DF094 MOD85_021DF094: ; 0x021DF094 @@ -16363,11 +16415,39 @@ MOD85_021DF094: ; 0x021DF094 .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00 .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xBD, 0xD1, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02, 0x69, 0xD3, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02 - .byte 0xE5, 0xC9, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02, 0x01, 0xD3, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02 - .byte 0x99, 0xD2, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02, 0x89, 0xCF, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02 - .byte 0x25, 0xD2, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02, 0xB5, 0xC8, 0x1D, 0x02, 0x3D, 0xC9, 0x1D, 0x02 - .byte 0xDD, 0xC5, 0x1D, 0x02 + + .global MOD85_021DF5B4 +MOD85_021DF5B4: ; 0x021DF5B4 + .word MOD85_021DD1BC, MOD85_021DD004 + + .global MOD85_021DF5BC +MOD85_021DF5BC: ; 0x021DF5BC + .word MOD85_021DD368, MOD85_021DD004 + + .global MOD85_021DF5C4 +MOD85_021DF5C4: ; 0x021DF5C4 + .word MOD85_021DC9E4, MOD85_021DC5DC + + .global MOD85_021DF5CC +MOD85_021DF5CC: ; 0x021DF5CC + .word MOD85_021DD300, MOD85_021DD004 + + .global MOD85_021DF5D4 +MOD85_021DF5D4: ; 0x021DF5D4 + .word MOD85_021DD298, MOD85_021DD004 + + .global MOD85_021DF5DC +MOD85_021DF5DC: ; 0x021DF5DC + .word MOD85_021DCF88, MOD85_021DD004 + + .global MOD85_021DF5E4 +MOD85_021DF5E4: ; 0x021DF5E4 + .word MOD85_021DD224, MOD85_021DD004 + + .global MOD85_021DF5EC +MOD85_021DF5EC: ; 0x021DF5EC + .word MOD85_021DC8B4, MOD85_021DC93C + .word MOD85_021DC5DC .global MOD85_021DF5F8 MOD85_021DF5F8: ; 0x021DF5F8 @@ -16387,8 +16467,11 @@ MOD85_021DF61C: ; 0x021DF61C .global MOD85_021DF628 MOD85_021DF628: ; 0x021DF628 - .byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD1, 0xD3, 0x1D, 0x02 - .byte 0x3D, 0xD4, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02 + .byte 0x00, 0xC0, 0x06, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD85_021DF634 +MOD85_021DF634: ; 0x021DF634 + .word MOD85_021DD3D0, MOD85_021DD43C, MOD85_021DD004 .global MOD85_021DF640 MOD85_021DF640: ; 0x021DF640 @@ -16416,8 +16499,11 @@ MOD85_021DF67C: ; 0x021DF67C .global MOD85_021DF688 MOD85_021DF688: ; 0x021DF688 - .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0xC7, 0x1D, 0x02 - .byte 0x7D, 0xC7, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02 + .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD85_021DF694 +MOD85_021DF694: ; 0x021DF694 + .word MOD85_021DC714, MOD85_021DC77C, MOD85_021DC5DC .global MOD85_021DF6A0 MOD85_021DF6A0: ; 0x021DF6A0 @@ -16449,8 +16535,11 @@ MOD85_021DF6E8: ; 0x021DF6E8 .global MOD85_021DF6F4 MOD85_021DF6F4: ; 0x021DF6F4 - .byte 0x00, 0x40, 0x0B, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE1, 0xC7, 0x1D, 0x02 - .byte 0x49, 0xC8, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02 + .byte 0x00, 0x40, 0x0B, 0x00, 0x00, 0x40, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD85_021DF700 +MOD85_021DF700: ; 0x021DF700 + .word MOD85_021DC7E0, MOD85_021DC848, MOD85_021DC5DC .global MOD85_021DF70C MOD85_021DF70C: ; 0x021DF70C @@ -16490,8 +16579,11 @@ MOD85_021DF76C: ; 0x021DF76C .global MOD85_021DF778 MOD85_021DF778: ; 0x021DF778 - .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xC6, 0x1D, 0x02 - .byte 0xF9, 0xC6, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02 + .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD85_021DF784 +MOD85_021DF784: ; 0x021DF784 + .word MOD85_021DC6CC, MOD85_021DC6F8, MOD85_021DC5DC .global MOD85_021DF790 MOD85_021DF790: ; 0x021DF790 @@ -16507,8 +16599,11 @@ MOD85_021DF7A8: ; 0x021DF7A8 .global MOD85_021DF7B4 MOD85_021DF7B4: ; 0x021DF7B4 - .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF1, 0xD0, 0x1D, 0x02 - .byte 0x59, 0xD1, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02 + .byte 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD85_021DF7C0 +MOD85_021DF7C0: ; 0x021DF7C0 + .word MOD85_021DD0F0, MOD85_021DD158, MOD85_021DD004 .global MOD85_021DF7CC MOD85_021DF7CC: ; 0x021DF7CC @@ -16557,90 +16652,102 @@ MOD85_021DF850: ; 0x021DF850 .global MOD85_021DF85C MOD85_021DF85C: ; 0x021DF85C - .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0xD0, 0x1D, 0x02 - .byte 0x65, 0xD0, 0x1D, 0x02, 0xC5, 0xD0, 0x1D, 0x02, 0x05, 0xD0, 0x1D, 0x02, 0x85, 0xC5, 0x1D, 0x02 - .byte 0x99, 0xC5, 0x1D, 0x02, 0xA9, 0xC5, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02, 0xE1, 0xC5, 0x1D, 0x02 - .byte 0x49, 0xC6, 0x1D, 0x02, 0xB1, 0xC6, 0x1D, 0x02, 0xDD, 0xC5, 0x1D, 0x02 + .word 0x00001000, 0x00001000, 0x00000000 + + .global MOD85_021DF868 +MOD85_021DF868: ; 0x021DF868 + .word MOD85_021DD008 + .word MOD85_021DD064, MOD85_021DD0C4, MOD85_021DD004 + + .global MOD85_021DF878 +MOD85_021DF878: ; 0x021DF878 + .word MOD85_021DC584 + .word MOD85_021DC598, MOD85_021DC5A8, MOD85_021DC5DC + + .global MOD85_021DF888 +MOD85_021DF888: ; 0x021DF888 + .word MOD85_021DC5E0 + .word MOD85_021DC648, MOD85_021DC6B0, MOD85_021DC5DC .global MOD85_021DF898 MOD85_021DF898: ; 0x021DF898 - .byte 0x18, 0x00, 0x00, 0x00, 0xE5, 0xDC, 0x1D, 0x02, 0x4D, 0xDD, 0x1D, 0x02, 0x61, 0xDD, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000018, MOD85_021DDCE4, MOD85_021DDD4C, MOD85_021DDD60 + .word FUN_02064794 .global MOD85_021DF8AC MOD85_021DF8AC: ; 0x021DF8AC - .byte 0x20, 0x00, 0x00, 0x00, 0x19, 0xCC, 0x1D, 0x02, 0x2D, 0xCC, 0x1D, 0x02, 0x59, 0xCC, 0x1D, 0x02 - .byte 0xF9, 0xCC, 0x1D, 0x02 + .word 0x00000020, MOD85_021DCC18, MOD85_021DCC2C, MOD85_021DCC58 + .word MOD85_021DCCF8 .global MOD85_021DF8C0 MOD85_021DF8C0: ; 0x021DF8C0 - .byte 0x30, 0x00, 0x00, 0x00, 0x19, 0xCF, 0x1D, 0x02, 0x39, 0xCF, 0x1D, 0x02, 0x65, 0xCF, 0x1D, 0x02 - .byte 0x85, 0xCF, 0x1D, 0x02 + .word 0x00000030, MOD85_021DCF18, MOD85_021DCF38, MOD85_021DCF64 + .word MOD85_021DCF84 .global MOD85_021DF8D4 MOD85_021DF8D4: ; 0x021DF8D4 - .byte 0x48, 0x00, 0x00, 0x00, 0x85, 0xD5, 0x1D, 0x02, 0x99, 0xD5, 0x1D, 0x02, 0x25, 0xD6, 0x1D, 0x02 - .byte 0x81, 0xD9, 0x1D, 0x02 + .word 0x00000048, MOD85_021DD584, MOD85_021DD598, MOD85_021DD624 + .word MOD85_021DD980 .global MOD85_021DF8E8 MOD85_021DF8E8: ; 0x021DF8E8 - .byte 0x10, 0x00, 0x00, 0x00, 0xBD, 0xD9, 0x1D, 0x02, 0x09, 0xDA, 0x1D, 0x02, 0x15, 0xDA, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000010, MOD85_021DD9BC, MOD85_021DDA08, MOD85_021DDA14 + .word FUN_02064794 .global MOD85_021DF8FC MOD85_021DF8FC: ; 0x021DF8FC - .byte 0x40, 0x00, 0x00, 0x00, 0x49, 0xDE, 0x1D, 0x02, 0xB1, 0xDE, 0x1D, 0x02, 0xC9, 0xDE, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000040, MOD85_021DDE48, MOD85_021DDEB0, MOD85_021DDEC8 + .word FUN_02064794 .global MOD85_021DF910 MOD85_021DF910: ; 0x021DF910 - .byte 0x48, 0x00, 0x00, 0x00, 0x91, 0xE2, 0x1D, 0x02, 0xD1, 0xE2, 0x1D, 0x02, 0x11, 0xE3, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000048, MOD85_021DE290, MOD85_021DE2D0, MOD85_021DE310 + .word FUN_02064794 .global MOD85_021DF924 MOD85_021DF924: ; 0x021DF924 - .byte 0x14, 0x00, 0x00, 0x00, 0x61, 0xDA, 0x1D, 0x02, 0xF1, 0xDA, 0x1D, 0x02, 0xFD, 0xDA, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000014, MOD85_021DDA60, MOD85_021DDAF0, MOD85_021DDAFC + .word FUN_02064794 .global MOD85_021DF938 MOD85_021DF938: ; 0x021DF938 - .byte 0x18, 0x00, 0x00, 0x00, 0x69, 0xC1, 0x1D, 0x02, 0xC1, 0xC1, 0x1D, 0x02, 0xCD, 0xC1, 0x1D, 0x02 - .byte 0x49, 0xC2, 0x1D, 0x02 + .word 0x00000018, MOD85_021DC168, MOD85_021DC1C0, MOD85_021DC1CC + .word MOD85_021DC248 .global MOD85_021DF94C MOD85_021DF94C: ; 0x021DF94C - .byte 0x18, 0x00, 0x00, 0x00, 0xA1, 0xC2, 0x1D, 0x02, 0xF9, 0xC2, 0x1D, 0x02, 0x05, 0xC3, 0x1D, 0x02 - .byte 0x81, 0xC3, 0x1D, 0x02 + .word 0x00000018, MOD85_021DC2A0, MOD85_021DC2F8, MOD85_021DC304 + .word MOD85_021DC380 .global MOD85_021DF960 MOD85_021DF960: ; 0x021DF960 - .byte 0x18, 0x00, 0x00, 0x00, 0xD9, 0xC3, 0x1D, 0x02, 0x31, 0xC4, 0x1D, 0x02, 0x3D, 0xC4, 0x1D, 0x02 - .byte 0xB1, 0xC4, 0x1D, 0x02 + .word 0x00000018, MOD85_021DC3D8, MOD85_021DC430, MOD85_021DC43C + .word MOD85_021DC4B0 .global MOD85_021DF974 MOD85_021DF974: ; 0x021DF974 - .byte 0x48, 0x00, 0x00, 0x00, 0x2D, 0xC5, 0x1D, 0x02, 0x45, 0xC5, 0x1D, 0x02, 0x61, 0xC5, 0x1D, 0x02 - .byte 0x81, 0xC5, 0x1D, 0x02 + .word 0x00000048, MOD85_021DC52C, MOD85_021DC544, MOD85_021DC560 + .word MOD85_021DC580 .global MOD85_021DF988 MOD85_021DF988: ; 0x021DF988 - .byte 0x10, 0x00, 0x00, 0x00, 0x49, 0xDB, 0x1D, 0x02, 0x95, 0xDB, 0x1D, 0x02, 0xA1, 0xDB, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000010, MOD85_021DDB48, MOD85_021DDB94, MOD85_021DDBA0 + .word FUN_02064794 .global MOD85_021DF99C MOD85_021DF99C: ; 0x021DF99C - .byte 0x54, 0x00, 0x00, 0x00, 0x6D, 0xDF, 0x1D, 0x02, 0xE1, 0xE0, 0x1D, 0x02, 0x05, 0xE1, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000054, MOD85_021DDF6C, MOD85_021DE0E0, MOD85_021DE104 + .word FUN_02064794 .global MOD85_021DF9B0 MOD85_021DF9B0: ; 0x021DF9B0 - .byte 0x14, 0x00, 0x00, 0x00, 0xFD, 0xDB, 0x1D, 0x02, 0x8D, 0xDC, 0x1D, 0x02, 0x99, 0xDC, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000014, MOD85_021DDBFC, MOD85_021DDC8C, MOD85_021DDC98 + .word FUN_02064794 .global MOD85_021DF9C4 MOD85_021DF9C4: ; 0x021DF9C4 - .byte 0x30, 0x00, 0x00, 0x00, 0x5D, 0xE1, 0x1D, 0x02, 0x2D, 0xE2, 0x1D, 0x02, 0x51, 0xE2, 0x1D, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000030, MOD85_021DE15C, MOD85_021DE22C, MOD85_021DE250 + .word FUN_02064794 .global MOD85_021DF9D8 MOD85_021DF9D8: ; 0x021DF9D8 @@ -16649,8 +16756,8 @@ MOD85_021DF9D8: ; 0x021DF9D8 .global MOD85_021DF9F0 MOD85_021DF9F0: ; 0x021DF9F0 - .byte 0x78, 0xF8, 0x1D, 0x02, 0x88, 0xF8, 0x1D, 0x02, 0x84, 0xF7, 0x1D, 0x02, 0x94, 0xF6, 0x1D, 0x02 - .byte 0x00, 0xF7, 0x1D, 0x02, 0xEC, 0xF5, 0x1D, 0x02, 0xC4, 0xF5, 0x1D, 0x02 + .word MOD85_021DF878, MOD85_021DF888, MOD85_021DF784, MOD85_021DF694 + .word MOD85_021DF700, MOD85_021DF5EC, MOD85_021DF5C4 .global MOD85_021DFA0C MOD85_021DFA0C: ; 0x021DFA0C @@ -16674,9 +16781,9 @@ MOD85_021DFA6C: ; 0x021DFA6C .global MOD85_021DFA8C MOD85_021DFA8C: ; 0x021DFA8C - .byte 0xDC, 0xF5, 0x1D, 0x02, 0x68, 0xF8, 0x1D, 0x02, 0xC0, 0xF7, 0x1D, 0x02, 0xB4, 0xF5, 0x1D, 0x02 - .byte 0xE4, 0xF5, 0x1D, 0x02, 0xD4, 0xF5, 0x1D, 0x02, 0xCC, 0xF5, 0x1D, 0x02, 0xBC, 0xF5, 0x1D, 0x02 - .byte 0x34, 0xF6, 0x1D, 0x02 + .word MOD85_021DF5DC, MOD85_021DF868, MOD85_021DF7C0, MOD85_021DF5B4 + .word MOD85_021DF5E4, MOD85_021DF5D4, MOD85_021DF5CC, MOD85_021DF5BC + .word MOD85_021DF634 .global MOD85_021DFAB0 MOD85_021DFAB0: ; 0x021DFAB0 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 4da0d50e..e5b37065 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -184,7 +184,7 @@ _021D765C: and r0, r1 cmp r0, #2 beq _021D7678 - ldr r0, _021D76AC ; =0x021C48F8 + ldr r0, _021D76AC ; =UNK_021C48F8 ldrh r0, [r0, #0x20] cmp r0, #0 beq _021D76A0 @@ -214,7 +214,7 @@ _021D76A0: pop {r3, r4, r5, r6, pc} nop _021D76A8: .word gUnknown21C48B8 -_021D76AC: .word 0x021C48F8 +_021D76AC: .word UNK_021C48F8 thumb_func_end MOD86_021D758C thumb_func_start MOD86_021D76B0 diff --git a/files/.gitattributes b/files/.gitattributes index d827ef67..cc0c2f17 100644 --- a/files/.gitattributes +++ b/files/.gitattributes @@ -2,3 +2,4 @@ *.txt eol=crlf .knarcignore eol=lf .knarckeep eol=lf +*.pal eol=crlf diff --git a/files/data/.gitignore b/files/data/.gitignore new file mode 100644 index 00000000..e405595a --- /dev/null +++ b/files/data/.gitignore @@ -0,0 +1,2 @@ +cell0.NCGR +cell0.NCLR diff --git a/files/data/cell0.NCGR b/files/data/cell0.NCGR Binary files differdeleted file mode 100644 index 76a112b3..00000000 --- a/files/data/cell0.NCGR +++ /dev/null diff --git a/files/data/cell0.NCLR b/files/data/cell0.NCLR Binary files differdeleted file mode 100644 index 680c004b..00000000 --- a/files/data/cell0.NCLR +++ /dev/null diff --git a/files/data/cell0.png b/files/data/cell0.png Binary files differnew file mode 100644 index 00000000..bfd49d69 --- /dev/null +++ b/files/data/cell0.png diff --git a/files/demo/title/titledemo/.gitignore b/files/demo/title/titledemo/.gitignore new file mode 100644 index 00000000..b49b5cb3 --- /dev/null +++ b/files/demo/title/titledemo/.gitignore @@ -0,0 +1,4 @@ +narc_0001.NCGR +narc_0001.NCLR +narc_0003.NCGR +narc_0003.NCLR diff --git a/files/demo/title/titledemo/narc_0001.NCGR b/files/demo/title/titledemo/narc_0001.NCGR Binary files differdeleted file mode 100644 index b40573ef..00000000 --- a/files/demo/title/titledemo/narc_0001.NCGR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0001.png b/files/demo/title/titledemo/narc_0001.png Binary files differnew file mode 100644 index 00000000..09c9cd17 --- /dev/null +++ b/files/demo/title/titledemo/narc_0001.png diff --git a/files/demo/title/titledemo/narc_0002.NCLR b/files/demo/title/titledemo/narc_0002.NCLR Binary files differdeleted file mode 100644 index f38c8aef..00000000 --- a/files/demo/title/titledemo/narc_0002.NCLR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0003.NCGR b/files/demo/title/titledemo/narc_0003.NCGR Binary files differdeleted file mode 100644 index 007b734c..00000000 --- a/files/demo/title/titledemo/narc_0003.NCGR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0003.png b/files/demo/title/titledemo/narc_0003.png Binary files differnew file mode 100644 index 00000000..34db01e9 --- /dev/null +++ b/files/demo/title/titledemo/narc_0003.png diff --git a/files/demo/title/titledemo/narc_0004.NCLR b/files/demo/title/titledemo/narc_0004.NCLR Binary files differdeleted file mode 100644 index bf289579..00000000 --- a/files/demo/title/titledemo/narc_0004.NCLR +++ /dev/null diff --git a/files/graphic/bag_gra/.gitignore b/files/graphic/bag_gra/.gitignore new file mode 100644 index 00000000..6fc1835d --- /dev/null +++ b/files/graphic/bag_gra/.gitignore @@ -0,0 +1,6 @@ +narc_0002.NCGR +narc_0006.NCGR +narc_0035.NCLR +narc_0034.NCGR +narc_0003.NCLR +narc_0034.NCLR diff --git a/files/graphic/bag_gra/narc_0002.NCGR b/files/graphic/bag_gra/narc_0002.NCGR Binary files differdeleted file mode 100644 index a33c847c..00000000 --- a/files/graphic/bag_gra/narc_0002.NCGR +++ /dev/null diff --git a/files/graphic/bag_gra/narc_0002.png b/files/graphic/bag_gra/narc_0002.png Binary files differnew file mode 100644 index 00000000..9152a7e1 --- /dev/null +++ b/files/graphic/bag_gra/narc_0002.png diff --git a/files/graphic/bag_gra/narc_0003.NCLR b/files/graphic/bag_gra/narc_0003.NCLR Binary files differdeleted file mode 100644 index 4e6b57e1..00000000 --- a/files/graphic/bag_gra/narc_0003.NCLR +++ /dev/null diff --git a/files/graphic/bag_gra/narc_0003.pal b/files/graphic/bag_gra/narc_0003.pal new file mode 100644 index 00000000..45483a1e --- /dev/null +++ b/files/graphic/bag_gra/narc_0003.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 238 205 +238 164 106 +238 115 106 +230 90 90 +197 82 65 +156 57 57 +180 65 65 +82 82 82 +255 255 255 +115 115 115 +164 131 57 +238 213 106 +230 180 90 +197 164 65 +139 115 57 +115 90 49 diff --git a/files/graphic/bag_gra/narc_0006.NCGR b/files/graphic/bag_gra/narc_0006.NCGR Binary files differdeleted file mode 100644 index 3517cd01..00000000 --- a/files/graphic/bag_gra/narc_0006.NCGR +++ /dev/null diff --git a/files/graphic/bag_gra/narc_0006.png b/files/graphic/bag_gra/narc_0006.png Binary files differnew file mode 100644 index 00000000..a9982600 --- /dev/null +++ b/files/graphic/bag_gra/narc_0006.png diff --git a/files/graphic/bag_gra/narc_0034.NCGR b/files/graphic/bag_gra/narc_0034.NCGR Binary files differdeleted file mode 100644 index 55f4282b..00000000 --- a/files/graphic/bag_gra/narc_0034.NCGR +++ /dev/null diff --git a/files/graphic/bag_gra/narc_0034.png b/files/graphic/bag_gra/narc_0034.png Binary files differnew file mode 100644 index 00000000..ba296b4c --- /dev/null +++ b/files/graphic/bag_gra/narc_0034.png diff --git a/files/graphic/bag_gra/narc_0035.NCLR b/files/graphic/bag_gra/narc_0035.NCLR Binary files differdeleted file mode 100644 index 4e6b57e1..00000000 --- a/files/graphic/bag_gra/narc_0035.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore new file mode 100644 index 00000000..b87dd594 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/.gitignore @@ -0,0 +1,113 @@ +narc_0002.NCGR +narc_0002.NCLR +narc_0004.NCGR +narc_0004.NCLR +narc_0006.NCGR +narc_0006.NCLR +narc_0008.NCGR +narc_0008.NCLR +narc_0010.NCGR +narc_0010.NCLR +narc_0012.NCGR +narc_0012.NCLR +narc_0014.NCGR +narc_0014.NCLR +narc_0016.NCGR +narc_0016.NCLR +narc_0018.NCGR +narc_0018.NCLR +narc_0020.NCGR +narc_0021.NCGR +narc_0022.NCLR +narc_0023.NCGR +narc_0024.NCGR +narc_0025.NCLR +narc_0026.NCGR +narc_0027.NCLR +narc_0028.NCLR +narc_0029.NCLR +narc_0030.NCGR +narc_0031.NCLR +narc_0032.NCLR +narc_0033.NCGR +narc_0034.NCLR +narc_0035.NCLR +narc_0036.NCLR +narc_0037.NCLR +narc_0038.NCGR +narc_0038.NCLR +narc_0040.NCGR +narc_0041.NCGR +narc_0042.NCLR +narc_0043.NCGR +narc_0043.NCLR +narc_0045.NCGR +narc_0045.NCLR +narc_0047.NCGR +narc_0047.NCLR +narc_0049.NCGR +narc_0049.NCLR +narc_0051.NCGR +narc_0052.NCLR +narc_0053.NCGR +narc_0053.NCLR +narc_0055.NCLR +narc_0056.NCGR +narc_0056.NCLR +narc_0058.NCGR +narc_0059.NCLR +narc_0060.NCLR +narc_0061.NCLR +narc_0062.NCLR +narc_0063.NCGR +narc_0063.NCLR +narc_0065.NCGR +narc_0066.NCLR +narc_0067.NCLR +narc_0068.NCLR +narc_0069.NCLR +narc_0070.NCLR +narc_0071.NCGR +narc_0071.NCLR +narc_0073.NCGR +narc_0074.NCLR +narc_0075.NCLR +narc_0076.NCGR +narc_0076.NCLR +narc_0078.NCGR +narc_0079.NCLR +narc_0080.NCLR +narc_0081.NCLR +narc_0082.NCLR +narc_0083.NCGR +narc_0083.NCLR +narc_0085.NCGR +narc_0086.NCLR +narc_0087.NCLR +narc_0088.NCLR +narc_0089.NCLR +narc_0090.NCGR +narc_0090.NCLR +narc_0092.NCGR +narc_0092.NCLR +narc_0094.NCLR +narc_0095.NCGR +narc_0095.NCLR +narc_0097.NCLR +narc_0098.NCLR +narc_0099.NCLR +narc_0100.NCGR +narc_0101.NCLR +narc_0102.NCLR +narc_0103.NCLR +narc_0104.NCLR +narc_0105.NCGR +narc_0105.NCLR +narc_0107.NCGR +narc_0107.NCLR +narc_0109.NCGR +narc_0110.NCLR +narc_0111.NCLR +narc_0112.NCGR +narc_0112.NCLR +narc_0114.NCLR diff --git a/files/itemtool/itemdata/item_icon/narc_0002.NCGR b/files/itemtool/itemdata/item_icon/narc_0002.NCGR Binary files differdeleted file mode 100644 index 045a5e06..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0002.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0002.png b/files/itemtool/itemdata/item_icon/narc_0002.png Binary files differnew file mode 100644 index 00000000..bc9abe05 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0002.png diff --git a/files/itemtool/itemdata/item_icon/narc_0003.NCLR b/files/itemtool/itemdata/item_icon/narc_0003.NCLR Binary files differdeleted file mode 100644 index 701517a8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0003.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0004.NCGR b/files/itemtool/itemdata/item_icon/narc_0004.NCGR Binary files differdeleted file mode 100644 index 19b1164c..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0004.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0004.png b/files/itemtool/itemdata/item_icon/narc_0004.png Binary files differnew file mode 100644 index 00000000..2bebe147 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0004.png diff --git a/files/itemtool/itemdata/item_icon/narc_0005.NCLR b/files/itemtool/itemdata/item_icon/narc_0005.NCLR Binary files differdeleted file mode 100644 index bca61e37..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0005.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0006.NCGR b/files/itemtool/itemdata/item_icon/narc_0006.NCGR Binary files differdeleted file mode 100644 index 2e2983c0..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0006.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0006.png b/files/itemtool/itemdata/item_icon/narc_0006.png Binary files differnew file mode 100644 index 00000000..723b699a --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0006.png diff --git a/files/itemtool/itemdata/item_icon/narc_0007.NCLR b/files/itemtool/itemdata/item_icon/narc_0007.NCLR Binary files differdeleted file mode 100644 index 91f0132a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0007.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0008.NCGR b/files/itemtool/itemdata/item_icon/narc_0008.NCGR Binary files differdeleted file mode 100644 index 72d857a6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0008.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0008.png b/files/itemtool/itemdata/item_icon/narc_0008.png Binary files differnew file mode 100644 index 00000000..fb5e215e --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0008.png diff --git a/files/itemtool/itemdata/item_icon/narc_0009.NCLR b/files/itemtool/itemdata/item_icon/narc_0009.NCLR Binary files differdeleted file mode 100644 index f728f1ae..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0009.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0010.NCGR b/files/itemtool/itemdata/item_icon/narc_0010.NCGR Binary files differdeleted file mode 100644 index 56d27763..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0010.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0010.png b/files/itemtool/itemdata/item_icon/narc_0010.png Binary files differnew file mode 100644 index 00000000..38784263 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0010.png diff --git a/files/itemtool/itemdata/item_icon/narc_0011.NCLR b/files/itemtool/itemdata/item_icon/narc_0011.NCLR Binary files differdeleted file mode 100644 index 89c4675c..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0011.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0012.NCGR b/files/itemtool/itemdata/item_icon/narc_0012.NCGR Binary files differdeleted file mode 100644 index 0095fa60..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0012.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0012.png b/files/itemtool/itemdata/item_icon/narc_0012.png Binary files differnew file mode 100644 index 00000000..da0cf777 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0012.png diff --git a/files/itemtool/itemdata/item_icon/narc_0013.NCLR b/files/itemtool/itemdata/item_icon/narc_0013.NCLR Binary files differdeleted file mode 100644 index 3563296b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0013.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0014.NCGR b/files/itemtool/itemdata/item_icon/narc_0014.NCGR Binary files differdeleted file mode 100644 index b31b518f..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0014.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0014.png b/files/itemtool/itemdata/item_icon/narc_0014.png Binary files differnew file mode 100644 index 00000000..71a630d4 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0014.png diff --git a/files/itemtool/itemdata/item_icon/narc_0015.NCLR b/files/itemtool/itemdata/item_icon/narc_0015.NCLR Binary files differdeleted file mode 100644 index 9ba135dd..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0015.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0016.NCGR b/files/itemtool/itemdata/item_icon/narc_0016.NCGR Binary files differdeleted file mode 100644 index 5d75c234..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0016.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0016.png b/files/itemtool/itemdata/item_icon/narc_0016.png Binary files differnew file mode 100644 index 00000000..9f2ccb9d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0016.png diff --git a/files/itemtool/itemdata/item_icon/narc_0017.NCLR b/files/itemtool/itemdata/item_icon/narc_0017.NCLR Binary files differdeleted file mode 100644 index 74070d69..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0017.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0018.NCGR b/files/itemtool/itemdata/item_icon/narc_0018.NCGR Binary files differdeleted file mode 100644 index d580d3e4..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0018.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0018.png b/files/itemtool/itemdata/item_icon/narc_0018.png Binary files differnew file mode 100644 index 00000000..17e02bc4 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0018.png diff --git a/files/itemtool/itemdata/item_icon/narc_0019.NCLR b/files/itemtool/itemdata/item_icon/narc_0019.NCLR Binary files differdeleted file mode 100644 index 3cc3439e..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0019.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0020.NCGR b/files/itemtool/itemdata/item_icon/narc_0020.NCGR Binary files differdeleted file mode 100644 index ddd27891..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0020.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0020.png b/files/itemtool/itemdata/item_icon/narc_0020.png Binary files differnew file mode 100644 index 00000000..a046a23a --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0020.png diff --git a/files/itemtool/itemdata/item_icon/narc_0021.NCGR b/files/itemtool/itemdata/item_icon/narc_0021.NCGR Binary files differdeleted file mode 100644 index 9d93568a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0021.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0021.png b/files/itemtool/itemdata/item_icon/narc_0021.png Binary files differnew file mode 100644 index 00000000..ea3fed09 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0021.png diff --git a/files/itemtool/itemdata/item_icon/narc_0022.NCLR b/files/itemtool/itemdata/item_icon/narc_0022.NCLR Binary files differdeleted file mode 100644 index 6af27f80..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0022.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0022.pal b/files/itemtool/itemdata/item_icon/narc_0022.pal new file mode 100644 index 00000000..696a4b38 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0022.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +156 74 57 +180 82 57 +222 90 57 +255 148 57 +255 213 57 +230 180 106 +255 255 148 +213 156 49 +255 238 82 diff --git a/files/itemtool/itemdata/item_icon/narc_0023.NCGR b/files/itemtool/itemdata/item_icon/narc_0023.NCGR Binary files differdeleted file mode 100644 index c63b44d6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0023.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0023.png b/files/itemtool/itemdata/item_icon/narc_0023.png Binary files differnew file mode 100644 index 00000000..66913f94 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0023.png diff --git a/files/itemtool/itemdata/item_icon/narc_0024.NCGR b/files/itemtool/itemdata/item_icon/narc_0024.NCGR Binary files differdeleted file mode 100644 index df0ab48b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0024.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0024.png b/files/itemtool/itemdata/item_icon/narc_0024.png Binary files differnew file mode 100644 index 00000000..5abf90de --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0024.png diff --git a/files/itemtool/itemdata/item_icon/narc_0025.NCLR b/files/itemtool/itemdata/item_icon/narc_0025.NCLR Binary files differdeleted file mode 100644 index 04294c8a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0025.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0025.pal b/files/itemtool/itemdata/item_icon/narc_0025.pal new file mode 100644 index 00000000..d1c83395 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0025.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +164 131 205 +197 238 222 +255 255 255 +164 205 189 +131 98 172 +131 172 156 +230 255 255 +230 197 255 +82 123 106 +90 57 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0026.NCGR b/files/itemtool/itemdata/item_icon/narc_0026.NCGR Binary files differdeleted file mode 100644 index 74b77380..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0026.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0026.png b/files/itemtool/itemdata/item_icon/narc_0026.png Binary files differnew file mode 100644 index 00000000..b8541bf2 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0026.png diff --git a/files/itemtool/itemdata/item_icon/narc_0027.NCLR b/files/itemtool/itemdata/item_icon/narc_0027.NCLR Binary files differdeleted file mode 100644 index 56911461..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0027.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0027.pal b/files/itemtool/itemdata/item_icon/narc_0027.pal new file mode 100644 index 00000000..fc656170 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0027.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +255 238 98 +255 180 41 +255 213 74 +246 197 57 +255 255 180 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0028.NCLR b/files/itemtool/itemdata/item_icon/narc_0028.NCLR Binary files differdeleted file mode 100644 index 3b2de0f8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0028.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0028.pal b/files/itemtool/itemdata/item_icon/narc_0028.pal new file mode 100644 index 00000000..9ca16738 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0028.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +139 246 139 +82 189 82 +115 222 115 +106 213 106 +222 255 222 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0029.NCLR b/files/itemtool/itemdata/item_icon/narc_0029.NCLR Binary files differdeleted file mode 100644 index 7d9c6c89..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0029.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0029.pal b/files/itemtool/itemdata/item_icon/narc_0029.pal new file mode 100644 index 00000000..49a1b20b --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0029.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +255 189 180 +246 106 106 +246 164 164 +246 139 139 +255 222 222 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0030.NCGR b/files/itemtool/itemdata/item_icon/narc_0030.NCGR Binary files differdeleted file mode 100644 index 74b77380..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0030.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0030.png b/files/itemtool/itemdata/item_icon/narc_0030.png Binary files differnew file mode 100644 index 00000000..6976dc90 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0030.png diff --git a/files/itemtool/itemdata/item_icon/narc_0031.NCLR b/files/itemtool/itemdata/item_icon/narc_0031.NCLR Binary files differdeleted file mode 100644 index 61212a78..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0031.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0031.pal b/files/itemtool/itemdata/item_icon/narc_0031.pal new file mode 100644 index 00000000..b2984538 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0031.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +131 238 255 +74 180 197 +106 213 230 +90 197 213 +213 255 255 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0032.NCLR b/files/itemtool/itemdata/item_icon/narc_0032.NCLR Binary files differdeleted file mode 100644 index 3f997e97..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0032.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0032.pal b/files/itemtool/itemdata/item_icon/narc_0032.pal new file mode 100644 index 00000000..e19a72ca --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0032.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +255 255 148 +197 197 57 +238 238 98 +222 222 90 +255 255 213 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0033.NCGR b/files/itemtool/itemdata/item_icon/narc_0033.NCGR Binary files differdeleted file mode 100644 index 5f2f5ee5..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0033.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0033.png b/files/itemtool/itemdata/item_icon/narc_0033.png Binary files differnew file mode 100644 index 00000000..f6ace7d3 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0033.png diff --git a/files/itemtool/itemdata/item_icon/narc_0034.NCLR b/files/itemtool/itemdata/item_icon/narc_0034.NCLR Binary files differdeleted file mode 100644 index 50c925b9..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0034.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0034.pal b/files/itemtool/itemdata/item_icon/narc_0034.pal new file mode 100644 index 00000000..35de1c56 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0034.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +156 230 65 +172 255 148 +123 197 32 +90 123 49 +213 213 164 +148 148 98 +255 255 213 +255 255 230 +180 180 131 +238 238 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0035.NCLR b/files/itemtool/itemdata/item_icon/narc_0035.NCLR Binary files differdeleted file mode 100644 index cdaa41e2..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0035.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0035.pal b/files/itemtool/itemdata/item_icon/narc_0035.pal new file mode 100644 index 00000000..8ac59013 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0035.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +65 156 230 +148 172 255 +32 123 197 +49 90 123 +180 180 197 +115 115 131 +230 230 246 +246 255 246 +148 148 164 +205 205 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0036.NCLR b/files/itemtool/itemdata/item_icon/narc_0036.NCLR Binary files differdeleted file mode 100644 index 0183b36b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0036.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0036.pal b/files/itemtool/itemdata/item_icon/narc_0036.pal new file mode 100644 index 00000000..fda69e0b --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0036.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 131 205 +197 222 238 +255 255 255 +164 189 205 +255 98 172 +131 156 172 +230 255 255 +255 197 255 +82 106 123 +197 57 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0037.NCLR b/files/itemtool/itemdata/item_icon/narc_0037.NCLR Binary files differdeleted file mode 100644 index 660d239d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0037.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0037.pal b/files/itemtool/itemdata/item_icon/narc_0037.pal new file mode 100644 index 00000000..76e58020 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0037.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 131 131 +255 222 131 +255 255 238 +230 189 106 +197 98 90 +180 139 65 +255 246 180 +255 172 148 +148 106 49 +148 82 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0038.NCGR b/files/itemtool/itemdata/item_icon/narc_0038.NCGR Binary files differdeleted file mode 100644 index 99816ceb..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0038.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0038.png b/files/itemtool/itemdata/item_icon/narc_0038.png Binary files differnew file mode 100644 index 00000000..076c4fd5 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0038.png diff --git a/files/itemtool/itemdata/item_icon/narc_0039.NCLR b/files/itemtool/itemdata/item_icon/narc_0039.NCLR Binary files differdeleted file mode 100644 index 5abc1d68..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0039.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0040.NCGR b/files/itemtool/itemdata/item_icon/narc_0040.NCGR Binary files differdeleted file mode 100644 index 0bf54763..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0040.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0040.png b/files/itemtool/itemdata/item_icon/narc_0040.png Binary files differnew file mode 100644 index 00000000..2b5a5086 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0040.png diff --git a/files/itemtool/itemdata/item_icon/narc_0041.NCGR b/files/itemtool/itemdata/item_icon/narc_0041.NCGR Binary files differdeleted file mode 100644 index 4dfa8709..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0041.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0041.png b/files/itemtool/itemdata/item_icon/narc_0041.png Binary files differnew file mode 100644 index 00000000..987ca1be --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0041.png diff --git a/files/itemtool/itemdata/item_icon/narc_0042.NCLR b/files/itemtool/itemdata/item_icon/narc_0042.NCLR Binary files differdeleted file mode 100644 index b5d81020..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0042.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0042.pal b/files/itemtool/itemdata/item_icon/narc_0042.pal new file mode 100644 index 00000000..ec9f0478 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0042.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 246 197 +230 230 123 +164 164 57 +255 255 255 +74 74 0 +222 238 238 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0043.NCGR b/files/itemtool/itemdata/item_icon/narc_0043.NCGR Binary files differdeleted file mode 100644 index 29df88c9..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0043.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0043.png b/files/itemtool/itemdata/item_icon/narc_0043.png Binary files differnew file mode 100644 index 00000000..a9b7aae9 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0043.png diff --git a/files/itemtool/itemdata/item_icon/narc_0044.NCLR b/files/itemtool/itemdata/item_icon/narc_0044.NCLR Binary files differdeleted file mode 100644 index 3d36b70a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0044.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0045.NCGR b/files/itemtool/itemdata/item_icon/narc_0045.NCGR Binary files differdeleted file mode 100644 index ed50716d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0045.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0045.png b/files/itemtool/itemdata/item_icon/narc_0045.png Binary files differnew file mode 100644 index 00000000..08dd22f2 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0045.png diff --git a/files/itemtool/itemdata/item_icon/narc_0046.NCLR b/files/itemtool/itemdata/item_icon/narc_0046.NCLR Binary files differdeleted file mode 100644 index fe281d12..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0046.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0047.NCGR b/files/itemtool/itemdata/item_icon/narc_0047.NCGR Binary files differdeleted file mode 100644 index 71a3ee83..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0047.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0047.png b/files/itemtool/itemdata/item_icon/narc_0047.png Binary files differnew file mode 100644 index 00000000..e77fb5ea --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0047.png diff --git a/files/itemtool/itemdata/item_icon/narc_0048.NCLR b/files/itemtool/itemdata/item_icon/narc_0048.NCLR Binary files differdeleted file mode 100644 index 54c0443a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0048.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0049.NCGR b/files/itemtool/itemdata/item_icon/narc_0049.NCGR Binary files differdeleted file mode 100644 index 96797161..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0049.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0049.png b/files/itemtool/itemdata/item_icon/narc_0049.png Binary files differnew file mode 100644 index 00000000..ce892f9d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0049.png diff --git a/files/itemtool/itemdata/item_icon/narc_0050.NCLR b/files/itemtool/itemdata/item_icon/narc_0050.NCLR Binary files differdeleted file mode 100644 index 4cd9db27..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0050.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0051.NCGR b/files/itemtool/itemdata/item_icon/narc_0051.NCGR Binary files differdeleted file mode 100644 index 8487d213..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0051.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0051.png b/files/itemtool/itemdata/item_icon/narc_0051.png Binary files differnew file mode 100644 index 00000000..65c39cf7 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0051.png diff --git a/files/itemtool/itemdata/item_icon/narc_0052.NCLR b/files/itemtool/itemdata/item_icon/narc_0052.NCLR Binary files differdeleted file mode 100644 index e9cfec47..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0052.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0052.pal b/files/itemtool/itemdata/item_icon/narc_0052.pal new file mode 100644 index 00000000..e4a26470 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0052.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 246 +238 164 164 +148 148 82 +197 115 115 +222 222 156 +238 238 189 +115 65 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0053.NCGR b/files/itemtool/itemdata/item_icon/narc_0053.NCGR Binary files differdeleted file mode 100644 index d5b4a18a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0053.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0053.png b/files/itemtool/itemdata/item_icon/narc_0053.png Binary files differnew file mode 100644 index 00000000..a081274c --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0053.png diff --git a/files/itemtool/itemdata/item_icon/narc_0054.NCLR b/files/itemtool/itemdata/item_icon/narc_0054.NCLR Binary files differdeleted file mode 100644 index df463ef7..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0054.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0055.NCLR b/files/itemtool/itemdata/item_icon/narc_0055.NCLR Binary files differdeleted file mode 100644 index e1684620..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0055.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0055.pal b/files/itemtool/itemdata/item_icon/narc_0055.pal new file mode 100644 index 00000000..dfe2d317 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0055.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 230 205 +238 238 98 +57 123 57 +197 197 98 +90 172 90 +139 205 139 +115 115 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0056.NCGR b/files/itemtool/itemdata/item_icon/narc_0056.NCGR Binary files differdeleted file mode 100644 index 38d84b65..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0056.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0056.png b/files/itemtool/itemdata/item_icon/narc_0056.png Binary files differnew file mode 100644 index 00000000..021f36f8 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0056.png diff --git a/files/itemtool/itemdata/item_icon/narc_0057.NCLR b/files/itemtool/itemdata/item_icon/narc_0057.NCLR Binary files differdeleted file mode 100644 index b143cb13..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0057.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0058.NCGR b/files/itemtool/itemdata/item_icon/narc_0058.NCGR Binary files differdeleted file mode 100644 index 8eb49fbc..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0058.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0058.png b/files/itemtool/itemdata/item_icon/narc_0058.png Binary files differnew file mode 100644 index 00000000..e68fe9c4 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0058.png diff --git a/files/itemtool/itemdata/item_icon/narc_0059.NCLR b/files/itemtool/itemdata/item_icon/narc_0059.NCLR Binary files differdeleted file mode 100644 index 934feb0d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0059.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0059.pal b/files/itemtool/itemdata/item_icon/narc_0059.pal new file mode 100644 index 00000000..312f134f --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0059.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +213 230 230 +222 172 230 +189 139 197 +164 197 197 +131 82 139 +123 156 164 +230 255 255 +246 213 255 +74 41 98 +156 106 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0060.NCLR b/files/itemtool/itemdata/item_icon/narc_0060.NCLR Binary files differdeleted file mode 100644 index c1cf2ad5..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0060.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0060.pal b/files/itemtool/itemdata/item_icon/narc_0060.pal new file mode 100644 index 00000000..1e51e009 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0060.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 238 255 +189 255 156 +164 230 131 +205 205 222 +106 180 65 +164 164 180 +246 246 255 +222 255 213 +49 106 65 +131 197 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0061.NCLR b/files/itemtool/itemdata/item_icon/narc_0061.NCLR Binary files differdeleted file mode 100644 index 740926e9..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0061.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0061.pal b/files/itemtool/itemdata/item_icon/narc_0061.pal new file mode 100644 index 00000000..51096890 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0061.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +238 238 164 +255 189 156 +230 164 131 +205 205 131 +180 106 65 +164 164 90 +246 246 164 +255 222 213 +106 49 65 +197 131 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0062.NCLR b/files/itemtool/itemdata/item_icon/narc_0062.NCLR Binary files differdeleted file mode 100644 index 64019fbd..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0062.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0062.pal b/files/itemtool/itemdata/item_icon/narc_0062.pal new file mode 100644 index 00000000..61e3c34f --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0062.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 246 180 +156 255 255 +131 230 230 +238 238 156 +65 180 180 +213 213 90 +255 255 205 +213 255 255 +65 106 106 +115 197 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0063.NCGR b/files/itemtool/itemdata/item_icon/narc_0063.NCGR Binary files differdeleted file mode 100644 index d55c56df..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0063.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0063.png b/files/itemtool/itemdata/item_icon/narc_0063.png Binary files differnew file mode 100644 index 00000000..d4d5e349 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0063.png diff --git a/files/itemtool/itemdata/item_icon/narc_0064.NCLR b/files/itemtool/itemdata/item_icon/narc_0064.NCLR Binary files differdeleted file mode 100644 index 2ad0b03a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0064.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0065.NCGR b/files/itemtool/itemdata/item_icon/narc_0065.NCGR Binary files differdeleted file mode 100644 index 5a52f13c..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0065.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0065.png b/files/itemtool/itemdata/item_icon/narc_0065.png Binary files differnew file mode 100644 index 00000000..9ee018cd --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0065.png diff --git a/files/itemtool/itemdata/item_icon/narc_0066.NCLR b/files/itemtool/itemdata/item_icon/narc_0066.NCLR Binary files differdeleted file mode 100644 index 7014cc69..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0066.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0066.pal b/files/itemtool/itemdata/item_icon/narc_0066.pal new file mode 100644 index 00000000..2aa1aa0c --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0066.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +139 172 246 +74 106 172 +172 205 255 +106 139 222 +205 74 65 +205 115 106 +222 164 148 +164 74 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0067.NCLR b/files/itemtool/itemdata/item_icon/narc_0067.NCLR Binary files differdeleted file mode 100644 index 0773888b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0067.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0067.pal b/files/itemtool/itemdata/item_icon/narc_0067.pal new file mode 100644 index 00000000..d20ae449 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0067.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +230 230 115 +139 139 74 +238 238 172 +205 205 90 +74 205 65 +115 205 106 +164 222 148 +74 172 65 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0068.NCLR b/files/itemtool/itemdata/item_icon/narc_0068.NCLR Binary files differdeleted file mode 100644 index 8691a020..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0068.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0068.pal b/files/itemtool/itemdata/item_icon/narc_0068.pal new file mode 100644 index 00000000..9fec9ed1 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0068.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +246 172 139 +172 106 74 +255 205 172 +222 139 106 +65 74 205 +106 115 205 +148 164 222 +65 74 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0069.NCLR b/files/itemtool/itemdata/item_icon/narc_0069.NCLR Binary files differdeleted file mode 100644 index d42adc51..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0069.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0069.pal b/files/itemtool/itemdata/item_icon/narc_0069.pal new file mode 100644 index 00000000..93bdbd6e --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0069.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +115 115 115 +49 49 49 +148 148 148 +82 82 82 +222 222 98 +222 222 139 +238 238 189 +180 180 98 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0070.NCLR b/files/itemtool/itemdata/item_icon/narc_0070.NCLR Binary files differdeleted file mode 100644 index b1c784f6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0070.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0070.pal b/files/itemtool/itemdata/item_icon/narc_0070.pal new file mode 100644 index 00000000..6dffd6f7 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0070.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +230 230 230 +164 164 164 +230 230 230 +197 197 197 +222 98 222 +222 139 222 +238 189 238 +180 98 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0071.NCGR b/files/itemtool/itemdata/item_icon/narc_0071.NCGR Binary files differdeleted file mode 100644 index 1fbbca02..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0071.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0071.png b/files/itemtool/itemdata/item_icon/narc_0071.png Binary files differnew file mode 100644 index 00000000..7e5f9cb6 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0071.png diff --git a/files/itemtool/itemdata/item_icon/narc_0072.NCLR b/files/itemtool/itemdata/item_icon/narc_0072.NCLR Binary files differdeleted file mode 100644 index c8c90838..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0072.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0073.NCGR b/files/itemtool/itemdata/item_icon/narc_0073.NCGR Binary files differdeleted file mode 100644 index cd0a84ad..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0073.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0073.png b/files/itemtool/itemdata/item_icon/narc_0073.png Binary files differnew file mode 100644 index 00000000..50ff4eb8 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0073.png diff --git a/files/itemtool/itemdata/item_icon/narc_0074.NCLR b/files/itemtool/itemdata/item_icon/narc_0074.NCLR Binary files differdeleted file mode 100644 index 3a0b2bb1..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0074.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0074.pal b/files/itemtool/itemdata/item_icon/narc_0074.pal new file mode 100644 index 00000000..4b7ec0b8 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0074.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +222 222 106 +172 172 41 +98 98 24 +246 246 164 +156 156 156 +115 115 115 +205 205 205 +82 82 82 +222 222 222 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0075.NCLR b/files/itemtool/itemdata/item_icon/narc_0075.NCLR Binary files differdeleted file mode 100644 index e08ca8fc..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0075.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0075.pal b/files/itemtool/itemdata/item_icon/narc_0075.pal new file mode 100644 index 00000000..85e6fd59 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0075.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +238 205 131 +131 131 131 +197 164 82 +205 205 205 +238 238 238 +115 90 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0076.NCGR b/files/itemtool/itemdata/item_icon/narc_0076.NCGR Binary files differdeleted file mode 100644 index 54ffcd43..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0076.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0076.png b/files/itemtool/itemdata/item_icon/narc_0076.png Binary files differnew file mode 100644 index 00000000..6b99ab1f --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0076.png diff --git a/files/itemtool/itemdata/item_icon/narc_0077.NCLR b/files/itemtool/itemdata/item_icon/narc_0077.NCLR Binary files differdeleted file mode 100644 index bb493a41..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0077.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0078.NCGR b/files/itemtool/itemdata/item_icon/narc_0078.NCGR Binary files differdeleted file mode 100644 index eb58370b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0078.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0078.png b/files/itemtool/itemdata/item_icon/narc_0078.png Binary files differnew file mode 100644 index 00000000..1339baad --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0078.png diff --git a/files/itemtool/itemdata/item_icon/narc_0079.NCLR b/files/itemtool/itemdata/item_icon/narc_0079.NCLR Binary files differdeleted file mode 100644 index b36e4f46..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0079.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0079.pal b/files/itemtool/itemdata/item_icon/narc_0079.pal new file mode 100644 index 00000000..2c4c742b --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0079.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 148 139 +197 90 115 +90 8 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0080.NCLR b/files/itemtool/itemdata/item_icon/narc_0080.NCLR Binary files differdeleted file mode 100644 index d0b6912f..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0080.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0080.pal b/files/itemtool/itemdata/item_icon/narc_0080.pal new file mode 100644 index 00000000..acaf36f9 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0080.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +172 180 255 +115 90 197 +32 8 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0081.NCLR b/files/itemtool/itemdata/item_icon/narc_0081.NCLR Binary files differdeleted file mode 100644 index d5cdde93..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0081.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0081.pal b/files/itemtool/itemdata/item_icon/narc_0081.pal new file mode 100644 index 00000000..3e33880b --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0081.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 230 90 +197 172 65 +90 65 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0082.NCLR b/files/itemtool/itemdata/item_icon/narc_0082.NCLR Binary files differdeleted file mode 100644 index e7c51a31..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0082.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0082.pal b/files/itemtool/itemdata/item_icon/narc_0082.pal new file mode 100644 index 00000000..066162e0 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0082.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +148 246 139 +90 197 115 +8 90 32 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0083.NCGR b/files/itemtool/itemdata/item_icon/narc_0083.NCGR Binary files differdeleted file mode 100644 index 9455a7ef..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0083.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0083.png b/files/itemtool/itemdata/item_icon/narc_0083.png Binary files differnew file mode 100644 index 00000000..fcce914d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0083.png diff --git a/files/itemtool/itemdata/item_icon/narc_0084.NCLR b/files/itemtool/itemdata/item_icon/narc_0084.NCLR Binary files differdeleted file mode 100644 index 7b79fbec..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0084.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0085.NCGR b/files/itemtool/itemdata/item_icon/narc_0085.NCGR Binary files differdeleted file mode 100644 index d884ae88..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0085.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0085.png b/files/itemtool/itemdata/item_icon/narc_0085.png Binary files differnew file mode 100644 index 00000000..db5dd059 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0085.png diff --git a/files/itemtool/itemdata/item_icon/narc_0086.NCLR b/files/itemtool/itemdata/item_icon/narc_0086.NCLR Binary files differdeleted file mode 100644 index fa50e91b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0086.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0086.pal b/files/itemtool/itemdata/item_icon/narc_0086.pal new file mode 100644 index 00000000..913a87ea --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0086.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +197 98 98 +246 164 164 +139 65 65 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +246 164 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0087.NCLR b/files/itemtool/itemdata/item_icon/narc_0087.NCLR Binary files differdeleted file mode 100644 index 26c8e57a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0087.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0087.pal b/files/itemtool/itemdata/item_icon/narc_0087.pal new file mode 100644 index 00000000..44592f92 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0087.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +189 189 90 +246 246 164 +139 139 65 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +49 164 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0088.NCLR b/files/itemtool/itemdata/item_icon/narc_0088.NCLR Binary files differdeleted file mode 100644 index 790c698d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0088.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0088.pal b/files/itemtool/itemdata/item_icon/narc_0088.pal new file mode 100644 index 00000000..75ea0b5e --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0088.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +90 189 189 +164 246 246 +65 139 139 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +41 164 246 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0089.NCLR b/files/itemtool/itemdata/item_icon/narc_0089.NCLR Binary files differdeleted file mode 100644 index a9c3b20b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0089.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0089.pal b/files/itemtool/itemdata/item_icon/narc_0089.pal new file mode 100644 index 00000000..0a0100e2 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0089.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +213 131 74 +255 205 164 +180 106 49 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +246 65 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0090.NCGR b/files/itemtool/itemdata/item_icon/narc_0090.NCGR Binary files differdeleted file mode 100644 index 31e2976b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0090.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0090.png b/files/itemtool/itemdata/item_icon/narc_0090.png Binary files differnew file mode 100644 index 00000000..d0fa4924 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0090.png diff --git a/files/itemtool/itemdata/item_icon/narc_0091.NCLR b/files/itemtool/itemdata/item_icon/narc_0091.NCLR Binary files differdeleted file mode 100644 index 1291d15c..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0091.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0092.NCGR b/files/itemtool/itemdata/item_icon/narc_0092.NCGR Binary files differdeleted file mode 100644 index 794e3bb6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0092.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0092.png b/files/itemtool/itemdata/item_icon/narc_0092.png Binary files differnew file mode 100644 index 00000000..4cd0bf83 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0092.png diff --git a/files/itemtool/itemdata/item_icon/narc_0093.NCLR b/files/itemtool/itemdata/item_icon/narc_0093.NCLR Binary files differdeleted file mode 100644 index 70b2a48e..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0093.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0094.NCLR b/files/itemtool/itemdata/item_icon/narc_0094.NCLR Binary files differdeleted file mode 100644 index 0cc05bf1..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0094.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0094.pal b/files/itemtool/itemdata/item_icon/narc_0094.pal new file mode 100644 index 00000000..47293609 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0094.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +246 255 246 +148 90 57 +189 131 49 +238 205 106 +123 106 0 +189 148 41 +255 197 115 +197 222 197 +230 246 230 +172 197 172 +131 222 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0095.NCGR b/files/itemtool/itemdata/item_icon/narc_0095.NCGR Binary files differdeleted file mode 100644 index a72df0b6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0095.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0095.png b/files/itemtool/itemdata/item_icon/narc_0095.png Binary files differnew file mode 100644 index 00000000..ee852fe1 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0095.png diff --git a/files/itemtool/itemdata/item_icon/narc_0096.NCLR b/files/itemtool/itemdata/item_icon/narc_0096.NCLR Binary files differdeleted file mode 100644 index 520a43e8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0096.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0097.NCLR b/files/itemtool/itemdata/item_icon/narc_0097.NCLR Binary files differdeleted file mode 100644 index 699bb466..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0097.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0097.pal b/files/itemtool/itemdata/item_icon/narc_0097.pal new file mode 100644 index 00000000..ad5bd273 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0097.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 213 115 +74 164 74 +172 238 156 +255 255 255 +148 156 148 +213 230 213 +32 115 32 +222 255 230 +90 172 74 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0098.NCLR b/files/itemtool/itemdata/item_icon/narc_0098.NCLR Binary files differdeleted file mode 100644 index 9f90931d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0098.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0098.pal b/files/itemtool/itemdata/item_icon/narc_0098.pal new file mode 100644 index 00000000..402d5bc5 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0098.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 189 90 +180 131 49 +255 213 131 +255 255 255 +164 148 148 +238 213 189 +123 57 8 +255 230 205 +205 148 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0099.NCLR b/files/itemtool/itemdata/item_icon/narc_0099.NCLR Binary files differdeleted file mode 100644 index fc5fd0c2..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0099.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0099.pal b/files/itemtool/itemdata/item_icon/narc_0099.pal new file mode 100644 index 00000000..4976e562 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0099.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +230 131 123 +164 74 74 +238 156 172 +255 255 255 +156 148 148 +230 213 213 +131 49 49 +255 230 222 +197 98 115 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0100.NCGR b/files/itemtool/itemdata/item_icon/narc_0100.NCGR Binary files differdeleted file mode 100644 index e2d0ccb0..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0100.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0100.png b/files/itemtool/itemdata/item_icon/narc_0100.png Binary files differnew file mode 100644 index 00000000..a6091675 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0100.png diff --git a/files/itemtool/itemdata/item_icon/narc_0101.NCLR b/files/itemtool/itemdata/item_icon/narc_0101.NCLR Binary files differdeleted file mode 100644 index d8934247..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0101.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0101.pal b/files/itemtool/itemdata/item_icon/narc_0101.pal new file mode 100644 index 00000000..a76518db --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0101.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +123 131 230 +74 74 164 +172 156 238 +255 255 255 +148 148 156 +213 213 230 +57 57 139 +222 230 255 +115 98 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0102.NCLR b/files/itemtool/itemdata/item_icon/narc_0102.NCLR Binary files differdeleted file mode 100644 index 050b02a8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0102.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0102.pal b/files/itemtool/itemdata/item_icon/narc_0102.pal new file mode 100644 index 00000000..15138038 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0102.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +106 205 205 +74 156 156 +172 230 230 +255 255 255 +148 156 156 +213 230 230 +32 106 106 +222 255 255 +90 164 164 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0103.NCLR b/files/itemtool/itemdata/item_icon/narc_0103.NCLR Binary files differdeleted file mode 100644 index 7a35d504..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0103.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0103.pal b/files/itemtool/itemdata/item_icon/narc_0103.pal new file mode 100644 index 00000000..4c600d07 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0103.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 115 189 +164 82 148 +238 180 222 +255 255 255 +156 148 156 +230 213 230 +115 49 98 +255 230 246 +172 98 156 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0104.NCLR b/files/itemtool/itemdata/item_icon/narc_0104.NCLR Binary files differdeleted file mode 100644 index 003a56d1..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0104.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0104.pal b/files/itemtool/itemdata/item_icon/narc_0104.pal new file mode 100644 index 00000000..6f5bc3d4 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0104.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +205 205 106 +156 156 74 +230 230 172 +255 255 255 +156 156 148 +230 230 213 +106 106 32 +255 255 222 +164 164 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0105.NCGR b/files/itemtool/itemdata/item_icon/narc_0105.NCGR Binary files differdeleted file mode 100644 index 6c79368d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0105.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0105.png b/files/itemtool/itemdata/item_icon/narc_0105.png Binary files differnew file mode 100644 index 00000000..8f437a49 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0105.png diff --git a/files/itemtool/itemdata/item_icon/narc_0106.NCLR b/files/itemtool/itemdata/item_icon/narc_0106.NCLR Binary files differdeleted file mode 100644 index 6bafd934..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0106.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0107.NCGR b/files/itemtool/itemdata/item_icon/narc_0107.NCGR Binary files differdeleted file mode 100644 index 22704d94..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0107.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0107.png b/files/itemtool/itemdata/item_icon/narc_0107.png Binary files differnew file mode 100644 index 00000000..192a875d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0107.png diff --git a/files/itemtool/itemdata/item_icon/narc_0108.NCLR b/files/itemtool/itemdata/item_icon/narc_0108.NCLR Binary files differdeleted file mode 100644 index eabeeab8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0108.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0109.NCGR b/files/itemtool/itemdata/item_icon/narc_0109.NCGR Binary files differdeleted file mode 100644 index 7f43bfae..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0109.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0109.png b/files/itemtool/itemdata/item_icon/narc_0109.png Binary files differnew file mode 100644 index 00000000..dab3c620 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0109.png diff --git a/files/itemtool/itemdata/item_icon/narc_0110.NCLR b/files/itemtool/itemdata/item_icon/narc_0110.NCLR Binary files differdeleted file mode 100644 index e92ca175..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0110.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0110.pal b/files/itemtool/itemdata/item_icon/narc_0110.pal new file mode 100644 index 00000000..c9c48968 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0110.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +213 230 230 +180 197 197 +123 139 139 +0 0 0 +0 0 0 +213 189 189 +139 115 115 +0 0 0 +0 0 0 +0 0 0 +246 246 255 +148 148 172 +205 205 230 diff --git a/files/itemtool/itemdata/item_icon/narc_0111.NCLR b/files/itemtool/itemdata/item_icon/narc_0111.NCLR Binary files differdeleted file mode 100644 index 408583d7..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0111.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0111.pal b/files/itemtool/itemdata/item_icon/narc_0111.pal new file mode 100644 index 00000000..1946607d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0111.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +213 230 230 +180 197 197 +123 139 139 +0 0 0 +0 0 0 +213 205 189 +139 131 115 +0 0 0 +0 0 0 +0 0 0 +255 246 230 +189 172 106 +246 230 164 diff --git a/files/itemtool/itemdata/item_icon/narc_0112.NCGR b/files/itemtool/itemdata/item_icon/narc_0112.NCGR Binary files differdeleted file mode 100644 index 5a495cbb..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0112.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0112.png b/files/itemtool/itemdata/item_icon/narc_0112.png Binary files differnew file mode 100644 index 00000000..44d5c064 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0112.png diff --git a/files/itemtool/itemdata/item_icon/narc_0113.NCLR b/files/itemtool/itemdata/item_icon/narc_0113.NCLR Binary files differdeleted file mode 100644 index 12b0d170..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0113.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0114.NCLR b/files/itemtool/itemdata/item_icon/narc_0114.NCLR Binary files differdeleted file mode 100644 index 3d35e0db..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0114.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0114.pal b/files/itemtool/itemdata/item_icon/narc_0114.pal new file mode 100644 index 00000000..c7ef0931 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0114.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +213 230 230 +180 197 197 +123 139 139 +0 0 0 +0 0 0 +230 90 57 +189 49 16 +0 0 0 +0 0 0 +0 0 0 +139 230 139 +49 123 49 +82 180 82 diff --git a/filesystem.mk b/filesystem.mk index 180845ac..1be7b682 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -794,6 +794,13 @@ files/wazaeffect/effectclact/wecellanm.narc: \ files/wazaeffect/effectclact/wecellanm/narc_0013.NANR.lz \ files/wazaeffect/effectclact/wecellanm/narc_0007.NANR.lz +files/graphic/bag_gra.narc: \ + files/graphic/bag_gra/narc_0002.NCGR \ + files/graphic/bag_gra/narc_0003.NCLR \ + files/graphic/bag_gra/narc_0006.NCGR \ + files/graphic/bag_gra/narc_0034.NCGR \ + files/graphic/bag_gra/narc_0034.NCLR + files/graphic/box.narc: \ files/graphic/box/narc_0022.NANR.lz \ files/graphic/box/narc_0036.NSCR.lz \ @@ -1552,6 +1559,122 @@ files/poketool/pokefoot/pokefoot.narc: \ files/poketool/pokefoot/pokefoot/narc_0371.NCGR.lz \ files/poketool/pokefoot/pokefoot/narc_0359.NCGR.lz +files/itemtool/itemdata/item_icon.narc: \ + files/itemtool/itemdata/item_icon/narc_0002.NCGR \ + files/itemtool/itemdata/item_icon/narc_0002.NCLR \ + files/itemtool/itemdata/item_icon/narc_0004.NCGR \ + files/itemtool/itemdata/item_icon/narc_0004.NCLR \ + files/itemtool/itemdata/item_icon/narc_0006.NCGR \ + files/itemtool/itemdata/item_icon/narc_0006.NCLR \ + files/itemtool/itemdata/item_icon/narc_0008.NCGR \ + files/itemtool/itemdata/item_icon/narc_0008.NCLR \ + files/itemtool/itemdata/item_icon/narc_0010.NCGR \ + files/itemtool/itemdata/item_icon/narc_0010.NCLR \ + files/itemtool/itemdata/item_icon/narc_0012.NCGR \ + files/itemtool/itemdata/item_icon/narc_0012.NCLR \ + files/itemtool/itemdata/item_icon/narc_0014.NCGR \ + files/itemtool/itemdata/item_icon/narc_0014.NCLR \ + files/itemtool/itemdata/item_icon/narc_0016.NCGR \ + files/itemtool/itemdata/item_icon/narc_0016.NCLR \ + files/itemtool/itemdata/item_icon/narc_0018.NCGR \ + files/itemtool/itemdata/item_icon/narc_0018.NCLR \ + files/itemtool/itemdata/item_icon/narc_0020.NCGR \ + files/itemtool/itemdata/item_icon/narc_0021.NCGR \ + files/itemtool/itemdata/item_icon/narc_0022.NCLR \ + files/itemtool/itemdata/item_icon/narc_0023.NCGR \ + files/itemtool/itemdata/item_icon/narc_0024.NCGR \ + files/itemtool/itemdata/item_icon/narc_0025.NCLR \ + files/itemtool/itemdata/item_icon/narc_0026.NCGR \ + files/itemtool/itemdata/item_icon/narc_0027.NCLR \ + files/itemtool/itemdata/item_icon/narc_0028.NCLR \ + files/itemtool/itemdata/item_icon/narc_0029.NCLR \ + files/itemtool/itemdata/item_icon/narc_0030.NCGR \ + files/itemtool/itemdata/item_icon/narc_0031.NCLR \ + files/itemtool/itemdata/item_icon/narc_0032.NCLR \ + files/itemtool/itemdata/item_icon/narc_0033.NCGR \ + files/itemtool/itemdata/item_icon/narc_0034.NCLR \ + files/itemtool/itemdata/item_icon/narc_0035.NCLR \ + files/itemtool/itemdata/item_icon/narc_0036.NCLR \ + files/itemtool/itemdata/item_icon/narc_0037.NCLR \ + files/itemtool/itemdata/item_icon/narc_0038.NCGR \ + files/itemtool/itemdata/item_icon/narc_0038.NCLR \ + files/itemtool/itemdata/item_icon/narc_0040.NCGR \ + files/itemtool/itemdata/item_icon/narc_0041.NCGR \ + files/itemtool/itemdata/item_icon/narc_0042.NCLR \ + files/itemtool/itemdata/item_icon/narc_0043.NCGR \ + files/itemtool/itemdata/item_icon/narc_0043.NCLR \ + files/itemtool/itemdata/item_icon/narc_0045.NCGR \ + files/itemtool/itemdata/item_icon/narc_0045.NCLR \ + files/itemtool/itemdata/item_icon/narc_0047.NCGR \ + files/itemtool/itemdata/item_icon/narc_0047.NCLR \ + files/itemtool/itemdata/item_icon/narc_0049.NCGR \ + files/itemtool/itemdata/item_icon/narc_0049.NCLR \ + files/itemtool/itemdata/item_icon/narc_0051.NCGR \ + files/itemtool/itemdata/item_icon/narc_0052.NCLR \ + files/itemtool/itemdata/item_icon/narc_0053.NCGR \ + files/itemtool/itemdata/item_icon/narc_0053.NCLR \ + files/itemtool/itemdata/item_icon/narc_0055.NCLR \ + files/itemtool/itemdata/item_icon/narc_0056.NCGR \ + files/itemtool/itemdata/item_icon/narc_0056.NCLR \ + files/itemtool/itemdata/item_icon/narc_0058.NCGR \ + files/itemtool/itemdata/item_icon/narc_0059.NCLR \ + files/itemtool/itemdata/item_icon/narc_0060.NCLR \ + files/itemtool/itemdata/item_icon/narc_0061.NCLR \ + files/itemtool/itemdata/item_icon/narc_0062.NCLR \ + files/itemtool/itemdata/item_icon/narc_0063.NCGR \ + files/itemtool/itemdata/item_icon/narc_0063.NCLR \ + files/itemtool/itemdata/item_icon/narc_0065.NCGR \ + files/itemtool/itemdata/item_icon/narc_0066.NCLR \ + files/itemtool/itemdata/item_icon/narc_0067.NCLR \ + files/itemtool/itemdata/item_icon/narc_0068.NCLR \ + files/itemtool/itemdata/item_icon/narc_0069.NCLR \ + files/itemtool/itemdata/item_icon/narc_0070.NCLR \ + files/itemtool/itemdata/item_icon/narc_0071.NCGR \ + files/itemtool/itemdata/item_icon/narc_0071.NCLR \ + files/itemtool/itemdata/item_icon/narc_0073.NCGR \ + files/itemtool/itemdata/item_icon/narc_0074.NCLR \ + files/itemtool/itemdata/item_icon/narc_0075.NCLR \ + files/itemtool/itemdata/item_icon/narc_0076.NCGR \ + files/itemtool/itemdata/item_icon/narc_0076.NCLR \ + files/itemtool/itemdata/item_icon/narc_0078.NCGR \ + files/itemtool/itemdata/item_icon/narc_0079.NCLR \ + files/itemtool/itemdata/item_icon/narc_0080.NCLR \ + files/itemtool/itemdata/item_icon/narc_0081.NCLR \ + files/itemtool/itemdata/item_icon/narc_0082.NCLR \ + files/itemtool/itemdata/item_icon/narc_0083.NCGR \ + files/itemtool/itemdata/item_icon/narc_0083.NCLR \ + files/itemtool/itemdata/item_icon/narc_0085.NCGR \ + files/itemtool/itemdata/item_icon/narc_0086.NCLR \ + files/itemtool/itemdata/item_icon/narc_0087.NCLR \ + files/itemtool/itemdata/item_icon/narc_0088.NCLR \ + files/itemtool/itemdata/item_icon/narc_0089.NCLR \ + files/itemtool/itemdata/item_icon/narc_0090.NCGR \ + files/itemtool/itemdata/item_icon/narc_0090.NCLR \ + files/itemtool/itemdata/item_icon/narc_0092.NCGR \ + files/itemtool/itemdata/item_icon/narc_0092.NCLR \ + files/itemtool/itemdata/item_icon/narc_0094.NCLR \ + files/itemtool/itemdata/item_icon/narc_0095.NCGR \ + files/itemtool/itemdata/item_icon/narc_0095.NCLR \ + files/itemtool/itemdata/item_icon/narc_0097.NCLR \ + files/itemtool/itemdata/item_icon/narc_0098.NCLR \ + files/itemtool/itemdata/item_icon/narc_0099.NCLR \ + files/itemtool/itemdata/item_icon/narc_0100.NCGR \ + files/itemtool/itemdata/item_icon/narc_0101.NCLR \ + files/itemtool/itemdata/item_icon/narc_0102.NCLR \ + files/itemtool/itemdata/item_icon/narc_0103.NCLR \ + files/itemtool/itemdata/item_icon/narc_0104.NCLR \ + files/itemtool/itemdata/item_icon/narc_0105.NCGR \ + files/itemtool/itemdata/item_icon/narc_0105.NCLR \ + files/itemtool/itemdata/item_icon/narc_0107.NCGR \ + files/itemtool/itemdata/item_icon/narc_0107.NCLR \ + files/itemtool/itemdata/item_icon/narc_0109.NCGR \ + files/itemtool/itemdata/item_icon/narc_0110.NCLR \ + files/itemtool/itemdata/item_icon/narc_0111.NCLR \ + files/itemtool/itemdata/item_icon/narc_0112.NCGR \ + files/itemtool/itemdata/item_icon/narc_0112.NCLR \ + files/itemtool/itemdata/item_icon/narc_0114.NCLR + + files/application/custom_ball/data/cb_data.narc: \ files/application/custom_ball/data/cb_data/narc_0195.NCGR.lz \ files/application/custom_ball/data/cb_data/narc_0181.NCER.lz \ @@ -2096,6 +2219,12 @@ files/data/namein.narc: \ files/data/namein/narc_0013.NCER.lz \ files/data/namein/narc_0007.NSCR.lz +files/demo/title/titledemo.narc: \ + files/demo/title/titledemo/narc_0001.NCGR \ + files/demo/title/titledemo/narc_0001.NCLR \ + files/demo/title/titledemo/narc_0003.NCGR \ + files/demo/title/titledemo/narc_0003.NCLR + .PHONY: filesystem filesystem: $(HOSTFS_FILES) diff --git a/graphics_rules.mk b/graphics_rules.mk new file mode 100644 index 00000000..fba3be06 --- /dev/null +++ b/graphics_rules.mk @@ -0,0 +1,213 @@ +#todo data/dp_areawindow.NCGR (weirdness with size) +#todo data/graphic/bag_gra/narc_0007.NCGR (SOPC section) (width 32, palette narc_0003.NCLR) +#todo data/demo/title/titledemo/narc_0007.NCGR (weidness with size, needs investigating) + +CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR + +CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \ + files/graphic/bag_gra/narc_0006.NCGR \ + files/graphic/bag_gra/narc_0034.NCGR \ + files/itemtool/itemdata/item_icon/narc_0002.NCGR \ + files/itemtool/itemdata/item_icon/narc_0004.NCGR \ + files/itemtool/itemdata/item_icon/narc_0006.NCGR \ + files/itemtool/itemdata/item_icon/narc_0008.NCGR \ + files/itemtool/itemdata/item_icon/narc_0010.NCGR \ + files/itemtool/itemdata/item_icon/narc_0012.NCGR \ + files/itemtool/itemdata/item_icon/narc_0014.NCGR \ + files/itemtool/itemdata/item_icon/narc_0016.NCGR \ + files/itemtool/itemdata/item_icon/narc_0018.NCGR \ + files/itemtool/itemdata/item_icon/narc_0020.NCGR \ + files/itemtool/itemdata/item_icon/narc_0021.NCGR \ + files/itemtool/itemdata/item_icon/narc_0023.NCGR \ + files/itemtool/itemdata/item_icon/narc_0024.NCGR \ + files/itemtool/itemdata/item_icon/narc_0026.NCGR \ + files/itemtool/itemdata/item_icon/narc_0030.NCGR \ + files/itemtool/itemdata/item_icon/narc_0033.NCGR \ + files/itemtool/itemdata/item_icon/narc_0038.NCGR \ + files/itemtool/itemdata/item_icon/narc_0040.NCGR \ + files/itemtool/itemdata/item_icon/narc_0041.NCGR \ + files/itemtool/itemdata/item_icon/narc_0043.NCGR \ + files/itemtool/itemdata/item_icon/narc_0045.NCGR \ + files/itemtool/itemdata/item_icon/narc_0047.NCGR \ + files/itemtool/itemdata/item_icon/narc_0049.NCGR \ + files/itemtool/itemdata/item_icon/narc_0051.NCGR \ + files/itemtool/itemdata/item_icon/narc_0053.NCGR \ + files/itemtool/itemdata/item_icon/narc_0056.NCGR \ + files/itemtool/itemdata/item_icon/narc_0058.NCGR \ + files/itemtool/itemdata/item_icon/narc_0063.NCGR \ + files/itemtool/itemdata/item_icon/narc_0065.NCGR \ + files/itemtool/itemdata/item_icon/narc_0071.NCGR \ + files/itemtool/itemdata/item_icon/narc_0073.NCGR \ + files/itemtool/itemdata/item_icon/narc_0076.NCGR \ + files/itemtool/itemdata/item_icon/narc_0078.NCGR \ + files/itemtool/itemdata/item_icon/narc_0083.NCGR \ + files/itemtool/itemdata/item_icon/narc_0085.NCGR \ + files/itemtool/itemdata/item_icon/narc_0090.NCGR \ + files/itemtool/itemdata/item_icon/narc_0092.NCGR \ + files/itemtool/itemdata/item_icon/narc_0095.NCGR \ + files/itemtool/itemdata/item_icon/narc_0100.NCGR \ + files/itemtool/itemdata/item_icon/narc_0105.NCGR \ + files/itemtool/itemdata/item_icon/narc_0107.NCGR \ + files/itemtool/itemdata/item_icon/narc_0109.NCGR \ + files/itemtool/itemdata/item_icon/narc_0112.NCGR + +IR_NCLR_FILES := files/itemtool/itemdata/item_icon/narc_0028.NCLR \ + files/itemtool/itemdata/item_icon/narc_0029.NCLR \ + files/itemtool/itemdata/item_icon/narc_0032.NCLR \ + files/itemtool/itemdata/item_icon/narc_0035.NCLR \ + files/itemtool/itemdata/item_icon/narc_0036.NCLR \ + files/itemtool/itemdata/item_icon/narc_0037.NCLR \ + files/itemtool/itemdata/item_icon/narc_0055.NCLR \ + files/itemtool/itemdata/item_icon/narc_0060.NCLR \ + files/itemtool/itemdata/item_icon/narc_0061.NCLR \ + files/itemtool/itemdata/item_icon/narc_0062.NCLR \ + files/itemtool/itemdata/item_icon/narc_0067.NCLR \ + files/itemtool/itemdata/item_icon/narc_0068.NCLR \ + files/itemtool/itemdata/item_icon/narc_0069.NCLR \ + files/itemtool/itemdata/item_icon/narc_0070.NCLR \ + files/itemtool/itemdata/item_icon/narc_0075.NCLR \ + files/itemtool/itemdata/item_icon/narc_0080.NCLR \ + files/itemtool/itemdata/item_icon/narc_0081.NCLR \ + files/itemtool/itemdata/item_icon/narc_0082.NCLR \ + files/itemtool/itemdata/item_icon/narc_0087.NCLR \ + files/itemtool/itemdata/item_icon/narc_0088.NCLR \ + files/itemtool/itemdata/item_icon/narc_0089.NCLR \ + files/itemtool/itemdata/item_icon/narc_0094.NCLR \ + files/itemtool/itemdata/item_icon/narc_0097.NCLR \ + files/itemtool/itemdata/item_icon/narc_0098.NCLR \ + files/itemtool/itemdata/item_icon/narc_0099.NCLR \ + files/itemtool/itemdata/item_icon/narc_0102.NCLR \ + files/itemtool/itemdata/item_icon/narc_0103.NCLR \ + files/itemtool/itemdata/item_icon/narc_0104.NCLR \ + files/itemtool/itemdata/item_icon/narc_0111.NCLR \ + files/itemtool/itemdata/item_icon/narc_0114.NCLR + +VERSION101_SOPC_8BPP_NCGR_FILES := files/demo/title/titledemo/narc_0001.NCGR \ + files/demo/title/titledemo/narc_0003.NCGR + +NCGR_CLEAN_LIST := files/data/cell0.NCGR \ + files/demo/title/titledemo/narc_0001.NCGR \ + files/demo/title/titledemo/narc_0003.NCGR \ + files/graphic/bag_gra/narc_0002.NCGR \ + files/graphic/bag_gra/narc_0006.NCGR \ + files/graphic/bag_gra/narc_0034.NCGR \ + files/itemtool/itemdata/item_icon/narc_0002.NCGR \ + files/itemtool/itemdata/item_icon/narc_0004.NCGR \ + files/itemtool/itemdata/item_icon/narc_0006.NCGR \ + files/itemtool/itemdata/item_icon/narc_0008.NCGR \ + files/itemtool/itemdata/item_icon/narc_0010.NCGR \ + files/itemtool/itemdata/item_icon/narc_0012.NCGR \ + files/itemtool/itemdata/item_icon/narc_0014.NCGR \ + files/itemtool/itemdata/item_icon/narc_0016.NCGR \ + files/itemtool/itemdata/item_icon/narc_0018.NCGR \ + files/itemtool/itemdata/item_icon/narc_0020.NCGR \ + files/itemtool/itemdata/item_icon/narc_0021.NCGR \ + files/itemtool/itemdata/item_icon/narc_0023.NCGR \ + files/itemtool/itemdata/item_icon/narc_0024.NCGR \ + files/itemtool/itemdata/item_icon/narc_0026.NCGR \ + files/itemtool/itemdata/item_icon/narc_0030.NCGR \ + files/itemtool/itemdata/item_icon/narc_0033.NCGR \ + files/itemtool/itemdata/item_icon/narc_0038.NCGR \ + files/itemtool/itemdata/item_icon/narc_0040.NCGR \ + files/itemtool/itemdata/item_icon/narc_0041.NCGR \ + files/itemtool/itemdata/item_icon/narc_0043.NCGR \ + files/itemtool/itemdata/item_icon/narc_0045.NCGR \ + files/itemtool/itemdata/item_icon/narc_0047.NCGR \ + files/itemtool/itemdata/item_icon/narc_0049.NCGR \ + files/itemtool/itemdata/item_icon/narc_0051.NCGR \ + files/itemtool/itemdata/item_icon/narc_0053.NCGR \ + files/itemtool/itemdata/item_icon/narc_0056.NCGR \ + files/itemtool/itemdata/item_icon/narc_0058.NCGR \ + files/itemtool/itemdata/item_icon/narc_0063.NCGR \ + files/itemtool/itemdata/item_icon/narc_0065.NCGR \ + files/itemtool/itemdata/item_icon/narc_0071.NCGR \ + files/itemtool/itemdata/item_icon/narc_0073.NCGR \ + files/itemtool/itemdata/item_icon/narc_0076.NCGR \ + files/itemtool/itemdata/item_icon/narc_0078.NCGR \ + files/itemtool/itemdata/item_icon/narc_0083.NCGR \ + files/itemtool/itemdata/item_icon/narc_0085.NCGR \ + files/itemtool/itemdata/item_icon/narc_0090.NCGR \ + files/itemtool/itemdata/item_icon/narc_0092.NCGR \ + files/itemtool/itemdata/item_icon/narc_0095.NCGR \ + files/itemtool/itemdata/item_icon/narc_0100.NCGR \ + files/itemtool/itemdata/item_icon/narc_0105.NCGR \ + files/itemtool/itemdata/item_icon/narc_0107.NCGR \ + files/itemtool/itemdata/item_icon/narc_0109.NCGR \ + files/itemtool/itemdata/item_icon/narc_0112.NCGR + + +NCLR_CLEAN_LIST := files/data/cell0.NCLR \ + files/demo/title/titledemo/narc_0001.NCLR \ + files/demo/title/titledemo/narc_0003.NCLR \ + files/graphic/bag_gra/narc_0003.NCLR \ + files/graphic/bag_gra/narc_0034.NCLR \ + files/itemtool/itemdata/item_icon/narc_0002.NCLR \ + files/itemtool/itemdata/item_icon/narc_0004.NCLR \ + files/itemtool/itemdata/item_icon/narc_0006.NCLR \ + files/itemtool/itemdata/item_icon/narc_0008.NCLR \ + files/itemtool/itemdata/item_icon/narc_0010.NCLR \ + files/itemtool/itemdata/item_icon/narc_0012.NCLR \ + files/itemtool/itemdata/item_icon/narc_0014.NCLR \ + files/itemtool/itemdata/item_icon/narc_0016.NCLR \ + files/itemtool/itemdata/item_icon/narc_0018.NCLR \ + files/itemtool/itemdata/item_icon/narc_0022.NCLR \ + files/itemtool/itemdata/item_icon/narc_0025.NCLR \ + files/itemtool/itemdata/item_icon/narc_0027.NCLR \ + files/itemtool/itemdata/item_icon/narc_0028.NCLR \ + files/itemtool/itemdata/item_icon/narc_0029.NCLR \ + files/itemtool/itemdata/item_icon/narc_0031.NCLR \ + files/itemtool/itemdata/item_icon/narc_0032.NCLR \ + files/itemtool/itemdata/item_icon/narc_0034.NCLR \ + files/itemtool/itemdata/item_icon/narc_0035.NCLR \ + files/itemtool/itemdata/item_icon/narc_0036.NCLR \ + files/itemtool/itemdata/item_icon/narc_0037.NCLR \ + files/itemtool/itemdata/item_icon/narc_0038.NCLR \ + files/itemtool/itemdata/item_icon/narc_0042.NCLR \ + files/itemtool/itemdata/item_icon/narc_0043.NCLR \ + files/itemtool/itemdata/item_icon/narc_0045.NCLR \ + files/itemtool/itemdata/item_icon/narc_0047.NCLR \ + files/itemtool/itemdata/item_icon/narc_0049.NCLR \ + files/itemtool/itemdata/item_icon/narc_0052.NCLR \ + files/itemtool/itemdata/item_icon/narc_0053.NCLR \ + files/itemtool/itemdata/item_icon/narc_0055.NCLR \ + files/itemtool/itemdata/item_icon/narc_0056.NCLR \ + files/itemtool/itemdata/item_icon/narc_0059.NCLR \ + files/itemtool/itemdata/item_icon/narc_0060.NCLR \ + files/itemtool/itemdata/item_icon/narc_0061.NCLR \ + files/itemtool/itemdata/item_icon/narc_0062.NCLR \ + files/itemtool/itemdata/item_icon/narc_0063.NCLR \ + files/itemtool/itemdata/item_icon/narc_0066.NCLR \ + files/itemtool/itemdata/item_icon/narc_0067.NCLR \ + files/itemtool/itemdata/item_icon/narc_0068.NCLR \ + files/itemtool/itemdata/item_icon/narc_0069.NCLR \ + files/itemtool/itemdata/item_icon/narc_0070.NCLR \ + files/itemtool/itemdata/item_icon/narc_0071.NCLR \ + files/itemtool/itemdata/item_icon/narc_0074.NCLR \ + files/itemtool/itemdata/item_icon/narc_0075.NCLR \ + files/itemtool/itemdata/item_icon/narc_0076.NCLR \ + files/itemtool/itemdata/item_icon/narc_0079.NCLR \ + files/itemtool/itemdata/item_icon/narc_0080.NCLR \ + files/itemtool/itemdata/item_icon/narc_0081.NCLR \ + files/itemtool/itemdata/item_icon/narc_0082.NCLR \ + files/itemtool/itemdata/item_icon/narc_0083.NCLR \ + files/itemtool/itemdata/item_icon/narc_0086.NCLR \ + files/itemtool/itemdata/item_icon/narc_0087.NCLR \ + files/itemtool/itemdata/item_icon/narc_0088.NCLR \ + files/itemtool/itemdata/item_icon/narc_0089.NCLR \ + files/itemtool/itemdata/item_icon/narc_0090.NCLR \ + files/itemtool/itemdata/item_icon/narc_0092.NCLR \ + files/itemtool/itemdata/item_icon/narc_0094.NCLR \ + files/itemtool/itemdata/item_icon/narc_0095.NCLR \ + files/itemtool/itemdata/item_icon/narc_0097.NCLR \ + files/itemtool/itemdata/item_icon/narc_0098.NCLR \ + files/itemtool/itemdata/item_icon/narc_0099.NCLR \ + files/itemtool/itemdata/item_icon/narc_0101.NCLR \ + files/itemtool/itemdata/item_icon/narc_0102.NCLR \ + files/itemtool/itemdata/item_icon/narc_0103.NCLR \ + files/itemtool/itemdata/item_icon/narc_0104.NCLR \ + files/itemtool/itemdata/item_icon/narc_0105.NCLR \ + files/itemtool/itemdata/item_icon/narc_0107.NCLR \ + files/itemtool/itemdata/item_icon/narc_0110.NCLR \ + files/itemtool/itemdata/item_icon/narc_0111.NCLR \ + files/itemtool/itemdata/item_icon/narc_0112.NCLR \ + files/itemtool/itemdata/item_icon/narc_0114.NCLR diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index 3315e00e..c62a25f8 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -359,7 +359,7 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m free(buffer); } -void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder) +void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc) { FILE *fp = fopen(path, "wb"); @@ -407,7 +407,7 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in break; } - WriteGenericNtrHeader(fp, "RGCN", bufferSize + 0x20, byteOrder); + WriteGenericNtrHeader(fp, "RGCN", bufferSize + (sopc ? 0x30 : 0x20), byteOrder, version101, sopc ? 2 : 1); unsigned char charHeader[0x20] = { 0x52, 0x41, 0x48, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00 }; @@ -419,11 +419,14 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in if (!clobberSize) { - charHeader[8] = numTiles & 0xFF; - charHeader[9] = (numTiles >> 8) & 0xFF; - - charHeader[10] = tileSize & 0xFF; - charHeader[11] = (tileSize >> 8) & 0xFF; + //charHeader[8] = numTiles & 0xFF; + //charHeader[9] = (numTiles >> 8) & 0xFF; + charHeader[8] = (bufferSize / (256 * bitDepth)) & 0xFF; + charHeader[9] = ((bufferSize / (256 * bitDepth)) >> 8) & 0xFF; + + //charHeader[10] = tileSize & 0xFF; + //charHeader[11] = (tileSize >> 8) & 0xFF; + charHeader[10] = 0x20; //todo figure out if this changes } else { @@ -446,6 +449,15 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in fwrite(pixelBuffer, 1, bufferSize, fp); + if (sopc) + { + unsigned char sopcBuffer[0x10] = { 0x53, 0x4F, 0x50, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 }; + sopcBuffer[14] = (bufferSize / (256 * bitDepth)) & 0xFF; + sopcBuffer[15] = ((bufferSize / (256 * bitDepth)) >> 8) & 0xFF; + + fwrite(sopcBuffer, 1, 0x10, fp); + } + free(pixelBuffer); fclose(fp); } @@ -534,7 +546,7 @@ void WriteGbaPalette(char *path, struct Palette *palette) fclose(fp); } -void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) +void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr, bool ir) { FILE *fp = fopen(path, "wb"); @@ -545,7 +557,7 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) uint32_t extSize = size + (ncpr ? 0x10 : 0x18); //NCLR header - WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr); + WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr, false, 1); unsigned char palHeader[0x18] = { @@ -594,6 +606,12 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) } } + if (ir) + { + colours[510] = 'I'; + colours[511] = 'R'; + } + fwrite(colours, 1, 256 * 2, fp); fclose(fp); diff --git a/tools/nitrogfx/gfx.h b/tools/nitrogfx/gfx.h index da56c5c5..54e6fb16 100644 --- a/tools/nitrogfx/gfx.h +++ b/tools/nitrogfx/gfx.h @@ -31,11 +31,11 @@ struct Image { void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); void ReadNtrImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors); -void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder); +void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc); void FreeImage(struct Image *image); void ReadGbaPalette(char *path, struct Palette *palette); void ReadNtrPalette(char *path, struct Palette *palette); void WriteGbaPalette(char *path, struct Palette *palette); -void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr); +void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr, bool ir); #endif // GFX_H diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index 2f5b2735..0aaad201 100644 --- a/tools/nitrogfx/main.c +++ b/tools/nitrogfx/main.c @@ -88,7 +88,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions * ReadPng(inputPath, &image); - WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder); + WriteNtrImage(outputPath, options->numTiles, image.bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc); FreeImage(&image); } @@ -320,6 +320,8 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a options.metatileHeight = 1; options.clobberSize = false; options.byteOrder = true; + options.version101 = false; + options.sopc = false; for (int i = 3; i < argc; i++) { @@ -385,6 +387,14 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a { options.byteOrder = false; } + else if (strcmp(option, "-version101") == 0) + { + options.version101 = true; + } + else if (strcmp(option, "-sopc") == 0) + { + options.sopc = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -406,6 +416,7 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c { struct Palette palette; bool ncpr = false; + bool ir = false; for (int i = 3; i < argc; i++) { @@ -415,6 +426,10 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c { ncpr = true; } + else if (strcmp(option, "-ir") == 0) + { + ir = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -422,7 +437,7 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c } ReadPngPalette(inputPath, &palette); - WriteNtrPalette(outputPath, &palette, ncpr); + WriteNtrPalette(outputPath, &palette, ncpr, ir); } void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) @@ -482,6 +497,7 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, { int numColors = 0; bool ncpr = false; + bool ir = false; for (int i = 3; i < argc; i++) { @@ -504,6 +520,10 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, { ncpr = true; } + else if (strcmp(option, "-ir") == 0) + { + ir = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -517,7 +537,7 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, if (numColors != 0) palette.numColors = numColors; - WriteNtrPalette(outputPath, &palette, ncpr); + WriteNtrPalette(outputPath, &palette, ncpr, ir); } void HandleLatinFontToPngCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h index 8376348f..dc90a2a2 100644 --- a/tools/nitrogfx/options.h +++ b/tools/nitrogfx/options.h @@ -28,6 +28,8 @@ struct PngToNtrOptions { int metatileHeight; bool clobberSize; bool byteOrder; + bool version101; + bool sopc; }; diff --git a/tools/nitrogfx/util.c b/tools/nitrogfx/util.c index 73a128a1..7dc4ca89 100644 --- a/tools/nitrogfx/util.c +++ b/tools/nitrogfx/util.c @@ -124,13 +124,18 @@ void WriteWholeFile(char *path, void *buffer, int bufferSize) fclose(fp); } -void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder) +void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101, uint16_t sectionCount) { unsigned char header[0x10] = { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00 }; //magic number memcpy(header, magicNumber, 4); + if (version101) + { + header[6] = 0x01; + } + //byte order if (!byteorder) { @@ -144,5 +149,9 @@ void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, boo header[10] = (size >> 16) & 0xFF; header[11] = (size >> 24) & 0xFF; + //section count + header[14] = sectionCount & 0xFF; + header[15] = (sectionCount >> 8) & 0xFF; + fwrite(header, 1, 0x10, fp); } diff --git a/tools/nitrogfx/util.h b/tools/nitrogfx/util.h index f181b66e..b757aa4d 100644 --- a/tools/nitrogfx/util.h +++ b/tools/nitrogfx/util.h @@ -11,6 +11,6 @@ char *GetFileExtension(char *path); unsigned char *ReadWholeFile(char *path, int *size); unsigned char *ReadWholeFileZeroPadded(char *path, int *size, int padAmount); void WriteWholeFile(char *path, void *buffer, int bufferSize); -void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder); +void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101, uint16_t sectionCount); #endif // UTIL_H |
