diff options
author | Akira Akashi <rubenru09@aol.com> | 2021-06-01 20:40:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-01 20:40:37 +0100 |
commit | 389b33f7d8499cab5b3b9e2ba21d786b1059c059 (patch) | |
tree | f02042907a117ce618b0a67c0b5cd82fc45cfcd7 | |
parent | 5a73f4f645faf368cf8e20cfe4793e2b12672472 (diff) | |
parent | f67d6fe193eeee8058a45934d08c3b883cc08eb9 (diff) |
Merge branch 'master' into unkk_020851B8
148 files changed, 6239 insertions, 6434 deletions
@@ -49,3 +49,4 @@ symbols.csv *.arc files/**/*.c *.o +*.naix @@ -162,6 +162,7 @@ clean: mostlyclean clean-fs clean-tools clean-fs: $(RM) $(filter %.narc %.arc,$(HOSTFS_FILES)) + $(RM) $(patsubst %.narc,%.naix,$(patsubst %.arc,%.naix,$(filter %.narc %.arc,$(HOSTFS_FILES)))) $(RM) $(NCGR_CLEAN_LIST) $(NCLR_CLEAN_LIST) $(NCER_CLEAN_LIST) $(NSCR_CLEAN_LIST) find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} + $(RM) files/msgdata/msg/narc_*.bin @@ -204,7 +205,7 @@ $(BUILD_DIR)/%.o: %.c $$(dep) $(BUILD_DIR)/%.o: %.s $$(dep) $(AS) $(ASFLAGS) $< -o $@ -arm9: +arm9: filesystem $(MAKE) -C arm9 $(MAKE_VARS) arm7: @@ -214,7 +215,7 @@ include filesystem.mk # TODO: Rules for Pearl # FIXME: Computed secure area CRC in header is incorrect due to first 8 bytes of header not actually being "encryObj" -$(ROM): rom.rsf arm9 arm7 filesystem $(BNR) tools/bin/rom_header.template.sbin +$(ROM): rom.rsf arm9 arm7 $(BNR) tools/bin/rom_header.template.sbin $(MAKEROM) -DBUILD_DIR="$(BUILD_DIR)" -DBNR="$(BNR)" -DTITLE_NAME="$(TITLE_NAME)" -DNITROFS_FILES="$(NITROFS_FILES)" $< $@ ifeq ($(SHIFTED),0) $(FIXROM) $@ --secure-crc $(SECURE_CRC) --game-code $(GAME_CODE) diff --git a/arm9/CMakeLists.txt b/arm9/CMakeLists.txt index fce2106f..0de93feb 100644 --- a/arm9/CMakeLists.txt +++ b/arm9/CMakeLists.txt @@ -15,5 +15,5 @@ file(GLOB_RECURSE SOURCES "*.c" "*.cpp") file(GLOB MODULE_INC modules/*/include) add_executable(DP_Arm9 ${SOURCES}) -target_include_directories(DP_Arm9 PRIVATE ../include ../include-mw lib/include ${MODULE_INC}) +target_include_directories(DP_Arm9 PRIVATE ../include ../include-mw lib/include ${MODULE_INC} ../files) target_compile_definitions(DP_Arm9 PUBLIC __CLION_IDE__) diff --git a/arm9/Makefile b/arm9/Makefile index 6f05d1c5..2ad29363 100644 --- a/arm9/Makefile +++ b/arm9/Makefile @@ -54,7 +54,7 @@ SRC_DIRS := src lib lib/src $(sort $(wildcard modules/*/src)) ASM_DIRS := asm data files $(sort $(wildcard modules/*/asm)) LIBASM_DIRS := lib/syscall INCLUDE_RECURSIVE_DIRS := ../include-mw lib/include -INCLUDE_DIRS := ../include $(sort $(wildcard modules/*/include)) +INCLUDE_DIRS := ../include $(sort $(wildcard modules/*/include)) ../files C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c))) CXX_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.cpp))) diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 7a8f19f1..fa609048 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -21,7 +21,7 @@ Static arm9 Object unk_020061E8.o Object overlay_manager.o Object filesystem.o - Object unk_02006864.o + Object gf_gfx_loader.o Object unk_02006D98.o Object unk_02008AA4.o Object unk_02008DEC.o @@ -157,7 +157,7 @@ Static arm9 Object unk_02038C78.o Object scrcmd.o Object scrcmd_asm.o - Object scrcmd_2.o + Object scrcmd_mart.o Object scrcmd_3.o Object scrcmd_names.o Object scrcmd_5.o @@ -166,7 +166,7 @@ Static arm9 Object scrcmd_8.o Object scrcmd_9.o Object scrcmd_10.o - Object scrcmd_11.o + Object scrcmd_berry_trees.o Object scrcmd_12.o Object scrcmd_13.o Object scrcmd_coins.o @@ -175,11 +175,11 @@ Static arm9 Object scrcmd_17.o Object scrcmd_18_c.o Object scrcmd_18.o - Object scrcmd_19.o - Object scrcmd_20.o + Object scrcmd_fossils.o + Object scrcmd_prizes.o Object scrcmd_flags.o Object scrcmd_items.o - Object scrcmd_23.o + Object scrcmd_underground.o Object scrcmd_24.o Object scrcmd_25.o Object unk_02046030.o diff --git a/arm9/asm/scrcmd_10.s b/arm9/asm/scrcmd_10.s index ea5903d8..3235f5ae 100644 --- a/arm9/asm/scrcmd_10.s +++ b/arm9/asm/scrcmd_10.s @@ -27,8 +27,8 @@ UNK_020F4340: ; 0x020F4340 .text - thumb_func_start FUN_02042354 -FUN_02042354: ; 0x02042354 + thumb_func_start ScrCmd_Unk01DA +ScrCmd_Unk01DA: ; 0x02042354 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -37,8 +37,8 @@ FUN_02042354: ; 0x02042354 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_02042364 -FUN_02042364: ; 0x02042364 + thumb_func_start ScrCmd_Unk01DB +ScrCmd_Unk01DB: ; 0x02042364 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -60,8 +60,8 @@ FUN_02042364: ; 0x02042364 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02042394 -FUN_02042394: ; 0x02042394 + thumb_func_start ScrCmd_Unk01DC +ScrCmd_Unk01DC: ; 0x02042394 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -76,8 +76,8 @@ FUN_02042394: ; 0x02042394 str r0, [r1, #0x0] pop {r4, pc} - thumb_func_start FUN_020423B0 -FUN_020423B0: ; 0x020423B0 + thumb_func_start ScrCmd_Unk01DD +ScrCmd_Unk01DD: ; 0x020423B0 push {r3-r7, lr} sub sp, #0x8 add r7, r0, #0x0 @@ -502,8 +502,8 @@ _020426FA: add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_02042700 -FUN_02042700: ; 0x02042700 + thumb_func_start ScrCmd_Unk01DE +ScrCmd_Unk01DE: ; 0x02042700 push {r3-r7, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -561,8 +561,8 @@ FUN_02042700: ; 0x02042700 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02042780 -FUN_02042780: ; 0x02042780 + thumb_func_start ScrCmd_Unk01DF +ScrCmd_Unk01DF: ; 0x02042780 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -581,8 +581,8 @@ FUN_02042780: ; 0x02042780 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020427A8 -FUN_020427A8: ; 0x020427A8 + thumb_func_start ScrCmd_Unk01E0 +ScrCmd_Unk01E0: ; 0x020427A8 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -601,8 +601,8 @@ FUN_020427A8: ; 0x020427A8 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020427D0 -FUN_020427D0: ; 0x020427D0 + thumb_func_start ScrCmd_Unk01E1 +ScrCmd_Unk01E1: ; 0x020427D0 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -671,8 +671,8 @@ _0204284C: _0204285C: .word 0x00000884 _02042860: .word 0x0000083E - thumb_func_start FUN_02042864 -FUN_02042864: ; 0x02042864 + thumb_func_start ScrCmd_Unk01E2 +ScrCmd_Unk01E2: ; 0x02042864 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -694,8 +694,8 @@ FUN_02042864: ; 0x02042864 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02042894 -FUN_02042894: ; 0x02042894 + thumb_func_start ScrCmd_Unk01E3 +ScrCmd_Unk01E3: ; 0x02042894 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 @@ -729,8 +729,8 @@ FUN_02042894: ; 0x02042894 add sp, #0x4 pop {r3-r6, pc} - thumb_func_start FUN_020428E0 -FUN_020428E0: ; 0x020428E0 + thumb_func_start ScrCmd_Unk01E4 +ScrCmd_Unk01E4: ; 0x020428E0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -792,8 +792,8 @@ _02042948: .balign 4 _0204294C: .word UNK_020F4334 - thumb_func_start FUN_02042950 -FUN_02042950: ; 0x02042950 + thumb_func_start ScrCmd_Unk0294 +ScrCmd_Unk0294: ; 0x02042950 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -817,8 +817,8 @@ FUN_02042950: ; 0x02042950 mov r0, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_02042980 -FUN_02042980: ; 0x02042980 + thumb_func_start ScrCmd_Unk0295 +ScrCmd_Unk0295: ; 0x02042980 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -830,8 +830,8 @@ FUN_02042980: ; 0x02042980 pop {r3, pc} .balign 4 - thumb_func_start FUN_02042998 -FUN_02042998: ; 0x02042998 + thumb_func_start ScrCmd_Unk0296 +ScrCmd_Unk0296: ; 0x02042998 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -847,8 +847,8 @@ FUN_02042998: ; 0x02042998 pop {r4, pc} .balign 4 - thumb_func_start FUN_020429B8 -FUN_020429B8: ; 0x020429B8 + thumb_func_start ScrCmd_Unk0297 +ScrCmd_Unk0297: ; 0x020429B8 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -870,8 +870,8 @@ FUN_020429B8: ; 0x020429B8 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_020429E8 -FUN_020429E8: ; 0x020429E8 + thumb_func_start ScrCmd_Unk0298 +ScrCmd_Unk0298: ; 0x020429E8 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -893,8 +893,8 @@ FUN_020429E8: ; 0x020429E8 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02042A18 -FUN_02042A18: ; 0x02042A18 + thumb_func_start ScrCmd_Unk0299 +ScrCmd_Unk0299: ; 0x02042A18 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -916,8 +916,8 @@ FUN_02042A18: ; 0x02042A18 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02042A48 -FUN_02042A48: ; 0x02042A48 + thumb_func_start ScrCmd_Unk029A +ScrCmd_Unk029A: ; 0x02042A48 push {r4-r6, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -955,8 +955,8 @@ _02042A90: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_02042A98 -FUN_02042A98: ; 0x02042A98 + thumb_func_start ScrCmd_Unk029B +ScrCmd_Unk029B: ; 0x02042A98 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index cc011b0f..25911feb 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -47,8 +47,8 @@ FUN_02042D10: ; 0x02042D10 bl FUN_0202B020 pop {r3, pc} - thumb_func_start FUN_02042D1C -FUN_02042D1C: ; 0x02042D1C + thumb_func_start ScrCmd_Unk023E +ScrCmd_Unk023E: ; 0x02042D1C push {r3-r7, lr} sub sp, #0x20 add r4, r0, #0x0 diff --git a/arm9/asm/scrcmd_17.s b/arm9/asm/scrcmd_17.s index f0e027ed..3df4d6e4 100644 --- a/arm9/asm/scrcmd_17.s +++ b/arm9/asm/scrcmd_17.s @@ -16,8 +16,8 @@ UNK_020F4494: ; 0x020F4494 .text - thumb_func_start FUN_02044158 -FUN_02044158: ; 0x02044158 + thumb_func_start ScrCmd_Unk0215 +ScrCmd_Unk0215: ; 0x02044158 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -27,8 +27,8 @@ FUN_02044158: ; 0x02044158 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0204416C -FUN_0204416C: ; 0x0204416C + thumb_func_start ScrCmd_Unk0216 +ScrCmd_Unk0216: ; 0x0204416C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -48,8 +48,8 @@ FUN_0204416C: ; 0x0204416C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02044198 -FUN_02044198: ; 0x02044198 + thumb_func_start ScrCmd_Unk0217 +ScrCmd_Unk0217: ; 0x02044198 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index fe0e3aa9..25fe86b8 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -3,8 +3,8 @@ .text - thumb_func_start ScrCmd_getpartyspecies -ScrCmd_getpartyspecies: ; 0x0204434C + thumb_func_start ScrCmd_GetPartySpecies +ScrCmd_GetPartySpecies: ; 0x0204434C ; getpartyspecies XXXX, YYYY ; Sets var YYYY to species of mon in party slot XXXX. ; If mon is an egg, the value is SPECIES_NONE. @@ -49,8 +49,8 @@ _020443A2: mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start ScrCmd_checkpartymonotid -ScrCmd_checkpartymonotid: ; 0x020443A8 + thumb_func_start ScrCmd_CheckPartyMonOTID +ScrCmd_CheckPartyMonOTID: ; 0x020443A8 push {r3-r7, lr} add r4, r0, #0x0 add r0, #0x80 @@ -98,8 +98,8 @@ _0204440E: mov r0, #0x0 pop {r3-r7, pc} - thumb_func_start ScrCmd_giveegg -ScrCmd_giveegg: ; 0x02044414 + thumb_func_start ScrCmd_GiveEgg +ScrCmd_GiveEgg: ; 0x02044414 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 @@ -157,8 +157,8 @@ _02044494: pop {r4-r7, pc} .balign 4 - thumb_func_start ScrCmd_setpartymonmove -ScrCmd_setpartymonmove: ; 0x0204449C + thumb_func_start ScrCmd_SetPartyMonMove +ScrCmd_SetPartyMonMove: ; 0x0204449C push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -196,8 +196,8 @@ ScrCmd_setpartymonmove: ; 0x0204449C pop {r3-r7, pc} .balign 4 - thumb_func_start ScrCmd_partymonhasmove -ScrCmd_partymonhasmove: ; 0x020444F4 + thumb_func_start ScrCmd_PartyMonHasMove +ScrCmd_PartyMonHasMove: ; 0x020444F4 push {r3-r7, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -271,8 +271,8 @@ _02044592: pop {r3-r7, pc} .balign 4 - thumb_func_start ScrCmd_findpartymonwithmove -ScrCmd_findpartymonwithmove: ; 0x02044598 + thumb_func_start ScrCmd_FindPartyMonWithMove +ScrCmd_FindPartyMonWithMove: ; 0x02044598 push {r3-r7, lr} sub sp, #0x8 add r4, r0, #0x0 @@ -359,8 +359,8 @@ _02044648: _02044650: .word 0x00000006 _02044654: .word 0x00000000 - thumb_func_start ScrCmd_survivepsn -ScrCmd_survivepsn: ; 0x02044658 + thumb_func_start ScrCmd_SurvivePsn +ScrCmd_SurvivePsn: ; 0x02044658 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -389,8 +389,8 @@ ScrCmd_survivepsn: ; 0x02044658 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start ScrCmd_countpartymonsatorbelowlevel -ScrCmd_countpartymonsatorbelowlevel: ; 0x0204469C + thumb_func_start ScrCmd_CountPartyMonsAtOrBelowLevel +ScrCmd_CountPartyMonsAtOrBelowLevel: ; 0x0204469C push {r4-r7, lr} sub sp, #0xc add r4, r0, #0x0 @@ -459,8 +459,8 @@ _02044726: add sp, #0xc pop {r4-r7, pc} - thumb_func_start ScrCmd_getpartymonlevel -ScrCmd_getpartymonlevel: ; 0x02044730 + thumb_func_start ScrCmd_GetPartyMonLevel +ScrCmd_GetPartyMonLevel: ; 0x02044730 push {r4-r6, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -501,8 +501,8 @@ _02044786: pop {r4-r6, pc} .balign 4 - thumb_func_start ScrCmd_getpartymonnature -ScrCmd_getpartymonnature: ; 0x0204478C + thumb_func_start ScrCmd_GetPartyMonNature +ScrCmd_GetPartyMonNature: ; 0x0204478C push {r4-r6, lr} add r6, r0, #0x0 add r1, r6, #0x0 @@ -554,8 +554,8 @@ _020447F2: pop {r4-r6, pc} .balign 4 - thumb_func_start ScrCmd_findpartymonwithnature -ScrCmd_findpartymonwithnature: ; 0x02044800 + thumb_func_start ScrCmd_FindPartyMonWithNature +ScrCmd_FindPartyMonWithNature: ; 0x02044800 push {r3-r7, lr} sub sp, #0x8 add r4, r0, #0x0 @@ -619,8 +619,8 @@ _0204487E: _02044884: .word 0x000000FF _02044888: .word 0x00000000 - thumb_func_start ScrCmd_getpartymonfriendship -ScrCmd_getpartymonfriendship: ; 0x0204488C + thumb_func_start ScrCmd_GetPartyMonFriendship +ScrCmd_GetPartyMonFriendship: ; 0x0204488C push {r4-r6, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -651,8 +651,8 @@ ScrCmd_getpartymonfriendship: ; 0x0204488C mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_020448D4 -FUN_020448D4: ; 0x020448D4 + thumb_func_start ScrCmd_Unk01BA +ScrCmd_Unk01BA: ; 0x020448D4 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -748,8 +748,8 @@ _02044994: add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_020449A4 -FUN_020449A4: ; 0x020449A4 + thumb_func_start ScrCmd_Unk01BB +ScrCmd_Unk01BB: ; 0x020449A4 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 @@ -797,8 +797,8 @@ _020449FA: add sp, #0x4 pop {r3-r6, pc} - thumb_func_start FUN_02044A0C -FUN_02044A0C: ; 0x02044A0C + thumb_func_start ScrCmd_Unk0281 +ScrCmd_Unk0281: ; 0x02044A0C push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -839,8 +839,8 @@ FUN_02044A0C: ; 0x02044A0C pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02044A6C -FUN_02044A6C: ; 0x02044A6C + thumb_func_start ScrCmd_Unk0247 +ScrCmd_Unk0247: ; 0x02044A6C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -859,8 +859,8 @@ FUN_02044A6C: ; 0x02044A6C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02044A94 -FUN_02044A94: ; 0x02044A94 + thumb_func_start ScrCmd_Unk0248 +ScrCmd_Unk0248: ; 0x02044A94 push {r3-r7, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -906,8 +906,8 @@ FUN_02044A94: ; 0x02044A94 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02044B00 -FUN_02044B00: ; 0x02044B00 + thumb_func_start ScrCmd_Unk0177 +ScrCmd_Unk0177: ; 0x02044B00 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -927,8 +927,8 @@ FUN_02044B00: ; 0x02044B00 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02044B2C -FUN_02044B2C: ; 0x02044B2C + thumb_func_start ScrCmd_Unk019A +ScrCmd_Unk019A: ; 0x02044B2C push {r3-r7, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -970,8 +970,8 @@ _02044B7A: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02044B84 -FUN_02044B84: ; 0x02044B84 + thumb_func_start ScrCmd_Unk019B +ScrCmd_Unk019B: ; 0x02044B84 push {r4-r7, lr} sub sp, #0xc add r4, r0, #0x0 @@ -1034,8 +1034,8 @@ _02044C00: pop {r4-r7, pc} .balign 4 - thumb_func_start FUN_02044C0C -FUN_02044C0C: ; 0x02044C0C + thumb_func_start ScrCmd_Unk019C +ScrCmd_Unk019C: ; 0x02044C0C push {r4-r7, lr} sub sp, #0xc add r4, r0, #0x0 @@ -1092,8 +1092,8 @@ _02044C76: add sp, #0xc pop {r4-r7, pc} - thumb_func_start FUN_02044C88 -FUN_02044C88: ; 0x02044C88 + thumb_func_start ScrCmd_Unk019D +ScrCmd_Unk019D: ; 0x02044C88 push {r3-r7, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -1135,8 +1135,8 @@ _02044CD6: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02044CE0 -FUN_02044CE0: ; 0x02044CE0 + thumb_func_start ScrCmd_Unk0119 +ScrCmd_Unk0119: ; 0x02044CE0 push {r3-r7, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -1184,8 +1184,8 @@ _02044D3C: .balign 4 _02044D40: .word 0x00000000 - thumb_func_start FUN_02044D44 -FUN_02044D44: ; 0x02044D44 + thumb_func_start ScrCmd_Unk011A +ScrCmd_Unk011A: ; 0x02044D44 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -1216,8 +1216,8 @@ FUN_02044D44: ; 0x02044D44 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02044D8C -FUN_02044D8C: ; 0x02044D8C + thumb_func_start ScrCmd_Unk01C8 +ScrCmd_Unk01C8: ; 0x02044D8C push {r4-r6, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -1297,8 +1297,8 @@ _02044E2C: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_02044E34 -FUN_02044E34: ; 0x02044E34 + thumb_func_start ScrCmd_Unk01C9 +ScrCmd_Unk01C9: ; 0x02044E34 push {r4-r6, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -1327,8 +1327,8 @@ FUN_02044E34: ; 0x02044E34 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02044E78 -FUN_02044E78: ; 0x02044E78 + thumb_func_start ScrCmd_Unk01CA +ScrCmd_Unk01CA: ; 0x02044E78 push {r3-r7, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -1369,8 +1369,8 @@ FUN_02044E78: ; 0x02044E78 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02044ED8 -FUN_02044ED8: ; 0x02044ED8 + thumb_func_start ScrCmd_Unk01EE +ScrCmd_Unk01EE: ; 0x02044ED8 push {r4-r6, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -1401,8 +1401,8 @@ FUN_02044ED8: ; 0x02044ED8 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02044F20 -FUN_02044F20: ; 0x02044F20 + thumb_func_start ScrCmd_Unk01F0 +ScrCmd_Unk01F0: ; 0x02044F20 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -1427,8 +1427,8 @@ FUN_02044F20: ; 0x02044F20 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02044F58 -FUN_02044F58: ; 0x02044F58 + thumb_func_start ScrCmd_Unk01C0 +ScrCmd_Unk01C0: ; 0x02044F58 push {r3-r7, lr} sub sp, #0x8 add r4, r0, #0x0 @@ -1495,8 +1495,8 @@ _02044FDE: .balign 4 _02044FE4: .word 0x00000000 - thumb_func_start FUN_02044FE8 -FUN_02044FE8: ; 0x02044FE8 + thumb_func_start ScrCmd_Unk022E +ScrCmd_Unk022E: ; 0x02044FE8 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -1550,8 +1550,8 @@ _02045048: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0204505C -FUN_0204505C: ; 0x0204505C + thumb_func_start ScrCmd_Unk022F +ScrCmd_Unk022F: ; 0x0204505C push {r3-r7, lr} sub sp, #0x10 add r4, r0, #0x0 @@ -1632,8 +1632,8 @@ _020450E8: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02045104 -FUN_02045104: ; 0x02045104 + thumb_func_start ScrCmd_Unk0230 +ScrCmd_Unk0230: ; 0x02045104 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -1679,8 +1679,8 @@ FUN_02045104: ; 0x02045104 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02045170 -FUN_02045170: ; 0x02045170 + thumb_func_start ScrCmd_Unk0231 +ScrCmd_Unk0231: ; 0x02045170 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 @@ -1722,8 +1722,8 @@ FUN_02045170: ; 0x02045170 pop {r3-r6, pc} .balign 4 - thumb_func_start FUN_020451D0 -FUN_020451D0: ; 0x020451D0 + thumb_func_start ScrCmd_Unk02B7 +ScrCmd_Unk02B7: ; 0x020451D0 push {r3-r7, lr} sub sp, #0x8 add r4, r0, #0x0 @@ -1795,7 +1795,7 @@ _0204524C: add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_02045264 -FUN_02045264: ; 0x02045264 + thumb_func_start ScrCmd_Unk00A0 +ScrCmd_Unk00A0: ; 0x02045264 mov r0, #0x0 bx lr diff --git a/arm9/asm/scrcmd_2.s b/arm9/asm/scrcmd_2.s deleted file mode 100644 index d7d98c66..00000000 --- a/arm9/asm/scrcmd_2.s +++ /dev/null @@ -1,391 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .rodata - - .global UNK_020F40A0 -UNK_020F40A0: ; 0x020F40A0 - .byte 0x8E, 0x00, 0x0B, 0x00, 0xFF, 0xFF - - .global UNK_020F40A6 -UNK_020F40A6: ; 0x020F40A6 - .byte 0x92, 0x00, 0x0E, 0x00, 0xFF, 0xFF - - .global UNK_020F40AC -UNK_020F40AC: ; 0x020F40AC - .byte 0x8C, 0x00, 0x0E, 0x00, 0x06, 0x00, 0xFF, 0xFF - - .global UNK_020F40B4 -UNK_020F40B4: ; 0x020F40B4 - .byte 0x8D, 0x00, 0x0E, 0x00, 0x06, 0x00, 0xFF, 0xFF - - .global UNK_020F40BC -UNK_020F40BC: ; 0x020F40BC - .byte 0x92, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x08, 0x00, 0xFF, 0xFF - - .global UNK_020F40C6 -UNK_020F40C6: ; 0x020F40C6 - .byte 0x24, 0x00, 0x22, 0x00, 0x23, 0x00, 0x25, 0x00, 0xFF, 0xFF - - .global UNK_020F40D0 -UNK_020F40D0: ; 0x020F40D0 - .byte 0x90, 0x00, 0x0D, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0xFF, 0xFF - - .global UNK_020F40DA -UNK_020F40DA: ; 0x020F40DA - .byte 0x92, 0x00, 0x06, 0x00, 0x08, 0x00, 0x0D, 0x00, 0xFF, 0xFF - - .global UNK_020F40E4 -UNK_020F40E4: ; 0x020F40E4 - .byte 0x92, 0x00, 0x08, 0x00, 0x0D, 0x00, 0x0F, 0x00, 0xFF, 0xFF - - .global UNK_020F40EE -UNK_020F40EE: ; 0x020F40EE - .byte 0x92, 0x00, 0x0D, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0xFF, 0xFF - - .global UNK_020F40F8 -UNK_020F40F8: ; 0x020F40F8 - .byte 0x8F, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x08, 0x00, 0xFF, 0xFF - - .global UNK_020F4102 -UNK_020F4102: ; 0x020F4102 - .byte 0x92, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x09, 0x00, 0xFF, 0xFF - - .global UNK_020F410C -UNK_020F410C: ; 0x020F410C - .byte 0x07, 0x00, 0x16, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, 0xFF, 0xFF - - .global UNK_020F4118 -UNK_020F4118: ; 0x020F4118 - .byte 0x73, 0x00, 0x74, 0x00, 0x75, 0x00, 0x77, 0x00, 0x78, 0x00, 0x79, 0x00, 0xFF, 0xFF - - .global UNK_020F4126 -UNK_020F4126: ; 0x020F4126 - .byte 0x2E, 0x00, 0x2F, 0x00, 0x31, 0x00, 0x34, 0x00, 0x30, 0x00, 0x2D, 0x00, 0xFF, 0xFF - - .global UNK_020F4134 -UNK_020F4134: ; 0x020F4134 - .byte 0x6D, 0x01, 0x60, 0x01, 0x55, 0x01, 0x5D, 0x01, 0x7B, 0x01, 0x56, 0x01, 0xFF, 0xFF - - .global UNK_020F4142 -UNK_020F4142: ; 0x020F4142 - .byte 0x02, 0x00, 0x09, 0x00, 0x1E, 0x00, 0x25, 0x00, 0x2C, 0x00, 0x10, 0x00, 0x17, 0x00, 0xFF, 0xFF - - .global UNK_020F4152 -UNK_020F4152: ; 0x020F4152 - .byte 0x1B, 0x00, 0x22, 0x00, 0x29, 0x00, 0x30, 0x00, 0x06, 0x00, 0x0D, 0x00, 0x14, 0x00, 0xFF, 0xFF - - .global UNK_020F4162 -UNK_020F4162: ; 0x020F4162 - .byte 0x03, 0x00, 0x0A, 0x00, 0x1F, 0x00, 0x26, 0x00, 0x2D, 0x00, 0x11, 0x00, 0x18, 0x00, 0xFF, 0xFF - - .global UNK_020F4172 -UNK_020F4172: ; 0x020F4172 - .byte 0x04, 0x00, 0x19, 0x00, 0x20, 0x00, 0x27, 0x00, 0x2E, 0x00, 0x0B, 0x00, 0x12, 0x00, 0xFF, 0xFF - - .global UNK_020F4182 -UNK_020F4182: ; 0x020F4182 - .byte 0x9A, 0x01, 0x58, 0x01, 0x7D, 0x01, 0x5B, 0x01, 0x68, 0x01, 0x57, 0x01, 0x8D, 0x01, 0xFF, 0xFF - - .global UNK_020F4192 -UNK_020F4192: ; 0x020F4192 - .byte 0x01, 0x00, 0x08, 0x00, 0x1D, 0x00, 0x2B, 0x00, 0x0F, 0x00, 0x16, 0x00, 0x24, 0x00, 0xFF, 0xFF - - .global UNK_020F41A2 -UNK_020F41A2: ; 0x020F41A2 - .byte 0x1A, 0x00, 0x21, 0x00, 0x28, 0x00, 0x2F, 0x00, 0x05, 0x00, 0x0C, 0x00, 0x13, 0x00, 0xFF, 0xFF - - .global UNK_020F41B2 -UNK_020F41B2: ; 0x020F41B2 - .byte 0x07, 0x00, 0x31, 0x00, 0x1C, 0x00, 0x2A, 0x00, 0x0E, 0x00, 0x15, 0x00, 0x23, 0x00, 0xFF, 0xFF - - .global UNK_020F41C2 -UNK_020F41C2: ; 0x020F41C2 - .byte 0x0E, 0x00, 0x06, 0x00, 0x08, 0x00, 0x0D, 0x00, 0x0F, 0x00, 0x0A, 0x00, 0x09, 0x00, 0x0B, 0x00 - .byte 0xFF, 0xFF - - .global UNK_020F41D4 -UNK_020F41D4: ; 0x020F41D4 - .byte 0x3B, 0x00, 0x39, 0x00, 0x3A, 0x00, 0x37, 0x00, 0x38, 0x00, 0x3C, 0x00, 0x3D, 0x00, 0x3E, 0x00 - .byte 0xFF, 0xFF - - .global UNK_020F41E6 -UNK_020F41E6: ; 0x020F41E6 - .byte 0x11, 0x00, 0x1A, 0x00, 0x19, 0x00, 0x18, 0x00, 0x1C, 0x00, 0x12, 0x00, 0x16, 0x00, 0x13, 0x00 - .byte 0x14, 0x00, 0x15, 0x00, 0x1B, 0x00, 0xFF, 0xFF - - .global UNK_020F41FE -UNK_020F41FE: ; 0x020F41FE - .byte 0x04, 0x00, 0x03, 0x00, 0x02, 0x00, 0x4E, 0x00, 0x3F, 0x00, 0x4F, 0x00, 0x4C, 0x00, 0x4D, 0x00 - .byte 0x89, 0x00, 0x8A, 0x00, 0x8B, 0x00, 0x91, 0x00, 0xFF, 0xFF - - .global UNK_020F4218 -UNK_020F4218: ; 0x020F4218 - .byte 0x04, 0x00, 0x01, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x04, 0x00, 0x11, 0x00, 0x01, 0x00 - .byte 0x1A, 0x00, 0x02, 0x00, 0x19, 0x00, 0x04, 0x00, 0x18, 0x00, 0x05, 0x00, 0x17, 0x00, 0x06, 0x00 - .byte 0x1C, 0x00, 0x03, 0x00, 0x12, 0x00, 0x01, 0x00, 0x16, 0x00, 0x01, 0x00, 0x15, 0x00, 0x02, 0x00 - .byte 0x13, 0x00, 0x02, 0x00, 0x14, 0x00, 0x02, 0x00, 0x1B, 0x00, 0x04, 0x00, 0x4E, 0x00, 0x02, 0x00 - .byte 0x4F, 0x00, 0x02, 0x00, 0x4C, 0x00, 0x03, 0x00, 0x4D, 0x00, 0x04, 0x00 - - .section .data - - .balign 4, 0 - .global UNK_02105DEC -UNK_02105DEC: ; 0x02105DEC - .word UNK_020F410C - .word UNK_020F4118 - - .global UNK_02105DF4 -UNK_02105DF4: ; 0x02105DF4 - .word UNK_020F4192 - .word UNK_020F4142 - .word UNK_020F4162 - .word UNK_020F4172 - .word UNK_020F41A2 - .word UNK_020F4152 - .word UNK_020F41B2 - - .global UNK_02105E10 -UNK_02105E10: ; 0x02105E10 - .word UNK_020F40A6 - .word UNK_020F40B4 - .word UNK_020F40AC - .word UNK_020F40BC - .word UNK_020F40C6 - .word UNK_020F40F8 - .word UNK_020F40DA - .word UNK_020F40E4 - .word UNK_020F41E6 - .word UNK_020F41FE - .word UNK_020F41D4 - .word UNK_020F4126 - .word UNK_020F4182 - .word UNK_020F4134 - .word UNK_020F40EE - .word UNK_020F40D0 - .word UNK_020F4102 - .word UNK_020F40A0 - .word UNK_020F41C2 - - .text - - thumb_func_start FUN_0203FCF4 -FUN_0203FCF4: ; 0x0203FCF4 - push {r4-r7, lr} - sub sp, #0x84 - add r7, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r7, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - mov r4, #0x0 - add r6, r4, #0x0 - add r5, r4, #0x0 -_0203FD10: - add r0, r7, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - ldr r0, [r0, #0xc] - bl Sav2_PlayerData_GetProfileAddr - add r1, r5, #0x0 - bl PlayerProfile_TestBadgeFlag - cmp r0, #0x1 - bne _0203FD2C - add r0, r6, #0x1 - lsl r0, r0, #0x18 - lsr r6, r0, #0x18 -_0203FD2C: - add r0, r5, #0x1 - lsl r0, r0, #0x18 - lsr r5, r0, #0x18 - cmp r5, #0x8 - blo _0203FD10 - cmp r6, #0x8 - bhi _0203FD70 - add r0, r6, r6 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_0203FD46: ; jump table (using 16-bit offset) - .short _0203FD58 - _0203FD46 - 2; case 0 - .short _0203FD5C - _0203FD46 - 2; case 1 - .short _0203FD5C - _0203FD46 - 2; case 2 - .short _0203FD60 - _0203FD46 - 2; case 3 - .short _0203FD60 - _0203FD46 - 2; case 4 - .short _0203FD64 - _0203FD46 - 2; case 5 - .short _0203FD64 - _0203FD46 - 2; case 6 - .short _0203FD68 - _0203FD46 - 2; case 7 - .short _0203FD6C - _0203FD46 - 2; case 8 -_0203FD58: - mov r1, #0x1 - b _0203FD72 -_0203FD5C: - mov r1, #0x2 - b _0203FD72 -_0203FD60: - mov r1, #0x3 - b _0203FD72 -_0203FD64: - mov r1, #0x4 - b _0203FD72 -_0203FD68: - mov r1, #0x5 - b _0203FD72 -_0203FD6C: - mov r1, #0x6 - b _0203FD72 -_0203FD70: - mov r1, #0x1 -_0203FD72: - ldr r0, _0203FDB4 ; =UNK_020F4218 - mov r2, #0x0 - add r6, sp, #0x4 -_0203FD78: - lsl r3, r2, #0x2 - add r5, r0, r3 - ldrh r3, [r5, #0x2] - cmp r1, r3 - blt _0203FD8E - ldrh r5, [r5, #0x0] - lsl r3, r4, #0x1 - strh r5, [r6, r3] - add r3, r4, #0x1 - lsl r3, r3, #0x18 - lsr r4, r3, #0x18 -_0203FD8E: - add r2, r2, #0x1 - lsl r2, r2, #0x18 - lsr r2, r2, #0x18 - cmp r2, #0x13 - blo _0203FD78 - ldr r1, _0203FDB8 ; =0x0000FFFF - lsl r0, r4, #0x1 - add r2, sp, #0x4 - strh r1, [r2, r0] - mov r3, #0x0 - str r3, [sp, #0x0] - ldr r0, [r7, #0x74] - add r7, #0x80 - ldr r1, [r7, #0x0] - bl MOD06_0223D3D0 - mov r0, #0x1 - add sp, #0x84 - pop {r4-r7, pc} - .balign 4 -_0203FDB4: .word UNK_020F4218 -_0203FDB8: .word 0x0000FFFF - - thumb_func_start FUN_0203FDBC -FUN_0203FDBC: ; 0x0203FDBC - push {r3-r4, lr} - sub sp, #0x4 - add r4, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r4, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r2, r0, #0x0 - ldr r0, _0203FE00 ; =0x0000FFF8 - add r0, r2, r0 - lsl r0, r0, #0x10 - lsr r0, r0, #0x10 - cmp r0, #0x5 - bhi _0203FDE4 - mov r0, #0x1 - b _0203FDE6 -_0203FDE4: - mov r0, #0x0 -_0203FDE6: - lsl r3, r2, #0x2 - str r0, [sp, #0x0] - ldr r2, _0203FE04 ; =UNK_02105E10 - ldr r0, [r4, #0x74] - add r4, #0x80 - ldr r2, [r2, r3] - ldr r1, [r4, #0x0] - mov r3, #0x0 - bl MOD06_0223D3D0 - mov r0, #0x1 - add sp, #0x4 - pop {r3-r4, pc} - .balign 4 -_0203FE00: .word 0x0000FFF8 -_0203FE04: .word UNK_02105E10 - - thumb_func_start FUN_0203FE08 -FUN_0203FE08: ; 0x0203FE08 - push {r3-r4, lr} - sub sp, #0x4 - add r4, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r4, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r2, r0, #0x0 - cmp r2, #0x1 - bhi _0203FE28 - mov r0, #0x1 - b _0203FE2A -_0203FE28: - mov r0, #0x0 -_0203FE2A: - lsl r3, r2, #0x2 - str r0, [sp, #0x0] - ldr r2, _0203FE44 ; =UNK_02105DEC - ldr r0, [r4, #0x74] - add r4, #0x80 - ldr r2, [r2, r3] - ldr r1, [r4, #0x0] - mov r3, #0x1 - bl MOD06_0223D3D0 - mov r0, #0x1 - add sp, #0x4 - pop {r3-r4, pc} - .balign 4 -_0203FE44: .word UNK_02105DEC - - thumb_func_start FUN_0203FE48 -FUN_0203FE48: ; 0x0203FE48 - push {r3-r4, lr} - sub sp, #0x4 - add r4, r0, #0x0 - bl ScriptReadHalfword - add r1, r0, #0x0 - add r0, r4, #0x0 - add r0, #0x80 - ldr r0, [r0, #0x0] - bl VarGet - add r2, r0, #0x0 - mov r0, #0x0 - lsl r3, r2, #0x2 - str r0, [sp, #0x0] - ldr r2, _0203FE7C ; =UNK_02105DF4 - ldr r0, [r4, #0x74] - add r4, #0x80 - ldr r2, [r2, r3] - ldr r1, [r4, #0x0] - mov r3, #0x2 - bl MOD06_0223D3D0 - mov r0, #0x1 - add sp, #0x4 - pop {r3-r4, pc} - .balign 4 -_0203FE7C: .word UNK_02105DF4 - - thumb_func_start FUN_0203FE80 -FUN_0203FE80: ; 0x0203FE80 - push {r3, lr} - add r0, #0x80 - ldr r0, [r0, #0x0] - ldr r0, [r0, #0x10] - bl FUN_02038AD0 - mov r0, #0x1 - pop {r3, pc} diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 4568c590..b0a515ef 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -3,8 +3,8 @@ .text - thumb_func_start FUN_0203FE90 -FUN_0203FE90: ; 0x0203FE90 + thumb_func_start ScrCmd_Unk00F8 +ScrCmd_Unk00F8: ; 0x0203FE90 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -26,8 +26,8 @@ FUN_0203FE90: ; 0x0203FE90 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203FEC0 -FUN_0203FEC0: ; 0x0203FEC0 + thumb_func_start ScrCmd_Unk00F9 +ScrCmd_Unk00F9: ; 0x0203FEC0 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -65,8 +65,8 @@ FUN_0203FEF4: ; 0x0203FEF4 bl FUN_02082158 pop {r4, pc} - thumb_func_start FUN_0203FF10 -FUN_0203FF10: ; 0x0203FF10 + thumb_func_start ScrCmd_Unk00FA +ScrCmd_Unk00FA: ; 0x0203FF10 push {r3-r7, lr} sub sp, #0x38 add r5, r0, #0x0 @@ -185,8 +185,8 @@ FUN_0203FF10: ; 0x0203FF10 add sp, #0x38 pop {r3-r7, pc} - thumb_func_start FUN_02040028 -FUN_02040028: ; 0x02040028 + thumb_func_start ScrCmd_Unk00FB +ScrCmd_Unk00FB: ; 0x02040028 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -220,8 +220,8 @@ FUN_02040028: ; 0x02040028 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02040074 -FUN_02040074: ; 0x02040074 + thumb_func_start ScrCmd_Unk00FC +ScrCmd_Unk00FC: ; 0x02040074 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -258,8 +258,8 @@ FUN_02040074: ; 0x02040074 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_020400C8 -FUN_020400C8: ; 0x020400C8 + thumb_func_start ScrCmd_Unk00FD +ScrCmd_Unk00FD: ; 0x020400C8 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -296,8 +296,8 @@ FUN_020400C8: ; 0x020400C8 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0204011C -FUN_0204011C: ; 0x0204011C + thumb_func_start ScrCmd_Unk00FE +ScrCmd_Unk00FE: ; 0x0204011C push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -334,8 +334,8 @@ FUN_0204011C: ; 0x0204011C pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02040170 -FUN_02040170: ; 0x02040170 + thumb_func_start ScrCmd_Unk00FF +ScrCmd_Unk00FF: ; 0x02040170 push {r4-r6, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -376,8 +376,8 @@ FUN_02040170: ; 0x02040170 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_020401CC -FUN_020401CC: ; 0x020401CC + thumb_func_start ScrCmd_Unk0100 +ScrCmd_Unk0100: ; 0x020401CC push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -405,8 +405,8 @@ FUN_020401F0: ; 0x020401F0 bl FUN_02081EB8 pop {r3, pc} - thumb_func_start FUN_02040204 -FUN_02040204: ; 0x02040204 + thumb_func_start ScrCmd_Unk0101 +ScrCmd_Unk0101: ; 0x02040204 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -420,8 +420,8 @@ FUN_02040204: ; 0x02040204 mov r0, #0x1 pop {r4, pc} - thumb_func_start FUN_02040220 -FUN_02040220: ; 0x02040220 + thumb_func_start ScrCmd_Unk0102 +ScrCmd_Unk0102: ; 0x02040220 push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -448,8 +448,8 @@ FUN_02040220: ; 0x02040220 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0204025C -FUN_0204025C: ; 0x0204025C + thumb_func_start ScrCmd_Unk0103 +ScrCmd_Unk0103: ; 0x0204025C push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -476,8 +476,8 @@ FUN_0204025C: ; 0x0204025C mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02040298 -FUN_02040298: ; 0x02040298 + thumb_func_start ScrCmd_Unk0104 +ScrCmd_Unk0104: ; 0x02040298 push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -504,8 +504,8 @@ FUN_02040298: ; 0x02040298 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_020402D4 -FUN_020402D4: ; 0x020402D4 + thumb_func_start ScrCmd_Unk0105 +ScrCmd_Unk0105: ; 0x020402D4 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -527,8 +527,8 @@ FUN_020402D4: ; 0x020402D4 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02040304 -FUN_02040304: ; 0x02040304 + thumb_func_start ScrCmd_Unk0106 +ScrCmd_Unk0106: ; 0x02040304 push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -555,8 +555,8 @@ FUN_02040304: ; 0x02040304 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02040340 -FUN_02040340: ; 0x02040340 + thumb_func_start ScrCmd_Unk0107 +ScrCmd_Unk0107: ; 0x02040340 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -578,8 +578,8 @@ FUN_02040340: ; 0x02040340 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02040370 -FUN_02040370: ; 0x02040370 + thumb_func_start ScrCmd_Unk0108 +ScrCmd_Unk0108: ; 0x02040370 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -601,8 +601,8 @@ FUN_02040370: ; 0x02040370 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020403A0 -FUN_020403A0: ; 0x020403A0 + thumb_func_start ScrCmd_Unk0109 +ScrCmd_Unk0109: ; 0x020403A0 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -624,8 +624,8 @@ FUN_020403A0: ; 0x020403A0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020403D0 -FUN_020403D0: ; 0x020403D0 + thumb_func_start ScrCmd_Unk010A +ScrCmd_Unk010A: ; 0x020403D0 push {r4-r6, lr} add r4, r0, #0x0 add r0, #0x80 @@ -655,8 +655,8 @@ FUN_020403D0: ; 0x020403D0 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02040414 -FUN_02040414: ; 0x02040414 + thumb_func_start ScrCmd_Unk010B +ScrCmd_Unk010B: ; 0x02040414 push {r4-r6, lr} add r4, r0, #0x0 add r0, #0x80 @@ -686,8 +686,8 @@ FUN_02040414: ; 0x02040414 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_02040458 -FUN_02040458: ; 0x02040458 + thumb_func_start ScrCmd_Unk010C +ScrCmd_Unk010C: ; 0x02040458 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -709,8 +709,8 @@ FUN_02040458: ; 0x02040458 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02040488 -FUN_02040488: ; 0x02040488 + thumb_func_start ScrCmd_Unk0110 +ScrCmd_Unk0110: ; 0x02040488 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -760,8 +760,8 @@ FUN_02040488: ; 0x02040488 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_020404FC -FUN_020404FC: ; 0x020404FC + thumb_func_start ScrCmd_Unk010D +ScrCmd_Unk010D: ; 0x020404FC push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -783,8 +783,8 @@ FUN_020404FC: ; 0x020404FC pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0204052C -FUN_0204052C: ; 0x0204052C + thumb_func_start ScrCmd_Unk010E +ScrCmd_Unk010E: ; 0x0204052C push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -813,8 +813,8 @@ FUN_0204052C: ; 0x0204052C pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0204056C -FUN_0204056C: ; 0x0204056C + thumb_func_start ScrCmd_Unk010F +ScrCmd_Unk010F: ; 0x0204056C push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -836,8 +836,8 @@ FUN_0204056C: ; 0x0204056C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0204059C -FUN_0204059C: ; 0x0204059C + thumb_func_start ScrCmd_Unk0117 +ScrCmd_Unk0117: ; 0x0204059C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -849,8 +849,8 @@ FUN_0204059C: ; 0x0204059C pop {r3, pc} .balign 4 - thumb_func_start FUN_020405B4 -FUN_020405B4: ; 0x020405B4 + thumb_func_start ScrCmd_Unk0118 +ScrCmd_Unk0118: ; 0x020405B4 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -862,8 +862,8 @@ FUN_020405B4: ; 0x020405B4 pop {r3, pc} .balign 4 - thumb_func_start FUN_020405CC -FUN_020405CC: ; 0x020405CC + thumb_func_start ScrCmd_Unk0111 +ScrCmd_Unk0111: ; 0x020405CC push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -883,8 +883,8 @@ FUN_020405CC: ; 0x020405CC mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_020405F8 -FUN_020405F8: ; 0x020405F8 + thumb_func_start ScrCmd_Unk0112 +ScrCmd_Unk0112: ; 0x020405F8 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -917,8 +917,8 @@ _02040632: pop {r3, pc} .balign 4 - thumb_func_start FUN_02040638 -FUN_02040638: ; 0x02040638 + thumb_func_start ScrCmd_Unk0113 +ScrCmd_Unk0113: ; 0x02040638 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -929,8 +929,8 @@ FUN_02040638: ; 0x02040638 pop {r3, pc} .balign 4 - thumb_func_start FUN_0204064C -FUN_0204064C: ; 0x0204064C + thumb_func_start ScrCmd_Unk0114 +ScrCmd_Unk0114: ; 0x0204064C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -941,8 +941,8 @@ FUN_0204064C: ; 0x0204064C pop {r3, pc} .balign 4 - thumb_func_start FUN_02040660 -FUN_02040660: ; 0x02040660 + thumb_func_start ScrCmd_Unk0115 +ScrCmd_Unk0115: ; 0x02040660 push {r4-r5, lr} sub sp, #0x1c add r5, r0, #0x0 @@ -991,8 +991,8 @@ _020406BA: add sp, #0x1c pop {r4-r5, pc} - thumb_func_start FUN_020406C0 -FUN_020406C0: ; 0x020406C0 + thumb_func_start ScrCmd_Unk0116 +ScrCmd_Unk0116: ; 0x020406C0 push {r3, lr} ldr r0, [r0, #0x74] bl MOD06_0224D3E8 diff --git a/arm9/asm/scrcmd_5.s b/arm9/asm/scrcmd_5.s index a1aa5216..2f3bd42c 100644 --- a/arm9/asm/scrcmd_5.s +++ b/arm9/asm/scrcmd_5.s @@ -9,8 +9,8 @@ UNK_021C5A10: ; 0x021C5A10 .text - thumb_func_start FUN_02041194 -FUN_02041194: ; 0x02041194 + thumb_func_start ScrCmd_Unk024E +ScrCmd_Unk024E: ; 0x02041194 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -32,8 +32,8 @@ FUN_02041194: ; 0x02041194 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_020411C4 -FUN_020411C4: ; 0x020411C4 + thumb_func_start ScrCmd_Unk024F +ScrCmd_Unk024F: ; 0x020411C4 push {r4-r7, lr} sub sp, #0x24 add r4, r0, #0x0 @@ -213,8 +213,8 @@ _02041336: .balign 4 _0204133C: .word 0x00000000 - thumb_func_start FUN_02041340 -FUN_02041340: ; 0x02041340 + thumb_func_start ScrCmd_Unk0250 +ScrCmd_Unk0250: ; 0x02041340 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s index 01c0425f..58f8b6dc 100644 --- a/arm9/asm/scrcmd_7.s +++ b/arm9/asm/scrcmd_7.s @@ -3,8 +3,8 @@ .text - thumb_func_start FUN_020416A8 -FUN_020416A8: ; 0x020416A8 + thumb_func_start ScrCmd_Unk00B6 +ScrCmd_Unk00B6: ; 0x020416A8 push {r3-r7, lr} sub sp, #0x18 add r5, r0, #0x0 @@ -91,8 +91,8 @@ _02041748: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02041770 -FUN_02041770: ; 0x02041770 + thumb_func_start ScrCmd_Unk00B7 +ScrCmd_Unk00B7: ; 0x02041770 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -146,8 +146,8 @@ _020417DC: mov r0, #0x1 pop {r4-r6, pc} - thumb_func_start FUN_020417E0 -FUN_020417E0: ; 0x020417E0 + thumb_func_start ScrCmd_Unk00B8 +ScrCmd_Unk00B8: ; 0x020417E0 push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -166,8 +166,8 @@ FUN_020417E0: ; 0x020417E0 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02041808 -FUN_02041808: ; 0x02041808 + thumb_func_start ScrCmd_Unk00B9 +ScrCmd_Unk00B9: ; 0x02041808 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -207,8 +207,8 @@ _02041854: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0204185C -FUN_0204185C: ; 0x0204185C + thumb_func_start ScrCmd_Unk00E4 +ScrCmd_Unk00E4: ; 0x0204185C push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -230,8 +230,8 @@ FUN_0204185C: ; 0x0204185C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0204188C -FUN_0204188C: ; 0x0204188C + thumb_func_start ScrCmd_Unk00E5 +ScrCmd_Unk00E5: ; 0x0204188C push {r3-r7, lr} sub sp, #0x10 add r5, r0, #0x0 @@ -287,8 +287,8 @@ _020418F2: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0204190C -FUN_0204190C: ; 0x0204190C + thumb_func_start ScrCmd_Unk02A0 +ScrCmd_Unk02A0: ; 0x0204190C push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -332,8 +332,8 @@ FUN_0204190C: ; 0x0204190C add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_02041970 -FUN_02041970: ; 0x02041970 + thumb_func_start ScrCmd_Unk00E7 +ScrCmd_Unk00E7: ; 0x02041970 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -396,8 +396,8 @@ _020419EC: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_020419F8 -FUN_020419F8: ; 0x020419F8 + thumb_func_start ScrCmd_Unk00E8 +ScrCmd_Unk00E8: ; 0x020419F8 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -460,8 +460,8 @@ _02041A74: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_02041A80 -FUN_02041A80: ; 0x02041A80 + thumb_func_start ScrCmd_Unk00E9 +ScrCmd_Unk00E9: ; 0x02041A80 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -484,8 +484,8 @@ FUN_02041A80: ; 0x02041A80 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02041AB4 -FUN_02041AB4: ; 0x02041AB4 + thumb_func_start ScrCmd_Unk00EA +ScrCmd_Unk00EA: ; 0x02041AB4 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -499,16 +499,16 @@ FUN_02041AB4: ; 0x02041AB4 pop {r4, pc} .balign 4 - thumb_func_start FUN_02041AD4 -FUN_02041AD4: ; 0x02041AD4 + thumb_func_start ScrCmd_Unk00EB +ScrCmd_Unk00EB: ; 0x02041AD4 push {r3, lr} ldr r0, [r0, #0x74] bl FUN_02048498 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_02041AE0 -FUN_02041AE0: ; 0x02041AE0 + thumb_func_start ScrCmd_Unk00EC +ScrCmd_Unk00EC: ; 0x02041AE0 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -530,8 +530,8 @@ FUN_02041AE0: ; 0x02041AE0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02041B10 -FUN_02041B10: ; 0x02041B10 + thumb_func_start ScrCmd_Unk00ED +ScrCmd_Unk00ED: ; 0x02041B10 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -553,8 +553,8 @@ FUN_02041B10: ; 0x02041B10 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02041B40 -FUN_02041B40: ; 0x02041B40 + thumb_func_start ScrCmd_Unk02BC +ScrCmd_Unk02BC: ; 0x02041B40 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -576,8 +576,8 @@ FUN_02041B40: ; 0x02041B40 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02041B70 -FUN_02041B70: ; 0x02041B70 + thumb_func_start ScrCmd_Unk00EE +ScrCmd_Unk00EE: ; 0x02041B70 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -597,8 +597,8 @@ FUN_02041B70: ; 0x02041B70 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_02041B9C -FUN_02041B9C: ; 0x02041B9C + thumb_func_start ScrCmd_Unk00EF +ScrCmd_Unk00EF: ; 0x02041B9C push {r4, lr} sub sp, #0x8 add r4, r0, #0x0 @@ -618,8 +618,8 @@ FUN_02041B9C: ; 0x02041B9C add sp, #0x8 pop {r4, pc} - thumb_func_start FUN_02041BC4 -FUN_02041BC4: ; 0x02041BC4 + thumb_func_start ScrCmd_Unk00F0 +ScrCmd_Unk00F0: ; 0x02041BC4 push {r3-r5, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -639,8 +639,8 @@ FUN_02041BC4: ; 0x02041BC4 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02041BF0 -FUN_02041BF0: ; 0x02041BF0 + thumb_func_start ScrCmd_Unk00F1 +ScrCmd_Unk00F1: ; 0x02041BF0 push {r3-r7, lr} add r6, r0, #0x0 add r0, #0x80 diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index ad61ab32..bad1ef47 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -33,8 +33,8 @@ UNK_020F4270: ; 0x020F4270 .text - thumb_func_start FUN_02041E40 -FUN_02041E40: ; 0x02041E40 + thumb_func_start ScrCmd_Unk0235 +ScrCmd_Unk0235: ; 0x02041E40 push {r3-r7, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -217,8 +217,8 @@ _02041FD2: nop _02041FD8: .word 0x00000233 - thumb_func_start FUN_02041FDC -FUN_02041FDC: ; 0x02041FDC + thumb_func_start ScrCmd_Unk0236 +ScrCmd_Unk0236: ; 0x02041FDC push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -235,8 +235,8 @@ FUN_02041FDC: ; 0x02041FDC pop {r4, pc} .balign 4 - thumb_func_start FUN_02042000 -FUN_02042000: ; 0x02042000 + thumb_func_start ScrCmd_Unk02B8 +ScrCmd_Unk02B8: ; 0x02042000 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -261,8 +261,8 @@ FUN_02042000: ; 0x02042000 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_02042038 -FUN_02042038: ; 0x02042038 + thumb_func_start ScrCmd_Unk0237 +ScrCmd_Unk0237: ; 0x02042038 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -356,8 +356,8 @@ _02042106: nop _0204210C: .word 0x00000232 - thumb_func_start FUN_02042110 -FUN_02042110: ; 0x02042110 + thumb_func_start ScrCmd_Unk0238 +ScrCmd_Unk0238: ; 0x02042110 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -384,8 +384,8 @@ FUN_02042110: ; 0x02042110 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0204214C -FUN_0204214C: ; 0x0204214C + thumb_func_start ScrCmd_Unk027C +ScrCmd_Unk027C: ; 0x0204214C push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s index d648ac52..af0e7940 100644 --- a/arm9/asm/scrcmd_asm.s +++ b/arm9/asm/scrcmd_asm.s @@ -14,8 +14,8 @@ UNK_021C5A0C: ; 0x021C5A0C .text - thumb_func_start FUN_0203B024 -FUN_0203B024: ; 0x0203B024 + thumb_func_start ScrCmd_Unk02A1 +ScrCmd_Unk02A1: ; 0x0203B024 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -156,8 +156,8 @@ _0203B13E: pop {r3, pc} .balign 4 - thumb_func_start FUN_0203B148 -FUN_0203B148: ; 0x0203B148 + thumb_func_start ScrCmd_Unk005F +ScrCmd_Unk005F: ; 0x0203B148 push {r3, lr} ldr r1, _0203B154 ; =FUN_0203B158 bl SetupNativeScript @@ -244,8 +244,8 @@ _0203B1EC: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203B1F0 -FUN_0203B1F0: ; 0x0203B1F0 + thumb_func_start ScrCmd_Unk0060 +ScrCmd_Unk0060: ; 0x0203B1F0 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -261,7 +261,7 @@ FUN_0203B1F0: ; 0x0203B1F0 b _0203B214 _0203B20E: add r0, r5, #0x0 - bl FUN_0203B2E0 + bl ScrCmd_Unk02B4 _0203B214: mov r0, #0x1 pop {r3-r5, pc} @@ -362,8 +362,8 @@ _0203B2D8: .balign 4 _0203B2DC: .word UNK_021C5A0C - thumb_func_start FUN_0203B2E0 -FUN_0203B2E0: ; 0x0203B2E0 + thumb_func_start ScrCmd_Unk02B4 +ScrCmd_Unk02B4: ; 0x0203B2E0 push {r3-r7, lr} sub sp, #0x8 str r0, [sp, #0x0] @@ -455,8 +455,8 @@ _0203B398: _0203B3A8: .word UNK_021C5A0C _0203B3AC: .word FUN_0203B218 - thumb_func_start FUN_0203B3B0 -FUN_0203B3B0: ; 0x0203B3B0 + thumb_func_start ScrCmd_Unk0061 +ScrCmd_Unk0061: ; 0x0203B3B0 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -465,8 +465,8 @@ FUN_0203B3B0: ; 0x0203B3B0 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203B3C0 -FUN_0203B3C0: ; 0x0203B3C0 + thumb_func_start ScrCmd_Unk0062 +ScrCmd_Unk0062: ; 0x0203B3C0 push {r4, lr} add r1, r0, #0x0 add r1, #0x80 @@ -479,8 +479,8 @@ FUN_0203B3C0: ; 0x0203B3C0 mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_0203B3DC -FUN_0203B3DC: ; 0x0203B3DC + thumb_func_start ScrCmd_Unk0063 +ScrCmd_Unk0063: ; 0x0203B3DC push {r4, lr} add r1, r0, #0x0 add r1, #0x80 @@ -493,8 +493,8 @@ FUN_0203B3DC: ; 0x0203B3DC mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_0203B3F8 -FUN_0203B3F8: ; 0x0203B3F8 + thumb_func_start ScrCmd_Unk0064 +ScrCmd_Unk0064: ; 0x0203B3F8 push {r3-r6, lr} sub sp, #0x4 add r4, r0, #0x0 @@ -527,8 +527,8 @@ _0203B43A: add sp, #0x4 pop {r3-r6, pc} - thumb_func_start FUN_0203B440 -FUN_0203B440: ; 0x0203B440 + thumb_func_start ScrCmd_Unk0065 +ScrCmd_Unk0065: ; 0x0203B440 push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -546,8 +546,8 @@ FUN_0203B440: ; 0x0203B440 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203B468 -FUN_0203B468: ; 0x0203B468 + thumb_func_start ScrCmd_Unk0066 +ScrCmd_Unk0066: ; 0x0203B468 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 @@ -613,8 +613,8 @@ FUN_0203B468: ; 0x0203B468 pop {r4-r7, pc} .balign 4 - thumb_func_start FUN_0203B500 -FUN_0203B500: ; 0x0203B500 + thumb_func_start ScrCmd_Unk0067 +ScrCmd_Unk0067: ; 0x0203B500 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -644,8 +644,8 @@ FUN_0203B500: ; 0x0203B500 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203B544 -FUN_0203B544: ; 0x0203B544 + thumb_func_start ScrCmd_Unk0068 +ScrCmd_Unk0068: ; 0x0203B544 push {r3-r5, lr} add r0, #0x80 ldr r5, [r0, #0x0] @@ -668,8 +668,8 @@ _0203B568: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203B574 -FUN_0203B574: ; 0x0203B574 + thumb_func_start ScrCmd_Unk0069 +ScrCmd_Unk0069: ; 0x0203B574 push {r4-r6, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -699,8 +699,8 @@ FUN_0203B574: ; 0x0203B574 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203B5B8 -FUN_0203B5B8: ; 0x0203B5B8 + thumb_func_start ScrCmd_Unk006A +ScrCmd_Unk006A: ; 0x0203B5B8 push {r4-r6, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -741,8 +741,8 @@ FUN_0203B5B8: ; 0x0203B5B8 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203B618 -FUN_0203B618: ; 0x0203B618 + thumb_func_start ScrCmd_Unk01BD +ScrCmd_Unk01BD: ; 0x0203B618 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -761,8 +761,8 @@ FUN_0203B618: ; 0x0203B618 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203B640 -FUN_0203B640: ; 0x0203B640 + thumb_func_start ScrCmd_Unk006B +ScrCmd_Unk006B: ; 0x0203B640 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 @@ -860,8 +860,8 @@ _0203B6F8: pop {r4-r7, pc} .balign 4 - thumb_func_start FUN_0203B724 -FUN_0203B724: ; 0x0203B724 + thumb_func_start ScrCmd_Unk006C +ScrCmd_Unk006C: ; 0x0203B724 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -885,8 +885,8 @@ FUN_0203B724: ; 0x0203B724 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203B758 -FUN_0203B758: ; 0x0203B758 + thumb_func_start ScrCmd_Unk006D +ScrCmd_Unk006D: ; 0x0203B758 push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -911,8 +911,8 @@ FUN_0203B758: ; 0x0203B758 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203B790 -FUN_0203B790: ; 0x0203B790 + thumb_func_start ScrCmd_Unk02AD +ScrCmd_Unk02AD: ; 0x0203B790 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -945,8 +945,8 @@ _0203B7D2: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203B7D8 -FUN_0203B7D8: ; 0x0203B7D8 + thumb_func_start ScrCmd_Unk006E +ScrCmd_Unk006E: ; 0x0203B7D8 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -958,8 +958,8 @@ FUN_0203B7D8: ; 0x0203B7D8 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203B7F0 -FUN_0203B7F0: ; 0x0203B7F0 + thumb_func_start ScrCmd_Unk02AB +ScrCmd_Unk02AB: ; 0x0203B7F0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -979,8 +979,8 @@ FUN_0203B7F0: ; 0x0203B7F0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203B81C -FUN_0203B81C: ; 0x0203B81C + thumb_func_start ScrCmd_Unk0093 +ScrCmd_Unk0093: ; 0x0203B81C push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -1008,8 +1008,8 @@ FUN_0203B81C: ; 0x0203B81C mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203B85C -FUN_0203B85C: ; 0x0203B85C + thumb_func_start ScrCmd_Unk0094 +ScrCmd_Unk0094: ; 0x0203B85C push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -1039,8 +1039,8 @@ FUN_0203B85C: ; 0x0203B85C pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203B8A0 -FUN_0203B8A0: ; 0x0203B8A0 + thumb_func_start ScrCmd_Unk0095 +ScrCmd_Unk0095: ; 0x0203B8A0 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -1069,8 +1069,8 @@ FUN_0203B8A0: ; 0x0203B8A0 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203B8E4 -FUN_0203B8E4: ; 0x0203B8E4 + thumb_func_start ScrCmd_Unk0191 +ScrCmd_Unk0191: ; 0x0203B8E4 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -1092,8 +1092,8 @@ FUN_0203B8E4: ; 0x0203B8E4 nop _0203B910: .word FUN_0203BC04 - thumb_func_start FUN_0203B914 -FUN_0203B914: ; 0x0203B914 + thumb_func_start ScrCmd_Unk02A5 +ScrCmd_Unk02A5: ; 0x0203B914 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -1115,8 +1115,8 @@ FUN_0203B914: ; 0x0203B914 nop _0203B940: .word FUN_0203BC04 - thumb_func_start FUN_0203B944 -FUN_0203B944: ; 0x0203B944 + thumb_func_start ScrCmd_Unk0192 +ScrCmd_Unk0192: ; 0x0203B944 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -1134,8 +1134,8 @@ FUN_0203B944: ; 0x0203B944 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203B968 -FUN_0203B968: ; 0x0203B968 + thumb_func_start ScrCmd_Unk0193 +ScrCmd_Unk0193: ; 0x0203B968 push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -1171,8 +1171,8 @@ _0203B9A6: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203B9B4 -FUN_0203B9B4: ; 0x0203B9B4 + thumb_func_start ScrCmd_Unk0194 +ScrCmd_Unk0194: ; 0x0203B9B4 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 @@ -1231,8 +1231,8 @@ FUN_0203B9B4: ; 0x0203B9B4 .balign 4 _0203BA38: .word FUN_0203BC04 - thumb_func_start FUN_0203BA3C -FUN_0203BA3C: ; 0x0203BA3C + thumb_func_start ScrCmd_Unk0195 +ScrCmd_Unk0195: ; 0x0203BA3C push {r4-r6, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -1287,8 +1287,8 @@ _0203BAA2: str r0, [r4, #0x0] pop {r4-r6, pc} - thumb_func_start FUN_0203BAB0 -FUN_0203BAB0: ; 0x0203BAB0 + thumb_func_start ScrCmd_Unk0196 +ScrCmd_Unk0196: ; 0x0203BAB0 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -1318,8 +1318,8 @@ FUN_0203BAB0: ; 0x0203BAB0 nop _0203BAF0: .word FUN_0203BC04 - thumb_func_start FUN_0203BAF4 -FUN_0203BAF4: ; 0x0203BAF4 + thumb_func_start ScrCmd_Unk0197 +ScrCmd_Unk0197: ; 0x0203BAF4 push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -1348,8 +1348,8 @@ _0203BB20: str r0, [r4, #0x0] pop {r3-r5, pc} - thumb_func_start FUN_0203BB34 -FUN_0203BB34: ; 0x0203BB34 + thumb_func_start ScrCmd_Unk009B +ScrCmd_Unk009B: ; 0x0203BB34 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -1383,23 +1383,23 @@ FUN_0203BB34: ; 0x0203BB34 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203BB80 -FUN_0203BB80: ; 0x0203BB80 + thumb_func_start ScrCmd_Unk009C +ScrCmd_Unk009C: ; 0x0203BB80 mov r0, #0x0 bx lr - thumb_func_start FUN_0203BB84 -FUN_0203BB84: ; 0x0203BB84 + thumb_func_start ScrCmd_Unk009D +ScrCmd_Unk009D: ; 0x0203BB84 mov r0, #0x0 bx lr - thumb_func_start FUN_0203BB88 -FUN_0203BB88: ; 0x0203BB88 + thumb_func_start ScrCmd_Unk009E +ScrCmd_Unk009E: ; 0x0203BB88 mov r0, #0x1 bx lr - thumb_func_start FUN_0203BB8C -FUN_0203BB8C: ; 0x0203BB8C + thumb_func_start ScrCmd_Unk009F +ScrCmd_Unk009F: ; 0x0203BB8C mov r0, #0x0 bx lr @@ -1477,8 +1477,8 @@ _0203BC16: pop {r3, pc} .balign 4 - thumb_func_start FUN_0203BC1C -FUN_0203BC1C: ; 0x0203BC1C + thumb_func_start ScrCmd_Unk00A1 +ScrCmd_Unk00A1: ; 0x0203BC1C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -1487,8 +1487,8 @@ FUN_0203BC1C: ; 0x0203BC1C mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203BC2C -FUN_0203BC2C: ; 0x0203BC2C + thumb_func_start ScrCmd_Unk01F8 +ScrCmd_Unk01F8: ; 0x0203BC2C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -1564,8 +1564,8 @@ _0203BC90: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203BCBC -FUN_0203BCBC: ; 0x0203BCBC + thumb_func_start ScrCmd_Unk00A2 +ScrCmd_Unk00A2: ; 0x0203BCBC push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -1574,16 +1574,16 @@ FUN_0203BCBC: ; 0x0203BCBC pop {r3, pc} .balign 4 - thumb_func_start FUN_0203BCCC -FUN_0203BCCC: ; 0x0203BCCC + thumb_func_start ScrCmd_Unk00A3 +ScrCmd_Unk00A3: ; 0x0203BCCC push {r3, lr} ldr r0, [r0, #0x74] bl FUN_0206F3B8 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203BCD8 -FUN_0203BCD8: ; 0x0203BCD8 + thumb_func_start ScrCmd_Unk00A4 +ScrCmd_Unk00A4: ; 0x0203BCD8 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -1605,8 +1605,8 @@ FUN_0203BCD8: ; 0x0203BCD8 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203BD08 -FUN_0203BD08: ; 0x0203BD08 + thumb_func_start ScrCmd_Unk0207 +ScrCmd_Unk0207: ; 0x0203BD08 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -1621,8 +1621,8 @@ FUN_0203BD08: ; 0x0203BD08 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203BD28 -FUN_0203BD28: ; 0x0203BD28 + thumb_func_start ScrCmd_Unk0208 +ScrCmd_Unk0208: ; 0x0203BD28 push {r4-r7, lr} sub sp, #0x14 add r5, r0, #0x0 @@ -1688,8 +1688,8 @@ FUN_0203BD28: ; 0x0203BD28 .balign 4 _0203BDB4: .word 0x000003D9 - thumb_func_start FUN_0203BDB8 -FUN_0203BDB8: ; 0x0203BDB8 + thumb_func_start ScrCmd_Unk028C +ScrCmd_Unk028C: ; 0x0203BDB8 push {r4-r6, lr} sub sp, #0x10 add r5, r0, #0x0 @@ -1758,8 +1758,8 @@ FUN_0203BDB8: ; 0x0203BDB8 .balign 4 _0203BE4C: .word 0x000003D9 - thumb_func_start FUN_0203BE50 -FUN_0203BE50: ; 0x0203BE50 + thumb_func_start ScrCmd_Unk0209 +ScrCmd_Unk0209: ; 0x0203BE50 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -1772,8 +1772,8 @@ FUN_0203BE50: ; 0x0203BE50 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203BE68 -FUN_0203BE68: ; 0x0203BE68 + thumb_func_start ScrCmd_Unk028D +ScrCmd_Unk028D: ; 0x0203BE68 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -1786,8 +1786,8 @@ FUN_0203BE68: ; 0x0203BE68 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203BE80 -FUN_0203BE80: ; 0x0203BE80 + thumb_func_start ScrCmd_Unk028E +ScrCmd_Unk028E: ; 0x0203BE80 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -1826,8 +1826,8 @@ _0203BEC8: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203BECC -FUN_0203BECC: ; 0x0203BECC + thumb_func_start ScrCmd_Unk020A +ScrCmd_Unk020A: ; 0x0203BECC push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -1851,8 +1851,8 @@ FUN_0203BECC: ; 0x0203BECC pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203BF00 -FUN_0203BF00: ; 0x0203BF00 + thumb_func_start ScrCmd_Unk020B +ScrCmd_Unk020B: ; 0x0203BF00 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -1869,16 +1869,16 @@ _0203BF1C: mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_0203BF20 -FUN_0203BF20: ; 0x0203BF20 + thumb_func_start ScrCmd_Unk00A5 +ScrCmd_Unk00A5: ; 0x0203BF20 push {r3, lr} ldr r0, [r0, #0x74] bl FUN_0208A338 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203BF2C -FUN_0203BF2C: ; 0x0203BF2C + thumb_func_start ScrCmd_Unk00A6 +ScrCmd_Unk00A6: ; 0x0203BF2C push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 @@ -1917,8 +1917,8 @@ FUN_0203BF2C: ; 0x0203BF2C pop {r3-r6, pc} .balign 4 - thumb_func_start FUN_0203BF84 -FUN_0203BF84: ; 0x0203BF84 + thumb_func_start ScrCmd_Unk00A7 +ScrCmd_Unk00A7: ; 0x0203BF84 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -1966,8 +1966,8 @@ _0203BFCC: .balign 4 _0203BFE8: .word FUN_0203BB90 - thumb_func_start FUN_0203BFEC -FUN_0203BFEC: ; 0x0203BFEC + thumb_func_start ScrCmd_Unk00A8 +ScrCmd_Unk00A8: ; 0x0203BFEC push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2015,8 +2015,8 @@ _0203C034: .balign 4 _0203C050: .word FUN_0203BB90 - thumb_func_start FUN_0203C054 -FUN_0203C054: ; 0x0203C054 + thumb_func_start ScrCmd_Unk012E +ScrCmd_Unk012E: ; 0x0203C054 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -2045,8 +2045,8 @@ _0203C088: mov r0, #0x1 pop {r4-r6, pc} - thumb_func_start FUN_0203C090 -FUN_0203C090: ; 0x0203C090 + thumb_func_start ScrCmd_Unk012F +ScrCmd_Unk012F: ; 0x0203C090 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -2075,8 +2075,8 @@ _0203C0C4: mov r0, #0x1 pop {r4-r6, pc} - thumb_func_start FUN_0203C0CC -FUN_0203C0CC: ; 0x0203C0CC + thumb_func_start ScrCmd_Unk0130 +ScrCmd_Unk0130: ; 0x0203C0CC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -2097,8 +2097,8 @@ FUN_0203C0CC: ; 0x0203C0CC mov r0, #0x1 pop {r3-r5, pc} - thumb_func_start FUN_0203C0FC -FUN_0203C0FC: ; 0x0203C0FC + thumb_func_start ScrCmd_Unk0205 +ScrCmd_Unk0205: ; 0x0203C0FC push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -2112,8 +2112,8 @@ FUN_0203C0FC: ; 0x0203C0FC .balign 4 _0203C114: .word FUN_0203BC04 - thumb_func_start FUN_0203C118 -FUN_0203C118: ; 0x0203C118 + thumb_func_start ScrCmd_Unk00A9 +ScrCmd_Unk00A9: ; 0x0203C118 push {r3, lr} add r1, r0, #0x0 ldr r0, [r1, #0x74] @@ -2124,8 +2124,8 @@ FUN_0203C118: ; 0x0203C118 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203C12C -FUN_0203C12C: ; 0x0203C12C + thumb_func_start ScrCmd_Unk00AA +ScrCmd_Unk00AA: ; 0x0203C12C push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2157,8 +2157,8 @@ FUN_0203C12C: ; 0x0203C12C nop _0203C170: .word FUN_0203BB90 - thumb_func_start FUN_0203C174 -FUN_0203C174: ; 0x0203C174 + thumb_func_start ScrCmd_Unk01D7 +ScrCmd_Unk01D7: ; 0x0203C174 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2184,8 +2184,8 @@ FUN_0203C174: ; 0x0203C174 .balign 4 _0203C1A8: .word FUN_0203BB90 - thumb_func_start FUN_0203C1AC -FUN_0203C1AC: ; 0x0203C1AC + thumb_func_start ScrCmd_Unk01D8 +ScrCmd_Unk01D8: ; 0x0203C1AC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -2225,8 +2225,8 @@ _0203C1FA: strh r0, [r4, #0x0] pop {r3-r5, pc} - thumb_func_start FUN_0203C200 -FUN_0203C200: ; 0x0203C200 + thumb_func_start ScrCmd_Unk01D9 +ScrCmd_Unk01D9: ; 0x0203C200 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -2279,8 +2279,8 @@ FUN_0203C200: ; 0x0203C200 .balign 4 _0203C274: .word FUN_0203BB90 - thumb_func_start ScrCmd_monstoragepc -ScrCmd_monstoragepc: ; 0x0203C278 + thumb_func_start ScrCmd_MonStoragePC +ScrCmd_MonStoragePC: ; 0x0203C278 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2315,8 +2315,8 @@ ScrCmd_monstoragepc: ; 0x0203C278 nop _0203C2C0: .word FUN_0203BBBC - thumb_func_start FUN_0203C2C4 -FUN_0203C2C4: ; 0x0203C2C4 + thumb_func_start ScrCmd_Unk00AC +ScrCmd_Unk00AC: ; 0x0203C2C4 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -2330,8 +2330,8 @@ FUN_0203C2C4: ; 0x0203C2C4 .balign 4 _0203C2DC: .word FUN_0203BC04 - thumb_func_start FUN_0203C2E0 -FUN_0203C2E0: ; 0x0203C2E0 + thumb_func_start ScrCmd_Unk00AD +ScrCmd_Unk00AD: ; 0x0203C2E0 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -2340,8 +2340,8 @@ FUN_0203C2E0: ; 0x0203C2E0 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203C2F0 -FUN_0203C2F0: ; 0x0203C2F0 + thumb_func_start ScrCmd_Unk00AE +ScrCmd_Unk00AE: ; 0x0203C2F0 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -2350,8 +2350,8 @@ FUN_0203C2F0: ; 0x0203C2F0 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203C300 -FUN_0203C300: ; 0x0203C300 + thumb_func_start ScrCmd_Unk00AF +ScrCmd_Unk00AF: ; 0x0203C300 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2372,8 +2372,8 @@ FUN_0203C300: ; 0x0203C300 .balign 4 _0203C328: .word FUN_0203BB90 - thumb_func_start ScrCmd_halloffame -ScrCmd_halloffame: ; 0x0203C32C + thumb_func_start ScrCmd_HallOfFame +ScrCmd_HallOfFame: ; 0x0203C32C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -2382,8 +2382,8 @@ ScrCmd_halloffame: ; 0x0203C32C mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203C33C -FUN_0203C33C: ; 0x0203C33C + thumb_func_start ScrCmd_Unk00B1 +ScrCmd_Unk00B1: ; 0x0203C33C push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2404,8 +2404,8 @@ FUN_0203C33C: ; 0x0203C33C .balign 4 _0203C364: .word FUN_0203BB90 - thumb_func_start FUN_0203C368 -FUN_0203C368: ; 0x0203C368 + thumb_func_start ScrCmd_Unk00B2 +ScrCmd_Unk00B2: ; 0x0203C368 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -2450,8 +2450,8 @@ _0203C3C0: .balign 4 _0203C3C4: .word FUN_0203BC04 - thumb_func_start FUN_0203C3C8 -FUN_0203C3C8: ; 0x0203C3C8 + thumb_func_start ScrCmd_Unk00B3 +ScrCmd_Unk00B3: ; 0x0203C3C8 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -2466,8 +2466,8 @@ FUN_0203C3C8: ; 0x0203C3C8 mov r0, #0x1 pop {r4, pc} - thumb_func_start FUN_0203C3E8 -FUN_0203C3E8: ; 0x0203C3E8 + thumb_func_start ScrCmd_Unk00B4 +ScrCmd_Unk00B4: ; 0x0203C3E8 push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2499,8 +2499,8 @@ FUN_0203C3E8: ; 0x0203C3E8 nop _0203C42C: .word FUN_0203BC04 - thumb_func_start FUN_0203C430 -FUN_0203C430: ; 0x0203C430 + thumb_func_start ScrCmd_Unk00B5 +ScrCmd_Unk00B5: ; 0x0203C430 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2522,8 +2522,8 @@ FUN_0203C430: ; 0x0203C430 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203C460 -FUN_0203C460: ; 0x0203C460 + thumb_func_start ScrCmd_Unk0178 +ScrCmd_Unk0178: ; 0x0203C460 push {r4-r6, lr} add r5, r0, #0x0 ldr r1, [r5, #0x8] @@ -2564,8 +2564,8 @@ _0203C492: .balign 4 _0203C4AC: .word FUN_0203BC04 - thumb_func_start FUN_0203C4B0 -FUN_0203C4B0: ; 0x0203C4B0 + thumb_func_start ScrCmd_Unk0179 +ScrCmd_Unk0179: ; 0x0203C4B0 push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -2594,8 +2594,8 @@ _0203C4DC: str r0, [r4, #0x0] pop {r3-r5, pc} - thumb_func_start FUN_0203C4F0 -FUN_0203C4F0: ; 0x0203C4F0 + thumb_func_start ScrCmd_Unk00BA +ScrCmd_Unk00BA: ; 0x0203C4F0 push {r3-r4, lr} sub sp, #0xc add r4, r0, #0x0 @@ -2618,8 +2618,8 @@ FUN_0203C4F0: ; 0x0203C4F0 pop {r3-r4, pc} .balign 4 - thumb_func_start FUN_0203C520 -FUN_0203C520: ; 0x0203C520 + thumb_func_start ScrCmd_Unk00BB +ScrCmd_Unk00BB: ; 0x0203C520 push {r4-r7, lr} sub sp, #0x34 add r5, r0, #0x0 @@ -2666,8 +2666,8 @@ FUN_0203C520: ; 0x0203C520 add sp, #0x34 pop {r4-r7, pc} - thumb_func_start FUN_0203C58C -FUN_0203C58C: ; 0x0203C58C + thumb_func_start ScrCmd_Unk0271 +ScrCmd_Unk0271: ; 0x0203C58C push {r3-r4, lr} sub sp, #0xc add r4, r0, #0x0 @@ -2690,8 +2690,8 @@ FUN_0203C58C: ; 0x0203C58C pop {r3-r4, pc} .balign 4 - thumb_func_start FUN_0203C5BC -FUN_0203C5BC: ; 0x0203C5BC + thumb_func_start ScrCmd_Unk0243 +ScrCmd_Unk0243: ; 0x0203C5BC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -2729,8 +2729,8 @@ FUN_0203C5BC: ; 0x0203C5BC nop _0203C610: .word 0x0000FFFF - thumb_func_start FUN_0203C614 -FUN_0203C614: ; 0x0203C614 + thumb_func_start ScrCmd_Unk0244 +ScrCmd_Unk0244: ; 0x0203C614 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -2777,8 +2777,8 @@ FUN_0203C614: ; 0x0203C614 .balign 4 _0203C67C: .word 0x0000FFFF - thumb_func_start FUN_0203C680 -FUN_0203C680: ; 0x0203C680 + thumb_func_start ScrCmd_Unk0245 +ScrCmd_Unk0245: ; 0x0203C680 push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -2808,8 +2808,8 @@ FUN_0203C680: ; 0x0203C680 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203C6C4 -FUN_0203C6C4: ; 0x0203C6C4 + thumb_func_start ScrCmd_Unk00BC +ScrCmd_Unk00BC: ; 0x0203C6C4 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 @@ -2840,8 +2840,8 @@ FUN_0203C6C4: ; 0x0203C6C4 add sp, #0xc pop {r4-r7, pc} - thumb_func_start FUN_0203C70C -FUN_0203C70C: ; 0x0203C70C + thumb_func_start ScrCmd_Unk00BD +ScrCmd_Unk00BD: ; 0x0203C70C push {r3, lr} ldr r1, _0203C718 ; =FUN_0203C71C bl SetupNativeScript @@ -2863,8 +2863,8 @@ _0203C72A: pop {r3, pc} .balign 4 - thumb_func_start FUN_0203C730 -FUN_0203C730: ; 0x0203C730 + thumb_func_start ScrCmd_Unk00BE +ScrCmd_Unk00BE: ; 0x0203C730 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -2902,8 +2902,8 @@ FUN_0203C730: ; 0x0203C730 add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_0203C788 -FUN_0203C788: ; 0x0203C788 + thumb_func_start ScrCmd_Unk0203 +ScrCmd_Unk0203: ; 0x0203C788 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -2943,8 +2943,8 @@ FUN_0203C788: ; 0x0203C788 add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_0203C7E4 -FUN_0203C7E4: ; 0x0203C7E4 + thumb_func_start ScrCmd_Unk0204 +ScrCmd_Unk0204: ; 0x0203C7E4 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -2953,8 +2953,8 @@ FUN_0203C7E4: ; 0x0203C7E4 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203C7F4 -FUN_0203C7F4: ; 0x0203C7F4 + thumb_func_start ScrCmd_Unk0200 +ScrCmd_Unk0200: ; 0x0203C7F4 push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -2974,8 +2974,8 @@ FUN_0203C7F4: ; 0x0203C7F4 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203C820 -FUN_0203C820: ; 0x0203C820 + thumb_func_start ScrCmd_Unk0201 +ScrCmd_Unk0201: ; 0x0203C820 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -2993,8 +2993,8 @@ FUN_0203C820: ; 0x0203C820 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203C844 -FUN_0203C844: ; 0x0203C844 + thumb_func_start ScrCmd_Unk00BF +ScrCmd_Unk00BF: ; 0x0203C844 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -3016,8 +3016,8 @@ FUN_0203C844: ; 0x0203C844 mov r0, #0x1 pop {r3-r5, pc} - thumb_func_start FUN_0203C874 -FUN_0203C874: ; 0x0203C874 + thumb_func_start ScrCmd_Unk00C0 +ScrCmd_Unk00C0: ; 0x0203C874 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3046,8 +3046,8 @@ FUN_0203C874: ; 0x0203C874 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203C8B4 -FUN_0203C8B4: ; 0x0203C8B4 + thumb_func_start ScrCmd_Unk00C1 +ScrCmd_Unk00C1: ; 0x0203C8B4 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -3069,8 +3069,8 @@ FUN_0203C8B4: ; 0x0203C8B4 mov r0, #0x1 pop {r3-r5, pc} - thumb_func_start FUN_0203C8E4 -FUN_0203C8E4: ; 0x0203C8E4 + thumb_func_start ScrCmd_Unk00C2 +ScrCmd_Unk00C2: ; 0x0203C8E4 push {r4-r6, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -3104,8 +3104,8 @@ FUN_0203C8E4: ; 0x0203C8E4 add sp, #0x8 pop {r4-r6, pc} - thumb_func_start FUN_0203C930 -FUN_0203C930: ; 0x0203C930 + thumb_func_start ScrCmd_Unk00C3 +ScrCmd_Unk00C3: ; 0x0203C930 push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -3127,8 +3127,8 @@ FUN_0203C930: ; 0x0203C930 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203C960 -FUN_0203C960: ; 0x0203C960 + thumb_func_start ScrCmd_Unk00C4 +ScrCmd_Unk00C4: ; 0x0203C960 push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -3150,8 +3150,8 @@ FUN_0203C960: ; 0x0203C960 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203C990 -FUN_0203C990: ; 0x0203C990 + thumb_func_start ScrCmd_Unk00C5 +ScrCmd_Unk00C5: ; 0x0203C990 push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3217,16 +3217,16 @@ _0203CA1A: pop {r4, pc} .balign 4 - thumb_func_start FUN_0203CA20 -FUN_0203CA20: ; 0x0203CA20 + thumb_func_start ScrCmd_Unk00C6 +ScrCmd_Unk00C6: ; 0x0203CA20 push {r3, lr} ldr r0, [r0, #0x74] bl MOD05_021E7030 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203CA2C -FUN_0203CA2C: ; 0x0203CA2C + thumb_func_start ScrCmd_Unk00C7 +ScrCmd_Unk00C7: ; 0x0203CA2C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -3251,8 +3251,8 @@ _0203CA56: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203CA5C -FUN_0203CA5C: ; 0x0203CA5C + thumb_func_start ScrCmd_Unk00C8 +ScrCmd_Unk00C8: ; 0x0203CA5C push {r4, lr} add r4, r0, #0x0 ldr r1, [r4, #0x8] @@ -3317,8 +3317,8 @@ _0203CAE4: mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_0203CAE8 -FUN_0203CAE8: ; 0x0203CAE8 + thumb_func_start ScrCmd_Unk02BF +ScrCmd_Unk02BF: ; 0x0203CAE8 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -3334,8 +3334,8 @@ FUN_0203CAE8: ; 0x0203CAE8 mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_0203CB08 -FUN_0203CB08: ; 0x0203CB08 + thumb_func_start ScrCmd_Unk00C9 +ScrCmd_Unk00C9: ; 0x0203CB08 push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 @@ -3348,8 +3348,8 @@ FUN_0203CB08: ; 0x0203CB08 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203CB20 -FUN_0203CB20: ; 0x0203CB20 + thumb_func_start ScrCmd_Unk00CA +ScrCmd_Unk00CA: ; 0x0203CB20 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -3368,8 +3368,8 @@ FUN_0203CB20: ; 0x0203CB20 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203CB48 -FUN_0203CB48: ; 0x0203CB48 + thumb_func_start ScrCmd_Unk00CB +ScrCmd_Unk00CB: ; 0x0203CB48 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -3381,8 +3381,8 @@ FUN_0203CB48: ; 0x0203CB48 mov r0, #0x1 pop {r4, pc} - thumb_func_start FUN_0203CB60 -FUN_0203CB60: ; 0x0203CB60 + thumb_func_start ScrCmd_Unk00CC +ScrCmd_Unk00CC: ; 0x0203CB60 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -3391,8 +3391,8 @@ FUN_0203CB60: ; 0x0203CB60 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203CB70 -FUN_0203CB70: ; 0x0203CB70 + thumb_func_start ScrCmd_Unk00E3 +ScrCmd_Unk00E3: ; 0x0203CB70 push {r4-r6, lr} add r4, r0, #0x0 add r0, #0x80 @@ -3425,8 +3425,8 @@ FUN_0203CB70: ; 0x0203CB70 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203CBBC -FUN_0203CBBC: ; 0x0203CBBC + thumb_func_start ScrCmd_Unk00DE +ScrCmd_Unk00DE: ; 0x0203CBBC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -3446,8 +3446,8 @@ FUN_0203CBBC: ; 0x0203CBBC pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203CBE8 -FUN_0203CBE8: ; 0x0203CBE8 + thumb_func_start ScrCmd_Unk00E6 +ScrCmd_Unk00E6: ; 0x0203CBE8 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3514,8 +3514,8 @@ FUN_0203CBE8: ; 0x0203CBE8 .balign 4 _0203CC84: .word FUN_0203A2F0 - thumb_func_start FUN_0203CC88 -FUN_0203CC88: ; 0x0203CC88 + thumb_func_start ScrCmd_Unk00F2 +ScrCmd_Unk00F2: ; 0x0203CC88 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -3585,8 +3585,8 @@ _0203CD18: pop {r4, pc} .balign 4 - thumb_func_start FUN_0203CD20 -FUN_0203CD20: ; 0x0203CD20 + thumb_func_start ScrCmd_Unk00F3 +ScrCmd_Unk00F3: ; 0x0203CD20 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -3656,24 +3656,24 @@ _0203CDB0: pop {r4, pc} .balign 4 - thumb_func_start FUN_0203CDB8 -FUN_0203CDB8: ; 0x0203CDB8 + thumb_func_start ScrCmd_Unk00F4 +ScrCmd_Unk00F4: ; 0x0203CDB8 push {r3, lr} bl ScriptReadHalfword mov r0, #0x1 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203CDC4 -FUN_0203CDC4: ; 0x0203CDC4 + thumb_func_start ScrCmd_Unk00F5 +ScrCmd_Unk00F5: ; 0x0203CDC4 push {r3, lr} bl ScriptReadHalfword mov r0, #0x1 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203CDD0 -FUN_0203CDD0: ; 0x0203CDD0 + thumb_func_start ScrCmd_Unk00F6 +ScrCmd_Unk00F6: ; 0x0203CDD0 push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3696,16 +3696,16 @@ FUN_0203CDD0: ; 0x0203CDD0 mov r0, #0x1 pop {r4-r6, pc} - thumb_func_start FUN_0203CE00 -FUN_0203CE00: ; 0x0203CE00 + thumb_func_start ScrCmd_Unk00F7 +ScrCmd_Unk00F7: ; 0x0203CE00 push {r3, lr} ldr r0, [r0, #0x74] bl FUN_02080C38 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203CE0C -FUN_0203CE0C: ; 0x0203CE0C + thumb_func_start ScrCmd_Unk011B +ScrCmd_Unk011B: ; 0x0203CE0C push {r3-r4, lr} sub sp, #0x14 add r4, r0, #0x0 @@ -3759,8 +3759,8 @@ FUN_0203CE0C: ; 0x0203CE0C pop {r3-r4, pc} .balign 4 - thumb_func_start FUN_0203CE8C -FUN_0203CE8C: ; 0x0203CE8C + thumb_func_start ScrCmd_Unk011C +ScrCmd_Unk011C: ; 0x0203CE8C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -3781,8 +3781,8 @@ FUN_0203CE8C: ; 0x0203CE8C mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203CEBC -FUN_0203CEBC: ; 0x0203CEBC + thumb_func_start ScrCmd_Unk011D +ScrCmd_Unk011D: ; 0x0203CEBC push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -3816,8 +3816,8 @@ FUN_0203CEBC: ; 0x0203CEBC add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_0203CF04 -FUN_0203CF04: ; 0x0203CF04 + thumb_func_start ScrCmd_Unk011E +ScrCmd_Unk011E: ; 0x0203CF04 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3839,8 +3839,8 @@ FUN_0203CF04: ; 0x0203CF04 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203CF34 -FUN_0203CF34: ; 0x0203CF34 + thumb_func_start ScrCmd_Unk011F +ScrCmd_Unk011F: ; 0x0203CF34 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3862,8 +3862,8 @@ FUN_0203CF34: ; 0x0203CF34 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203CF64 -FUN_0203CF64: ; 0x0203CF64 + thumb_func_start ScrCmd_Unk0120 +ScrCmd_Unk0120: ; 0x0203CF64 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3885,8 +3885,8 @@ FUN_0203CF64: ; 0x0203CF64 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203CF94 -FUN_0203CF94: ; 0x0203CF94 + thumb_func_start ScrCmd_Unk0121 +ScrCmd_Unk0121: ; 0x0203CF94 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3908,13 +3908,13 @@ FUN_0203CF94: ; 0x0203CF94 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203CFC4 -FUN_0203CFC4: ; 0x0203CFC4 + thumb_func_start ScrCmd_Unk0122 +ScrCmd_Unk0122: ; 0x0203CFC4 mov r0, #0x0 bx lr - thumb_func_start FUN_0203CFC8 -FUN_0203CFC8: ; 0x0203CFC8 + thumb_func_start ScrCmd_Unk0123 +ScrCmd_Unk0123: ; 0x0203CFC8 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -3975,8 +3975,8 @@ _0203D048: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203D050 -FUN_0203D050: ; 0x0203D050 + thumb_func_start ScrCmd_Unk0124 +ScrCmd_Unk0124: ; 0x0203D050 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 @@ -4014,8 +4014,8 @@ FUN_0203D050: ; 0x0203D050 pop {r3-r6, pc} .balign 4 - thumb_func_start FUN_0203D0A4 -FUN_0203D0A4: ; 0x0203D0A4 + thumb_func_start ScrCmd_Unk02BD +ScrCmd_Unk02BD: ; 0x0203D0A4 push {r3-r6, lr} sub sp, #0x4 add r5, r0, #0x0 @@ -4053,8 +4053,8 @@ FUN_0203D0A4: ; 0x0203D0A4 pop {r3-r6, pc} .balign 4 - thumb_func_start FUN_0203D0F8 -FUN_0203D0F8: ; 0x0203D0F8 + thumb_func_start ScrCmd_Unk0125 +ScrCmd_Unk0125: ; 0x0203D0F8 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -4081,16 +4081,16 @@ FUN_0203D0F8: ; 0x0203D0F8 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D134 -FUN_0203D134: ; 0x0203D134 + thumb_func_start ScrCmd_Unk0126 +ScrCmd_Unk0126: ; 0x0203D134 push {r3, lr} ldr r0, [r0, #0x74] bl FUN_020470AC mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203D140 -FUN_0203D140: ; 0x0203D140 + thumb_func_start ScrCmd_Unk0127 +ScrCmd_Unk0127: ; 0x0203D140 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -4099,8 +4099,8 @@ FUN_0203D140: ; 0x0203D140 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D150 -FUN_0203D150: ; 0x0203D150 + thumb_func_start ScrCmd_Unk0128 +ScrCmd_Unk0128: ; 0x0203D150 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -4119,8 +4119,8 @@ FUN_0203D150: ; 0x0203D150 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D178 -FUN_0203D178: ; 0x0203D178 + thumb_func_start ScrCmd_Unk0129 +ScrCmd_Unk0129: ; 0x0203D178 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -4134,8 +4134,8 @@ FUN_0203D178: ; 0x0203D178 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203D194 -FUN_0203D194: ; 0x0203D194 + thumb_func_start ScrCmd_Unk012A +ScrCmd_Unk012A: ; 0x0203D194 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -4144,8 +4144,8 @@ FUN_0203D194: ; 0x0203D194 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D1A4 -FUN_0203D1A4: ; 0x0203D1A4 + thumb_func_start ScrCmd_Unk012B +ScrCmd_Unk012B: ; 0x0203D1A4 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -4159,8 +4159,8 @@ FUN_0203D1A4: ; 0x0203D1A4 .balign 4 _0203D1BC: .word FUN_0203BC04 - thumb_func_start FUN_0203D1C0 -FUN_0203D1C0: ; 0x0203D1C0 + thumb_func_start ScrCmd_Unk012C +ScrCmd_Unk012C: ; 0x0203D1C0 push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -4203,8 +4203,8 @@ _0203D210: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203D214 -FUN_0203D214: ; 0x0203D214 + thumb_func_start ScrCmd_Unk012D +ScrCmd_Unk012D: ; 0x0203D214 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -4223,16 +4223,16 @@ FUN_0203D214: ; 0x0203D214 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D23C -FUN_0203D23C: ; 0x0203D23C + thumb_func_start ScrCmd_Unk0131 +ScrCmd_Unk0131: ; 0x0203D23C push {r3, lr} ldr r0, [r0, #0x74] bl MOD05_021E3424 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203D248 -FUN_0203D248: ; 0x0203D248 + thumb_func_start ScrCmd_Unk0132 +ScrCmd_Unk0132: ; 0x0203D248 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -4254,8 +4254,8 @@ FUN_0203D248: ; 0x0203D248 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D278 -FUN_0203D278: ; 0x0203D278 + thumb_func_start ScrCmd_Unk0133 +ScrCmd_Unk0133: ; 0x0203D278 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -4275,8 +4275,8 @@ FUN_0203D278: ; 0x0203D278 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D2A4 -FUN_0203D2A4: ; 0x0203D2A4 + thumb_func_start ScrCmd_Unk0134 +ScrCmd_Unk0134: ; 0x0203D2A4 push {r4-r6, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -4304,8 +4304,8 @@ FUN_0203D2A4: ; 0x0203D2A4 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203D2E4 -FUN_0203D2E4: ; 0x0203D2E4 + thumb_func_start ScrCmd_Unk0135 +ScrCmd_Unk0135: ; 0x0203D2E4 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -4342,16 +4342,16 @@ _0203D324: bl FUN_020315D8 pop {r4, pc} - thumb_func_start FUN_0203D330 -FUN_0203D330: ; 0x0203D330 + thumb_func_start ScrCmd_Unk0136 +ScrCmd_Unk0136: ; 0x0203D330 push {r3, lr} bl FUN_0203168C mov r0, #0x0 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D33C -FUN_0203D33C: ; 0x0203D33C + thumb_func_start ScrCmd_Unk0137 +ScrCmd_Unk0137: ; 0x0203D33C push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -4373,8 +4373,8 @@ FUN_0203D33C: ; 0x0203D33C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D36C -FUN_0203D36C: ; 0x0203D36C + thumb_func_start ScrCmd_Unk0138 +ScrCmd_Unk0138: ; 0x0203D36C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -4400,8 +4400,8 @@ FUN_0203D36C: ; 0x0203D36C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D3A4 -FUN_0203D3A4: ; 0x0203D3A4 + thumb_func_start ScrCmd_Unk0139 +ScrCmd_Unk0139: ; 0x0203D3A4 push {r4, lr} bl ScriptReadHalfword add r4, r0, #0x0 @@ -4430,8 +4430,8 @@ _0203D3D8: mov r0, #0x0 pop {r4, pc} - thumb_func_start FUN_0203D3DC -FUN_0203D3DC: ; 0x0203D3DC + thumb_func_start ScrCmd_Unk013C +ScrCmd_Unk013C: ; 0x0203D3DC push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -4480,8 +4480,8 @@ _0203D434: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203D448 -FUN_0203D448: ; 0x0203D448 + thumb_func_start ScrCmd_Unk013D +ScrCmd_Unk013D: ; 0x0203D448 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -4490,8 +4490,8 @@ FUN_0203D448: ; 0x0203D448 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D458 -FUN_0203D458: ; 0x0203D458 + thumb_func_start ScrCmd_Unk013E +ScrCmd_Unk013E: ; 0x0203D458 push {r4, lr} add r4, r0, #0x0 add r0, #0x80 @@ -4520,8 +4520,8 @@ _0203D48A: pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D490 -FUN_0203D490: ; 0x0203D490 + thumb_func_start ScrCmd_Unk013F +ScrCmd_Unk013F: ; 0x0203D490 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -4560,8 +4560,8 @@ FUN_0203D490: ; 0x0203D490 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203D4E8 -FUN_0203D4E8: ; 0x0203D4E8 + thumb_func_start ScrCmd_Unk02BA +ScrCmd_Unk02BA: ; 0x0203D4E8 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -4591,8 +4591,8 @@ _0203D522: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D528 -FUN_0203D528: ; 0x0203D528 + thumb_func_start ScrCmd_Unk0140 +ScrCmd_Unk0140: ; 0x0203D528 push {r4-r6, lr} add r4, r0, #0x0 add r0, #0x80 @@ -4617,8 +4617,8 @@ FUN_0203D528: ; 0x0203D528 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203D560 -FUN_0203D560: ; 0x0203D560 + thumb_func_start ScrCmd_Unk0146 +ScrCmd_Unk0146: ; 0x0203D560 push {r3-r7, lr} add r4, r0, #0x0 add r0, #0x80 @@ -4653,8 +4653,8 @@ FUN_0203D560: ; 0x0203D560 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203D5B0 -FUN_0203D5B0: ; 0x0203D5B0 + thumb_func_start ScrCmd_Unk0141 +ScrCmd_Unk0141: ; 0x0203D5B0 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -4691,8 +4691,8 @@ _0203D5F0: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203D5F8 -FUN_0203D5F8: ; 0x0203D5F8 + thumb_func_start ScrCmd_Unk0142 +ScrCmd_Unk0142: ; 0x0203D5F8 push {r3, lr} add r0, #0x80 ldr r1, [r0, #0x0] @@ -4703,8 +4703,8 @@ FUN_0203D5F8: ; 0x0203D5F8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D60C -FUN_0203D60C: ; 0x0203D60C + thumb_func_start ScrCmd_Unk013A +ScrCmd_Unk013A: ; 0x0203D60C push {r3, lr} mov r0, #0x4 bl FUN_02052B74 @@ -4712,8 +4712,8 @@ FUN_0203D60C: ; 0x0203D60C mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203D61C -FUN_0203D61C: ; 0x0203D61C + thumb_func_start ScrCmd_Unk013B +ScrCmd_Unk013B: ; 0x0203D61C push {r3, lr} bl FUN_02031C64 bl FUN_02031B50 @@ -4722,8 +4722,8 @@ FUN_0203D61C: ; 0x0203D61C mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203D630 -FUN_0203D630: ; 0x0203D630 + thumb_func_start ScrCmd_Unk0143 +ScrCmd_Unk0143: ; 0x0203D630 push {r4-r6, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -4750,8 +4750,8 @@ FUN_0203D630: ; 0x0203D630 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203D66C -FUN_0203D66C: ; 0x0203D66C + thumb_func_start ScrCmd_Unk0144 +ScrCmd_Unk0144: ; 0x0203D66C push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -4795,8 +4795,8 @@ _0203D6BC: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D6C4 -FUN_0203D6C4: ; 0x0203D6C4 + thumb_func_start ScrCmd_Unk0145 +ScrCmd_Unk0145: ; 0x0203D6C4 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -4847,8 +4847,8 @@ _0203D720: .balign 4 _0203D724: .word gMain - thumb_func_start FUN_0203D728 -FUN_0203D728: ; 0x0203D728 + thumb_func_start ScrCmd_Unk0153 +ScrCmd_Unk0153: ; 0x0203D728 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -4857,8 +4857,8 @@ FUN_0203D728: ; 0x0203D728 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203D738 -FUN_0203D738: ; 0x0203D738 + thumb_func_start ScrCmd_Unk0154 +ScrCmd_Unk0154: ; 0x0203D738 push {r4-r6, lr} add r4, r0, #0x0 add r0, #0x80 @@ -4884,8 +4884,8 @@ FUN_0203D738: ; 0x0203D738 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203D774 -FUN_0203D774: ; 0x0203D774 + thumb_func_start ScrCmd_Unk0155 +ScrCmd_Unk0155: ; 0x0203D774 push {r3-r7, lr} add r4, r0, #0x0 add r0, #0x80 @@ -4928,8 +4928,8 @@ FUN_0203D774: ; 0x0203D774 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203D7DC -FUN_0203D7DC: ; 0x0203D7DC + thumb_func_start ScrCmd_Unk029C +ScrCmd_Unk029C: ; 0x0203D7DC push {r3-r7, lr} add r4, r0, #0x0 add r0, #0x80 @@ -4966,8 +4966,8 @@ FUN_0203D7DC: ; 0x0203D7DC pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203D834 -FUN_0203D834: ; 0x0203D834 + thumb_func_start ScrCmd_Unk0156 +ScrCmd_Unk0156: ; 0x0203D834 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -4990,16 +4990,16 @@ FUN_0203D834: ; 0x0203D834 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D868 -FUN_0203D868: ; 0x0203D868 + thumb_func_start ScrCmd_Unk014B +ScrCmd_Unk014B: ; 0x0203D868 push {r3, lr} ldr r0, [r0, #0x74] bl FUN_02048498 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203D874 -FUN_0203D874: ; 0x0203D874 + thumb_func_start ScrCmd_Unk014C +ScrCmd_Unk014C: ; 0x0203D874 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5019,8 +5019,8 @@ FUN_0203D874: ; 0x0203D874 pop {r3-r5, pc} .balign 4 - thumb_func_start ScrCmd_getplayergender -ScrCmd_getplayergender: ; 0x0203D8A0 + thumb_func_start ScrCmd_GetPlayerGender +ScrCmd_GetPlayerGender: ; 0x0203D8A0 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -5041,8 +5041,8 @@ ScrCmd_getplayergender: ; 0x0203D8A0 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start ScrCmd_healparty -ScrCmd_healparty: ; 0x0203D8D0 + thumb_func_start ScrCmd_HealParty +ScrCmd_HealParty: ; 0x0203D8D0 push {r3, lr} ldr r0, [r0, #0x74] bl FUN_02046528 @@ -5053,13 +5053,13 @@ ScrCmd_healparty: ; 0x0203D8D0 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D8E8 -FUN_0203D8E8: ; 0x0203D8E8 + thumb_func_start ScrCmd_Unk014F +ScrCmd_Unk014F: ; 0x0203D8E8 mov r0, #0x0 bx lr - thumb_func_start FUN_0203D8EC -FUN_0203D8EC: ; 0x0203D8EC + thumb_func_start ScrCmd_Unk0150 +ScrCmd_Unk0150: ; 0x0203D8EC push {r4, lr} add r4, r0, #0x0 bl FUN_02050024 @@ -5087,8 +5087,8 @@ _0203D91A: pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D920 -FUN_0203D920: ; 0x0203D920 + thumb_func_start ScrCmd_Unk02BB +ScrCmd_Unk02BB: ; 0x0203D920 push {r4, lr} add r4, r0, #0x0 bl FUN_02050048 @@ -5100,8 +5100,8 @@ FUN_0203D920: ; 0x0203D920 .balign 4 _0203D934: .word FUN_0203D904 - thumb_func_start FUN_0203D938 -FUN_0203D938: ; 0x0203D938 + thumb_func_start ScrCmd_Unk0151 +ScrCmd_Unk0151: ; 0x0203D938 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -5110,8 +5110,8 @@ FUN_0203D938: ; 0x0203D938 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D948 -FUN_0203D948: ; 0x0203D948 + thumb_func_start ScrCmd_Unk0152 +ScrCmd_Unk0152: ; 0x0203D948 push {r3, lr} bl ScriptReadHalfword bl FUN_0204F6DC @@ -5119,8 +5119,8 @@ FUN_0203D948: ; 0x0203D948 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203D958 -FUN_0203D958: ; 0x0203D958 + thumb_func_start ScrCmd_Unk017A +ScrCmd_Unk017A: ; 0x0203D958 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5148,8 +5148,8 @@ FUN_0203D958: ; 0x0203D958 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203D998 -FUN_0203D998: ; 0x0203D998 + thumb_func_start ScrCmd_Unk0186 +ScrCmd_Unk0186: ; 0x0203D998 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5184,8 +5184,8 @@ FUN_0203D998: ; 0x0203D998 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203D9E8 -FUN_0203D9E8: ; 0x0203D9E8 + thumb_func_start ScrCmd_Unk0187 +ScrCmd_Unk0187: ; 0x0203D9E8 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 @@ -5246,8 +5246,8 @@ FUN_0203D9E8: ; 0x0203D9E8 pop {r4-r7, pc} .balign 4 - thumb_func_start FUN_0203DA78 -FUN_0203DA78: ; 0x0203DA78 + thumb_func_start ScrCmd_Unk0188 +ScrCmd_Unk0188: ; 0x0203DA78 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5272,8 +5272,8 @@ FUN_0203DA78: ; 0x0203DA78 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203DAB0 -FUN_0203DAB0: ; 0x0203DAB0 + thumb_func_start ScrCmd_Unk0189 +ScrCmd_Unk0189: ; 0x0203DAB0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5298,8 +5298,8 @@ FUN_0203DAB0: ; 0x0203DAB0 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203DAE8 -FUN_0203DAE8: ; 0x0203DAE8 + thumb_func_start ScrCmd_Unk018A +ScrCmd_Unk018A: ; 0x0203DAE8 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5334,8 +5334,8 @@ FUN_0203DAE8: ; 0x0203DAE8 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203DB38 -FUN_0203DB38: ; 0x0203DB38 + thumb_func_start ScrCmd_Unk018B +ScrCmd_Unk018B: ; 0x0203DB38 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5370,8 +5370,8 @@ FUN_0203DB38: ; 0x0203DB38 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203DB88 -FUN_0203DB88: ; 0x0203DB88 + thumb_func_start ScrCmd_Unk018C +ScrCmd_Unk018C: ; 0x0203DB88 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5405,8 +5405,8 @@ _0203DBC6: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203DBD4 -FUN_0203DBD4: ; 0x0203DBD4 + thumb_func_start ScrCmd_Unk018F +ScrCmd_Unk018F: ; 0x0203DBD4 push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -5428,8 +5428,8 @@ _0203DBFC: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203DC00 -FUN_0203DC00: ; 0x0203DC00 + thumb_func_start ScrCmd_Unk0168 +ScrCmd_Unk0168: ; 0x0203DC00 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5468,8 +5468,8 @@ FUN_0203DC00: ; 0x0203DC00 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203DC58 -FUN_0203DC58: ; 0x0203DC58 + thumb_func_start ScrCmd_Unk0169 +ScrCmd_Unk0169: ; 0x0203DC58 push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 @@ -5482,8 +5482,8 @@ FUN_0203DC58: ; 0x0203DC58 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DC70 -FUN_0203DC70: ; 0x0203DC70 + thumb_func_start ScrCmd_Unk016A +ScrCmd_Unk016A: ; 0x0203DC70 push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 @@ -5496,8 +5496,8 @@ FUN_0203DC70: ; 0x0203DC70 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DC88 -FUN_0203DC88: ; 0x0203DC88 + thumb_func_start ScrCmd_Unk016B +ScrCmd_Unk016B: ; 0x0203DC88 push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 @@ -5510,8 +5510,8 @@ FUN_0203DC88: ; 0x0203DC88 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DCA0 -FUN_0203DCA0: ; 0x0203DCA0 + thumb_func_start ScrCmd_Unk016C +ScrCmd_Unk016C: ; 0x0203DCA0 push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 @@ -5524,8 +5524,8 @@ FUN_0203DCA0: ; 0x0203DCA0 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DCB8 -FUN_0203DCB8: ; 0x0203DCB8 + thumb_func_start ScrCmd_Unk016F +ScrCmd_Unk016F: ; 0x0203DCB8 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -5534,8 +5534,8 @@ FUN_0203DCB8: ; 0x0203DCB8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DCC8 -FUN_0203DCC8: ; 0x0203DCC8 + thumb_func_start ScrCmd_Unk0170 +ScrCmd_Unk0170: ; 0x0203DCC8 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -5544,8 +5544,8 @@ FUN_0203DCC8: ; 0x0203DCC8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DCD8 -FUN_0203DCD8: ; 0x0203DCD8 + thumb_func_start ScrCmd_Unk0171 +ScrCmd_Unk0171: ; 0x0203DCD8 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -5554,8 +5554,8 @@ FUN_0203DCD8: ; 0x0203DCD8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DCE8 -FUN_0203DCE8: ; 0x0203DCE8 + thumb_func_start ScrCmd_Unk0172 +ScrCmd_Unk0172: ; 0x0203DCE8 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -5564,8 +5564,8 @@ FUN_0203DCE8: ; 0x0203DCE8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DCF8 -FUN_0203DCF8: ; 0x0203DCF8 + thumb_func_start ScrCmd_Unk0173 +ScrCmd_Unk0173: ; 0x0203DCF8 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -5574,8 +5574,8 @@ FUN_0203DCF8: ; 0x0203DCF8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DD08 -FUN_0203DD08: ; 0x0203DD08 + thumb_func_start ScrCmd_Unk0174 +ScrCmd_Unk0174: ; 0x0203DD08 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -5584,8 +5584,8 @@ FUN_0203DD08: ; 0x0203DD08 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DD18 -FUN_0203DD18: ; 0x0203DD18 + thumb_func_start ScrCmd_Unk0175 +ScrCmd_Unk0175: ; 0x0203DD18 push {r3, lr} add r1, r0, #0x0 add r1, #0x80 @@ -5600,8 +5600,8 @@ FUN_0203DD18: ; 0x0203DD18 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DD34 -FUN_0203DD34: ; 0x0203DD34 + thumb_func_start ScrCmd_Unk0176 +ScrCmd_Unk0176: ; 0x0203DD34 push {r3, lr} add r1, r0, #0x0 add r1, #0x80 @@ -5616,8 +5616,8 @@ FUN_0203DD34: ; 0x0203DD34 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DD50 -FUN_0203DD50: ; 0x0203DD50 + thumb_func_start ScrCmd_Unk01AC +ScrCmd_Unk01AC: ; 0x0203DD50 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -5626,8 +5626,8 @@ FUN_0203DD50: ; 0x0203DD50 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DD60 -FUN_0203DD60: ; 0x0203DD60 + thumb_func_start ScrCmd_Unk019E +ScrCmd_Unk019E: ; 0x0203DD60 push {r3-r7, lr} add r5, r0, #0x0 add r0, #0x80 @@ -5701,8 +5701,8 @@ _0203DDF6: nop _0203DDFC: .word 0x0000FFFE - thumb_func_start FUN_0203DE00 -FUN_0203DE00: ; 0x0203DE00 + thumb_func_start ScrCmd_Unk019F +ScrCmd_Unk019F: ; 0x0203DE00 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -5738,16 +5738,16 @@ FUN_0203DE38: ; 0x0203DE38 bl FUN_020546C8 pop {r3, pc} - thumb_func_start FUN_0203DE4C -FUN_0203DE4C: ; 0x0203DE4C + thumb_func_start ScrCmd_Unk01A0 +ScrCmd_Unk01A0: ; 0x0203DE4C push {r3, lr} bl MOD11_0224CA94 mov r0, #0x0 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DE58 -FUN_0203DE58: ; 0x0203DE58 + thumb_func_start ScrCmd_Unk01A1 +ScrCmd_Unk01A1: ; 0x0203DE58 push {r3-r5, lr} add r4, r0, #0x0 ldr r2, [r4, #0x8] @@ -5766,8 +5766,8 @@ FUN_0203DE58: ; 0x0203DE58 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203DE80 -FUN_0203DE80: ; 0x0203DE80 + thumb_func_start ScrCmd_Unk01A2 +ScrCmd_Unk01A2: ; 0x0203DE80 push {r3-r5, lr} add r4, r0, #0x0 ldr r2, [r4, #0x8] @@ -5786,8 +5786,8 @@ FUN_0203DE80: ; 0x0203DE80 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203DEA8 -FUN_0203DEA8: ; 0x0203DEA8 + thumb_func_start ScrCmd_Unk003F +ScrCmd_Unk003F: ; 0x0203DEA8 push {r3, lr} sub sp, #0x8 mov r3, #0x0 @@ -5802,8 +5802,8 @@ FUN_0203DEA8: ; 0x0203DEA8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203DEC4 -FUN_0203DEC4: ; 0x0203DEC4 + thumb_func_start ScrCmd_Unk01B1 +ScrCmd_Unk01B1: ; 0x0203DEC4 push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -5827,8 +5827,8 @@ _0203DEEC: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203DEF8 -FUN_0203DEF8: ; 0x0203DEF8 + thumb_func_start ScrCmd_Unk01B2 +ScrCmd_Unk01B2: ; 0x0203DEF8 push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -5852,16 +5852,16 @@ _0203DF20: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203DF2C -FUN_0203DF2C: ; 0x0203DF2C + thumb_func_start ScrCmd_Unk01B3 +ScrCmd_Unk01B3: ; 0x0203DF2C push {r3, lr} ldr r0, [r0, #0x74] bl FUN_02066818 mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203DF38 -FUN_0203DF38: ; 0x0203DF38 + thumb_func_start ScrCmd_Unk01B4 +ScrCmd_Unk01B4: ; 0x0203DF38 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -5881,8 +5881,8 @@ FUN_0203DF38: ; 0x0203DF38 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203DF64 -FUN_0203DF64: ; 0x0203DF64 + thumb_func_start ScrCmd_Unk01B5 +ScrCmd_Unk01B5: ; 0x0203DF64 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -5897,8 +5897,8 @@ FUN_0203DF64: ; 0x0203DF64 mov r0, #0x1 pop {r4, pc} - thumb_func_start FUN_0203DF84 -FUN_0203DF84: ; 0x0203DF84 + thumb_func_start ScrCmd_Unk01B6 +ScrCmd_Unk01B6: ; 0x0203DF84 push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -5915,8 +5915,8 @@ FUN_0203DF84: ; 0x0203DF84 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203DFA8 -FUN_0203DFA8: ; 0x0203DFA8 + thumb_func_start ScrCmd_Unk01B7 +ScrCmd_Unk01B7: ; 0x0203DFA8 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5940,8 +5940,8 @@ FUN_0203DFA8: ; 0x0203DFA8 mov r0, #0x1 pop {r3-r5, pc} - thumb_func_start FUN_0203DFE0 -FUN_0203DFE0: ; 0x0203DFE0 + thumb_func_start ScrCmd_Unk01B8 +ScrCmd_Unk01B8: ; 0x0203DFE0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -5965,8 +5965,8 @@ FUN_0203DFE0: ; 0x0203DFE0 mov r0, #0x1 pop {r3-r5, pc} - thumb_func_start FUN_0203E018 -FUN_0203E018: ; 0x0203E018 + thumb_func_start ScrCmd_Unk01C1 +ScrCmd_Unk01C1: ; 0x0203E018 push {r4-r6, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -5993,8 +5993,8 @@ FUN_0203E018: ; 0x0203E018 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203E054 -FUN_0203E054: ; 0x0203E054 + thumb_func_start ScrCmd_Unk01C2 +ScrCmd_Unk01C2: ; 0x0203E054 push {r3-r5, lr} add r4, r0, #0x0 add r1, r4, #0x0 @@ -6011,8 +6011,8 @@ FUN_0203E054: ; 0x0203E054 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203E078 -FUN_0203E078: ; 0x0203E078 + thumb_func_start ScrCmd_Unk01C3 +ScrCmd_Unk01C3: ; 0x0203E078 push {r3-r7, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -6049,8 +6049,8 @@ FUN_0203E078: ; 0x0203E078 mov r0, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_0203E0CC -FUN_0203E0CC: ; 0x0203E0CC + thumb_func_start ScrCmd_Unk01C4 +ScrCmd_Unk01C4: ; 0x0203E0CC push {r3-r7, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -6087,8 +6087,8 @@ FUN_0203E0CC: ; 0x0203E0CC mov r0, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_0203E120 -FUN_0203E120: ; 0x0203E120 + thumb_func_start ScrCmd_Unk01C5 +ScrCmd_Unk01C5: ; 0x0203E120 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -6100,8 +6100,8 @@ FUN_0203E120: ; 0x0203E120 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203E138 -FUN_0203E138: ; 0x0203E138 + thumb_func_start ScrCmd_Unk01CC +ScrCmd_Unk01CC: ; 0x0203E138 push {r4, lr} add r0, #0x80 ldr r4, [r0, #0x0] @@ -6122,8 +6122,8 @@ FUN_0203E138: ; 0x0203E138 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203E168 -FUN_0203E168: ; 0x0203E168 + thumb_func_start ScrCmd_Unk01CD +ScrCmd_Unk01CD: ; 0x0203E168 push {r3-r7, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -6234,13 +6234,13 @@ _0203E23E: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203E254 -FUN_0203E254: ; 0x0203E254 + thumb_func_start ScrCmd_Unk01CE +ScrCmd_Unk01CE: ; 0x0203E254 mov r0, #0x0 bx lr - thumb_func_start FUN_0203E258 -FUN_0203E258: ; 0x0203E258 + thumb_func_start ScrCmd_Unk01D2 +ScrCmd_Unk01D2: ; 0x0203E258 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6269,8 +6269,8 @@ FUN_0203E258: ; 0x0203E258 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203E29C -FUN_0203E29C: ; 0x0203E29C + thumb_func_start ScrCmd_Unk01D3 +ScrCmd_Unk01D3: ; 0x0203E29C push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6309,8 +6309,8 @@ FUN_0203E29C: ; 0x0203E29C pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203E2F8 -FUN_0203E2F8: ; 0x0203E2F8 + thumb_func_start ScrCmd_Unk01D4 +ScrCmd_Unk01D4: ; 0x0203E2F8 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6355,8 +6355,8 @@ _0203E354: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203E35C -FUN_0203E35C: ; 0x0203E35C + thumb_func_start ScrCmd_Unk01D5 +ScrCmd_Unk01D5: ; 0x0203E35C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6377,8 +6377,8 @@ FUN_0203E35C: ; 0x0203E35C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E38C -FUN_0203E38C: ; 0x0203E38C + thumb_func_start ScrCmd_Unk01D6 +ScrCmd_Unk01D6: ; 0x0203E38C push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6407,8 +6407,8 @@ FUN_0203E38C: ; 0x0203E38C mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203E3D0 -FUN_0203E3D0: ; 0x0203E3D0 + thumb_func_start ScrCmd_Unk01E8 +ScrCmd_Unk01E8: ; 0x0203E3D0 push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -6435,8 +6435,8 @@ _0203E404: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203E408 -FUN_0203E408: ; 0x0203E408 + thumb_func_start ScrCmd_Unk01E9 +ScrCmd_Unk01E9: ; 0x0203E408 push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -6463,8 +6463,8 @@ _0203E43C: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203E440 -FUN_0203E440: ; 0x0203E440 + thumb_func_start ScrCmd_Unk01EA +ScrCmd_Unk01EA: ; 0x0203E440 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -6487,8 +6487,8 @@ FUN_0203E440: ; 0x0203E440 .balign 4 _0203E46C: .word FUN_0203BB90 - thumb_func_start FUN_0203E470 -FUN_0203E470: ; 0x0203E470 + thumb_func_start ScrCmd_Unk01EB +ScrCmd_Unk01EB: ; 0x0203E470 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -6511,8 +6511,8 @@ FUN_0203E470: ; 0x0203E470 .balign 4 _0203E49C: .word FUN_0203BB90 - thumb_func_start FUN_0203E4A0 -FUN_0203E4A0: ; 0x0203E4A0 + thumb_func_start ScrCmd_Unk01EC +ScrCmd_Unk01EC: ; 0x0203E4A0 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -6521,8 +6521,8 @@ FUN_0203E4A0: ; 0x0203E4A0 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203E4B0 -FUN_0203E4B0: ; 0x0203E4B0 + thumb_func_start ScrCmd_Unk01ED +ScrCmd_Unk01ED: ; 0x0203E4B0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6541,8 +6541,8 @@ FUN_0203E4B0: ; 0x0203E4B0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E4D8 -FUN_0203E4D8: ; 0x0203E4D8 + thumb_func_start ScrCmd_Unk01EF +ScrCmd_Unk01EF: ; 0x0203E4D8 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -6554,8 +6554,8 @@ FUN_0203E4D8: ; 0x0203E4D8 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203E4F0 -FUN_0203E4F0: ; 0x0203E4F0 + thumb_func_start ScrCmd_Unk01E5 +ScrCmd_Unk01E5: ; 0x0203E4F0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6570,8 +6570,8 @@ FUN_0203E4F0: ; 0x0203E4F0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E510 -FUN_0203E510: ; 0x0203E510 + thumb_func_start ScrCmd_Unk01E6 +ScrCmd_Unk01E6: ; 0x0203E510 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6610,8 +6610,8 @@ FUN_0203E510: ; 0x0203E510 .balign 4 _0203E564: .word 0xFFFF0000 - thumb_func_start FUN_0203E568 -FUN_0203E568: ; 0x0203E568 + thumb_func_start ScrCmd_Unk01E7 +ScrCmd_Unk01E7: ; 0x0203E568 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6666,8 +6666,8 @@ _0203E5D6: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203E5DC -FUN_0203E5DC: ; 0x0203E5DC + thumb_func_start ScrCmd_Unk0202 +ScrCmd_Unk0202: ; 0x0203E5DC push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -6737,8 +6737,8 @@ _0203E66E: add sp, #0x8 pop {r3-r7, pc} - thumb_func_start FUN_0203E674 -FUN_0203E674: ; 0x0203E674 + thumb_func_start ScrCmd_Unk0206 +ScrCmd_Unk0206: ; 0x0203E674 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -6747,8 +6747,8 @@ FUN_0203E674: ; 0x0203E674 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203E684 -FUN_0203E684: ; 0x0203E684 + thumb_func_start ScrCmd_Unk020D +ScrCmd_Unk020D: ; 0x0203E684 push {r4-r6, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -6771,8 +6771,8 @@ FUN_0203E684: ; 0x0203E684 pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203E6B4 -FUN_0203E6B4: ; 0x0203E6B4 + thumb_func_start ScrCmd_Unk020E +ScrCmd_Unk020E: ; 0x0203E6B4 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -6781,8 +6781,8 @@ FUN_0203E6B4: ; 0x0203E6B4 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203E6C4 -FUN_0203E6C4: ; 0x0203E6C4 + thumb_func_start ScrCmd_Unk020F +ScrCmd_Unk020F: ; 0x0203E6C4 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6807,8 +6807,8 @@ FUN_0203E6C4: ; 0x0203E6C4 mov r0, #0x1 pop {r4-r6, pc} - thumb_func_start FUN_0203E6FC -FUN_0203E6FC: ; 0x0203E6FC + thumb_func_start ScrCmd_Unk0210 +ScrCmd_Unk0210: ; 0x0203E6FC push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6830,8 +6830,8 @@ FUN_0203E6FC: ; 0x0203E6FC pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203E72C -FUN_0203E72C: ; 0x0203E72C + thumb_func_start ScrCmd_Unk0211 +ScrCmd_Unk0211: ; 0x0203E72C push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 @@ -6844,8 +6844,8 @@ FUN_0203E72C: ; 0x0203E72C mov r0, #0x1 pop {r3, pc} - thumb_func_start FUN_0203E744 -FUN_0203E744: ; 0x0203E744 + thumb_func_start ScrCmd_Unk0214 +ScrCmd_Unk0214: ; 0x0203E744 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -6867,8 +6867,8 @@ FUN_0203E744: ; 0x0203E744 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E774 -FUN_0203E774: ; 0x0203E774 + thumb_func_start ScrCmd_Unk0218 +ScrCmd_Unk0218: ; 0x0203E774 push {r3-r7, lr} add r4, r0, #0x0 add r0, #0x80 @@ -6928,8 +6928,8 @@ _0203E7E8: .balign 4 _0203E7EC: .word 0x000001ED - thumb_func_start FUN_0203E7F0 -FUN_0203E7F0: ; 0x0203E7F0 + thumb_func_start ScrCmd_Unk0219 +ScrCmd_Unk0219: ; 0x0203E7F0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6949,8 +6949,8 @@ FUN_0203E7F0: ; 0x0203E7F0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E81C -FUN_0203E81C: ; 0x0203E81C + thumb_func_start ScrCmd_Unk021A +ScrCmd_Unk021A: ; 0x0203E81C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -6970,8 +6970,8 @@ FUN_0203E81C: ; 0x0203E81C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E848 -FUN_0203E848: ; 0x0203E848 + thumb_func_start ScrCmd_Unk021B +ScrCmd_Unk021B: ; 0x0203E848 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -6980,8 +6980,8 @@ FUN_0203E848: ; 0x0203E848 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203E858 -FUN_0203E858: ; 0x0203E858 + thumb_func_start ScrCmd_Unk021C +ScrCmd_Unk021C: ; 0x0203E858 push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 @@ -6994,8 +6994,8 @@ FUN_0203E858: ; 0x0203E858 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203E870 -FUN_0203E870: ; 0x0203E870 + thumb_func_start ScrCmd_Unk0226 +ScrCmd_Unk0226: ; 0x0203E870 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -7013,8 +7013,8 @@ FUN_0203E870: ; 0x0203E870 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203E894 -FUN_0203E894: ; 0x0203E894 + thumb_func_start ScrCmd_Unk0227 +ScrCmd_Unk0227: ; 0x0203E894 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -7036,8 +7036,8 @@ FUN_0203E894: ; 0x0203E894 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E8C4 -FUN_0203E8C4: ; 0x0203E8C4 + thumb_func_start ScrCmd_Unk0228 +ScrCmd_Unk0228: ; 0x0203E8C4 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -7059,8 +7059,8 @@ FUN_0203E8C4: ; 0x0203E8C4 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E8F4 -FUN_0203E8F4: ; 0x0203E8F4 + thumb_func_start ScrCmd_Unk0229 +ScrCmd_Unk0229: ; 0x0203E8F4 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -7084,8 +7084,8 @@ FUN_0203E8F4: ; 0x0203E8F4 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203E928 -FUN_0203E928: ; 0x0203E928 + thumb_func_start ScrCmd_Unk022A +ScrCmd_Unk022A: ; 0x0203E928 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7097,8 +7097,8 @@ FUN_0203E928: ; 0x0203E928 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203E940 -FUN_0203E940: ; 0x0203E940 + thumb_func_start ScrCmd_Unk022B +ScrCmd_Unk022B: ; 0x0203E940 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7108,8 +7108,8 @@ FUN_0203E940: ; 0x0203E940 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203E954 -FUN_0203E954: ; 0x0203E954 + thumb_func_start ScrCmd_Unk022C +ScrCmd_Unk022C: ; 0x0203E954 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7119,8 +7119,8 @@ FUN_0203E954: ; 0x0203E954 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203E968 -FUN_0203E968: ; 0x0203E968 + thumb_func_start ScrCmd_Unk022D +ScrCmd_Unk022D: ; 0x0203E968 push {r4-r6, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -7166,8 +7166,8 @@ _0203E9C8: mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203E9CC -FUN_0203E9CC: ; 0x0203E9CC + thumb_func_start ScrCmd_Unk0233 +ScrCmd_Unk0233: ; 0x0203E9CC push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 @@ -7235,8 +7235,8 @@ FUN_0203E9CC: ; 0x0203E9CC pop {r4-r7, pc} .balign 4 - thumb_func_start FUN_0203EA68 -FUN_0203EA68: ; 0x0203EA68 + thumb_func_start ScrCmd_Unk0234 +ScrCmd_Unk0234: ; 0x0203EA68 push {r4, lr} sub sp, #0x10 add r4, r0, #0x0 @@ -7255,8 +7255,8 @@ FUN_0203EA68: ; 0x0203EA68 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203EA90 -FUN_0203EA90: ; 0x0203EA90 + thumb_func_start ScrCmd_Unk0239 +ScrCmd_Unk0239: ; 0x0203EA90 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -7271,8 +7271,8 @@ FUN_0203EA90: ; 0x0203EA90 mov r0, #0x1 pop {r4, pc} - thumb_func_start FUN_0203EAB0 -FUN_0203EAB0: ; 0x0203EAB0 + thumb_func_start ScrCmd_Unk023A +ScrCmd_Unk023A: ; 0x0203EAB0 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -7319,8 +7319,8 @@ FUN_0203EAB0: ; 0x0203EAB0 pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203EB20 -FUN_0203EB20: ; 0x0203EB20 + thumb_func_start ScrCmd_Unk023B +ScrCmd_Unk023B: ; 0x0203EB20 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -7339,8 +7339,8 @@ FUN_0203EB20: ; 0x0203EB20 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203EB48 -FUN_0203EB48: ; 0x0203EB48 + thumb_func_start ScrCmd_Unk023C +ScrCmd_Unk023C: ; 0x0203EB48 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -7369,8 +7369,8 @@ FUN_0203EB48: ; 0x0203EB48 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203EB88 -FUN_0203EB88: ; 0x0203EB88 + thumb_func_start ScrCmd_Unk023D +ScrCmd_Unk023D: ; 0x0203EB88 push {r4-r7, lr} sub sp, #0xc add r5, r0, #0x0 @@ -7400,8 +7400,8 @@ FUN_0203EB88: ; 0x0203EB88 add sp, #0xc pop {r4-r7, pc} - thumb_func_start ScrCmd_gameversion -ScrCmd_gameversion: ; 0x0203EBC8 + thumb_func_start ScrCmd_GameVersion +ScrCmd_GameVersion: ; 0x0203EBC8 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -7415,8 +7415,8 @@ ScrCmd_gameversion: ; 0x0203EBC8 pop {r4, pc} .balign 4 - thumb_func_start ScrCmd_givewallpaper -ScrCmd_givewallpaper: ; 0x0203EBE4 + thumb_func_start ScrCmd_GiveWallpaper +ScrCmd_GiveWallpaper: ; 0x0203EBE4 push {r3-r7, lr} sub sp, #0x10 add r5, r0, #0x0 @@ -7506,8 +7506,8 @@ _0203ECA2: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203ECAC -FUN_0203ECAC: ; 0x0203ECAC + thumb_func_start ScrCmd_Unk024A +ScrCmd_Unk024A: ; 0x0203ECAC push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -7527,8 +7527,8 @@ FUN_0203ECAC: ; 0x0203ECAC mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203ECD8 -FUN_0203ECD8: ; 0x0203ECD8 + thumb_func_start ScrCmd_Unk024B +ScrCmd_Unk024B: ; 0x0203ECD8 push {r3, lr} add r1, r0, #0x0 add r1, #0x80 @@ -7543,8 +7543,8 @@ FUN_0203ECD8: ; 0x0203ECD8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203ECF4 -FUN_0203ECF4: ; 0x0203ECF4 + thumb_func_start ScrCmd_Unk024C +ScrCmd_Unk024C: ; 0x0203ECF4 push {r3, lr} add r1, r0, #0x0 add r1, #0x80 @@ -7559,8 +7559,8 @@ FUN_0203ECF4: ; 0x0203ECF4 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203ED10 -FUN_0203ED10: ; 0x0203ED10 + thumb_func_start ScrCmd_Unk024D +ScrCmd_Unk024D: ; 0x0203ED10 push {r3, lr} add r1, r0, #0x0 add r1, #0x80 @@ -7606,8 +7606,8 @@ FUN_0203ED2C: ; 0x0203ED2C pop {r4-r6, pc} .balign 4 - thumb_func_start ScrCmd_pcfreespace -ScrCmd_pcfreespace: ; 0x0203ED70 + thumb_func_start ScrCmd_PCFreeSpace +ScrCmd_PCFreeSpace: ; 0x0203ED70 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -7631,8 +7631,8 @@ ScrCmd_pcfreespace: ; 0x0203ED70 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203EDA4 -FUN_0203EDA4: ; 0x0203EDA4 + thumb_func_start ScrCmd_Unk0258 +ScrCmd_Unk0258: ; 0x0203EDA4 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -7650,8 +7650,8 @@ FUN_0203EDA4: ; 0x0203EDA4 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203EDC8 -FUN_0203EDC8: ; 0x0203EDC8 + thumb_func_start ScrCmd_Unk0259 +ScrCmd_Unk0259: ; 0x0203EDC8 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7663,8 +7663,8 @@ FUN_0203EDC8: ; 0x0203EDC8 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203EDE0 -FUN_0203EDE0: ; 0x0203EDE0 + thumb_func_start ScrCmd_Unk025A +ScrCmd_Unk025A: ; 0x0203EDE0 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -7683,8 +7683,8 @@ FUN_0203EDE0: ; 0x0203EDE0 pop {r4, pc} .balign 4 - thumb_func_start FUN_0203EE08 -FUN_0203EE08: ; 0x0203EE08 + thumb_func_start ScrCmd_Unk025B +ScrCmd_Unk025B: ; 0x0203EE08 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7693,8 +7693,8 @@ FUN_0203EE08: ; 0x0203EE08 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203EE18 -FUN_0203EE18: ; 0x0203EE18 + thumb_func_start ScrCmd_Unk025C +ScrCmd_Unk025C: ; 0x0203EE18 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7703,8 +7703,8 @@ FUN_0203EE18: ; 0x0203EE18 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203EE28 -FUN_0203EE28: ; 0x0203EE28 + thumb_func_start ScrCmd_Unk025D +ScrCmd_Unk025D: ; 0x0203EE28 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -7729,8 +7729,8 @@ _0203EE50: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203EE58 -FUN_0203EE58: ; 0x0203EE58 + thumb_func_start ScrCmd_Unk025E +ScrCmd_Unk025E: ; 0x0203EE58 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7739,8 +7739,8 @@ FUN_0203EE58: ; 0x0203EE58 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203EE68 -FUN_0203EE68: ; 0x0203EE68 + thumb_func_start ScrCmd_Unk025F +ScrCmd_Unk025F: ; 0x0203EE68 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7749,8 +7749,8 @@ FUN_0203EE68: ; 0x0203EE68 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203EE78 -FUN_0203EE78: ; 0x0203EE78 + thumb_func_start ScrCmd_Unk0260 +ScrCmd_Unk0260: ; 0x0203EE78 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -7765,8 +7765,8 @@ FUN_0203EE78: ; 0x0203EE78 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203EE98 -FUN_0203EE98: ; 0x0203EE98 + thumb_func_start ScrCmd_Unk0262 +ScrCmd_Unk0262: ; 0x0203EE98 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -7794,8 +7794,8 @@ FUN_0203EE98: ; 0x0203EE98 mov r0, #0x1 pop {r4-r6, pc} - thumb_func_start FUN_0203EED8 -FUN_0203EED8: ; 0x0203EED8 + thumb_func_start ScrCmd_Unk0263 +ScrCmd_Unk0263: ; 0x0203EED8 push {r3-r7, lr} sub sp, #0x8 add r4, r0, #0x0 @@ -7854,8 +7854,8 @@ _0203EF4E: .balign 4 _0203EF54: .word 0x00000182 - thumb_func_start FUN_0203EF58 -FUN_0203EF58: ; 0x0203EF58 + thumb_func_start ScrCmd_Unk0264 +ScrCmd_Unk0264: ; 0x0203EF58 push {r3-r7, lr} sub sp, #0x30 add r4, r0, #0x0 @@ -7946,8 +7946,8 @@ _0203EFFC: .balign 4 _0203F008: .word UNK_020F34FC - thumb_func_start FUN_0203F00C -FUN_0203F00C: ; 0x0203F00C + thumb_func_start ScrCmd_Unk0265 +ScrCmd_Unk0265: ; 0x0203F00C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7957,8 +7957,8 @@ FUN_0203F00C: ; 0x0203F00C mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203F020 -FUN_0203F020: ; 0x0203F020 + thumb_func_start ScrCmd_Unk0266 +ScrCmd_Unk0266: ; 0x0203F020 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -7968,8 +7968,8 @@ FUN_0203F020: ; 0x0203F020 mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203F034 -FUN_0203F034: ; 0x0203F034 + thumb_func_start ScrCmd_Unk0267 +ScrCmd_Unk0267: ; 0x0203F034 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -7986,8 +7986,8 @@ FUN_0203F034: ; 0x0203F034 mov r0, #0x1 pop {r4, pc} - thumb_func_start FUN_0203F058 -FUN_0203F058: ; 0x0203F058 + thumb_func_start ScrCmd_Unk0268 +ScrCmd_Unk0268: ; 0x0203F058 push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -8004,8 +8004,8 @@ FUN_0203F058: ; 0x0203F058 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203F07C -FUN_0203F07C: ; 0x0203F07C + thumb_func_start ScrCmd_Unk0269 +ScrCmd_Unk0269: ; 0x0203F07C push {r3-r7, lr} sub sp, #0x10 add r5, r0, #0x0 @@ -8069,8 +8069,8 @@ _0203F0FA: add sp, #0x10 pop {r3-r7, pc} - thumb_func_start FUN_0203F110 -FUN_0203F110: ; 0x0203F110 + thumb_func_start ScrCmd_Unk026A +ScrCmd_Unk026A: ; 0x0203F110 push {r3-r7, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -8114,8 +8114,8 @@ _0203F164: mov r0, #0x1 pop {r3-r7, pc} - thumb_func_start FUN_0203F174 -FUN_0203F174: ; 0x0203F174 + thumb_func_start ScrCmd_Unk026B +ScrCmd_Unk026B: ; 0x0203F174 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8134,8 +8134,8 @@ FUN_0203F174: ; 0x0203F174 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F19C -FUN_0203F19C: ; 0x0203F19C + thumb_func_start ScrCmd_Unk026C +ScrCmd_Unk026C: ; 0x0203F19C push {r4-r7, lr} sub sp, #0x24 add r4, r0, #0x0 @@ -8211,8 +8211,8 @@ _0203F222: nop _0203F230: .word 0x0000FFFF - thumb_func_start FUN_0203F234 -FUN_0203F234: ; 0x0203F234 + thumb_func_start ScrCmd_Unk026E +ScrCmd_Unk026E: ; 0x0203F234 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -8228,8 +8228,8 @@ FUN_0203F234: ; 0x0203F234 .balign 4 _0203F250: .word gMain + 0x60 - thumb_func_start FUN_0203F254 -FUN_0203F254: ; 0x0203F254 + thumb_func_start ScrCmd_Unk026F +ScrCmd_Unk026F: ; 0x0203F254 push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -8241,8 +8241,8 @@ FUN_0203F254: ; 0x0203F254 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203F26C -FUN_0203F26C: ; 0x0203F26C + thumb_func_start ScrCmd_Unk0270 +ScrCmd_Unk0270: ; 0x0203F26C push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8273,8 +8273,8 @@ _0203F2A6: pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203F2AC -FUN_0203F2AC: ; 0x0203F2AC + thumb_func_start ScrCmd_Unk0273 +ScrCmd_Unk0273: ; 0x0203F2AC push {r4-r6, lr} add r5, r0, #0x0 add r0, #0x80 @@ -8300,8 +8300,8 @@ FUN_0203F2AC: ; 0x0203F2AC pop {r4-r6, pc} .balign 4 - thumb_func_start FUN_0203F2E4 -FUN_0203F2E4: ; 0x0203F2E4 + thumb_func_start ScrCmd_Unk0275 +ScrCmd_Unk0275: ; 0x0203F2E4 push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -8329,8 +8329,8 @@ _0203F316: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203F31C -FUN_0203F31C: ; 0x0203F31C + thumb_func_start ScrCmd_Unk0277 +ScrCmd_Unk0277: ; 0x0203F31C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8350,8 +8350,8 @@ FUN_0203F31C: ; 0x0203F31C pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F348 -FUN_0203F348: ; 0x0203F348 + thumb_func_start ScrCmd_Unk0279 +ScrCmd_Unk0279: ; 0x0203F348 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8380,8 +8380,8 @@ FUN_0203F348: ; 0x0203F348 mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203F38C -FUN_0203F38C: ; 0x0203F38C + thumb_func_start ScrCmd_Unk027A +ScrCmd_Unk027A: ; 0x0203F38C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -8390,8 +8390,8 @@ FUN_0203F38C: ; 0x0203F38C pop {r3, pc} .balign 4 - thumb_func_start FUN_0203F39C -FUN_0203F39C: ; 0x0203F39C + thumb_func_start ScrCmd_Unk027B +ScrCmd_Unk027B: ; 0x0203F39C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -8400,8 +8400,8 @@ FUN_0203F39C: ; 0x0203F39C mov r0, #0x0 pop {r3, pc} - thumb_func_start FUN_0203F3AC -FUN_0203F3AC: ; 0x0203F3AC + thumb_func_start ScrCmd_Unk027D +ScrCmd_Unk027D: ; 0x0203F3AC push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8448,8 +8448,8 @@ _0203F3FE: nop _0203F414: .word 0x0000FFFF - thumb_func_start FUN_0203F418 -FUN_0203F418: ; 0x0203F418 + thumb_func_start ScrCmd_Unk027F +ScrCmd_Unk027F: ; 0x0203F418 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8475,8 +8475,8 @@ _0203F446: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203F44C -FUN_0203F44C: ; 0x0203F44C + thumb_func_start ScrCmd_Unk027E +ScrCmd_Unk027E: ; 0x0203F44C push {r3-r5, lr} add r4, r0, #0x0 add r0, #0x80 @@ -8504,8 +8504,8 @@ _0203F47E: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203F484 -FUN_0203F484: ; 0x0203F484 + thumb_func_start ScrCmd_Unk0282 +ScrCmd_Unk0282: ; 0x0203F484 push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8544,8 +8544,8 @@ _0203F4D2: pop {r3-r7, pc} .balign 4 - thumb_func_start FUN_0203F4D8 -FUN_0203F4D8: ; 0x0203F4D8 + thumb_func_start ScrCmd_Unk0284 +ScrCmd_Unk0284: ; 0x0203F4D8 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -8567,8 +8567,8 @@ FUN_0203F4D8: ; 0x0203F4D8 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F508 -FUN_0203F508: ; 0x0203F508 + thumb_func_start ScrCmd_Unk0285 +ScrCmd_Unk0285: ; 0x0203F508 push {r3-r7, lr} add r6, r0, #0x0 bl ScriptReadHalfword @@ -8671,8 +8671,8 @@ _0203F5C8: .word 0x0000010E _0203F5CC: .word 0x0000010D _0203F5D0: .word UNK_020F3538 - thumb_func_start FUN_0203F5D4 -FUN_0203F5D4: ; 0x0203F5D4 + thumb_func_start ScrCmd_Unk0286 +ScrCmd_Unk0286: ; 0x0203F5D4 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -8694,8 +8694,8 @@ FUN_0203F5D4: ; 0x0203F5D4 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F604 -FUN_0203F604: ; 0x0203F604 + thumb_func_start ScrCmd_Unk0287 +ScrCmd_Unk0287: ; 0x0203F604 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -8717,8 +8717,8 @@ FUN_0203F604: ; 0x0203F604 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F634 -FUN_0203F634: ; 0x0203F634 + thumb_func_start ScrCmd_Unk0288 +ScrCmd_Unk0288: ; 0x0203F634 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -8740,8 +8740,8 @@ FUN_0203F634: ; 0x0203F634 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F664 -FUN_0203F664: ; 0x0203F664 + thumb_func_start ScrCmd_Unk0289 +ScrCmd_Unk0289: ; 0x0203F664 push {r3-r7, lr} sub sp, #0x8 add r5, r0, #0x0 @@ -8803,8 +8803,8 @@ _0203F6DA: .balign 4 _0203F6E0: .word 0x0000FFFF - thumb_func_start FUN_0203F6E4 -FUN_0203F6E4: ; 0x0203F6E4 + thumb_func_start ScrCmd_Unk028A +ScrCmd_Unk028A: ; 0x0203F6E4 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8833,8 +8833,8 @@ _0203F714: nop _0203F71C: .word 0x0000FFFF - thumb_func_start FUN_0203F720 -FUN_0203F720: ; 0x0203F720 + thumb_func_start ScrCmd_Unk028B +ScrCmd_Unk028B: ; 0x0203F720 push {r4-r6, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -8864,8 +8864,8 @@ _0203F752: mov r0, #0x0 pop {r4-r6, pc} - thumb_func_start FUN_0203F760 -FUN_0203F760: ; 0x0203F760 + thumb_func_start ScrCmd_Unk028F +ScrCmd_Unk028F: ; 0x0203F760 push {r3-r5, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -8915,8 +8915,8 @@ _0203F7BE: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F7C8 -FUN_0203F7C8: ; 0x0203F7C8 + thumb_func_start ScrCmd_Unk0290 +ScrCmd_Unk0290: ; 0x0203F7C8 push {r4-r6, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -8947,8 +8947,8 @@ FUN_0203F7C8: ; 0x0203F7C8 .balign 4 _0203F808: .word FUN_0203BC04 - thumb_func_start FUN_0203F80C -FUN_0203F80C: ; 0x0203F80C + thumb_func_start ScrCmd_Unk0291 +ScrCmd_Unk0291: ; 0x0203F80C push {r4-r6, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -9003,8 +9003,8 @@ _0203F872: str r0, [r4, #0x0] pop {r4-r6, pc} - thumb_func_start FUN_0203F880 -FUN_0203F880: ; 0x0203F880 + thumb_func_start ScrCmd_Unk0292 +ScrCmd_Unk0292: ; 0x0203F880 push {r3-r5, lr} add r5, r0, #0x0 ldr r2, [r5, #0x8] @@ -9037,8 +9037,8 @@ _0203F8BA: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203F8C0 -FUN_0203F8C0: ; 0x0203F8C0 + thumb_func_start ScrCmd_Unk029E +ScrCmd_Unk029E: ; 0x0203F8C0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -9087,8 +9087,8 @@ _0203F91E: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F924 -FUN_0203F924: ; 0x0203F924 + thumb_func_start ScrCmd_Unk0293 +ScrCmd_Unk0293: ; 0x0203F924 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -9110,8 +9110,8 @@ FUN_0203F924: ; 0x0203F924 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F954 -FUN_0203F954: ; 0x0203F954 + thumb_func_start ScrCmd_Unk029F +ScrCmd_Unk029F: ; 0x0203F954 push {r4, lr} add r4, r0, #0x0 bl ScriptReadHalfword @@ -9137,8 +9137,8 @@ _0203F982: pop {r4, pc} .balign 4 - thumb_func_start FUN_0203F988 -FUN_0203F988: ; 0x0203F988 + thumb_func_start ScrCmd_Unk02A3 +ScrCmd_Unk02A3: ; 0x0203F988 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -9157,8 +9157,8 @@ FUN_0203F988: ; 0x0203F988 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F9B0 -FUN_0203F9B0: ; 0x0203F9B0 + thumb_func_start ScrCmd_Unk02A4 +ScrCmd_Unk02A4: ; 0x0203F9B0 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -9178,8 +9178,8 @@ FUN_0203F9B0: ; 0x0203F9B0 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203F9DC -FUN_0203F9DC: ; 0x0203F9DC + thumb_func_start ScrCmd_Unk02A2 +ScrCmd_Unk02A2: ; 0x0203F9DC push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -9206,8 +9206,8 @@ _0203FA0C: .balign 4 _0203FA10: .word 0x0000FF79 - thumb_func_start FUN_0203FA14 -FUN_0203FA14: ; 0x0203FA14 + thumb_func_start ScrCmd_Unk02A7 +ScrCmd_Unk02A7: ; 0x0203FA14 push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -9239,8 +9239,8 @@ _0203FA4E: nop _0203FA54: .word 0x0000012A - thumb_func_start FUN_0203FA58 -FUN_0203FA58: ; 0x0203FA58 + thumb_func_start ScrCmd_Unk02AA +ScrCmd_Unk02AA: ; 0x0203FA58 push {r3-r7, lr} sub sp, #0x10 add r4, r0, #0x0 @@ -9342,8 +9342,8 @@ _0203FB26: nop _0203FB48: .word 0x00000147 - thumb_func_start FUN_0203FB4C -FUN_0203FB4C: ; 0x0203FB4C + thumb_func_start ScrCmd_Unk02AC +ScrCmd_Unk02AC: ; 0x0203FB4C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -9355,8 +9355,8 @@ FUN_0203FB4C: ; 0x0203FB4C pop {r3, pc} .balign 4 - thumb_func_start FUN_0203FB64 -FUN_0203FB64: ; 0x0203FB64 + thumb_func_start ScrCmd_Unk02AF +ScrCmd_Unk02AF: ; 0x0203FB64 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -9378,24 +9378,24 @@ FUN_0203FB64: ; 0x0203FB64 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203FB94 -FUN_0203FB94: ; 0x0203FB94 + thumb_func_start ScrCmd_Unk02B0 +ScrCmd_Unk02B0: ; 0x0203FB94 push {r3, lr} bl FUN_02033E74 mov r0, #0x0 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203FBA0 -FUN_0203FBA0: ; 0x0203FBA0 + thumb_func_start ScrCmd_Unk02B1 +ScrCmd_Unk02B1: ; 0x0203FBA0 push {r3, lr} bl FUN_02033ED0 mov r0, #0x0 pop {r3, pc} .balign 4 - thumb_func_start FUN_0203FBAC -FUN_0203FBAC: ; 0x0203FBAC + thumb_func_start ScrCmd_Unk02B2 +ScrCmd_Unk02B2: ; 0x0203FBAC push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] @@ -9404,8 +9404,8 @@ FUN_0203FBAC: ; 0x0203FBAC pop {r3, pc} .balign 4 - thumb_func_start FUN_0203FBBC -FUN_0203FBBC: ; 0x0203FBBC + thumb_func_start ScrCmd_Unk02B5 +ScrCmd_Unk02B5: ; 0x0203FBBC push {r3-r7, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -9447,8 +9447,8 @@ FUN_0203FBBC: ; 0x0203FBBC mov r0, #0x0 pop {r3-r7, pc} - thumb_func_start FUN_0203FC1C -FUN_0203FC1C: ; 0x0203FC1C + thumb_func_start ScrCmd_Unk02B6 +ScrCmd_Unk02B6: ; 0x0203FC1C push {r3-r5, lr} add r5, r0, #0x0 bl ScriptReadHalfword @@ -9476,8 +9476,8 @@ _0203FC4C: mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203FC58 -FUN_0203FC58: ; 0x0203FC58 + thumb_func_start ScrCmd_Unk02BE +ScrCmd_Unk02BE: ; 0x0203FC58 push {r3-r5, lr} add r5, r0, #0x0 add r1, r5, #0x0 @@ -9496,8 +9496,8 @@ FUN_0203FC58: ; 0x0203FC58 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203FC80 -FUN_0203FC80: ; 0x0203FC80 + thumb_func_start ScrCmd_Unk02C1 +ScrCmd_Unk02C1: ; 0x0203FC80 push {r3-r5, lr} add r0, #0x80 ldr r5, [r0, #0x0] @@ -9520,8 +9520,8 @@ _0203FCAA: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203FCB0 -FUN_0203FCB0: ; 0x0203FCB0 + thumb_func_start ScrCmd_Unk02C2 +ScrCmd_Unk02C2: ; 0x0203FCB0 push {r3-r5, lr} add r0, #0x80 ldr r5, [r0, #0x0] @@ -9542,8 +9542,8 @@ _0203FCD6: pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203FCDC -FUN_0203FCDC: ; 0x0203FCDC + thumb_func_start ScrCmd_Unk02C3 +ScrCmd_Unk02C3: ; 0x0203FCDC push {r3, lr} ldr r2, [r0, #0x8] add r1, r2, #0x1 diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s index 3f62a449..119c68ff 100644 --- a/arm9/asm/unk_02002C14.s +++ b/arm9/asm/unk_02002C14.s @@ -411,7 +411,7 @@ FUN_02002ED0: ; 0x02002ED0 mov r0, #0xe mov r1, #0x6 add r2, r4, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x8 pop {r4, pc} @@ -427,6 +427,6 @@ FUN_02002EEC: ; 0x02002EEC mov r0, #0xe mov r1, #0x7 add r2, r4, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x8 pop {r4, pc} diff --git a/arm9/asm/unk_02002F08.s b/arm9/asm/unk_02002F08.s index c37869ed..fb6f96ff 100644 --- a/arm9/asm/unk_02002F08.s +++ b/arm9/asm/unk_02002F08.s @@ -226,7 +226,7 @@ FUN_02003084: ; 0x02003084 add r1, r2, #0x0 add r2, sp, #0x4 ldr r4, [sp, #0x1c] - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r6, r0, #0x0 bne _0200309E bl GF_AssertFail diff --git a/arm9/asm/unk_020030E8.s b/arm9/asm/unk_020030E8.s index 30d0ea43..f9b9de1f 100644 --- a/arm9/asm/unk_020030E8.s +++ b/arm9/asm/unk_020030E8.s @@ -72,7 +72,7 @@ FUN_0200317C: ; 0x0200317C add r5, r3, #0x0 add r2, sp, #0x0 add r3, r4, #0x0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0x0 bne _02003192 bl GF_AssertFail @@ -1387,7 +1387,7 @@ FUN_02003B40: ; 0x02003B40 add r0, r1, #0x0 add r1, r2, #0x0 add r2, sp, #0x4 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0x0 bne _02003B58 bl GF_AssertFail diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s index 215e56c0..c2d91fe9 100644 --- a/arm9/asm/unk_020051F4.s +++ b/arm9/asm/unk_020051F4.s @@ -1216,8 +1216,8 @@ FUN_02005BF8: ; 0x02005BF8 pop {r3-r6, pc} .balign 4 - thumb_func_start PlayBGM -PlayBGM: ; 0x02005C28 + thumb_func_start PlaySound +PlaySound: ; 0x02005C28 push {r3-r5, lr} add r5, r0, #0x0 bl FUN_020048F4 diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s deleted file mode 100644 index 75adbe92..00000000 --- a/arm9/asm/unk_02006864.s +++ /dev/null @@ -1,698 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .section .rodata - - .global UNK_020ECB98 -UNK_020ECB98: ; 0x020ECB98 - .word NNS_G2dLoadImage1DMapping - .word NNS_G2dLoadImage2DMapping - - .global UNK_020ECBA0 -UNK_020ECBA0: ; 0x020ECBA0 - .word GX_LoadOBJ, GXS_LoadOBJ - - .global UNK_020ECBA8 -UNK_020ECBA8: ; 0x020ECBA8 - .word NNS_G2dLoadImage1DMapping, NNS_G2dLoadImage2DMapping - - .global UNK_020ECBB0 -UNK_020ECBB0: ; 0x020ECBB0 - .word GX_LoadBGPltt, GX_LoadOBJPltt, GX_LoadBGExtPltt, GX_LoadOBJExtPltt - .word GXS_LoadBGPltt, GXS_LoadOBJPltt, GXS_LoadBGExtPltt, GXS_LoadOBJExtPltt - - .text - - thumb_func_start FUN_0200687C -FUN_0200687C: ; 0x0200687C - push {r3-r7, lr} - sub sp, #0x8 - add r6, r2, #0x0 - mov r2, #0x0 - add r5, r3, #0x0 - str r2, [sp, #0x0] - ldr r2, [sp, #0x28] - ldr r3, [sp, #0x2c] - ldr r4, [sp, #0x24] - bl UncompressFromNarc - add r7, r0, #0x0 - beq _020068C2 - add r1, sp, #0x4 - bl NNS_G2dGetUnpackedBGCharacterData - cmp r0, #0x0 - beq _020068BC - cmp r4, #0x0 - bne _020068A8 - ldr r0, [sp, #0x4] - ldr r4, [r0, #0x10] -_020068A8: - ldr r0, [sp, #0x20] - lsl r1, r5, #0x18 - str r0, [sp, #0x0] - ldr r2, [sp, #0x4] - add r0, r6, #0x0 - ldr r2, [r2, #0x14] - lsr r1, r1, #0x18 - add r3, r4, #0x0 - bl FUN_02017E14 -_020068BC: - add r0, r7, #0x0 - bl FreeToHeap -_020068C2: - add r0, r4, #0x0 - add sp, #0x8 - pop {r3-r7, pc} - - thumb_func_start FUN_020068C8 -FUN_020068C8: ; 0x020068C8 - push {r3-r7, lr} - sub sp, #0x8 - add r6, r2, #0x0 - mov r2, #0x1 - add r5, r3, #0x0 - str r2, [sp, #0x0] - ldr r2, [sp, #0x28] - ldr r3, [sp, #0x2c] - ldr r4, [sp, #0x24] - bl UncompressFromNarc - add r7, r0, #0x0 - beq _0200692C - add r1, sp, #0x4 - bl NNS_G2dGetUnpackedScreenData - cmp r0, #0x0 - beq _02006926 - cmp r4, #0x0 - bne _020068F4 - ldr r0, [sp, #0x4] - ldr r4, [r0, #0x8] -_020068F4: - lsl r1, r5, #0x18 - add r0, r6, #0x0 - lsr r1, r1, #0x18 - bl FUN_0201886C - cmp r0, #0x0 - beq _02006912 - ldr r2, [sp, #0x4] - lsl r1, r5, #0x18 - add r0, r6, #0x0 - lsr r1, r1, #0x18 - add r2, #0xc - add r3, r4, #0x0 - bl FUN_02017DFC -_02006912: - ldr r0, [sp, #0x20] - lsl r1, r5, #0x18 - str r0, [sp, #0x0] - ldr r2, [sp, #0x4] - add r0, r6, #0x0 - lsr r1, r1, #0x18 - add r2, #0xc - add r3, r4, #0x0 - bl FUN_02017CE8 -_02006926: - add r0, r7, #0x0 - bl FreeToHeap -_0200692C: - add sp, #0x8 - pop {r3-r7, pc} - - thumb_func_start FUN_02006930 -FUN_02006930: ; 0x02006930 - push {lr} - sub sp, #0xc - str r3, [sp, #0x0] - ldr r3, [sp, #0x10] - str r3, [sp, #0x4] - ldr r3, [sp, #0x14] - str r3, [sp, #0x8] - mov r3, #0x0 - bl FUN_02006948 - add sp, #0xc - pop {pc} - - thumb_func_start FUN_02006948 -FUN_02006948: ; 0x02006948 - push {r4-r7, lr} - sub sp, #0xc - add r4, r2, #0x0 - add r7, r3, #0x0 - mov r2, #0x1 - str r2, [sp, #0x0] - ldr r3, [sp, #0x28] - mov r2, #0x0 - ldr r6, [sp, #0x20] - ldr r5, [sp, #0x24] - bl UncompressFromNarc - str r0, [sp, #0x4] - cmp r0, #0x0 - beq _02006A2A - add r1, sp, #0x8 - bl NNS_G2dGetUnpackedPaletteData - cmp r0, #0x0 - beq _02006A24 - ldr r0, [sp, #0x8] - ldr r1, [r0, #0xc] - add r1, r1, r7 - str r1, [r0, #0xc] - cmp r5, #0x0 - bne _02006982 - ldr r0, [sp, #0x8] - ldr r0, [r0, #0x8] - sub r5, r0, r7 -_02006982: - ldr r0, [sp, #0x8] - add r1, r5, #0x0 - ldr r0, [r0, #0xc] - bl DC_FlushRange - cmp r4, #0x7 - bhi _02006A14 - add r0, r4, r4 - add r0, pc - ldrh r0, [r0, #0x6] - lsl r0, r0, #0x10 - asr r0, r0, #0x10 - add pc, r0 -_0200699C: ; jump table (using 16-bit offset) - .short _02006A14 - _0200699C - 2; case 0 - .short _02006A14 - _0200699C - 2; case 1 - .short _020069AC - _0200699C - 2; case 2 - .short _020069E0 - _0200699C - 2; case 3 - .short _02006A14 - _0200699C - 2; case 4 - .short _02006A14 - _0200699C - 2; case 5 - .short _020069C6 - _0200699C - 2; case 6 - .short _020069FA - _0200699C - 2; case 7 -_020069AC: - bl GX_BeginLoadBGExtPltt - ldr r0, [sp, #0x8] - ldr r3, _02006A30 ; =UNK_020ECBB0 - lsl r4, r4, #0x2 - ldr r0, [r0, #0xc] - ldr r3, [r3, r4] - add r1, r6, #0x0 - add r2, r5, #0x0 - blx r3 - bl GX_EndLoadBGExtPltt - b _02006A24 -_020069C6: - bl GXS_BeginLoadBGExtPltt - ldr r0, [sp, #0x8] - ldr r3, _02006A30 ; =UNK_020ECBB0 - lsl r4, r4, #0x2 - ldr r0, [r0, #0xc] - ldr r3, [r3, r4] - add r1, r6, #0x0 - add r2, r5, #0x0 - blx r3 - bl GXS_EndLoadBGExtPltt - b _02006A24 -_020069E0: - bl GX_BeginLoadOBJExtPltt - ldr r0, [sp, #0x8] - ldr r3, _02006A30 ; =UNK_020ECBB0 - lsl r4, r4, #0x2 - ldr r0, [r0, #0xc] - ldr r3, [r3, r4] - add r1, r6, #0x0 - add r2, r5, #0x0 - blx r3 - bl GX_EndLoadOBJExtPltt - b _02006A24 -_020069FA: - bl GXS_BeginLoadOBJExtPltt - ldr r0, [sp, #0x8] - ldr r3, _02006A30 ; =UNK_020ECBB0 - lsl r4, r4, #0x2 - ldr r0, [r0, #0xc] - ldr r3, [r3, r4] - add r1, r6, #0x0 - add r2, r5, #0x0 - blx r3 - bl GXS_EndLoadOBJExtPltt - b _02006A24 -_02006A14: - ldr r0, [sp, #0x8] - ldr r3, _02006A30 ; =UNK_020ECBB0 - lsl r4, r4, #0x2 - ldr r0, [r0, #0xc] - ldr r3, [r3, r4] - add r1, r6, #0x0 - add r2, r5, #0x0 - blx r3 -_02006A24: - ldr r0, [sp, #0x4] - bl FreeToHeap -_02006A2A: - add sp, #0xc - pop {r4-r7, pc} - nop -_02006A30: .word UNK_020ECBB0 - - thumb_func_start FUN_02006A34 -FUN_02006A34: ; 0x02006A34 - push {r3-r7, lr} - sub sp, #0x8 - add r5, r2, #0x0 - mov r2, #0x1 - add r6, r3, #0x0 - str r2, [sp, #0x0] - ldr r2, [sp, #0x24] - ldr r3, [sp, #0x28] - ldr r4, [sp, #0x20] - bl UncompressFromNarc - add r7, r0, #0x0 - beq _02006A80 - add r1, sp, #0x4 - bl NNS_G2dGetUnpackedCharacterData - cmp r0, #0x0 - beq _02006A7A - cmp r4, #0x0 - bne _02006A60 - ldr r0, [sp, #0x4] - ldr r4, [r0, #0x10] -_02006A60: - ldr r0, [sp, #0x4] - add r1, r4, #0x0 - ldr r0, [r0, #0x14] - bl DC_FlushRange - ldr r0, [sp, #0x4] - ldr r3, _02006A88 ; =UNK_020ECBA0 - lsl r5, r5, #0x2 - ldr r0, [r0, #0x14] - ldr r3, [r3, r5] - add r1, r6, #0x0 - add r2, r4, #0x0 - blx r3 -_02006A7A: - add r0, r7, #0x0 - bl FreeToHeap -_02006A80: - add r0, r4, #0x0 - add sp, #0x8 - pop {r3-r7, pc} - nop -_02006A88: .word UNK_020ECBA0 - - thumb_func_start FUN_02006A8C -FUN_02006A8C: ; 0x02006A8C - push {r4-r7, lr} - sub sp, #0xc - add r5, r2, #0x0 - add r4, r3, #0x0 - mov r2, #0x1 - str r2, [sp, #0x0] - ldr r3, [sp, #0x20] - mov r2, #0x0 - bl UncompressFromNarc - add r6, r0, #0x0 - beq _02006AE0 - add r1, sp, #0x4 - bl NNS_G2dGetUnpackedPaletteCompressInfo - add r7, r0, #0x0 - add r0, r6, #0x0 - add r1, sp, #0x8 - bl NNS_G2dGetUnpackedPaletteData - cmp r0, #0x0 - beq _02006ADA - cmp r7, #0x0 - beq _02006ACE - ldr r0, [sp, #0x24] - add r2, r4, #0x0 - str r0, [sp, #0x0] - ldr r0, [sp, #0x8] - ldr r1, [sp, #0x4] - add r3, r5, #0x0 - bl NNS_G2dLoadPaletteEx - b _02006ADA -_02006ACE: - ldr r0, [sp, #0x8] - ldr r3, [sp, #0x24] - add r1, r4, #0x0 - add r2, r5, #0x0 - bl NNS_G2dLoadPalette -_02006ADA: - add r0, r6, #0x0 - bl FreeToHeap -_02006AE0: - add sp, #0xc - pop {r4-r7, pc} - - thumb_func_start FUN_02006AE4 -FUN_02006AE4: ; 0x02006AE4 - push {r4-r6, lr} - sub sp, #0x8 - add r5, r3, #0x0 - mov r3, #0x1 - str r3, [sp, #0x0] - ldr r3, [sp, #0x24] - bl UncompressFromNarc - add r6, r0, #0x0 - ldr r4, _02006B30 ; =0x00000000 - beq _02006B28 - add r1, sp, #0x4 - bl NNS_G2dGetUnpackedCharacterData - cmp r0, #0x0 - beq _02006B22 - ldr r1, [sp, #0x18] - cmp r1, #0x0 - beq _02006B0E - ldr r0, [sp, #0x4] - str r1, [r0, #0x10] -_02006B0E: - ldr r4, _02006B34 ; =UNK_020ECBA8 - lsl r5, r5, #0x2 - ldr r0, [sp, #0x4] - ldr r1, [sp, #0x20] - ldr r2, [sp, #0x1c] - ldr r3, [sp, #0x28] - ldr r4, [r4, r5] - blx r4 - ldr r0, [sp, #0x4] - ldr r4, [r0, #0x10] -_02006B22: - add r0, r6, #0x0 - bl FreeToHeap -_02006B28: - add r0, r4, #0x0 - add sp, #0x8 - pop {r4-r6, pc} - nop -_02006B30: .word 0x00000000 -_02006B34: .word UNK_020ECBA8 - - thumb_func_start FUN_02006B38 -FUN_02006B38: ; 0x02006B38 - push {r4-r6, lr} - sub sp, #0x8 - add r5, r3, #0x0 - mov r3, #0x1 - str r3, [sp, #0x0] - ldr r3, [sp, #0x24] - bl UncompressFromNarc - add r4, r0, #0x0 - beq _02006B9E - add r1, sp, #0x4 - bl NNS_G2dGetUnpackedCharacterData - cmp r0, #0x0 - beq _02006B98 - ldr r1, [sp, #0x18] - cmp r1, #0x0 - beq _02006B60 - ldr r0, [sp, #0x4] - str r1, [r0, #0x10] -_02006B60: - ldr r0, [sp, #0x1c] - cmp r0, #0x1 - beq _02006B6C - cmp r0, #0x2 - beq _02006B7C - b _02006B88 -_02006B6C: - mov r0, #0x1 - lsl r0, r0, #0x1a - ldr r1, [r0, #0x0] - ldr r0, _02006BA4 ; =0x00300010 - and r1, r0 - ldr r0, [sp, #0x4] - str r1, [r0, #0x8] - b _02006B88 -_02006B7C: - ldr r0, _02006BA8 ; =0x04001000 - ldr r1, [r0, #0x0] - ldr r0, _02006BA4 ; =0x00300010 - and r1, r0 - ldr r0, [sp, #0x4] - str r1, [r0, #0x8] -_02006B88: - lsl r6, r5, #0x2 - ldr r5, _02006BAC ; =UNK_020ECB98 - ldr r0, [sp, #0x4] - ldr r1, [sp, #0x20] - ldr r2, [sp, #0x1c] - ldr r3, [sp, #0x28] - ldr r5, [r5, r6] - blx r5 -_02006B98: - add r0, r4, #0x0 - bl FreeToHeap -_02006B9E: - add sp, #0x8 - pop {r4-r6, pc} - nop -_02006BA4: .word 0x00300010 -_02006BA8: .word 0x04001000 -_02006BAC: .word UNK_020ECB98 - - thumb_func_start FUN_02006BB0 -FUN_02006BB0: ; 0x02006BB0 - push {r3-r5, lr} - add r4, r3, #0x0 - mov r3, #0x0 - str r3, [sp, #0x0] - ldr r3, [sp, #0x10] - bl UncompressFromNarc - add r5, r0, #0x0 - beq _02006BD6 - add r1, r4, #0x0 - bl NNS_G2dGetUnpackedBGCharacterData - cmp r0, #0x0 - bne _02006BD6 - add r0, r5, #0x0 - bl FreeToHeap - mov r0, #0x0 - pop {r3-r5, pc} -_02006BD6: - add r0, r5, #0x0 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_02006BDC -FUN_02006BDC: ; 0x02006BDC - push {r3-r5, lr} - add r4, r3, #0x0 - mov r3, #0x0 - str r3, [sp, #0x0] - ldr r3, [sp, #0x10] - bl UncompressFromNarc - add r5, r0, #0x0 - beq _02006C02 - add r1, r4, #0x0 - bl NNS_G2dGetUnpackedScreenData - cmp r0, #0x0 - bne _02006C02 - add r0, r5, #0x0 - bl FreeToHeap - mov r0, #0x0 - pop {r3-r5, pc} -_02006C02: - add r0, r5, #0x0 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_02006C08 -FUN_02006C08: ; 0x02006C08 - push {r3-r5, lr} - add r5, r2, #0x0 - mov r2, #0x0 - str r2, [sp, #0x0] - bl UncompressFromNarc - add r4, r0, #0x0 - beq _02006C2C - add r1, r5, #0x0 - bl NNS_G2dGetUnpackedPaletteData - cmp r0, #0x0 - bne _02006C2C - add r0, r4, #0x0 - bl FreeToHeap - mov r0, #0x0 - pop {r3-r5, pc} -_02006C2C: - add r0, r4, #0x0 - pop {r3-r5, pc} - - thumb_func_start FUN_02006C30 -FUN_02006C30: ; 0x02006C30 - push {r3-r5, lr} - add r4, r3, #0x0 - mov r3, #0x0 - str r3, [sp, #0x0] - ldr r3, [sp, #0x10] - bl UncompressFromNarc - add r5, r0, #0x0 - beq _02006C56 - add r1, r4, #0x0 - bl NNS_G2dGetUnpackedCellBank - cmp r0, #0x0 - bne _02006C56 - add r0, r5, #0x0 - bl FreeToHeap - mov r0, #0x0 - pop {r3-r5, pc} -_02006C56: - add r0, r5, #0x0 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_02006C5C -FUN_02006C5C: ; 0x02006C5C - push {r3-r5, lr} - add r4, r3, #0x0 - mov r3, #0x0 - str r3, [sp, #0x0] - ldr r3, [sp, #0x10] - bl UncompressFromNarc - add r5, r0, #0x0 - beq _02006C82 - add r1, r4, #0x0 - bl NNS_G2dGetUnpackedAnimBank - cmp r0, #0x0 - bne _02006C82 - add r0, r5, #0x0 - bl FreeToHeap - mov r0, #0x0 - pop {r3-r5, pc} -_02006C82: - add r0, r5, #0x0 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_02006C88 -FUN_02006C88: ; 0x02006C88 - push {r3, lr} - add r3, r2, #0x0 - mov r2, #0x0 - str r2, [sp, #0x0] - mov r2, #0x1 - bl UncompressFromNarc - pop {r3, pc} - - thumb_func_start UncompressFromNarc -UncompressFromNarc: ; 0x02006C98 - ; void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd) - push {r3-r7, lr} - add r5, r2, #0x0 - add r7, r0, #0x0 - add r6, r3, #0x0 - str r1, [sp, #0x0] - cmp r5, #0x0 - bne _02006CAC - ldr r2, [sp, #0x18] - cmp r2, #0x1 - bne _02006CC0 -_02006CAC: - ldr r1, [sp, #0x0] - add r0, r7, #0x0 - bl GetNarcMemberSizeByIdPair - add r1, r0, #0x0 - add r0, r6, #0x0 - bl AllocFromHeapAtEnd - add r4, r0, #0x0 - b _02006CCE -_02006CC0: - bl GetNarcMemberSizeByIdPair - add r1, r0, #0x0 - add r0, r6, #0x0 - bl AllocFromHeap - add r4, r0, #0x0 -_02006CCE: - cmp r4, #0x0 - beq _02006D12 - ldr r2, [sp, #0x0] - add r0, r4, #0x0 - add r1, r7, #0x0 - bl ReadWholeNarcMemberByIdPair - cmp r5, #0x0 - beq _02006D12 - ldr r0, [sp, #0x18] - cmp r0, #0x0 - bne _02006CF2 - ldr r1, [r4, #0x0] - add r0, r6, #0x0 - lsr r1, r1, #0x8 - bl AllocFromHeap - b _02006CFC -_02006CF2: - ldr r1, [r4, #0x0] - add r0, r6, #0x0 - lsr r1, r1, #0x8 - bl AllocFromHeapAtEnd -_02006CFC: - add r5, r0, #0x0 - cmp r5, #0x0 - beq _02006D10 - add r0, r4, #0x0 - add r1, r5, #0x0 - bl MI_UncompressLZ8 - add r0, r4, #0x0 - bl FreeToHeap -_02006D10: - add r4, r5, #0x0 -_02006D12: - add r0, r4, #0x0 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_02006D18 -FUN_02006D18: ; 0x02006D18 - push {r3-r7, lr} - sub sp, #0x8 - ldr r5, [sp, #0x24] - str r0, [sp, #0x0] - str r1, [sp, #0x4] - add r6, r2, #0x0 - add r7, r3, #0x0 - bl GetNarcMemberSizeByIdPair - str r0, [r5, #0x0] - cmp r6, #0x0 - bne _02006D36 - ldr r0, [sp, #0x20] - cmp r0, #0x1 - bne _02006D42 -_02006D36: - ldr r1, [r5, #0x0] - add r0, r7, #0x0 - bl AllocFromHeapAtEnd - add r4, r0, #0x0 - b _02006D4C -_02006D42: - ldr r1, [r5, #0x0] - add r0, r7, #0x0 - bl AllocFromHeap - add r4, r0, #0x0 -_02006D4C: - cmp r4, #0x0 - beq _02006D92 - ldr r1, [sp, #0x0] - ldr r2, [sp, #0x4] - add r0, r4, #0x0 - bl ReadWholeNarcMemberByIdPair - cmp r6, #0x0 - beq _02006D92 - ldr r0, [r4, #0x0] - lsr r0, r0, #0x8 - str r0, [r5, #0x0] - ldr r0, [sp, #0x20] - cmp r0, #0x0 - bne _02006D74 - ldr r1, [r5, #0x0] - add r0, r7, #0x0 - bl AllocFromHeap - b _02006D7C -_02006D74: - ldr r1, [r5, #0x0] - add r0, r7, #0x0 - bl AllocFromHeapAtEnd -_02006D7C: - add r5, r0, #0x0 - cmp r5, #0x0 - beq _02006D90 - add r0, r4, #0x0 - add r1, r5, #0x0 - bl MI_UncompressLZ8 - add r0, r4, #0x0 - bl FreeToHeap -_02006D90: - add r4, r5, #0x0 -_02006D92: - add r0, r4, #0x0 - add sp, #0x8 - pop {r3-r7, pc} diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s index 92341f16..31aabcc3 100644 --- a/arm9/asm/unk_02008DEC.s +++ b/arm9/asm/unk_02008DEC.s @@ -1604,7 +1604,7 @@ FUN_02009978: ; 0x02009978 add r1, r3, #0x0 ldr r2, [sp, #0x10] ldr r3, [sp, #0x24] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, r0, #0x0 ldr r0, [r5, #0x0] ldr r2, [sp, #0x14] diff --git a/arm9/asm/unk_0200BB14.s b/arm9/asm/unk_0200BB14.s deleted file mode 100644 index b8a6eab5..00000000 --- a/arm9/asm/unk_0200BB14.s +++ /dev/null @@ -1,2135 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start FUN_0200BB14 -FUN_0200BB14: ; 0x0200BB14 - push {r4, lr} - mov r1, #0x4e - lsl r1, r1, #0x2 - add r4, r0, #0x0 - bl AllocFromHeap - cmp r0, #0x0 - bne _0200BB28 - mov r0, #0x0 - pop {r4, pc} -_0200BB28: - str r4, [r0, #0x0] - mov r1, #0x0 - str r1, [r0, #0x4] - mov r1, #0x1 - str r1, [r0, #0x8] - pop {r4, pc} - - thumb_func_start FUN_0200BB34 -FUN_0200BB34: ; 0x0200BB34 - push {r4, lr} - add r4, r0, #0x0 - bne _0200BB3E - bl GF_AssertFail -_0200BB3E: - ldr r0, [r4, #0x0] - mov r1, #0x58 - bl AllocFromHeap - cmp r0, #0x0 - bne _0200BB4E - mov r0, #0x0 - pop {r4, pc} -_0200BB4E: - ldr r1, [r4, #0x4] - mov r2, #0x0 - add r1, r1, #0x1 - str r1, [r4, #0x4] - add r3, r0, #0x0 - add r1, r2, #0x0 -_0200BB5A: - add r2, r2, #0x1 - str r1, [r3, #0xc] - add r3, r3, #0x4 - cmp r2, #0x6 - blt _0200BB5A - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_0200BB68 -FUN_0200BB68: ; 0x0200BB68 - add r0, #0x10 - bx lr - - thumb_func_start FUN_0200BB6C -FUN_0200BB6C: ; 0x0200BB6C - push {r4-r7, lr} - sub sp, #0x24 - add r5, r0, #0x0 - add r4, r1, #0x0 - add r6, r2, #0x0 - add r7, r3, #0x0 - cmp r5, #0x0 - bne _0200BB80 - bl GF_AssertFail -_0200BB80: - cmp r5, #0x0 - bne _0200BB8A - add sp, #0x24 - mov r0, #0x0 - pop {r4-r7, pc} -_0200BB8A: - ldr r0, [r6, #0x0] - str r0, [sp, #0x14] - ldr r0, [r6, #0x4] - str r0, [sp, #0x18] - ldr r0, [r6, #0x8] - str r0, [sp, #0x1c] - ldr r0, [r5, #0x0] - str r0, [sp, #0x20] - ldr r1, [r6, #0xc] - ldr r2, [r6, #0x10] - add r0, sp, #0x14 - bl FUN_0201D060 - ldr r1, [r5, #0x0] - add r0, r7, #0x0 - bl FUN_0201E00C - bl NNS_G2dInitOamManagerModule - ldr r0, [r5, #0x8] - cmp r0, #0x1 - bne _0200BBD6 - ldr r0, [r4, #0x10] - str r0, [sp, #0x0] - ldr r0, [r4, #0x14] - str r0, [sp, #0x4] - ldr r0, [r4, #0x18] - str r0, [sp, #0x8] - ldr r0, [r4, #0x1c] - str r0, [sp, #0xc] - ldr r0, [r5, #0x0] - str r0, [sp, #0x10] - ldr r0, [r4, #0x0] - ldr r1, [r4, #0x4] - ldr r2, [r4, #0x8] - ldr r3, [r4, #0xc] - bl FUN_02009EAC -_0200BBD6: - ldr r1, [r5, #0x0] - mov r0, #0x20 - bl FUN_0201C328 - str r0, [r5, #0xc] - bl FUN_0201D168 - bl FUN_0201E0BC - mov r0, #0x1 - add sp, #0x24 - pop {r4-r7, pc} - .balign 4 - - thumb_func_start FUN_0200BBF0 -FUN_0200BBF0: ; 0x0200BBF0 - push {r4, lr} - add r3, r0, #0x0 - add r4, r1, #0x0 - cmp r3, #0x0 - beq _0200BBFE - cmp r4, #0x0 - bne _0200BC02 -_0200BBFE: - mov r0, #0x0 - pop {r4, pc} -_0200BC02: - add r0, r2, #0x0 - add r1, r3, #0x0 - ldr r2, [r3, #0x0] - add r1, #0x10 - bl FUN_02008C9C - str r0, [r4, #0x0] - mov r0, #0x1 - pop {r4, pc} - - thumb_func_start FUN_0200BC14 -FUN_0200BC14: ; 0x0200BC14 - ldr r3, _0200BC18 ; =FUN_0201FFC8 - bx r3 - .balign 4 -_0200BC18: .word FUN_0201FFC8 - - thumb_func_start FUN_0200BC1C -FUN_0200BC1C: ; 0x0200BC1C - push {r4, lr} - add r4, r0, #0x0 - bne _0200BC26 - bl GF_AssertFail -_0200BC26: - ldr r0, [r4, #0x0] - bl FUN_0201FDEC - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_0200BC30 -FUN_0200BC30: ; 0x0200BC30 - ldr r3, _0200BC34 ; =FUN_02009F80 - bx r3 - .balign 4 -_0200BC34: .word FUN_02009F80 - - thumb_func_start FUN_0200BC38 -FUN_0200BC38: ; 0x0200BC38 - ldr r3, _0200BC3C ; =FUN_0201C348 - bx r3 - .balign 4 -_0200BC3C: .word FUN_0201C348 - - thumb_func_start FUN_0200BC40 -FUN_0200BC40: ; 0x0200BC40 - ldr r3, _0200BC48 ; =FUN_0201FD58 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200BC48: .word FUN_0201FD58 - - thumb_func_start FUN_0200BC4C -FUN_0200BC4C: ; 0x0200BC4C - push {r3, lr} - ldr r0, [r0, #0x4] - cmp r0, #0x0 - beq _0200BC58 - bl FUN_02008C80 -_0200BC58: - pop {r3, pc} - .balign 4 - - thumb_func_start FUN_0200BC5C -FUN_0200BC5C: ; 0x0200BC5C - push {r4-r6, lr} - add r5, r0, #0x0 - ldr r0, [r5, #0x54] - mov r4, #0x0 - cmp r0, #0x0 - ble _0200BC7C -_0200BC68: - ldr r0, [r5, #0x8] - add r1, r4, #0x0 - bl FUN_02009660 - bl FUN_020096B4 - ldr r0, [r5, #0x54] - add r4, r4, #0x1 - cmp r4, r0 - blt _0200BC68 -_0200BC7C: - ldr r0, [r5, #0x8] - bl FreeToHeap - ldr r0, [r5, #0x24] - bl FUN_02009C30 - ldr r0, [r5, #0x28] - bl FUN_02009E28 - ldr r0, [r5, #0x54] - mov r6, #0x0 - cmp r0, #0x0 - ble _0200BCAE - add r4, r5, #0x0 -_0200BC98: - ldr r0, [r4, #0x24] - bl FUN_02009448 - ldr r0, [r4, #0xc] - bl FUN_02008E2C - ldr r0, [r5, #0x54] - add r6, r6, #0x1 - add r4, r4, #0x4 - cmp r6, r0 - blt _0200BC98 -_0200BCAE: - pop {r4-r6, pc} - - thumb_func_start FUN_0200BCB0 -FUN_0200BCB0: ; 0x0200BCB0 - push {r4, lr} - add r4, r0, #0x0 - ldr r0, [r4, #0xc] - bl FUN_0201C350 - bl FUN_0201D12C - bl FUN_0201E08C - ldr r0, [r4, #0x8] - cmp r0, #0x1 - bne _0200BCCC - bl FUN_02009FA0 -_0200BCCC: - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_0200BCD0 -FUN_0200BCD0: ; 0x0200BCD0 - ldr r2, [r0, #0x4] - ldr r3, _0200BCDC ; =FreeToHeap - sub r2, r2, #0x1 - str r2, [r0, #0x4] - add r0, r1, #0x0 - bx r3 - .balign 4 -_0200BCDC: .word FreeToHeap - - thumb_func_start FUN_0200BCE0 -FUN_0200BCE0: ; 0x0200BCE0 - push {r3-r5, lr} - add r4, r1, #0x0 - add r5, r0, #0x0 - add r0, r4, #0x0 - bl FUN_0200BC40 - add r0, r4, #0x0 - bl FUN_0200BC4C - add r0, r4, #0x0 - bl FUN_0200BC5C - add r0, r5, #0x0 - add r1, r4, #0x0 - bl FUN_0200BCD0 - pop {r3-r5, pc} - .balign 4 - - thumb_func_start FUN_0200BD04 -FUN_0200BD04: ; 0x0200BD04 - push {r4, lr} - add r4, r0, #0x0 - ldr r0, [r4, #0x4] - cmp r0, #0x0 - beq _0200BD12 - bl GF_AssertFail -_0200BD12: - add r0, r4, #0x0 - bl FUN_0200BCB0 - add r0, r4, #0x0 - bl FreeToHeap - pop {r4, pc} - - thumb_func_start FUN_0200BD20 -FUN_0200BD20: ; 0x0200BD20 - push {r4-r7, lr} - sub sp, #0x24 - add r5, r0, #0x0 - mov r0, #0x6 - add r4, r1, #0x0 - str r2, [sp, #0x10] - str r0, [sp, #0x14] - cmp r5, #0x0 - beq _0200BD36 - cmp r4, #0x0 - bne _0200BD3C -_0200BD36: - add sp, #0x24 - mov r0, #0x0 - pop {r4-r7, pc} -_0200BD3C: - add r0, r2, #0x0 - ldr r0, [r0, #0x10] - cmp r0, #0x0 - bne _0200BD48 - mov r0, #0x4 - str r0, [sp, #0x14] -_0200BD48: - ldr r0, [sp, #0x14] - str r0, [r4, #0x54] - bl FUN_0200965C - add r2, r0, #0x0 - ldr r1, [sp, #0x14] - ldr r0, [r5, #0x0] - mul r1, r2 - bl AllocFromHeap - str r0, [r4, #0x8] - ldr r0, [sp, #0x14] - mov r7, #0x0 - cmp r0, #0x0 - ble _0200BD94 - ldr r6, [sp, #0x10] -_0200BD68: - ldr r0, [r4, #0x8] - add r1, r7, #0x0 - bl FUN_02009660 - str r0, [sp, #0x18] - ldr r0, [r5, #0x0] - ldr r1, [r6, #0x0] - bl FUN_020161A4 - ldr r1, [sp, #0x18] - ldr r2, [r5, #0x0] - str r0, [sp, #0x1c] - bl FUN_02009668 - ldr r0, [sp, #0x1c] - bl FreeToHeap - ldr r0, [sp, #0x14] - add r7, r7, #0x1 - add r6, r6, #0x4 - cmp r7, r0 - blt _0200BD68 -_0200BD94: - ldr r0, [sp, #0x14] - mov r6, #0x0 - cmp r0, #0x0 - ble _0200BDBE - add r7, r4, #0x0 -_0200BD9E: - ldr r0, [r4, #0x8] - add r1, r6, #0x0 - bl FUN_02009660 - bl FUN_020096CC - ldr r2, [r5, #0x0] - add r1, r6, #0x0 - bl FUN_02008DEC - str r0, [r7, #0xc] - ldr r0, [sp, #0x14] - add r6, r6, #0x1 - add r7, r7, #0x4 - cmp r6, r0 - blt _0200BD9E -_0200BDBE: - ldr r0, [sp, #0x14] - mov r7, #0x0 - cmp r0, #0x0 - ble _0200BDF6 - add r6, r4, #0x0 -_0200BDC8: - ldr r0, [r4, #0x8] - add r1, r7, #0x0 - bl FUN_02009660 - str r0, [sp, #0x20] - bl FUN_020096CC - ldr r1, [r5, #0x0] - bl FUN_02009424 - add r2, r0, #0x0 - str r2, [r6, #0x24] - ldr r0, [r6, #0xc] - ldr r1, [sp, #0x20] - ldr r3, [r5, #0x0] - bl FUN_020093A8 - str r0, [r6, #0x3c] - ldr r0, [sp, #0x14] - add r7, r7, #0x1 - add r6, r6, #0x4 - cmp r7, r0 - blt _0200BDC8 -_0200BDF6: - ldr r0, [r4, #0x24] - bl FUN_02009A90 - ldr r0, [r4, #0x28] - bl FUN_02009D34 - ldr r1, [sp, #0x10] - ldr r0, [r5, #0x0] - ldr r1, [r1, #0x18] - bl FUN_020161A4 - ldr r1, [r4, #0x14] - add r6, r0, #0x0 - str r1, [sp, #0x0] - ldr r1, [r4, #0x18] - str r1, [sp, #0x4] - ldr r1, [r4, #0x1c] - str r1, [sp, #0x8] - ldr r1, [r4, #0x20] - str r1, [sp, #0xc] - ldr r1, [r5, #0x0] - ldr r2, [r4, #0xc] - ldr r3, [r4, #0x10] - bl FUN_02008BE0 - str r0, [r4, #0x4] - add r0, r6, #0x0 - bl FreeToHeap - mov r0, #0x1 - add sp, #0x24 - pop {r4-r7, pc} - .balign 4 - - thumb_func_start FUN_0200BE38 -FUN_0200BE38: ; 0x0200BE38 - push {r4, lr} - sub sp, #0x28 - mov r3, #0x4 - mov r4, #0x6 - ldrsh r3, [r2, r3] - ldrsh r4, [r2, r4] - str r4, [sp, #0x0] - str r3, [sp, #0x4] - ldrh r4, [r2, #0xa] - str r4, [sp, #0x8] - ldr r4, [r2, #0xc] - str r4, [sp, #0xc] - ldr r4, [r2, #0x10] - str r4, [sp, #0x10] - ldr r4, [r2, #0x14] - str r4, [sp, #0x14] - ldr r4, [r2, #0x18] - str r4, [sp, #0x18] - ldr r4, [r2, #0x1c] - str r4, [sp, #0x1c] - ldr r4, [r2, #0x20] - str r4, [sp, #0x20] - ldr r4, [r2, #0x24] - str r4, [sp, #0x24] - ldr r2, [r2, #0x0] - bl FUN_0200BE74 - add sp, #0x28 - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_0200BE74 -FUN_0200BE74: ; 0x0200BE74 - push {r4, lr} - sub sp, #0x30 - add r4, r0, #0x0 - ldr r0, [r1, #0x0] - str r0, [sp, #0x0] - ldr r0, [r1, #0x4] - ldr r1, [r0, #0x0] - mov r0, #0x24 - mul r0, r2 - add r0, r1, r0 - str r0, [sp, #0x4] - cmp r3, #0x0 - ble _0200BEA0 - lsl r0, r3, #0xc - bl _fflt - add r1, r0, #0x0 - mov r0, #0x3f - lsl r0, r0, #0x18 - bl _fadd - b _0200BEAE -_0200BEA0: - lsl r0, r3, #0xc - bl _fflt - mov r1, #0x3f - lsl r1, r1, #0x18 - bl _fsub -_0200BEAE: - bl _ffix - str r0, [sp, #0x8] - add r1, sp, #0x28 - mov r0, #0x10 - ldrsh r0, [r1, r0] - cmp r0, #0x0 - ble _0200BED0 - lsl r0, r0, #0xc - bl _fflt - add r1, r0, #0x0 - mov r0, #0x3f - lsl r0, r0, #0x18 - bl _fadd - b _0200BEDE -_0200BED0: - lsl r0, r0, #0xc - bl _fflt - mov r1, #0x3f - lsl r1, r1, #0x18 - bl _fsub -_0200BEDE: - bl _ffix - str r0, [sp, #0xc] - add r1, sp, #0x28 - mov r0, #0x14 - ldrsh r0, [r1, r0] - cmp r0, #0x0 - ble _0200BF00 - lsl r0, r0, #0xc - bl _fflt - add r1, r0, #0x0 - mov r0, #0x3f - lsl r0, r0, #0x18 - bl _fadd - b _0200BF0E -_0200BF00: - lsl r0, r0, #0xc - bl _fflt - mov r1, #0x3f - lsl r1, r1, #0x18 - bl _fsub -_0200BF0E: - bl _ffix - str r0, [sp, #0x10] - ldr r0, [sp, #0x4c] - cmp r0, #0x2 - bne _0200BF24 - mov r0, #0x3 - ldr r1, [sp, #0xc] - lsl r0, r0, #0x12 - add r0, r1, r0 - str r0, [sp, #0xc] -_0200BF24: - mov r0, #0x1 - lsl r0, r0, #0xc - str r0, [sp, #0x14] - str r0, [sp, #0x18] - str r0, [sp, #0x1c] - mov r1, #0x0 - add r0, sp, #0x0 - strh r1, [r0, #0x20] - ldr r0, [sp, #0x44] - str r0, [sp, #0x24] - ldr r0, [sp, #0x4c] - str r0, [sp, #0x28] - ldr r0, [r4, #0x0] - str r0, [sp, #0x2c] - add r0, sp, #0x0 - bl FUN_0201FE94 - add r4, r0, #0x0 - beq _0200BF5A - add r1, sp, #0x28 - ldrh r1, [r1, #0x18] - bl FUN_02020130 - ldr r1, [sp, #0x48] - add r0, r4, #0x0 - bl FUN_02020248 -_0200BF5A: - add r0, r4, #0x0 - add sp, #0x30 - pop {r4, pc} - - thumb_func_start FUN_0200BF60 -FUN_0200BF60: ; 0x0200BF60 - push {r4-r7, lr} - sub sp, #0xc - str r0, [sp, #0x0] - mov r0, #0x6 - str r0, [sp, #0x4] - ldr r0, [sp, #0x0] - add r5, r1, #0x0 - add r6, r2, #0x0 - cmp r0, #0x0 - beq _0200BF78 - cmp r5, #0x0 - bne _0200BF7E -_0200BF78: - add sp, #0xc - mov r0, #0x0 - pop {r4-r7, pc} -_0200BF7E: - ldr r0, [r6, #0x10] - cmp r0, #0x0 - beq _0200BF8A - ldr r0, [r6, #0x14] - cmp r0, #0x0 - bne _0200BF8E -_0200BF8A: - mov r0, #0x4 - str r0, [sp, #0x4] -_0200BF8E: - ldr r0, [sp, #0x4] - str r0, [r5, #0x54] - mov r0, #0x0 - str r0, [sp, #0x8] - ldr r0, [sp, #0x4] - cmp r0, #0x0 - ble _0200BFBE - add r7, r6, #0x0 - add r4, r5, #0x0 -_0200BFA0: - ldr r2, [sp, #0x0] - ldr r0, [r7, #0x0] - ldr r1, [sp, #0x8] - ldr r2, [r2, #0x0] - bl FUN_02008DEC - str r0, [r4, #0xc] - ldr r0, [sp, #0x8] - add r7, r7, #0x4 - add r1, r0, #0x1 - ldr r0, [sp, #0x4] - add r4, r4, #0x4 - str r1, [sp, #0x8] - cmp r1, r0 - blt _0200BFA0 -_0200BFBE: - ldr r0, [sp, #0x4] - mov r7, #0x0 - cmp r0, #0x0 - ble _0200C004 - add r4, r7, #0x0 -_0200BFC8: - ldr r0, [r6, #0x0] - cmp r0, #0x0 - beq _0200BFF8 - ldr r1, [sp, #0x0] - ldr r1, [r1, #0x0] - bl FUN_02009424 - str r0, [r5, #0x24] - mov r0, #0x0 - str r0, [r5, #0x3c] - ldr r3, [r5, #0x24] - add r1, r0, #0x0 - ldr r0, [r3, #0x4] - cmp r0, #0x0 - ble _0200BFF8 - add r2, r1, #0x0 -_0200BFE8: - ldr r0, [r3, #0x0] - add r1, r1, #0x1 - str r4, [r0, r2] - ldr r3, [r5, #0x24] - add r2, r2, #0x4 - ldr r0, [r3, #0x4] - cmp r1, r0 - blt _0200BFE8 -_0200BFF8: - ldr r0, [sp, #0x4] - add r7, r7, #0x1 - add r6, r6, #0x4 - add r5, r5, #0x4 - cmp r7, r0 - blt _0200BFC8 -_0200C004: - mov r0, #0x1 - add sp, #0xc - pop {r4-r7, pc} - .balign 4 - - thumb_func_start FUN_0200C00C -FUN_0200C00C: ; 0x0200C00C - push {r4-r7, lr} - sub sp, #0xc - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r0, [r4, #0xc] - ldr r1, [sp, #0x28] - add r6, r2, #0x0 - add r7, r3, #0x0 - bl FUN_0200945C - cmp r0, #0x0 - bne _0200C02A - add sp, #0xc - mov r0, #0x0 - pop {r4-r7, pc} -_0200C02A: - ldr r0, [sp, #0x28] - ldr r3, [sp, #0x20] - str r0, [sp, #0x0] - ldr r0, [sp, #0x24] - add r1, r6, #0x0 - str r0, [sp, #0x4] - ldr r0, [r5, #0x0] - add r2, r7, #0x0 - str r0, [sp, #0x8] - ldr r0, [r4, #0xc] - bl FUN_02008F34 - add r5, r0, #0x0 - beq _0200C058 - bl FUN_02009B04 - ldr r0, [r4, #0x24] - add r1, r5, #0x0 - bl FUN_0200C474 - add sp, #0xc - mov r0, #0x1 - pop {r4-r7, pc} -_0200C058: - bl GF_AssertFail - cmp r5, #0x0 - beq _0200C066 - add sp, #0xc - mov r0, #0x1 - pop {r4-r7, pc} -_0200C066: - mov r0, #0x0 - add sp, #0xc - pop {r4-r7, pc} - - thumb_func_start FUN_0200C06C -FUN_0200C06C: ; 0x0200C06C - push {r3-r7, lr} - sub sp, #0x10 - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r0, [r4, #0x10] - ldr r1, [sp, #0x34] - add r6, r2, #0x0 - add r7, r3, #0x0 - bl FUN_0200945C - cmp r0, #0x0 - bne _0200C08C - mov r0, #0x0 - add sp, #0x10 - mvn r0, r0 - pop {r3-r7, pc} -_0200C08C: - ldr r0, [sp, #0x34] - ldr r3, [sp, #0x28] - str r0, [sp, #0x0] - ldr r0, [sp, #0x30] - add r1, r6, #0x0 - str r0, [sp, #0x4] - ldr r0, [sp, #0x2c] - add r2, r7, #0x0 - str r0, [sp, #0x8] - ldr r0, [r5, #0x0] - str r0, [sp, #0xc] - ldr r0, [r4, #0x10] - bl FUN_02008FEC - add r5, r0, #0x0 - beq _0200C0D0 - bl FUN_02009D68 - cmp r0, #0x1 - beq _0200C0B8 - bl GF_AssertFail -_0200C0B8: - ldr r0, [r4, #0x28] - add r1, r5, #0x0 - bl FUN_0200C474 - ldr r1, [sp, #0x30] - add r0, r5, #0x0 - bl FUN_02009E88 - lsl r0, r0, #0x18 - add sp, #0x10 - asr r0, r0, #0x18 - pop {r3-r7, pc} -_0200C0D0: - bl GF_AssertFail - mov r0, #0x0 - mvn r0, r0 - add sp, #0x10 - pop {r3-r7, pc} - - thumb_func_start FUN_0200C0DC -FUN_0200C0DC: ; 0x0200C0DC - push {r4-r6, lr} - sub sp, #0x10 - add r5, r0, #0x0 - ldr r0, [sp, #0x28] - add r6, r1, #0x0 - str r0, [sp, #0x0] - ldr r0, [sp, #0x2c] - add r1, r3, #0x0 - str r0, [sp, #0x4] - ldr r0, [sp, #0x30] - ldr r3, [sp, #0x24] - str r0, [sp, #0x8] - ldr r0, [sp, #0x34] - str r0, [sp, #0xc] - add r0, r2, #0x0 - ldr r2, [sp, #0x20] - bl FUN_0200C06C - add r4, r0, #0x0 - mov r0, #0x0 - mvn r0, r0 - cmp r4, r0 - beq _0200C11A - ldr r3, [sp, #0x2c] - lsl r2, r4, #0x14 - add r0, r5, #0x0 - add r1, r6, #0x0 - lsr r2, r2, #0x10 - lsl r3, r3, #0x5 - bl FUN_02003108 -_0200C11A: - lsl r0, r4, #0x18 - lsr r0, r0, #0x18 - add sp, #0x10 - pop {r4-r6, pc} - .balign 4 - - thumb_func_start FUN_0200C124 -FUN_0200C124: ; 0x0200C124 - push {r3-r4, lr} - sub sp, #0xc - ldr r4, [sp, #0x18] - str r4, [sp, #0x0] - mov r4, #0x2 - str r4, [sp, #0x4] - ldr r4, [sp, #0x1c] - str r4, [sp, #0x8] - bl FUN_0200C404 - add sp, #0xc - pop {r3-r4, pc} - - thumb_func_start FUN_0200C13C -FUN_0200C13C: ; 0x0200C13C - push {r3-r4, lr} - sub sp, #0xc - ldr r4, [sp, #0x18] - str r4, [sp, #0x0] - mov r4, #0x3 - str r4, [sp, #0x4] - ldr r4, [sp, #0x1c] - str r4, [sp, #0x8] - bl FUN_0200C404 - add sp, #0xc - pop {r3-r4, pc} - - thumb_func_start FUN_0200C154 -FUN_0200C154: ; 0x0200C154 - push {r4-r7, lr} - sub sp, #0x74 - add r7, r0, #0x0 - ldr r0, [r7, #0x0] - add r6, r1, #0x0 - mov r1, #0x10 - add r5, r2, #0x0 - bl AllocFromHeap - add r4, r0, #0x0 - bne _0200C170 - add sp, #0x74 - mov r0, #0x0 - pop {r4-r7, pc} -_0200C170: - ldr r0, [r7, #0x0] - mov r1, #0x8 - bl AllocFromHeap - str r0, [r4, #0x8] - cmp r0, #0x0 - bne _0200C184 - add sp, #0x74 - mov r0, #0x0 - pop {r4-r7, pc} -_0200C184: - ldr r0, [r7, #0x0] - mov r1, #0x24 - bl AllocFromHeap - ldr r1, [r4, #0x8] - str r0, [r1, #0x0] - ldr r0, [r4, #0x8] - ldr r0, [r0, #0x0] - str r0, [r4, #0x4] - ldr r0, [r4, #0x8] - ldr r1, [r0, #0x0] - cmp r1, #0x0 - bne _0200C1AC - cmp r0, #0x0 - beq _0200C1A6 - bl FreeToHeap -_0200C1A6: - add sp, #0x74 - mov r0, #0x0 - pop {r4-r7, pc} -_0200C1AC: - mov r1, #0x0 - add r2, r5, #0x0 - add r3, sp, #0x2c -_0200C1B2: - ldr r0, [r2, #0x14] - add r1, r1, #0x1 - add r2, r2, #0x4 - stmia r3!, {r0} - cmp r1, #0x6 - blt _0200C1B2 - ldr r0, [r6, #0x1c] - cmp r0, #0x0 - beq _0200C1CA - ldr r1, [r6, #0x20] - cmp r1, #0x0 - bne _0200C1D4 -_0200C1CA: - mov r0, #0x0 - mvn r0, r0 - str r0, [sp, #0x3c] - str r0, [sp, #0x40] - b _0200C206 -_0200C1D4: - mov r2, #0x0 - ldr r1, [sp, #0x3c] - mvn r2, r2 - cmp r1, r2 - beq _0200C1EC - bl FUN_0200945C - cmp r0, #0x0 - bne _0200C1EC - mov r0, #0x0 - mvn r0, r0 - str r0, [sp, #0x3c] -_0200C1EC: - mov r0, #0x0 - ldr r1, [sp, #0x40] - mvn r0, r0 - cmp r1, r0 - beq _0200C206 - ldr r0, [r6, #0x20] - bl FUN_0200945C - cmp r0, #0x0 - bne _0200C206 - mov r0, #0x0 - mvn r0, r0 - str r0, [sp, #0x40] -_0200C206: - ldr r0, [sp, #0x38] - str r0, [sp, #0x0] - ldr r0, [sp, #0x3c] - str r0, [sp, #0x4] - ldr r0, [sp, #0x40] - str r0, [sp, #0x8] - ldr r0, [r5, #0x30] - str r0, [sp, #0xc] - ldr r0, [r5, #0x2c] - str r0, [sp, #0x10] - ldr r0, [r6, #0xc] - str r0, [sp, #0x14] - ldr r0, [r6, #0x10] - str r0, [sp, #0x18] - ldr r0, [r6, #0x14] - str r0, [sp, #0x1c] - ldr r0, [r6, #0x18] - str r0, [sp, #0x20] - ldr r0, [r6, #0x1c] - str r0, [sp, #0x24] - ldr r0, [r6, #0x20] - str r0, [sp, #0x28] - ldr r0, [r4, #0x4] - ldr r1, [sp, #0x2c] - ldr r2, [sp, #0x30] - ldr r3, [sp, #0x34] - bl FUN_02008AA4 - ldr r0, [r6, #0x0] - str r0, [sp, #0x44] - ldr r0, [r4, #0x4] - str r0, [sp, #0x48] - mov r0, #0x0 - ldrsh r0, [r5, r0] - cmp r0, #0x0 - ble _0200C260 - lsl r0, r0, #0xc - bl _fflt - add r1, r0, #0x0 - mov r0, #0x3f - lsl r0, r0, #0x18 - bl _fadd - b _0200C26E -_0200C260: - lsl r0, r0, #0xc - bl _fflt - mov r1, #0x3f - lsl r1, r1, #0x18 - bl _fsub -_0200C26E: - bl _ffix - str r0, [sp, #0x4c] - mov r0, #0x2 - ldrsh r0, [r5, r0] - cmp r0, #0x0 - ble _0200C28E - lsl r0, r0, #0xc - bl _fflt - add r1, r0, #0x0 - mov r0, #0x3f - lsl r0, r0, #0x18 - bl _fadd - b _0200C29C -_0200C28E: - lsl r0, r0, #0xc - bl _fflt - mov r1, #0x3f - lsl r1, r1, #0x18 - bl _fsub -_0200C29C: - bl _ffix - str r0, [sp, #0x50] - mov r0, #0x4 - ldrsh r0, [r5, r0] - cmp r0, #0x0 - ble _0200C2BC - lsl r0, r0, #0xc - bl _fflt - add r1, r0, #0x0 - mov r0, #0x3f - lsl r0, r0, #0x18 - bl _fadd - b _0200C2CA -_0200C2BC: - lsl r0, r0, #0xc - bl _fflt - mov r1, #0x3f - lsl r1, r1, #0x18 - bl _fsub -_0200C2CA: - bl _ffix - str r0, [sp, #0x54] - ldr r0, [r5, #0x10] - cmp r0, #0x2 - bne _0200C2E0 - mov r0, #0x3 - ldr r1, [sp, #0x50] - lsl r0, r0, #0x12 - add r0, r1, r0 - str r0, [sp, #0x50] -_0200C2E0: - mov r0, #0x1 - lsl r0, r0, #0xc - str r0, [sp, #0x58] - str r0, [sp, #0x5c] - str r0, [sp, #0x60] - mov r1, #0x0 - add r0, sp, #0x2c - strh r1, [r0, #0x38] - ldr r0, [r5, #0x8] - str r0, [sp, #0x68] - ldr r0, [r5, #0x10] - str r0, [sp, #0x6c] - ldr r0, [r7, #0x0] - str r0, [sp, #0x70] - add r0, sp, #0x44 - bl FUN_0201FE94 - str r0, [r4, #0x0] - ldr r0, [r5, #0x30] - str r0, [r4, #0xc] - ldr r0, [r4, #0x0] - cmp r0, #0x0 - beq _0200C328 - bl FUN_020202A0 - add r6, r0, #0x0 - ldrh r1, [r5, #0x6] - ldr r0, [r4, #0x0] - bl FUN_02020130 - ldr r1, [r5, #0xc] - ldr r0, [r4, #0x0] - add r1, r6, r1 - bl FUN_02020248 - b _0200C32C -_0200C328: - bl GF_AssertFail -_0200C32C: - add r0, r4, #0x0 - add sp, #0x74 - pop {r4-r7, pc} - .balign 4 - - thumb_func_start FUN_0200C334 -FUN_0200C334: ; 0x0200C334 - push {r3, lr} - ldr r0, [r0, #0x10] - bl FUN_020094F0 - mov r1, #0x0 - bl FUN_02009E54 - pop {r3, pc} - - thumb_func_start FUN_0200C344 -FUN_0200C344: ; 0x0200C344 - push {r4, lr} - ldr r0, [r0, #0x10] - add r4, r2, #0x0 - bl FUN_020094F0 - add r1, r4, #0x0 - bl FUN_02009E88 - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_0200C358 -FUN_0200C358: ; 0x0200C358 - add r3, r0, #0x0 - add r2, r1, #0x0 - ldr r0, [r3, #0xc] - ldr r1, [r3, #0x24] - ldr r3, _0200C364 ; =FUN_0200C4F4 - bx r3 - .balign 4 -_0200C364: .word FUN_0200C4F4 - - thumb_func_start FUN_0200C368 -FUN_0200C368: ; 0x0200C368 - add r3, r0, #0x0 - add r2, r1, #0x0 - ldr r0, [r3, #0x10] - ldr r1, [r3, #0x28] - ldr r3, _0200C374 ; =FUN_0200C548 - bx r3 - .balign 4 -_0200C374: .word FUN_0200C548 - - thumb_func_start FUN_0200C378 -FUN_0200C378: ; 0x0200C378 - add r3, r0, #0x0 - add r2, r1, #0x0 - ldr r0, [r3, #0x14] - ldr r1, [r3, #0x2c] - ldr r3, _0200C384 ; =FUN_0200C4A8 - bx r3 - .balign 4 -_0200C384: .word FUN_0200C4A8 - - thumb_func_start FUN_0200C388 -FUN_0200C388: ; 0x0200C388 - add r3, r0, #0x0 - add r2, r1, #0x0 - ldr r0, [r3, #0x18] - ldr r1, [r3, #0x30] - ldr r3, _0200C394 ; =FUN_0200C4A8 - bx r3 - .balign 4 -_0200C394: .word FUN_0200C4A8 - - thumb_func_start FUN_0200C398 -FUN_0200C398: ; 0x0200C398 - push {r3-r7, lr} - add r6, r1, #0x0 - add r7, r0, #0x0 - add r0, r6, #0x0 - bl FUN_0200BC40 - ldr r0, [r6, #0x24] - bl FUN_02009C30 - ldr r0, [r6, #0x28] - bl FUN_02009E28 - ldr r0, [r6, #0x54] - mov r4, #0x0 - cmp r0, #0x0 - ble _0200C3D0 - add r5, r6, #0x0 -_0200C3BA: - ldr r0, [r5, #0x24] - bl FUN_02009448 - ldr r0, [r5, #0xc] - bl FUN_02008E2C - ldr r0, [r6, #0x54] - add r4, r4, #0x1 - add r5, r5, #0x4 - cmp r4, r0 - blt _0200C3BA -_0200C3D0: - add r0, r7, #0x0 - add r1, r6, #0x0 - bl FUN_0200BCD0 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200C3DC -FUN_0200C3DC: ; 0x0200C3DC - push {r4, lr} - add r4, r0, #0x0 - ldr r0, [r4, #0xc] - cmp r0, #0x0 - beq _0200C3EE - ldr r0, [r4, #0x4] - ldr r0, [r0, #0x0] - bl FUN_02009CDC -_0200C3EE: - ldr r0, [r4, #0x0] - bl FUN_0201FFC8 - ldr r0, [r4, #0x8] - bl FUN_02008C80 - add r0, r4, #0x0 - bl FreeToHeap - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_0200C404 -FUN_0200C404: ; 0x0200C404 - push {r4-r7, lr} - sub sp, #0x14 - add r6, r1, #0x0 - add r7, r0, #0x0 - ldr r0, [sp, #0x2c] - add r5, r6, #0x0 - lsl r4, r0, #0x2 - add r5, #0xc - ldr r0, [r5, r4] - ldr r1, [sp, #0x30] - str r2, [sp, #0xc] - str r3, [sp, #0x10] - bl FUN_0200945C - cmp r0, #0x0 - bne _0200C42A - add sp, #0x14 - mov r0, #0x0 - pop {r4-r7, pc} -_0200C42A: - ldr r0, [sp, #0x30] - ldr r1, [sp, #0xc] - str r0, [sp, #0x0] - ldr r0, [sp, #0x2c] - ldr r2, [sp, #0x10] - str r0, [sp, #0x4] - ldr r0, [r7, #0x0] - ldr r3, [sp, #0x28] - str r0, [sp, #0x8] - ldr r0, [r5, r4] - bl FUN_020090AC - add r5, r0, #0x0 - beq _0200C460 - add r0, r6, r4 - ldr r0, [r0, #0x24] - add r1, r5, #0x0 - bl FUN_0200C474 - add r4, r0, #0x0 - cmp r4, #0x1 - beq _0200C45A - bl GF_AssertFail -_0200C45A: - add sp, #0x14 - add r0, r4, #0x0 - pop {r4-r7, pc} -_0200C460: - bl GF_AssertFail - cmp r5, #0x0 - beq _0200C46E - add sp, #0x14 - mov r0, #0x1 - pop {r4-r7, pc} -_0200C46E: - mov r0, #0x0 - add sp, #0x14 - pop {r4-r7, pc} - - thumb_func_start FUN_0200C474 -FUN_0200C474: ; 0x0200C474 - push {r3-r6} - ldr r6, [r0, #0x4] - mov r3, #0x0 - cmp r6, #0x0 - ble _0200C4A0 - ldr r5, [r0, #0x0] - add r4, r5, #0x0 -_0200C482: - ldr r2, [r4, #0x0] - cmp r2, #0x0 - bne _0200C498 - lsl r2, r3, #0x2 - str r1, [r5, r2] - ldr r1, [r0, #0x8] - add r1, r1, #0x1 - str r1, [r0, #0x8] - mov r0, #0x1 - pop {r3-r6} - bx lr -_0200C498: - add r3, r3, #0x1 - add r4, r4, #0x4 - cmp r3, r6 - blt _0200C482 -_0200C4A0: - mov r0, #0x0 - pop {r3-r6} - bx lr - .balign 4 - - thumb_func_start FUN_0200C4A8 -FUN_0200C4A8: ; 0x0200C4A8 - push {r3-r7, lr} - add r5, r1, #0x0 - str r0, [sp, #0x0] - ldr r0, [r5, #0x4] - add r7, r2, #0x0 - mov r6, #0x0 - cmp r0, #0x0 - ble _0200C4F0 - add r4, r6, #0x0 -_0200C4BA: - ldr r0, [r5, #0x0] - ldr r0, [r0, r4] - cmp r0, #0x0 - beq _0200C4E6 - bl FUN_02009530 - cmp r0, r7 - bne _0200C4E6 - ldr r1, [r5, #0x0] - lsl r4, r6, #0x2 - ldr r0, [sp, #0x0] - ldr r1, [r1, r4] - bl FUN_02009490 - ldr r0, [r5, #0x0] - mov r1, #0x0 - str r1, [r0, r4] - ldr r0, [r5, #0x8] - sub r0, r0, #0x1 - str r0, [r5, #0x8] - mov r0, #0x1 - pop {r3-r7, pc} -_0200C4E6: - ldr r0, [r5, #0x4] - add r6, r6, #0x1 - add r4, r4, #0x4 - cmp r6, r0 - blt _0200C4BA -_0200C4F0: - mov r0, #0x0 - pop {r3-r7, pc} - - thumb_func_start FUN_0200C4F4 -FUN_0200C4F4: ; 0x0200C4F4 - push {r3-r7, lr} - add r5, r1, #0x0 - str r0, [sp, #0x0] - ldr r0, [r5, #0x4] - add r7, r2, #0x0 - mov r6, #0x0 - cmp r0, #0x0 - ble _0200C542 - add r4, r6, #0x0 -_0200C506: - ldr r0, [r5, #0x0] - ldr r0, [r0, r4] - cmp r0, #0x0 - beq _0200C538 - bl FUN_02009530 - cmp r0, r7 - bne _0200C538 - add r0, r7, #0x0 - bl FUN_0201D324 - ldr r1, [r5, #0x0] - lsl r4, r6, #0x2 - ldr r0, [sp, #0x0] - ldr r1, [r1, r4] - bl FUN_02009490 - ldr r0, [r5, #0x0] - mov r1, #0x0 - str r1, [r0, r4] - ldr r0, [r5, #0x8] - sub r0, r0, #0x1 - str r0, [r5, #0x8] - mov r0, #0x1 - pop {r3-r7, pc} -_0200C538: - ldr r0, [r5, #0x4] - add r6, r6, #0x1 - add r4, r4, #0x4 - cmp r6, r0 - blt _0200C506 -_0200C542: - mov r0, #0x0 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200C548 -FUN_0200C548: ; 0x0200C548 - push {r3-r7, lr} - add r5, r1, #0x0 - str r0, [sp, #0x0] - ldr r0, [r5, #0x4] - add r7, r2, #0x0 - mov r6, #0x0 - cmp r0, #0x0 - ble _0200C596 - add r4, r6, #0x0 -_0200C55A: - ldr r0, [r5, #0x0] - ldr r0, [r0, r4] - cmp r0, #0x0 - beq _0200C58C - bl FUN_02009530 - cmp r0, r7 - bne _0200C58C - add r0, r7, #0x0 - bl FUN_0201E1C8 - ldr r1, [r5, #0x0] - lsl r4, r6, #0x2 - ldr r0, [sp, #0x0] - ldr r1, [r1, r4] - bl FUN_02009490 - ldr r0, [r5, #0x0] - mov r1, #0x0 - str r1, [r0, r4] - ldr r0, [r5, #0x8] - sub r0, r0, #0x1 - str r0, [r5, #0x8] - mov r0, #0x1 - pop {r3-r7, pc} -_0200C58C: - ldr r0, [r5, #0x4] - add r6, r6, #0x1 - add r4, r4, #0x4 - cmp r6, r0 - blt _0200C55A -_0200C596: - mov r0, #0x0 - pop {r3-r7, pc} - .balign 4 - - thumb_func_start FUN_0200C59C -FUN_0200C59C: ; 0x0200C59C - ldr r3, _0200C5A4 ; =FUN_020201E4 - mov r1, #0x1 - lsl r1, r1, #0xc - bx r3 - .balign 4 -_0200C5A4: .word FUN_020201E4 - - thumb_func_start FUN_0200C5A8 -FUN_0200C5A8: ; 0x0200C5A8 - ldr r3, _0200C5B0 ; =FUN_0200C59C - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C5B0: .word FUN_0200C59C - - thumb_func_start FUN_0200C5B4 -FUN_0200C5B4: ; 0x0200C5B4 - ldr r3, _0200C5BC ; =FUN_020201E4 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C5BC: .word FUN_020201E4 - - thumb_func_start FUN_0200C5C0 -FUN_0200C5C0: ; 0x0200C5C0 - ldr r3, _0200C5C8 ; =FUN_02020130 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C5C8: .word FUN_02020130 - - thumb_func_start FUN_0200C5CC -FUN_0200C5CC: ; 0x0200C5CC - ldr r3, _0200C5D4 ; =FUN_020201DC - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C5D4: .word FUN_020201DC - - thumb_func_start FUN_0200C5D8 -FUN_0200C5D8: ; 0x0200C5D8 - ldr r3, _0200C5DC ; =FUN_020200BC - bx r3 - .balign 4 -_0200C5DC: .word FUN_020200BC - - thumb_func_start FUN_0200C5E0 -FUN_0200C5E0: ; 0x0200C5E0 - ldr r3, _0200C5E8 ; =FUN_0200C5D8 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C5E8: .word FUN_0200C5D8 - - thumb_func_start FUN_0200C5EC -FUN_0200C5EC: ; 0x0200C5EC - ldr r3, _0200C5F0 ; =FUN_020200D8 - bx r3 - .balign 4 -_0200C5F0: .word FUN_020200D8 - - thumb_func_start FUN_0200C5F4 -FUN_0200C5F4: ; 0x0200C5F4 - ldr r3, _0200C5FC ; =FUN_0200C5EC - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C5FC: .word FUN_0200C5EC - - thumb_func_start FUN_0200C600 -FUN_0200C600: ; 0x0200C600 - ldr r3, _0200C604 ; =FUN_02020388 - bx r3 - .balign 4 -_0200C604: .word FUN_02020388 - - thumb_func_start FUN_0200C608 -FUN_0200C608: ; 0x0200C608 - ldr r3, _0200C610 ; =FUN_0200C600 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C610: .word FUN_0200C600 - - thumb_func_start FUN_0200C614 -FUN_0200C614: ; 0x0200C614 - ldr r3, _0200C618 ; =FUN_02020208 - bx r3 - .balign 4 -_0200C618: .word FUN_02020208 - - thumb_func_start FUN_0200C61C -FUN_0200C61C: ; 0x0200C61C - ldr r3, _0200C624 ; =FUN_0200C614 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C624: .word FUN_0200C614 - - thumb_func_start FUN_0200C628 -FUN_0200C628: ; 0x0200C628 - ldr r3, _0200C62C ; =FUN_0202022C - bx r3 - .balign 4 -_0200C62C: .word FUN_0202022C - - thumb_func_start FUN_0200C630 -FUN_0200C630: ; 0x0200C630 - ldr r3, _0200C638 ; =FUN_0200C628 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C638: .word FUN_0200C628 - - thumb_func_start FUN_0200C63C -FUN_0200C63C: ; 0x0200C63C - ldr r3, _0200C640 ; =FUN_020200A0 - bx r3 - .balign 4 -_0200C640: .word FUN_020200A0 - - thumb_func_start FUN_0200C644 -FUN_0200C644: ; 0x0200C644 - ldr r3, _0200C64C ; =FUN_0200C63C - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C64C: .word FUN_0200C63C - - thumb_func_start FUN_0200C650 -FUN_0200C650: ; 0x0200C650 - ldr r3, _0200C654 ; =FUN_02020128 - bx r3 - .balign 4 -_0200C654: .word FUN_02020128 - - thumb_func_start FUN_0200C658 -FUN_0200C658: ; 0x0200C658 - ldr r3, _0200C660 ; =FUN_0200C650 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C660: .word FUN_0200C650 - - thumb_func_start FUN_0200C664 -FUN_0200C664: ; 0x0200C664 - ldr r3, _0200C668 ; =FUN_02020248 - bx r3 - .balign 4 -_0200C668: .word FUN_02020248 - - thumb_func_start FUN_0200C66C -FUN_0200C66C: ; 0x0200C66C - ldr r3, _0200C674 ; =FUN_0200C664 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C674: .word FUN_0200C664 - - thumb_func_start FUN_0200C678 -FUN_0200C678: ; 0x0200C678 - ldr r3, _0200C67C ; =FUN_020202A8 - bx r3 - .balign 4 -_0200C67C: .word FUN_020202A8 - - thumb_func_start FUN_0200C680 -FUN_0200C680: ; 0x0200C680 - ldr r3, _0200C688 ; =FUN_0200C678 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C688: .word FUN_0200C678 - - thumb_func_start FUN_0200C68C -FUN_0200C68C: ; 0x0200C68C - ldr r3, _0200C694 ; =FUN_02020300 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C694: .word FUN_02020300 - - thumb_func_start FUN_0200C698 -FUN_0200C698: ; 0x0200C698 - ldr r3, _0200C6A0 ; =FUN_02020238 - lsl r1, r1, #0x18 - lsr r1, r1, #0x18 - bx r3 - .balign 4 -_0200C6A0: .word FUN_02020238 - - thumb_func_start FUN_0200C6A4 -FUN_0200C6A4: ; 0x0200C6A4 - ldr r3, _0200C6AC ; =FUN_02020240 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C6AC: .word FUN_02020240 - - thumb_func_start FUN_0200C6B0 -FUN_0200C6B0: ; 0x0200C6B0 - ldr r3, _0200C6B8 ; =FUN_0200C698 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C6B8: .word FUN_0200C698 - - thumb_func_start FUN_0200C6BC -FUN_0200C6BC: ; 0x0200C6BC - ldr r3, _0200C6C0 ; =FUN_02020310 - bx r3 - .balign 4 -_0200C6C0: .word FUN_02020310 - - thumb_func_start FUN_0200C6C4 -FUN_0200C6C4: ; 0x0200C6C4 - ldr r3, _0200C6CC ; =FUN_0200C6BC - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C6CC: .word FUN_0200C6BC - - thumb_func_start FUN_0200C6D0 -FUN_0200C6D0: ; 0x0200C6D0 - ldr r3, _0200C6D4 ; =FUN_0202032C - bx r3 - .balign 4 -_0200C6D4: .word FUN_0202032C - - thumb_func_start FUN_0200C6D8 -FUN_0200C6D8: ; 0x0200C6D8 - ldr r3, _0200C6E0 ; =FUN_0200C6D0 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C6E0: .word FUN_0200C6D0 - - thumb_func_start FUN_0200C6E4 -FUN_0200C6E4: ; 0x0200C6E4 - push {r3-r4, lr} - sub sp, #0xc - lsl r1, r1, #0xc - str r1, [sp, #0x0] - lsl r1, r2, #0xc - add r4, r0, #0x0 - str r1, [sp, #0x4] - bl FUN_02020380 - cmp r0, #0x2 - bne _0200C704 - mov r0, #0x3 - ldr r1, [sp, #0x4] - lsl r0, r0, #0x12 - add r0, r1, r0 - str r0, [sp, #0x4] -_0200C704: - mov r0, #0x0 - str r0, [sp, #0x8] - add r0, r4, #0x0 - add r1, sp, #0x0 - bl FUN_02020044 - add sp, #0xc - pop {r3-r4, pc} - - thumb_func_start FUN_0200C714 -FUN_0200C714: ; 0x0200C714 - ldr r3, _0200C71C ; =FUN_0200C6E4 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C71C: .word FUN_0200C6E4 - - thumb_func_start FUN_0200C720 -FUN_0200C720: ; 0x0200C720 - push {r4-r5, lr} - sub sp, #0xc - lsl r1, r1, #0xc - str r1, [sp, #0x0] - lsl r1, r2, #0xc - add r5, r0, #0x0 - add r4, r3, #0x0 - str r1, [sp, #0x4] - bl FUN_02020380 - cmp r0, #0x2 - bne _0200C73E - ldr r0, [sp, #0x4] - add r0, r0, r4 - str r0, [sp, #0x4] -_0200C73E: - mov r0, #0x0 - str r0, [sp, #0x8] - add r0, r5, #0x0 - add r1, sp, #0x0 - bl FUN_02020044 - add sp, #0xc - pop {r4-r5, pc} - .balign 4 - - thumb_func_start FUN_0200C750 -FUN_0200C750: ; 0x0200C750 - push {r3, lr} - ldr r0, [r0, #0x0] - bl FUN_0200C720 - pop {r3, pc} - .balign 4 - - thumb_func_start FUN_0200C75C -FUN_0200C75C: ; 0x0200C75C - push {r3-r7, lr} - add r7, r0, #0x0 - add r6, r1, #0x0 - add r5, r2, #0x0 - bl FUN_0202011C - add r4, r0, #0x0 - ldr r1, [r4, #0x0] - asr r0, r1, #0xb - lsr r0, r0, #0x14 - add r0, r1, r0 - asr r0, r0, #0xc - strh r0, [r6, #0x0] - add r0, r7, #0x0 - bl FUN_02020380 - cmp r0, #0x2 - ldr r1, [r4, #0x4] - bne _0200C794 - mov r0, #0x3 - lsl r0, r0, #0x12 - sub r1, r1, r0 - asr r0, r1, #0xb - lsr r0, r0, #0x14 - add r0, r1, r0 - asr r0, r0, #0xc - strh r0, [r5, #0x0] - pop {r3-r7, pc} -_0200C794: - asr r0, r1, #0xb - lsr r0, r0, #0x14 - add r0, r1, r0 - asr r0, r0, #0xc - strh r0, [r5, #0x0] - pop {r3-r7, pc} - - thumb_func_start FUN_0200C7A0 -FUN_0200C7A0: ; 0x0200C7A0 - ldr r3, _0200C7A8 ; =FUN_0200C75C - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C7A8: .word FUN_0200C75C - - thumb_func_start FUN_0200C7AC -FUN_0200C7AC: ; 0x0200C7AC - push {r3-r7, lr} - str r0, [sp, #0x0] - add r6, r1, #0x0 - add r5, r2, #0x0 - add r7, r3, #0x0 - bl FUN_0202011C - add r4, r0, #0x0 - ldr r1, [r4, #0x0] - asr r0, r1, #0xb - lsr r0, r0, #0x14 - add r0, r1, r0 - asr r0, r0, #0xc - strh r0, [r6, #0x0] - ldr r0, [sp, #0x0] - bl FUN_02020380 - cmp r0, #0x2 - bne _0200C7E2 - ldr r0, [r4, #0x4] - sub r1, r0, r7 - asr r0, r1, #0xb - lsr r0, r0, #0x14 - add r0, r1, r0 - asr r0, r0, #0xc - strh r0, [r5, #0x0] - pop {r3-r7, pc} -_0200C7E2: - ldr r1, [r4, #0x4] - asr r0, r1, #0xb - lsr r0, r0, #0x14 - add r0, r1, r0 - asr r0, r0, #0xc - strh r0, [r5, #0x0] - pop {r3-r7, pc} - - thumb_func_start FUN_0200C7F0 -FUN_0200C7F0: ; 0x0200C7F0 - push {r3, lr} - ldr r0, [r0, #0x0] - bl FUN_0200C7AC - pop {r3, pc} - .balign 4 - - thumb_func_start FUN_0200C7FC -FUN_0200C7FC: ; 0x0200C7FC - push {r3-r6, lr} - sub sp, #0xc - add r6, r0, #0x0 - add r5, r1, #0x0 - add r4, r2, #0x0 - bl FUN_0202011C - ldr r2, [r0, #0x0] - lsl r1, r5, #0xc - add r1, r2, r1 - str r1, [sp, #0x0] - ldr r2, [r0, #0x4] - lsl r1, r4, #0xc - add r1, r2, r1 - str r1, [sp, #0x4] - ldr r0, [r0, #0x8] - add r1, sp, #0x0 - str r0, [sp, #0x8] - add r0, r6, #0x0 - bl FUN_02020044 - add sp, #0xc - pop {r3-r6, pc} - .balign 4 - - thumb_func_start FUN_0200C82C -FUN_0200C82C: ; 0x0200C82C - ldr r3, _0200C834 ; =FUN_0200C7FC - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C834: .word FUN_0200C7FC - - thumb_func_start FUN_0200C838 -FUN_0200C838: ; 0x0200C838 - ldr r3, _0200C83C ; =FUN_020200EC - bx r3 - .balign 4 -_0200C83C: .word FUN_020200EC - - thumb_func_start FUN_0200C840 -FUN_0200C840: ; 0x0200C840 - ldr r3, _0200C848 ; =FUN_0200C838 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C848: .word FUN_0200C838 - - thumb_func_start FUN_0200C84C -FUN_0200C84C: ; 0x0200C84C - push {r3-r7, lr} - add r5, r0, #0x0 - add r6, r1, #0x0 - add r7, r2, #0x0 - bl FUN_02020120 - add r4, r0, #0x0 - ldr r0, _0200C880 ; =0x45800000 - add r1, r6, #0x0 - bl _fmul - bl _ffix - str r0, [r4, #0x0] - ldr r0, _0200C880 ; =0x45800000 - add r1, r7, #0x0 - bl _fmul - bl _ffix - str r0, [r4, #0x4] - add r0, r5, #0x0 - add r1, r4, #0x0 - bl FUN_02020064 - pop {r3-r7, pc} - .balign 4 -_0200C880: .word 0x45800000 - - thumb_func_start FUN_0200C884 -FUN_0200C884: ; 0x0200C884 - ldr r3, _0200C88C ; =FUN_0200C84C - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C88C: .word FUN_0200C84C - - thumb_func_start FUN_0200C890 -FUN_0200C890: ; 0x0200C890 - ldr r3, _0200C894 ; =FUN_02020088 - bx r3 - .balign 4 -_0200C894: .word FUN_02020088 - - thumb_func_start FUN_0200C898 -FUN_0200C898: ; 0x0200C898 - ldr r3, _0200C8A0 ; =FUN_0200C890 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C8A0: .word FUN_0200C890 - - thumb_func_start FUN_0200C8A4 -FUN_0200C8A4: ; 0x0200C8A4 - push {r3-r5, lr} - add r5, r1, #0x0 - add r4, r0, #0x0 - bl FUN_02020124 - add r0, r0, r5 - lsl r0, r0, #0x10 - lsr r1, r0, #0x10 - add r0, r4, #0x0 - bl FUN_02020088 - pop {r3-r5, pc} - - thumb_func_start FUN_0200C8BC -FUN_0200C8BC: ; 0x0200C8BC - ldr r3, _0200C8C4 ; =FUN_0200C8A4 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C8C4: .word FUN_0200C8A4 - - thumb_func_start FUN_0200C8C8 -FUN_0200C8C8: ; 0x0200C8C8 - ldr r3, _0200C8CC ; =FUN_02020100 - bx r3 - .balign 4 -_0200C8CC: .word FUN_02020100 - - thumb_func_start FUN_0200C8D0 -FUN_0200C8D0: ; 0x0200C8D0 - ldr r3, _0200C8D8 ; =FUN_0200C8C8 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C8D8: .word FUN_0200C8C8 - - thumb_func_start FUN_0200C8DC -FUN_0200C8DC: ; 0x0200C8DC - push {lr} - sub sp, #0xc - lsl r1, r1, #0xc - str r1, [sp, #0x0] - lsl r1, r2, #0xc - str r1, [sp, #0x4] - mov r1, #0x0 - str r1, [sp, #0x8] - ldr r0, [r0, #0x0] - add r1, sp, #0x0 - bl FUN_02020054 - add sp, #0xc - pop {pc} - - thumb_func_start FUN_0200C8F8 -FUN_0200C8F8: ; 0x0200C8F8 - ldr r3, _0200C900 ; =FUN_02020358 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C900: .word FUN_02020358 - - thumb_func_start FUN_0200C904 -FUN_0200C904: ; 0x0200C904 - ldr r3, _0200C908 ; =FUN_02020398 - bx r3 - .balign 4 -_0200C908: .word FUN_02020398 - - thumb_func_start FUN_0200C90C -FUN_0200C90C: ; 0x0200C90C - ldr r3, _0200C914 ; =FUN_0200C904 - ldr r0, [r0, #0x0] - bx r3 - nop -_0200C914: .word FUN_0200C904 - - thumb_func_start FUN_0200C918 -FUN_0200C918: ; 0x0200C918 - push {r4-r7, lr} - sub sp, #0xc - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r0, [r4, #0xc] - ldr r1, [sp, #0x28] - add r6, r2, #0x0 - add r7, r3, #0x0 - bl FUN_0200945C - cmp r0, #0x0 - bne _0200C936 - add sp, #0xc - mov r0, #0x0 - pop {r4-r7, pc} -_0200C936: - ldr r0, [sp, #0x28] - ldr r3, [sp, #0x20] - str r0, [sp, #0x0] - ldr r0, [sp, #0x24] - add r1, r6, #0x0 - str r0, [sp, #0x4] - ldr r0, [r5, #0x0] - add r2, r7, #0x0 - str r0, [sp, #0x8] - ldr r0, [r4, #0xc] - bl FUN_02008F34 - add r5, r0, #0x0 - beq _0200C964 - bl FUN_02009AC4 - ldr r0, [r4, #0x24] - add r1, r5, #0x0 - bl FUN_0200C474 - add sp, #0xc - mov r0, #0x1 - pop {r4-r7, pc} -_0200C964: - bl GF_AssertFail - cmp r5, #0x0 - beq _0200C972 - add sp, #0xc - mov r0, #0x1 - pop {r4-r7, pc} -_0200C972: - mov r0, #0x0 - add sp, #0xc - pop {r4-r7, pc} - - thumb_func_start FUN_0200C978 -FUN_0200C978: ; 0x0200C978 - push {r4-r7, lr} - sub sp, #0xc - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r0, [r4, #0xc] - ldr r1, [sp, #0x28] - add r6, r2, #0x0 - add r7, r3, #0x0 - bl FUN_0200945C - cmp r0, #0x0 - bne _0200C996 - add sp, #0xc - mov r0, #0x0 - pop {r4-r7, pc} -_0200C996: - ldr r0, [sp, #0x28] - ldr r3, [sp, #0x20] - str r0, [sp, #0x0] - ldr r0, [sp, #0x24] - add r1, r6, #0x0 - str r0, [sp, #0x4] - ldr r0, [r5, #0x0] - add r2, r7, #0x0 - str r0, [sp, #0x8] - ldr r0, [r4, #0xc] - bl FUN_02008F34 - add r5, r0, #0x0 - beq _0200C9C4 - bl FUN_02009B78 - ldr r0, [r4, #0x24] - add r1, r5, #0x0 - bl FUN_0200C474 - add sp, #0xc - mov r0, #0x1 - pop {r4-r7, pc} -_0200C9C4: - bl GF_AssertFail - cmp r5, #0x0 - beq _0200C9D2 - add sp, #0xc - mov r0, #0x1 - pop {r4-r7, pc} -_0200C9D2: - mov r0, #0x0 - add sp, #0xc - pop {r4-r7, pc} - - thumb_func_start FUN_0200C9D8 -FUN_0200C9D8: ; 0x0200C9D8 - push {r4-r7, lr} - sub sp, #0xc - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r0, [r4, #0xc] - ldr r1, [sp, #0x24] - add r7, r2, #0x0 - str r3, [sp, #0x8] - bl FUN_020094F0 - add r6, r0, #0x0 - ldr r0, [sp, #0x20] - ldr r3, [sp, #0x8] - str r0, [sp, #0x0] - ldr r0, [r5, #0x0] - add r1, r6, #0x0 - str r0, [sp, #0x4] - ldr r0, [r4, #0xc] - add r2, r7, #0x0 - bl FUN_020090FC - add r0, r6, #0x0 - bl FUN_02009BE8 - add sp, #0xc - pop {r4-r7, pc} - - thumb_func_start FUN_0200CA0C -FUN_0200CA0C: ; 0x0200CA0C - push {r4-r7, lr} - sub sp, #0xc - add r4, r1, #0x0 - add r5, r0, #0x0 - ldr r0, [r4, #0x10] - ldr r1, [sp, #0x24] - add r7, r2, #0x0 - str r3, [sp, #0x8] - bl FUN_020094F0 - add r6, r0, #0x0 - ldr r0, [sp, #0x20] - ldr r3, [sp, #0x8] - str r0, [sp, #0x0] - ldr r0, [r5, #0x0] - add r1, r6, #0x0 - str r0, [sp, #0x4] - ldr r0, [r4, #0x10] - add r2, r7, #0x0 - bl FUN_02009168 - add r0, r6, #0x0 - bl FUN_02009DE0 - add sp, #0xc - pop {r4-r7, pc} - - thumb_func_start FUN_0200CA40 -FUN_0200CA40: ; 0x0200CA40 - ldr r0, [r0, #0x0] - bx lr diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s index bf4889d8..9e8b3189 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -42,7 +42,7 @@ FUN_0200CABC: ; 0x0200CABC mov r0, #0x26 add r2, r5, #0x0 add r3, r4, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r3-r5, pc} _0200CAE2: @@ -55,7 +55,7 @@ _0200CAE2: mov r0, #0x26 add r2, r5, #0x0 add r3, r4, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r3-r5, pc} @@ -89,7 +89,7 @@ _0200CB18: str r0, [sp, #0xc] mov r0, #0x26 add r3, r5, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, sp, #0x10 ldrb r0, [r0, #0x10] cmp r0, #0x2 @@ -108,7 +108,7 @@ _0200CB3C: str r0, [sp, #0x4] mov r0, #0x26 lsl r3, r4, #0x5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4-r6, pc} _0200CB56: @@ -119,7 +119,7 @@ _0200CB56: str r0, [sp, #0x4] mov r0, #0x26 lsl r3, r4, #0x5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4-r6, pc} @@ -394,7 +394,7 @@ FUN_0200CD68: ; 0x0200CD68 str r0, [sp, #0xc] mov r0, #0x26 add r3, r5, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData cmp r5, #0x4 bhs _0200CDB8 add r0, r7, #0x0 @@ -407,7 +407,7 @@ FUN_0200CD68: ; 0x0200CD68 str r0, [sp, #0x4] mov r0, #0x26 lsl r3, r4, #0x5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x14 pop {r4-r7, pc} _0200CDB8: @@ -421,7 +421,7 @@ _0200CDB8: str r0, [sp, #0x4] mov r0, #0x26 lsl r3, r4, #0x5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x14 pop {r4-r7, pc} .balign 4 @@ -908,7 +908,7 @@ FUN_0200D18C: ; 0x0200D18C mov r1, #0x16 mov r2, #0x0 add r3, sp, #0x3c - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x2c] ldr r0, [sp, #0x3c] mov r7, #0x0 @@ -1006,7 +1006,7 @@ FUN_0200D274: ; 0x0200D274 str r0, [sp, #0x0] mov r0, #0x26 add r3, sp, #0x10 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0xc] mov r1, #0x9 ldr r0, [sp, #0x2c] @@ -1077,7 +1077,7 @@ FUN_0200D300: ; 0x0200D300 mov r0, #0x24 add r3, r6, #0x0 str r4, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x24 ; NARC_GRAPHIC_FIELD_BOARD mov r1, #0x1 add r2, r4, #0x0 @@ -1144,7 +1144,7 @@ _0200D390: str r0, [sp, #0xc] mov r0, #0x24 add r3, r4, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r3-r5, pc} @@ -1792,7 +1792,7 @@ _0200D8DA: mov r0, #0x26 mov r2, #0x0 add r3, sp, #0x30 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r2, #0x80 add r5, r0, #0x0 str r2, [sp, #0x0] diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s index 8ee30228..bc9652c8 100644 --- a/arm9/asm/unk_02011744.s +++ b/arm9/asm/unk_02011744.s @@ -46,7 +46,7 @@ _02011766: mov r2, #0x0 add r3, r4, #0x0 str r7, [sp, #0x0] - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x0] cmp r0, #0x0 bne _0201177E diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index aa2f249b..189206a3 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -471,7 +471,7 @@ _020148EA: ldr r0, [r5, #0x8] ldr r1, [r7, #0xc] add r3, r6, #0x0 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r4, #0x8] ldr r0, [r4, #0x18] ldr r1, [r5, #0x1c] @@ -672,7 +672,7 @@ _02014A58: add r0, r7, #0x0 mov r2, #0x1 add r3, r4, #0x4 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [r4, #0x8] str r5, [r4, #0x0] ldr r0, [sp, #0x20] @@ -710,7 +710,7 @@ _02014AA6: ldr r3, [sp, #0x1c] add r0, r7, #0x0 add r2, r4, #0x0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r4, #0x4] str r5, [r4, #0x8] ldr r0, [sp, #0x18] diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index bcf7b7cf..bbed9516 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -199,9 +199,9 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_Unk002F .word ScrCmd_WaitButtonAB .word ScrCmd_WaitButton - .word ScrCmd_Unk0032 + .word ScrCmd_WaitButtonABPad .word ScrCmd_Unk0033 - .word ScrCmd_Unk0034 + .word ScrCmd_CloseMessageBox .word ScrCmd_Unk0035 .word ScrCmd_CreateMessageBox .word ScrCmd_Unk0037 @@ -212,7 +212,7 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_Menu .word ScrCmd_ScrollBg .word ScrCmd_YesNoMenu - .word FUN_0203DEA8 + .word ScrCmd_Unk003F .word ScrCmd_Unk0040 .word ScrCmd_Unk0041 .word ScrCmd_Unk0042 @@ -222,53 +222,53 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_Unk0046 .word ScrCmd_Unk0047 .word ScrCmd_Unk0048 - .word ScrCmd_Unk0049 - .word ScrCmd_Unk004A - .word ScrCmd_Unk004B - .word ScrCmd_Unk004C + .word ScrCmd_PlayFanfare + .word ScrCmd_StopFanfare + .word ScrCmd_PlayFanfareWait + .word ScrCmd_PlayCry .word ScrCmd_PlayCryWait + .word ScrCmd_PlaySound + .word ScrCmd_PlaySoundWait .word ScrCmd_PlayBgm - .word ScrCmd_Unk004F - .word ScrCmd_Unk0050 - .word ScrCmd_Unk0051 - .word ScrCmd_Unk0052 + .word ScrCmd_StopBgm + .word ScrCmd_PlayDefaultBgm .word ScrCmd_Unk0053 - .word ScrCmd_Unk0054 - .word ScrCmd_Unk0055 + .word ScrCmd_FadeOutBgm + .word ScrCmd_FadeInBgm .word ScrCmd_Unk0056 .word ScrCmd_Unk0057 .word ScrCmd_Unk0058 - .word ScrCmd_Unk0059 - .word ScrCmd_Unk005A - .word ScrCmd_Unk005B - .word ScrCmd_Unk005C + .word ScrCmd_CheckChatotCry + .word ScrCmd_StartChatotRecord + .word ScrCmd_StopChatotRecord + .word ScrCmd_SaveChatotCry .word ScrCmd_Unk005D .word ScrCmd_Unk005E - .word FUN_0203B148 - .word FUN_0203B1F0 - .word FUN_0203B3B0 - .word FUN_0203B3C0 - .word FUN_0203B3DC - .word FUN_0203B3F8 - .word FUN_0203B440 - .word FUN_0203B468 - .word FUN_0203B500 - .word FUN_0203B544 - .word FUN_0203B574 - .word FUN_0203B5B8 - .word FUN_0203B640 - .word FUN_0203B724 - .word FUN_0203B758 - .word FUN_0203B7D8 + .word ScrCmd_Unk005F + .word ScrCmd_Unk0060 + .word ScrCmd_Unk0061 + .word ScrCmd_Unk0062 + .word ScrCmd_Unk0063 + .word ScrCmd_Unk0064 + .word ScrCmd_Unk0065 + .word ScrCmd_Unk0066 + .word ScrCmd_Unk0067 + .word ScrCmd_Unk0068 + .word ScrCmd_Unk0069 + .word ScrCmd_Unk006A + .word ScrCmd_Unk006B + .word ScrCmd_Unk006C + .word ScrCmd_Unk006D + .word ScrCmd_Unk006E .word ScrCmd_GiveMoney .word ScrCmd_TakeMoneyImmediate .word ScrCmd_HasEnoughMoneyImmediate - .word ScrCmd_Unk0072 - .word ScrCmd_Unk0073 - .word ScrCmd_Unk0074 - .word ScrCmd_Unk0075 - .word ScrCmd_Unk0076 - .word ScrCmd_Unk0077 + .word ScrCmd_ShowMoneyBox + .word ScrCmd_HideMoneyBox + .word ScrCmd_UpdateMoneyBox + .word ScrCmd_ShowCoinBox + .word ScrCmd_HideCoinBox + .word ScrCmd_UpdateCoinBox .word ScrCmd_GetCoins .word ScrCmd_GiveCoins .word ScrCmd_TakeCoinsImmediate @@ -280,380 +280,380 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_GetItemPocketId .word ScrCmd_Unk0081 .word ScrCmd_Unk0082 - .word ScrCmd_Unk0083 - .word ScrCmd_Unk0084 - .word ScrCmd_Unk0085 - .word ScrCmd_Unk0086 - .word ScrCmd_Unk0087 - .word ScrCmd_Unk0088 - .word ScrCmd_Unk0089 - .word ScrCmd_Unk008A - .word ScrCmd_Unk008B - .word ScrCmd_Unk008C - .word ScrCmd_Unk008D - .word ScrCmd_Unk008E - .word ScrCmd_Unk008F - .word ScrCmd_Unk0090 - .word ScrCmd_Unk0091 - .word ScrCmd_Unk0092 - .word FUN_0203B81C - .word FUN_0203B85C - .word FUN_0203B8A0 + .word ScrCmd_GiveSecretBaseDecoration + .word ScrCmd_TakeSecretBaseDecoration + .word ScrCmd_HasSpaceForDecoration + .word ScrCmd_GetDecorationCount + .word ScrCmd_GiveUndergroundTrap + .word ScrCmd_TakeUndergroundTrap + .word ScrCmd_HasSpaceForTrap + .word ScrCmd_GetTrapCount + .word ScrCmd_GiveTreasure + .word ScrCmd_TakeTreasure + .word ScrCmd_HasSpaceForTreasure + .word ScrCmd_GetTreasureCount + .word ScrCmd_GiveUndergroundSphere + .word ScrCmd_TakeUndergroundSphere + .word ScrCmd_HasSpaceForSphere + .word ScrCmd_GetSphereCount + .word ScrCmd_Unk0093 + .word ScrCmd_Unk0094 + .word ScrCmd_Unk0095 .word ScrCmd_GiveMon - .word ScrCmd_giveegg - .word ScrCmd_setpartymonmove - .word ScrCmd_partymonhasmove - .word ScrCmd_findpartymonwithmove - .word FUN_0203BB34 - .word FUN_0203BB80 - .word FUN_0203BB84 - .word FUN_0203BB88 - .word FUN_0203BB8C - .word FUN_02045264 - .word FUN_0203BC1C - .word FUN_0203BCBC - .word FUN_0203BCCC - .word FUN_0203BCD8 - .word FUN_0203BF20 - .word FUN_0203BF2C - .word FUN_0203BF84 - .word FUN_0203BFEC - .word FUN_0203C118 - .word FUN_0203C12C - .word ScrCmd_monstoragepc - .word FUN_0203C2C4 - .word FUN_0203C2E0 - .word FUN_0203C2F0 - .word FUN_0203C300 - .word ScrCmd_halloffame - .word FUN_0203C33C - .word FUN_0203C368 - .word FUN_0203C3C8 - .word FUN_0203C3E8 - .word FUN_0203C430 - .word FUN_020416A8 - .word FUN_02041770 - .word FUN_020417E0 - .word FUN_02041808 - .word FUN_0203C4F0 - .word FUN_0203C520 - .word FUN_0203C6C4 - .word FUN_0203C70C - .word FUN_0203C730 - .word FUN_0203C844 - .word FUN_0203C874 - .word FUN_0203C8B4 - .word FUN_0203C8E4 - .word FUN_0203C930 - .word FUN_0203C960 - .word FUN_0203C990 - .word FUN_0203CA20 - .word FUN_0203CA2C - .word FUN_0203CA5C - .word FUN_0203CB08 - .word FUN_0203CB20 - .word FUN_0203CB48 - .word FUN_0203CB60 + .word ScrCmd_GiveEgg + .word ScrCmd_SetPartyMonMove + .word ScrCmd_PartyMonHasMove + .word ScrCmd_FindPartyMonWithMove + .word ScrCmd_Unk009B + .word ScrCmd_Unk009C + .word ScrCmd_Unk009D + .word ScrCmd_Unk009E + .word ScrCmd_Unk009F + .word ScrCmd_Unk00A0 + .word ScrCmd_Unk00A1 + .word ScrCmd_Unk00A2 + .word ScrCmd_Unk00A3 + .word ScrCmd_Unk00A4 + .word ScrCmd_Unk00A5 + .word ScrCmd_Unk00A6 + .word ScrCmd_Unk00A7 + .word ScrCmd_Unk00A8 + .word ScrCmd_Unk00A9 + .word ScrCmd_Unk00AA + .word ScrCmd_MonStoragePC + .word ScrCmd_Unk00AC + .word ScrCmd_Unk00AD + .word ScrCmd_Unk00AE + .word ScrCmd_Unk00AF + .word ScrCmd_HallOfFame + .word ScrCmd_Unk00B1 + .word ScrCmd_Unk00B2 + .word ScrCmd_Unk00B3 + .word ScrCmd_Unk00B4 + .word ScrCmd_Unk00B5 + .word ScrCmd_Unk00B6 + .word ScrCmd_Unk00B7 + .word ScrCmd_Unk00B8 + .word ScrCmd_Unk00B9 + .word ScrCmd_Unk00BA + .word ScrCmd_Unk00BB + .word ScrCmd_Unk00BC + .word ScrCmd_Unk00BD + .word ScrCmd_Unk00BE + .word ScrCmd_Unk00BF + .word ScrCmd_Unk00C0 + .word ScrCmd_Unk00C1 + .word ScrCmd_Unk00C2 + .word ScrCmd_Unk00C3 + .word ScrCmd_Unk00C4 + .word ScrCmd_Unk00C5 + .word ScrCmd_Unk00C6 + .word ScrCmd_Unk00C7 + .word ScrCmd_Unk00C8 + .word ScrCmd_Unk00C9 + .word ScrCmd_Unk00CA + .word ScrCmd_Unk00CB + .word ScrCmd_Unk00CC .word ScrCmd_GetPlayerName .word ScrCmd_GetRivalName .word ScrCmd_GetFriendName - .word ScrCmd_Unk00D0 + .word ScrCmd_GetPokemonName .word ScrCmd_GetItemName .word ScrCmd_GetPocketName .word ScrCmd_GetTMHMMoveName .word ScrCmd_GetMoveName .word ScrCmd_Unk00D5 - .word ScrCmd_Unk00D6 + .word ScrCmd_GetPokemonNickname .word ScrCmd_GetPoketchAppName .word ScrCmd_GetTrainerClassName .word ScrCmd_Unk00D9 .word ScrCmd_Unk00DA - .word ScrCmd_Unk00DB - .word ScrCmd_Unk00DC - .word ScrCmd_Unk00DD - .word FUN_0203CBBC + .word ScrCmd_GetPlayerStarterName + .word ScrCmd_GetRivalStarterName + .word ScrCmd_GetCounterpartStarterName + .word ScrCmd_Unk00DE .word ScrCmd_GetDecorationName .word ScrCmd_GetUndergroundTrapName .word ScrCmd_GetUndergroundItemName - .word ScrCmd_Unk00E2 - .word FUN_0203CB70 - .word FUN_0204185C - .word FUN_0204188C - .word FUN_0203CBE8 - .word FUN_02041970 - .word FUN_020419F8 - .word FUN_02041A80 - .word FUN_02041AB4 - .word FUN_02041AD4 - .word FUN_02041AE0 - .word FUN_02041B10 - .word FUN_02041B70 - .word FUN_02041B9C - .word FUN_02041BC4 - .word FUN_02041BF0 - .word FUN_0203CC88 - .word FUN_0203CD20 - .word FUN_0203CDB8 - .word FUN_0203CDC4 - .word FUN_0203CDD0 - .word FUN_0203CE00 - .word FUN_0203FE90 - .word FUN_0203FEC0 - .word FUN_0203FF10 - .word FUN_02040028 - .word FUN_02040074 - .word FUN_020400C8 - .word FUN_0204011C - .word FUN_02040170 - .word FUN_020401CC - .word FUN_02040204 - .word FUN_02040220 - .word FUN_0204025C - .word FUN_02040298 - .word FUN_020402D4 - .word FUN_02040304 - .word FUN_02040340 - .word FUN_02040370 - .word FUN_020403A0 - .word FUN_020403D0 - .word FUN_02040414 - .word FUN_02040458 - .word FUN_020404FC - .word FUN_0204052C - .word FUN_0204056C - .word FUN_02040488 - .word FUN_020405CC - .word FUN_020405F8 - .word FUN_02040638 - .word FUN_0204064C - .word FUN_02040660 - .word FUN_020406C0 - .word FUN_0204059C - .word FUN_020405B4 - .word FUN_02044CE0 - .word FUN_02044D44 - .word FUN_0203CE0C - .word FUN_0203CE8C - .word FUN_0203CEBC - .word FUN_0203CF04 - .word FUN_0203CF34 - .word FUN_0203CF64 - .word FUN_0203CF94 - .word FUN_0203CFC4 - .word FUN_0203CFC8 - .word FUN_0203D050 - .word FUN_0203D0F8 - .word FUN_0203D134 - .word FUN_0203D140 - .word FUN_0203D150 - .word FUN_0203D178 - .word FUN_0203D194 - .word FUN_0203D1A4 - .word FUN_0203D1C0 - .word FUN_0203D214 - .word FUN_0203C054 - .word FUN_0203C090 - .word FUN_0203C0CC - .word FUN_0203D23C - .word FUN_0203D248 - .word FUN_0203D278 - .word FUN_0203D2A4 - .word FUN_0203D2E4 - .word FUN_0203D330 - .word FUN_0203D33C - .word FUN_0203D36C - .word FUN_0203D3A4 - .word FUN_0203D60C - .word FUN_0203D61C - .word FUN_0203D3DC - .word FUN_0203D448 - .word FUN_0203D458 - .word FUN_0203D490 - .word FUN_0203D528 - .word FUN_0203D5B0 - .word FUN_0203D5F8 - .word FUN_0203D630 - .word FUN_0203D66C - .word FUN_0203D6C4 - .word FUN_0203D560 - .word FUN_0203FCF4 - .word FUN_0203FDBC - .word FUN_0203FE08 - .word FUN_0203FE48 - .word FUN_0203D868 - .word FUN_0203D874 - .word ScrCmd_getplayergender - .word ScrCmd_healparty - .word FUN_0203D8E8 - .word FUN_0203D8EC - .word FUN_0203D938 - .word FUN_0203D948 - .word FUN_0203D728 - .word FUN_0203D738 - .word FUN_0203D774 - .word FUN_0203D834 + .word ScrCmd_GetMapName + .word ScrCmd_Unk00E3 + .word ScrCmd_Unk00E4 + .word ScrCmd_Unk00E5 + .word ScrCmd_Unk00E6 + .word ScrCmd_Unk00E7 + .word ScrCmd_Unk00E8 + .word ScrCmd_Unk00E9 + .word ScrCmd_Unk00EA + .word ScrCmd_Unk00EB + .word ScrCmd_Unk00EC + .word ScrCmd_Unk00ED + .word ScrCmd_Unk00EE + .word ScrCmd_Unk00EF + .word ScrCmd_Unk00F0 + .word ScrCmd_Unk00F1 + .word ScrCmd_Unk00F2 + .word ScrCmd_Unk00F3 + .word ScrCmd_Unk00F4 + .word ScrCmd_Unk00F5 + .word ScrCmd_Unk00F6 + .word ScrCmd_Unk00F7 + .word ScrCmd_Unk00F8 + .word ScrCmd_Unk00F9 + .word ScrCmd_Unk00FA + .word ScrCmd_Unk00FB + .word ScrCmd_Unk00FC + .word ScrCmd_Unk00FD + .word ScrCmd_Unk00FE + .word ScrCmd_Unk00FF + .word ScrCmd_Unk0100 + .word ScrCmd_Unk0101 + .word ScrCmd_Unk0102 + .word ScrCmd_Unk0103 + .word ScrCmd_Unk0104 + .word ScrCmd_Unk0105 + .word ScrCmd_Unk0106 + .word ScrCmd_Unk0107 + .word ScrCmd_Unk0108 + .word ScrCmd_Unk0109 + .word ScrCmd_Unk010A + .word ScrCmd_Unk010B + .word ScrCmd_Unk010C + .word ScrCmd_Unk010D + .word ScrCmd_Unk010E + .word ScrCmd_Unk010F + .word ScrCmd_Unk0110 + .word ScrCmd_Unk0111 + .word ScrCmd_Unk0112 + .word ScrCmd_Unk0113 + .word ScrCmd_Unk0114 + .word ScrCmd_Unk0115 + .word ScrCmd_Unk0116 + .word ScrCmd_Unk0117 + .word ScrCmd_Unk0118 + .word ScrCmd_Unk0119 + .word ScrCmd_Unk011A + .word ScrCmd_Unk011B + .word ScrCmd_Unk011C + .word ScrCmd_Unk011D + .word ScrCmd_Unk011E + .word ScrCmd_Unk011F + .word ScrCmd_Unk0120 + .word ScrCmd_Unk0121 + .word ScrCmd_Unk0122 + .word ScrCmd_Unk0123 + .word ScrCmd_Unk0124 + .word ScrCmd_Unk0125 + .word ScrCmd_Unk0126 + .word ScrCmd_Unk0127 + .word ScrCmd_Unk0128 + .word ScrCmd_Unk0129 + .word ScrCmd_Unk012A + .word ScrCmd_Unk012B + .word ScrCmd_Unk012C + .word ScrCmd_Unk012D + .word ScrCmd_Unk012E + .word ScrCmd_Unk012F + .word ScrCmd_Unk0130 + .word ScrCmd_Unk0131 + .word ScrCmd_Unk0132 + .word ScrCmd_Unk0133 + .word ScrCmd_Unk0134 + .word ScrCmd_Unk0135 + .word ScrCmd_Unk0136 + .word ScrCmd_Unk0137 + .word ScrCmd_Unk0138 + .word ScrCmd_Unk0139 + .word ScrCmd_Unk013A + .word ScrCmd_Unk013B + .word ScrCmd_Unk013C + .word ScrCmd_Unk013D + .word ScrCmd_Unk013E + .word ScrCmd_Unk013F + .word ScrCmd_Unk0140 + .word ScrCmd_Unk0141 + .word ScrCmd_Unk0142 + .word ScrCmd_Unk0143 + .word ScrCmd_Unk0144 + .word ScrCmd_Unk0145 + .word ScrCmd_Unk0146 + .word ScrCmd_NormalMart + .word ScrCmd_SpecialMart + .word ScrCmd_GoodsMart + .word ScrCmd_SealsMart + .word ScrCmd_Unk014B + .word ScrCmd_Unk014C + .word ScrCmd_GetPlayerGender + .word ScrCmd_HealParty + .word ScrCmd_Unk014F + .word ScrCmd_Unk0150 + .word ScrCmd_Unk0151 + .word ScrCmd_Unk0152 + .word ScrCmd_Unk0153 + .word ScrCmd_Unk0154 + .word ScrCmd_Unk0155 + .word ScrCmd_Unk0156 .word ScrCmd_HasSinnohDex .word ScrCmd_GiveSinnohDex - .word ScrCmd_Unk0159 - .word ScrCmd_Unk015A + .word ScrCmd_HasRunningShoes + .word ScrCmd_GiveRunningShoes .word ScrCmd_HasBadge .word ScrCmd_GiveBadge .word ScrCmd_GetTotalEarnedBadges - .word ScrCmd_Unk015E - .word ScrCmd_Unk015F + .word ScrCmd_GiveBag + .word ScrCmd_HasBag .word ScrCmd_Unk0160 .word ScrCmd_Unk0161 .word ScrCmd_Unk0162 .word ScrCmd_Unk0163 .word ScrCmd_Unk0164 .word ScrCmd_Unk0165 - .word ScrCmd_Unk0166 - .word ScrCmd_Unk0167 - .word FUN_0203DC00 - .word FUN_0203DC58 - .word FUN_0203DC70 - .word FUN_0203DC88 - .word FUN_0203DCA0 - .word ScrCmd_Unk016D - .word ScrCmd_Unk016E - .word FUN_0203DCB8 - .word FUN_0203DCC8 - .word FUN_0203DCD8 - .word FUN_0203DCE8 - .word FUN_0203DCF8 - .word FUN_0203DD08 - .word FUN_0203DD18 - .word FUN_0203DD34 - .word FUN_02044B00 - .word FUN_0203C460 - .word FUN_0203C4B0 - .word FUN_0203D958 - .word ScrCmd_Unk017B + .word ScrCmd_CheckGameCompleted + .word ScrCmd_SetGameCompleted + .word ScrCmd_Unk0168 + .word ScrCmd_Unk0169 + .word ScrCmd_Unk016A + .word ScrCmd_Unk016B + .word ScrCmd_Unk016C + .word ScrCmd_GetDaycarePokemonNames + .word ScrCmd_GetDaycareStatus + .word ScrCmd_Unk016F + .word ScrCmd_Unk0170 + .word ScrCmd_Unk0171 + .word ScrCmd_Unk0172 + .word ScrCmd_Unk0173 + .word ScrCmd_Unk0174 + .word ScrCmd_Unk0175 + .word ScrCmd_Unk0176 + .word ScrCmd_Unk0177 + .word ScrCmd_Unk0178 + .word ScrCmd_Unk0179 + .word ScrCmd_Unk017A + .word ScrCmd_GetBerryName .word ScrCmd_GetNatureName - .word ScrCmd_Unk017D - .word ScrCmd_Unk017E - .word ScrCmd_Unk017F - .word ScrCmd_Unk0180 - .word ScrCmd_Unk0181 - .word ScrCmd_Unk0182 - .word ScrCmd_Unk0183 + .word ScrCmd_GetBerryTreeGrowth + .word ScrCmd_GetBerryTreeType + .word ScrCmd_GetBerryTreeMulch + .word ScrCmd_GetBerryTreeWater + .word ScrCmd_GetBerryTreeAmount + .word ScrCmd_SetBerryTreeMulch + .word ScrCmd_SetBerryTreeType .word ScrCmd_Unk0184 - .word ScrCmd_Unk0185 - .word FUN_0203D998 - .word FUN_0203D9E8 - .word FUN_0203DA78 - .word FUN_0203DAB0 - .word FUN_0203DAE8 - .word FUN_0203DB38 - .word FUN_0203DB88 + .word ScrCmd_TakeBerryTreeBerries + .word ScrCmd_Unk0186 + .word ScrCmd_Unk0187 + .word ScrCmd_Unk0188 + .word ScrCmd_Unk0189 + .word ScrCmd_Unk018A + .word ScrCmd_Unk018B + .word ScrCmd_Unk018C .word ScrCmd_ShowSaveClock .word ScrCmd_HideSaveClock - .word FUN_0203DBD4 + .word ScrCmd_Unk018F .word ScrCmd_WaitButtonABTime - .word FUN_0203B8E4 - .word FUN_0203B944 - .word FUN_0203B968 - .word FUN_0203B9B4 - .word FUN_0203BA3C - .word FUN_0203BAB0 - .word FUN_0203BAF4 - .word ScrCmd_getpartyspecies - .word ScrCmd_checkpartymonotid - .word FUN_02044B2C - .word FUN_02044B84 - .word FUN_02044C0C - .word FUN_02044C88 - .word FUN_0203DD60 - .word FUN_0203DE00 - .word FUN_0203DE4C - .word FUN_0203DE58 - .word FUN_0203DE80 + .word ScrCmd_Unk0191 + .word ScrCmd_Unk0192 + .word ScrCmd_Unk0193 + .word ScrCmd_Unk0194 + .word ScrCmd_Unk0195 + .word ScrCmd_Unk0196 + .word ScrCmd_Unk0197 + .word ScrCmd_GetPartySpecies + .word ScrCmd_CheckPartyMonOTID + .word ScrCmd_Unk019A + .word ScrCmd_Unk019B + .word ScrCmd_Unk019C + .word ScrCmd_Unk019D + .word ScrCmd_Unk019E + .word ScrCmd_Unk019F + .word ScrCmd_Unk01A0 + .word ScrCmd_Unk01A1 + .word ScrCmd_Unk01A2 .word ScrCmd_TakeMoneyAddress .word ScrCmd_Unk01A4 .word ScrCmd_Unk01A5 .word ScrCmd_Unk01A6 .word ScrCmd_Unk01A7 - .word ScrCmd_Unk01A8 - .word ScrCmd_Unk01A9 + .word ScrCmd_DeleteDaycareEgg + .word ScrCmd_GiveDaycareEgg .word ScrCmd_Unk01AA .word ScrCmd_HasEnoughMoneyAddress - .word FUN_0203DD50 + .word ScrCmd_Unk01AC .word ScrCmd_Unk01AD - .word ScrCmd_Unk01AE + .word ScrCmd_GetDaycareLevel .word ScrCmd_Unk01AF .word ScrCmd_Unk01B0 - .word FUN_0203DEC4 - .word FUN_0203DEF8 - .word FUN_0203DF2C - .word FUN_0203DF38 - .word FUN_0203DF64 - .word FUN_0203DF84 - .word FUN_0203DFA8 - .word FUN_0203DFE0 - .word ScrCmd_getpartymonfriendship - .word FUN_020448D4 - .word FUN_020449A4 + .word ScrCmd_Unk01B1 + .word ScrCmd_Unk01B2 + .word ScrCmd_Unk01B3 + .word ScrCmd_Unk01B4 + .word ScrCmd_Unk01B5 + .word ScrCmd_Unk01B6 + .word ScrCmd_Unk01B7 + .word ScrCmd_Unk01B8 + .word ScrCmd_GetPartyMonFriendship + .word ScrCmd_Unk01BA + .word ScrCmd_Unk01BB .word ScrCmd_Unk01BC - .word FUN_0203B618 + .word ScrCmd_Unk01BD .word ScrCmd_Unk01BE .word ScrCmd_Unk01BF - .word FUN_02044F58 - .word FUN_0203E018 - .word FUN_0203E054 - .word FUN_0203E078 - .word FUN_0203E0CC - .word FUN_0203E120 + .word ScrCmd_Unk01C0 + .word ScrCmd_Unk01C1 + .word ScrCmd_Unk01C2 + .word ScrCmd_Unk01C3 + .word ScrCmd_Unk01C4 + .word ScrCmd_Unk01C5 .word ScrCmd_Unk01C6 .word ScrCmd_Unk01C7 - .word FUN_02044D8C - .word FUN_02044E34 - .word FUN_02044E78 + .word ScrCmd_Unk01C8 + .word ScrCmd_Unk01C9 + .word ScrCmd_Unk01CA .word ScrCmd_GetPokemonMoveName - .word FUN_0203E138 - .word FUN_0203E168 - .word FUN_0203E254 - .word ScrCmd_Unk01CF - .word ScrCmd_Unk01D0 - .word ScrCmd_Unk01D1 - .word FUN_0203E258 - .word FUN_0203E29C - .word FUN_0203E2F8 - .word FUN_0203E35C - .word FUN_0203E38C - .word FUN_0203C174 - .word FUN_0203C1AC - .word FUN_0203C200 - .word FUN_02042354 - .word FUN_02042364 - .word FUN_02042394 - .word FUN_020423B0 - .word FUN_02042700 - .word FUN_02042780 - .word FUN_020427A8 - .word FUN_020427D0 - .word FUN_02042864 - .word FUN_02042894 - .word FUN_020428E0 - .word FUN_0203E4F0 - .word FUN_0203E510 - .word FUN_0203E568 - .word FUN_0203E3D0 - .word FUN_0203E408 - .word FUN_0203E440 - .word FUN_0203E470 - .word FUN_0203E4A0 - .word FUN_0203E4B0 - .word FUN_02044ED8 - .word FUN_0203E4D8 - .word FUN_02044F20 - .word ScrCmd_Unk01F1 + .word ScrCmd_Unk01CC + .word ScrCmd_Unk01CD + .word ScrCmd_Unk01CE + .word ScrCmd_GetSetStrength + .word ScrCmd_GetSetFlash + .word ScrCmd_GetSetDefog + .word ScrCmd_Unk01D2 + .word ScrCmd_Unk01D3 + .word ScrCmd_Unk01D4 + .word ScrCmd_Unk01D5 + .word ScrCmd_Unk01D6 + .word ScrCmd_Unk01D7 + .word ScrCmd_Unk01D8 + .word ScrCmd_Unk01D9 + .word ScrCmd_Unk01DA + .word ScrCmd_Unk01DB + .word ScrCmd_Unk01DC + .word ScrCmd_Unk01DD + .word ScrCmd_Unk01DE + .word ScrCmd_Unk01DF + .word ScrCmd_Unk01E0 + .word ScrCmd_Unk01E1 + .word ScrCmd_Unk01E2 + .word ScrCmd_Unk01E3 + .word ScrCmd_Unk01E4 + .word ScrCmd_Unk01E5 + .word ScrCmd_Unk01E6 + .word ScrCmd_Unk01E7 + .word ScrCmd_Unk01E8 + .word ScrCmd_Unk01E9 + .word ScrCmd_Unk01EA + .word ScrCmd_Unk01EB + .word ScrCmd_Unk01EC + .word ScrCmd_Unk01ED + .word ScrCmd_Unk01EE + .word ScrCmd_Unk01EF + .word ScrCmd_Unk01F0 + .word ScrCmd_CountFossils .word ScrCmd_Unk01F2 .word ScrCmd_Unk01F3 - .word ScrCmd_Unk01F4 - .word ScrCmd_Unk01F5 - .word ScrCmd_countpartymonsatorbelowlevel - .word ScrCmd_survivepsn - .word FUN_0203BC2C + .word ScrCmd_GetFossilPokemon + .word ScrCmd_GetFossilMinimumAmount + .word ScrCmd_CountPartyMonsAtOrBelowLevel + .word ScrCmd_SurvivePsn + .word ScrCmd_Unk01F8 .word ScrCmd_DebugWatch .word ScrCmd_MessageFrom .word ScrCmd_MessageFrom2 @@ -661,35 +661,35 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_Unk01FD .word ScrCmd_Unk01FE .word ScrCmd_Unk01FF - .word FUN_0203C7F4 - .word FUN_0203C820 - .word FUN_0203E5DC - .word FUN_0203C788 - .word FUN_0203C7E4 - .word FUN_0203C0FC - .word FUN_0203E674 - .word FUN_0203BD08 - .word FUN_0203BD28 - .word FUN_0203BE50 - .word FUN_0203BECC - .word FUN_0203BF00 + .word ScrCmd_Unk0200 + .word ScrCmd_Unk0201 + .word ScrCmd_Unk0202 + .word ScrCmd_Unk0203 + .word ScrCmd_Unk0204 + .word ScrCmd_Unk0205 + .word ScrCmd_Unk0206 + .word ScrCmd_Unk0207 + .word ScrCmd_Unk0208 + .word ScrCmd_Unk0209 + .word ScrCmd_Unk020A + .word ScrCmd_Unk020B .word ScrCmd_Unk020C - .word FUN_0203E684 - .word FUN_0203E6B4 - .word FUN_0203E6C4 - .word FUN_0203E6FC - .word FUN_0203E72C - .word ScrCmd_getpartymonnature - .word ScrCmd_findpartymonwithnature - .word FUN_0203E744 - .word FUN_02044158 - .word FUN_0204416C - .word FUN_02044198 - .word FUN_0203E774 - .word FUN_0203E7F0 - .word FUN_0203E81C - .word FUN_0203E848 - .word FUN_0203E858 + .word ScrCmd_Unk020D + .word ScrCmd_Unk020E + .word ScrCmd_Unk020F + .word ScrCmd_Unk0210 + .word ScrCmd_Unk0211 + .word ScrCmd_GetPartyMonNature + .word ScrCmd_FindPartyMonWithNature + .word ScrCmd_Unk0214 + .word ScrCmd_Unk0215 + .word ScrCmd_Unk0216 + .word ScrCmd_Unk0217 + .word ScrCmd_Unk0218 + .word ScrCmd_Unk0219 + .word ScrCmd_Unk021A + .word ScrCmd_Unk021B + .word ScrCmd_Unk021C .word ScrCmd_Unk021D .word ScrCmd_Unk021E .word ScrCmd_Unk021F @@ -699,164 +699,164 @@ gScriptCmdTable: ; 0x020F355C .word ScrCmd_Unk0223 .word ScrCmd_Unk0224 .word ScrCmd_Unk0225 - .word FUN_0203E870 - .word FUN_0203E894 - .word FUN_0203E8C4 - .word FUN_0203E8F4 - .word FUN_0203E928 - .word FUN_0203E940 - .word FUN_0203E954 - .word FUN_0203E968 - .word FUN_02044FE8 - .word FUN_0204505C - .word FUN_02045104 - .word FUN_02045170 - .word ScrCmd_Unk0232 - .word FUN_0203E9CC - .word FUN_0203EA68 - .word FUN_02041E40 - .word FUN_02041FDC - .word FUN_02042038 - .word FUN_02042110 - .word FUN_0203EA90 - .word FUN_0203EAB0 - .word FUN_0203EB20 - .word FUN_0203EB48 - .word FUN_0203EB88 - .word FUN_02042D1C + .word ScrCmd_Unk0226 + .word ScrCmd_Unk0227 + .word ScrCmd_Unk0228 + .word ScrCmd_Unk0229 + .word ScrCmd_Unk022A + .word ScrCmd_Unk022B + .word ScrCmd_Unk022C + .word ScrCmd_Unk022D + .word ScrCmd_Unk022E + .word ScrCmd_Unk022F + .word ScrCmd_Unk0230 + .word ScrCmd_Unk0231 + .word ScrCmd_GetRibbonName + .word ScrCmd_Unk0233 + .word ScrCmd_Unk0234 + .word ScrCmd_Unk0235 + .word ScrCmd_Unk0236 + .word ScrCmd_Unk0237 + .word ScrCmd_Unk0238 + .word ScrCmd_Unk0239 + .word ScrCmd_Unk023A + .word ScrCmd_Unk023B + .word ScrCmd_Unk023C + .word ScrCmd_Unk023D + .word ScrCmd_Unk023E .word ScrCmd_Unk023F .word ScrCmd_Unk0240 .word ScrCmd_Unk0241 .word ScrCmd_Unk0242 - .word FUN_0203C5BC - .word FUN_0203C614 - .word FUN_0203C680 - .word ScrCmd_gameversion - .word FUN_02044A6C - .word FUN_02044A94 - .word ScrCmd_givewallpaper - .word FUN_0203ECAC - .word FUN_0203ECD8 - .word FUN_0203ECF4 - .word FUN_0203ED10 - .word FUN_02041194 - .word FUN_020411C4 - .word FUN_02041340 + .word ScrCmd_Unk0243 + .word ScrCmd_Unk0244 + .word ScrCmd_Unk0245 + .word ScrCmd_GameVersion + .word ScrCmd_Unk0247 + .word ScrCmd_Unk0248 + .word ScrCmd_GiveWallpaper + .word ScrCmd_Unk024A + .word ScrCmd_Unk024B + .word ScrCmd_Unk024C + .word ScrCmd_Unk024D + .word ScrCmd_Unk024E + .word ScrCmd_Unk024F + .word ScrCmd_Unk0250 .word ScrCmd_Unk0251 - .word ScrCmd_pcfreespace + .word ScrCmd_PCFreeSpace .word ScrCmd_Unk0253 .word ScrCmd_Unk0254 .word ScrCmd_Unk0255 .word ScrCmd_Unk0256 - .word FUN_0203FE80 - .word FUN_0203EDA4 - .word FUN_0203EDC8 - .word FUN_0203EDE0 - .word FUN_0203EE08 - .word FUN_0203EE18 - .word FUN_0203EE28 - .word FUN_0203EE58 - .word FUN_0203EE68 - .word FUN_0203EE78 + .word ScrCmd_AccessoriesShop + .word ScrCmd_Unk0258 + .word ScrCmd_Unk0259 + .word ScrCmd_Unk025A + .word ScrCmd_Unk025B + .word ScrCmd_Unk025C + .word ScrCmd_Unk025D + .word ScrCmd_Unk025E + .word ScrCmd_Unk025F + .word ScrCmd_Unk0260 .word ScrCmd_GetFashionName - .word FUN_0203EE98 - .word FUN_0203EED8 - .word FUN_0203EF58 - .word FUN_0203F00C - .word FUN_0203F020 - .word FUN_0203F034 - .word FUN_0203F058 - .word FUN_0203F07C - .word FUN_0203F110 - .word FUN_0203F174 - .word FUN_0203F19C - .word ScrCmd_Unk026D - .word FUN_0203F234 - .word FUN_0203F254 - .word FUN_0203F26C - .word FUN_0203C58C - .word ScrCmd_Unk0272 - .word FUN_0203F2AC + .word ScrCmd_Unk0262 + .word ScrCmd_Unk0263 + .word ScrCmd_Unk0264 + .word ScrCmd_Unk0265 + .word ScrCmd_Unk0266 + .word ScrCmd_Unk0267 + .word ScrCmd_Unk0268 + .word ScrCmd_Unk0269 + .word ScrCmd_Unk026A + .word ScrCmd_Unk026B + .word ScrCmd_Unk026C + .word ScrCmd_MessageUnown + .word ScrCmd_Unk026E + .word ScrCmd_Unk026F + .word ScrCmd_Unk0270 + .word ScrCmd_Unk0271 + .word ScrCmd_GetWhiteRockInscription + .word ScrCmd_Unk0273 .word ScrCmd_HasEnoughCoinsImmediate - .word FUN_0203F2E4 + .word ScrCmd_Unk0275 .word ScrCmd_CanGiveCoins - .word FUN_0203F31C - .word ScrCmd_getpartymonlevel - .word FUN_0203F348 - .word FUN_0203F38C - .word FUN_0203F39C - .word FUN_0204214C - .word FUN_0203F3AC - .word FUN_0203F44C - .word FUN_0203F418 + .word ScrCmd_Unk0277 + .word ScrCmd_GetPartyMonLevel + .word ScrCmd_Unk0279 + .word ScrCmd_Unk027A + .word ScrCmd_Unk027B + .word ScrCmd_Unk027C + .word ScrCmd_Unk027D + .word ScrCmd_Unk027E + .word ScrCmd_Unk027F .word ScrCmd_Unk0280 - .word FUN_02044A0C - .word FUN_0203F484 - .word ScrCmd_Unk0283 - .word FUN_0203F4D8 - .word FUN_0203F508 - .word FUN_0203F5D4 - .word FUN_0203F604 - .word FUN_0203F634 - .word FUN_0203F664 - .word FUN_0203F6E4 - .word FUN_0203F720 - .word FUN_0203BDB8 - .word FUN_0203BE68 - .word FUN_0203BE80 - .word FUN_0203F760 - .word FUN_0203F7C8 - .word FUN_0203F80C - .word FUN_0203F880 - .word FUN_0203F924 - .word FUN_02042950 - .word FUN_02042980 - .word FUN_02042998 - .word FUN_020429B8 - .word FUN_020429E8 - .word FUN_02042A18 - .word FUN_02042A48 - .word FUN_02042A98 - .word FUN_0203D7DC + .word ScrCmd_Unk0281 + .word ScrCmd_Unk0282 + .word ScrCmd_SetVolume + .word ScrCmd_Unk0284 + .word ScrCmd_Unk0285 + .word ScrCmd_Unk0286 + .word ScrCmd_Unk0287 + .word ScrCmd_Unk0288 + .word ScrCmd_Unk0289 + .word ScrCmd_Unk028A + .word ScrCmd_Unk028B + .word ScrCmd_Unk028C + .word ScrCmd_Unk028D + .word ScrCmd_Unk028E + .word ScrCmd_Unk028F + .word ScrCmd_Unk0290 + .word ScrCmd_Unk0291 + .word ScrCmd_Unk0292 + .word ScrCmd_Unk0293 + .word ScrCmd_Unk0294 + .word ScrCmd_Unk0295 + .word ScrCmd_Unk0296 + .word ScrCmd_Unk0297 + .word ScrCmd_Unk0298 + .word ScrCmd_Unk0299 + .word ScrCmd_Unk029A + .word ScrCmd_Unk029B + .word ScrCmd_Unk029C .word ScrCmd_Unk029D - .word FUN_0203F8C0 - .word FUN_0203F954 - .word FUN_0204190C - .word FUN_0203B024 - .word FUN_0203F9DC - .word FUN_0203F988 - .word FUN_0203F9B0 - .word FUN_0203B914 - .word ScrCmd_Unk02A6 - .word FUN_0203FA14 + .word ScrCmd_Unk029E + .word ScrCmd_Unk029F + .word ScrCmd_Unk02A0 + .word ScrCmd_Unk02A1 + .word ScrCmd_Unk02A2 + .word ScrCmd_Unk02A3 + .word ScrCmd_Unk02A4 + .word ScrCmd_Unk02A5 + .word ScrCmd_GetPrizeItemIdAndCost + .word ScrCmd_Unk02A7 .word ScrCmd_TakeCoinsAddress .word ScrCmd_HasEnoughCoinsAddress - .word FUN_0203FA58 - .word FUN_0203B7F0 - .word FUN_0203FB4C - .word FUN_0203B790 + .word ScrCmd_Unk02AA + .word ScrCmd_Unk02AB + .word ScrCmd_Unk02AC + .word ScrCmd_Unk02AD .word ScrCmd_Unk02AE - .word FUN_0203FB64 - .word FUN_0203FB94 - .word FUN_0203FBA0 - .word FUN_0203FBAC + .word ScrCmd_Unk02AF + .word ScrCmd_Unk02B0 + .word ScrCmd_Unk02B1 + .word ScrCmd_Unk02B2 .word ScrCmd_GetSealName - .word FUN_0203B2E0 - .word FUN_0203FBBC - .word FUN_0203FC1C - .word FUN_020451D0 - .word FUN_02042000 + .word ScrCmd_Unk02B4 + .word ScrCmd_Unk02B5 + .word ScrCmd_Unk02B6 + .word ScrCmd_Unk02B7 + .word ScrCmd_Unk02B8 .word ScrCmd_Unk02B9 - .word FUN_0203D4E8 - .word FUN_0203D920 - .word FUN_02041B40 - .word FUN_0203D0A4 - .word FUN_0203FC58 - .word FUN_0203CAE8 + .word ScrCmd_Unk02BA + .word ScrCmd_Unk02BB + .word ScrCmd_Unk02BC + .word ScrCmd_Unk02BD + .word ScrCmd_Unk02BE + .word ScrCmd_Unk02BF .word ScrCmd_Unk02C0 - .word FUN_0203FC80 - .word FUN_0203FCB0 - .word FUN_0203FCDC + .word ScrCmd_Unk02C1 + .word ScrCmd_Unk02C2 + .word ScrCmd_Unk02C3 .word ScrCmd_GetItemNameWithIndefArticle .word ScrCmd_GetItemNamePlural .word ScrCmd_GetDecorationNameWithArticle diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 96cfbab6..780c4833 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -49,7 +49,7 @@ FUN_02048120: ; 0x02048120 mov r1, #0x6 mov r2, #0x0 lsl r3, r3, #0x4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x8 pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0205363C.s b/arm9/asm/unk_0205363C.s index 2e5f334e..aa73064c 100644 --- a/arm9/asm/unk_0205363C.s +++ b/arm9/asm/unk_0205363C.s @@ -165,7 +165,7 @@ FUN_02053708: ; 0x02053708 mov r1, #0x7 add r2, sp, #0x0 add r3, r5, #0x0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData mov r1, #0x9 add r4, r0, #0x0 add r0, r5, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 2499c108..4ba1b745 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2365,7 +2365,7 @@ _0206DA26: str r0, [sp, #0xc] mov r0, #0x76 mov r3, #0x3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -2376,7 +2376,7 @@ _0206DA26: str r0, [sp, #0xc] mov r0, #0x76 mov r3, #0x3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0x0 str r1, [sp, #0x0] mov r0, #0x40 @@ -2441,7 +2441,7 @@ _0206DA26: mov r0, #0xc add r2, r4, #0x0 mov r3, #0x4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -2453,7 +2453,7 @@ _0206DA26: mov r0, #0xc add r2, r4, #0x0 mov r3, #0x4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x1 str r0, [sp, #0x0] mov r0, #0x20 @@ -2719,7 +2719,7 @@ _0206DDDC: b _0206DDFA _0206DDE4: ldr r0, _0206DE00 ; =0x00000484 - bl PlayBGM + bl PlaySound b _0206DDFA _0206DDEC: ldr r0, _0206DE04 ; =0x000005E6 @@ -2727,7 +2727,7 @@ _0206DDEC: b _0206DDFA _0206DDF4: ldr r0, _0206DE08 ; =0x00000483 - bl PlayBGM + bl PlaySound _0206DDFA: add r0, r4, #0x0 pop {r4, pc} diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index a50d92bf..17adb2d2 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1256,7 +1256,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0xf mov r3, #0x3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -1267,7 +1267,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0x11 mov r3, #0x3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x14 ; NARC_GRAPHIC_PLIST_GRA mov r1, #0x10 mov r2, #0xc @@ -1331,7 +1331,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0x3 mov r3, #0x4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0x20 mov r1, #0x4 str r3, [sp, #0x0] @@ -1339,7 +1339,7 @@ FUN_0206FD24: ; 0x0206FD24 str r0, [sp, #0x4] mov r0, #0x14 add r2, r1, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -1349,7 +1349,7 @@ FUN_0206FD24: ; 0x0206FD24 ldr r2, [r5, #0x0] mov r0, #0x14 mov r3, #0x5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -1360,7 +1360,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0xe mov r3, #0x5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp, #0x0] mov r0, #0xc @@ -1369,7 +1369,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r1, #0xd mov r2, #0x4 mov r3, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r2, #0x99 lsl r2, r2, #0x2 mov r3, #0xf9 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 7cbbce8f..a08d279d 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -1717,7 +1717,7 @@ _020732A6: b _020732BE _020732AE: ldr r0, _020732C8 ; =0x00000483 - bl PlayBGM + bl PlaySound b _020732BE _020732B6: ldr r0, _020732C4 ; =0x000005E6 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 34c0bc89..87e9cab0 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -2269,7 +2269,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f add r2, r1, #0x0 add r3, r1, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp, #0x0] mov r0, #0x12 @@ -2278,7 +2278,7 @@ FUN_02077FE8: ; 0x02077FE8 add r1, r0, #0x0 mov r2, #0x4 mov r3, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x4 mov r1, #0x0 bl FUN_02017FE4 @@ -2295,7 +2295,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f add r2, r4, #0x0 add r3, r1, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x6 @@ -2309,7 +2309,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r1, #0x4 add r2, r4, #0x0 mov r3, #0x2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x2 @@ -2322,7 +2322,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f mov r1, #0x2 add r2, r4, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0xe @@ -2335,7 +2335,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f mov r1, #0x6 add r2, r4, #0x0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0x0 mov r0, #0xe str r3, [sp, #0x0] @@ -2348,7 +2348,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f mov r1, #0x7 add r2, r4, #0x0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0x6 mov r0, #0x0 lsl r1, r1, #0x6 @@ -2382,7 +2382,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r1, #0x10 mov r2, #0x1 add r3, r5, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData ldr r1, _0207810C ; =0x000004AC str r0, [r5, r1] add sp, #0x10 @@ -2533,7 +2533,7 @@ _0207818C: mov r0, #0x13 mov r2, #0x0 add r3, r5, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData ldr r1, _02078320 ; =0x000004B4 str r0, [r5, r1] add r0, r1, #0x4 @@ -2547,7 +2547,7 @@ _0207818C: lsl r2, r0, #0x6 add r2, r5, r2 mov r3, #0x12 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData ldr r1, _02078324 ; =0x000004BC str r0, [r5, r1] add r0, r1, #0x4 @@ -3131,7 +3131,7 @@ _020786F0: mov r0, #0x1f add r1, r7, #0x6 add r3, r6, #0x0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0x0 add r1, r6, #0x0 bl FUN_02078BA8 @@ -3435,7 +3435,7 @@ FUN_0207890C: ; 0x0207890C ldr r2, [r5, r2] mov r0, #0x1f mov r1, #0x9 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x46 mov r1, #0x4 lsl r0, r0, #0x4 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 625807ae..3134a96c 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -551,7 +551,7 @@ FUN_0207A0CC: ; 0x0207A0CC ldr r2, [r4, #0x0] mov r0, #0x27 mov r3, #0x3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -562,7 +562,7 @@ FUN_0207A0CC: ; 0x0207A0CC ldr r2, [r4, #0x0] mov r0, #0x27 add r3, r1, #0x0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0x0 str r2, [sp, #0x0] mov r0, #0x13 @@ -570,7 +570,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0x1 add r3, r2, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -581,7 +581,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0xb mov r3, #0x2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -592,7 +592,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0x2 mov r3, #0x4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -603,7 +603,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0x10 mov r3, #0x5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -614,7 +614,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0xf mov r3, #0x5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0x0 str r3, [sp, #0x0] mov r0, #0x13 @@ -622,7 +622,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0xe mov r2, #0x4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4, pc} diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index 58dba10d..a64d7ab7 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -177,7 +177,7 @@ _0208292A: mov r0, #0x5a add r2, r1, #0x0 add r3, r5, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0x14] mov r0, #0x5a mov r1, #0x0 @@ -513,7 +513,7 @@ FUN_02082B90: ; 0x02082B90 mov r0, #0x5a mov r1, #0x2 mov r2, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0x14] ldr r1, _02082D10 ; =0x00000121 ldr r0, [sp, #0x8] @@ -938,7 +938,7 @@ FUN_02082ED0: ; 0x02082ED0 add r2, r5, #0x0 add r4, r5, #0x0 str r1, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0x14] mov r0, #0x5a mov r1, #0x1 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index e5739d5b..54ce0190 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -772,7 +772,7 @@ FUN_0208699C: ; 0x0208699C mov r0, #0x76 add r2, r5, #0x0 mov r3, #0x3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -783,7 +783,7 @@ FUN_0208699C: ; 0x0208699C mov r0, #0x76 add r2, r5, #0x0 mov r3, #0x3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0x0 str r1, [sp, #0x0] mov r0, #0x40 @@ -815,7 +815,7 @@ FUN_020869F0: ; 0x020869F0 mov r1, #0xa add r2, r5, #0x0 mov r3, #0x4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -827,7 +827,7 @@ FUN_020869F0: ; 0x020869F0 mov r1, #0xb add r2, r5, #0x0 mov r3, #0x4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x1 str r0, [sp, #0x0] mov r0, #0x20 diff --git a/arm9/asm/unk_02086FA8.s b/arm9/asm/unk_02086FA8.s index f164c88f..5e0a8dfa 100644 --- a/arm9/asm/unk_02086FA8.s +++ b/arm9/asm/unk_02086FA8.s @@ -185,7 +185,7 @@ _0208710E: cmp r0, #0x0 bne _0208712A ldr r0, _02087244 ; =0x00000484 - bl PlayBGM + bl PlaySound ldr r0, [r4, #0x5c] add r0, r0, #0x1 str r0, [r4, #0x5c] @@ -470,7 +470,7 @@ _02087362: cmp r0, #0x0 bne _0208737E ldr r0, _02087498 ; =0x00000484 - bl PlayBGM + bl PlaySound ldr r0, [r4, #0x5c] add r0, r0, #0x1 str r0, [r4, #0x5c] diff --git a/arm9/asm/unk_02087A6C.s b/arm9/asm/unk_02087A6C.s index c508e978..1ab7b908 100644 --- a/arm9/asm/unk_02087A6C.s +++ b/arm9/asm/unk_02087A6C.s @@ -249,7 +249,7 @@ FUN_02087C18: ; 0x02087C18 mov r0, #0x4b add r2, r1, #0x0 str r1, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc pop {r3, pc} .balign 4 @@ -261,7 +261,7 @@ FUN_02087C2C: ; 0x02087C2C mov r0, #0x4b mov r1, #0x1 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc pop {r3, pc} .balign 4 @@ -277,14 +277,14 @@ FUN_02087C40: ; 0x02087C40 mov r0, #0x4b mov r1, #0x9 add r3, r6, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0xa add r3, r6, #0x0 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -302,14 +302,14 @@ FUN_02087C70: ; 0x02087C70 mov r0, #0x4b mov r1, #0x7 add r3, r6, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x8 add r3, r6, #0x0 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -327,14 +327,14 @@ FUN_02087CA0: ; 0x02087CA0 mov r0, #0x4b mov r1, #0x5 add r3, r6, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x6 add r3, r6, #0x0 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -352,14 +352,14 @@ FUN_02087CD0: ; 0x02087CD0 mov r0, #0x4b mov r1, #0x3 add r3, r6, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x4 add r3, r6, #0x0 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} diff --git a/arm9/asm/unk_0208A300.s b/arm9/asm/unk_0208A300.s deleted file mode 100644 index fe273a33..00000000 --- a/arm9/asm/unk_0208A300.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start FUN_0208A300 -FUN_0208A300: ; 0x0208A300 - push {r3, lr} - mov r1, #0x8 - bl AllocFromHeap - mov r1, #0x0 - strb r1, [r0, #0x0] - strb r1, [r0, #0x1] - strb r1, [r0, #0x2] - strb r1, [r0, #0x3] - strb r1, [r0, #0x4] - strb r1, [r0, #0x5] - strb r1, [r0, #0x6] - strb r1, [r0, #0x7] - mov r1, #0x2 - str r1, [r0, #0x4] - pop {r3, pc} - - thumb_func_start FUN_0208A320 -FUN_0208A320: ; 0x0208A320 - ldr r3, _0208A324 ; =FreeToHeap - bx r3 - .balign 4 -_0208A324: .word FreeToHeap - - thumb_func_start FUN_0208A328 -FUN_0208A328: ; 0x0208A328 - ldr r0, [r0, #0x0] - bx lr - - thumb_func_start FUN_0208A32C -FUN_0208A32C: ; 0x0208A32C - str r1, [r0, #0x0] - bx lr - - thumb_func_start FUN_0208A330 -FUN_0208A330: ; 0x0208A330 - ldr r0, [r0, #0x4] - bx lr - - thumb_func_start FUN_0208A334 -FUN_0208A334: ; 0x0208A334 - str r1, [r0, #0x4] - bx lr diff --git a/arm9/global.inc b/arm9/global.inc index d4d6b78c..46268a8c 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -360,7 +360,7 @@ .extern FUN_02005614 .extern FUN_02005670 .extern FUN_020056AC -.extern PlayBGM +.extern PlaySound .extern FUN_02005CBC .extern FUN_02005CFC .extern FUN_02005D20 @@ -394,22 +394,22 @@ .extern NARC_ReadFromMember .extern NARC_ReadFile .extern NARC_GetFileCount -.extern FUN_0200687C -.extern FUN_020068C8 -.extern FUN_02006930 -.extern FUN_02006948 -.extern FUN_02006A34 -.extern FUN_02006A8C -.extern FUN_02006AE4 -.extern FUN_02006B38 -.extern FUN_02006BB0 -.extern FUN_02006BDC -.extern FUN_02006C08 -.extern FUN_02006C30 -.extern FUN_02006C5C -.extern FUN_02006C88 -.extern UncompressFromNarc -.extern FUN_02006D18 +.extern GfGfxLoader_LoadCharData +.extern GfGfxLoader_LoadScrnData +.extern GfGfxLoader_GXLoadPal +.extern GfGfxLoader_GXLoadPalWithSrcOffset +.extern GfGfxLoader_LoadWholePalette +.extern GfGfxLoader_PartiallyLoadPalette +.extern GfGfxLoader_LoadImageMapping +.extern GfGfxLoader_SetObjCntFlagsAndLoadImageMapping +.extern GfGfxLoader_GetCharData +.extern GfGfxLoader_GetScrnData +.extern GfGfxLoader_GetPlttData +.extern GfGfxLoader_GetCellBank +.extern GfGfxLoader_GetAnimBank +.extern GfGfxLoader_UncompressFromNarc +.extern GfGfxLoader_LoadFromNarc +.extern GfGfxLoader_LoadFromNarc_GetSizeOut .extern FUN_02006D98 .extern FUN_02006ED4 .extern FUN_020072E8 @@ -2745,7 +2745,7 @@ .extern ScrCmd_Unk01FD .extern ScrCmd_Unk01FE .extern ScrCmd_Unk01FF -.extern ScrCmd_Unk026D +.extern ScrCmd_MessageUnown .extern ScrCmd_Unk002C .extern ScrCmd_Unk002D .extern ScrCmd_Unk02C0 @@ -2755,9 +2755,9 @@ .extern ScrCmd_WaitButtonAB .extern ScrCmd_WaitButtonABTime .extern ScrCmd_WaitButton -.extern ScrCmd_Unk0032 +.extern ScrCmd_WaitButtonABPad .extern ScrCmd_Unk0033 -.extern ScrCmd_Unk0034 +.extern ScrCmd_CloseMessageBox .extern ScrCmd_Unk0035 .extern ScrCmd_ScrollBg .extern ScrCmd_CreateMessageBox @@ -2784,403 +2784,403 @@ .extern ScrCmd_Unk02CF .extern ScrCmd_Unk02D0 .extern ScrCmd_Unk005E -.extern FUN_0203B024 -.extern FUN_0203B148 -.extern FUN_0203B1F0 -.extern FUN_0203B2E0 -.extern FUN_0203B3B0 -.extern FUN_0203B3C0 -.extern FUN_0203B3DC -.extern FUN_0203B3F8 -.extern FUN_0203B440 -.extern FUN_0203B468 -.extern FUN_0203B500 -.extern FUN_0203B544 -.extern FUN_0203B574 -.extern FUN_0203B5B8 -.extern FUN_0203B618 -.extern FUN_0203B640 -.extern FUN_0203B724 -.extern FUN_0203B758 -.extern FUN_0203B790 -.extern FUN_0203B7D8 -.extern FUN_0203B7F0 -.extern FUN_0203B81C -.extern FUN_0203B85C -.extern FUN_0203B8A0 -.extern FUN_0203B8E4 -.extern FUN_0203B914 -.extern FUN_0203B944 -.extern FUN_0203B968 -.extern FUN_0203B9B4 -.extern FUN_0203BA3C -.extern FUN_0203BAB0 -.extern FUN_0203BAF4 -.extern FUN_0203BB34 -.extern FUN_0203BB80 -.extern FUN_0203BB84 -.extern FUN_0203BB88 -.extern FUN_0203BB8C +.extern ScrCmd_Unk02A1 +.extern ScrCmd_Unk005F +.extern ScrCmd_Unk0060 +.extern ScrCmd_Unk02B4 +.extern ScrCmd_Unk0061 +.extern ScrCmd_Unk0062 +.extern ScrCmd_Unk0063 +.extern ScrCmd_Unk0064 +.extern ScrCmd_Unk0065 +.extern ScrCmd_Unk0066 +.extern ScrCmd_Unk0067 +.extern ScrCmd_Unk0068 +.extern ScrCmd_Unk0069 +.extern ScrCmd_Unk006A +.extern ScrCmd_Unk01BD +.extern ScrCmd_Unk006B +.extern ScrCmd_Unk006C +.extern ScrCmd_Unk006D +.extern ScrCmd_Unk02AD +.extern ScrCmd_Unk006E +.extern ScrCmd_Unk02AB +.extern ScrCmd_Unk0093 +.extern ScrCmd_Unk0094 +.extern ScrCmd_Unk0095 +.extern ScrCmd_Unk0191 +.extern ScrCmd_Unk02A5 +.extern ScrCmd_Unk0192 +.extern ScrCmd_Unk0193 +.extern ScrCmd_Unk0194 +.extern ScrCmd_Unk0195 +.extern ScrCmd_Unk0196 +.extern ScrCmd_Unk0197 +.extern ScrCmd_Unk009B +.extern ScrCmd_Unk009C +.extern ScrCmd_Unk009D +.extern ScrCmd_Unk009E +.extern ScrCmd_Unk009F .extern FUN_0203BC04 -.extern FUN_0203BC1C -.extern FUN_0203BC2C -.extern FUN_0203BCBC -.extern FUN_0203BCCC -.extern FUN_0203BCD8 -.extern FUN_0203BD08 -.extern FUN_0203BD28 -.extern FUN_0203BDB8 -.extern FUN_0203BE50 -.extern FUN_0203BE68 -.extern FUN_0203BE80 -.extern FUN_0203BECC -.extern FUN_0203BF00 -.extern FUN_0203BF20 -.extern FUN_0203BF2C -.extern FUN_0203BF84 -.extern FUN_0203BFEC -.extern FUN_0203C054 -.extern FUN_0203C090 -.extern FUN_0203C0CC -.extern FUN_0203C0FC -.extern FUN_0203C118 -.extern FUN_0203C12C -.extern FUN_0203C174 -.extern FUN_0203C1AC -.extern FUN_0203C200 -.extern ScrCmd_monstoragepc -.extern FUN_0203C2C4 -.extern FUN_0203C2E0 -.extern FUN_0203C2F0 -.extern FUN_0203C300 -.extern ScrCmd_halloffame -.extern FUN_0203C33C -.extern FUN_0203C368 -.extern FUN_0203C3C8 -.extern FUN_0203C3E8 -.extern FUN_0203C430 -.extern FUN_0203C460 -.extern FUN_0203C4B0 -.extern FUN_0203C4F0 -.extern FUN_0203C520 -.extern FUN_0203C58C -.extern FUN_0203C5BC -.extern FUN_0203C614 -.extern FUN_0203C680 -.extern FUN_0203C6C4 -.extern FUN_0203C70C -.extern FUN_0203C730 -.extern FUN_0203C788 -.extern FUN_0203C7E4 -.extern FUN_0203C7F4 -.extern FUN_0203C820 -.extern FUN_0203C844 -.extern FUN_0203C874 -.extern FUN_0203C8B4 -.extern FUN_0203C8E4 -.extern FUN_0203C930 -.extern FUN_0203C960 -.extern FUN_0203C990 -.extern FUN_0203CA20 -.extern FUN_0203CA2C -.extern FUN_0203CA5C -.extern FUN_0203CAE8 -.extern FUN_0203CB08 -.extern FUN_0203CB20 -.extern FUN_0203CB48 -.extern FUN_0203CB60 -.extern FUN_0203CB70 -.extern FUN_0203CBBC -.extern FUN_0203CBE8 -.extern FUN_0203CC88 -.extern FUN_0203CD20 -.extern FUN_0203CDB8 -.extern FUN_0203CDC4 -.extern FUN_0203CDD0 -.extern FUN_0203CE00 -.extern FUN_0203CE0C -.extern FUN_0203CE8C -.extern FUN_0203CEBC -.extern FUN_0203CF04 -.extern FUN_0203CF34 -.extern FUN_0203CF64 -.extern FUN_0203CF94 -.extern FUN_0203CFC4 -.extern FUN_0203CFC8 -.extern FUN_0203D050 -.extern FUN_0203D0A4 -.extern FUN_0203D0F8 -.extern FUN_0203D134 -.extern FUN_0203D140 -.extern FUN_0203D150 -.extern FUN_0203D178 -.extern FUN_0203D194 -.extern FUN_0203D1A4 -.extern FUN_0203D1C0 -.extern FUN_0203D214 -.extern FUN_0203D23C -.extern FUN_0203D248 -.extern FUN_0203D278 -.extern FUN_0203D2A4 -.extern FUN_0203D2E4 -.extern FUN_0203D330 -.extern FUN_0203D33C -.extern FUN_0203D36C -.extern FUN_0203D3A4 -.extern FUN_0203D3DC -.extern FUN_0203D448 -.extern FUN_0203D458 -.extern FUN_0203D490 -.extern FUN_0203D4E8 -.extern FUN_0203D528 -.extern FUN_0203D560 -.extern FUN_0203D5B0 -.extern FUN_0203D5F8 -.extern FUN_0203D60C -.extern FUN_0203D61C -.extern FUN_0203D630 -.extern FUN_0203D66C -.extern FUN_0203D6C4 -.extern FUN_0203D728 -.extern FUN_0203D738 -.extern FUN_0203D774 -.extern FUN_0203D7DC -.extern FUN_0203D834 -.extern FUN_0203D868 -.extern FUN_0203D874 -.extern ScrCmd_getplayergender -.extern ScrCmd_healparty -.extern FUN_0203D8E8 -.extern FUN_0203D8EC -.extern FUN_0203D920 -.extern FUN_0203D938 -.extern FUN_0203D948 -.extern FUN_0203D958 -.extern FUN_0203D998 -.extern FUN_0203D9E8 -.extern FUN_0203DA78 -.extern FUN_0203DAB0 -.extern FUN_0203DAE8 -.extern FUN_0203DB38 -.extern FUN_0203DB88 -.extern FUN_0203DBD4 -.extern FUN_0203DC00 -.extern FUN_0203DC58 -.extern FUN_0203DC70 -.extern FUN_0203DC88 -.extern FUN_0203DCA0 -.extern FUN_0203DCB8 -.extern FUN_0203DCC8 -.extern FUN_0203DCD8 -.extern FUN_0203DCE8 -.extern FUN_0203DCF8 -.extern FUN_0203DD08 -.extern FUN_0203DD18 -.extern FUN_0203DD34 -.extern FUN_0203DD50 -.extern FUN_0203DD60 -.extern FUN_0203DE00 -.extern FUN_0203DE4C -.extern FUN_0203DE58 -.extern FUN_0203DE80 -.extern FUN_0203DEA8 -.extern FUN_0203DEC4 -.extern FUN_0203DEF8 -.extern FUN_0203DF2C -.extern FUN_0203DF38 -.extern FUN_0203DF64 -.extern FUN_0203DF84 -.extern FUN_0203DFA8 -.extern FUN_0203DFE0 -.extern FUN_0203E018 -.extern FUN_0203E054 -.extern FUN_0203E078 -.extern FUN_0203E0CC -.extern FUN_0203E120 -.extern FUN_0203E138 -.extern FUN_0203E168 -.extern FUN_0203E254 -.extern FUN_0203E258 -.extern FUN_0203E29C -.extern FUN_0203E2F8 -.extern FUN_0203E35C -.extern FUN_0203E38C -.extern FUN_0203E3D0 -.extern FUN_0203E408 -.extern FUN_0203E440 -.extern FUN_0203E470 -.extern FUN_0203E4A0 -.extern FUN_0203E4B0 -.extern FUN_0203E4D8 -.extern FUN_0203E4F0 -.extern FUN_0203E510 -.extern FUN_0203E568 -.extern FUN_0203E5DC -.extern FUN_0203E674 -.extern FUN_0203E684 -.extern FUN_0203E6B4 -.extern FUN_0203E6C4 -.extern FUN_0203E6FC -.extern FUN_0203E72C -.extern FUN_0203E744 -.extern FUN_0203E774 -.extern FUN_0203E7F0 -.extern FUN_0203E81C -.extern FUN_0203E848 -.extern FUN_0203E858 -.extern FUN_0203E870 -.extern FUN_0203E894 -.extern FUN_0203E8C4 -.extern FUN_0203E8F4 -.extern FUN_0203E928 -.extern FUN_0203E940 -.extern FUN_0203E954 -.extern FUN_0203E968 -.extern FUN_0203E9CC -.extern FUN_0203EA68 -.extern FUN_0203EA90 -.extern FUN_0203EAB0 -.extern FUN_0203EB20 -.extern FUN_0203EB48 -.extern FUN_0203EB88 -.extern ScrCmd_gameversion -.extern ScrCmd_givewallpaper -.extern FUN_0203ECAC -.extern FUN_0203ECD8 -.extern FUN_0203ECF4 -.extern FUN_0203ED10 -.extern ScrCmd_pcfreespace -.extern FUN_0203EDA4 -.extern FUN_0203EDC8 -.extern FUN_0203EDE0 -.extern FUN_0203EE08 -.extern FUN_0203EE18 -.extern FUN_0203EE28 -.extern FUN_0203EE58 -.extern FUN_0203EE68 -.extern FUN_0203EE78 -.extern FUN_0203EE98 -.extern FUN_0203EED8 -.extern FUN_0203EF58 -.extern FUN_0203F00C -.extern FUN_0203F020 -.extern FUN_0203F034 -.extern FUN_0203F058 -.extern FUN_0203F07C -.extern FUN_0203F110 -.extern FUN_0203F174 -.extern FUN_0203F19C -.extern FUN_0203F234 -.extern FUN_0203F254 -.extern FUN_0203F26C -.extern FUN_0203F2AC -.extern FUN_0203F2E4 -.extern FUN_0203F31C -.extern FUN_0203F348 -.extern FUN_0203F38C -.extern FUN_0203F39C -.extern FUN_0203F3AC -.extern FUN_0203F418 -.extern FUN_0203F44C -.extern FUN_0203F484 -.extern FUN_0203F4D8 -.extern FUN_0203F508 -.extern FUN_0203F5D4 -.extern FUN_0203F604 -.extern FUN_0203F634 -.extern FUN_0203F664 -.extern FUN_0203F6E4 -.extern FUN_0203F720 -.extern FUN_0203F760 -.extern FUN_0203F7C8 -.extern FUN_0203F80C -.extern FUN_0203F880 -.extern FUN_0203F8C0 -.extern FUN_0203F924 -.extern FUN_0203F954 -.extern FUN_0203F988 -.extern FUN_0203F9B0 -.extern FUN_0203F9DC -.extern FUN_0203FA14 -.extern FUN_0203FA58 -.extern FUN_0203FB4C -.extern FUN_0203FB64 -.extern FUN_0203FB94 -.extern FUN_0203FBA0 -.extern FUN_0203FBAC -.extern FUN_0203FBBC -.extern FUN_0203FC1C -.extern FUN_0203FC58 -.extern FUN_0203FC80 -.extern FUN_0203FCB0 -.extern FUN_0203FCDC -.extern FUN_0203FCF4 -.extern FUN_0203FDBC -.extern FUN_0203FE08 -.extern FUN_0203FE48 -.extern FUN_0203FE80 -.extern FUN_0203FE90 -.extern FUN_0203FEC0 -.extern FUN_0203FF10 -.extern FUN_02040028 -.extern FUN_02040074 -.extern FUN_020400C8 -.extern FUN_0204011C -.extern FUN_02040170 -.extern FUN_020401CC -.extern FUN_02040204 -.extern FUN_02040220 -.extern FUN_0204025C -.extern FUN_02040298 -.extern FUN_020402D4 -.extern FUN_02040304 -.extern FUN_02040340 -.extern FUN_02040370 -.extern FUN_020403A0 -.extern FUN_020403D0 -.extern FUN_02040414 -.extern FUN_02040458 -.extern FUN_02040488 -.extern FUN_020404FC -.extern FUN_0204052C -.extern FUN_0204056C -.extern FUN_0204059C -.extern FUN_020405B4 -.extern FUN_020405CC -.extern FUN_020405F8 -.extern FUN_02040638 -.extern FUN_0204064C -.extern FUN_02040660 -.extern FUN_020406C0 +.extern ScrCmd_Unk00A1 +.extern ScrCmd_Unk01F8 +.extern ScrCmd_Unk00A2 +.extern ScrCmd_Unk00A3 +.extern ScrCmd_Unk00A4 +.extern ScrCmd_Unk0207 +.extern ScrCmd_Unk0208 +.extern ScrCmd_Unk028C +.extern ScrCmd_Unk0209 +.extern ScrCmd_Unk028D +.extern ScrCmd_Unk028E +.extern ScrCmd_Unk020A +.extern ScrCmd_Unk020B +.extern ScrCmd_Unk00A5 +.extern ScrCmd_Unk00A6 +.extern ScrCmd_Unk00A7 +.extern ScrCmd_Unk00A8 +.extern ScrCmd_Unk012E +.extern ScrCmd_Unk012F +.extern ScrCmd_Unk0130 +.extern ScrCmd_Unk0205 +.extern ScrCmd_Unk00A9 +.extern ScrCmd_Unk00AA +.extern ScrCmd_Unk01D7 +.extern ScrCmd_Unk01D8 +.extern ScrCmd_Unk01D9 +.extern ScrCmd_MonStoragePC +.extern ScrCmd_Unk00AC +.extern ScrCmd_Unk00AD +.extern ScrCmd_Unk00AE +.extern ScrCmd_Unk00AF +.extern ScrCmd_HallOfFame +.extern ScrCmd_Unk00B1 +.extern ScrCmd_Unk00B2 +.extern ScrCmd_Unk00B3 +.extern ScrCmd_Unk00B4 +.extern ScrCmd_Unk00B5 +.extern ScrCmd_Unk0178 +.extern ScrCmd_Unk0179 +.extern ScrCmd_Unk00BA +.extern ScrCmd_Unk00BB +.extern ScrCmd_Unk0271 +.extern ScrCmd_Unk0243 +.extern ScrCmd_Unk0244 +.extern ScrCmd_Unk0245 +.extern ScrCmd_Unk00BC +.extern ScrCmd_Unk00BD +.extern ScrCmd_Unk00BE +.extern ScrCmd_Unk0203 +.extern ScrCmd_Unk0204 +.extern ScrCmd_Unk0200 +.extern ScrCmd_Unk0201 +.extern ScrCmd_Unk00BF +.extern ScrCmd_Unk00C0 +.extern ScrCmd_Unk00C1 +.extern ScrCmd_Unk00C2 +.extern ScrCmd_Unk00C3 +.extern ScrCmd_Unk00C4 +.extern ScrCmd_Unk00C5 +.extern ScrCmd_Unk00C6 +.extern ScrCmd_Unk00C7 +.extern ScrCmd_Unk00C8 +.extern ScrCmd_Unk02BF +.extern ScrCmd_Unk00C9 +.extern ScrCmd_Unk00CA +.extern ScrCmd_Unk00CB +.extern ScrCmd_Unk00CC +.extern ScrCmd_Unk00E3 +.extern ScrCmd_Unk00DE +.extern ScrCmd_Unk00E6 +.extern ScrCmd_Unk00F2 +.extern ScrCmd_Unk00F3 +.extern ScrCmd_Unk00F4 +.extern ScrCmd_Unk00F5 +.extern ScrCmd_Unk00F6 +.extern ScrCmd_Unk00F7 +.extern ScrCmd_Unk011B +.extern ScrCmd_Unk011C +.extern ScrCmd_Unk011D +.extern ScrCmd_Unk011E +.extern ScrCmd_Unk011F +.extern ScrCmd_Unk0120 +.extern ScrCmd_Unk0121 +.extern ScrCmd_Unk0122 +.extern ScrCmd_Unk0123 +.extern ScrCmd_Unk0124 +.extern ScrCmd_Unk02BD +.extern ScrCmd_Unk0125 +.extern ScrCmd_Unk0126 +.extern ScrCmd_Unk0127 +.extern ScrCmd_Unk0128 +.extern ScrCmd_Unk0129 +.extern ScrCmd_Unk012A +.extern ScrCmd_Unk012B +.extern ScrCmd_Unk012C +.extern ScrCmd_Unk012D +.extern ScrCmd_Unk0131 +.extern ScrCmd_Unk0132 +.extern ScrCmd_Unk0133 +.extern ScrCmd_Unk0134 +.extern ScrCmd_Unk0135 +.extern ScrCmd_Unk0136 +.extern ScrCmd_Unk0137 +.extern ScrCmd_Unk0138 +.extern ScrCmd_Unk0139 +.extern ScrCmd_Unk013C +.extern ScrCmd_Unk013D +.extern ScrCmd_Unk013E +.extern ScrCmd_Unk013F +.extern ScrCmd_Unk02BA +.extern ScrCmd_Unk0140 +.extern ScrCmd_Unk0146 +.extern ScrCmd_Unk0141 +.extern ScrCmd_Unk0142 +.extern ScrCmd_Unk013A +.extern ScrCmd_Unk013B +.extern ScrCmd_Unk0143 +.extern ScrCmd_Unk0144 +.extern ScrCmd_Unk0145 +.extern ScrCmd_Unk0153 +.extern ScrCmd_Unk0154 +.extern ScrCmd_Unk0155 +.extern ScrCmd_Unk029C +.extern ScrCmd_Unk0156 +.extern ScrCmd_Unk014B +.extern ScrCmd_Unk014C +.extern ScrCmd_GetPlayerGender +.extern ScrCmd_HealParty +.extern ScrCmd_Unk014F +.extern ScrCmd_Unk0150 +.extern ScrCmd_Unk02BB +.extern ScrCmd_Unk0151 +.extern ScrCmd_Unk0152 +.extern ScrCmd_Unk017A +.extern ScrCmd_Unk0186 +.extern ScrCmd_Unk0187 +.extern ScrCmd_Unk0188 +.extern ScrCmd_Unk0189 +.extern ScrCmd_Unk018A +.extern ScrCmd_Unk018B +.extern ScrCmd_Unk018C +.extern ScrCmd_Unk018F +.extern ScrCmd_Unk0168 +.extern ScrCmd_Unk0169 +.extern ScrCmd_Unk016A +.extern ScrCmd_Unk016B +.extern ScrCmd_Unk016C +.extern ScrCmd_Unk016F +.extern ScrCmd_Unk0170 +.extern ScrCmd_Unk0171 +.extern ScrCmd_Unk0172 +.extern ScrCmd_Unk0173 +.extern ScrCmd_Unk0174 +.extern ScrCmd_Unk0175 +.extern ScrCmd_Unk0176 +.extern ScrCmd_Unk01AC +.extern ScrCmd_Unk019E +.extern ScrCmd_Unk019F +.extern ScrCmd_Unk01A0 +.extern ScrCmd_Unk01A1 +.extern ScrCmd_Unk01A2 +.extern ScrCmd_Unk003F +.extern ScrCmd_Unk01B1 +.extern ScrCmd_Unk01B2 +.extern ScrCmd_Unk01B3 +.extern ScrCmd_Unk01B4 +.extern ScrCmd_Unk01B5 +.extern ScrCmd_Unk01B6 +.extern ScrCmd_Unk01B7 +.extern ScrCmd_Unk01B8 +.extern ScrCmd_Unk01C1 +.extern ScrCmd_Unk01C2 +.extern ScrCmd_Unk01C3 +.extern ScrCmd_Unk01C4 +.extern ScrCmd_Unk01C5 +.extern ScrCmd_Unk01CC +.extern ScrCmd_Unk01CD +.extern ScrCmd_Unk01CE +.extern ScrCmd_Unk01D2 +.extern ScrCmd_Unk01D3 +.extern ScrCmd_Unk01D4 +.extern ScrCmd_Unk01D5 +.extern ScrCmd_Unk01D6 +.extern ScrCmd_Unk01E8 +.extern ScrCmd_Unk01E9 +.extern ScrCmd_Unk01EA +.extern ScrCmd_Unk01EB +.extern ScrCmd_Unk01EC +.extern ScrCmd_Unk01ED +.extern ScrCmd_Unk01EF +.extern ScrCmd_Unk01E5 +.extern ScrCmd_Unk01E6 +.extern ScrCmd_Unk01E7 +.extern ScrCmd_Unk0202 +.extern ScrCmd_Unk0206 +.extern ScrCmd_Unk020D +.extern ScrCmd_Unk020E +.extern ScrCmd_Unk020F +.extern ScrCmd_Unk0210 +.extern ScrCmd_Unk0211 +.extern ScrCmd_Unk0214 +.extern ScrCmd_Unk0218 +.extern ScrCmd_Unk0219 +.extern ScrCmd_Unk021A +.extern ScrCmd_Unk021B +.extern ScrCmd_Unk021C +.extern ScrCmd_Unk0226 +.extern ScrCmd_Unk0227 +.extern ScrCmd_Unk0228 +.extern ScrCmd_Unk0229 +.extern ScrCmd_Unk022A +.extern ScrCmd_Unk022B +.extern ScrCmd_Unk022C +.extern ScrCmd_Unk022D +.extern ScrCmd_Unk0233 +.extern ScrCmd_Unk0234 +.extern ScrCmd_Unk0239 +.extern ScrCmd_Unk023A +.extern ScrCmd_Unk023B +.extern ScrCmd_Unk023C +.extern ScrCmd_Unk023D +.extern ScrCmd_GameVersion +.extern ScrCmd_GiveWallpaper +.extern ScrCmd_Unk024A +.extern ScrCmd_Unk024B +.extern ScrCmd_Unk024C +.extern ScrCmd_Unk024D +.extern ScrCmd_PCFreeSpace +.extern ScrCmd_Unk0258 +.extern ScrCmd_Unk0259 +.extern ScrCmd_Unk025A +.extern ScrCmd_Unk025B +.extern ScrCmd_Unk025C +.extern ScrCmd_Unk025D +.extern ScrCmd_Unk025E +.extern ScrCmd_Unk025F +.extern ScrCmd_Unk0260 +.extern ScrCmd_Unk0262 +.extern ScrCmd_Unk0263 +.extern ScrCmd_Unk0264 +.extern ScrCmd_Unk0265 +.extern ScrCmd_Unk0266 +.extern ScrCmd_Unk0267 +.extern ScrCmd_Unk0268 +.extern ScrCmd_Unk0269 +.extern ScrCmd_Unk026A +.extern ScrCmd_Unk026B +.extern ScrCmd_Unk026C +.extern ScrCmd_Unk026E +.extern ScrCmd_Unk026F +.extern ScrCmd_Unk0270 +.extern ScrCmd_Unk0273 +.extern ScrCmd_Unk0275 +.extern ScrCmd_Unk0277 +.extern ScrCmd_Unk0279 +.extern ScrCmd_Unk027A +.extern ScrCmd_Unk027B +.extern ScrCmd_Unk027D +.extern ScrCmd_Unk027F +.extern ScrCmd_Unk027E +.extern ScrCmd_Unk0282 +.extern ScrCmd_Unk0284 +.extern ScrCmd_Unk0285 +.extern ScrCmd_Unk0286 +.extern ScrCmd_Unk0287 +.extern ScrCmd_Unk0288 +.extern ScrCmd_Unk0289 +.extern ScrCmd_Unk028A +.extern ScrCmd_Unk028B +.extern ScrCmd_Unk028F +.extern ScrCmd_Unk0290 +.extern ScrCmd_Unk0291 +.extern ScrCmd_Unk0292 +.extern ScrCmd_Unk029E +.extern ScrCmd_Unk0293 +.extern ScrCmd_Unk029F +.extern ScrCmd_Unk02A3 +.extern ScrCmd_Unk02A4 +.extern ScrCmd_Unk02A2 +.extern ScrCmd_Unk02A7 +.extern ScrCmd_Unk02AA +.extern ScrCmd_Unk02AC +.extern ScrCmd_Unk02AF +.extern ScrCmd_Unk02B0 +.extern ScrCmd_Unk02B1 +.extern ScrCmd_Unk02B2 +.extern ScrCmd_Unk02B5 +.extern ScrCmd_Unk02B6 +.extern ScrCmd_Unk02BE +.extern ScrCmd_Unk02C1 +.extern ScrCmd_Unk02C2 +.extern ScrCmd_Unk02C3 +.extern ScrCmd_NormalMart +.extern ScrCmd_SpecialMart +.extern ScrCmd_GoodsMart +.extern ScrCmd_SealsMart +.extern ScrCmd_AccessoriesShop +.extern ScrCmd_Unk00F8 +.extern ScrCmd_Unk00F9 +.extern ScrCmd_Unk00FA +.extern ScrCmd_Unk00FB +.extern ScrCmd_Unk00FC +.extern ScrCmd_Unk00FD +.extern ScrCmd_Unk00FE +.extern ScrCmd_Unk00FF +.extern ScrCmd_Unk0100 +.extern ScrCmd_Unk0101 +.extern ScrCmd_Unk0102 +.extern ScrCmd_Unk0103 +.extern ScrCmd_Unk0104 +.extern ScrCmd_Unk0105 +.extern ScrCmd_Unk0106 +.extern ScrCmd_Unk0107 +.extern ScrCmd_Unk0108 +.extern ScrCmd_Unk0109 +.extern ScrCmd_Unk010A +.extern ScrCmd_Unk010B +.extern ScrCmd_Unk010C +.extern ScrCmd_Unk0110 +.extern ScrCmd_Unk010D +.extern ScrCmd_Unk010E +.extern ScrCmd_Unk010F +.extern ScrCmd_Unk0117 +.extern ScrCmd_Unk0118 +.extern ScrCmd_Unk0111 +.extern ScrCmd_Unk0112 +.extern ScrCmd_Unk0113 +.extern ScrCmd_Unk0114 +.extern ScrCmd_Unk0115 +.extern ScrCmd_Unk0116 .extern ScrCmd_GetPlayerName .extern ScrCmd_GetRivalName .extern ScrCmd_GetFriendName -.extern ScrCmd_Unk00D0 +.extern ScrCmd_GetPokemonName .extern ScrCmd_GetItemName .extern ScrCmd_GetPocketName .extern ScrCmd_GetTMHMMoveName .extern ScrCmd_GetMoveName .extern ScrCmd_Unk00D5 .extern ScrCmd_Unk0280 -.extern ScrCmd_Unk00D6 +.extern ScrCmd_GetPokemonNickname .extern ScrCmd_Unk0251 .extern ScrCmd_GetPoketchAppName .extern ScrCmd_GetTrainerClassName .extern ScrCmd_Unk00D9 .extern ScrCmd_Unk00DA -.extern ScrCmd_Unk00DB -.extern ScrCmd_Unk00DC -.extern ScrCmd_Unk00DD +.extern ScrCmd_GetPlayerStarterName +.extern ScrCmd_GetRivalStarterName +.extern ScrCmd_GetCounterpartStarterName .extern ScrCmd_GetDecorationName .extern ScrCmd_GetUndergroundTrapName .extern ScrCmd_GetUndergroundItemName -.extern ScrCmd_Unk00E2 -.extern ScrCmd_Unk017B +.extern ScrCmd_GetMapName +.extern ScrCmd_GetBerryName .extern ScrCmd_GetNatureName .extern ScrCmd_GetFashionName -.extern ScrCmd_Unk0272 +.extern ScrCmd_GetWhiteRockInscription .extern ScrCmd_GetPokemonMoveName -.extern ScrCmd_Unk0232 +.extern ScrCmd_GetRibbonName .extern ScrCmd_GetSealName .extern ScrCmd_GetItemNameWithIndefArticle .extern ScrCmd_GetItemNamePlural @@ -3193,94 +3193,94 @@ .extern ScrCmd_Unk02CC .extern ScrCmd_GetSealNamePlural .extern ScrCmd_CapitalizeFirstChar -.extern FUN_02041194 -.extern FUN_020411C4 -.extern FUN_02041340 +.extern ScrCmd_Unk024E +.extern ScrCmd_Unk024F +.extern ScrCmd_Unk0250 .extern ScrCmd_Unk02AE -.extern ScrCmd_Unk0050 -.extern ScrCmd_Unk0051 -.extern ScrCmd_Unk0052 +.extern ScrCmd_PlayBgm +.extern ScrCmd_StopBgm +.extern ScrCmd_PlayDefaultBgm .extern ScrCmd_Unk0053 -.extern ScrCmd_Unk0054 -.extern ScrCmd_Unk0055 +.extern ScrCmd_FadeOutBgm +.extern ScrCmd_FadeInBgm .extern ScrCmd_Unk0056 .extern ScrCmd_Unk0057 .extern ScrCmd_Unk0058 -.extern ScrCmd_Unk0049 -.extern ScrCmd_Unk004A -.extern ScrCmd_Unk004B -.extern ScrCmd_Unk004C +.extern ScrCmd_PlayFanfare +.extern ScrCmd_StopFanfare +.extern ScrCmd_PlayFanfareWait +.extern ScrCmd_PlayCry .extern ScrCmd_PlayCryWait -.extern ScrCmd_PlayBgm -.extern ScrCmd_Unk004F -.extern ScrCmd_Unk0059 -.extern ScrCmd_Unk005A -.extern ScrCmd_Unk005B -.extern ScrCmd_Unk005C +.extern ScrCmd_PlaySound +.extern ScrCmd_PlaySoundWait +.extern ScrCmd_CheckChatotCry +.extern ScrCmd_StartChatotRecord +.extern ScrCmd_StopChatotRecord +.extern ScrCmd_SaveChatotCry .extern ScrCmd_Unk005D -.extern ScrCmd_Unk0283 -.extern FUN_020416A8 -.extern FUN_02041770 -.extern FUN_020417E0 -.extern FUN_02041808 -.extern FUN_0204185C -.extern FUN_0204188C -.extern FUN_0204190C -.extern FUN_02041970 -.extern FUN_020419F8 -.extern FUN_02041A80 -.extern FUN_02041AB4 -.extern FUN_02041AD4 -.extern FUN_02041AE0 -.extern FUN_02041B10 -.extern FUN_02041B40 -.extern FUN_02041B70 -.extern FUN_02041B9C -.extern FUN_02041BC4 -.extern FUN_02041BF0 +.extern ScrCmd_SetVolume +.extern ScrCmd_Unk00B6 +.extern ScrCmd_Unk00B7 +.extern ScrCmd_Unk00B8 +.extern ScrCmd_Unk00B9 +.extern ScrCmd_Unk00E4 +.extern ScrCmd_Unk00E5 +.extern ScrCmd_Unk02A0 +.extern ScrCmd_Unk00E7 +.extern ScrCmd_Unk00E8 +.extern ScrCmd_Unk00E9 +.extern ScrCmd_Unk00EA +.extern ScrCmd_Unk00EB +.extern ScrCmd_Unk00EC +.extern ScrCmd_Unk00ED +.extern ScrCmd_Unk02BC +.extern ScrCmd_Unk00EE +.extern ScrCmd_Unk00EF +.extern ScrCmd_Unk00F0 +.extern ScrCmd_Unk00F1 .extern ScrCmd_Unk021D -.extern FUN_02041E40 -.extern FUN_02041FDC -.extern FUN_02042000 -.extern FUN_02042038 -.extern FUN_02042110 -.extern FUN_0204214C -.extern FUN_02042354 -.extern FUN_02042364 -.extern FUN_02042394 -.extern FUN_020423B0 -.extern FUN_02042700 -.extern FUN_02042780 -.extern FUN_020427A8 -.extern FUN_020427D0 -.extern FUN_02042864 -.extern FUN_02042894 -.extern FUN_020428E0 -.extern FUN_02042950 -.extern FUN_02042980 -.extern FUN_02042998 -.extern FUN_020429B8 -.extern FUN_020429E8 -.extern FUN_02042A18 -.extern FUN_02042A48 -.extern FUN_02042A98 -.extern ScrCmd_Unk017D -.extern ScrCmd_Unk017E -.extern ScrCmd_Unk017F -.extern ScrCmd_Unk0180 -.extern ScrCmd_Unk0181 -.extern ScrCmd_Unk0182 -.extern ScrCmd_Unk0183 +.extern ScrCmd_Unk0235 +.extern ScrCmd_Unk0236 +.extern ScrCmd_Unk02B8 +.extern ScrCmd_Unk0237 +.extern ScrCmd_Unk0238 +.extern ScrCmd_Unk027C +.extern ScrCmd_Unk01DA +.extern ScrCmd_Unk01DB +.extern ScrCmd_Unk01DC +.extern ScrCmd_Unk01DD +.extern ScrCmd_Unk01DE +.extern ScrCmd_Unk01DF +.extern ScrCmd_Unk01E0 +.extern ScrCmd_Unk01E1 +.extern ScrCmd_Unk01E2 +.extern ScrCmd_Unk01E3 +.extern ScrCmd_Unk01E4 +.extern ScrCmd_Unk0294 +.extern ScrCmd_Unk0295 +.extern ScrCmd_Unk0296 +.extern ScrCmd_Unk0297 +.extern ScrCmd_Unk0298 +.extern ScrCmd_Unk0299 +.extern ScrCmd_Unk029A +.extern ScrCmd_Unk029B +.extern ScrCmd_GetBerryTreeGrowth +.extern ScrCmd_GetBerryTreeType +.extern ScrCmd_GetBerryTreeMulch +.extern ScrCmd_GetBerryTreeWater +.extern ScrCmd_GetBerryTreeAmount +.extern ScrCmd_SetBerryTreeMulch +.extern ScrCmd_SetBerryTreeType .extern ScrCmd_Unk0184 -.extern ScrCmd_Unk0185 -.extern FUN_02042D1C +.extern ScrCmd_TakeBerryTreeBerries +.extern ScrCmd_Unk023E .extern ScrCmd_Unk0253 .extern ScrCmd_Unk0254 .extern ScrCmd_Unk0255 .extern ScrCmd_Unk0256 -.extern ScrCmd_Unk0075 -.extern ScrCmd_Unk0076 -.extern ScrCmd_Unk0077 +.extern ScrCmd_ShowCoinBox +.extern ScrCmd_HideCoinBox +.extern ScrCmd_UpdateCoinBox .extern ScrCmd_GetCoins .extern ScrCmd_GiveCoins .extern ScrCmd_TakeCoinsImmediate @@ -3293,16 +3293,16 @@ .extern ScrCmd_TakeMoneyAddress .extern ScrCmd_HasEnoughMoneyImmediate .extern ScrCmd_HasEnoughMoneyAddress -.extern ScrCmd_Unk0072 -.extern ScrCmd_Unk0073 -.extern ScrCmd_Unk0074 -.extern ScrCmd_Unk016D -.extern ScrCmd_Unk016E -.extern ScrCmd_Unk01A8 -.extern ScrCmd_Unk01A9 +.extern ScrCmd_ShowMoneyBox +.extern ScrCmd_HideMoneyBox +.extern ScrCmd_UpdateMoneyBox +.extern ScrCmd_GetDaycarePokemonNames +.extern ScrCmd_GetDaycareStatus +.extern ScrCmd_DeleteDaycareEgg +.extern ScrCmd_GiveDaycareEgg .extern ScrCmd_Unk01A4 .extern ScrCmd_Unk01AA -.extern ScrCmd_Unk01AE +.extern ScrCmd_GetDaycareLevel .extern ScrCmd_Unk01AF .extern ScrCmd_Unk01B0 .extern ScrCmd_Unk01BC @@ -3312,72 +3312,72 @@ .extern ScrCmd_Unk01A6 .extern ScrCmd_Unk01A7 .extern ScrCmd_Unk01AD -.extern FUN_02044158 -.extern FUN_0204416C -.extern FUN_02044198 +.extern ScrCmd_Unk0215 +.extern ScrCmd_Unk0216 +.extern ScrCmd_Unk0217 .extern ScrCmd_GiveMon -.extern ScrCmd_getpartyspecies -.extern ScrCmd_checkpartymonotid -.extern ScrCmd_giveegg -.extern ScrCmd_setpartymonmove -.extern ScrCmd_partymonhasmove -.extern ScrCmd_findpartymonwithmove -.extern ScrCmd_survivepsn -.extern ScrCmd_countpartymonsatorbelowlevel -.extern ScrCmd_getpartymonlevel -.extern ScrCmd_getpartymonnature -.extern ScrCmd_findpartymonwithnature -.extern ScrCmd_getpartymonfriendship -.extern FUN_020448D4 -.extern FUN_020449A4 -.extern FUN_02044A0C -.extern FUN_02044A6C -.extern FUN_02044A94 -.extern FUN_02044B00 -.extern FUN_02044B2C -.extern FUN_02044B84 -.extern FUN_02044C0C -.extern FUN_02044C88 -.extern FUN_02044CE0 -.extern FUN_02044D44 -.extern FUN_02044D8C -.extern FUN_02044E34 -.extern FUN_02044E78 -.extern FUN_02044ED8 -.extern FUN_02044F20 -.extern FUN_02044F58 -.extern FUN_02044FE8 -.extern FUN_0204505C -.extern FUN_02045104 -.extern FUN_02045170 -.extern FUN_020451D0 -.extern FUN_02045264 -.extern ScrCmd_Unk01F1 -.extern ScrCmd_Unk01F4 -.extern ScrCmd_Unk01F5 +.extern ScrCmd_GetPartySpecies +.extern ScrCmd_CheckPartyMonOTID +.extern ScrCmd_GiveEgg +.extern ScrCmd_SetPartyMonMove +.extern ScrCmd_PartyMonHasMove +.extern ScrCmd_FindPartyMonWithMove +.extern ScrCmd_SurvivePsn +.extern ScrCmd_CountPartyMonsAtOrBelowLevel +.extern ScrCmd_GetPartyMonLevel +.extern ScrCmd_GetPartyMonNature +.extern ScrCmd_FindPartyMonWithNature +.extern ScrCmd_GetPartyMonFriendship +.extern ScrCmd_Unk01BA +.extern ScrCmd_Unk01BB +.extern ScrCmd_Unk0281 +.extern ScrCmd_Unk0247 +.extern ScrCmd_Unk0248 +.extern ScrCmd_Unk0177 +.extern ScrCmd_Unk019A +.extern ScrCmd_Unk019B +.extern ScrCmd_Unk019C +.extern ScrCmd_Unk019D +.extern ScrCmd_Unk0119 +.extern ScrCmd_Unk011A +.extern ScrCmd_Unk01C8 +.extern ScrCmd_Unk01C9 +.extern ScrCmd_Unk01CA +.extern ScrCmd_Unk01EE +.extern ScrCmd_Unk01F0 +.extern ScrCmd_Unk01C0 +.extern ScrCmd_Unk022E +.extern ScrCmd_Unk022F +.extern ScrCmd_Unk0230 +.extern ScrCmd_Unk0231 +.extern ScrCmd_Unk02B7 +.extern ScrCmd_Unk00A0 +.extern ScrCmd_CountFossils +.extern ScrCmd_GetFossilPokemon +.extern ScrCmd_GetFossilMinimumAmount .extern ScrCmd_Unk01F2 .extern ScrCmd_Unk01F3 -.extern ScrCmd_Unk02A6 +.extern ScrCmd_GetPrizeItemIdAndCost .extern ScrCmd_HasSinnohDex .extern ScrCmd_GiveSinnohDex -.extern ScrCmd_Unk0159 -.extern ScrCmd_Unk015A +.extern ScrCmd_HasRunningShoes +.extern ScrCmd_GiveRunningShoes .extern ScrCmd_HasBadge .extern ScrCmd_GiveBadge -.extern ScrCmd_Unk015E +.extern ScrCmd_GiveBag .extern ScrCmd_GetTotalEarnedBadges -.extern ScrCmd_Unk015F +.extern ScrCmd_HasBag .extern ScrCmd_Unk0160 .extern ScrCmd_Unk0161 .extern ScrCmd_Unk0162 .extern ScrCmd_Unk0163 .extern ScrCmd_Unk0164 .extern ScrCmd_Unk0165 -.extern ScrCmd_Unk0166 -.extern ScrCmd_Unk0167 -.extern ScrCmd_Unk01CF -.extern ScrCmd_Unk01D0 -.extern ScrCmd_Unk01D1 +.extern ScrCmd_CheckGameCompleted +.extern ScrCmd_SetGameCompleted +.extern ScrCmd_GetSetStrength +.extern ScrCmd_GetSetFlash +.extern ScrCmd_GetSetDefog .extern ScrCmd_GiveItem .extern ScrCmd_TakeItem .extern ScrCmd_HasSpaceForItem @@ -3386,22 +3386,22 @@ .extern ScrCmd_GetItemPocketId .extern ScrCmd_Unk0081 .extern ScrCmd_Unk0082 -.extern ScrCmd_Unk0083 -.extern ScrCmd_Unk0084 -.extern ScrCmd_Unk0085 -.extern ScrCmd_Unk0086 -.extern ScrCmd_Unk0087 -.extern ScrCmd_Unk0088 -.extern ScrCmd_Unk0089 -.extern ScrCmd_Unk008A -.extern ScrCmd_Unk008B -.extern ScrCmd_Unk008C -.extern ScrCmd_Unk008D -.extern ScrCmd_Unk008E -.extern ScrCmd_Unk008F -.extern ScrCmd_Unk0090 -.extern ScrCmd_Unk0091 -.extern ScrCmd_Unk0092 +.extern ScrCmd_GiveSecretBaseDecoration +.extern ScrCmd_TakeSecretBaseDecoration +.extern ScrCmd_HasSpaceForDecoration +.extern ScrCmd_GetDecorationCount +.extern ScrCmd_GiveUndergroundTrap +.extern ScrCmd_TakeUndergroundTrap +.extern ScrCmd_HasSpaceForTrap +.extern ScrCmd_GetTrapCount +.extern ScrCmd_GiveTreasure +.extern ScrCmd_TakeTreasure +.extern ScrCmd_HasSpaceForTreasure +.extern ScrCmd_GetTreasureCount +.extern ScrCmd_GiveUndergroundSphere +.extern ScrCmd_TakeUndergroundSphere +.extern ScrCmd_HasSpaceForSphere +.extern ScrCmd_GetSphereCount .extern ScrCmd_Unk01C6 .extern ScrCmd_Unk01C7 .extern ScrCmd_Unk021E diff --git a/arm9/lib/include/NNS_g2d.h b/arm9/lib/include/NNS_g2d.h new file mode 100644 index 00000000..483f254a --- /dev/null +++ b/arm9/lib/include/NNS_g2d.h @@ -0,0 +1,212 @@ +#ifndef NNSYS_NNS_G2D_H
+#define NNSYS_NNS_G2D_H
+
+#include "gx.h"
+
+typedef struct NNSG2dCharacterData
+{
+ u16 H;
+ u16 W;
+ GXTexFmt pixelFmt;
+ GXOBJVRamModeChar mapingType;
+ u32 characterFmt;
+ u32 szByte;
+ void * pRawData;
+} NNSG2dCharacterData;
+
+typedef struct NNSG2dScreenData
+{
+ u16 screenWidth;
+ u16 screenHeight;
+ u16 colorMode;
+ u16 screenFormat;
+ u32 szByte;
+ u32 rawData[1];
+} NNSG2dScreenData;
+
+typedef struct NNSG2dPaletteData
+{
+ GXTexFmt fmt;
+ BOOL bExtendedPlt;
+ u32 szByte;
+ void * pRawData;
+
+} NNSG2dPaletteData;
+
+typedef enum NNS_G2D_VRAM_TYPE
+{
+ NNS_G2D_VRAM_TYPE_3DMAIN = 0,
+ NNS_G2D_VRAM_TYPE_2DMAIN = 1,
+ NNS_G2D_VRAM_TYPE_2DSUB = 2,
+ NNS_G2D_VRAM_TYPE_MAX = 3
+} NNS_G2D_VRAM_TYPE;
+
+typedef enum NNSG2dCharacterDataMapingType
+{
+ NNS_G2D_CHARACTERMAPING_1D_32,
+ NNS_G2D_CHARACTERMAPING_1D_64,
+ NNS_G2D_CHARACTERMAPING_1D_128,
+ NNS_G2D_CHARACTERMAPING_1D_256,
+ NNS_G2D_CHARACTERMAPING_2D,
+ NNS_G2D_CHARACTERMAPING_MAX
+
+} NNSG2dCharacterDataMapingType;
+
+typedef struct NNSG2dImageAttr
+{
+ GXTexSizeS sizeS;
+ GXTexSizeT sizeT;
+ GXTexFmt fmt;
+ BOOL bExtendedPlt;
+ GXTexPlttColor0 plttUse;
+ GXOBJVRamModeChar mappingType;
+} NNSG2dImageAttr;
+
+typedef struct NNSG2dVRamLocation
+{
+ u32 baseAddrOfVram[ NNS_G2D_VRAM_TYPE_MAX ];
+} NNSG2dVRamLocation;
+
+typedef struct NNSG2dImageProxy
+{
+ NNSG2dVRamLocation vramLocation;
+ NNSG2dImageAttr attr;
+} NNSG2dImageProxy;
+
+typedef struct NNSG2dPaletteCompressInfo
+{
+ u16 numPalette;
+ u16 pad16;
+ void * pPlttIdxTbl;
+
+} NNSG2dPaletteCompressInfo;
+
+void NNS_G2dLoadImage1DMapping
+(
+ const NNSG2dCharacterData * pSrcData,
+ u32 baseAddr,
+ NNS_G2D_VRAM_TYPE type,
+ NNSG2dImageProxy * pImgProxy
+);
+
+void NNS_G2dLoadImage2DMapping
+(
+ const NNSG2dCharacterData * pSrcData,
+ u32 baseAddr,
+ NNS_G2D_VRAM_TYPE type,
+ NNSG2dImageProxy * pImgProxy
+);
+
+typedef struct NNSG2dImagePaletteProxy
+{
+ GXTexFmt fmt;
+ BOOL bExtendedPlt;
+ NNSG2dVRamLocation vramLocation;
+} NNSG2dImagePaletteProxy;
+
+void NNS_G2dLoadPalette
+(
+ const NNSG2dPaletteData * pSrcData,
+ u32 addr,
+ NNS_G2D_VRAM_TYPE type,
+ NNSG2dImagePaletteProxy * pPltProxy
+);
+
+void NNS_G2dLoadPaletteEx
+(
+ const NNSG2dPaletteData * pSrcData,
+ const NNSG2dPaletteCompressInfo * pCmpInfo,
+ u32 addr,
+ NNS_G2D_VRAM_TYPE type,
+ NNSG2dImagePaletteProxy * pPltProxy
+);
+
+typedef struct NNSG2dCellVramTransferData
+{
+ u32 srcDataOffset;
+ u32 szByte;
+} NNSG2dCellVramTransferData;
+
+typedef struct NNSG2dVramTransferData
+{
+ u32 szByteMax;
+ NNSG2dCellVramTransferData * pCellTransferDataArray;
+} NNSG2dVramTransferData;
+
+typedef struct NNSG2dCellOAMAttrData
+{
+ u16 attr0;
+ u16 attr1;
+ u16 attr2;
+} NNSG2dCellOAMAttrData;
+
+typedef struct NNSG2dCellData
+{
+ u16 numOAMAttrs;
+ u16 cellAttr;
+ NNSG2dCellOAMAttrData * pOamAttrArray;
+
+} NNSG2dCellData;
+
+typedef struct NNSG2dCellDataBank
+{
+ u16 numCells;
+ u16 cellBankAttr;
+ NNSG2dCellData * pCellDataArrayHead;
+ NNSG2dCharacterDataMapingType mappingMode;
+ NNSG2dVramTransferData * pVramTransferData;
+ void * pStringBank;
+ void * pExtendedData;
+
+} NNSG2dCellDataBank;
+
+typedef enum NNSG2dAnimationPlayMode
+{
+ NNS_G2D_ANIMATIONPLAYMODE_INVALID = 0x0,
+ NNS_G2D_ANIMATIONPLAYMODE_FORWARD,
+ NNS_G2D_ANIMATIONPLAYMODE_FORWARD_LOOP,
+ NNS_G2D_ANIMATIONPLAYMODE_REVERSE,
+ NNS_G2D_ANIMATIONPLAYMODE_REVERSE_LOOP,
+ NNS_G2D_ANIMATIONPLAYMODE_MAX
+} NNSG2dAnimationPlayMode;
+
+typedef struct NNSG2dAnimFrameData
+{
+ void * pContent;
+ u16 frames;
+ u16 pad16;
+} NNSG2dAnimFrameData;
+
+typedef struct NNSG2dAnimSequenceData
+{
+ u16 numFrames;
+ u16 loopStartFrameIdx;
+ u32 animType;
+ NNSG2dAnimationPlayMode playMode;
+ NNSG2dAnimFrameData * pAnmFrameArray;
+
+} NNSG2dAnimSequenceData;
+
+typedef struct NNSG2dAnimBankData
+{
+
+ u16 numSequences;
+ u16 numTotalFrames;
+ NNSG2dAnimSequenceData * pSequenceArrayHead;
+ NNSG2dAnimFrameData * pFrameArrayHead;
+ void * pAnimContents;
+ void * pStringBank;
+ void * pExtendedData;
+
+} NNSG2dAnimBankData;
+
+BOOL NNS_G2dGetUnpackedBGCharacterData(void * pNcgrFile, NNSG2dCharacterData ** ppCharData);
+BOOL NNS_G2dGetUnpackedCharacterData(void * pNcgrFile, NNSG2dCharacterData ** ppCharData);
+BOOL NNS_G2dGetUnpackedScreenData(void * pNscrFile, NNSG2dScreenData ** ppScrData);
+BOOL NNS_G2dGetUnpackedPaletteData(void * pNclrFile, NNSG2dPaletteData ** ppPltData);
+BOOL NNS_G2dGetUnpackedPaletteData(void * pNclrFile, NNSG2dPaletteData ** ppPltData);
+BOOL NNS_G2dGetUnpackedPaletteCompressInfo(void * pNclrFile, NNSG2dPaletteCompressInfo ** ppPltCmpInfo);
+BOOL NNS_G2dGetUnpackedCellBank(void * pNcerFile, NNSG2dCellDataBank ** ppCellBank);
+BOOL NNS_G2dGetUnpackedAnimBank(void * pNanrFile, NNSG2dAnimBankData ** ppAnimBank);
+
+#endif //NNSYS_NNS_G2D_H
diff --git a/arm9/lib/include/gx.h b/arm9/lib/include/gx.h index 26f6cfaf..11081942 100644 --- a/arm9/lib/include/gx.h +++ b/arm9/lib/include/gx.h @@ -5,6 +5,7 @@ #include "MI_memory.h" #include "MI_dma.h" #include "OS_vramExclusive.h" +#include "registers.h" //temporary while other files aren't decompiled @@ -166,4 +167,18 @@ typedef enum } GXDispSelect; +typedef enum +{ + GX_OBJVRAMMODE_CHAR_2D = (0 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (0 << REG_GX_DISPCNT_EXOBJ_SHIFT), + GX_OBJVRAMMODE_CHAR_1D_32K = + (1 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (0 << REG_GX_DISPCNT_EXOBJ_SHIFT), + GX_OBJVRAMMODE_CHAR_1D_64K = + (1 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (1 << REG_GX_DISPCNT_EXOBJ_SHIFT), + GX_OBJVRAMMODE_CHAR_1D_128K = + (1 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (2 << REG_GX_DISPCNT_EXOBJ_SHIFT), + GX_OBJVRAMMODE_CHAR_1D_256K = + (1 << REG_GX_DISPCNT_OBJMAP_SHIFT) | (3 << REG_GX_DISPCNT_EXOBJ_SHIFT) +} + GXOBJVRamModeChar; + #endif //GUARD_GX_H diff --git a/arm9/lib/include/registers.h b/arm9/lib/include/registers.h index d55347d5..7a0155da 100644 --- a/arm9/lib/include/registers.h +++ b/arm9/lib/include/registers.h @@ -517,4 +517,146 @@ #define REG_GX_POWCNT_DSEL_SIZE 1 #define REG_GX_POWCNT_DSEL_MASK 0x8000 +// GX_DISPCNT +#define REG_GX_DISPCNT_O_SHIFT 31 +#define REG_GX_DISPCNT_O_SIZE 1 +#define REG_GX_DISPCNT_O_MASK 0x80000000 + +#define REG_GX_DISPCNT_BG_SHIFT 30 +#define REG_GX_DISPCNT_BG_SIZE 1 +#define REG_GX_DISPCNT_BG_MASK 0x40000000 + +#define REG_GX_DISPCNT_BGSCREENOFFSET_SHIFT 27 +#define REG_GX_DISPCNT_BGSCREENOFFSET_SIZE 3 +#define REG_GX_DISPCNT_BGSCREENOFFSET_MASK 0x38000000 + +#define REG_GX_DISPCNT_BGCHAROFFSET_SHIFT 24 +#define REG_GX_DISPCNT_BGCHAROFFSET_SIZE 3 +#define REG_GX_DISPCNT_BGCHAROFFSET_MASK 0x07000000 + +#define REG_GX_DISPCNT_OH_SHIFT 23 +#define REG_GX_DISPCNT_OH_SIZE 1 +#define REG_GX_DISPCNT_OH_MASK 0x00800000 + +#define REG_GX_DISPCNT_EXOBJ_SHIFT 20 +#define REG_GX_DISPCNT_EXOBJ_SIZE 3 +#define REG_GX_DISPCNT_EXOBJ_MASK 0x00700000 + +#define REG_GX_DISPCNT_VRAM_SHIFT 18 +#define REG_GX_DISPCNT_VRAM_SIZE 2 +#define REG_GX_DISPCNT_VRAM_MASK 0x000c0000 + +#define REG_GX_DISPCNT_MODE_SHIFT 16 +#define REG_GX_DISPCNT_MODE_SIZE 2 +#define REG_GX_DISPCNT_MODE_MASK 0x00030000 + +#define REG_GX_DISPCNT_OW_SHIFT 15 +#define REG_GX_DISPCNT_OW_SIZE 1 +#define REG_GX_DISPCNT_OW_MASK 0x00008000 + +#define REG_GX_DISPCNT_W1_SHIFT 14 +#define REG_GX_DISPCNT_W1_SIZE 1 +#define REG_GX_DISPCNT_W1_MASK 0x00004000 + +#define REG_GX_DISPCNT_W0_SHIFT 13 +#define REG_GX_DISPCNT_W0_SIZE 1 +#define REG_GX_DISPCNT_W0_MASK 0x00002000 + +#define REG_GX_DISPCNT_DISPLAY_SHIFT 8 +#define REG_GX_DISPCNT_DISPLAY_SIZE 5 +#define REG_GX_DISPCNT_DISPLAY_MASK 0x00001f00 + +#define REG_GX_DISPCNT_BLANK_SHIFT 7 +#define REG_GX_DISPCNT_BLANK_SIZE 1 +#define REG_GX_DISPCNT_BLANK_MASK 0x00000080 + +#define REG_GX_DISPCNT_OBJMAP_SHIFT 4 +#define REG_GX_DISPCNT_OBJMAP_SIZE 3 +#define REG_GX_DISPCNT_OBJMAP_MASK 0x00000070 + +#define REG_GX_DISPCNT_BG02D3D_SHIFT 3 +#define REG_GX_DISPCNT_BG02D3D_SIZE 1 +#define REG_GX_DISPCNT_BG02D3D_MASK 0x00000008 + +#define REG_GX_DISPCNT_BGMODE_SHIFT 0 +#define REG_GX_DISPCNT_BGMODE_SIZE 3 +#define REG_GX_DISPCNT_BGMODE_MASK 0x00000007 + +#define REG_GX_DISPCNT_OBJMAP_CH_SHIFT 4 +#define REG_GX_DISPCNT_OBJMAP_CH_SIZE 1 +#define REG_GX_DISPCNT_OBJMAP_CH_MASK 0x00000010 + +#define REG_GX_DISPCNT_OBJMAP_BM_SHIFT 5 +#define REG_GX_DISPCNT_OBJMAP_BM_SIZE 2 +#define REG_GX_DISPCNT_OBJMAP_BM_MASK 0x00000060 + +#define REG_GX_DISPCNT_EXOBJ_CH_SHIFT 20 +#define REG_GX_DISPCNT_EXOBJ_CH_SIZE 2 +#define REG_GX_DISPCNT_EXOBJ_CH_MASK 0x00300000 + +#define REG_GX_DISPCNT_EXOBJ_BM_SHIFT 22 +#define REG_GX_DISPCNT_EXOBJ_BM_SIZE 1 +#define REG_GX_DISPCNT_EXOBJ_BM_MASK 0x00400000 + +// GXS_DB_DISPCNT +#define REG_GXS_DB_DISPCNT_O_SHIFT 31 +#define REG_GXS_DB_DISPCNT_O_SIZE 1 +#define REG_GXS_DB_DISPCNT_O_MASK 0x80000000 + +#define REG_GXS_DB_DISPCNT_BG_SHIFT 30 +#define REG_GXS_DB_DISPCNT_BG_SIZE 1 +#define REG_GXS_DB_DISPCNT_BG_MASK 0x40000000 + +#define REG_GXS_DB_DISPCNT_OH_SHIFT 23 +#define REG_GXS_DB_DISPCNT_OH_SIZE 1 +#define REG_GXS_DB_DISPCNT_OH_MASK 0x00800000 + +#define REG_GXS_DB_DISPCNT_EXOBJ_SHIFT 20 +#define REG_GXS_DB_DISPCNT_EXOBJ_SIZE 2 +#define REG_GXS_DB_DISPCNT_EXOBJ_MASK 0x00300000 + +#define REG_GXS_DB_DISPCNT_MODE_SHIFT 16 +#define REG_GXS_DB_DISPCNT_MODE_SIZE 1 +#define REG_GXS_DB_DISPCNT_MODE_MASK 0x00010000 + +#define REG_GXS_DB_DISPCNT_OW_SHIFT 15 +#define REG_GXS_DB_DISPCNT_OW_SIZE 1 +#define REG_GXS_DB_DISPCNT_OW_MASK 0x00008000 + +#define REG_GXS_DB_DISPCNT_W1_SHIFT 14 +#define REG_GXS_DB_DISPCNT_W1_SIZE 1 +#define REG_GXS_DB_DISPCNT_W1_MASK 0x00004000 + +#define REG_GXS_DB_DISPCNT_W0_SHIFT 13 +#define REG_GXS_DB_DISPCNT_W0_SIZE 1 +#define REG_GXS_DB_DISPCNT_W0_MASK 0x00002000 + +#define REG_GXS_DB_DISPCNT_DISPLAY_SHIFT 8 +#define REG_GXS_DB_DISPCNT_DISPLAY_SIZE 5 +#define REG_GXS_DB_DISPCNT_DISPLAY_MASK 0x00001f00 + +#define REG_GXS_DB_DISPCNT_BLANK_SHIFT 7 +#define REG_GXS_DB_DISPCNT_BLANK_SIZE 1 +#define REG_GXS_DB_DISPCNT_BLANK_MASK 0x00000080 + +#define REG_GXS_DB_DISPCNT_OBJMAP_SHIFT 4 +#define REG_GXS_DB_DISPCNT_OBJMAP_SIZE 3 +#define REG_GXS_DB_DISPCNT_OBJMAP_MASK 0x00000070 + +#define REG_GXS_DB_DISPCNT_BGMODE_SHIFT 0 +#define REG_GXS_DB_DISPCNT_BGMODE_SIZE 3 +#define REG_GXS_DB_DISPCNT_BGMODE_MASK 0x00000007 + +#define REG_GXS_DB_DISPCNT_OBJMAP_CH_SHIFT 4 +#define REG_GXS_DB_DISPCNT_OBJMAP_CH_SIZE 1 +#define REG_GXS_DB_DISPCNT_OBJMAP_CH_MASK 0x00000010 + +#define REG_GXS_DB_DISPCNT_OBJMAP_BM_SHIFT 5 +#define REG_GXS_DB_DISPCNT_OBJMAP_BM_SIZE 2 +#define REG_GXS_DB_DISPCNT_OBJMAP_BM_MASK 0x00000060 + +#define REG_GXS_DB_DISPCNT_EXOBJ_CH_SHIFT 20 +#define REG_GXS_DB_DISPCNT_EXOBJ_CH_SIZE 2 +#define REG_GXS_DB_DISPCNT_EXOBJ_CH_MASK 0x00300000 + #endif //POKEDIAMOND_ARM9_REGISTERS_H diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index 8d4f91fa..7b1e767f 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -520,7 +520,7 @@ MOD05_021DC480: ; 0x021DC480 add r1, r5, #0 mov r2, #0 mov r3, #4 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r5, r0, #0 add r1, r4, #0 mov r2, #4 diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s index 73ee60ca..42f9037e 100644 --- a/arm9/modules/05/asm/mod05_021E3444.s +++ b/arm9/modules/05/asm/mod05_021E3444.s @@ -1170,7 +1170,7 @@ MOD05_021E3D20: ; 0x021E3D20 str r0, [sp, #4] mov r0, #0x70 add r2, r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1181,7 +1181,7 @@ MOD05_021E3D20: ; 0x021E3D20 add r1, r6, #0 add r2, r4, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1192,7 +1192,7 @@ MOD05_021E3D20: ; 0x021E3D20 add r1, r5, #0 add r2, r4, #0 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r4, r5, r6, pc} @@ -1464,7 +1464,7 @@ MOD05_021E3F68: ; 0x021E3F68 ldrh r1, [r1, #8] add r2, sp, #4 add r3, r4, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 add r0, sp, #0x20 ldrh r0, [r0, #0x10] @@ -1549,7 +1549,7 @@ MOD05_021E4014: ; 0x021E4014 ldrh r1, [r1, #0xa] mov r2, #0 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #4] ldr r0, [sp, #0xc] ldr r0, [r0, #0x14] diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 4662c7cc..006e8bb1 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -26118,7 +26118,7 @@ MOD05_021F5268: ; 0x021F5268 add r1, r2, #0 str r5, [sp] add r2, r5, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4] bl NNS_G3dGetMdlSet str r0, [r4, #4] @@ -26211,7 +26211,7 @@ MOD05_021F531C: ; 0x021F531C ldr r3, [sp, #0x18] add r2, r6, #0 str r6, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r2, r0, #0 ldr r3, [sp, #0x1c] add r0, r5, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 62890044..3b86cb19 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -8879,7 +8879,7 @@ MOD06_0223D9E8: ; 0x0223D9E8 ldr r2, [r4] mov r0, #0x3e mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, _0223DA88 ; =0x00000241 ldrb r0, [r4, r0] cmp r0, #0 @@ -8894,7 +8894,7 @@ MOD06_0223D9E8: ; 0x0223D9E8 mov r0, #0x3e mov r1, #2 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData b _0223DA3E _0223DA26: mov r0, #0 @@ -8907,7 +8907,7 @@ _0223DA26: mov r0, #0x3e mov r1, #3 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _0223DA3E: mov r0, #0x20 str r0, [sp] @@ -8917,7 +8917,7 @@ _0223DA3E: mov r0, #0x3e mov r1, #1 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r3, #0xb @@ -30992,7 +30992,7 @@ _0224886C: mov r0, #0x73 add r1, r6, #0 add r3, r5, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4] str r5, [r4, #0x10] str r6, [r4, #0xc] @@ -38774,7 +38774,7 @@ _0224C476: mov r2, #0 bl MOD05_021DA4EC ldr r0, _0224C51C ; =0x0000048E - bl PlayBGM + bl PlaySound ldrb r0, [r4, #0xf] add r0, r0, #1 strb r0, [r4, #0xf] @@ -44316,7 +44316,7 @@ _0224EFCC: add r1, r4, #4 mov r2, #0 mov r3, #4 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r6, r7] add r4, r4, #1 add r6, r6, #4 diff --git a/arm9/modules/06/include/module_06.h b/arm9/modules/06/include/module_06.h new file mode 100644 index 00000000..d9915f00 --- /dev/null +++ b/arm9/modules/06/include/module_06.h @@ -0,0 +1,14 @@ +#ifndef POKEDIAMOND_MODULE_06_H
+#define POKEDIAMOND_MODULE_06_H
+
+enum MartType
+{
+ MART_ITEMS = 0,
+ MART_GOODS,
+ MART_SEALS,
+ MART_DECORATIONS = MART_GOODS,
+};
+
+void MOD06_0223D3D0(struct UnkStruct_0204639C *, struct UnkSavStruct80 *, const u16 *, enum MartType, u32);
+
+#endif //POKEDIAMOND_MODULE_06_H
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 215c03c6..80472fdf 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -2010,7 +2010,7 @@ MOD07_02212E90: ; 0x02212E90 str r0, [sp, #0xc] ldr r2, [r4, #0xc] mov r0, #0x6c - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2022,7 +2022,7 @@ MOD07_02212E90: ; 0x02212E90 str r0, [sp, #0xc] ldr r2, [r4, #0xc] mov r0, #0x6c - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2034,7 +2034,7 @@ MOD07_02212E90: ; 0x02212E90 str r0, [sp, #0xc] ldr r2, [r4, #0xc] mov r0, #0x6c - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2046,7 +2046,7 @@ MOD07_02212E90: ; 0x02212E90 str r0, [sp, #0xc] ldr r2, [r4, #0xc] mov r0, #0x6c - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] ldr r0, [r4] @@ -2055,7 +2055,7 @@ MOD07_02212E90: ; 0x02212E90 add r3, r2, #0 str r0, [sp, #4] mov r0, #0x6c - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 ldr r0, [r4, #8] add r2, r1, #0 @@ -3299,7 +3299,7 @@ MOD07_02213924: ; 0x02213924 str r0, [sp, #0xc] ldr r2, [r5, #0xc] mov r0, #0x14 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3311,7 +3311,7 @@ MOD07_02213924: ; 0x02213924 str r0, [sp, #0xc] ldr r2, [r5, #0xc] mov r0, #0x14 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r2, [r5] mov r0, #0x14 ldr r2, [r2, #0x24] diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index 3c0363b4..a02c3f48 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -3198,7 +3198,7 @@ _02213500: mov r0, #7 add r1, r7, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData cmp r4, #1 bne _022135AC ldr r0, [r5] @@ -4144,7 +4144,7 @@ MOD08_02213C94: ; 0x02213C94 ldr r2, [r2] mov r0, #7 add r3, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [sp, #0x10] mov r1, #1 bl MOD08_022156AC @@ -4198,7 +4198,7 @@ _02213D18: ldr r2, [r5] mov r0, #7 add r3, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -4640,7 +4640,7 @@ _02214078: add r2, #0xc4 ldr r2, [r2] mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0x66 lsl r2, r2, #2 add r1, r2, #0 @@ -4681,7 +4681,7 @@ _022140CC: add r2, #0xc4 ldr r2, [r2] mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldrb r0, [r4, #5] add r0, r0, #1 strb r0, [r4, #5] @@ -5016,7 +5016,7 @@ _0221436A: add r2, #0xc4 ldr r2, [r2] mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0x66 lsl r2, r2, #2 add r1, r2, #0 @@ -5057,7 +5057,7 @@ _022143BE: add r2, #0xc4 ldr r2, [r2] mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #3 mov r1, #1 bl FUN_0201797C @@ -5608,7 +5608,7 @@ _022147E4: ldr r1, [r5, r1] ldr r2, [r2] add r3, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData b _0221482A _02214822: add r0, r5, #0 @@ -5630,7 +5630,7 @@ _0221482A: add r5, #0xc4 ldr r2, [r5] add r3, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} @@ -5932,7 +5932,7 @@ MOD08_02214A4C: ; 0x02214A4C ldr r2, [r2] mov r0, #7 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 mov r1, #1 bl MOD08_022156AC @@ -5943,7 +5943,7 @@ MOD08_02214A4C: ; 0x02214A4C add r3, r2, #0 str r0, [sp, #4] mov r0, #7 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 mov r1, #2 bl MOD08_022156AC @@ -5959,7 +5959,7 @@ MOD08_02214A4C: ; 0x02214A4C ldr r2, [r5] mov r0, #7 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -15585,7 +15585,7 @@ _02219228: mov r0, #7 add r1, r6, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r7, #0 mov r1, #1 bl MOD08_022156AC @@ -15639,7 +15639,7 @@ _022192BC: mov r0, #7 add r1, r6, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0xa ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] @@ -15989,7 +15989,7 @@ _02219550: mov r0, #7 add r1, r6, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r7, #0 mov r1, #1 bl MOD08_022156AC @@ -16043,7 +16043,7 @@ _022195EA: mov r0, #7 add r1, r6, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0xa ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] @@ -42742,7 +42742,7 @@ MOD08_02227068: ; 0x02227068 add r3, r4, #0 ldr r1, [r1, r2] ldr r2, [r5, #0x2c] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -42774,7 +42774,7 @@ MOD08_02227068: ; 0x02227068 add r3, r4, #0 ldr r1, [r1, r2] ldr r2, [r5, #0x2c] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r4, r5, r6, pc} nop diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index a3085247..003e2dc8 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2177,7 +2177,7 @@ MOD09_02212F8C: ; 0x02212F8C mov r0, #0x48 mov r1, #0x16 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r2, [r5] mov r0, #0x48 ldr r2, [r2, #0xc] @@ -2279,7 +2279,7 @@ MOD09_02212F8C: ; 0x02212F8C ldr r2, [r5, r2] mov r0, #0x26 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 bl FUN_0200CD64 add r2, r0, #0 @@ -13991,7 +13991,7 @@ MOD09_022191C0: ; 0x022191C0 str r0, [sp, #0xc] ldr r2, [r5, #4] mov r0, #0x4d - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -14002,7 +14002,7 @@ MOD09_022191C0: ; 0x022191C0 str r0, [sp, #0xc] ldr r2, [r5, #4] mov r0, #0x4d - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r2, [r5] mov r0, #0x4d ldr r2, [r2, #0xc] @@ -14059,7 +14059,7 @@ MOD09_022191C0: ; 0x022191C0 str r0, [sp, #0xc] ldr r2, [r5, #4] mov r0, #0x26 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 bl FUN_0200CD64 add r2, r0, #0 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 9fedcb0a..2a6bb196 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -527,7 +527,7 @@ _0222D99A: mov r0, #7 add r1, r1, #3 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r5, #0 bl MOD11_02230C68 add r2, r0, #0 @@ -581,7 +581,7 @@ _0222D99A: mov r0, #7 mov r1, #2 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 lsl r0, r0, #0x1a ldr r2, [r0] @@ -1547,7 +1547,7 @@ _0222E2F0: add r1, r1, #3 add r2, r4, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r5, #0 bl MOD11_02230C68 add r6, r0, #0 @@ -1601,7 +1601,7 @@ _0222E2F0: mov r1, #2 add r2, r4, #0 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 lsl r0, r0, #0x1a ldr r2, [r0] diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index b22a9a77..451daa87 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -6258,7 +6258,7 @@ _02232234: b _02232252 _0223223C: ldr r0, _02232258 ; =0x00000484 - bl PlayBGM + bl PlaySound b _02232252 _02232244: ldr r0, _0223225C ; =0x000005E6 @@ -6266,7 +6266,7 @@ _02232244: b _02232252 _0223224C: ldr r0, _02232260 ; =0x00000483 - bl PlayBGM + bl PlaySound _02232252: add r0, r4, #0 pop {r4, pc} @@ -84494,7 +84494,7 @@ _02258512: mov r0, #7 mov r2, #1 add r3, sp, #0x18 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r5, r0, #0 lsl r0, r4, #2 add r0, r6, r0 @@ -84597,7 +84597,7 @@ _022585DE: mov r1, #0xca add r2, sp, #0x14 mov r3, #5 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp, #0x14] ldr r1, [r6, #0x60] @@ -84696,7 +84696,7 @@ MOD11_022586BC: ; 0x022586BC mov r1, #0x11 add r2, r5, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r2, _02258790 ; =0x00004E2D add r0, r6, #0 add r1, r4, #0 @@ -88713,7 +88713,7 @@ _0225A7CE: ldr r0, [sp, #0x40] mov r2, #1 add r3, sp, #0x4c - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x44] ldr r0, [sp, #0x4c] ldr r1, [sp, #0x1c] diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 1448f650..effb333a 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -1054,7 +1054,7 @@ MOD12_0222DF30: ; 0x0222DF30 mov r0, #0x2d mov r1, #3 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1066,7 +1066,7 @@ MOD12_0222DF30: ; 0x0222DF30 mov r0, #0x2d mov r1, #5 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 add r1, r0, #0 bl FUN_020178BC @@ -1117,7 +1117,7 @@ MOD12_0222DFC4: ; 0x0222DFC4 ldr r2, [r5, #0x30] mov r0, #0x2d mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1129,7 +1129,7 @@ MOD12_0222DFC4: ; 0x0222DFC4 mov r0, #0x2d mov r1, #2 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1140,7 +1140,7 @@ MOD12_0222DFC4: ; 0x0222DFC4 ldr r2, [r5, #0x30] mov r0, #0x2d mov r1, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1151,7 +1151,7 @@ MOD12_0222DFC4: ; 0x0222DFC4 ldr r2, [r5, #0x30] mov r0, #0x2d mov r1, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 add r0, r5, #0 add r2, r1, #0 @@ -4185,7 +4185,7 @@ MOD12_0222F834: ; 0x0222F834 ldr r2, [r5, #0x30] mov r0, #0x2d mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4197,7 +4197,7 @@ MOD12_0222F834: ; 0x0222F834 mov r0, #0x2d mov r1, #0x15 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x30] mov r1, #1 bl FUN_02018744 @@ -4260,7 +4260,7 @@ MOD12_0222F834: ; 0x0222F834 mov r0, #0x2d mov r1, #0x17 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4272,7 +4272,7 @@ MOD12_0222F834: ; 0x0222F834 mov r0, #0x2d mov r1, #0x14 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -4310,7 +4310,7 @@ MOD12_0222F938: ; 0x0222F938 mov r0, #0x2d mov r1, #0x12 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4322,7 +4322,7 @@ MOD12_0222F938: ; 0x0222F938 mov r0, #0x2d mov r1, #0x13 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 str r0, [sp] mov r0, #0 @@ -6184,7 +6184,7 @@ MOD12_022308F0: ; 0x022308F0 mov r0, #0x2d mov r1, #0xd mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6196,7 +6196,7 @@ MOD12_022308F0: ; 0x022308F0 mov r0, #0x2d mov r1, #0xe mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8440,7 +8440,7 @@ _02231A4C: mov r0, #0x2d mov r2, #1 add r3, sp, #0xc - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r6, r0, #0 lsl r0, r5, #2 add r0, r4, r0 @@ -8679,7 +8679,7 @@ _02231C40: mov r0, #0x2d mov r2, #1 add r3, r7, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0xb6 lsl r1, r1, #2 str r0, [r7, r1] @@ -15831,7 +15831,7 @@ _02235382: mov r0, #0x2d ldr r2, [r2, #0x30] mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldrb r0, [r4, #8] add sp, #0x10 add r0, r0, #1 @@ -25820,7 +25820,7 @@ _02239C90: ldr r2, [r6, #0x30] mov r0, #0x2d mov r1, #0x14 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, _02239D84 ; =MOD12_02239D8C ldr r2, _02239D88 ; =0x00007530 add r1, r4, #0 @@ -28948,7 +28948,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #9 mov r2, #1 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r5, r0, #0 ldr r0, [sp, #0xc] add r1, r4, #0 @@ -28966,7 +28966,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #0x11 mov r2, #1 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r5, r0, #0 ldr r0, [sp, #0xc] add r1, r4, #0 @@ -28984,7 +28984,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #0xf mov r2, #1 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r5, r0, #0 ldr r0, [sp, #0xc] add r1, r4, #0 @@ -29002,7 +29002,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #7 mov r2, #1 add r3, sp, #8 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r1, r4, #0 add r5, r0, #0 ldr r0, [sp, #8] @@ -29020,7 +29020,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #8 mov r2, #1 add r3, sp, #8 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r1, r4, #0 add r5, r0, #0 ldr r0, [sp, #8] @@ -29038,7 +29038,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #0x10 mov r2, #1 add r3, sp, #8 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r1, r4, #0 add r5, r0, #0 ldr r0, [sp, #8] @@ -29056,7 +29056,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #0x1b mov r2, #1 add r3, sp, #8 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r1, r4, #0 add r5, r0, #0 ldr r0, [sp, #8] @@ -42170,7 +42170,7 @@ MOD12_02241BA0: ; 0x02241BA0 mov r0, #0x2d mov r1, #0x12 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -42182,7 +42182,7 @@ MOD12_02241BA0: ; 0x02241BA0 mov r0, #0x2d mov r1, #0x13 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 str r0, [sp] mov r0, #0 @@ -43630,7 +43630,7 @@ MOD12_022426BC: ; 0x022426BC mov r0, #0x2d mov r1, #0x16 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -43642,7 +43642,7 @@ MOD12_022426BC: ; 0x022426BC mov r0, #0x2d mov r1, #0x15 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x30] mov r1, #1 bl FUN_02018744 @@ -43789,7 +43789,7 @@ MOD12_02242804: ; 0x02242804 mov r0, #0x2d mov r1, #0x1a mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -43800,7 +43800,7 @@ MOD12_02242804: ; 0x02242804 ldr r2, [r6, #0x30] mov r0, #0x2d mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -43812,7 +43812,7 @@ MOD12_02242804: ; 0x02242804 mov r0, #0x2d mov r1, #0x19 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r6, #0x30] mov r1, #1 bl FUN_02018744 @@ -47817,7 +47817,7 @@ MOD12_0224473C: ; 0x0224473C mov r0, #0x5a add r1, r1, #3 str r2, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc pop {r3, pc} .align 2, 0 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index af35772e..bdfed5b1 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -10558,7 +10558,7 @@ _021DC79C: mov r1, #0x1a add r2, r5, #0 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #0 mov r1, #0xa bl FUN_02002C84 @@ -12965,7 +12965,7 @@ MOD14_021DDB50: ; 0x021DDB50 ldr r2, [r5, r2] mov r0, #0x12 mov r1, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -12996,7 +12996,7 @@ MOD14_021DDB50: ; 0x021DDB50 ldr r2, [r5, r2] mov r0, #0x12 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0xe0 str r0, [sp] mov r0, #0xa @@ -13005,7 +13005,7 @@ MOD14_021DDB50: ; 0x021DDB50 mov r0, #0x12 mov r1, #5 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 bl MOD14_021DC3C4 cmp r0, #4 @@ -13022,7 +13022,7 @@ MOD14_021DDB50: ; 0x021DDB50 ldr r2, [r5, r2] mov r0, #0x12 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _021DDBF2: mov r0, #0x43 lsl r0, r0, #4 @@ -13736,7 +13736,7 @@ MOD14_021DE138: ; 0x021DE138 ldrb r1, [r1, r2] add r2, sp, #8 mov r3, #0xa - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [sp, #4] cmp r0, #0 beq _021DE1C0 @@ -13810,7 +13810,7 @@ MOD14_021DE1D0: ; 0x021DE1D0 ldr r1, _021DE26C ; =MOD14_021E65AD ldrb r1, [r1, r3] mov r3, #0xa - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0x10] cmp r0, #0 beq _021DE268 @@ -13890,7 +13890,7 @@ MOD14_021DE278: ; 0x021DE278 ldr r1, _021DE2E0 ; =MOD14_021E65AC ldrb r1, [r1, r3] mov r3, #0xa - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #4] cmp r0, #0 beq _021DE2DC @@ -15753,7 +15753,7 @@ MOD14_021DF07C: ; 0x021DF07C mov r0, #0x12 mov r1, #0xd add r3, #0x1c - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x14] mov r0, #0xa add r3, r5, #0 @@ -15762,7 +15762,7 @@ MOD14_021DF07C: ; 0x021DF07C mov r1, #0xe mov r2, #1 add r3, #0x20 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5, #0x18] ldr r0, [r5, #0x14] cmp r0, #0 @@ -15806,7 +15806,7 @@ MOD14_021DF144: ; 0x021DF144 str r0, [sp, #0x10] mov r0, #0x12 mov r1, #0xc - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping ldr r0, _021DF310 ; =0x00000785 ldrb r0, [r4, r0] cmp r0, #1 @@ -18645,13 +18645,13 @@ MOD14_021E078C: ; 0x021E078C mov r0, #0x13 mov r2, #1 mov r3, #0x40 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette bl FUN_0206B888 add r1, r0, #0 mov r0, #0x13 add r2, sp, #0x14 mov r3, #0xa - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [sp, #0xc] cmp r0, #0 beq _021E0818 @@ -18697,7 +18697,7 @@ _021E0818: mov r1, #0x15 mov r2, #1 add r3, #0x10 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #8] mov r0, #0xa str r0, [sp] @@ -18705,7 +18705,7 @@ _021E0818: mov r1, #0x16 mov r2, #1 add r3, r5, #4 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5] mov r0, #0xa add r3, r5, #0 @@ -18714,7 +18714,7 @@ _021E0818: mov r1, #0x17 mov r2, #1 add r3, #0x1c - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x14] mov r0, #0xa add r3, r5, #0 @@ -18723,7 +18723,7 @@ _021E0818: mov r1, #0x18 mov r2, #1 add r3, #0x20 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5, #0x18] mov r0, #0x13 mov r1, #0xa @@ -19277,7 +19277,7 @@ MOD14_021E0C7C: ; 0x021E0C7C mov r0, #0x12 mov r2, #1 add r3, #0x10 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r4, #8] mov r0, #0xa add r3, r4, #0 @@ -19286,7 +19286,7 @@ MOD14_021E0C7C: ; 0x021E0C7C mov r1, #0xb mov r2, #1 add r3, #0x14 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r4, #0xc] ldr r0, [r4, #8] cmp r0, #0 @@ -19324,7 +19324,7 @@ MOD14_021E0CCC: ; 0x021E0CCC str r0, [sp, #0x10] mov r0, #0x12 mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping ldr r0, [r4, #0x44] bl MOD14_021DDD48 add r2, r0, #0 @@ -19450,7 +19450,7 @@ _021E0DAC: mov r1, #0x10 mov r2, #1 add r3, #0x2c - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x28] mov r0, #0 str r0, [r5, #0x30] @@ -19472,7 +19472,7 @@ _021E0DAC: add r0, r4, #0 mov r2, #1 add r3, #0x38 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank mov r1, #0 str r0, [r5, #0x34] add r2, r5, #0 @@ -19696,7 +19696,7 @@ MOD14_021E0FA8: ; 0x021E0FA8 ldr r0, [sp, #0x1c] mov r2, #1 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 mov r6, #0x5e str r0, [sp, #0x14] @@ -19720,7 +19720,7 @@ _021E0FE0: ldr r1, [sp, #0x18] mov r2, #1 mov r3, #0 - bl FUN_02006B38 + bl GfGfxLoader_SetObjCntFlagsAndLoadImageMapping ldr r0, [r5, #0x14] bl MOD14_021DDD48 add r2, r0, #0 @@ -19772,7 +19772,7 @@ _021E103E: str r0, [sp, #0x10] mov r0, #0x12 mov r1, #0xf - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping ldr r0, [r5, #0x14] bl MOD14_021DDD48 add r2, r0, #0 @@ -20131,7 +20131,7 @@ _021E12EC: str r0, [sp, #8] add r0, r6, #0 lsl r3, r3, #0xa - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette ldr r0, [r4, #0x3c] bl FUN_0202011C add r6, r0, #0 @@ -20180,7 +20180,7 @@ _021E12EC: str r0, [sp, #8] add r0, r6, #0 lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #9 ldr r1, [sp, #0x10] lsl r0, r0, #0xe @@ -20679,7 +20679,7 @@ MOD14_021E1750: ; 0x021E1750 mov r1, #0x19 mov r2, #1 add r3, #0x28 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [r4, #0x24] cmp r0, #0 beq _021E17B6 @@ -20781,7 +20781,7 @@ _021E1848: ldr r2, [r6] mov r0, #0x26 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] mov r0, #0xa @@ -20790,7 +20790,7 @@ _021E1848: mov r1, #0x18 mov r2, #0 mov r3, #0xe0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r6, #0x20] ldr r2, _021E1898 ; =0x00000209 lsl r0, r0, #0x18 @@ -21443,12 +21443,12 @@ MOD14_021E1D38: ; 0x021E1D38 mov r0, #0x12 mov r1, #4 add r3, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x12 mov r1, #0x1b add r2, sp, #0x14 mov r3, #0xa - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp, #0x14] add r1, r5, #0 @@ -21462,7 +21462,7 @@ MOD14_021E1D38: ; 0x021E1D38 mov r1, #0x14 add r2, sp, #0x14 mov r3, #0xa - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp, #0x14] mov r1, #0x49 @@ -21522,7 +21522,7 @@ _021E1DBC: mov r1, #0x11 mov r2, #1 add r3, #0x18 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [r5, #0x14] mov r0, #0xa str r0, [sp] @@ -21531,7 +21531,7 @@ _021E1DBC: add r1, r0, #0 mov r2, #1 add r3, #0x20 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x1c] mov r0, #0xa add r3, r5, #0 @@ -21540,7 +21540,7 @@ _021E1DBC: mov r1, #2 mov r2, #1 add r3, #0x38 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x34] mov r0, #0xa add r3, r5, #0 @@ -21549,7 +21549,7 @@ _021E1DBC: mov r1, #3 mov r2, #1 add r3, #0x30 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x2c] mov r0, #2 mov r1, #0xd @@ -22998,7 +22998,7 @@ MOD14_021E2940: ; 0x021E2940 mov r0, #0x10 mov r2, #0 add r3, sp, #8 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r6, r0, #0 mov r0, #1 lsl r0, r0, #0x1a @@ -23025,7 +23025,7 @@ MOD14_021E2940: ; 0x021E2940 mov r0, #0x10 mov r2, #1 mov r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #1 @@ -23141,7 +23141,7 @@ _021E2A74: mov r1, #6 mov r2, #1 add r3, #0x18 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x14] cmp r0, #0 beq _021E2AB6 @@ -24602,7 +24602,7 @@ MOD14_021E355C: ; 0x021E355C mov r0, #0x12 mov r1, #0x67 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -24614,7 +24614,7 @@ MOD14_021E355C: ; 0x021E355C mov r0, #0x12 mov r1, #0x64 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -24626,7 +24626,7 @@ MOD14_021E355C: ; 0x021E355C mov r0, #0x12 mov r1, #0x65 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -24638,7 +24638,7 @@ MOD14_021E355C: ; 0x021E355C mov r0, #0x12 mov r1, #0x66 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] ldr r0, [r4, #8] @@ -24698,7 +24698,7 @@ MOD14_021E355C: ; 0x021E355C mov r1, #0x68 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 bl MOD14_021E3664 _021E365C: @@ -24727,7 +24727,7 @@ MOD14_021E3664: ; 0x021E3664 mov r0, #0x12 mov r1, #0x72 mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping add r0, r4, #0 add r0, #0xa4 ldr r0, [r0] @@ -24790,7 +24790,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r1, #0x73 mov r2, #1 add r3, #0x9c - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank add r1, r4, #0 add r1, #0x98 str r0, [r1] @@ -24801,7 +24801,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r1, #0x74 mov r2, #1 add r3, #0xa4 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank add r1, r4, #0 add r1, #0xa0 str r0, [r1] @@ -24812,7 +24812,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r1, #0x76 mov r2, #1 add r3, #0xac - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank add r1, r4, #0 add r1, #0xa8 str r0, [r1] @@ -24823,7 +24823,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r1, #0x77 mov r2, #1 add r3, #0xb4 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank add r1, r4, #0 add r1, #0xb0 str r0, [r1] @@ -24838,7 +24838,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r2, #2 mov r3, #0 str r4, [sp, #4] - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette add sp, #8 pop {r4, pc} .align 2, 0 @@ -25767,7 +25767,7 @@ MOD14_021E3E1C: ; 0x021E3E1C mov r0, #0x12 mov r1, #0x75 mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping add r7, r5, #0 mov r6, #0 add r4, r5, #0 @@ -27182,7 +27182,7 @@ MOD14_021E4890: ; 0x021E4890 mov r0, #0x10 mov r2, #0 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #8] cmp r0, #0 beq _021E4950 @@ -27406,7 +27406,7 @@ _021E4A54: str r0, [sp, #8] ldr r3, [r3, r4] mov r0, #0x10 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette lsl r0, r7, #0x10 lsr r0, r0, #0x10 mov r1, #2 @@ -27421,7 +27421,7 @@ _021E4A54: mov r0, #0x10 mov r2, #1 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r1, [sp, #0xc] add r5, #0x1c lsl r4, r6, #2 @@ -27537,7 +27537,7 @@ MOD14_021E4B58: ; 0x021E4B58 str r0, [sp, #8] ldr r3, [r3, r6] mov r0, #0x10 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette lsl r0, r7, #0x10 lsr r0, r0, #0x10 mov r1, #2 @@ -27552,7 +27552,7 @@ MOD14_021E4B58: ; 0x021E4B58 mov r0, #0x10 mov r2, #1 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r1, [sp, #0xc] add r5, #0x1c lsl r4, r4, #2 @@ -28191,7 +28191,7 @@ _021E5064: mov r1, #7 mov r2, #1 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData mov r3, #0x37 lsl r3, r3, #4 str r0, [r4, r3] @@ -28202,7 +28202,7 @@ _021E5064: mov r1, #8 mov r2, #1 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData mov r1, #0xdd lsl r1, r1, #2 str r0, [r4, r1] @@ -28277,7 +28277,7 @@ MOD14_021E5128: ; 0x021E5128 mov r0, #0x12 mov r1, #0x6c mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -28289,7 +28289,7 @@ MOD14_021E5128: ; 0x021E5128 mov r0, #0x12 mov r1, #0x69 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -28301,7 +28301,7 @@ MOD14_021E5128: ; 0x021E5128 mov r0, #0x12 mov r1, #0x6a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -28313,7 +28313,7 @@ MOD14_021E5128: ; 0x021E5128 mov r0, #0x12 mov r1, #0x6b mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x80 str r0, [sp] mov r0, #0xa @@ -28322,7 +28322,7 @@ MOD14_021E5128: ; 0x021E5128 mov r1, #0x6d mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal bl FUN_0206B888 mov r3, #0x80 add r1, r0, #0 @@ -28331,7 +28331,7 @@ MOD14_021E5128: ; 0x021E5128 str r0, [sp, #4] mov r0, #0x13 mov r2, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #4 mov r1, #0x20 mov r2, #0 @@ -29404,7 +29404,7 @@ MOD14_021E5A08: ; 0x021E5A08 mov r1, #0x6f mov r2, #1 add r3, #0x60 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r7, #0x5c] mov r0, #0xa add r3, r7, #0 @@ -29413,7 +29413,7 @@ MOD14_021E5A08: ; 0x021E5A08 mov r1, #0x70 mov r2, #1 add r3, #0x68 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r7, #0x64] mov r0, #0x60 str r0, [sp] @@ -29423,7 +29423,7 @@ MOD14_021E5A08: ; 0x021E5A08 mov r1, #0x71 mov r2, #5 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, sp, #0x48 bl NNS_G2dInitImageProxy mov r3, #0 @@ -29438,7 +29438,7 @@ MOD14_021E5A08: ; 0x021E5A08 mov r0, #0x12 mov r1, #0x6e mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping str r0, [sp, #0x20] ldr r0, [r7, #4] bl MOD14_021DDD48 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 3bc1378b..97282c02 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2951,7 +2951,7 @@ MOD15_021D8AB4: ; 0x021D8AB4 str r0, [sp, #0x10] mov r0, #0x4c mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x23 str r0, [sp] mov r0, #0x66 @@ -2962,7 +2962,7 @@ MOD15_021D8AB4: ; 0x021D8AB4 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r1, #7 mov r0, #0x23 lsl r3, r1, #6 @@ -2970,7 +2970,7 @@ MOD15_021D8AB4: ; 0x021D8AB4 mov r0, #0x4c mov r2, #1 add r3, r4, r3 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank mov r3, #0x1d lsl r3, r3, #4 str r0, [r4, r3] @@ -2981,7 +2981,7 @@ MOD15_021D8AB4: ; 0x021D8AB4 mov r1, #8 mov r2, #1 add r3, r4, r3 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank mov r1, #0x76 lsl r1, r1, #2 str r0, [r4, r1] @@ -4419,7 +4419,7 @@ MOD15_021D9694: ; 0x021D9694 mov r0, #0x4c add r2, r6, #0 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -4429,7 +4429,7 @@ MOD15_021D9694: ; 0x021D9694 str r0, [sp, #0xc] mov r0, #0x4c add r2, r6, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData lsr r4, r0, #5 mov r0, #1 str r0, [sp] @@ -4495,7 +4495,7 @@ MOD15_021D9694: ; 0x021D9694 mov r0, #0x26 add r2, r6, #0 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 add r0, #0xc2 str r0, [r5, #0x60] @@ -4508,7 +4508,7 @@ MOD15_021D9694: ; 0x021D9694 mov r1, #0x18 mov r2, #0 lsl r3, r3, #6 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r5, #4] bl MOD15_021D87E0 lsl r0, r0, #0x18 @@ -4565,12 +4565,12 @@ MOD15_021D97E4: ; 0x021D97E4 mov r0, #0x4c mov r1, #6 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x4c mov r1, #6 add r2, sp, #8 mov r3, #0x23 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp, #8] add r1, r5, #0 @@ -5605,7 +5605,7 @@ MOD15_021D9FD4: ; 0x021D9FD4 mov r1, #4 add r2, r4, #0 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5617,7 +5617,7 @@ MOD15_021D9FD4: ; 0x021D9FD4 mov r1, #5 add r2, r4, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r1, _021DA03C ; =0x021DBA00 add r0, r4, #0 mov r2, #0 @@ -5863,7 +5863,7 @@ MOD15_021DA1D0: ; 0x021DA1D0 mov r0, #0x4c mov r1, #2 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5874,7 +5874,7 @@ MOD15_021DA1D0: ; 0x021DA1D0 mov r0, #0x4c mov r1, #3 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r2, r0, #0 add r0, r5, #0 add r1, r4, #0 @@ -7494,7 +7494,7 @@ MOD15_021DAEB4: ; 0x021DAEB4 mov r1, #0x15 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7506,7 +7506,7 @@ MOD15_021DAEB4: ; 0x021DAEB4 mov r0, #0x4c mov r1, #0xb mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 bl MOD15_021DAFAC add r0, r4, #0 @@ -7613,7 +7613,7 @@ _021DAFB8: mov r0, #0x4c mov r2, #1 add r3, sp, #4 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r7, r0, #0 beq _021DAFE6 ldr r0, [sp, #4] @@ -7675,7 +7675,7 @@ MOD15_021DAFF8: ; 0x021DAFF8 mov r1, #0x14 mov r2, #1 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #8] cmp r0, #0 beq _021DB0D4 @@ -7812,7 +7812,7 @@ MOD15_021DB154: ; 0x021DB154 mov r1, #0x19 mov r2, #2 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r3, #0 str r3, [sp] mov r0, #2 @@ -7825,7 +7825,7 @@ MOD15_021DB154: ; 0x021DB154 mov r0, #0x4c mov r1, #0x18 mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping add r0, r4, #0 add r0, #0x1c mov r1, #0x4c @@ -7906,7 +7906,7 @@ MOD15_021DB224: ; 0x021DB224 add r0, r4, #0 mov r2, #1 add r3, r5, #4 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5] mov r0, #0x23 add r3, r5, #0 @@ -7915,7 +7915,7 @@ MOD15_021DB224: ; 0x021DB224 add r1, r6, #0 mov r2, #1 add r3, #0xc - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5, #8] add sp, #4 pop {r3, r4, r5, r6, pc} diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 2f05ad9a..e9eedca1 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -6027,7 +6027,7 @@ _021DA196: mov r0, #0x4b add r1, r5, #0 add r3, r6, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut ldr r1, [sp, #8] lsr r1, r1, #1 str r1, [r4] @@ -9944,12 +9944,12 @@ _021DBD82: add r0, sp, #8 str r0, [sp, #4] .ifdef DIAMOND - mov r0, #0x8b + mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND .else - mov r0, #0x8c + mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL .endif add r1, r5, r1 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r4] ldr r0, [sp, #8] lsr r0, r0, #2 @@ -9999,12 +9999,12 @@ MOD16_021DBDE4: ; 0x021DBDE4 add r0, sp, #8 str r0, [sp, #4] .ifdef DIAMOND - mov r0, #0x8b + mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND .else - mov r0, #0x8c + mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL .endif add r2, r1, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut cmp r4, #0 beq _021DBE06 ldr r1, [sp, #8] @@ -10027,12 +10027,12 @@ MOD16_021DBE0C: ; 0x021DBE0C add r0, sp, #8 str r0, [sp, #4] .ifdef DIAMOND - mov r0, #0x8b + mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND .else - mov r0, #0x8c + mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL .endif mov r1, #2 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut add r5, r0, #0 cmp r4, #0 beq _021DBE34 @@ -52059,7 +52059,7 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #6 add r3, r2, #0 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -52070,13 +52070,13 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #0x21 add r2, r5, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData str r4, [sp] mov r0, #0x45 mov r1, #0x32 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r3, #0 str r3, [sp] @@ -52100,7 +52100,7 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #0x33 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r1, #3 str r1, [sp] @@ -52124,7 +52124,7 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #0x34 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r6, r0, #0 ldr r2, [sp, #0x10] mov r0, #8 @@ -52149,7 +52149,7 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #0x36 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r4, r0, #0 ldr r2, [sp, #0x10] mov r0, #0x10 @@ -52192,13 +52192,13 @@ MOD16_021EF8A8: ; 0x021EF8A8 mov r1, #0x21 add r2, r4, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData str r5, [sp] mov r0, #0x45 mov r1, #0x39 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r3, #0 str r3, [sp] @@ -52520,7 +52520,7 @@ MOD16_021EFB20: ; 0x021EFB20 mov r1, #0x17 add r2, #8 add r3, r5, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData b _021EFB48 _021EFB3A: add r2, r4, #0 @@ -52528,7 +52528,7 @@ _021EFB3A: mov r1, #0x18 add r2, #8 add r3, r5, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData _021EFB48: add r2, r4, #0 str r0, [r4] @@ -52536,7 +52536,7 @@ _021EFB48: mov r1, #0x1a add r2, #0xc add r3, r5, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r4, #4] mov r1, #0 str r1, [r4, #0x10] diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 74c32457..955741b3 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -1752,7 +1752,7 @@ _021D81AC: add r1, r4, #1 mov r2, #0 mov r3, #0xe - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #4] cmp r0, #0 bne _021D81C6 @@ -1778,7 +1778,7 @@ _021D81C6: mov r0, #0x19 add r2, r1, #0 mov r3, #0xe - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r4, r0, #0 ldr r0, [r6, #0x14] add r1, r4, #0 @@ -1816,7 +1816,7 @@ _021D822A: add r1, #0xce mov r2, #0 mov r3, #0xe - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r2, r4, #0 add r1, r0, #0 add r2, #0x64 @@ -1837,7 +1837,7 @@ _021D822A: str r0, [sp] ldr r1, [sp, #8] mov r0, #0x19 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0xc] ldr r0, [r5, #0x14] ldr r1, [sp, #0xc] @@ -1887,7 +1887,7 @@ MOD17_021D82B8: ; 0x021D82B8 mov r0, #0x19 mov r1, #0xeb str r2, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x28] add sp, #4 pop {r3, r4, pc} @@ -8834,7 +8834,7 @@ MOD17_021DB6D8: ; 0x021DB6D8 ldrh r0, [r1] ldrh r1, [r1, #2] mov r3, #0xe - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, r0, #0 add r0, r4, #0 mov r2, #0x76 @@ -8913,7 +8913,7 @@ MOD17_021DB700: ; 0x021DB700 ldrh r0, [r6] ldrh r1, [r6, #2] ldr r3, [sp, #0x30] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, sp, #0x10 add r6, r0, #0 bl NNS_G2dGetUnpackedCharacterData @@ -9813,7 +9813,7 @@ _021DBDAA: ldr r0, [r5] add r3, sp, #0x14 ldr r0, [r0, #4] - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r3, [r5] add r4, r0, #0 ldr r0, [r3, #0x18] @@ -9850,7 +9850,7 @@ MOD17_021DBDE8: ; 0x021DBDE8 ldr r0, [r1, #4] ldr r1, [r1, #8] add r3, sp, #0x14 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r3, [r5] add r4, r0, #0 ldr r0, [r3, #0x18] @@ -10023,7 +10023,7 @@ _021DBF2A: ldr r0, [r5, #4] ldr r1, [r5, #0x10] add r3, sp, #0x24 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x24] str r0, [sp, #0x20] ldrh r0, [r2] @@ -10206,7 +10206,7 @@ _021DC0A0: add r0, r7, #0 mov r2, #0 add r3, r4, #4 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [r4, #8] str r5, [r4] ldr r0, [sp, #0x20] @@ -10245,7 +10245,7 @@ _021DC0EE: ldr r3, [sp, #0x1c] add r0, r7, #0 add r2, r4, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r4, #4] str r5, [r4, #8] ldr r0, [sp, #0x18] @@ -13716,7 +13716,7 @@ _021DDAC6: mov r0, #0x19 add r1, r5, #1 mov r2, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r7, r0, #0 ldr r0, [r4, #0x10] add r1, r7, #0 @@ -13749,7 +13749,7 @@ _021DDB1E: ldr r3, [sp, #0xc] mov r0, #0x19 add r2, r1, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r5, r0, #0 ldr r0, [r4, #0x14] add r1, r5, #0 @@ -14023,7 +14023,7 @@ MOD17_021DDD54: ; 0x021DDD54 mov r1, #0x7e mov r2, #0 mov r3, #0x60 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -14034,7 +14034,7 @@ MOD17_021DDD54: ; 0x021DDD54 mov r0, #0x19 mov r1, #0x7d mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5, #0xc] cmp r0, #0 bne _021DDD92 @@ -14050,7 +14050,7 @@ _021DDD96: mov r0, #0x19 mov r2, #0 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r3, #0 str r3, [sp] @@ -14106,7 +14106,7 @@ MOD17_021DDDFC: ; 0x021DDDFC add r1, r0, #0 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -14118,7 +14118,7 @@ MOD17_021DDDFC: ; 0x021DDDFC mov r0, #0xc mov r1, #0xb mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -14130,7 +14130,7 @@ MOD17_021DDDFC: ; 0x021DDDFC mov r0, #0xc mov r1, #0xa mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 15b80554..9b2fdf67 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1788,7 +1788,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r0, #0x34 mov r1, #1 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -1798,7 +1798,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r0, #0x34 add r2, r4, #0 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -1809,7 +1809,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r0, #0x34 mov r1, #2 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0x80 str r3, [sp] mov r0, #0x1d @@ -1818,7 +1818,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r1, #0x34 mov r2, #0 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 add r1, r6, #0 add r2, r5, #0 @@ -1861,7 +1861,7 @@ MOD18_0223A4D8: ; 0x0223A4D8 mov r1, #9 ldr r2, [r2, #4] mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, _0223A55C ; =0x02251380 ldr r0, [r0] ldr r0, [r0, #4] @@ -2500,7 +2500,7 @@ _0223AA5C: mov r1, #0x34 mov r2, #0 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #2 str r0, [sp] mov r0, #4 @@ -3495,7 +3495,7 @@ _0223B1FC: mov r0, #0x37 mov r2, #0 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal b _0223B248 _0223B218: ldr r5, [sp, #0x18] @@ -3505,7 +3505,7 @@ _0223B218: mov r0, #0x37 add r2, r5, r4 mov r3, #0x1d - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData ldr r1, [sp, #0x18] add r1, r1, r4 str r0, [r1, #0x18] @@ -3533,7 +3533,7 @@ _0223B248: ldrh r1, [r1, #0x10] mov r0, #0x37 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData str r0, [sp, #0x20] ldr r0, [sp, #0x30] str r0, [sp, #0x24] @@ -8073,7 +8073,7 @@ MOD18_0223D414: ; 0x0223D414 mov r1, #0x34 mov r2, #0 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #2 str r0, [sp] mov r0, #4 @@ -14679,7 +14679,7 @@ _022406A4: mov r0, #0x32 mov r1, #9 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add sp, #0x1c add r0, r0, #1 @@ -14694,7 +14694,7 @@ _022406D8: mov r0, #0x32 mov r1, #0xa add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r4] add sp, #0x1c add r0, r0, #1 @@ -14725,7 +14725,7 @@ _022406F6: mov r0, #0x32 mov r1, #8 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData b _02240774 _0224072E: ldr r1, _0224088C ; =0x022500A8 @@ -14760,7 +14760,7 @@ _0224072E: ldr r2, [r4, #0x10] mov r0, #0x32 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _02240774: mov r0, #0 mov r1, #3 @@ -23148,7 +23148,7 @@ MOD18_0224486C: ; 0x0224486C mov r0, #0x1c add r3, r1, #0 str r2, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 mov r0, #5 str r1, [sp] @@ -23160,7 +23160,7 @@ MOD18_0224486C: ; 0x0224486C mov r1, #1 add r2, r5, #0 str r3, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -23172,7 +23172,7 @@ MOD18_0224486C: ; 0x0224486C mov r1, #2 add r2, r5, #0 str r3, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #4 mov r1, #0 bl FUN_02054590 @@ -23195,7 +23195,7 @@ MOD18_0224486C: ; 0x0224486C mov r1, #0x34 add r3, #0xc0 str r2, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #1 bl FUN_0200E394 add sp, #0x64 @@ -26973,7 +26973,7 @@ _02246668: mov r1, #0x34 mov r2, #0 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #2 str r0, [sp] mov r0, #4 @@ -33727,7 +33727,7 @@ MOD18_02249BA8: ; 0x02249BA8 bl MOD18_0223D678 ldr r1, _02249CB0 ; =0x0000023B mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank add r0, r6, #1 mov r1, #4 bl ListMenuItems_ctor @@ -34194,7 +34194,7 @@ MOD18_02249F8C: ; 0x02249F8C bl MOD18_0223D678 ldr r1, _0224A0D4 ; =0x00000239 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank add r0, r6, #1 mov r1, #4 bl ListMenuItems_ctor @@ -34643,7 +34643,7 @@ MOD18_0224A360: ; 0x0224A360 bl MOD18_0223D678 ldr r1, _0224A464 ; =0x00000239 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank add r0, r6, #1 mov r1, #4 bl ListMenuItems_ctor @@ -35581,7 +35581,7 @@ MOD18_0224AB08: ; 0x0224AB08 bl MOD18_0223D678 ldr r1, _0224AC0C ; =0x00000237 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank add r0, r6, #1 mov r1, #4 bl ListMenuItems_ctor @@ -37823,7 +37823,7 @@ MOD18_0224BD54: ; 0x0224BD54 mov r1, #0x91 lsl r1, r1, #2 mov r2, #1 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank ldr r0, _0224BDE4 ; =0x00000246 mov r1, #0 strb r1, [r4, r0] @@ -39123,7 +39123,7 @@ MOD18_0224C7D4: ; 0x0224C7D4 bl MOD18_0223D678 ldr r1, _0224C938 ; =0x0000023B mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank b _0224C876 _0224C83C: cmp r0, #0 @@ -39137,7 +39137,7 @@ _0224C83C: bl MOD18_0223D678 ldr r1, _0224C93C ; =0x00000237 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank b _0224C876 _0224C85C: mov r0, #0 @@ -39149,7 +39149,7 @@ _0224C85C: bl MOD18_0223D678 ldr r1, _0224C940 ; =0x00000239 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank _0224C876: mov r7, #0x21 mov r4, #0 @@ -39394,7 +39394,7 @@ MOD18_0224CA58: ; 0x0224CA58 bl MOD18_0223D658 ldr r1, _0224CA90 ; =0x00000241 mov r2, #1 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank bl MOD18_0223D658 add r4, r0, #0 bl FUN_02031190 @@ -41034,7 +41034,7 @@ _0224D7BC: bl MOD18_0223D658 ldr r1, _0224D80C ; =0x00000245 mov r2, #1 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank mov r0, #4 bl FUN_02025964 add r6, r0, #0 @@ -41468,8 +41468,9 @@ MOD18_0224DB5C: ; 0x0224DB5C pop {r4, pc} thumb_func_end MOD18_0224DB5C - thumb_func_start MOD18_0224DB80 -MOD18_0224DB80: ; 0x0224DB80 + thumb_func_start MOD18_LoadMsgBank +MOD18_LoadMsgBank: ; 0x0224DB80 + ; void MOD18_LoadMsgBank(struct MOD18Work * work, s32 bank, u32 async) push {r4, r5, r6, lr} add r5, r0, #0 ldr r0, [r5, #0x2c] @@ -41492,7 +41493,7 @@ MOD18_0224DB80: ; 0x0224DB80 _0224DBAC: pop {r4, r5, r6, pc} .align 2, 0 - thumb_func_end MOD18_0224DB80 + thumb_func_end MOD18_LoadMsgBank thumb_func_start MOD18_0224DBB0 MOD18_0224DBB0: ; 0x0224DBB0 @@ -42917,7 +42918,7 @@ _0224E5CE: bl MOD18_0223D678 ldr r1, _0224E68C ; =0x00000237 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank ldr r4, _0224E698 ; =0x022507D0 add r3, sp, #0x30 add r2, r3, #0 diff --git a/arm9/modules/19/asm/module_19.s b/arm9/modules/19/asm/module_19.s index 91c756c6..8f3a28ce 100644 --- a/arm9/modules/19/asm/module_19.s +++ b/arm9/modules/19/asm/module_19.s @@ -42,7 +42,7 @@ MOD19_02252440: ; 0x02252440 mov r1, #0xa add r2, r4, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -54,7 +54,7 @@ MOD19_02252440: ; 0x02252440 mov r1, #0xb add r2, r4, #0 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #8 @@ -63,7 +63,7 @@ MOD19_02252440: ; 0x02252440 add r1, r0, #0 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r2, _022524E0 ; =0x04001000 ldr r0, _022524EC ; =0xFFFF1FFF ldr r1, [r2] diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index 23481e5a..a77f95fc 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -1331,7 +1331,7 @@ MOD20_02252D44: ; 0x02252D44 mov r1, #0 add r2, sp, #0 mov r3, #7 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 beq _02252D7A ldr r0, [sp] @@ -1591,7 +1591,7 @@ MOD20_02252ED0: ; 0x02252ED0 ldr r2, [r4, r2] mov r1, #0xe mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1604,7 +1604,7 @@ MOD20_02252ED0: ; 0x02252ED0 ldr r2, [r4, r2] mov r1, #0xf mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1621,7 +1621,7 @@ MOD20_02252ED0: ; 0x02252ED0 mov r1, #0xd mov r2, #4 lsl r3, r3, #5 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r3, #0 str r3, [sp] mov r0, #0x20 @@ -2232,7 +2232,7 @@ MOD20_02253430: ; 0x02253430 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0x60 str r0, [sp] mov r0, #7 @@ -2241,7 +2241,7 @@ MOD20_02253430: ; 0x02253430 mov r0, #0xc mov r2, #5 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r5, #0 mov r1, #0xf bl MOD20_022534D4 @@ -2994,7 +2994,7 @@ MOD20_022539C4: ; 0x022539C4 mov r0, #0x13 add r2, sp, #0 mov r3, #8 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 beq _02253A02 ldr r0, [sp] @@ -3805,12 +3805,12 @@ MOD20_02253FBC: ; 0x02253FBC str r4, [r5, #0x10] add r0, r6, #0 add r2, r4, #0 - bl FUN_02006C88 + bl GfGfxLoader_UncompressFromNarc str r0, [r5] add r0, r6, #0 add r1, r7, #0 add r2, r4, #0 - bl FUN_02006C88 + bl GfGfxLoader_UncompressFromNarc str r0, [r5, #4] ldr r0, [r5] cmp r0, #0 diff --git a/arm9/modules/21/src/mod21_02254A6C.c b/arm9/modules/21/src/mod21_02254A6C.c index 1dcbe4b8..040ebdaa 100644 --- a/arm9/modules/21/src/mod21_02254A6C.c +++ b/arm9/modules/21/src/mod21_02254A6C.c @@ -5,7 +5,7 @@ extern void MOD20_022536F4(u32 *param0, u32 param1); extern u32 MOD20_02252D34(void); -extern void *FUN_02006BDC(u32 param0, u32 param1, u32 param2, void *param3, u32 param4); +extern void *GfGfxLoader_GetScrnData(u32 param0, u32 param1, u32 param2, void *param3, u32 param4); extern void MOD20_022537E0(void *param0, u32 param1, void *param2, u32 param3, void *param4, u32 param5, u32 param6); UnkOverlayStruct1 const MOD21_02254DAC[] = { @@ -26,8 +26,8 @@ u8 const MOD21_02254D90[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; extern void FUN_02016C18(u32 param0, u32 param1, void *param2, u32 param3); -extern void FUN_0200687C(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); -extern void FUN_020068C8(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); +extern void GfGfxLoader_LoadCharData(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); +extern void GfGfxLoader_LoadScrnData(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); extern void MOD20_02252D7C(u32 param0, u32 param1); extern void FUN_02017CD0(u32 param0, u32 param1); extern void FUN_020178A0(u32 param0, u32 param1); @@ -45,7 +45,7 @@ THUMB_FUNC BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1) MOD20_022536F4(strct->Unk08, 8); strct->Unk00 = param1; strct->Unk04 = MOD20_02252D34(); - void *res = FUN_02006BDC(12, 0x19, 1, &sp4, 8); + void *res = GfGfxLoader_GetScrnData(12, 0x19, 1, &sp4, 8); if (res == 0) { FreeToHeap(strct); @@ -105,8 +105,8 @@ THUMB_FUNC BOOL MOD21_02254B60(u32 param0, void *param1) #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); FUN_02016C18(strct->Unk04, 6, MOD21_02254D90, 0); - FUN_0200687C(12, 23, strct->Unk04, 6, 0, 0, 1, 8); - FUN_020068C8(12, 24, strct->Unk04, 6, 0, 0, 1, 8); + GfGfxLoader_LoadCharData(12, 23, strct->Unk04, 6, 0, 0, 1, 8); + GfGfxLoader_LoadScrnData(12, 24, strct->Unk04, 6, 0, 0, 1, 8); MOD20_02252D7C(0, 0); MOD21_02254C5C(strct); FUN_02017CD0(strct->Unk04, 6); diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s index e58e406b..bf11e9db 100644 --- a/arm9/modules/22/asm/module_22.s +++ b/arm9/modules/22/asm/module_22.s @@ -1164,7 +1164,7 @@ MOD22_02255098: ; 0x02255098 mov r0, #0xc mov r1, #0x15 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1176,7 +1176,7 @@ MOD22_02255098: ; 0x02255098 mov r0, #0xc mov r1, #0x14 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -1245,7 +1245,7 @@ MOD22_0225516C: ; 0x0225516C str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -1256,7 +1256,7 @@ MOD22_0225516C: ; 0x0225516C mov r0, #0xc mov r1, #0x16 lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #1 add sp, #0xc pop {pc} diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s index 5550c76b..9f052087 100644 --- a/arm9/modules/23/asm/module_23.s +++ b/arm9/modules/23/asm/module_23.s @@ -1165,7 +1165,7 @@ MOD23_02255088: ; 0x02255088 mov r0, #0xc mov r1, #0x10 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1177,7 +1177,7 @@ MOD23_02255088: ; 0x02255088 mov r0, #0xc mov r1, #0x11 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r5, #0 bl MOD23_02255124 mov r0, #0 diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index 16b8766a..cdf4b770 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -818,7 +818,7 @@ _02254E1E: mov r0, #0xc mov r1, #0x1e mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -830,7 +830,7 @@ _02254E1E: mov r0, #0xc mov r1, #0x1f mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -1110,7 +1110,7 @@ MOD24_02255078: ; 0x02255078 str r0, [sp, #8] mov r0, #0xc mov r1, #0x20 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index 481c98c2..5e70bbbe 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -440,7 +440,7 @@ MOD25_02254B34: ; 0x02254B34 mov r0, #0xc mov r1, #0x17 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -452,7 +452,7 @@ MOD25_02254B34: ; 0x02254B34 mov r0, #0xc mov r1, #0x1a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -587,7 +587,7 @@ MOD25_02254C74: ; 0x02254C74 str r0, [sp, #8] mov r0, #0xc mov r1, #0x1d - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 0bb87572..25e4a4b6 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -528,7 +528,7 @@ MOD27_02254C08: ; 0x02254C08 mov r0, #0xc mov r1, #0x6a mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 lsr r5, r0, #5 str r3, [sp] @@ -898,7 +898,7 @@ MOD27_02254F18: ; 0x02254F18 str r0, [sp, #8] mov r0, #0xc mov r1, #0x6d - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r4, #0 add r0, sp, #0x18 strb r4, [r0, #0xa] diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 3d1890e7..04176ba5 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -559,7 +559,7 @@ MOD28_02254C18: ; 0x02254C18 mov r0, #0xc mov r1, #7 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -623,7 +623,7 @@ MOD28_02254CB4: ; 0x02254CB4 mov r0, #0xc mov r1, #0x23 lsl r3, r0, #9 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0x13 mov r1, #8 bl NARC_ctor diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index 723e8449..9fb45a65 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -539,7 +539,7 @@ MOD29_02254C08: ; 0x02254C08 str r0, [sp, #8] mov r0, #0xc mov r1, #0x2a - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette add r2, r6, #0 ldr r0, [r6, #0x30] ldr r1, _02254C7C ; =MOD29_022550C0 @@ -684,7 +684,7 @@ MOD29_02254D10: ; 0x02254D10 mov r0, #0xc mov r1, #0x27 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -696,7 +696,7 @@ MOD29_02254D10: ; 0x02254D10 mov r0, #0xc mov r1, #0x26 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s index aa55cd5b..5daf123f 100644 --- a/arm9/modules/30/asm/module_30.s +++ b/arm9/modules/30/asm/module_30.s @@ -376,7 +376,7 @@ MOD30_02254AE0: ; 0x02254AE0 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -387,7 +387,7 @@ MOD30_02254AE0: ; 0x02254AE0 mov r0, #0xc mov r1, #0x2f lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -548,7 +548,7 @@ MOD30_02254C18: ; 0x02254C18 mov r0, #0xc mov r1, #0x2c mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -560,7 +560,7 @@ MOD30_02254C18: ; 0x02254C18 mov r0, #0xc mov r1, #0x2b mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s index 7dcd4e3a..5e45ce23 100644 --- a/arm9/modules/31/asm/module_31.s +++ b/arm9/modules/31/asm/module_31.s @@ -366,7 +366,7 @@ MOD31_02254AD4: ; 0x02254AD4 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -377,7 +377,7 @@ MOD31_02254AD4: ; 0x02254AD4 mov r0, #0xc mov r1, #0x34 lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -538,7 +538,7 @@ MOD31_02254C0C: ; 0x02254C0C mov r0, #0xc mov r1, #0x31 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -550,7 +550,7 @@ MOD31_02254C0C: ; 0x02254C0C mov r0, #0xc mov r1, #0x30 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s index 5b40a737..c928dd1a 100644 --- a/arm9/modules/32/asm/module_32.s +++ b/arm9/modules/32/asm/module_32.s @@ -349,7 +349,7 @@ MOD32_02254A9C: ; 0x02254A9C str r0, [sp, #8] mov r0, #0xc mov r1, #0x68 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -465,7 +465,7 @@ MOD32_02254B58: ; 0x02254B58 mov r0, #0xc mov r1, #0x65 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -477,7 +477,7 @@ MOD32_02254B58: ; 0x02254B58 mov r0, #0xc mov r1, #0x64 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s index 6db0efdf..55ccf203 100644 --- a/arm9/modules/33/asm/module_33.s +++ b/arm9/modules/33/asm/module_33.s @@ -313,7 +313,7 @@ MOD33_02254A38: ; 0x02254A38 ldr r2, [r5, #4] mov r0, #0xc mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -333,7 +333,7 @@ MOD33_02254A38: ; 0x02254A38 mov r1, #9 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r5, #4] mov r1, #0xc mov r2, #6 diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s index 84100418..ddc4f587 100644 --- a/arm9/modules/34/asm/module_34.s +++ b/arm9/modules/34/asm/module_34.s @@ -407,7 +407,7 @@ MOD34_02254AE8: ; 0x02254AE8 mov r0, #0xc mov r1, #0x3b mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -419,7 +419,7 @@ MOD34_02254AE8: ; 0x02254AE8 mov r0, #0xc mov r1, #0x3a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index 45cab8d3..f73ad3ff 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -431,7 +431,7 @@ MOD35_02254B54: ; 0x02254B54 str r0, [sp, #8] mov r0, #0xc mov r1, #0x54 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r1, #0x14 bl _u32_div_f ldr r1, [sp, #0xc] @@ -609,7 +609,7 @@ MOD35_02254C98: ; 0x02254C98 mov r0, #0xc mov r1, #0x51 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -621,7 +621,7 @@ MOD35_02254C98: ; 0x02254C98 mov r0, #0xc mov r1, #0x50 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index b0353507..0149e180 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -868,7 +868,7 @@ MOD36_02254E8C: ; 0x02254E8C str r0, [sp, #8] mov r0, #0xc mov r1, #0x59 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -1016,7 +1016,7 @@ _02254F9E: mov r0, #0xc mov r1, #0x56 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r6, r0, #0 mov r0, #0 str r0, [sp] @@ -1029,7 +1029,7 @@ _02254F9E: mov r0, #0xc mov r1, #0x55 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s index 3c7f412c..c2f1439a 100644 --- a/arm9/modules/37/asm/module_37.s +++ b/arm9/modules/37/asm/module_37.s @@ -341,7 +341,7 @@ MOD37_02254AA0: ; 0x02254AA0 str r0, [sp, #8] mov r0, #0xc mov r1, #0x39 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r4, #0 @@ -471,7 +471,7 @@ MOD37_02254B70: ; 0x02254B70 mov r0, #0xc mov r1, #0x36 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -483,7 +483,7 @@ MOD37_02254B70: ; 0x02254B70 mov r0, #0xc mov r1, #0x35 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index 89e7ff79..ee5980ec 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -559,7 +559,7 @@ MOD38_02254C38: ; 0x02254C38 str r0, [sp, #8] mov r0, #0xc mov r1, #0x40 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r6, #0 @@ -753,7 +753,7 @@ MOD38_02254D84: ; 0x02254D84 mov r0, #0xc mov r1, #0x3d mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r4, r0, #0 mov r0, #0 str r0, [sp] @@ -766,7 +766,7 @@ MOD38_02254D84: ; 0x02254D84 mov r0, #0xc mov r1, #0x3c mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index a850e16a..da3f83f4 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -586,7 +586,7 @@ MOD39_02254C6C: ; 0x02254C6C str r0, [sp, #8] mov r0, #0xc mov r1, #0x4a - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r1, #0x14 bl _u32_div_f ldr r1, [sp, #0xc] @@ -800,7 +800,7 @@ MOD39_02254DF4: ; 0x02254DF4 mov r0, #0xc mov r1, #0x47 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -812,7 +812,7 @@ MOD39_02254DF4: ; 0x02254DF4 mov r0, #0xc mov r1, #0x46 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index 713e9ec7..13c9a94f 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -759,7 +759,7 @@ MOD40_02254DBC: ; 0x02254DBC str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -770,7 +770,7 @@ MOD40_02254DBC: ; 0x02254DBC mov r0, #0xc mov r1, #0x4f lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -1050,7 +1050,7 @@ MOD40_02254FE8: ; 0x02254FE8 mov r0, #0xc mov r1, #0x4c mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1062,7 +1062,7 @@ MOD40_02254FE8: ; 0x02254FE8 mov r0, #0xc mov r1, #0x4b mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s index 637c100f..4d1afb06 100644 --- a/arm9/modules/41/asm/module_41.s +++ b/arm9/modules/41/asm/module_41.s @@ -1382,7 +1382,7 @@ MOD41_022552A0: ; 0x022552A0 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -1393,7 +1393,7 @@ MOD41_022552A0: ; 0x022552A0 mov r0, #0xc mov r1, #0x5e lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -1573,7 +1573,7 @@ MOD41_022553F4: ; 0x022553F4 mov r0, #0xc mov r1, #0x5b mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1585,7 +1585,7 @@ MOD41_022553F4: ; 0x022553F4 mov r0, #0xc mov r1, #0x5a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index 5bbfa2ba..03136570 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -659,7 +659,7 @@ MOD42_02254D04: ; 0x02254D04 str r0, [sp, #8] mov r0, #0xc mov r1, #0x78 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -965,7 +965,7 @@ MOD42_02254F3C: ; 0x02254F3C mov r0, #0xc mov r1, #0x75 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -977,7 +977,7 @@ MOD42_02254F3C: ; 0x02254F3C mov r0, #0xc mov r1, #0x73 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index fd20dc17..ce3da4bb 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -573,7 +573,7 @@ MOD43_02254C28: ; 0x02254C28 mov r0, #0xc mov r1, #0x75 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r4, r0, #0 mov r0, #0 str r0, [sp] @@ -586,7 +586,7 @@ MOD43_02254C28: ; 0x02254C28 mov r0, #0xc mov r1, #0x74 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -843,7 +843,7 @@ MOD43_02254E78: ; 0x02254E78 str r0, [sp, #8] mov r0, #0xc mov r1, #0x78 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] mov r0, #0x4e diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s index bf007af4..19726565 100644 --- a/arm9/modules/44/asm/module_44.s +++ b/arm9/modules/44/asm/module_44.s @@ -334,7 +334,7 @@ MOD44_02254A90: ; 0x02254A90 str r0, [sp, #8] mov r0, #0xc mov r1, #0x45 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -468,7 +468,7 @@ MOD44_02254B64: ; 0x02254B64 mov r0, #0xc mov r1, #0x42 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -480,7 +480,7 @@ MOD44_02254B64: ; 0x02254B64 mov r0, #0xc mov r1, #0x41 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index d8d9bf36..95cf3fbc 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -505,7 +505,7 @@ MOD45_02254BE0: ; 0x02254BE0 str r0, [sp, #8] mov r0, #0xc mov r1, #0x72 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -660,7 +660,7 @@ MOD45_02254CCC: ; 0x02254CCC mov r0, #0xc mov r1, #0x6f mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -766,7 +766,7 @@ MOD45_02254DDC: ; 0x02254DDC mov r0, #0xc mov r1, #0x6e mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r6, #4] mov r4, #0 cmp r0, #0 diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s index 9e4c3dc5..66418468 100644 --- a/arm9/modules/46/asm/module_46.s +++ b/arm9/modules/46/asm/module_46.s @@ -313,7 +313,7 @@ MOD46_02254A38: ; 0x02254A38 ldr r2, [r5, #4] mov r0, #0xc mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -333,7 +333,7 @@ MOD46_02254A38: ; 0x02254A38 mov r1, #9 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r5, #4] mov r1, #0x1a mov r2, #6 diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index 3ec4768c..3cd1bb32 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -749,7 +749,7 @@ MOD47_02254D8C: ; 0x02254D8C str r0, [sp, #8] mov r0, #0xc mov r1, #0x63 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r6, #0 @@ -889,7 +889,7 @@ MOD47_02254E74: ; 0x02254E74 mov r0, #0xc mov r1, #0x60 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r4, r0, #0 mov r0, #0 str r0, [sp] @@ -902,7 +902,7 @@ MOD47_02254E74: ; 0x02254E74 mov r0, #0xc mov r1, #0x5f mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index ed66d753..8dfd4e0a 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -438,7 +438,7 @@ MOD48_02254B30: ; 0x02254B30 mov r0, #0xc mov r1, #0x7a mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -450,7 +450,7 @@ MOD48_02254B30: ; 0x02254B30 mov r0, #0xc mov r1, #0x79 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -679,7 +679,7 @@ MOD48_02254D2C: ; 0x02254D2C str r0, [sp, #8] mov r0, #0xc mov r1, #0x7d - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette add r1, r4, #0 lsr r0, r0, #5 add r1, #0xac diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s index f91ae977..5d80d9b6 100644 --- a/arm9/modules/50/asm/module_50.s +++ b/arm9/modules/50/asm/module_50.s @@ -322,7 +322,7 @@ MOD50_02254A48: ; 0x02254A48 ldr r2, [r5, #4] mov r0, #0xc mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -342,7 +342,7 @@ MOD50_02254A48: ; 0x02254A48 mov r1, #9 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r1, [r5] ldr r0, [r5, #4] ldr r1, [r1] diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index aa0549bd..4642f8c1 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -120,7 +120,7 @@ MOD51_022548F0: ; 0x022548F0 mov r1, #3 mov r2, #1 add r3, #0x24 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r4, #0x20] add sp, #4 pop {r3, r4, pc} @@ -477,7 +477,7 @@ MOD51_02254B54: ; 0x02254B54 mov r0, #0x4a add r3, r1, #0 str r2, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -491,7 +491,7 @@ MOD51_02254B54: ; 0x02254B54 mov r1, #2 add r2, r4, #0 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -504,7 +504,7 @@ MOD51_02254B54: ; 0x02254B54 add r2, r4, #0 mov r3, #7 str r1, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #4 mov r1, #0 bl FUN_02054590 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 1866a427..d070f979 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -768,7 +768,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r0, #0x4e add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x40 str r0, [sp] mov r0, #0x27 @@ -777,7 +777,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r1, #1 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -801,7 +801,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r0, #0x4e add r2, r4, #0 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -815,7 +815,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r1, #4 add r2, r4, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #2 @@ -829,7 +829,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r1, #3 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -843,7 +843,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r0, #0x4e add r2, r4, #0 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #8] ldr r0, [r0, #8] bl Options_GetFrame diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 42233002..b11b96cf 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -612,7 +612,7 @@ _021D79A6: mov r1, #1 add r2, #0x1c mov r3, #0x33 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r7, #0x18] mov r1, #0x32 ldr r0, _021D7A30 ; =0x00004A44 @@ -694,7 +694,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r0, #0x56 add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x33 @@ -703,7 +703,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 add r1, r0, #0 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -725,7 +725,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r1, #0xa add r2, r4, #0 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -737,7 +737,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r1, #0xb add r2, r4, #0 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #2 @@ -750,7 +750,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r0, #0x56 mov r1, #2 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -763,7 +763,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r0, #0x56 mov r1, #3 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #8] ldr r0, [r0, #8] bl Options_GetFrame @@ -3240,7 +3240,7 @@ MOD54_021D8E64: ; 0x021D8E64 mov r1, #8 add r2, r4, r2 mov r3, #0x33 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData mov r2, #0xcd lsl r2, r2, #2 str r0, [r4, r2] @@ -3249,7 +3249,7 @@ MOD54_021D8E64: ; 0x021D8E64 mov r1, #7 add r2, r4, r2 mov r3, #0x33 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData mov r3, #0xce lsl r3, r3, #2 str r0, [r4, r3] @@ -3260,7 +3260,7 @@ MOD54_021D8E64: ; 0x021D8E64 mov r1, #0x20 mov r2, #1 add r3, r4, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0xc9 lsl r1, r1, #2 str r0, [r4, r1] @@ -3271,7 +3271,7 @@ MOD54_021D8E64: ; 0x021D8E64 mov r1, #9 mov r2, #1 add r3, r4, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0xca lsl r1, r1, #2 str r0, [r4, r1] diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index d9a9cad6..b9f3c277 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -726,7 +726,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x34 @@ -734,7 +734,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #3 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -762,7 +762,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #2 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -772,7 +772,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #8 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -783,7 +783,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #4 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -794,7 +794,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r1, #0xa add r2, r4, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -805,7 +805,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r1, #0xb add r2, r4, #0 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #8] bl Sav2_PlayerData_GetOptionsAddr bl Options_GetFrame @@ -2723,7 +2723,7 @@ MOD55_021D8A7C: ; 0x021D8A7C ldr r2, [r5, #4] mov r0, #0x59 mov r1, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -2733,7 +2733,7 @@ MOD55_021D8A7C: ; 0x021D8A7C ldr r2, [r5, #4] mov r0, #0x59 mov r1, #8 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2744,7 +2744,7 @@ MOD55_021D8A7C: ; 0x021D8A7C mov r0, #0x59 mov r1, #5 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -3573,7 +3573,7 @@ MOD55_021D9184: ; 0x021D9184 mov r0, #0x59 mov r1, #7 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -4110,7 +4110,7 @@ _021D9618: mov r0, #0x59 mov r1, #2 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4121,7 +4121,7 @@ _021D9618: mov r0, #0x59 mov r1, #8 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4132,7 +4132,7 @@ _021D9618: mov r0, #0x59 mov r1, #6 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 @@ -4910,7 +4910,7 @@ _021D9D16: mov r0, #0x59 mov r1, #0xa mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4921,7 +4921,7 @@ _021D9D16: mov r0, #0x59 mov r1, #0xb mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #3 str r0, [sp] mov r1, #1 @@ -4961,7 +4961,7 @@ MOD55_021D9D88: ; 0x021D9D88 ldr r2, [r6, #4] mov r0, #0x59 mov r1, #8 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4972,7 +4972,7 @@ MOD55_021D9D88: ; 0x021D9D88 mov r0, #0x59 mov r1, #4 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r7, #0x29 mov r4, #0 add r5, r6, #0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index e9abf575..531194c6 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -950,7 +950,7 @@ MOD56_0221257C: ; 0x0221257C mov r0, #0x5c mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x36 @@ -958,7 +958,7 @@ MOD56_0221257C: ; 0x0221257C mov r0, #0x5c mov r1, #3 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -978,7 +978,7 @@ MOD56_0221257C: ; 0x0221257C mov r0, #0x5c mov r1, #2 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -988,7 +988,7 @@ MOD56_0221257C: ; 0x0221257C mov r0, #0x5c mov r1, #4 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -999,7 +999,7 @@ MOD56_0221257C: ; 0x0221257C mov r1, #9 add r2, r4, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1010,7 +1010,7 @@ MOD56_0221257C: ; 0x0221257C mov r1, #0xa add r2, r4, #0 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r5, #0xc4 ldr r0, [r5] bl Sav2_PlayerData_GetOptionsAddr @@ -2464,7 +2464,7 @@ MOD56_02213194: ; 0x02213194 ldr r2, [r2] mov r0, #0x5c mov r1, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] @@ -3644,7 +3644,7 @@ MOD56_02213A94: ; 0x02213A94 ldr r2, [r2] mov r0, #0x5c mov r1, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 @@ -6929,7 +6929,7 @@ MOD56_0221547C: ; 0x0221547C ldr r2, [r2] mov r0, #0x5c mov r1, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xf3 mov r1, #0 lsl r0, r0, #2 @@ -6964,7 +6964,7 @@ MOD56_022154BC: ; 0x022154BC mov r0, #0x5c mov r1, #6 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xcb lsl r0, r0, #2 ldr r0, [r5, r0] @@ -7564,7 +7564,7 @@ MOD56_022159B0: ; 0x022159B0 ldr r2, [r2] mov r0, #0x5c mov r1, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 38bd1306..481488f8 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -667,7 +667,7 @@ _021D7A56: mov r1, #0 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7A66: @@ -675,7 +675,7 @@ _021D7A66: mov r1, #1 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7A76: @@ -683,7 +683,7 @@ _021D7A76: mov r1, #2 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7A86: @@ -691,7 +691,7 @@ _021D7A86: mov r1, #3 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7A96: @@ -699,7 +699,7 @@ _021D7A96: mov r1, #4 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7AA6: @@ -707,7 +707,7 @@ _021D7AA6: mov r1, #5 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7AB6: @@ -715,7 +715,7 @@ _021D7AB6: mov r1, #6 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 _021D7AC4: ldr r0, [sp] @@ -754,7 +754,7 @@ _021D7B02: mov r1, #7 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7B30 _021D7B12: @@ -762,7 +762,7 @@ _021D7B12: mov r1, #8 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7B30 _021D7B22: @@ -770,7 +770,7 @@ _021D7B22: mov r1, #9 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 _021D7B30: ldr r0, [sp] @@ -802,7 +802,7 @@ MOD57_021D7B5C: ; 0x021D7B5C mov r1, #0x29 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r6, r0, #0 ldr r0, [sp] lsl r4, r4, #5 @@ -952,7 +952,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 mov r1, #0 add r2, sp, #0x14 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r5, r0, #0 ldr r0, [sp, #0x14] mov r1, #2 @@ -979,7 +979,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 mov r1, #0xa add r2, sp, #0x10 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r5, r0, #0 ldr r0, [sp, #0x10] mov r1, #2 @@ -1010,7 +1010,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 mov r1, #0x1b mov r3, #0x19 str r2, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc ldr r1, _021D7ECC ; =0x000030B8 str r0, [r4, r1] ldr r0, [r4, r1] @@ -1041,7 +1041,7 @@ _021D7D60: mov r1, #0x23 mov r2, #0 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r1, _021D7ED4 ; =0x000032F8 str r0, [r4, r1] b _021D7DF2 @@ -1052,7 +1052,7 @@ _021D7D86: mov r1, #0x24 mov r2, #0 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r1, _021D7ED4 ; =0x000032F8 str r0, [r4, r1] b _021D7DF2 @@ -1064,7 +1064,7 @@ _021D7D9C: mov r0, #0x33 mov r3, #0x19 str r2, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc ldr r1, _021D7ECC ; =0x000030B8 str r0, [r4, r1] ldr r0, [r4, r1] @@ -1088,7 +1088,7 @@ _021D7DD0: mov r1, #0x2a mov r2, #0 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r1, _021D7ED4 ; =0x000032F8 str r0, [r4, r1] add r0, r4, #0 @@ -1109,7 +1109,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x17 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1120,7 +1120,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x1e mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1131,7 +1131,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x18 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1142,7 +1142,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x20 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1152,7 +1152,7 @@ _021D7DF2: ldr r2, [r4] mov r0, #0x33 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1163,7 +1163,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x21 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1174,7 +1174,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x1a mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1185,7 +1185,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x22 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 add r0, #0xb4 ldr r0, [r0] @@ -1327,7 +1327,7 @@ _021D7FB0: mov r0, #0x33 mov r1, #0x1f mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #4 add r1, r5, #0 mov r2, #6 @@ -1359,7 +1359,7 @@ _021D8006: mov r0, #0x33 mov r1, #0x1e mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #4 mov r1, #7 mov r2, #0xa diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 501480eb..eb13ddb7 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -580,7 +580,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r0, #0x5f add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x40 str r0, [sp] mov r0, #0x27 @@ -589,7 +589,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #2 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -618,7 +618,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #3 add r2, r4, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -632,7 +632,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #5 add r2, r4, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #2 @@ -646,7 +646,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #4 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -660,7 +660,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #6 add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0xc] bl Options_GetFrame lsl r0, r0, #0x18 diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index a928881a..5604bf3c 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -1367,7 +1367,7 @@ MOD59_021D8058: ; 0x021D8058 str r0, [sp, #0xc] ldr r2, [r5, #0x18] mov r0, #0x7d - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 ldr r3, [r5] mov r1, #0x20 @@ -1383,7 +1383,7 @@ MOD59_021D8058: ; 0x021D8058 ldr r2, [r5, #0x18] mov r0, #0x7d mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, _021D80F8 ; =gGameVersion ldrb r0, [r0] cmp r0, #0xa @@ -1402,7 +1402,7 @@ _021D80AA: str r0, [sp, #4] mov r0, #0x7d add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0xa0 str r0, [sp] ldr r0, [r5] @@ -1411,7 +1411,7 @@ _021D80AA: mov r0, #0x7d mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r5, #0 bl MOD59_021D80FC add r0, r5, #0 @@ -1460,7 +1460,7 @@ MOD59_021D80FC: ; 0x021D80FC ldr r2, [r3, #0x18] mov r0, #0x7d mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _021D8138: add sp, #0x24 pop {r4, r5, pc} @@ -1500,7 +1500,7 @@ _021D814C: ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] ldr r0, [r4] @@ -1514,7 +1514,7 @@ _021D814C: add r1, sp, #0x14 ldr r1, [r1, r2] mov r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1525,7 +1525,7 @@ _021D814C: ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 mov r1, #1 mov r2, #7 @@ -1550,7 +1550,7 @@ _021D81BE: ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] ldr r0, [r4] @@ -1565,7 +1565,7 @@ _021D81BE: ldr r1, [r1, r2] mov r2, #0 add r3, #0x83 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1576,7 +1576,7 @@ _021D81BE: ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 mov r1, #2 mov r2, #8 @@ -1618,7 +1618,7 @@ MOD59_021D8234: ; 0x021D8234 ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 add r0, #0x8b ldrb r0, [r0] @@ -1813,7 +1813,7 @@ MOD59_021D83F8: ; 0x021D83F8 ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 mov r1, #6 mov r2, #9 @@ -1826,7 +1826,7 @@ MOD59_021D83F8: ; 0x021D83F8 mov r0, #0x7d mov r2, #4 mov r3, #0xe0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r3, [r4] mov r0, #6 mov r1, #0x20 @@ -1843,7 +1843,7 @@ MOD59_021D83F8: ; 0x021D83F8 ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2007,7 +2007,7 @@ _021D8546: lsl r1, r1, #2 ldr r1, [r2, r1] ldr r2, [r4, #0x18] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x30 pop {r3, r4, r5, pc} _021D858E: @@ -2070,7 +2070,7 @@ _021D85C2: lsl r1, r1, #2 ldr r1, [r2, r1] ldr r2, [r4, #0x18] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x30 pop {r3, r4, r5, pc} nop @@ -2167,7 +2167,7 @@ _021D8698: ldr r2, [r3, #0x18] mov r0, #0x7d mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData _021D86AE: add r0, r4, #0 add sp, #0x40 @@ -3374,7 +3374,7 @@ _021D90A2: str r0, [sp, #0xc] ldr r2, [r4, #0x18] mov r0, #0x7d - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 add r0, #0x94 ldr r0, [r0] diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index 370d58b1..2925c404 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -289,7 +289,7 @@ _021D9A2C: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x88 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -299,7 +299,7 @@ _021D9A2C: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x88 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r5, _021D9BC4 ; =0x021DA064 add r3, sp, #0x2c ldmia r5!, {r0, r1} @@ -325,7 +325,7 @@ _021D9A2C: ldr r2, [r4, #4] mov r0, #0x88 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -336,7 +336,7 @@ _021D9A2C: ldr r2, [r4, #4] mov r0, #0x88 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r5, _021D9BC8 ; =0x021DA0B8 add r3, sp, #0x10 ldmia r5!, {r0, r1} @@ -361,7 +361,7 @@ _021D9A2C: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x88 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -372,7 +372,7 @@ _021D9A2C: ldr r2, [r4, #4] mov r0, #0x88 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] ldr r0, [r4] @@ -380,7 +380,7 @@ _021D9A2C: str r0, [sp, #4] mov r0, #0x88 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r2, [r4] mov r0, #0 mov r1, #0x20 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index e697563f..26b7d486 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -3801,7 +3801,7 @@ MOD62_0222F2C8: ; 0x0222F2C8 ldr r2, [r2] add r1, #0xb1 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3816,7 +3816,7 @@ MOD62_0222F2C8: ; 0x0222F2C8 ldr r2, [r2] add r1, #0xc1 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 str r1, [sp] mov r0, #0x40 @@ -3844,7 +3844,7 @@ MOD62_0222F2C8: ; 0x0222F2C8 ldr r2, [r2] add r1, #0xb2 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3858,7 +3858,7 @@ MOD62_0222F2C8: ; 0x0222F2C8 ldr r2, [r4] add r1, #0xc2 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r4, pc} thumb_func_end MOD62_0222F2C8 @@ -3882,7 +3882,7 @@ MOD62_0222F36C: ; 0x0222F36C ldr r2, [r2] add r1, #0xb0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3897,7 +3897,7 @@ MOD62_0222F36C: ; 0x0222F36C ldr r2, [r2] add r1, #0xc0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 str r0, [sp] mov r0, #0x40 @@ -3935,7 +3935,7 @@ MOD62_0222F3D4: ; 0x0222F3D4 ldr r2, [r2] add r1, #0xb0 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3950,7 +3950,7 @@ MOD62_0222F3D4: ; 0x0222F3D4 ldr r2, [r2] add r1, #0xbf mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 str r0, [sp] mov r0, #0x40 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index ab30c4e0..ea96bf3b 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -1880,7 +1880,7 @@ MOD63_021D83A8: ; 0x021D83A8 add r2, r5, #0 add r3, r1, #0 str r4, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1890,7 +1890,7 @@ MOD63_021D83A8: ; 0x021D83A8 add r2, r5, #0 mov r3, #3 str r4, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1900,7 +1900,7 @@ MOD63_021D83A8: ; 0x021D83A8 add r2, r5, #0 mov r3, #7 str r4, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1910,7 +1910,7 @@ MOD63_021D83A8: ; 0x021D83A8 add r2, r5, #0 mov r3, #3 str r4, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, _021D85C8 ; =gGameVersion ldrb r7, [r0] cmp r7, #0xa ; VERSION_DIAMOND @@ -1929,14 +1929,14 @@ _021D8420: mov r0, #0x30 mov r2, #4 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r2, #0 str r2, [sp] ldr r1, [sp, #0x18] mov r0, #0x30 add r3, r2, #0 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal cmp r7, #0xa bne _021D8448 mov r1, #1 @@ -1954,7 +1954,7 @@ _021D844C: add r2, r5, #0 mov r3, #6 str r4, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r3, #1 @@ -1963,7 +1963,7 @@ _021D844C: mov r2, #6 lsl r3, r3, #0xe str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -1972,7 +1972,7 @@ _021D844C: add r2, r5, #0 mov r3, #6 str r4, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1982,7 +1982,7 @@ _021D844C: add r2, r5, #0 mov r3, #5 str r4, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r1, #0x10 @@ -1990,7 +1990,7 @@ _021D844C: mov r2, #6 lsl r3, r1, #9 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2000,7 +2000,7 @@ _021D844C: add r2, r5, #0 mov r3, #5 str r4, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2010,7 +2010,7 @@ _021D844C: add r2, r5, #0 mov r3, #1 str r4, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2020,7 +2020,7 @@ _021D844C: add r2, r5, #0 mov r3, #1 str r4, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x60 str r0, [sp] mov r0, #0x30 @@ -2028,7 +2028,7 @@ _021D844C: mov r2, #0 mov r3, #0x20 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 add r1, r0, #0 bl FUN_02017FE4 @@ -2150,7 +2150,7 @@ _021D85FE: add r2, r7, #0 mov r3, #5 str r5, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #0x80 @@ -2158,7 +2158,7 @@ _021D85FE: mov r2, #6 lsl r3, r0, #6 str r5, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2168,7 +2168,7 @@ _021D85FE: add r2, r7, #0 mov r3, #5 str r5, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _021D863A: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index db832531..6f6f8f75 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -849,7 +849,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x13 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -860,7 +860,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x13 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -871,7 +871,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x14 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -882,7 +882,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x15 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x4c @@ -890,7 +890,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x12 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x4c @@ -898,7 +898,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x12 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -909,7 +909,7 @@ MOD63_021D8F38: ; 0x021D8F38 ldr r2, [r4, #0xc] mov r0, #0x80 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -920,7 +920,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #2 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 mov r0, #0x20 str r0, [sp] @@ -929,7 +929,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -940,7 +940,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x16 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -951,7 +951,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x16 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -962,7 +962,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x48 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -973,7 +973,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r0, #0x80 mov r1, #0x49 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x4c @@ -982,7 +982,7 @@ MOD63_021D8F38: ; 0x021D8F38 mov r1, #0x47 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #4 mov r1, #0 bl GX_EngineAToggleLayers @@ -1794,7 +1794,7 @@ _021D96F8: mov r0, #0x80 mov r1, #0x1c mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1805,7 +1805,7 @@ _021D96F8: mov r0, #0x80 mov r1, #0x1a mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 str r1, [sp] ldr r0, [r5, #0x2c] @@ -1822,7 +1822,7 @@ _021D96F8: mov r0, #0x80 mov r1, #0x11 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1833,7 +1833,7 @@ _021D96F8: mov r0, #0x80 mov r1, #0xf mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 lsl r0, r0, #8 str r0, [sp] @@ -1843,7 +1843,7 @@ _021D96F8: mov r1, #0x10 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1854,7 +1854,7 @@ _021D96F8: mov r0, #0x80 mov r1, #0x1b mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1865,7 +1865,7 @@ _021D96F8: mov r0, #0x80 mov r1, #0x19 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1876,7 +1876,7 @@ _021D96F8: mov r0, #0x80 mov r1, #0x18 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x10] bl MOD63_021DA6E8 ldr r0, [r5, #0x10] @@ -3072,7 +3072,7 @@ _021DA192: mov r0, #0x80 mov r1, #0x36 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3083,7 +3083,7 @@ _021DA192: mov r0, #0x80 mov r1, #0x3b mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3094,7 +3094,7 @@ _021DA192: mov r0, #0x80 mov r1, #0x38 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3105,7 +3105,7 @@ _021DA192: mov r0, #0x80 mov r1, #0x3d mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3116,7 +3116,7 @@ _021DA192: mov r0, #0x80 mov r1, #0x39 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3127,7 +3127,7 @@ _021DA192: mov r0, #0x80 mov r1, #0x3e mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -3137,7 +3137,7 @@ _021DA192: ldr r2, [r4, #0xc] mov r0, #0x80 mov r1, #0x3a - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -3147,7 +3147,7 @@ _021DA192: ldr r2, [r4, #0xc] mov r0, #0x80 mov r1, #0x3f - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3158,7 +3158,7 @@ _021DA192: mov r0, #0x80 mov r1, #0x37 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3169,7 +3169,7 @@ _021DA192: mov r0, #0x80 mov r1, #0x3c mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xe mov r1, #1 bl GX_EngineAToggleLayers diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 16c3724b..7a70bf1f 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -704,7 +704,7 @@ MOD64_021D7A54: ; 0x021D7A54 mov r2, #0 mov r3, #0x40 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r5, #0x98 mov r1, #0 mov r2, #2 @@ -1057,7 +1057,7 @@ MOD64_021D7D7C: ; 0x021D7D7C add r4, r0, #0 str r2, [sp] mov r0, #0x52 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x54] bl NNS_G3dGetMdlSet str r0, [r4, #0x58] @@ -1091,7 +1091,7 @@ MOD64_021D7DC0: ; 0x021D7DC0 str r2, [sp] mov r0, #0x52 add r3, r6, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x64] mov r1, #0 bl NNS_G3dGetAnmByIdx @@ -2920,14 +2920,14 @@ MOD64_021D8B70: ; 0x021D8B70 mov r2, #0 add r3, #0x14 str r6, [sp] - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r2, r5, #0 str r0, [r5, #0xc] mov r0, #0x52 mov r1, #0xf add r2, #0x18 add r3, r6, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r5, #0x10] ldr r0, _021D8C04 ; =0x0000064C ldr r0, [r4, r0] @@ -3386,7 +3386,7 @@ MOD64_021D8EF4: ; 0x021D8EF4 mov r1, #0x11 mov r2, #0 mov r3, #0xa0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r5, [sp, #0x14] mov r4, #0 mov r6, #1 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index f67a1817..60bd02b5 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -351,7 +351,7 @@ MOD67_021D77B0: ; 0x021D77B0 ldr r2, [r4] mov r0, #0x50 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -361,7 +361,7 @@ MOD67_021D77B0: ; 0x021D77B0 ldr r2, [r4] mov r0, #0x50 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x2a @@ -369,7 +369,7 @@ MOD67_021D77B0: ; 0x021D77B0 mov r0, #0x50 mov r1, #4 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal b _021D7844 _021D7802: mov r0, #0 @@ -382,7 +382,7 @@ _021D7802: mov r0, #0x50 mov r1, #3 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -393,7 +393,7 @@ _021D7802: mov r0, #0x50 mov r1, #1 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x2a @@ -401,7 +401,7 @@ _021D7802: mov r0, #0x50 mov r1, #5 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal _021D7844: ldr r0, [r4] mov r1, #2 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index ebb66d25..b2170444 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -340,7 +340,7 @@ MOD68_021D77A4: ; 0x021D77A4 ldr r2, [r5] mov r0, #0x35 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -350,7 +350,7 @@ MOD68_021D77A4: ; 0x021D77A4 ldr r2, [r5] mov r0, #0x35 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -361,7 +361,7 @@ MOD68_021D77A4: ; 0x021D77A4 mov r0, #0x35 mov r1, #1 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x24 @@ -369,7 +369,7 @@ MOD68_021D77A4: ; 0x021D77A4 mov r0, #0x35 mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x24 mov r1, #0x80 bl AllocFromHeap @@ -1286,7 +1286,7 @@ MOD68_021D7EEC: ; 0x021D7EEC str r0, [sp, #0xc] ldr r2, [r4] mov r0, #0x35 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x7e lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1300,7 +1300,7 @@ MOD68_021D7EEC: ; 0x021D7EEC mov r0, #0x35 mov r2, #0 mov r3, #0x60 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 2a478ef5..58d0b4f8 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -533,7 +533,7 @@ _0222DA0E: ldr r2, [r4, #0x10] mov r0, #0x69 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -811,7 +811,7 @@ MOD69_0222DBAC: ; 0x0222DBAC ldr r2, [r4, #0x10] mov r0, #0x69 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -822,7 +822,7 @@ MOD69_0222DBAC: ; 0x0222DBAC ldr r2, [r4, #0x10] mov r0, #0x69 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x60 str r0, [sp] mov r0, #0x3f @@ -831,7 +831,7 @@ MOD69_0222DBAC: ; 0x0222DBAC mov r0, #0x69 mov r1, #4 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -843,7 +843,7 @@ MOD69_0222DBAC: ; 0x0222DBAC ldr r2, [r4, #0x10] mov r0, #0x69 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4, #0x10] mov r1, #1 bl FUN_02017CD0 @@ -1095,7 +1095,7 @@ MOD69_0222DE98: ; 0x0222DE98 mov r1, #0x29 mov r2, #0 add r3, sp, #0x18 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank mov r1, #0x5b lsl r1, r1, #2 str r0, [r4, r1] @@ -1105,7 +1105,7 @@ MOD69_0222DE98: ; 0x0222DE98 mov r1, #0x2a mov r2, #0 add r3, sp, #0x14 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank mov r1, #0x17 lsl r1, r1, #4 str r0, [r4, r1] @@ -1156,13 +1156,13 @@ MOD69_0222DF0C: ; 0x0222DF0C str r0, [sp] mov r0, #0x1b add r3, sp, #0x44 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x28] mov r0, #0x1b mov r1, #0x27 add r2, sp, #0x40 mov r3, #0x3f - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [sp, #0x24] mov r0, #0 str r0, [sp, #0x20] @@ -1303,7 +1303,7 @@ _0222DF98: ldrh r1, [r1, #4] mov r2, #1 add r3, r6, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x81 lsl r1, r1, #2 ldr r1, [r5, r1] @@ -1398,7 +1398,7 @@ _0222E10E: ldrh r1, [r1, #4] mov r2, #1 mov r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp, #0x94] add r0, sp, #0x80 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index f6d3dc58..9db294af 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -831,7 +831,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 ldr r2, [r5, #0x10] mov r0, #0x65 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -842,7 +842,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 ldr r2, [r5, #0x10] mov r0, #0x65 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x40 str r0, [sp] mov r0, #0x3d @@ -851,7 +851,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 mov r0, #0x65 mov r1, #2 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r2, #0 str r2, [sp] mov r1, #1 @@ -1357,7 +1357,7 @@ MOD70_021D7F70: ; 0x021D7F70 mov r1, #0x29 mov r2, #0 add r3, sp, #8 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank mov r1, #0x5e lsl r1, r1, #2 str r0, [r4, r1] @@ -1367,7 +1367,7 @@ MOD70_021D7F70: ; 0x021D7F70 mov r1, #0x2a mov r2, #0 add r3, sp, #4 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank mov r1, #0x5f lsl r1, r1, #2 str r0, [r4, r1] @@ -1448,13 +1448,13 @@ MOD70_021D7FF8: ; 0x021D7FF8 add r2, r3, #0 mov r0, #0x1b add r3, sp, #0x14 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0xc] mov r0, #0x1b mov r1, #0x27 add r2, sp, #0x10 mov r3, #0x3d - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData mov r4, #0 ldr r6, _021D80C4 ; =0x021D82AC str r0, [sp, #8] @@ -1605,7 +1605,7 @@ _021D80F4: ldrh r1, [r1, #4] ldr r3, [sp, #0x14] mov r2, #1 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [sp, #0x20] ldr r0, [r0, #0x18] cmp r4, r0 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 00f887bb..303bee40 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -756,7 +756,7 @@ _0222DC0C: mov r0, #0x13 mov r2, #0 add r3, r6, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0x79 lsl r1, r1, #4 str r0, [r5, r1] @@ -1821,7 +1821,7 @@ MOD71_0222E4DC: ; 0x0222E4DC ldrh r1, [r2, r1] mov r2, #5 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, _0222E548 ; =0x00002110 mov r1, #0 str r1, [r5, r0] @@ -2220,7 +2220,7 @@ MOD71_0222E884: ; 0x0222E884 str r2, [sp] ldr r2, [sp, #0x20] ldr r3, [sp, #0x24] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r6, r0, #0 beq _0222E8D6 add r1, sp, #4 @@ -2291,7 +2291,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 mov r2, #4 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 mov r0, #0x12 lsl r0, r0, #4 @@ -2301,7 +2301,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 add r1, r0, #0 bl FUN_02017FE4 @@ -2325,7 +2325,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 add r2, r4, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2353,7 +2353,7 @@ MOD71_0222E900: ; 0x0222E900 mov r1, #4 add r2, r4, #0 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 mov r1, #0x40 mov r2, #0x1a @@ -2375,7 +2375,7 @@ MOD71_0222E900: ; 0x0222E900 mov r1, #2 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2389,7 +2389,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 add r2, r4, #0 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2403,7 +2403,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 add r2, r4, #0 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #4 mov r1, #0x40 mov r2, #0x1a @@ -2628,7 +2628,7 @@ _0222EAA6: mov r0, #0x13 mov r2, #1 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD71_0222EA68 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index f8da5256..7d9850cc 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -3681,7 +3681,7 @@ MOD73_021D9258: ; 0x021D9258 mov r0, #0x7a mov r2, #0 add r3, sp, #4 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r4, r0, #0 ldr r0, [sp, #4] str r5, [sp, #8] @@ -3705,7 +3705,7 @@ MOD73_021D9288: ; 0x021D9288 add r3, r2, #0 mov r0, #0x7a add r2, sp, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp] str r5, [sp, #4] @@ -5042,7 +5042,7 @@ MOD73_021D9CA0: ; 0x021D9CA0 mov r1, #1 mov r2, #4 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -5051,7 +5051,7 @@ MOD73_021D9CA0: ; 0x021D9CA0 ldr r2, [r5, #4] mov r0, #0x7a mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5, #0x14] cmp r0, #1 bne _021D9CD6 @@ -5065,7 +5065,7 @@ _021D9CD8: mov r0, #0x7a mov r2, #0 add r3, #0x24 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x20] ldr r2, [r5, #0x24] mov r3, #0 @@ -5104,7 +5104,7 @@ _021D9CD8: mov r1, #4 mov r2, #0 add r3, #0x2c - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x28] ldr r0, [r5, #4] mov r1, #5 @@ -5997,7 +5997,7 @@ MOD73_021DA374: ; 0x021DA374 mov r2, #0 mov r3, #0x80 str r5, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6007,13 +6007,13 @@ MOD73_021DA374: ; 0x021DA374 mov r0, #0x7a mov r1, #5 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData str r5, [sp] mov r0, #0x7a mov r1, #7 mov r2, #0 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r3, #0 str r3, [sp] diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index f84a1de7..3500c458 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -785,7 +785,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #7 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -796,7 +796,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xa mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -807,7 +807,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #9 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #6 @@ -815,7 +815,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #8 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #6 @@ -824,7 +824,7 @@ MOD75_021E7214: ; 0x021E7214 mov r1, #0x12 mov r2, #0 lsl r3, r0, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x16 mov r0, #0 lsl r1, r1, #4 @@ -862,7 +862,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xb mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] mov r0, #6 @@ -870,7 +870,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xc mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -881,7 +881,7 @@ MOD75_021E7214: ; 0x021E7214 ldr r2, [r4] add r1, r0, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -892,7 +892,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0x25 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -903,7 +903,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0x24 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -914,7 +914,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xf mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0x40 str r3, [sp] mov r0, #6 @@ -922,7 +922,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xe mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index baa825fc..fc6dc5bd 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -402,7 +402,7 @@ MOD76_021D7814: ; 0x021D7814 mov r0, #0x71 mov r1, #0xa mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -413,7 +413,7 @@ MOD76_021D7814: ; 0x021D7814 mov r0, #0x71 mov r1, #0xb mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x43 @@ -421,7 +421,7 @@ MOD76_021D7814: ; 0x021D7814 mov r0, #0x71 mov r1, #0xc add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #7 mov r0, #0 lsl r1, r1, #6 @@ -2105,7 +2105,7 @@ _021D85BE: b _021D85D6 _021D85C6: ldr r0, _021D85E0 ; =0x00000483 - bl PlayBGM + bl PlaySound b _021D85D6 _021D85CE: ldr r0, _021D85DC ; =0x000005E6 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index bdbf644f..6affcb88 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -897,7 +897,7 @@ MOD77_021D7C64: ; 0x021D7C64 mov r0, #0x66 ldr r3, [r3] mov r1, #0x12 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [sp, #0x18] ldr r0, [sp, #0x20] mov r1, #6 @@ -957,7 +957,7 @@ _021D7CE0: mov r0, #0x66 ldr r3, [r3] mov r2, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [sp, #0x14] ldr r0, [sp, #0x1c] mov r5, #1 @@ -1360,7 +1360,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r1, #5 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x80 str r0, [sp] ldr r0, [r5] @@ -1369,7 +1369,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1381,7 +1381,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 ldr r2, [r5, r2] add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #8] bl Options_GetFrame lsl r0, r0, #0x18 @@ -1468,7 +1468,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r1, #5 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x80 str r0, [sp] ldr r0, [r5] @@ -1477,7 +1477,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r1, #6 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1489,7 +1489,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r1, #7 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] ldr r0, [r5] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 9f5fda4b..83e02d71 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -2001,7 +2001,7 @@ _0222E414: mov r0, #0x13 add r2, sp, #0x18 mov r3, #0x3e - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [sp, #0x14] ldr r0, [sp, #0x18] mov r1, #0x60 @@ -2797,7 +2797,7 @@ MOD80_0222EB6C: ; 0x0222EB6C mov r0, #0x68 mov r1, #4 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -2836,7 +2836,7 @@ MOD80_0222EB6C: ; 0x0222EB6C mov r0, #0x68 mov r1, #0xe add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2849,7 +2849,7 @@ MOD80_0222EB6C: ; 0x0222EB6C mov r0, #0x68 mov r1, #0x1e add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2863,7 +2863,7 @@ MOD80_0222EB6C: ; 0x0222EB6C mov r1, #0x1d add r2, r4, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r5, #0 bl MOD80_0222F338 add sp, #0x10 @@ -3790,7 +3790,7 @@ MOD80_0222F338: ; 0x0222F338 mov r1, #5 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #0x2a @@ -3804,7 +3804,7 @@ MOD80_0222F338: ; 0x0222F338 mov r1, #0xf add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -3818,7 +3818,7 @@ MOD80_0222F338: ; 0x0222F338 mov r1, #0x1f add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r4, pc} thumb_func_end MOD80_0222F338 @@ -4081,7 +4081,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r0, #0x68 mov r1, #7 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #1 lsl r0, r0, #8 str r0, [sp] @@ -4091,7 +4091,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r1, #5 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -4130,7 +4130,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r0, #0x68 mov r1, #0x11 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -4143,7 +4143,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r0, #0x68 mov r1, #0x19 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #0x2a @@ -4157,7 +4157,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r1, #0xf add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -4171,7 +4171,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r1, #0x1f add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -5100,7 +5100,7 @@ MOD80_0222FD88: ; 0x0222FD88 ldrh r1, [r1, #4] mov r2, #1 lsl r3, r3, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 bl FreeToHeap add sp, #0x30 @@ -5419,7 +5419,7 @@ MOD80_02230054: ; 0x02230054 mov r0, #0x68 mov r1, #0x11 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x60 str r0, [sp] mov r0, #0x3e @@ -5428,7 +5428,7 @@ MOD80_02230054: ; 0x02230054 mov r0, #0x68 mov r1, #7 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD80_02230054 @@ -5890,7 +5890,7 @@ MOD80_0223043C: ; 0x0223043C ldr r2, [r4, #4] mov r0, #0x68 mov r1, #0x1b - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r2, _022304BC ; =0x00000B34 ldr r0, _022304C0 ; =0x00000F98 mov r3, #0xba @@ -5922,7 +5922,7 @@ _0223048C: ldr r2, [r4, #4] mov r0, #0x68 mov r1, #0x1c - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r2, _022304C4 ; =0x00000B54 ldr r0, _022304C0 ; =0x00000F98 ldr r1, [r4, r2] @@ -6377,7 +6377,7 @@ MOD80_02230840: ; 0x02230840 mov r0, #0x68 mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #1 lsl r0, r0, #8 str r0, [sp] @@ -6387,7 +6387,7 @@ MOD80_02230840: ; 0x02230840 mov r1, #5 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -6426,7 +6426,7 @@ MOD80_02230840: ; 0x02230840 mov r0, #0x68 mov r1, #0xd add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -6439,7 +6439,7 @@ MOD80_02230840: ; 0x02230840 mov r0, #0x68 mov r1, #0x1a add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -8789,7 +8789,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r0, #0x68 mov r1, #2 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #1 lsl r0, r0, #8 str r0, [sp] @@ -8799,7 +8799,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r1, #5 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -8838,7 +8838,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r0, #0x68 mov r1, #0xc add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -8851,7 +8851,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r0, #0x68 mov r1, #0x18 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #6 @@ -8865,7 +8865,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r1, #0x1d add r2, r4, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD80_02231BF4 @@ -11828,7 +11828,7 @@ MOD80_0223346C: ; 0x0223346C mov r0, #0x68 mov r1, #1 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -11867,7 +11867,7 @@ MOD80_0223346C: ; 0x0223346C mov r0, #0x68 mov r1, #0xb add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -11880,7 +11880,7 @@ MOD80_0223346C: ; 0x0223346C mov r0, #0x68 mov r1, #0x17 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD80_0223346C @@ -13500,7 +13500,7 @@ MOD80_02234204: ; 0x02234204 str r0, [sp, #4] mov r0, #0x4b mov r1, #0xd - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut ldr r1, [sp, #8] lsr r1, r1, #1 str r1, [r4] @@ -13529,7 +13529,7 @@ MOD80_02234228: ; 0x02234228 mov r0, #0x4b mov r1, #0xc add r3, r5, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut add r7, r0, #0 ldr r0, [sp, #8] ldr r5, _02234284 ; =0x00000000 @@ -14372,7 +14372,7 @@ MOD80_022348CC: ; 0x022348CC mov r0, #0x68 add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -17002,7 +17002,7 @@ MOD80_02235C88: ; 0x02235C88 mov r1, #7 add r2, r4, r2 mov r3, #0x3e - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData ldr r3, _02235CCC ; =0x00000FF8 mov r1, #9 str r0, [r4, r3] @@ -17012,7 +17012,7 @@ MOD80_02235C88: ; 0x02235C88 mov r0, #0x56 mov r2, #1 add r3, r4, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0xff lsl r1, r1, #4 str r0, [r4, r1] @@ -18003,7 +18003,7 @@ MOD80_02236488: ; 0x02236488 mov r0, #0x5c mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x3e @@ -18011,7 +18011,7 @@ MOD80_02236488: ; 0x02236488 mov r0, #0x5c mov r1, #3 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -18055,7 +18055,7 @@ MOD80_02236488: ; 0x02236488 mov r1, #2 add r2, r4, #0 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -18068,7 +18068,7 @@ MOD80_02236488: ; 0x02236488 mov r1, #4 add r2, r4, #0 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 mov r0, #0x36 str r1, [sp] @@ -18081,7 +18081,7 @@ MOD80_02236488: ; 0x02236488 mov r1, #9 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -18094,7 +18094,7 @@ MOD80_02236488: ; 0x02236488 mov r1, #0xa add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl FUN_02017FE4 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 1d4b48de..c8b46eb9 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -358,7 +358,7 @@ MOD81_02238118: ; 0x02238118 mov r1, #6 add r2, sp, #4 mov r3, #0x39 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r7, r0, #0 beq _02238152 mov r0, #0 @@ -1072,7 +1072,7 @@ _0223869C: ldrh r0, [r1, #0x10] ldrh r1, [r1, #0x14] lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x44 pop {r4, r5, r6, r7, pc} nop @@ -1106,7 +1106,7 @@ _022386DE: mov r0, #7 mov r2, #0 add r3, sp, #0x1c - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r7, r0, #0 beq _02238746 mov r0, #0xa @@ -1169,7 +1169,7 @@ MOD81_0223874C: ; 0x0223874C add r0, r4, #0 mov r2, #1 add r3, #8 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5] mov r0, #0x3a add r3, r5, #0 @@ -1178,7 +1178,7 @@ MOD81_0223874C: ; 0x0223874C add r1, r6, #0 mov r2, #1 add r3, #0xc - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5, #4] add sp, #4 pop {r3, r4, r5, r6, pc} @@ -1657,7 +1657,7 @@ MOD81_02238A84: ; 0x02238A84 mov r2, #0 mov r3, #0x3a add r5, r4, r6 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, r6] ldr r1, [sp, #4] add r0, r7, #0 @@ -2237,7 +2237,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0xe mov r1, #7 mov r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2249,7 +2249,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x16 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2261,7 +2261,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x15 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -2270,7 +2270,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x17 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2282,7 +2282,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x16 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2294,7 +2294,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x15 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -2303,7 +2303,7 @@ MOD81_02238E44: ; 0x02238E44 mov r1, #0x17 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r4, #0x40] mov r1, #1 bl FUN_02017CD0 @@ -2843,7 +2843,7 @@ MOD81_022393F4: ; 0x022393F4 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x5c @@ -2852,7 +2852,7 @@ MOD81_022393F4: ; 0x022393F4 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #2 add r1, r4, #0 str r0, [sp] @@ -3687,7 +3687,7 @@ MOD81_022399FC: ; 0x022399FC ldr r2, [r2] mov r0, #0x5d add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3701,7 +3701,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #2 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] add r2, r4, #0 @@ -3714,7 +3714,7 @@ MOD81_022399FC: ; 0x022399FC ldr r2, [r2] mov r0, #0x5d mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -3727,7 +3727,7 @@ MOD81_022399FC: ; 0x022399FC ldr r2, [r2] mov r0, #0x5d mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] bl MOD81_02238828 add r5, r0, #0 @@ -3739,7 +3739,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -3748,7 +3748,7 @@ MOD81_022399FC: ; 0x022399FC mov r1, #3 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, _02239C90 ; =0x0223D07C lsl r1, r5, #1 ldrh r5, [r0, r1] @@ -3762,7 +3762,7 @@ MOD81_022399FC: ; 0x022399FC mov r1, #3 mov r2, #0 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0x20 str r0, [sp] mov r0, #0x40 @@ -3773,7 +3773,7 @@ MOD81_022399FC: ; 0x022399FC mov r1, #3 mov r2, #4 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3787,7 +3787,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #5 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3801,7 +3801,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #5 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3815,7 +3815,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #4 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3829,7 +3829,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #4 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x3a mov r1, #0x60 bl AllocFromHeap @@ -4113,7 +4113,7 @@ MOD81_02239E00: ; 0x02239E00 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #0xd - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r3, #0 str r3, [sp] mov r0, #2 @@ -4126,7 +4126,7 @@ MOD81_02239E00: ; 0x02239E00 mov r0, #0x5d mov r1, #0xd mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x60 @@ -4135,7 +4135,7 @@ MOD81_02239E00: ; 0x02239E00 mov r1, #0xe mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #0x3a str r0, [sp] add r0, sp, #0x60 @@ -4144,7 +4144,7 @@ MOD81_02239E00: ; 0x02239E00 mov r1, #0xe mov r2, #2 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #1 add r1, r7, #0 str r0, [sp] @@ -5775,7 +5775,7 @@ _0223AAE8: mov r0, #0x5d add r1, r7, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5787,7 +5787,7 @@ _0223AAE8: mov r0, #0x5d add r1, r7, #0 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5799,7 +5799,7 @@ _0223AAE8: ldr r2, [r4, #0x24] mov r0, #0x5d mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5811,7 +5811,7 @@ _0223AAE8: ldr r2, [r4, #0x24] mov r0, #0x5d mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -5821,7 +5821,7 @@ _0223AAE8: mov r0, #0x5d add r1, r6, #0 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -5832,7 +5832,7 @@ _0223AAE8: add r1, r6, #0 mov r2, #4 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r1, #3 add r3, r1, #0 ldr r0, [r4, #0x24] @@ -6020,7 +6020,7 @@ MOD81_0223ACE8: ; 0x0223ACE8 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x5c @@ -6029,7 +6029,7 @@ MOD81_0223ACE8: ; 0x0223ACE8 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #0 add r1, r4, #0 str r0, [sp] @@ -6769,7 +6769,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x13 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6781,7 +6781,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x13 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6793,7 +6793,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x12 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6805,7 +6805,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x12 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -6814,7 +6814,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x14 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -6823,7 +6823,7 @@ MOD81_0223B264: ; 0x0223B264 mov r1, #0x14 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0xc8 str r0, [sp] mov r1, #1 @@ -7284,7 +7284,7 @@ _0223B6F0: mov r0, #0x5d add r1, r7, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7296,7 +7296,7 @@ _0223B6F0: mov r0, #0x5d add r1, r7, #0 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7308,7 +7308,7 @@ _0223B6F0: ldr r2, [r4, #0x24] mov r0, #0x5d mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7320,7 +7320,7 @@ _0223B6F0: ldr r2, [r4, #0x24] mov r0, #0x5d mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -7330,7 +7330,7 @@ _0223B6F0: mov r0, #0x5d add r1, r6, #0 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -7341,7 +7341,7 @@ _0223B6F0: add r1, r6, #0 mov r2, #4 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r1, #3 ldr r0, [r4, #0x24] add r2, r1, #0 @@ -7539,7 +7539,7 @@ MOD81_0223B908: ; 0x0223B908 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x5c @@ -7548,7 +7548,7 @@ MOD81_0223B908: ; 0x0223B908 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #1 add r1, r4, #0 str r0, [sp] @@ -8417,7 +8417,7 @@ MOD81_0223BF74: ; 0x0223BF74 ldr r2, [r4, #0xc] mov r0, #0x5d add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8429,7 +8429,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #2 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8440,7 +8440,7 @@ MOD81_0223BF74: ; 0x0223BF74 ldr r2, [r4, #0xc] mov r0, #0x5d mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8451,7 +8451,7 @@ MOD81_0223BF74: ; 0x0223BF74 ldr r2, [r4, #0xc] mov r0, #0x5d mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] bl MOD81_02238828 add r5, r0, #0 @@ -8463,7 +8463,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -8472,7 +8472,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r1, #3 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, _0223C1A0 ; =0x0223D280 lsl r1, r5, #1 ldrh r5, [r0, r1] @@ -8486,7 +8486,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r1, #3 mov r2, #0 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0x20 str r0, [sp] mov r0, #0x40 @@ -8497,7 +8497,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r1, #3 mov r2, #4 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8509,7 +8509,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #5 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8521,7 +8521,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #5 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8533,7 +8533,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #4 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8545,7 +8545,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #4 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x3a mov r1, #0x60 bl AllocFromHeap @@ -9289,7 +9289,7 @@ MOD81_0223C658: ; 0x0223C658 mov r0, #0xe mov r1, #7 mov r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r4, #0x44] mov r1, #1 bl FUN_02017CD0 @@ -9304,7 +9304,7 @@ MOD81_0223C658: ; 0x0223C658 mov r0, #0x5d mov r1, #0x16 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -9316,7 +9316,7 @@ MOD81_0223C658: ; 0x0223C658 mov r0, #0x5d mov r1, #0x15 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -9325,7 +9325,7 @@ MOD81_0223C658: ; 0x0223C658 mov r0, #0x5d mov r1, #0x17 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 bl MOD81_0223CAC4 mov r1, #0 @@ -9611,7 +9611,7 @@ _0223C982: add r0, #0x48 bl CopyWindowToVram ldr r0, _0223CA90 ; =0x00000484 - bl PlayBGM + bl PlaySound mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -9895,7 +9895,7 @@ MOD81_0223CBE0: ; 0x0223CBE0 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x5c @@ -9904,7 +9904,7 @@ MOD81_0223CBE0: ; 0x0223CBE0 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #2 add r1, r4, #0 str r0, [sp] diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 7b00d33a..f1a3e494 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -1617,7 +1617,7 @@ MOD82_0222E264: ; 0x0222E264 mov r0, #0x5c mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x44 @@ -1625,7 +1625,7 @@ MOD82_0222E264: ; 0x0222E264 mov r0, #0x5c mov r1, #3 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -1669,7 +1669,7 @@ MOD82_0222E264: ; 0x0222E264 mov r1, #2 add r2, r4, #0 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -1682,7 +1682,7 @@ MOD82_0222E264: ; 0x0222E264 mov r1, #4 add r2, r4, #0 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 mov r0, #0x36 str r1, [sp] @@ -1695,7 +1695,7 @@ MOD82_0222E264: ; 0x0222E264 mov r1, #9 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -1708,7 +1708,7 @@ MOD82_0222E264: ; 0x0222E264 mov r1, #0xa add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl FUN_02017FE4 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index f067a6f1..09c161b4 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -792,7 +792,7 @@ MOD83_0222DBD0: ; 0x0222DBD0 mov r1, #0x29 mov r2, #0 mov r3, #0x80 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0xe lsl r0, r0, #6 str r0, [sp] @@ -807,7 +807,7 @@ MOD83_0222DBD0: ; 0x0222DBD0 mov r0, #0x74 mov r1, #0x28 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2581,7 +2581,7 @@ _0222E960: add r3, r0, #0 add r2, r1, #0 add r3, #0x8c - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -2594,7 +2594,7 @@ _0222E960: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x74 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2607,7 +2607,7 @@ _0222E960: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x74 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -2645,7 +2645,7 @@ MOD83_0222EA88: ; 0x0222EA88 mov r0, #0x74 mov r1, #0 add r3, #0xfc - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -2658,7 +2658,7 @@ MOD83_0222EA88: ; 0x0222EA88 str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x74 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2672,7 +2672,7 @@ MOD83_0222EA88: ; 0x0222EA88 ldr r2, [r4, #4] mov r0, #0x74 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -5690,7 +5690,7 @@ MOD83_022302B4: ; 0x022302B4 mov r0, #0x74 mov r1, #0 add r3, #0xfc - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -5703,7 +5703,7 @@ MOD83_022302B4: ; 0x022302B4 mov r0, #0x74 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -5717,7 +5717,7 @@ MOD83_022302B4: ; 0x022302B4 mov r1, #2 add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -5751,7 +5751,7 @@ MOD83_02230330: ; 0x02230330 add r3, r0, #0 add r2, r1, #0 add r3, #0x8c - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -5764,7 +5764,7 @@ MOD83_02230330: ; 0x02230330 mov r0, #0x74 add r2, r4, #0 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -5777,7 +5777,7 @@ MOD83_02230330: ; 0x02230330 mov r0, #0x74 mov r1, #2 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -8285,7 +8285,7 @@ MOD83_02231820: ; 0x02231820 mov r1, #0xb mov r2, #0 lsl r3, r3, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x57 @@ -8295,7 +8295,7 @@ MOD83_02231820: ; 0x02231820 mov r1, #0x10 mov r2, #0 lsl r3, r3, #6 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #3 @@ -8308,7 +8308,7 @@ MOD83_02231820: ; 0x02231820 mov r0, #0x74 mov r1, #0x11 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -8321,7 +8321,7 @@ MOD83_02231820: ; 0x02231820 mov r0, #0x74 mov r1, #0x12 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -9382,7 +9382,7 @@ MOD83_022320D8: ; 0x022320D8 add r6, r3, #0 ldr r3, [r5] mov r0, #0x74 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, sp, #4 add r7, r0, #0 bl NNS_G2dGetUnpackedScreenData @@ -9417,7 +9417,7 @@ MOD83_02232118: ; 0x02232118 mov r0, #0x74 mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #3 @@ -9431,7 +9431,7 @@ MOD83_02232118: ; 0x02232118 ldr r2, [r5, r2] mov r0, #0x74 mov r1, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData cmp r4, #0 beq _0223215E cmp r4, #1 @@ -9451,7 +9451,7 @@ _0223215E: ldr r2, [r5, r2] mov r0, #0x74 mov r1, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData b _0223219C _0223217E: mov r0, #0 @@ -9467,7 +9467,7 @@ _0223217E: ldr r2, [r5, r2] mov r0, #0x74 mov r1, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _0223219C: mov r0, #0x20 str r0, [sp] @@ -9478,7 +9478,7 @@ _0223219C: add r3, r0, #0 add r2, r1, #0 add r3, #0xec - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #2 @@ -9492,7 +9492,7 @@ _0223219C: ldr r2, [r5, r2] mov r0, #0x74 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #3 add r0, r5, #0 mov r1, #2 @@ -9622,7 +9622,7 @@ _022322A8: str r0, [sp, #4] mov r0, #0x13 mov r3, #0x60 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal _022322DC: mov r0, #0xb2 mov r6, #0 @@ -9673,7 +9673,7 @@ _02232312: str r0, [sp] mov r0, #0x13 add r3, sp, #0x18 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x14] ldr r0, [sp, #0x18] mov r1, #2 @@ -15800,7 +15800,7 @@ _02235132: str r0, [sp, #4] mov r0, #0x13 add r3, #0xff - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD83_022350EC @@ -17545,7 +17545,7 @@ _02235F48: mov r0, #0x74 mov r1, #0x13 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -17559,7 +17559,7 @@ _02235F48: mov r0, #0x74 mov r1, #0x16 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #2 mov r1, #0x4e bl FUN_02002C50 @@ -17588,7 +17588,7 @@ MOD83_02235FBC: ; 0x02235FBC mov r0, #0x74 mov r1, #0x14 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -17846,7 +17846,7 @@ _02236148: mov r0, #0x74 mov r1, #0x15 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -23956,7 +23956,7 @@ MOD83_02238F94: ; 0x02238F94 str r0, [sp, #4] ldrh r0, [r4] ldrh r1, [r4, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -24183,7 +24183,7 @@ MOD83_022391CC: ; 0x022391CC mov r0, #0x74 mov r1, #0x1d add r3, #0xfc - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #8 pop {r3, pc} .align 2, 0 @@ -24213,14 +24213,14 @@ MOD83_022391EC: ; 0x022391EC str r0, [sp, #0xc] mov r0, #0x74 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #1 ldr r3, _022392DC ; =MOD83_0223BC30 str r2, [sp] ldr r3, [r3, #4] mov r0, #0x74 mov r1, #0x1f - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, sp, #0x14 str r0, [sp, #0x10] bl NNS_G2dGetUnpackedScreenData diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index 2f29a2a9..a5838988 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -596,7 +596,7 @@ MOD84_021D7968: ; 0x021D7968 mov r0, #0x7f mov r1, #0x42 add r3, r2, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r3, #0 str r3, [sp] mov r0, #0x20 @@ -606,7 +606,7 @@ MOD84_021D7968: ; 0x021D7968 mov r0, #0x7f mov r1, #0x42 mov r2, #4 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset ldr r2, _021D7A74 ; =0x04000050 mov r0, #0 add r3, r2, #0 @@ -859,7 +859,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 mov r1, #1 mov r3, #0x4b add r4, #0x38 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r5, #0x38] ldr r1, [sp, #8] bl DC_FlushRange @@ -924,7 +924,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 mov r0, #0x7f mov r1, #3 mov r3, #0x4b - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r4, #4] cmp r0, #0 beq _021D7CCC @@ -1129,7 +1129,7 @@ _021D7E08: str r0, [sp, #4] mov r0, #0x7f mov r3, #0x4b - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r4] cmp r0, #0 beq _021D7E9A @@ -1274,7 +1274,7 @@ _021D7F2C: ldrh r1, [r1, r4] mov r0, #0x7f add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x4b ldr r1, _021D7F88 ; =0x021DA662 str r0, [sp] @@ -1286,7 +1286,7 @@ _021D7F2C: mov r0, #0x7f mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette ldr r1, _021D7F8C ; =0x021DA664 ldr r2, _021D7F90 ; =0x021DA666 ldrh r1, [r1, r4] diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index 6a42cff9..17f9316e 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -105,7 +105,7 @@ MOD84_021D81DC: ; 0x021D81DC add r1, r6, #0 mov r2, #0 add r3, #8 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r4] mov r0, #0x4b add r3, r4, #0 @@ -114,7 +114,7 @@ MOD84_021D81DC: ; 0x021D81DC add r1, r7, #0 mov r2, #0 add r3, #0xc - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r4, #4] _021D8218: add r0, r4, #0 @@ -940,7 +940,7 @@ MOD84_021D881C: ; 0x021D881C ldr r3, [r4, #8] mov r0, #0x7f mov r1, #0x2a - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -951,7 +951,7 @@ MOD84_021D881C: ; 0x021D881C ldr r3, [r4, #8] mov r0, #0x7f mov r1, #0x2b - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] mov r0, #0x4b @@ -960,7 +960,7 @@ MOD84_021D881C: ; 0x021D881C mov r0, #0x7f mov r1, #0x2c add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -1137,7 +1137,7 @@ _021D899C: mov r0, #0x7f mov r1, #0x41 add r3, r2, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0x80 str r0, [sp] mov r0, #6 @@ -1149,7 +1149,7 @@ _021D899C: mov r1, #0x41 mov r2, #4 mov r3, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1165,7 +1165,7 @@ _021D89D8: mov r0, #0x7f mov r1, #4 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1176,7 +1176,7 @@ _021D89D8: ldr r2, [r5, #4] mov r0, #0x7f add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1192,7 +1192,7 @@ _021D8A10: mov r0, #0x7f mov r1, #5 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1208,7 +1208,7 @@ _021D8A30: mov r0, #0x7f mov r1, #7 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1420,7 +1420,7 @@ _021D8BB2: mov r0, #0x7f mov r1, #0x24 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1431,7 +1431,7 @@ _021D8BB2: mov r0, #0x7f mov r1, #0x22 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1447,7 +1447,7 @@ _021D8BEA: mov r0, #0x7f mov r1, #0x25 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1463,7 +1463,7 @@ _021D8C0A: mov r0, #0x7f mov r1, #0x23 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1762,7 +1762,7 @@ _021D8E4A: mov r0, #0x7f mov r1, #0x22 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1773,7 +1773,7 @@ _021D8E4A: mov r0, #0x7f mov r1, #0x22 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -1791,7 +1791,7 @@ _021D8E86: mov r0, #0x7f mov r1, #0x23 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -1809,7 +1809,7 @@ _021D8EAA: mov r0, #0x7f mov r1, #0x23 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -1853,7 +1853,7 @@ _021D8EF2: mov r0, #0x7f mov r1, #0x37 add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x4b str r0, [sp] add r4, #0x34 @@ -1862,7 +1862,7 @@ _021D8EF2: mov r2, #1 mov r3, #0 str r4, [sp, #4] - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -1911,7 +1911,7 @@ _021D8F86: mov r1, #0x28 mov r2, #0 add r3, sp, #0x20 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x18] cmp r0, #0 beq _021D8FC8 @@ -2579,7 +2579,7 @@ _021D94BA: mov r0, #0x7f mov r1, #0x26 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2590,7 +2590,7 @@ _021D94BA: mov r0, #0x7f mov r1, #0x22 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2606,7 +2606,7 @@ _021D94F2: mov r0, #0x7f mov r1, #0x27 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2622,7 +2622,7 @@ _021D9512: mov r0, #0x7f mov r1, #0x23 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2861,7 +2861,7 @@ _021D96D4: mov r0, #0x7f mov r1, #0x10 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2872,7 +2872,7 @@ _021D96D4: mov r0, #0x7f mov r1, #0x12 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2883,7 +2883,7 @@ _021D96D4: mov r0, #0x7f mov r1, #0x11 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2894,7 +2894,7 @@ _021D96D4: mov r0, #0x7f mov r1, #0x13 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [r4, #0x64] ldr r0, [r5] @@ -3049,7 +3049,7 @@ _021D986A: mov r0, #0x7f mov r1, #8 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3060,7 +3060,7 @@ _021D986A: mov r0, #0x7f mov r1, #0xa mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3076,7 +3076,7 @@ _021D98A2: mov r0, #0x7f mov r1, #9 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3092,7 +3092,7 @@ _021D98C2: mov r0, #0x7f mov r1, #0xb mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3108,7 +3108,7 @@ _021D98E2: mov r0, #0x7f mov r1, #0xc mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3119,7 +3119,7 @@ _021D98E2: mov r0, #0x7f mov r1, #0xe mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3135,7 +3135,7 @@ _021D991A: mov r0, #0x7f mov r1, #0xd mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3151,7 +3151,7 @@ _021D993A: mov r0, #0x7f mov r1, #0xf mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3178,7 +3178,7 @@ _021D995A: mov r0, #0x7f mov r1, #0x3b add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping add r0, r4, #0 add r0, #0x34 bl NNS_G2dInitImagePaletteProxy @@ -3191,7 +3191,7 @@ _021D995A: mov r1, #0x3c mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #2 str r0, [sp] add r2, r4, #0 @@ -3452,7 +3452,7 @@ _021D9B7A: mov r0, #0x7f mov r1, #0x28 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3463,7 +3463,7 @@ _021D9B7A: mov r0, #0x7f mov r1, #0x22 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3479,7 +3479,7 @@ _021D9BB2: mov r0, #0x7f mov r1, #0x29 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3495,7 +3495,7 @@ _021D9BD2: mov r0, #0x7f mov r1, #0x23 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3560,7 +3560,7 @@ MOD84_021D9C1C: ; 0x021D9C1C mov r1, #0x41 add r2, #0x5c mov r3, #0x4b - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r4, #0x58] cmp r0, #0 beq _021D9C76 @@ -3726,7 +3726,7 @@ _021D9D6A: mov r0, #0x7f mov r1, #0x1c mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3737,7 +3737,7 @@ _021D9D6A: mov r0, #0x7f mov r1, #0x18 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3748,7 +3748,7 @@ _021D9D6A: mov r0, #0x7f mov r1, #0x1d mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3759,7 +3759,7 @@ _021D9D6A: mov r0, #0x7f mov r1, #0x19 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 add r4, #0xec str r0, [r4] @@ -3823,7 +3823,7 @@ _021D9E3C: mov r0, #0x7f mov r1, #0x20 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3834,7 +3834,7 @@ _021D9E3C: mov r0, #0x7f mov r1, #0x1e mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3845,7 +3845,7 @@ _021D9E3C: mov r0, #0x7f mov r1, #0x21 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3856,7 +3856,7 @@ _021D9E3C: mov r0, #0x7f mov r1, #0x1f mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 add r4, #0xec str r0, [r4] @@ -4003,7 +4003,7 @@ _021D9FBE: mov r0, #0x7f mov r1, #0x2a mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4014,7 +4014,7 @@ _021D9FBE: mov r0, #0x7f mov r1, #0x2b mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] mov r0, #0x4b @@ -4023,7 +4023,7 @@ _021D9FBE: mov r0, #0x7f mov r1, #0x2c add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 add r4, #0xec str r0, [r4] @@ -4136,7 +4136,7 @@ _021DA0E2: mov r0, #0x7f mov r1, #0x16 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4147,7 +4147,7 @@ _021DA0E2: mov r0, #0x7f mov r1, #0x1a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4163,7 +4163,7 @@ _021DA11A: mov r0, #0x7f mov r1, #0x17 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4179,7 +4179,7 @@ _021DA13A: mov r0, #0x7f mov r1, #0x1b mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4195,7 +4195,7 @@ _021DA15A: mov r0, #0x7f mov r1, #0x14 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4206,7 +4206,7 @@ _021DA15A: mov r0, #0x7f mov r1, #0x18 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4222,7 +4222,7 @@ _021DA192: mov r0, #0x7f mov r1, #0x15 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4238,7 +4238,7 @@ _021DA1B2: mov r0, #0x7f mov r1, #0x19 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4276,7 +4276,7 @@ _021DA1E2: mov r0, #0x7f mov r1, #0x3f add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x4b str r0, [sp] add r4, #0x40 @@ -4285,7 +4285,7 @@ _021DA1E2: mov r1, #0x40 mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4304,7 +4304,7 @@ _021DA238: mov r0, #0x7f mov r1, #0x3f add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x4b str r0, [sp] add r0, r4, #0 @@ -4314,7 +4314,7 @@ _021DA238: mov r1, #0x40 mov r2, #2 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #2 str r0, [sp] add r2, r4, #0 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index db86339d..2bd7d12a 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -629,7 +629,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -640,7 +640,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] ldr r0, [r5] @@ -649,7 +649,7 @@ _021D7A06: ldr r1, [sp, #0x14] mov r0, #0x84 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -660,7 +660,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -671,7 +671,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] ldr r0, [r5] @@ -680,7 +680,7 @@ _021D7A06: mov r0, #0x84 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -691,7 +691,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -715,7 +715,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0x20 str r3, [sp] ldr r0, [r5] @@ -723,7 +723,7 @@ _021D7A06: str r0, [sp, #4] mov r0, #0x84 mov r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -734,7 +734,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -759,7 +759,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0x20 str r3, [sp] ldr r0, [r5] @@ -767,7 +767,7 @@ _021D7A06: str r0, [sp, #4] mov r0, #0x84 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 ldr r3, [r5] mov r1, #0x20 diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c new file mode 100644 index 00000000..769c90d9 --- /dev/null +++ b/arm9/src/gf_gfx_loader.c @@ -0,0 +1,349 @@ +#include "global.h"
+#include "filesystem.h"
+#include "NNS_g2d.h"
+#include "gf_gfx_loader.h"
+
+THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
+{
+ NNSG2dCharacterData * pCharData;
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
+ {
+ if (NNS_G2dGetUnpackedBGCharacterData(pFile, &pCharData))
+ {
+ if (szByte == 0)
+ szByte = pCharData->szByte;
+ FUN_02017E14(unkStruct02016B94_2, (u8)a3, pCharData->pRawData, szByte, a4);
+ }
+ FreeToHeap(pFile);
+ }
+ return szByte;
+}
+
+THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
+{
+ NNSG2dScreenData * pScreenData;
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, TRUE);
+ if (pFile != NULL)
+ {
+ if (NNS_G2dGetUnpackedScreenData(pFile, &pScreenData))
+ {
+ if (szByte == 0)
+ szByte = pScreenData->szByte;
+ if (FUN_0201886C(unkStruct02016B94_2, (u8)a3) != NULL)
+ FUN_02017DFC(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte);
+ FUN_02017CE8(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte, a4);
+ }
+ FreeToHeap(pFile);
+ }
+}
+
+THUMB_FUNC void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 baseAddr, u32 szByte, u32 heap_id)
+{
+ GfGfxLoader_GXLoadPalWithSrcOffset(narcId, memberNo, whichRoutine, 0, baseAddr, szByte, heap_id);
+}
+
+THUMB_FUNC void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 srcOffset, u32 baseAddr, u32 szByte, u32 heap_id)
+{
+ static void (*const load_funcs[])(void *, u32, u32) = {
+ GX_LoadBGPltt,
+ GX_LoadOBJPltt,
+ GX_LoadBGExtPltt,
+ GX_LoadOBJExtPltt,
+ GXS_LoadBGPltt,
+ GXS_LoadOBJPltt,
+ GXS_LoadBGExtPltt,
+ GXS_LoadOBJExtPltt
+ };
+ NNSG2dPaletteData * pPltData;
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, FALSE, heap_id, TRUE);
+ if (pFile != NULL)
+ {
+ if (NNS_G2dGetUnpackedPaletteData(pFile, &pPltData))
+ {
+ pPltData->pRawData = (void *)((u32)pPltData->pRawData + srcOffset);
+ if (szByte == 0)
+ szByte = pPltData->szByte - srcOffset;
+ DC_FlushRange(pPltData->pRawData, szByte);
+ switch (whichRoutine)
+ {
+ case 2:
+ GX_BeginLoadBGExtPltt();
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
+ GX_EndLoadBGExtPltt();
+ break;
+ case 6:
+ GXS_BeginLoadBGExtPltt();
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
+ GXS_EndLoadBGExtPltt();
+ break;
+ case 3:
+ GX_BeginLoadOBJExtPltt();
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
+ GX_EndLoadOBJExtPltt();
+ break;
+ case 7:
+ GXS_BeginLoadOBJExtPltt();
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
+ GXS_EndLoadOBJExtPltt();
+ break;
+ default:
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
+ break;
+ }
+ }
+ FreeToHeap(pFile);
+ }
+}
+
+THUMB_FUNC u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 whichRoutine, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id)
+{
+ static void (*const load_funcs[])(void *, u32, u32) = {
+ GX_LoadOBJ,
+ GXS_LoadOBJ
+ };
+
+ NNSG2dCharacterData* pCharData;
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
+ if (pFile != NULL)
+ {
+ if (NNS_G2dGetUnpackedCharacterData(pFile, &pCharData))
+ {
+ if (szByte == 0)
+ szByte = pCharData->szByte;
+ DC_FlushRange(pCharData->pRawData, szByte);
+ load_funcs[whichRoutine](pCharData->pRawData, baseAddr, szByte);
+ }
+ FreeToHeap(pFile);
+ }
+ return szByte;
+}
+
+THUMB_FUNC void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heap_id, NNSG2dImagePaletteProxy * pPltProxy)
+{
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heap_id, TRUE);
+ NNSG2dPaletteData* pPlttData;
+ NNSG2dPaletteCompressInfo* pCompressInfo;
+ if (pFile != NULL)
+ {
+ BOOL isCompressed = NNS_G2dGetUnpackedPaletteCompressInfo(pFile, &pCompressInfo);
+ if (NNS_G2dGetUnpackedPaletteData(pFile, &pPlttData))
+ {
+ if (isCompressed)
+ {
+ NNS_G2dLoadPaletteEx(pPlttData, pCompressInfo, baseAddr, vramType, pPltProxy);
+ }
+ else
+ {
+ NNS_G2dLoadPalette(pPlttData, baseAddr, vramType, pPltProxy);
+ }
+ }
+ FreeToHeap(pFile);
+ }
+}
+
+THUMB_FUNC u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy *pImgProxy)
+{
+ static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = {
+ NNS_G2dLoadImage1DMapping,
+ NNS_G2dLoadImage2DMapping
+ };
+
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
+ u32 retSize = 0;
+ NNSG2dCharacterData * pSrcData;
+ if (pFile != NULL)
+ {
+ if (NNS_G2dGetUnpackedCharacterData(pFile, &pSrcData))
+ {
+ if (szByte != 0)
+ pSrcData->szByte = szByte;
+ load_funcs[whichRoutine](pSrcData, baseAddr, type, pImgProxy);
+ retSize = pSrcData->szByte;
+ }
+ FreeToHeap(pFile);
+ }
+ return retSize;
+}
+
+THUMB_FUNC void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy * pImageProxy)
+{
+ static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = {
+ NNS_G2dLoadImage1DMapping,
+ NNS_G2dLoadImage2DMapping
+ };
+ NNSG2dCharacterData * pCharacterData;
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
+ if (pFile != NULL)
+ {
+ if (NNS_G2dGetUnpackedCharacterData(pFile, &pCharacterData))
+ {
+ if (szByte != 0)
+ pCharacterData->szByte = szByte;
+ switch (type)
+ {
+ case NNS_G2D_VRAM_TYPE_2DMAIN:
+ pCharacterData->mapingType = (GXOBJVRamModeChar)(reg_GX_DISPCNT & (REG_GX_DISPCNT_EXOBJ_CH_MASK | REG_GX_DISPCNT_OBJMAP_CH_MASK));
+ break;
+ case NNS_G2D_VRAM_TYPE_2DSUB:
+ pCharacterData->mapingType = (GXOBJVRamModeChar)(reg_GXS_DB_DISPCNT & (REG_GXS_DB_DISPCNT_EXOBJ_MASK | REG_GXS_DB_DISPCNT_OBJMAP_CH_MASK));
+ break;
+ default:
+ ;
+ }
+ load_funcs[whichRoutine](pCharacterData, baseAddr, type, pImageProxy);
+ }
+ FreeToHeap(pFile);
+ }
+}
+
+THUMB_FUNC void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, u32 heap_id)
+{
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
+ {
+ if (!NNS_G2dGetUnpackedBGCharacterData(pFile, ppCharData))
+ {
+ FreeToHeap(pFile);
+ return NULL;
+ }
+ }
+ return pFile;
+}
+
+THUMB_FUNC void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** ppScrData, u32 heap_id)
+{
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
+ {
+ if (!NNS_G2dGetUnpackedScreenData(pFile, ppScrData))
+ {
+ FreeToHeap(pFile);
+ return NULL;
+ }
+ }
+ return pFile;
+}
+
+THUMB_FUNC void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData ** ppPltData, u32 heap_id)
+{
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heap_id, FALSE);
+ if (pFile != NULL)
+ {
+ if (!NNS_G2dGetUnpackedPaletteData(pFile, ppPltData))
+ {
+ FreeToHeap(pFile);
+ return NULL;
+ }
+ }
+ return pFile;
+}
+
+THUMB_FUNC void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** ppCellBank, u32 heap_id)
+{
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
+ {
+ if (!NNS_G2dGetUnpackedCellBank(pFile, ppCellBank))
+ {
+ FreeToHeap(pFile);
+ return NULL;
+ }
+ }
+ return pFile;
+}
+
+THUMB_FUNC void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** ppAnimBank, u32 heap_id)
+{
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
+ {
+ if (!NNS_G2dGetUnpackedAnimBank(pFile, ppAnimBank))
+ {
+ FreeToHeap(pFile);
+ return NULL;
+ }
+ }
+ return pFile;
+}
+
+THUMB_FUNC void * GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, u32 heap_id)
+{
+ return GfGfxLoader_LoadFromNarc(narcId, memberId, TRUE, heap_id, FALSE);
+}
+
+THUMB_FUNC void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd)
+{
+ void * dest;
+ void * dest2;
+ if (isCompressed || allocAtEnd == TRUE)
+ {
+ u32 size = GetNarcMemberSizeByIdPair(narcId, memberNo);
+ dest = AllocFromHeapAtEnd(heap_id, size);
+ }
+ else
+ {
+ u32 size = GetNarcMemberSizeByIdPair(narcId, memberNo);
+ dest = AllocFromHeap(heap_id, size);
+ }
+ if (dest != NULL)
+ {
+ ReadWholeNarcMemberByIdPair(dest, narcId, memberNo);
+ if (isCompressed)
+ {
+ if (allocAtEnd == FALSE)
+ {
+ dest2 = AllocFromHeap(heap_id, (*(u32 *)dest) >> 8);
+ }
+ else
+ {
+ dest2 = AllocFromHeapAtEnd(heap_id, (*(u32 *)dest) >> 8);
+ }
+ if (dest2 != NULL)
+ {
+ MI_UncompressLZ8(dest, dest2);
+ FreeToHeap(dest);
+ }
+ dest = dest2; // UB: if dest2 is NULL, dest is never freed
+ }
+ }
+ return dest;
+}
+
+THUMB_FUNC void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd, u32 *size_p)
+{
+ void * dest;
+ void * dest2;
+ *size_p = GetNarcMemberSizeByIdPair(narcId, memberNo);
+ if (isCompressed || allocAtEnd == TRUE)
+ {
+ dest = AllocFromHeapAtEnd(heap_id, *size_p);
+ }
+ else
+ {
+ dest = AllocFromHeap(heap_id, *size_p);
+ }
+ if (dest != NULL)
+ {
+ ReadWholeNarcMemberByIdPair(dest, narcId, memberNo);
+ if (isCompressed)
+ {
+ *size_p = (*(u32 *)dest) >> 8;
+ if (allocAtEnd == FALSE)
+ {
+ dest2 = AllocFromHeap(heap_id, *size_p);
+ }
+ else
+ {
+ dest2 = AllocFromHeapAtEnd(heap_id, *size_p);
+ }
+ if (dest2 != NULL)
+ {
+ MI_UncompressLZ8(dest, dest2);
+ FreeToHeap(dest);
+ }
+ dest = dest2; // UB: if dest2 is NULL, dest is never freed
+ }
+ }
+ return dest;
+}
diff --git a/arm9/src/main.c b/arm9/src/main.c index 7a8a14d8..749bec41 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -16,7 +16,6 @@ #include "unk_0202F150.h" #include "module_52.h" - FS_EXTERN_OVERLAY(MODULE_52); FS_EXTERN_OVERLAY(MODULE_63); diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 75ddbc8e..7adb1fe8 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -578,7 +578,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01FF(struct ScriptContext *ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk026D(struct ScriptContext *ctx) //message unown font? +THUMB_FUNC BOOL ScrCmd_MessageUnown(struct ScriptContext *ctx) { struct UnkStruct_0203A288 myLocalStruct; u16 msg = ScriptReadHalfword(ctx); @@ -743,7 +743,7 @@ THUMB_FUNC static BOOL FUN_0203A4E0(struct ScriptContext *ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0032(struct ScriptContext *ctx) +THUMB_FUNC BOOL ScrCmd_WaitButtonABPad(struct ScriptContext *ctx) { SetupNativeScript(ctx, FUN_0203A570); return TRUE; @@ -773,7 +773,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0033(struct ScriptContext *ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0034(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_CloseMessageBox(struct ScriptContext* ctx) { struct UnkSavStruct80 *unk80 = ctx->unk80; struct Window *unk = FUN_02039438(unk80, 0x1); @@ -1302,7 +1302,7 @@ THUMB_FUNC BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk005E(struct ScriptContext *ctx) +THUMB_FUNC BOOL ScrCmd_Unk005E(struct ScriptContext *ctx) //ApplyMovement? { u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u32 unk2 = ScriptReadWord(ctx); diff --git a/arm9/src/scrcmd_20.c b/arm9/src/scrcmd_20.c deleted file mode 100644 index 882126a0..00000000 --- a/arm9/src/scrcmd_20.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "scrcmd.h" - -const u16 UNK_020F452A[19][2] = { - { 0x00FB, 0x03E8 }, - { 0x0109, 0x03E8 }, - { 0x0114, 0x03E8 }, - { 0x0115, 0x03E8 }, - { 0x01A1, 0x07D0 }, - { 0x0181, 0x07D0 }, - { 0x0192, 0x0FA0 }, - { 0x0167, 0x0FA0 }, - { 0x0173, 0x1770 }, - { 0x01A0, 0x1770 }, - { 0x0151, 0x1770 }, - { 0x0162, 0x1F40 }, - { 0x015C, 0x1F40 }, - { 0x016A, 0x2710 }, - { 0x015F, 0x2710 }, - { 0x0154, 0x2710 }, - { 0x0164, 0x2710 }, - { 0x0191, 0x3A98 }, - { 0x018B, 0x4E20 }, -}; - -THUMB_FUNC BOOL ScrCmd_Unk02A6(struct ScriptContext * ctx) -{ - u16 idx = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); - u16 * ret_ptr1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); - u16 * ret_ptr2 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); - - *ret_ptr1 = UNK_020F452A[idx][0]; - *ret_ptr2 = UNK_020F452A[idx][1]; - - return FALSE; -} diff --git a/arm9/src/scrcmd_8.c b/arm9/src/scrcmd_8.c index ba35b302..0c47594b 100644 --- a/arm9/src/scrcmd_8.c +++ b/arm9/src/scrcmd_8.c @@ -8,51 +8,52 @@ extern void FUN_020385CC(struct UnkStruct_0204639C*, u32, u32, u32, u32, u16*, u extern BOOL FUN_020612EC(struct UnkSavStruct80*); extern BOOL FUN_020612F8(struct UnkSavStruct80*); -THUMB_FUNC BOOL ScrCmd_Unk021D(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_Unk021D(struct ScriptContext* ctx) //docs has this command as ScrCmd_Group, with a comment saying + //"This command is the devil" { struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); struct UnkSaveStruct_020286F8* unk_sav_ptr = FUN_0202881C(ctx->unk80->saveBlock2); struct SaveBlock2* sav2 = ctx->unk80->saveBlock2; - u16 unk = ScriptReadHalfword(ctx); - switch (unk) + u16 option = ScriptReadHalfword(ctx); + switch (option) { - case 0: { + case 0: { //check if group ID exists u16 unk_var = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); *ret_ptr = (u16)FUN_02028828(unk_sav_ptr, unk_var); return FALSE; } - case 1: { + case 1: { //check if group ID is accessible u16 unk_var = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); *ret_ptr = (u16)FUN_02028840(unk_sav_ptr, unk_var); return FALSE; } - case 2: { + case 2: { //writes group ID to string buffer u16 unk_var = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 idx = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); BufferEasyChatWord(*mgr, sav2, unk_var, idx, 0); break; } - case 3: { + case 3: { //writes group leader name to string buffer u16 unk_var = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 idx = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); BufferEasyChatWord(*mgr, sav2, unk_var, idx, 1); break; } - case 4: { + case 4: { //opens keyboard, 2 if group id exists, 1 if cancel, 0 otherwise u16* unk_str_ptr = FUN_020287A8(unk_sav_ptr, 0, 0); u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); FUN_020385CC(ctx->unk74, 5, 0, 7, 0, unk_str_ptr, ret_ptr); return TRUE; } - case 5: { + case 5: { //enter in group id (whatever this means, needs more investigation) u16 src_idx = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); BOOL unk_bool = FUN_02028828(unk_sav_ptr, 1); @@ -64,7 +65,7 @@ THUMB_FUNC BOOL ScrCmd_Unk021D(struct ScriptContext* ctx) return FALSE; } - case 6: { + case 6: { //create a group struct String* player_name = String_ctor(64, 32); struct PlayerData* player = Sav2_PlayerData_GetProfileAddr(ctx->unk80->saveBlock2); diff --git a/arm9/src/scrcmd_11.c b/arm9/src/scrcmd_berry_trees.c index 8553adfa..53715ca1 100644 --- a/arm9/src/scrcmd_11.c +++ b/arm9/src/scrcmd_berry_trees.c @@ -16,7 +16,7 @@ extern void FUN_0204B5A8(struct UnkSavStruct80*, void*, u16); extern void FUN_0204B9A0(struct UnkSavStruct80*); extern void FUN_0204B4FC(struct UnkSavStruct80*, void*); -THUMB_FUNC BOOL ScrCmd_Unk017D(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetBerryTreeGrowth(struct ScriptContext* ctx) { u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); void** unk = FUN_02039438(ctx->unk80, 10); @@ -26,7 +26,7 @@ THUMB_FUNC BOOL ScrCmd_Unk017D(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk017E(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetBerryTreeType(struct ScriptContext* ctx) { void** unk = FUN_02039438(ctx->unk80, 10); u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); @@ -36,7 +36,7 @@ THUMB_FUNC BOOL ScrCmd_Unk017E(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk017F(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetBerryTreeMulch(struct ScriptContext* ctx) { void** unk = FUN_02039438(ctx->unk80, 10); u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); @@ -46,7 +46,7 @@ THUMB_FUNC BOOL ScrCmd_Unk017F(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0180(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetBerryTreeWater(struct ScriptContext* ctx) { void** unk = FUN_02039438(ctx->unk80, 10); u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); @@ -56,7 +56,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0180(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0181(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetBerryTreeAmount(struct ScriptContext* ctx) { void** unk = FUN_02039438(ctx->unk80, 10); u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); @@ -66,7 +66,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0181(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0182(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_SetBerryTreeMulch(struct ScriptContext* ctx) { void** unk = FUN_02039438(ctx->unk80, 10); u16 unk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -76,7 +76,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0182(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0183(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_SetBerryTreeType(struct ScriptContext* ctx) { void** unk = FUN_02039438(ctx->unk80, 10); struct UnkStruct_02029FB0* unk2 = FUN_02029FC8(ctx->unk80->saveBlock2); @@ -88,7 +88,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0183(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0184(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_Unk0184(struct ScriptContext* ctx) //SetBerryTreeWater/WaterBerryTree, or just the animation? { u16 unk = ScriptReadHalfword(ctx); @@ -108,7 +108,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0184(struct ScriptContext* ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0185(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_TakeBerryTreeBerries(struct ScriptContext* ctx) { struct UnkStruct_02029FB0* unk = FUN_02029FC8(ctx->unk80->saveBlock2); void** unk2 = FUN_02039438(ctx->unk80, 10); diff --git a/arm9/src/scrcmd_coins.c b/arm9/src/scrcmd_coins.c index 59638c83..f4fea1de 100644 --- a/arm9/src/scrcmd_coins.c +++ b/arm9/src/scrcmd_coins.c @@ -7,7 +7,7 @@ extern u32 MOD05_021E2950(struct UnkSavStruct80* arg, u8, u8); extern MOD05_021E29B4(); extern MOD05_021E29C8(); -THUMB_FUNC BOOL ScrCmd_Unk0075(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_ShowCoinBox(struct ScriptContext * ctx) { struct UnkSavStruct80* sav_ptr = ctx->unk80; u32 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -20,7 +20,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0075(struct ScriptContext * ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0076(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_HideCoinBox(struct ScriptContext * ctx) { u16 ** unk = FUN_02039438(ctx->unk80, 0x26); MOD05_021E29B4(*unk); @@ -28,7 +28,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0076(struct ScriptContext * ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0077(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_UpdateCoinBox(struct ScriptContext * ctx) { u16 ** unk = FUN_02039438(ctx->unk80, 0x26); MOD05_021E29C8(ctx->unk80, *unk); diff --git a/arm9/src/scrcmd_daycare.c b/arm9/src/scrcmd_daycare.c index 4e2f925e..34abab1e 100644 --- a/arm9/src/scrcmd_daycare.c +++ b/arm9/src/scrcmd_daycare.c @@ -17,7 +17,7 @@ extern u16 MOD05_021ED5C4(struct PlayerParty* party, int idx, struct ScrStrBufs* extern u16 MOD05_021ED5EC(struct DayCare* daycare); extern u32 MOD05_021ED644(struct DayCare* daycare); -THUMB_FUNC BOOL ScrCmd_Unk016D(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetDaycarePokemonNames(struct ScriptContext* ctx) { struct SaveBlock2* sav2 = ctx->unk80->saveBlock2; struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); @@ -28,7 +28,7 @@ THUMB_FUNC BOOL ScrCmd_Unk016D(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk016E(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetDaycareStatus(struct ScriptContext* ctx) { struct UnkSavStruct80* sav_ptr = ctx->unk80; struct SaveBlock2* sav2 = sav_ptr->saveBlock2; @@ -40,7 +40,7 @@ THUMB_FUNC BOOL ScrCmd_Unk016E(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01A8(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_DeleteDaycareEgg(struct ScriptContext* ctx) { struct DayCare* daycare = SavArray_get(ctx->unk80->saveBlock2, 8); MOD05_021ECD64(daycare); @@ -48,7 +48,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01A8(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01A9(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GiveDaycareEgg(struct ScriptContext* ctx) { struct UnkSavStruct80* sav_ptr = ctx->unk80; struct DayCare* daycare = SavArray_get(sav_ptr->saveBlock2, 8); @@ -90,7 +90,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01AA(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01AE(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetDaycareLevel(struct ScriptContext* ctx) { struct SaveBlock2* sav2 = ctx->unk80->saveBlock2; struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); diff --git a/arm9/src/scrcmd_flags.c b/arm9/src/scrcmd_flags.c index c0f6a519..ee13ebc0 100644 --- a/arm9/src/scrcmd_flags.c +++ b/arm9/src/scrcmd_flags.c @@ -47,7 +47,7 @@ THUMB_FUNC BOOL ScrCmd_GiveSinnohDex(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0159(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_HasRunningShoes(struct ScriptContext* ctx) { u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); void* unk_sav_ptr = FUN_02034E30(ctx->unk80->saveBlock2); @@ -58,7 +58,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0159(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk015A(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GiveRunningShoes(struct ScriptContext* ctx) { void* unk_sav_ptr = FUN_02034E30(ctx->unk80->saveBlock2); void* unk = FUN_02034E20(unk_sav_ptr); @@ -91,7 +91,7 @@ THUMB_FUNC BOOL ScrCmd_GiveBadge(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk015E(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GiveBag(struct ScriptContext* ctx) { u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2); @@ -121,7 +121,7 @@ THUMB_FUNC BOOL ScrCmd_GetTotalEarnedBadges(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk015F(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_HasBag(struct ScriptContext* ctx) { struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2); @@ -186,7 +186,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0165(struct ScriptContext* ctx) return 0; } -THUMB_FUNC BOOL ScrCmd_Unk0166(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_CheckGameCompleted(struct ScriptContext* ctx) { u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2); @@ -196,7 +196,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0166(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0167(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_SetGameCompleted(struct ScriptContext* ctx) { struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2); @@ -205,21 +205,21 @@ THUMB_FUNC BOOL ScrCmd_Unk0167(struct ScriptContext* ctx) return 0; } -THUMB_FUNC BOOL ScrCmd_Unk01CF(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetSetStrength(struct ScriptContext* ctx) { struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2); - u8 unk = ScriptReadByte(ctx); + u8 option = ScriptReadByte(ctx); u16* ret_ptr; - switch (unk) + switch (option) { - case 1: + case 1: //set strength to on FUN_0205F264(state, 1); break; - case 0: + case 0: //set strength to off FUN_0205F264(state, 0); break; - case 2: + case 2: //get whether strength is on or off ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); *ret_ptr = (u16)FUN_0205F264(state, 2); break; @@ -231,21 +231,21 @@ THUMB_FUNC BOOL ScrCmd_Unk01CF(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01D0(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetSetFlash(struct ScriptContext* ctx) { struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2); - u8 unk = ScriptReadByte(ctx); + u8 option = ScriptReadByte(ctx); u16* ret_ptr; - switch (unk) + switch (option) { - case 1: + case 1: //set flash to on FUN_0205F274(state); break; - case 0: + case 0: //set flash to off FUN_0205F284(state); break; - case 2: + case 2: //get whether flash is on or off ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); *ret_ptr = (u16)FUN_0205F294(state); break; @@ -257,21 +257,21 @@ THUMB_FUNC BOOL ScrCmd_Unk01D0(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01D1(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetSetDefog(struct ScriptContext* ctx) { struct ScriptState* state = SavArray_Flags_get(ctx->unk80->saveBlock2); - u8 unk = ScriptReadByte(ctx); + u8 option = ScriptReadByte(ctx); u16* ret_ptr; - switch (unk) + switch (option) { - case 1: + case 1: //set defog to on FUN_0205F2A4(state); break; - case 0: + case 0: //set defog to off FUN_0205F2B4(state); break; - case 2: + case 2: //get whether defog is on or off ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); *ret_ptr = (u16)FUN_0205F2C4(state); break; diff --git a/arm9/src/scrcmd_19.c b/arm9/src/scrcmd_fossils.c index b0a201b7..e4177382 100644 --- a/arm9/src/scrcmd_19.c +++ b/arm9/src/scrcmd_fossils.c @@ -1,45 +1,45 @@ #include "scrcmd.h" #include "bag.h" -const u16 UNK_020F450C[7][2] = { - { 0x0067, 0x008E }, - { 0x0065, 0x008A }, - { 0x0066, 0x008C }, - { 0x0063, 0x0159 }, - { 0x0064, 0x015B }, - { 0x0068, 0x019A }, - { 0x0069, 0x0198 }, +const u16 gFossilPokemonMap[7][2] = { + { ITEM_OLD_AMBER, SPECIES_AERODACTYL }, + { ITEM_HELIX_FOSSIL, SPECIES_OMANYTE }, + { ITEM_DOME_FOSSIL, SPECIES_KABUTO }, + { ITEM_ROOT_FOSSIL, SPECIES_LILEEP }, + { ITEM_CLAW_FOSSIL, SPECIES_ANORITH }, + { ITEM_ARMOR_FOSSIL, SPECIES_SHIELDON }, + { ITEM_SKULL_FOSSIL, SPECIES_CRANIDOS }, }; -THUMB_FUNC BOOL ScrCmd_Unk01F1(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_CountFossils(struct ScriptContext * ctx) { struct UnkSavStruct80 * sav_ptr = ctx->unk80; - u16 * ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); + u16 *ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); u8 i; u16 total; for (i = 0, total = 0; i < 7; i++) { - total += Bag_GetQuantity(Sav2_Bag_get(sav_ptr->saveBlock2), UNK_020F450C[i][0], 4); + total += Bag_GetQuantity(Sav2_Bag_get(sav_ptr->saveBlock2), gFossilPokemonMap[i][0], 4); } *ret_ptr = total; return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01F4(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_GetFossilPokemon(struct ScriptContext * ctx) { - u16 * ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); - u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); + u16 *ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); + u16 fossilId = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); *ret_ptr = 0; for (u16 i = 0; i < 7; i++) { - if (UNK_020F450C[i][0] == unk) + if (gFossilPokemonMap[i][0] == fossilId) { - *ret_ptr = UNK_020F450C[i][1]; + *ret_ptr = gFossilPokemonMap[i][1]; break; } } @@ -47,7 +47,7 @@ THUMB_FUNC BOOL ScrCmd_Unk01F4(struct ScriptContext * ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk01F5(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_GetFossilMinimumAmount(struct ScriptContext * ctx) { struct UnkSavStruct80* sav_ptr = ctx->unk80; u16 * ret_ptr1 = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); @@ -61,10 +61,10 @@ THUMB_FUNC BOOL ScrCmd_Unk01F5(struct ScriptContext * ctx) u16 total = 0; for (; i < 7; i++) { - total += Bag_GetQuantity(Sav2_Bag_get(sav_ptr->saveBlock2), UNK_020F450C[i][0], 4); + total += Bag_GetQuantity(Sav2_Bag_get(sav_ptr->saveBlock2), gFossilPokemonMap[i][0], 4); if (total >= needed_amount) { - *ret_ptr1 = UNK_020F450C[i][0]; + *ret_ptr1 = gFossilPokemonMap[i][0]; *ret_ptr2 = i; break; } diff --git a/arm9/src/scrcmd_mart.c b/arm9/src/scrcmd_mart.c new file mode 100644 index 00000000..6803617c --- /dev/null +++ b/arm9/src/scrcmd_mart.c @@ -0,0 +1,442 @@ +#include "global.h"
+#include "constants/items.h"
+#include "constants/seal_constants.h"
+#include "constants/decorations.h"
+#include "scrcmd.h"
+#include "module_06.h"
+
+extern void FUN_02038AD0(struct UnkStruct_0204639C *);
+
+static const u16 UNK_020F40A6[] = {
+ ITEM_AIR_MAIL,
+ ITEM_HEAL_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40A0[] = {
+ ITEM_STEEL_MAIL,
+ ITEM_LUXURY_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40B4[] = {
+ ITEM_TUNNEL_MAIL,
+ ITEM_HEAL_BALL,
+ ITEM_NET_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40AC[] = {
+ ITEM_BLOOM_MAIL,
+ ITEM_HEAL_BALL,
+ ITEM_NET_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40BC[] = {
+ ITEM_AIR_MAIL,
+ ITEM_HEAL_BALL,
+ ITEM_NET_BALL,
+ ITEM_NEST_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40F8[] = {
+ ITEM_HEART_MAIL,
+ ITEM_HEAL_BALL,
+ ITEM_NET_BALL,
+ ITEM_NEST_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4102[] = {
+ ITEM_AIR_MAIL,
+ ITEM_QUICK_BALL,
+ ITEM_TIMER_BALL,
+ ITEM_REPEAT_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40DA[] = {
+ ITEM_AIR_MAIL,
+ ITEM_NET_BALL,
+ ITEM_NEST_BALL,
+ ITEM_DUSK_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40EE[] = {
+ ITEM_AIR_MAIL,
+ ITEM_DUSK_BALL,
+ ITEM_QUICK_BALL,
+ ITEM_TIMER_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40D0[] = {
+ ITEM_SNOW_MAIL,
+ ITEM_DUSK_BALL,
+ ITEM_QUICK_BALL,
+ ITEM_TIMER_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40C6[] = {
+ ITEM_HEAL_POWDER,
+ ITEM_ENERGYPOWDER,
+ ITEM_ENERGY_ROOT,
+ ITEM_REVIVAL_HERB,
+ 0xFFFF
+};
+
+static const u16 UNK_020F40E4[] = {
+ ITEM_AIR_MAIL,
+ ITEM_NEST_BALL,
+ ITEM_DUSK_BALL,
+ ITEM_QUICK_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F410C[] = {
+ DECORATION_YELLOW_CUSHION,
+ DECORATION_CUPBOARD,
+ DECORATION_TV,
+ DECORATION_REFRIGERATOR,
+ DECORATION_PRETTY_SINK,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4118[] = {
+ DECORATION_MUNCHLAX_DOLL,
+ DECORATION_BONSLY_DOLL,
+ DECORATION_MIME_JR__DOLL,
+ DECORATION_MANTYKE_DOLL,
+ DECORATION_BUIZEL_DOLL,
+ DECORATION_CHATOT_DOLL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4126[] = {
+ ITEM_PROTEIN,
+ ITEM_IRON,
+ ITEM_CALCIUM,
+ ITEM_ZINC,
+ ITEM_CARBOS,
+ ITEM_HP_UP,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4134[] = {
+ ITEM_TM38,
+ ITEM_TM25,
+ ITEM_TM14,
+ ITEM_TM22,
+ ITEM_TM52,
+ ITEM_TM15,
+ 0xFFFF
+};
+
+static const u16 UNK_020F41B2[] = {
+ SEAL_STAR_A,
+ SEAL_A,
+ SEAL_FIRE_A,
+ SEAL_SONG_A,
+ SEAL_LINE_B,
+ SEAL_ELE_B,
+ SEAL_PARTY_D,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4142[] = {
+ SEAL_HEART_B,
+ SEAL_STAR_C,
+ SEAL_FIRE_C,
+ SEAL_FLORA_B,
+ SEAL_SONG_C,
+ SEAL_SMOKE_A,
+ SEAL_ELE_D,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4152[] = {
+ SEAL_FOAMY_D,
+ SEAL_PARTY_C,
+ SEAL_FLORA_F,
+ SEAL_SONG_G,
+ SEAL_HEART_F,
+ SEAL_LINE_A,
+ SEAL_ELE_A,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4162[] = {
+ SEAL_HEART_C,
+ SEAL_STAR_D,
+ SEAL_FIRE_D,
+ SEAL_FLORA_C,
+ SEAL_SONG_D,
+ SEAL_SMOKE_B,
+ SEAL_FOAMY_A,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4172[] = {
+ SEAL_HEART_D,
+ SEAL_FOAMY_B,
+ SEAL_PARTY_A,
+ SEAL_FLORA_D,
+ SEAL_SONG_E,
+ SEAL_STAR_E,
+ SEAL_SMOKE_C,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4182[] = {
+ ITEM_TM83,
+ ITEM_TM17,
+ ITEM_TM54,
+ ITEM_TM20,
+ ITEM_TM33,
+ ITEM_TM16,
+ ITEM_TM70,
+ 0xFFFF
+};
+
+static const u16 UNK_020F4192[] = {
+ SEAL_HEART_A,
+ SEAL_STAR_B,
+ SEAL_FIRE_B,
+ SEAL_SONG_B,
+ SEAL_LINE_C,
+ SEAL_ELE_C,
+ SEAL_FLORA_A,
+ 0xFFFF
+};
+
+static const u16 UNK_020F41A2[] = {
+ SEAL_FOAMY_C,
+ SEAL_PARTY_B,
+ SEAL_FLORA_E,
+ SEAL_SONG_F,
+ SEAL_HEART_E,
+ SEAL_STAR_F,
+ SEAL_SMOKE_D,
+ 0xFFFF
+};
+
+static const u16 UNK_020F41D4[] = {
+ ITEM_X_SPEED,
+ ITEM_X_ATTACK,
+ ITEM_X_DEFENSE,
+ ITEM_GUARD_SPEC_,
+ ITEM_DIRE_HIT,
+ ITEM_X_ACCURACY,
+ ITEM_X_SPECIAL,
+ ITEM_X_SP__DEF,
+ 0xFFFF
+};
+
+static const u16 UNK_020F41C2[] = {
+ ITEM_HEAL_BALL,
+ ITEM_NET_BALL,
+ ITEM_NEST_BALL,
+ ITEM_DUSK_BALL,
+ ITEM_QUICK_BALL,
+ ITEM_TIMER_BALL,
+ ITEM_REPEAT_BALL,
+ ITEM_LUXURY_BALL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F41E6[] = {
+ ITEM_POTION,
+ ITEM_SUPER_POTION,
+ ITEM_HYPER_POTION,
+ ITEM_MAX_POTION,
+ ITEM_REVIVE,
+ ITEM_ANTIDOTE,
+ ITEM_PARLYZ_HEAL,
+ ITEM_BURN_HEAL,
+ ITEM_ICE_HEAL,
+ ITEM_AWAKENING,
+ ITEM_FULL_HEAL,
+ 0xFFFF
+};
+
+static const u16 UNK_020F41FE[] = {
+ ITEM_POKE_BALL,
+ ITEM_GREAT_BALL,
+ ITEM_ULTRA_BALL,
+ ITEM_ESCAPE_ROPE,
+ ITEM_POKE_DOLL,
+ ITEM_REPEL,
+ ITEM_SUPER_REPEL,
+ ITEM_MAX_REPEL,
+ ITEM_GRASS_MAIL,
+ ITEM_FLAME_MAIL,
+ ITEM_BUBBLE_MAIL,
+ ITEM_SPACE_MAIL,
+ 0xFFFF
+};
+
+static const u16 sNormalMartBadgeThresholds[][2] = {
+ // Balls
+ {ITEM_POKE_BALL, 1},
+ {ITEM_GREAT_BALL, 3},
+ {ITEM_ULTRA_BALL, 4},
+ // Potions
+ {ITEM_POTION, 1},
+ {ITEM_SUPER_POTION, 2},
+ {ITEM_HYPER_POTION, 4},
+ {ITEM_MAX_POTION, 5},
+ {ITEM_FULL_RESTORE, 6},
+ // Revives
+ {ITEM_REVIVE, 3},
+ // Status heal
+ {ITEM_ANTIDOTE, 1},
+ {ITEM_PARLYZ_HEAL, 1},
+ {ITEM_AWAKENING, 2},
+ {ITEM_BURN_HEAL, 2},
+ {ITEM_ICE_HEAL, 2},
+ {ITEM_FULL_HEAL, 4},
+ // Dungeon items
+ {ITEM_ESCAPE_ROPE, 2},
+ // Repels
+ {ITEM_REPEL, 2},
+ {ITEM_SUPER_REPEL, 3},
+ {ITEM_MAX_REPEL, 4},
+};
+
+const u16 *sDecorationMartPointers[] = {
+ UNK_020F410C,
+ UNK_020F4118,
+};
+
+const u16 *sSpecialMartPointers[] = {
+ UNK_020F40A6,
+ UNK_020F40B4,
+ UNK_020F40AC,
+ UNK_020F40BC,
+ UNK_020F40C6,
+ UNK_020F40F8,
+ UNK_020F40DA,
+ UNK_020F40E4,
+ UNK_020F41E6,
+ UNK_020F41FE,
+ UNK_020F41D4,
+ UNK_020F4126,
+ UNK_020F4182,
+ UNK_020F4134,
+ UNK_020F40EE,
+ UNK_020F40D0,
+ UNK_020F4102,
+ UNK_020F40A0,
+ UNK_020F41C2,
+};
+
+const u16 *sSealsMartPointers[] = {
+ UNK_020F4192,
+ UNK_020F4142,
+ UNK_020F4162,
+ UNK_020F4172,
+ UNK_020F41A2,
+ UNK_020F4152,
+ UNK_020F41B2,
+};
+
+THUMB_FUNC BOOL ScrCmd_NormalMart(struct ScriptContext * ctx)
+{
+ u16 whichMart = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+ s32 param;
+ u16 martItems[64];
+ u8 martIdx = 0;
+ u8 badgeCount = 0;
+ u8 i;
+
+ for (i = 0; i < 8; i++)
+ {
+ if (PlayerProfile_TestBadgeFlag(Sav2_PlayerData_GetProfileAddr(ctx->unk80->saveBlock2), i) == TRUE)
+ badgeCount++;
+ }
+ switch (badgeCount)
+ {
+ case 0:
+ param = 1;
+ break;
+ case 1:
+ case 2:
+ param = 2;
+ break;
+ case 3:
+ case 4:
+ param = 3;
+ break;
+ case 5:
+ case 6:
+ param = 4;
+ break;
+ case 7:
+ param = 5;
+ break;
+ case 8:
+ param = 6;
+ break;
+ default:
+ param = 1;
+ break;
+ }
+ for (i = 0; i < NELEMS(sNormalMartBadgeThresholds); i++)
+ {
+ if (param >= sNormalMartBadgeThresholds[i][1])
+ {
+ martItems[martIdx] = sNormalMartBadgeThresholds[i][0];
+ martIdx++;
+ }
+ }
+ martItems[martIdx] = 0xFFFF; // terminator
+ MOD06_0223D3D0(ctx->unk74, ctx->unk80, martItems, MART_ITEMS, 0);
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SpecialMart(struct ScriptContext * ctx)
+{
+ u16 whichMart = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+ u32 sp0;
+
+ // Fakematch?
+ if ((u16)(whichMart + (u16)(-8u)) <= 5)
+ sp0 = 1;
+ else
+ sp0 = 0;
+
+ MOD06_0223D3D0(ctx->unk74, ctx->unk80, sSpecialMartPointers[whichMart], MART_ITEMS, sp0);
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_GoodsMart(struct ScriptContext * ctx)
+{
+ u16 whichMart = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+ u32 sp0;
+
+ if (whichMart <= 1)
+ sp0 = 1;
+ else
+ sp0 = 0;
+
+ MOD06_0223D3D0(ctx->unk74, ctx->unk80, sDecorationMartPointers[whichMart], MART_DECORATIONS, sp0);
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_SealsMart(struct ScriptContext * ctx)
+{
+ u16 whichMart = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+
+ MOD06_0223D3D0(ctx->unk74, ctx->unk80, sSealsMartPointers[whichMart], MART_SEALS, 0);
+ return TRUE;
+}
+
+THUMB_FUNC BOOL ScrCmd_AccessoriesShop(struct ScriptContext * ctx)
+{
+ FUN_02038AD0(ctx->unk80->unk10);
+ return TRUE;
+}
diff --git a/arm9/src/scrcmd_money.c b/arm9/src/scrcmd_money.c index d2254844..6f18d65d 100644 --- a/arm9/src/scrcmd_money.c +++ b/arm9/src/scrcmd_money.c @@ -82,7 +82,7 @@ THUMB_FUNC BOOL ScrCmd_HasEnoughMoneyAddress(struct ScriptContext * ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0072(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_ShowMoneyBox(struct ScriptContext * ctx) { struct UnkSavStruct80 * sav_ptr = ctx->unk80; u32 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -94,7 +94,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0072(struct ScriptContext * ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0073(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_HideMoneyBox(struct ScriptContext * ctx) { u32 ** unk = FUN_02039438(ctx->unk80, 0x27); MOD05_021E288C(*unk); @@ -102,7 +102,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0073(struct ScriptContext * ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0074(struct ScriptContext * ctx) +THUMB_FUNC BOOL ScrCmd_UpdateMoneyBox(struct ScriptContext * ctx) { u32 ** unk = FUN_02039438(ctx->unk80, 0x27); MOD05_021E28A0(ctx->unk80, *unk); diff --git a/arm9/src/scrcmd_names.c b/arm9/src/scrcmd_names.c index cf721328..ec1d8c92 100644 --- a/arm9/src/scrcmd_names.c +++ b/arm9/src/scrcmd_names.c @@ -53,7 +53,7 @@ THUMB_FUNC BOOL ScrCmd_GetFriendName(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00D0(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetPokemonName(struct ScriptContext* ctx) { struct UnkSavStruct80* sav_ptr = ctx->unk80; struct ScrStrBufs** mgr = FUN_02039438(sav_ptr, 15); @@ -145,7 +145,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0280(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00D6(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetPokemonNickname(struct ScriptContext* ctx) { struct UnkSavStruct80* sav_ptr = ctx->unk80; struct ScrStrBufs** mgr = FUN_02039438(sav_ptr, 15); @@ -237,7 +237,7 @@ THUMB_FUNC struct String* FUN_02040AE4(u32 msg_no, u32 heap_id) return ret; } -THUMB_FUNC BOOL ScrCmd_Unk00DB(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetPlayerStarterName(struct ScriptContext* ctx) { struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); u8 idx = ScriptReadByte(ctx); @@ -251,7 +251,7 @@ THUMB_FUNC BOOL ScrCmd_Unk00DB(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00DC(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetRivalStarterName(struct ScriptContext* ctx) { struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); u8 idx = ScriptReadByte(ctx); @@ -265,7 +265,7 @@ THUMB_FUNC BOOL ScrCmd_Unk00DC(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00DD(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetCounterpartStarterName(struct ScriptContext* ctx) { struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); u8 idx = ScriptReadByte(ctx); @@ -312,7 +312,7 @@ THUMB_FUNC BOOL ScrCmd_GetUndergroundItemName(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk00E2(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetMapName(struct ScriptContext* ctx) { struct String* str = String_ctor(22, 4); struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); @@ -326,7 +326,7 @@ THUMB_FUNC BOOL ScrCmd_Unk00E2(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk017B(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetBerryName(struct ScriptContext* ctx) { struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); u8 idx = ScriptReadByte(ctx); @@ -362,7 +362,7 @@ THUMB_FUNC BOOL ScrCmd_GetFashionName(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0272(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetWhiteRockInscription(struct ScriptContext* ctx) { struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); u8 idx = ScriptReadByte(ctx); @@ -393,7 +393,7 @@ THUMB_FUNC BOOL ScrCmd_GetPokemonMoveName(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0232(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetRibbonName(struct ScriptContext* ctx) { struct ScrStrBufs** mgr = FUN_02039438(ctx->unk80, 15); u8 idx = ScriptReadByte(ctx); diff --git a/arm9/src/scrcmd_prizes.c b/arm9/src/scrcmd_prizes.c new file mode 100644 index 00000000..9a6cde41 --- /dev/null +++ b/arm9/src/scrcmd_prizes.c @@ -0,0 +1,36 @@ +#include "scrcmd.h" +#include "constants/items.h" + +const u16 gGameCornerPrizes[19][2] = { + { ITEM_SILK_SCARF, 1000 }, + { ITEM_WIDE_LENS, 1000 }, + { ITEM_ZOOM_LENS, 1000 }, + { ITEM_METRONOME, 1000 }, + { ITEM_TM90, 2000 }, + { ITEM_TM58, 2000 }, + { ITEM_TM75, 4000 }, + { ITEM_TM32, 4000 }, + { ITEM_TM44, 6000 }, + { ITEM_TM89, 6000 }, + { ITEM_TM10, 6000 }, + { ITEM_TM27, 8000 }, + { ITEM_TM21, 8000 }, + { ITEM_TM35, 10000 }, + { ITEM_TM24, 10000 }, + { ITEM_TM13, 10000 }, + { ITEM_TM29, 10000 }, + { ITEM_TM74, 15000 }, + { ITEM_TM68, 20000 }, +}; + +THUMB_FUNC BOOL ScrCmd_GetPrizeItemIdAndCost(struct ScriptContext* ctx) +{ + u16 idx = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); + u16* prize_item_id = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); + u16* prize_cost_in_coins = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); + + *prize_item_id = gGameCornerPrizes[idx][0]; + *prize_cost_in_coins = gGameCornerPrizes[idx][1]; + + return FALSE; +} diff --git a/arm9/src/scrcmd_sound.c b/arm9/src/scrcmd_sound.c index df611ec7..ec5ab7f8 100644 --- a/arm9/src/scrcmd_sound.c +++ b/arm9/src/scrcmd_sound.c @@ -7,7 +7,7 @@ extern void FUN_0200433C(u32, u32, u32); extern u32 FUN_02005E28(void); extern void FUN_02005E64(void); extern BOOL FUN_02005CBC(void); -extern void PlayBGM(u16); +extern void PlaySound(u16); extern u32 FUN_02004124(u16); extern void FUN_0204AB20(struct UnkSavStruct80 *ctx, u16); extern u16 FUN_0204ABA8(struct UnkSavStruct80 *ctx, u32); @@ -38,33 +38,33 @@ THUMB_FUNC BOOL ScrCmd_Unk02AE(struct ScriptContext *ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0050(struct ScriptContext *ctx) +THUMB_FUNC BOOL ScrCmd_PlayBgm(struct ScriptContext *ctx) { FUN_0200521C(ScriptReadHalfword(ctx)); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0051(struct ScriptContext *ctx) +THUMB_FUNC BOOL ScrCmd_StopBgm(struct ScriptContext *ctx) { u32 unk0 = FUN_02004124(ScriptReadHalfword(ctx)); FUN_02005350(unk0, 0); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0052(struct ScriptContext *ctx) +THUMB_FUNC BOOL ScrCmd_PlayDefaultBgm(struct ScriptContext *ctx) { u16 unk0 = FUN_0204ABA8(ctx->unk80, *ctx->unk80->mapId); FUN_0200521C(unk0); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0053(struct ScriptContext *ctx) +THUMB_FUNC BOOL ScrCmd_Unk0053(struct ScriptContext *ctx) //Special BGM? { FUN_0204AB20(ctx->unk80, ScriptReadHalfword(ctx)); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0054(struct ScriptContext *ctx) +THUMB_FUNC BOOL ScrCmd_FadeOutBgm(struct ScriptContext *ctx) { u16 unk1 = ScriptReadHalfword(ctx); u16 unk2 = ScriptReadHalfword(ctx); @@ -85,7 +85,7 @@ THUMB_FUNC BOOL FUN_02041464(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0055(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_FadeInBgm(struct ScriptContext* ctx) { u16 unk = ScriptReadHalfword(ctx); @@ -120,21 +120,21 @@ THUMB_FUNC BOOL ScrCmd_Unk0058(struct ScriptContext* ctx) } -THUMB_FUNC BOOL ScrCmd_Unk0049(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_PlayFanfare(struct ScriptContext* ctx) { u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); FUN_020054C8(unk); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk004A(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_StopFanfare(struct ScriptContext* ctx) { u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); FUN_020054F0(unk, 0); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk004B(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_PlayFanfareWait(struct ScriptContext* ctx) { u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -152,7 +152,7 @@ THUMB_FUNC BOOL FUN_02041540(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk004C(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_PlayCry(struct ScriptContext* ctx) { u16 unk0 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -176,15 +176,15 @@ THUMB_FUNC BOOL FUN_02041598(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_PlayBgm(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_PlaySound(struct ScriptContext* ctx) { u16 bgm_id = ScriptReadHalfword(ctx); - PlayBGM(bgm_id); + PlaySound(bgm_id); return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk004F(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_PlaySoundWait(struct ScriptContext* ctx) { SetupNativeScript(ctx, FUN_020415CC); return TRUE; @@ -199,7 +199,7 @@ THUMB_FUNC BOOL FUN_020415CC(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0059(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_CheckChatotCry(struct ScriptContext* ctx) { u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); @@ -216,7 +216,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0059(struct ScriptContext* ctx) } } -THUMB_FUNC BOOL ScrCmd_Unk005A(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_StartChatotRecord(struct ScriptContext* ctx) { u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx)); @@ -232,14 +232,14 @@ THUMB_FUNC BOOL ScrCmd_Unk005A(struct ScriptContext* ctx) } } -THUMB_FUNC BOOL ScrCmd_Unk005B(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_StopChatotRecord(struct ScriptContext* ctx) { #pragma unused(ctx) FUN_02005E64(); return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk005C(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_SaveChatotCry(struct ScriptContext* ctx) { void* unk = Sav2_Chatot_get(ctx->unk80->saveBlock2); FUN_02005E6C(unk); @@ -254,7 +254,7 @@ THUMB_FUNC BOOL ScrCmd_Unk005D(struct ScriptContext* ctx) return TRUE; } -THUMB_FUNC BOOL ScrCmd_Unk0283(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_SetVolume(struct ScriptContext* ctx) { u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); diff --git a/arm9/src/scrcmd_23.c b/arm9/src/scrcmd_underground.c index 0c9907a5..5d273c9b 100644 --- a/arm9/src/scrcmd_23.c +++ b/arm9/src/scrcmd_underground.c @@ -6,7 +6,7 @@ extern BOOL FUN_02026298(void*, u16); extern void* FUN_02026CC4(struct SaveBlock2* sav2); extern BOOL FUN_020260C4(void*, u16, u16); -THUMB_FUNC BOOL ScrCmd_Unk0083(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GiveSecretBaseDecoration(struct ScriptContext* ctx) { struct SaveBlock2* sav2 = ctx->unk80->saveBlock2; u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -19,7 +19,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0083(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0084(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_TakeSecretBaseDecoration(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -28,7 +28,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0084(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0085(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_HasSpaceForDecoration(struct ScriptContext* ctx) { struct SaveBlock2* sav2 = ctx->unk80->saveBlock2; u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -41,7 +41,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0085(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0086(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetDecorationCount(struct ScriptContext* ctx) //somewhat unsure on name, was originally CheckGoods { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -50,7 +50,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0086(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0087(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GiveUndergroundTrap(struct ScriptContext* ctx) { struct SaveBlock2* sav2 = ctx->unk80->saveBlock2; u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -63,7 +63,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0087(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0088(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_TakeUndergroundTrap(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -72,7 +72,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0088(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0089(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_HasSpaceForTrap(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -81,7 +81,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0089(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk008A(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetTrapCount(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -90,7 +90,7 @@ THUMB_FUNC BOOL ScrCmd_Unk008A(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk008B(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GiveTreasure(struct ScriptContext* ctx) { struct SaveBlock2* sav2 = ctx->unk80->saveBlock2; u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -101,7 +101,7 @@ THUMB_FUNC BOOL ScrCmd_Unk008B(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk008C(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_TakeTreasure(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -110,7 +110,7 @@ THUMB_FUNC BOOL ScrCmd_Unk008C(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk008D(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_HasSpaceForTreasure(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -119,7 +119,7 @@ THUMB_FUNC BOOL ScrCmd_Unk008D(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk008E(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetTreasureCount(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -128,7 +128,7 @@ THUMB_FUNC BOOL ScrCmd_Unk008E(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk008F(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GiveUndergroundSphere(struct ScriptContext* ctx) { struct SaveBlock2* sav2 = ctx->unk80->saveBlock2; u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -141,7 +141,7 @@ THUMB_FUNC BOOL ScrCmd_Unk008F(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0090(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_TakeUndergroundSphere(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -150,7 +150,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0090(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0091(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_HasSpaceForSphere(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); @@ -159,7 +159,7 @@ THUMB_FUNC BOOL ScrCmd_Unk0091(struct ScriptContext* ctx) return FALSE; } -THUMB_FUNC BOOL ScrCmd_Unk0092(struct ScriptContext* ctx) +THUMB_FUNC BOOL ScrCmd_GetSphereCount(struct ScriptContext* ctx) { u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx)); diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 596056b1..1242d550 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -20,8 +20,8 @@ extern u32 GetCityNamesMsgdataIdByCountry(u32); extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1); extern void StringCat_HandleTrainerName(struct String * dest, const struct String * src); extern void StrAddChar(struct String * str, u16 val); -extern void * FUN_02006BB0(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); -extern void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd); +extern void * GfGfxLoader_GetCharData(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); +extern void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd); const u16 UNK_020ECE6C[][2] = { { 0x0140, 0x0008 }, @@ -751,7 +751,7 @@ struct UnkStruct_0200B870 * MessagePrinter_new(u32 r5, u32 r6, u32 sp4, u32 r4) struct UnkStruct_0200B870 * sp8 = AllocFromHeap(r4, sizeof(struct UnkStruct_0200B870)); if (sp8 != NULL) { - sp8->unk_0 = FUN_02006BB0(NARC_GRAPHIC_FONT, 4, 1, &sp8->unk_4, r4); + sp8->unk_0 = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, 4, 1, &sp8->unk_4, r4); int i; u8 * ptr = sp8->unk_4->unk_14; for (i = 0; i < sp8->unk_4->unk_10; i++) diff --git a/arm9/src/text.c b/arm9/src/text.c index 8676cbcc..36349b8b 100644 --- a/arm9/src/text.c +++ b/arm9/src/text.c @@ -21,7 +21,7 @@ extern void FUN_0201C1A8(struct TextPrinter *printer); extern u32 FontFunc(u8 fontId, struct TextPrinter *printer); -extern void * FUN_02006BB0(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); +extern void * GfGfxLoader_GetCharData(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); THUMB_FUNC void SetFontsPointer(const struct FontInfo *fonts) @@ -330,7 +330,7 @@ THUMB_FUNC u16 *FUN_0201C1B0(void) { void *res = AllocFromHeap(0, 32 * 24 * sizeof(u16)); struct UnkStruct_0200B870_sub * var; - void *tmp = FUN_02006BB0(NARC_GRAPHIC_FONT, 5, 0, &var, 0); + void *tmp = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, 5, 0, &var, 0); MI_CpuCopy32(var->unk_14, res, 32 * 24 * sizeof(u16)); FreeToHeap(tmp); return res; diff --git a/arm9/src/unk_0200BB14.c b/arm9/src/unk_0200BB14.c new file mode 100644 index 00000000..45850885 --- /dev/null +++ b/arm9/src/unk_0200BB14.c @@ -0,0 +1,1323 @@ +#include "global.h" +#include "unk_0200BB14.h" +#include "game_init.h" +#include "heap.h" + +extern void FUN_0201D060(u32 *param0, u32 param1, u32 param2); +extern void FUN_0201E00C(u32 param0, u32 param1); +extern void NNS_G2dInitOamManagerModule(); +extern void FUN_02009EAC(u32 param0, + u32 param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + u32 param6, + u32 param7, + u32 param8); +extern u32 FUN_0201C328(u32 param0, u32 param1); +extern void FUN_0201D168(); +extern void FUN_0201E0BC(); +extern u32 FUN_02008C9C(u32 param0, void *param1, u32 param2); +extern void FUN_0201FFC8(u32 param0); +extern void FUN_0201FDEC(u32 param0); +extern void FUN_02009F80(); +extern void FUN_0201C348(); +extern void FUN_0201FD58(u32 param0); +extern void FUN_02008C80(u32 param0); +extern u32 FUN_02009660(u32 *param0, s32 param1); +extern void FUN_020096B4(u32 param0); +extern void FUN_02009C30(u32 *param0); +extern void FUN_02009E28(u32 *param0); +extern void FUN_02009448(u32 *param0); +extern void FUN_02008E2C(u32 param0); +extern void FUN_0201C350(u32 param0); +extern void FUN_0201D12C(); +extern void FUN_0201E08C(); +extern void FUN_02009FA0(); +extern u32 FUN_0200965C(s32 param0); +extern void FUN_02009668(void *param0, u32 param1, u32 param2); +extern u32 FUN_020096CC(u32 param0); +extern u32 FUN_02008DEC(u32 param0, s32 param1, u32 param2); +extern u32 *FUN_02009424(u32 param0, u32 param1); +extern u32 FUN_020093A8(u32 param0, u32 param1, u32 *param2, u32 param3); +extern void FUN_02009A90(u32 *param0); +extern void FUN_02009D34(u32 *param0); +extern u32 FUN_02008BE0(void *param0, + u32 param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + u32 param6, + u32 param7); +extern u32 FUN_0201FE94(struct UnkStruct_0200BB14_4 *param0); +extern void FUN_02020130(u32 param0, u32 param1); +extern void FUN_02020248(u32 param0, u32 param1); +extern u32 FUN_0200945C(u32 param0, s32 param1); +extern u32 FUN_02008F34( + u32 param0, u32 param1, u32 param2, u32 param3, s32 param4, u32 param5, u32 param6); +extern void FUN_02009B04(u32 param0); +extern u32 FUN_02008FEC( + u32 param0, u32 param1, u32 param2, u32 param3, s32 param4, u32 param5, u32 param6, u32 param7); +extern u32 FUN_02009D68(u32 param0); +extern u32 FUN_02009E88(u32 param0, u32 param1); +extern void FUN_02003108(u32 param0, u32 param1, u16 param2, u32 param3); +extern void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0, + s32 param1, + s32 param2, + s32 param3, + s32 param4, + s32 param5, + s32 param6, + u32 param7, + u32 param8, + u32 param9, + u32 param10, + u32 param11, + u32 param12, + u32 param13, + u32 param14); +extern u8 FUN_020202A0(u32 param0); +extern u32 FUN_020094F0(u32 param0, u32 param1); +extern u32 FUN_02009E54(u32 param0, u32 param1); +extern void FUN_02009CDC(u32 param0); +extern u32 FUN_020090AC( + u32 param0, u32 param1, u32 param2, u32 param3, s32 param4, u32 param5, u32 param6); +extern u32 FUN_02009530(u32 param0); +extern void FUN_02009490(u32 param0, u32 param1); +extern void FUN_0201D324(u32 param0); +extern void FUN_0201E1C8(u32 param0); +extern void FUN_020201E4(u32 param0, u32 param1); +extern u32 FUN_020201DC(u32 param0); +extern void FUN_020200BC(u32 param0, u32 param1); +extern void FUN_020200D8(u32 param0, u32 param1); +extern u32 FUN_02020388(u32 param0); +extern void FUN_02020208(u32 param0); +extern void FUN_0202022C(u32 param0); +extern void FUN_020200A0(u32 param0, u32 param1); +extern u8 FUN_02020128(u32 param0); +extern void FUN_020202A8(u32 param0, u32 param1); +extern u8 FUN_02020300(u32 param0); +extern void FUN_02020238(u32 param0, u8 param1); +extern u8 FUN_02020240(u32 param0); +extern void FUN_02020310(u32 param0, u32 param1); +extern u16 FUN_0202032C(u32 param0); +extern u32 FUN_02020380(u32 param0); +extern void FUN_02020044(u32 param0, u32 *param1); +extern u32 *FUN_0202011C(u32 param0, u16 *param1, u16 *param2); +extern void FUN_020200EC(u32 param0, u32 param1); +extern u32 *FUN_02020120(u32 param0); +extern void FUN_02020064(u32 param0, s32 *param1); +extern void FUN_02020088(u32 param0, u16 param1); +extern u16 FUN_02020124(u32 param0); +extern void FUN_02020100(u32 param0, u32 param1); +extern void FUN_02020054(u32 param0, u32 *param1); +extern void FUN_02020358(u32 param0, u32 param1); +extern void FUN_02020398(u32 param0, u32 param1); +extern void FUN_02009AC4(u32 param0); +extern void FUN_02009B78(u32 param0); +extern void FUN_020090FC(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); +extern void FUN_02009BE8(u32 param0); +extern void FUN_02009168(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5); +extern void FUN_02009DE0(u32 param0); + +THUMB_FUNC struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id) +{ + struct UnkStruct_0200BB14_1 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_0200BB14_1)); + if (ptr == NULL) + { + return NULL; + } + + ptr->unk000 = heap_id; + ptr->unk004 = 0; + ptr->unk008 = 1; + + return ptr; +} + +THUMB_FUNC struct UnkStruct_0200BB14_2 *FUN_0200BB34(struct UnkStruct_0200BB14_1 *param0) +{ + GF_ASSERT(param0 != NULL); + + struct UnkStruct_0200BB14_2 *ptr = + AllocFromHeap(param0->unk000, sizeof(struct UnkStruct_0200BB14_2)); + if (ptr == NULL) + { + return NULL; + } + + param0->unk004++; + + for (s32 i = 0; i < 6; i++) + { + ptr->unk0c[i] = 0; + } + + return ptr; +} + +THUMB_FUNC u32 FUN_0200BB68(u32 param0) +{ + return param0 + 0x10; +} + +THUMB_FUNC BOOL FUN_0200BB6C( + struct UnkStruct_0200BB14_1 *param0, u32 *param1, u32 *param2, u32 param3) +{ + GF_ASSERT(param0 != NULL); + + if (param0 == NULL) + { + return FALSE; + } + + u32 st14[4] = { param2[0], param2[1], param2[2], param0->unk000 }; + + FUN_0201D060(st14, param2[3], param2[4]); + FUN_0201E00C(param3, param0->unk000); + NNS_G2dInitOamManagerModule(); + + if (param0->unk008 == 1) + { + FUN_02009EAC(param1[0], + param1[1], + param1[2], + param1[3], + param1[4], + param1[5], + param1[6], + param1[7], + param0->unk000); + } + + param0->unk00c = FUN_0201C328(0x20, param0->unk000); + FUN_0201D168(); + FUN_0201E0BC(); + + return TRUE; +} + +THUMB_FUNC BOOL FUN_0200BBF0( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2) +{ + if (param0 == NULL || param1 == NULL) + { + return FALSE; + } + + param1->unk00 = FUN_02008C9C(param2, param0->unk010, param0->unk000); + + return TRUE; +} + +THUMB_FUNC void FUN_0200BC14(u32 param0) +{ + FUN_0201FFC8(param0); +} + +THUMB_FUNC void FUN_0200BC1C(u32 *param0) +{ + GF_ASSERT(param0 != NULL); + + FUN_0201FDEC(*param0); +} + +THUMB_FUNC void FUN_0200BC30() +{ + FUN_02009F80(); +} + +THUMB_FUNC void FUN_0200BC38() +{ + FUN_0201C348(); +} + +THUMB_FUNC void FUN_0200BC40(struct UnkStruct_0200BB14_2 *param0) +{ + FUN_0201FD58(param0->unk00); +} + +THUMB_FUNC void FUN_0200BC4C(struct UnkStruct_0200BB14_2 *param0) +{ + if (param0->unk04 != 0) + { + FUN_02008C80(param0->unk04); + } +} + +THUMB_FUNC void FUN_0200BC5C(struct UnkStruct_0200BB14_2 *param0) +{ + for (s32 i = 0; i < param0->unk54; i++) + { + FUN_020096B4(FUN_02009660(param0->unk08, i)); + } + + FreeToHeap(param0->unk08); + FUN_02009C30(param0->unk24[0]); + FUN_02009E28(param0->unk24[1]); + + for (s32 i = 0; i < param0->unk54; i++) + { + FUN_02009448(param0->unk24[i]); + FUN_02008E2C(param0->unk0c[i]); + } +} + +THUMB_FUNC void FUN_0200BCB0(u32 *param0) +{ + FUN_0201C350(param0[3]); + FUN_0201D12C(); + FUN_0201E08C(); + + if (param0[2] == 1) + { + FUN_02009FA0(); + } +} + +THUMB_FUNC void FUN_0200BCD0( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1) +{ + param0->unk004--; + FreeToHeap(param1); +} + +THUMB_FUNC void FUN_0200BCE0( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1) +{ + FUN_0200BC40(param1); + FUN_0200BC4C(param1); + FUN_0200BC5C(param1); + FUN_0200BCD0(param0, param1); +} + +THUMB_FUNC void FUN_0200BD04(u32 *param0) +{ + GF_ASSERT(param0[1] == 0); + FUN_0200BCB0(param0); + FreeToHeap(param0); +} + +THUMB_FUNC BOOL FUN_0200BD20( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, const char **param2) +{ + s32 st14 = 6; + const char **st10 = param2; + + if (param0 == NULL || param1 == NULL) + { + return FALSE; + } + + if (param2[4] == 0) + { + st14 = 4; + } + + param1->unk54 = st14; + u32 r2 = FUN_0200965C(st14); + param1->unk08 = AllocFromHeap(param0->unk000, r2 * st14); + + for (s32 i = 0; i < st14; i++) + { + u32 st18 = FUN_02009660(param1->unk08, i); + void *st1c = FUN_020161A4(param0->unk000, st10[i]); + + FUN_02009668(st1c, st18, param0->unk000); + FreeToHeap(st1c); + } + + for (s32 i = 0; i < st14; i++) + { + param1->unk0c[i] = + FUN_02008DEC(FUN_020096CC(FUN_02009660(param1->unk08, i)), i, param0->unk000); + } + + for (s32 i = 0; i < st14; i++) + { + u32 st20 = FUN_02009660(param1->unk08, i); + param1->unk24[i] = FUN_02009424(FUN_020096CC(st20), param0->unk000); + param1->unk3c[i] = FUN_020093A8(param1->unk0c[i], st20, param1->unk24[i], param0->unk000); + } + + FUN_02009A90(param1->unk24[0]); + FUN_02009D34(param1->unk24[1]); + void *r6 = FUN_020161A4(param0->unk000, st10[6]); + param1->unk04 = FUN_02008BE0(r6, + param0->unk000, + param1->unk0c[0], + param1->unk0c[1], + param1->unk0c[2], + param1->unk0c[3], + param1->unk0c[4], + param1->unk0c[5]); + FreeToHeap(r6); + + return TRUE; +} + +THUMB_FUNC u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct_0200BB14_3 *param2) +{ + return FUN_0200BE74(param0, + param1, + param2->unk00, + param2->unk04, + param2->unk06, + param2->unk04, + param2->unk0a, + param2->unk0c, + param2->unk10, + param2->unk14, + param2->unk18, + param2->unk1c, + param2->unk20, + param2->unk24); +} + +THUMB_FUNC u32 FUN_0200BE74(u32 *param0, + u32 *param1, + u32 param2, + s16 param3, + s16 param4, + s16 param5, + u16 param6, + u32 param7, + u32 param8, + u32 param9, + u32 param10, + u32 param11, + u32 param12, + u32 param13) +{ +#pragma unused(param10) +#pragma unused(param11) +#pragma unused(param12) +#pragma unused(param13) + + struct UnkStruct_0200BB14_4 st0; + st0.unk00 = param1[0]; + st0.unk04 = &(*(struct UnkStruct_0200BB14_sub **)(param1[1]))[param2]; + + f32 r0; + if (param3 > 0) + { + r0 = ((f32)(param3 * 0x1000) + (f32)0.5); + } + else + { + r0 = ((f32)(param3 * 0x1000) - (f32)0.5); + } + st0.unk08 = (s32)r0; + + if (param4 > 0) + { + r0 = ((f32)(param4 * 0x1000) + (f32)0.5); + } + else + { + r0 = ((f32)(param4 * 0x1000) - (f32)0.5); + } + st0.unk0c = (s32)r0; + + if (param5 > 0) + { + r0 = ((f32)(param5 * 0x1000) + (f32)0.5); + } + else + { + r0 = ((f32)(param5 * 0x1000) - (f32)0.5); + } + st0.unk10 = (s32)r0; + + if (param9 == 2) + { + st0.unk0c += 0xC0000; + } + + st0.unk14 = 0x1000; + st0.unk18 = 0x1000; + st0.unk1c = 0x1000; + st0.unk20 = 0; + st0.unk24 = param7; + st0.unk28 = param9; + st0.unk2c = param0[0]; + + u32 r4 = FUN_0201FE94(&st0); + if (r4 != 0) + { + FUN_02020130(r4, param6); + + FUN_02020248(r4, param8); + } + + return r4; +} + +THUMB_FUNC BOOL FUN_0200BF60( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2) +{ + struct UnkStruct_0200BB14_1 *st0 = param0; + s32 i; + s32 st4 = 6; + + if (st0 == NULL || param1 == NULL) + { + return FALSE; + } + + if (param2[4] == 0 || param2[5] == 0) + { + st4 = 4; + } + + param1->unk54 = st4; + + for (i = 0; i < st4; i++) + { + param1->unk0c[i] = FUN_02008DEC(param2[i], i, st0->unk000); + } + + for (i = 0; i < st4; i++) + { + if (param2[i] != 0) + { + param1->unk24[i] = FUN_02009424(param2[i], st0->unk000); + param1->unk3c[i] = 0; + + for (s32 j = 0; j < (s32)param1->unk24[i][1]; j++) + { + ((u32 *)param1->unk24[i][0])[j] = 0; + } + } + } + + return TRUE; +} + +THUMB_FUNC BOOL FUN_0200C00C(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6) +{ + if (FUN_0200945C(param1->unk0c[0], param6) == 0) + { + return FALSE; + } + + u32 r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); + if (r5 != 0) + { + FUN_02009B04(r5); + FUN_0200C474(param1->unk24[0], r5); + return TRUE; + } + + GF_AssertFail(); + if (r5 != 0) + { + return TRUE; + } + + return FALSE; +} + +THUMB_FUNC s32 FUN_0200C06C(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + u32 param6, + s32 param7) +{ + if (FUN_0200945C(param1->unk0c[1], param7) == 0) + { + return -1; + } + + u32 r5 = + FUN_02008FEC(param1->unk0c[1], param2, param3, param4, param7, param6, param5, param0[0]); + if (r5 != 0) + { + GF_ASSERT(FUN_02009D68(r5) == 1); + FUN_0200C474(param1->unk24[1], r5); + return (s8)FUN_02009E88(r5, param6); + } + + GF_AssertFail(); + return -1; +} + +THUMB_FUNC u8 FUN_0200C0DC(u32 param0, + u32 param1, + u32 *param2, + struct UnkStruct_0200BB14_2 *param3, + u32 param4, + u32 param5, + u32 param6, + u32 param7, + u32 param8, + s32 param9) +{ + s32 r4 = FUN_0200C06C(param2, param3, param4, param5, param6, param7, param8, param9); + if (r4 != -1) + { + FUN_02003108(param0, param1, (u16)(r4 << 4), param7 << 5); + } + + return (u8)r4; +} + +THUMB_FUNC u32 FUN_0200C124(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + s32 param5) +{ + return FUN_0200C404(param0, param1, param2, param3, param4, 2, param5); +} + +THUMB_FUNC u32 FUN_0200C13C(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + s32 param5) +{ + return FUN_0200C404(param0, param1, param2, param3, param4, 3, param5); +} + +THUMB_FUNC struct UnkStruct_0200BB14_5 *FUN_0200C154( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2) +{ + struct UnkStruct_0200BB14_4 st44; + s32 st2c[6]; + + struct UnkStruct_0200BB14_5 *ptr = + AllocFromHeap(param0->unk000, sizeof(struct UnkStruct_0200BB14_5)); + if (ptr == NULL) + { + return NULL; + } + + ptr->unk08 = AllocFromHeap(param0->unk000, sizeof(struct UnkStruct_0200BB14_6)); + if (ptr->unk08 == 0) + { + return NULL; + } + + ptr->unk08->unk0 = AllocFromHeap(param0->unk000, sizeof(struct UnkStruct_0200BB14_sub)); + ptr->unk04 = ptr->unk08->unk0; + if (ptr->unk08->unk0 == NULL) + { + if (ptr->unk08 != NULL) + { + FreeToHeap(ptr->unk08); + } + + return NULL; + } + + for (s32 i = 0; i < 6; i++) + { + st2c[i] = (s32)param2[5 + i]; + } + + if (param1->unk0c[4] == 0 || param1->unk0c[5] == 0) + { + st2c[4] = -1; + st2c[5] = -1; + } + else + { + if (st2c[4] != -1 && FUN_0200945C(param1->unk0c[4], st2c[4]) == 0) + { + st2c[4] = -1; + } + + if (st2c[5] != -1 && FUN_0200945C(param1->unk0c[5], st2c[5]) == 0) + { + st2c[5] = -1; + } + } + + FUN_02008AA4(ptr->unk04, + st2c[0], + st2c[1], + st2c[2], + st2c[3], + st2c[4], + st2c[5], + param2[12], + param2[11], + param1->unk0c[0], + param1->unk0c[1], + param1->unk0c[2], + param1->unk0c[3], + param1->unk0c[4], + param1->unk0c[5]); + + st44.unk00 = param1->unk00; + st44.unk04 = ptr->unk04; + f32 r0; + if (((s16 *)param2)[0] > 0) + { + r0 = ((f32)(((s16 *)param2)[0] << 0xc) + (f32)0.5); + } + else + { + r0 = ((f32)(((s16 *)param2)[0] << 0xc) - (f32)0.5); + } + st44.unk08 = (s32)r0; + + if (((s16 *)param2)[1] > 0) + { + r0 = ((f32)(((s16 *)param2)[1] << 0xc) + (f32)0.5); + } + else + { + r0 = ((f32)(((s16 *)param2)[1] << 0xc) - (f32)0.5); + } + st44.unk0c = (s32)r0; + + if (((s16 *)param2)[2] > 0) + { + r0 = ((f32)(((s16 *)param2)[2] << 0xc) + (f32)0.5); + } + else + { + r0 = ((f32)(((s16 *)param2)[2] << 0xc) - (f32)0.5); + } + st44.unk10 = (s32)r0; + + if (param2[4] == 2) + { + st44.unk0c += 0xC0000; + } + + st44.unk14 = 0x1000; + st44.unk18 = 0x1000; + st44.unk1c = 0x1000; + st44.unk20 = 0; + st44.unk24 = param2[2]; + st44.unk28 = param2[4]; + st44.unk2c = param0->unk000; + + ptr->unk00 = FUN_0201FE94(&st44); + ptr->unk0c = param2[12]; + + if (ptr->unk00 != 0) + { + u8 r6 = FUN_020202A0(ptr->unk00); + + FUN_02020130(ptr->unk00, ((u16 *)param2)[3]); + FUN_02020248(ptr->unk00, r6 + param2[3]); + } + else + { + GF_AssertFail(); + } + + return ptr; +} + +THUMB_FUNC u32 FUN_0200C334(u32 *param0, u32 param1) +{ + return FUN_02009E54(FUN_020094F0(param0[4], param1), 0); +} + +THUMB_FUNC u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2) +{ + return FUN_02009E88(FUN_020094F0(param0[4], param1), param2); +} + +THUMB_FUNC u32 FUN_0200C358(struct UnkStruct_0200BB14_2 *param0, u32 param1) +{ + return FUN_0200C4F4(param0->unk0c[0], param0->unk24[0], param1); +} + +THUMB_FUNC u32 FUN_0200C368(struct UnkStruct_0200BB14_2 *param0, u32 param1) +{ + return FUN_0200C548(param0->unk0c[1], param0->unk24[1], param1); +} + +THUMB_FUNC u32 FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1) +{ + return FUN_0200C4A8(param0->unk0c[2], param0->unk24[2], param1); +} + +THUMB_FUNC u32 FUN_0200C388(struct UnkStruct_0200BB14_2 *param0, u32 param1) +{ + return FUN_0200C4A8(param0->unk0c[3], param0->unk24[3], param1); +} + +THUMB_FUNC void FUN_0200C398( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1) +{ + FUN_0200BC40(param1); + FUN_02009C30(param1->unk24[0]); + FUN_02009E28(param1->unk24[1]); + + for (s32 i = 0; i < param1->unk54; i++) + { + FUN_02009448(param1->unk24[i]); + FUN_02008E2C(param1->unk0c[i]); + } + + FUN_0200BCD0(param0, param1); +} + +THUMB_FUNC void FUN_0200C3DC(u32 *param0) +{ + if (param0[3] != 0) + { + FUN_02009CDC(*(u32 *)param0[1]); + } + + FUN_0201FFC8(param0[0]); + FUN_02008C80(param0[2]); + FreeToHeap(param0); +} + +THUMB_FUNC BOOL FUN_0200C404(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6) +{ + if (FUN_0200945C(param1->unk0c[param5], param6) == 0) + { + return FALSE; + } + + u32 r5 = FUN_020090AC(param1->unk0c[param5], param2, param3, param4, param6, param5, param0[0]); + if (r5 != 0) + { + u32 r4 = FUN_0200C474(param1->unk24[param5], r5); + GF_ASSERT(r4 == 1); + return r4; + } + GF_AssertFail(); + if (r5 != 0) + { + return TRUE; + } + + return FALSE; +} + +THUMB_FUNC BOOL FUN_0200C474(u32 *param0, u32 param1) +{ + for (s32 i = 0; i < (s32)param0[1]; i++) + { + if (((u32 *)param0[0])[i] == 0) + { + ((u32 *)param0[0])[i] = param1; + param0[2]++; + return TRUE; + } + } + + return FALSE; +} + +THUMB_FUNC BOOL FUN_0200C4A8(u32 param0, u32 *param1, u32 param2) +{ + for (s32 i = 0; i < (s32)param1[1]; i++) + { + if (((u32 *)param1[0])[i] != 0) + { + u32 r0 = FUN_02009530(((u32 *)param1[0])[i]); + if (r0 == param2) + { + + FUN_02009490(param0, ((u32 *)param1[0])[i]); + ((u32 *)param1[0])[i] = 0; + param1[2]--; + + return TRUE; + } + } + } + + return FALSE; +} + +THUMB_FUNC BOOL FUN_0200C4F4(u32 param0, u32 *param1, u32 param2) +{ + for (s32 i = 0; i < (s32)param1[1]; i++) + { + if (((u32 *)param1[0])[i] != 0) + { + u32 r0 = FUN_02009530(((u32 *)param1[0])[i]); + if (r0 == param2) + { + FUN_0201D324(param2); + + FUN_02009490(param0, ((u32 *)param1[0])[i]); + ((u32 *)param1[0])[i] = 0; + param1[2]--; + + return TRUE; + } + } + } + + return FALSE; +} + +THUMB_FUNC BOOL FUN_0200C548(u32 param0, u32 *param1, u32 param2) +{ + for (s32 i = 0; i < (s32)param1[1]; i++) + { + if (((u32 *)param1[0])[i] != 0) + { + u32 r0 = FUN_02009530(((u32 *)param1[0])[i]); + if (r0 == param2) + { + FUN_0201E1C8(param2); + + FUN_02009490(param0, ((u32 *)param1[0])[i]); + ((u32 *)param1[0])[i] = 0; + param1[2]--; + + return TRUE; + } + } + } + + return FALSE; +} + +THUMB_FUNC void FUN_0200C59C(u32 param0) +{ + FUN_020201E4(param0, 0x1000); +} + +THUMB_FUNC void FUN_0200C5A8(u32 *param0) +{ + FUN_0200C59C(param0[0]); +} + +THUMB_FUNC void FUN_0200C5B4(u32 *param0, u32 param1) +{ + FUN_020201E4(param0[0], param1); +} + +THUMB_FUNC void FUN_0200C5C0(u32 *param0, u32 param1) +{ + FUN_02020130(param0[0], param1); +} + +THUMB_FUNC u32 FUN_0200C5CC(u32 *param0) +{ + return FUN_020201DC(param0[0]); +} + +THUMB_FUNC void FUN_0200C5D8(u32 param0, u32 param1) +{ + FUN_020200BC(param0, param1); +} + +THUMB_FUNC void FUN_0200C5E0(u32 *param0, u32 param1) +{ + FUN_0200C5D8(param0[0], param1); +} + +THUMB_FUNC void FUN_0200C5EC(u32 param0, u32 param1) +{ + FUN_020200D8(param0, param1); +} + +THUMB_FUNC void FUN_0200C5F4(u32 *param0, u32 param1) +{ + FUN_0200C5EC(*param0, param1); +} + +THUMB_FUNC u32 FUN_0200C600(u32 param0) +{ + return FUN_02020388(param0); +} + +THUMB_FUNC u32 FUN_0200C608(u32 *param0) +{ + return FUN_0200C600(*param0); +} + +THUMB_FUNC void FUN_0200C614(u32 param0) +{ + FUN_02020208(param0); +} + +THUMB_FUNC void FUN_0200C61C(u32 *param0) +{ + FUN_0200C614(*param0); +} + +THUMB_FUNC void FUN_0200C628(u32 param0) +{ + FUN_0202022C(param0); +} + +THUMB_FUNC void FUN_0200C630(u32 *param0) +{ + FUN_0200C628(*param0); +} + +THUMB_FUNC void FUN_0200C63C(u32 param0, u32 param1) +{ + FUN_020200A0(param0, param1); +} + +THUMB_FUNC void FUN_0200C644(u32 *param0, u32 param1) +{ + FUN_0200C63C(*param0, param1); +} + +THUMB_FUNC u8 FUN_0200C650(u32 param0) +{ + return FUN_02020128(param0); +} + +THUMB_FUNC u8 FUN_0200C658(u32 *param0) +{ + return FUN_0200C650(*param0); +} + +THUMB_FUNC void FUN_0200C664(u32 param0, u32 param1) +{ + FUN_02020248(param0, param1); +} + +THUMB_FUNC void FUN_0200C66C(u32 *param0, u32 param1) +{ + FUN_0200C664(*param0, param1); +} + +THUMB_FUNC void FUN_0200C678(u32 param0, u32 param1) +{ + FUN_020202A8(param0, param1); +} + +THUMB_FUNC void FUN_0200C680(u32 *param0, u32 param1) +{ + FUN_0200C678(*param0, param1); +} + +THUMB_FUNC u8 FUN_0200C68C(u32 *param0) +{ + return FUN_02020300(*param0); +} + +THUMB_FUNC void FUN_0200C698(u32 param0, u32 param1) +{ + FUN_02020238(param0, (u8)param1); +} + +THUMB_FUNC u8 FUN_0200C6A4(u32 *param0) +{ + return FUN_02020240(*param0); +} + +THUMB_FUNC void FUN_0200C6B0(u32 *param0, u32 param1) +{ + FUN_0200C698(*param0, param1); +} + +THUMB_FUNC void FUN_0200C6BC(u32 param0, u32 param1) +{ + FUN_02020310(param0, param1); +} + +THUMB_FUNC void FUN_0200C6C4(u32 *param0, u32 param1) +{ + FUN_0200C6BC(*param0, param1); +} + +THUMB_FUNC u16 FUN_0200C6D0(u32 param0) +{ + return FUN_0202032C(param0); +} + +THUMB_FUNC u16 FUN_0200C6D8(u32 *param0) +{ + return FUN_0200C6D0(*param0); +} + +THUMB_FUNC void FUN_0200C6E4(u32 param0, u32 param1, u32 param2) +{ + u32 st0[3]; + st0[0] = param1 << 12; + st0[1] = param2 << 12; + if (FUN_02020380(param0) == 2) + { + st0[1] += 0xc0000; + } + st0[2] = 0; + + FUN_02020044(param0, st0); +} + +THUMB_FUNC void FUN_0200C714(u32 *param0, u32 param1, u32 param2) +{ + FUN_0200C6E4(*param0, param1, param2); +} + +THUMB_FUNC void FUN_0200C720(u32 param0, u32 param1, u32 param2, u32 param3) +{ + u32 st0[3]; + + st0[0] = param1 << 12; + st0[1] = param2 << 12; + if (FUN_02020380(param0) == 2) + { + st0[1] += param3; + } + st0[2] = 0; + + FUN_02020044(param0, st0); +} + +THUMB_FUNC void FUN_0200C750(u32 *param0, u32 param1, u32 param2, u32 param3) +{ + FUN_0200C720(*param0, param1, param2, param3); +} + +THUMB_FUNC void FUN_0200C75C(u32 param0, u16 *param1, u16 *param2) +{ + s32 *r4 = FUN_0202011C(param0, param1, param2); + + param1[0] = r4[0] / 0x1000; + + if (FUN_02020380(param0) == 2) + { + s32 r1 = r4[1] - 0xc0000; + + param2[0] = r1 / 0x1000; + + return; + } + + param2[0] = r4[1] / 0x1000; +} + +THUMB_FUNC void FUN_0200C7A0(u32 *param0, u16 *param1, u16 *param2) +{ + FUN_0200C75C(*param0, param1, param2); +} + +THUMB_FUNC void FUN_0200C7AC(u32 param0, u16 *param1, u16 *param2, u32 param3) +{ + s32 *r4 = FUN_0202011C(param0, param1, param2); + + param1[0] = r4[0] / 0x1000; + + if (FUN_02020380(param0) == 2) + { + s32 r1 = r4[1] - param3; + + param2[0] = r1 / 0x1000; + + return; + } + + param2[0] = r4[1] / 0x1000; +} + +THUMB_FUNC void FUN_0200C7F0(u32 *param0, u16 *param1, u16 *param2, u32 param3) +{ + FUN_0200C7AC(*param0, param1, param2, param3); +} + +THUMB_FUNC void FUN_0200C7FC(u32 param0, u16 *param1, u16 *param2) +{ + u32 st0[3]; + + u32 *r0 = FUN_0202011C(param0, param1, param2); + + st0[0] = r0[0] + ((u32)param1 << 0xc); + st0[1] = r0[1] + ((u32)param2 << 0xc); + st0[2] = r0[2]; + + FUN_02020044(param0, st0); +} + +THUMB_FUNC void FUN_0200C82C(u32 *param0, u16 *param1, u16 *param2) +{ + FUN_0200C7FC(*param0, param1, param2); +} + +THUMB_FUNC void FUN_0200C838(u32 param0, u32 param1) +{ + FUN_020200EC(param0, param1); +} + +THUMB_FUNC void FUN_0200C840(u32 *param0, u32 param1) +{ + FUN_0200C838(*param0, param1); +} + +THUMB_FUNC void FUN_0200C84C(u32 param0, f32 param1, f32 param2) +{ + s32 *r4 = FUN_02020120(param0); + + r4[0] = (s32)(param1 * 0x1000); + r4[1] = (s32)(param2 * 0x1000); + + FUN_02020064(param0, r4); +} + +THUMB_FUNC void FUN_0200C884(u32 *param0, f32 param1, f32 param2) +{ + FUN_0200C84C(*param0, param1, param2); +} + +THUMB_FUNC void FUN_0200C890(u32 param0, u16 param1) +{ + FUN_02020088(param0, param1); +} + +THUMB_FUNC void FUN_0200C898(u32 *param0, u16 param1) +{ + FUN_0200C890(*param0, param1); +} + +THUMB_FUNC void FUN_0200C8A4(u32 param0, u32 param1) +{ + u16 r0 = FUN_02020124(param0); + r0 += param1; + FUN_02020088(param0, r0); +} + +THUMB_FUNC void FUN_0200C8BC(u32 *param0, u32 param1) +{ + FUN_0200C8A4(*param0, param1); +} + +THUMB_FUNC void FUN_0200C8C8(u32 param0, u32 param1) +{ + FUN_02020100(param0, param1); +} + +THUMB_FUNC void FUN_0200C8D0(u32 *param0, u32 param1) +{ + FUN_0200C8C8(*param0, param1); +} + +THUMB_FUNC void FUN_0200C8DC(u32 *param0, u32 param1, u32 param2) +{ + u32 st0[3]; + st0[0] = param1 << 12; + st0[1] = param2 << 12; + st0[2] = 0; + + FUN_02020054(*param0, st0); +} + +THUMB_FUNC void FUN_0200C8F8(u32 *param0, u32 param1) +{ + FUN_02020358(*param0, param1); +} + +THUMB_FUNC void FUN_0200C904(u32 param0, u32 param1) +{ + FUN_02020398(param0, param1); +} + +THUMB_FUNC void FUN_0200C90C(u32 *param0, u32 param1) +{ + FUN_0200C904(*param0, param1); +} + +THUMB_FUNC BOOL FUN_0200C918(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6) +{ + if (FUN_0200945C(param1->unk0c[0], param6) == 0) + { + return FALSE; + } + + u32 r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); + if (r5 != 0) + { + FUN_02009AC4(r5); + FUN_0200C474(param1->unk24[0], r5); + + return TRUE; + } + + GF_AssertFail(); + if (r5 != 0) + { + return TRUE; + } + + return FALSE; +} + +THUMB_FUNC BOOL FUN_0200C978(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6) +{ + if (FUN_0200945C(param1->unk0c[0], param6) == 0) + { + return FALSE; + } + + u32 r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); + if (r5 != 0) + { + FUN_02009B78(r5); + FUN_0200C474(param1->unk24[0], r5); + + return TRUE; + } + + GF_AssertFail(); + if (r5 != 0) + { + return TRUE; + } + + return FALSE; +} + +THUMB_FUNC void FUN_0200C9D8( + u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5) +{ + u32 r6 = FUN_020094F0(param1[3], param5); + FUN_020090FC(param1[3], r6, param2, param3, param4, param0[0]); + + FUN_02009BE8(r6); +} + +THUMB_FUNC void FUN_0200CA0C( + u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5) +{ + u32 r6 = FUN_020094F0(param1[4], param5); + FUN_02009168(param1[4], r6, param2, param3, param4, param0[0]); + + FUN_02009DE0(r6); +} + +THUMB_FUNC u32 FUN_0200CA40(u32 *param0) +{ + return *param0; +} diff --git a/arm9/src/unk_02016B94.c b/arm9/src/unk_02016B94.c index e01b3133..6a9dd194 100644 --- a/arm9/src/unk_02016B94.c +++ b/arm9/src/unk_02016B94.c @@ -3361,7 +3361,7 @@ THUMB_FUNC u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2] return ptr; } -THUMB_FUNC void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u32 param1) +THUMB_FUNC void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u8 param1) { return param0->unk08[param1].unk08; } diff --git a/arm9/src/unk_0208A300.c b/arm9/src/unk_0208A300.c new file mode 100644 index 00000000..3c4a496b --- /dev/null +++ b/arm9/src/unk_0208A300.c @@ -0,0 +1,38 @@ +#include "global.h" +#include "heap.h" +#include "unk_0208A300.h" + +THUMB_FUNC struct UnkStruct_0208A300* FUN_0208A300(u32 heap_id) +{ + struct UnkStruct_0208A300* ret = AllocFromHeap(heap_id, sizeof(struct UnkStruct_0208A300)); + + __builtin__clear(ret, sizeof(struct UnkStruct_0208A300)); + ret->unk4 = 2; + + return ret; +} + +THUMB_FUNC void FUN_0208A320(struct UnkStruct_0208A300* unk) +{ + FreeToHeap(unk); +} + +THUMB_FUNC u32 FUN_0208A328(struct UnkStruct_0208A300* unk) +{ + return unk->unk0; +} + +THUMB_FUNC void FUN_0208A32C(struct UnkStruct_0208A300* unk, u32 a1) +{ + unk->unk0 = a1; +} + +THUMB_FUNC u32 FUN_0208A330(struct UnkStruct_0208A300* unk) +{ + return unk->unk4; +} + +THUMB_FUNC void FUN_0208A334(struct UnkStruct_0208A300* unk, u32 a1) +{ + unk->unk4 = a1; +} diff --git a/filesystem.mk b/filesystem.mk index 2b74f25f..387231bf 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -275,10 +275,13 @@ endif HOSTFS_FILES := $(NITROFS_FILES:%=files/%) %.narc: - $(KNARC) -d $(basename $@)/ -p $@ + $(KNARC) -d $(basename $@)/ -p $@ -i %.arc: - $(KNARC) -d $(basename $@)/ -p $@ + $(KNARC) -d $(basename $@)/ -p $@ -i + +%.naix: %.narc +files/wazaeffect/we.naix: %.naix: %.arc O2NARC_TARGETS := \ files/poketool/personal/personal.narc \ @@ -295,8 +298,9 @@ O2NARC_TARGETS := \ ALL_O2NARC_TARGETS := $(O2NARC_TARGETS) \ files/poketool/trainer/trpoke.narc +O2NARCFLAGS := -i files/poketool/personal/pms.narc: O2NARCFLAGS = -f -files/itemtool/itemdata/item_data.narc: O2NARCFLAGS = -p 0xFF +files/itemtool/itemdata/item_data.narc: O2NARCFLAGS += -p 0xFF ifeq (,$(NODEP)) $(ALL_O2NARC_TARGETS): dep = $(shell $(SCANINC) -I include -I include-mw -I arm9/lib/include $(patsubst %.narc,%.json.txt,$@)) diff --git a/include/constants/decorations.h b/include/constants/decorations.h new file mode 100644 index 00000000..e9b4e947 --- /dev/null +++ b/include/constants/decorations.h @@ -0,0 +1,144 @@ +#ifndef POKEDIAMOND_DECORATIONS_H
+#define POKEDIAMOND_DECORATIONS_H
+
+#define DECORATION_NONE 0
+#define DECORATION_DUMMY_1 1
+#define DECORATION_DUMMY_2 2
+#define DECORATION_DUMMY_3 3
+#define DECORATION_DUMMY_4 4
+#define DECORATION_DUMMY_5 5
+#define DECORATION_BIG_BOULDER 6
+#define DECORATION_YELLOW_CUSHION 7
+#define DECORATION_BLUE_CUSHION 8
+#define DECORATION_WOODEN_CHAIR 9
+#define DECORATION_BIG_TABLE 10
+#define DECORATION_PLAIN_TABLE 11
+#define DECORATION_SMALL_TABLE 12
+#define DECORATION_LONG_TABLE 13
+#define DECORATION_WIDE_TABLE 14
+#define DECORATION_POKE_TABLE 15
+#define DECORATION_BIG_BOOKSHELF 16
+#define DECORATION_SMALL_BOOKSHELF 17
+#define DECORATION_RESEARCH_SHELF 18
+#define DECORATION_BIKE_RACK 19
+#define DECORATION_SHOP_SHELF 20
+#define DECORATION_DISPLAY_SHELF 21
+#define DECORATION_CUPBOARD 22
+#define DECORATION_WOOD_DRESSER 23
+#define DECORATION_PINK_DRESSER 24
+#define DECORATION_TV 25
+#define DECORATION_REFRIGERATOR 26
+#define DECORATION_PRETTY_SINK 27
+#define DECORATION_FEATHERY_BED 28
+#define DECORATION_TRASH_CAN 29
+#define DECORATION_CARDBOARD_BOX 30
+#define DECORATION_CRATE 31
+#define DECORATION_CONTAINER 32
+#define DECORATION_OIL_DRUM 33
+#define DECORATION_BIG_OIL_DRUM 34
+#define DECORATION_IRON_BEAM 35
+#define DECORATION_POTTED_PLANT 36
+#define DECORATION_POKE_FLOWER 37
+#define DECORATION_HEALING_MACHINE 38
+#define DECORATION_LAB_MACHINE 39
+#define DECORATION_TEST_MACHINE 40
+#define DECORATION_GAME_SYSTEM 41
+#define DECORATION_VENDING_MACHINE 42
+#define DECORATION_RED_BIKE 43
+#define DECORATION_GREEN_BIKE 44
+#define DECORATION_BINOCULARS 45
+#define DECORATION_GLOBE 46
+#define DECORATION_GYM_STATUE 47
+#define DECORATION_RED_TENT 48
+#define DECORATION_BLUE_TENT 49
+#define DECORATION_CLEAR_TENT 50
+#define DECORATION_MAZE_BLOCK_1 51
+#define DECORATION_MAZE_BLOCK_2 52
+#define DECORATION_MAZE_BLOCK_3 53
+#define DECORATION_MAZE_BLOCK_4 54
+#define DECORATION_MAZE_BLOCK_5 55
+#define DECORATION_HOLE_TOOL 56
+#define DECORATION_PIT_TOOL 57
+#define DECORATION_SMOKE_TOOL 58
+#define DECORATION_BIG_SMOKE_TOOL 59
+#define DECORATION_ROCK_TOOL 60
+#define DECORATION_ROCKFALL_TOOL 61
+#define DECORATION_FOAM_TOOL 62
+#define DECORATION_BUBBLE_TOOL 63
+#define DECORATION_ALERT_TOOL_1 64
+#define DECORATION_ALERT_TOOL_2 65
+#define DECORATION_ALERT_TOOL_3 66
+#define DECORATION_ALERT_TOOL_4 67
+#define DECORATION_LEAF_TOOL 68
+#define DECORATION_FLOWER_TOOL 69
+#define DECORATION_EMBER_TOOL 70
+#define DECORATION_FIRE_TOOL 71
+#define DECORATION_CUTE_CUP 72
+#define DECORATION_COOL_CUP 73
+#define DECORATION_BEAUTY_CUP 74
+#define DECORATION_TOUGH_CUP 75
+#define DECORATION_CLEVER_CUP 76
+#define DECORATION_BLUE_CRYSTAL 77
+#define DECORATION_PINK_CRYSTAL 78
+#define DECORATION_RED_CRYSTAL 79
+#define DECORATION_YELLOW_CRYSTAL 80
+#define DECORATION_PRETTY_GEM 81
+#define DECORATION_SHINY_GEM 82
+#define DECORATION_MYSTIC_GEM 83
+#define DECORATION_GLITTER_GEM 84
+#define DECORATION_BRONZE_TROPHY 85
+#define DECORATION_SILVER_TROPHY 86
+#define DECORATION_GOLD_TROPHY 87
+#define DECORATION_GREAT_TROPHY 88
+#define DECORATION_BALL_ORNAMENT 89
+#define DECORATION_ROUND_ORNAMENT 90
+#define DECORATION_CLEAR_ORNAMENT 91
+#define DECORATION_CHARMANDER_DOLL 92
+#define DECORATION_BULBASAUR_DOLL 93
+#define DECORATION_SQUIRTLE_DOLL 94
+#define DECORATION_CYNDAQUIL_DOLL 95
+#define DECORATION_CHIKORITA_DOLL 96
+#define DECORATION_TOTODILE_DOLL 97
+#define DECORATION_TORCHIC_DOLL 98
+#define DECORATION_TREECKO_DOLL 99
+#define DECORATION_MUDKIP_DOLL 100
+#define DECORATION_CHIMCHAR_DOLL 101
+#define DECORATION_TURTWIG_DOLL 102
+#define DECORATION_PIPLUP_DOLL 103
+#define DECORATION_PIKACHU_DOLL 104
+#define DECORATION_PLUSLE_DOLL 105
+#define DECORATION_MINUN_DOLL 106
+#define DECORATION_CLEFAIRY_DOLL 107
+#define DECORATION_JIGGLYPUFF_DOLL 108
+#define DECORATION_WOBBUFFET_DOLL 109
+#define DECORATION_MEOWTH_DOLL 110
+#define DECORATION_SKITTY_DOLL 111
+#define DECORATION_GLAMEOW_DOLL 112
+#define DECORATION_BUNEARY_DOLL 113
+#define DECORATION_WEAVILE_DOLL 114
+#define DECORATION_MUNCHLAX_DOLL 115
+#define DECORATION_BONSLY_DOLL 116
+#define DECORATION_MIME_JR__DOLL 117
+#define DECORATION_LUCARIO_DOLL 118
+#define DECORATION_MANTYKE_DOLL 119
+#define DECORATION_BUIZEL_DOLL 120
+#define DECORATION_CHATOT_DOLL 121
+#define DECORATION_MANAPHY_DOLL 122
+#define DECORATION_SNORLAX_DOLL 123
+#define DECORATION_WAILORD_DOLL 124
+#define DECORATION_MAGNEZONE_DOLL 125
+#define DECORATION_DRIFLOON_DOLL 126
+#define DECORATION_HAPPINY_DOLL 127
+#define DECORATION_PACHIRISU_DOLL 128
+#define DECORATION_129 129
+#define DECORATION_130 130
+#define DECORATION_131 131
+#define DECORATION_132 132
+#define DECORATION_WIDE_SOFA 133
+#define DECORATION_BONSAI 134
+#define DECORATION_DAINTY_FLOWERS 135
+#define DECORATION_LOVELY_FLOWERS 136
+#define DECORATION_PRETTY_FLOWERS 137
+#define DECORATION_LAVISH_FLOWERS 138
+
+#endif //POKEDIAMOND_DECORATIONS_H
diff --git a/include/gf_gfx_loader.h b/include/gf_gfx_loader.h new file mode 100644 index 00000000..b95075dc --- /dev/null +++ b/include/gf_gfx_loader.h @@ -0,0 +1,23 @@ +#ifndef POKEDIAMOND_GF_GFX_LOADER_H
+#define POKEDIAMOND_GF_GFX_LOADER_H
+
+#include "unk_02016B94.h"
+
+u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
+void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
+void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 baseAddr, u32 szByte, u32 heap_id);
+void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 srcOffset, u32 baseAddr, u32 szByte, u32 heap_id);
+u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 whichRoutine, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id);
+void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heap_id, NNSG2dImagePaletteProxy * pPltProxy);
+u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy *pImgProxy);
+void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy * pImageProxy);
+void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, u32 heap_id);
+void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** ppScrData, u32 heap_id);
+void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData ** ppPltData, u32 heap_id);
+void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** ppCellBank, u32 heap_id);
+void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** ppAnimBank, u32 heap_id);
+void * GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, u32 heap_id);
+void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd);
+void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd, u32 *size_p);
+
+#endif //POKEDIAMOND_GF_GFX_LOADER_H
diff --git a/include/scrcmd.h b/include/scrcmd.h index a1906e2d..91cb306c 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -67,7 +67,7 @@ BOOL ScrCmd_Unk01FC(struct ScriptContext* ctx); BOOL ScrCmd_Unk01FD(struct ScriptContext* ctx); BOOL ScrCmd_Unk01FE(struct ScriptContext* ctx); BOOL ScrCmd_Unk01FF(struct ScriptContext* ctx); -BOOL ScrCmd_Unk026D(struct ScriptContext* ctx); +BOOL ScrCmd_MessageUnown(struct ScriptContext* ctx); BOOL ScrCmd_Unk002C(struct ScriptContext* ctx); BOOL ScrCmd_Unk002D(struct ScriptContext* ctx); BOOL ScrCmd_Unk02C0(struct ScriptContext* ctx); @@ -77,9 +77,9 @@ BOOL ScrCmd_Unk002F(struct ScriptContext* ctx); BOOL ScrCmd_WaitButtonAB(struct ScriptContext* ctx); BOOL ScrCmd_WaitButtonABTime(struct ScriptContext *ctx); BOOL ScrCmd_WaitButton(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0032(struct ScriptContext *ctx); +BOOL ScrCmd_WaitButtonABPad(struct ScriptContext *ctx); BOOL ScrCmd_Unk0033(struct ScriptContext *ctx); -BOOL ScrCmd_Unk0034(struct ScriptContext* ctx); +BOOL ScrCmd_CloseMessageBox(struct ScriptContext* ctx); BOOL ScrCmd_Unk0035(struct ScriptContext* ctx); BOOL ScrCmd_ScrollBg(struct ScriptContext* ctx); BOOL ScrCmd_CreateMessageBox(struct ScriptContext* ctx); @@ -107,37 +107,44 @@ BOOL ScrCmd_Unk02CF(struct ScriptContext *ctx); BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx); BOOL ScrCmd_Unk005E(struct ScriptContext *ctx); +// scrcmd_mart.c +BOOL ScrCmd_NormalMart(struct ScriptContext * ctx); +BOOL ScrCmd_SpecialMart(struct ScriptContext * ctx); +BOOL ScrCmd_GoodsMart(struct ScriptContext * ctx); +BOOL ScrCmd_SealsMart(struct ScriptContext * ctx); +BOOL ScrCmd_AccessoriesShop(struct ScriptContext * ctx); + //scrcmd_4.c BOOL ScrCmd_GetPlayerName(struct ScriptContext* ctx); BOOL ScrCmd_GetRivalName(struct ScriptContext* ctx); BOOL ScrCmd_GetFriendName(struct ScriptContext* ctx); -BOOL ScrCmd_Unk00D0(struct ScriptContext* ctx); +BOOL ScrCmd_GetPokemonName(struct ScriptContext* ctx); BOOL ScrCmd_GetItemName(struct ScriptContext* ctx); BOOL ScrCmd_GetPocketName(struct ScriptContext* ctx); BOOL ScrCmd_GetTMHMMoveName(struct ScriptContext* ctx); BOOL ScrCmd_GetMoveName(struct ScriptContext* ctx); BOOL ScrCmd_Unk00D5(struct ScriptContext* ctx); BOOL ScrCmd_Unk0280(struct ScriptContext* ctx); -BOOL ScrCmd_Unk00D6(struct ScriptContext* ctx); +BOOL ScrCmd_GetPokemonNickname(struct ScriptContext* ctx); BOOL ScrCmd_Unk0251(struct ScriptContext* ctx); BOOL ScrCmd_GetPoketchAppName(struct ScriptContext* ctx); BOOL ScrCmd_GetTrainerClassName(struct ScriptContext* ctx); BOOL ScrCmd_Unk00D9(struct ScriptContext* ctx); BOOL ScrCmd_Unk00DA(struct ScriptContext* ctx); struct String* FUN_02040AE4(u32 msg_no, u32 heap_id); -BOOL ScrCmd_Unk00DB(struct ScriptContext* ctx); -BOOL ScrCmd_Unk00DC(struct ScriptContext* ctx); -BOOL ScrCmd_Unk00DD(struct ScriptContext* ctx); +BOOL ScrCmd_GetPlayerStarterName(struct ScriptContext* ctx); +BOOL ScrCmd_GetRivalStarterName(struct ScriptContext* ctx); +BOOL ScrCmd_GetCounterpartStarterName(struct ScriptContext* ctx); BOOL ScrCmd_GetDecorationName(struct ScriptContext* ctx); BOOL ScrCmd_GetUndergroundTrapName(struct ScriptContext* ctx); BOOL ScrCmd_GetUndergroundItemName(struct ScriptContext* ctx); -BOOL ScrCmd_Unk00E2(struct ScriptContext* ctx); -BOOL ScrCmd_Unk017B(struct ScriptContext* ctx); +BOOL ScrCmd_GetMapName(struct ScriptContext* ctx); +BOOL ScrCmd_GetBerryName(struct ScriptContext* ctx); BOOL ScrCmd_GetNatureName(struct ScriptContext* ctx); BOOL ScrCmd_GetFashionName(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0272(struct ScriptContext* ctx); +BOOL ScrCmd_GetWhiteRockInscription(struct ScriptContext* ctx); BOOL ScrCmd_GetPokemonMoveName(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0232(struct ScriptContext* ctx); +BOOL ScrCmd_GetRibbonName(struct ScriptContext* ctx); BOOL ScrCmd_GetSealName(struct ScriptContext* ctx); BOOL ScrCmd_GetItemNameWithIndefArticle(struct ScriptContext* ctx); BOOL ScrCmd_GetItemNamePlural(struct ScriptContext* ctx); @@ -153,46 +160,46 @@ BOOL ScrCmd_CapitalizeFirstChar(struct ScriptContext* ctx); //scrcmd_sound.c BOOL ScrCmd_Unk02AE(struct ScriptContext *ctx); -BOOL ScrCmd_Unk0050(struct ScriptContext *ctx); -BOOL ScrCmd_Unk0051(struct ScriptContext *ctx); -BOOL ScrCmd_Unk0052(struct ScriptContext *ctx); +BOOL ScrCmd_PlayBgm(struct ScriptContext *ctx); +BOOL ScrCmd_StopBgm(struct ScriptContext *ctx); +BOOL ScrCmd_PlayDefaultBgm(struct ScriptContext *ctx); BOOL ScrCmd_Unk0053(struct ScriptContext *ctx); -BOOL ScrCmd_Unk0054(struct ScriptContext *ctx); +BOOL ScrCmd_FadeOutBgm(struct ScriptContext *ctx); BOOL FUN_02041464(struct ScriptContext *ctx); -BOOL ScrCmd_Unk0055(struct ScriptContext* ctx); +BOOL ScrCmd_FadeInBgm(struct ScriptContext* ctx); BOOL ScrCmd_Unk0056(struct ScriptContext* ctx); BOOL ScrCmd_Unk0057(struct ScriptContext* ctx); BOOL ScrCmd_Unk0058(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0049(struct ScriptContext* ctx); -BOOL ScrCmd_Unk004A(struct ScriptContext* ctx); -BOOL ScrCmd_Unk004B(struct ScriptContext* ctx); +BOOL ScrCmd_PlayFanfare(struct ScriptContext* ctx); +BOOL ScrCmd_StopFanfare(struct ScriptContext* ctx); +BOOL ScrCmd_PlayFanfareWait(struct ScriptContext* ctx); BOOL FUN_02041540(struct ScriptContext* ctx); -BOOL ScrCmd_Unk004C(struct ScriptContext* ctx); +BOOL ScrCmd_PlayCry(struct ScriptContext* ctx); BOOL ScrCmd_PlayCryWait(struct ScriptContext* ctx); BOOL FUN_02041598(struct ScriptContext* ctx); -BOOL ScrCmd_Unk004F(struct ScriptContext* ctx); +BOOL ScrCmd_PlaySoundWait(struct ScriptContext* ctx); BOOL FUN_020415CC(struct ScriptContext* ctx); -BOOL ScrCmd_PlayBgm(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0059(struct ScriptContext* ctx); -BOOL ScrCmd_Unk005A(struct ScriptContext* ctx); -BOOL ScrCmd_Unk005B(struct ScriptContext* ctx); -BOOL ScrCmd_Unk005C(struct ScriptContext* ctx); +BOOL ScrCmd_PlaySound(struct ScriptContext* ctx); +BOOL ScrCmd_CheckChatotCry(struct ScriptContext* ctx); +BOOL ScrCmd_StartChatotRecord(struct ScriptContext* ctx); +BOOL ScrCmd_StopChatotRecord(struct ScriptContext* ctx); +BOOL ScrCmd_SaveChatotCry(struct ScriptContext* ctx); BOOL ScrCmd_Unk005D(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0283(struct ScriptContext *ctx); +BOOL ScrCmd_SetVolume(struct ScriptContext *ctx); //scrcmd_8.c BOOL ScrCmd_Unk021D(struct ScriptContext* ctx); -//scrcmd_11.c -BOOL ScrCmd_Unk017D(struct ScriptContext* ctx); -BOOL ScrCmd_Unk017E(struct ScriptContext* ctx); -BOOL ScrCmd_Unk017F(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0180(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0181(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0182(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0183(struct ScriptContext* ctx); +//scrcmd_berry_trees.c +BOOL ScrCmd_GetBerryTreeGrowth(struct ScriptContext* ctx); +BOOL ScrCmd_GetBerryTreeType(struct ScriptContext* ctx); +BOOL ScrCmd_GetBerryTreeMulch(struct ScriptContext* ctx); +BOOL ScrCmd_GetBerryTreeWater(struct ScriptContext* ctx); +BOOL ScrCmd_GetBerryTreeAmount(struct ScriptContext* ctx); +BOOL ScrCmd_SetBerryTreeMulch(struct ScriptContext* ctx); +BOOL ScrCmd_SetBerryTreeType(struct ScriptContext* ctx); BOOL ScrCmd_Unk0184(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0185(struct ScriptContext* ctx); +BOOL ScrCmd_TakeBerryTreeBerries(struct ScriptContext* ctx); //scrcmd_13.c BOOL ScrCmd_Unk0253(struct ScriptContext* ctx); @@ -201,9 +208,9 @@ BOOL ScrCmd_Unk0255(struct ScriptContext* ctx); BOOL ScrCmd_Unk0256(struct ScriptContext* ctx); //scrcmd_coins.c -BOOL ScrCmd_Unk0075(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0076(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0077(struct ScriptContext* ctx); +BOOL ScrCmd_ShowCoinBox(struct ScriptContext* ctx); +BOOL ScrCmd_HideCoinBox(struct ScriptContext* ctx); +BOOL ScrCmd_UpdateCoinBox(struct ScriptContext* ctx); BOOL ScrCmd_GetCoins(struct ScriptContext* ctx); BOOL ScrCmd_GiveCoins(struct ScriptContext* ctx); BOOL ScrCmd_TakeCoinsImmediate(struct ScriptContext* ctx); @@ -218,18 +225,18 @@ BOOL ScrCmd_TakeMoneyImmediate(struct ScriptContext* ctx); BOOL ScrCmd_TakeMoneyAddress(struct ScriptContext* ctx); BOOL ScrCmd_HasEnoughMoneyImmediate(struct ScriptContext* ctx); BOOL ScrCmd_HasEnoughMoneyAddress(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0072(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0073(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0074(struct ScriptContext* ctx); +BOOL ScrCmd_ShowMoneyBox(struct ScriptContext* ctx); +BOOL ScrCmd_HideMoneyBox(struct ScriptContext* ctx); +BOOL ScrCmd_UpdateMoneyBox(struct ScriptContext* ctx); //scrcmd_daycare.c -BOOL ScrCmd_Unk016D(struct ScriptContext* ctx); -BOOL ScrCmd_Unk016E(struct ScriptContext* ctx); -BOOL ScrCmd_Unk01A8(struct ScriptContext* ctx); -BOOL ScrCmd_Unk01A9(struct ScriptContext* ctx); +BOOL ScrCmd_GetDaycarePokemonNames(struct ScriptContext* ctx); +BOOL ScrCmd_GetDaycareStatus(struct ScriptContext* ctx); +BOOL ScrCmd_DeleteDaycareEgg(struct ScriptContext* ctx); +BOOL ScrCmd_GiveDaycareEgg(struct ScriptContext* ctx); BOOL ScrCmd_Unk01A4(struct ScriptContext* ctx); BOOL ScrCmd_Unk01AA(struct ScriptContext* ctx); -BOOL ScrCmd_Unk01AE(struct ScriptContext* ctx); +BOOL ScrCmd_GetDaycareLevel(struct ScriptContext* ctx); BOOL ScrCmd_Unk01AF(struct ScriptContext* ctx); BOOL ScrCmd_Unk01B0(struct ScriptContext* ctx); BOOL ScrCmd_Unk01BC(struct ScriptContext* ctx); @@ -243,37 +250,37 @@ BOOL ScrCmd_Unk01AD(struct ScriptContext* ctx); //scrcmd_18.c BOOL ScrCmd_GiveMon(struct ScriptContext* ctx); -//scrcmd_19.c -BOOL ScrCmd_Unk01F1(struct ScriptContext* ctx); -BOOL ScrCmd_Unk01F4(struct ScriptContext* ctx); -BOOL ScrCmd_Unk01F5(struct ScriptContext* ctx); +//scrcmd_fossils.c +BOOL ScrCmd_CountFossils(struct ScriptContext* ctx); +BOOL ScrCmd_GetFossilPokemon(struct ScriptContext* ctx); +BOOL ScrCmd_GetFossilMinimumAmount(struct ScriptContext* ctx); BOOL ScrCmd_Unk01F2(struct ScriptContext* ctx); BOOL ScrCmd_Unk01F3(struct ScriptContext* ctx); -//scrcmd_20.c -BOOL ScrCmd_Unk02A6(struct ScriptContext* ctx); +//scrcmd_prizes.c +BOOL ScrCmd_GetPrizeItemIdAndCost(struct ScriptContext* ctx); //scrcmd_flags.c BOOL ScrCmd_HasSinnohDex(struct ScriptContext* ctx); BOOL ScrCmd_GiveSinnohDex(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0159(struct ScriptContext* ctx); -BOOL ScrCmd_Unk015A(struct ScriptContext* ctx); +BOOL ScrCmd_HasRunningShoes(struct ScriptContext* ctx); +BOOL ScrCmd_GiveRunningShoes(struct ScriptContext* ctx); BOOL ScrCmd_HasBadge(struct ScriptContext* ctx); BOOL ScrCmd_GiveBadge(struct ScriptContext* ctx); -BOOL ScrCmd_Unk015E(struct ScriptContext* ctx); +BOOL ScrCmd_GiveBag(struct ScriptContext* ctx); BOOL ScrCmd_GetTotalEarnedBadges(struct ScriptContext* ctx); -BOOL ScrCmd_Unk015F(struct ScriptContext* ctx); +BOOL ScrCmd_HasBag(struct ScriptContext* ctx); BOOL ScrCmd_Unk0160(struct ScriptContext* ctx); BOOL ScrCmd_Unk0161(struct ScriptContext* ctx); BOOL ScrCmd_Unk0162(struct ScriptContext* ctx); BOOL ScrCmd_Unk0163(struct ScriptContext* ctx); BOOL ScrCmd_Unk0164(struct ScriptContext* ctx); BOOL ScrCmd_Unk0165(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0166(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0167(struct ScriptContext* ctx); -BOOL ScrCmd_Unk01CF(struct ScriptContext* ctx); -BOOL ScrCmd_Unk01D0(struct ScriptContext* ctx); -BOOL ScrCmd_Unk01D1(struct ScriptContext* ctx); +BOOL ScrCmd_CheckGameCompleted(struct ScriptContext* ctx); +BOOL ScrCmd_SetGameCompleted(struct ScriptContext* ctx); +BOOL ScrCmd_GetSetStrength(struct ScriptContext* ctx); +BOOL ScrCmd_GetSetFlash(struct ScriptContext* ctx); +BOOL ScrCmd_GetSetDefog(struct ScriptContext* ctx); //scrcmd_items.c BOOL ScrCmd_GiveItem(struct ScriptContext* ctx); @@ -285,23 +292,23 @@ BOOL ScrCmd_GetItemPocketId(struct ScriptContext* ctx); BOOL ScrCmd_Unk0081(struct ScriptContext* ctx); BOOL ScrCmd_Unk0082(struct ScriptContext* ctx); -//scrcmd_23.c -BOOL ScrCmd_Unk0083(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0084(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0085(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0086(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0087(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0088(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0089(struct ScriptContext* ctx); -BOOL ScrCmd_Unk008A(struct ScriptContext* ctx); -BOOL ScrCmd_Unk008B(struct ScriptContext* ctx); -BOOL ScrCmd_Unk008C(struct ScriptContext* ctx); -BOOL ScrCmd_Unk008D(struct ScriptContext* ctx); -BOOL ScrCmd_Unk008E(struct ScriptContext* ctx); -BOOL ScrCmd_Unk008F(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0090(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0091(struct ScriptContext* ctx); -BOOL ScrCmd_Unk0092(struct ScriptContext* ctx); +//scrcmd_underground.c +BOOL ScrCmd_GiveSecretBaseDecoration(struct ScriptContext* ctx); +BOOL ScrCmd_TakeSecretBaseDecoration(struct ScriptContext* ctx); +BOOL ScrCmd_HasSpaceForDecoration(struct ScriptContext* ctx); +BOOL ScrCmd_GetDecorationCount(struct ScriptContext* ctx); +BOOL ScrCmd_GiveUndergroundTrap(struct ScriptContext* ctx); +BOOL ScrCmd_TakeUndergroundTrap(struct ScriptContext* ctx); +BOOL ScrCmd_HasSpaceForTrap(struct ScriptContext* ctx); +BOOL ScrCmd_GetTrapCount(struct ScriptContext* ctx); +BOOL ScrCmd_GiveTreasure(struct ScriptContext* ctx); +BOOL ScrCmd_TakeTreasure(struct ScriptContext* ctx); +BOOL ScrCmd_HasSpaceForTreasure(struct ScriptContext* ctx); +BOOL ScrCmd_GetTreasureCount(struct ScriptContext* ctx); +BOOL ScrCmd_GiveUndergroundSphere(struct ScriptContext* ctx); +BOOL ScrCmd_TakeUndergroundSphere(struct ScriptContext* ctx); +BOOL ScrCmd_HasSpaceForSphere(struct ScriptContext* ctx); +BOOL ScrCmd_GetSphereCount(struct ScriptContext* ctx); //scrcmd_24.c BOOL ScrCmd_Unk01C6(struct ScriptContext* ctx); diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h new file mode 100644 index 00000000..a252fd93 --- /dev/null +++ b/include/unk_0200BB14.h @@ -0,0 +1,243 @@ +#ifndef POKEDIAMOND_UNK_0200BB14_H +#define POKEDIAMOND_UNK_0200BB14_H + +#include "global.h" + +struct UnkStruct_0200BB14_1 +{ + u32 unk000; + u32 unk004; + u32 unk008; + u32 unk00c; + u8 unk010[0x128]; +}; + +struct UnkStruct_0200BB14_2 +{ + u32 unk00; + u32 unk04; + u32 *unk08; + u32 unk0c[6]; + u32 *unk24[6]; + u32 unk3c[6]; + s32 unk54; +}; + +struct UnkStruct_0200BB14_3 +{ + u32 unk00; + s16 unk04; + s16 unk06; + u16 unk08; + u16 unk0a; + u32 unk0c; + u32 unk10; + u32 unk14; + u32 unk18; + u32 unk1c; + u32 unk20; + u32 unk24; +}; + +struct UnkStruct_0200BB14_sub +{ + u8 unk00[0x24]; +}; + +struct UnkStruct_0200BB14_4 +{ + u32 unk00; + struct UnkStruct_0200BB14_sub *unk04; + s32 unk08; + s32 unk0c; + s32 unk10; + u32 unk14; + u32 unk18; + u32 unk1c; + u16 unk20; + u32 unk24; + u32 unk28; + u32 unk2c; +}; + +struct UnkStruct_0200BB14_6 +{ + struct UnkStruct_0200BB14_sub *unk0; + u32 unk4; +}; +struct UnkStruct_0200BB14_5 +{ + u32 unk00; + struct UnkStruct_0200BB14_sub *unk04; + struct UnkStruct_0200BB14_6 *unk08; + u32 unk0c; +}; + +struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id); +struct UnkStruct_0200BB14_2 *FUN_0200BB34(struct UnkStruct_0200BB14_1 *param0); +u32 FUN_0200BB68(u32 param0); +BOOL FUN_0200BB6C(struct UnkStruct_0200BB14_1 *param0, u32 *param1, u32 *param2, u32 param3); +BOOL FUN_0200BBF0( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 param2); +void FUN_0200BC14(u32 param0); +void FUN_0200BC1C(u32 *param0); +void FUN_0200BC30(); +void FUN_0200BC38(); +void FUN_0200BC40(struct UnkStruct_0200BB14_2 *param0); +void FUN_0200BC4C(struct UnkStruct_0200BB14_2 *param0); +void FUN_0200BC5C(struct UnkStruct_0200BB14_2 *param0); +void FUN_0200BCB0(u32 *param0); +void FUN_0200BCD0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); +void FUN_0200BCE0(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); +void FUN_0200BD04(u32 *param0); +BOOL FUN_0200BD20( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, const char **param2); +u32 FUN_0200BE38(u32 *param0, u32 *param1, struct UnkStruct_0200BB14_3 *param2); +u32 FUN_0200BE74(u32 *param0, + u32 *param1, + u32 param2, + s16 param3, + s16 param4, + s16 param5, + u16 param6, + u32 param7, + u32 param8, + u32 param9, + u32 param10, + u32 param11, + u32 param12, + u32 param13); +BOOL FUN_0200BF60( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); +BOOL FUN_0200C00C(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6); +s32 FUN_0200C06C(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + u32 param6, + s32 param7); +u8 FUN_0200C0DC(u32 param0, + u32 param1, + u32 *param2, + struct UnkStruct_0200BB14_2 *param3, + u32 param4, + u32 param5, + u32 param6, + u32 param7, + u32 param8, + s32 param9); +u32 FUN_0200C124(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + s32 param5); +u32 FUN_0200C13C(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + s32 param5); +struct UnkStruct_0200BB14_5 *FUN_0200C154( + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); +u32 FUN_0200C334(u32 *param0, u32 param1); +u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2); +u32 FUN_0200C358(struct UnkStruct_0200BB14_2 *param0, u32 param1); +u32 FUN_0200C368(struct UnkStruct_0200BB14_2 *param0, u32 param1); +u32 FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1); +u32 FUN_0200C388(struct UnkStruct_0200BB14_2 *param0, u32 param1); +void FUN_0200C398(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1); +void FUN_0200C3DC(u32 *param0); +BOOL FUN_0200C404(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6); +BOOL FUN_0200C474(u32 *param0, u32 param1); +BOOL FUN_0200C4A8(u32 param0, u32 *param1, u32 param2); +BOOL FUN_0200C4F4(u32 param0, u32 *param1, u32 param2); +BOOL FUN_0200C548(u32 param0, u32 *param1, u32 param2); +void FUN_0200C59C(u32 param0); +void FUN_0200C5A8(u32 *param0); +void FUN_0200C5B4(u32 *param0, u32 param1); +void FUN_0200C5C0(u32 *param0, u32 param1); +u32 FUN_0200C5CC(u32 *param0); +void FUN_0200C5D8(u32 param0, u32 param1); +void FUN_0200C5E0(u32 *param0, u32 param1); +void FUN_0200C5EC(u32 param0, u32 param1); +void FUN_0200C5F4(u32 *param0, u32 param1); +u32 FUN_0200C600(u32 param0); +u32 FUN_0200C608(u32 *param0); +void FUN_0200C614(u32 param0); +void FUN_0200C61C(u32 *param0); +void FUN_0200C628(u32 param0); +void FUN_0200C630(u32 *param0); +void FUN_0200C63C(u32 param0, u32 param1); +void FUN_0200C644(u32 *param0, u32 param1); +u8 FUN_0200C650(u32 param0); +u8 FUN_0200C658(u32 *param0); +void FUN_0200C664(u32 param0, u32 param1); +void FUN_0200C66C(u32 *param0, u32 param1); +void FUN_0200C678(u32 param0, u32 param1); +void FUN_0200C680(u32 *param0, u32 param1); +u8 FUN_0200C68C(u32 *param0); +void FUN_0200C698(u32 param0, u32 param1); +u8 FUN_0200C6A4(u32 *param0); +void FUN_0200C6B0(u32 *param0, u32 param1); +void FUN_0200C6BC(u32 param0, u32 param1); +void FUN_0200C6C4(u32 *param0, u32 param1); +u16 FUN_0200C6D0(u32 param0); +u16 FUN_0200C6D8(u32 *param0); +void FUN_0200C6E4(u32 param0, u32 param1, u32 param2); +void FUN_0200C714(u32 *param0, u32 param1, u32 param2); +void FUN_0200C720(u32 param0, u32 param1, u32 param2, u32 param3); +void FUN_0200C750(u32 *param0, u32 param1, u32 param2, u32 param3); +void FUN_0200C75C(u32 param0, u16 *param1, u16 *param2); +void FUN_0200C7A0(u32 *param0, u16 *param1, u16 *param2); +void FUN_0200C7AC(u32 param0, u16 *param1, u16 *param2, u32 param3); +void FUN_0200C7F0(u32 *param0, u16 *param1, u16 *param2, u32 param3); +void FUN_0200C7FC(u32 param0, u16 *param1, u16 *param2); +void FUN_0200C82C(u32 *param0, u16 *param1, u16 *param2); +void FUN_0200C838(u32 param0, u32 param1); +void FUN_0200C840(u32 *param0, u32 param1); +void FUN_0200C84C(u32 param0, f32 param1, f32 param2); +void FUN_0200C884(u32 *param0, f32 param1, f32 param2); +void FUN_0200C890(u32 param0, u16 param1); +void FUN_0200C898(u32 *param0, u16 param1); +void FUN_0200C8A4(u32 param0, u32 param1); +void FUN_0200C8BC(u32 *param0, u32 param1); +void FUN_0200C8C8(u32 param0, u32 param1); +void FUN_0200C8D0(u32 *param0, u32 param1); +void FUN_0200C8DC(u32 *param0, u32 param1, u32 param2); +void FUN_0200C8F8(u32 *param0, u32 param1); +void FUN_0200C904(u32 param0, u32 param1); +void FUN_0200C90C(u32 *param0, u32 param1); +BOOL FUN_0200C918(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6); +BOOL FUN_0200C978(u32 *param0, + struct UnkStruct_0200BB14_2 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6); +void FUN_0200C9D8(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); +void FUN_0200CA0C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); +u32 FUN_0200CA40(u32 *param0); + +#endif // POKEDIAMOND_UNK_0200BB14_H diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h index a13f1634..fec45cd8 100644 --- a/include/unk_02016B94.h +++ b/include/unk_02016B94.h @@ -219,7 +219,7 @@ void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2); void *FUN_020187B0(u32 param0); void FUN_02018808(u8 *param0, u32 param1, u8 (*param2)[2], u8 param3); u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2]; -void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u32 param1); +void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u8 param1); u16 FUN_02018878(struct UnkStruct_02016B94_2 *param0, u32 param1); u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1); void BlitBitmapRect4Bit(struct UnkStruct_02016B94_3 *param0, diff --git a/include/unk_0208A300.h b/include/unk_0208A300.h new file mode 100644 index 00000000..9c2ae898 --- /dev/null +++ b/include/unk_0208A300.h @@ -0,0 +1,17 @@ +#ifndef POKEDIAMOND_UNK_0208A300_H +#define POKEDIAMOND_UNK_0208A300_H + +struct UnkStruct_0208A300 +{ + u32 unk0; + u32 unk4; +}; + +struct UnkStruct_0208A300* FUN_0208A300(u32 heap_id); +void FUN_0208A320(struct UnkStruct_0208A300* unk); +u32 FUN_0208A328(struct UnkStruct_0208A300* unk); +void FUN_0208A32C(struct UnkStruct_0208A300* unk, u32 a1); +u32 FUN_0208A330(struct UnkStruct_0208A300* unk); +void FUN_0208A334(struct UnkStruct_0208A300* unk, u32 a1); + +#endif diff --git a/tools/knarc/Narc.cpp b/tools/knarc/Narc.cpp index 7e698571..cce7cdea 100644 --- a/tools/knarc/Narc.cpp +++ b/tools/knarc/Narc.cpp @@ -29,6 +29,7 @@ using namespace std; extern bool debug; extern bool pack_no_fnt; +extern bool output_header; void Narc::AlignDword(ofstream& ofs, uint8_t paddingChar) { @@ -145,6 +146,39 @@ bool Narc::Pack(const fs::path& fileName, const fs::path& directory) if (!ofs.good()) { return Cleanup(ofs, NarcError::InvalidOutputFile); } + ofstream ofhs; + string stem; + string stem_upper; + // Pikalax 29 May 2021 + // Output an includable header that enumerates the NARC contents + if (output_header) + { + fs::path naixfname = fileName; + naixfname.replace_extension(".naix"); + + ofhs.open(naixfname); + if (!ofhs.good()) + { + ofhs.close(); + return Cleanup(ofs, NarcError::InvalidOutputFile); + } + + stem = fileName.stem().string(); + stem_upper = stem; + for (char &c : stem_upper) + { c = toupper(c); } + + ofhs << "/*\n" + " * THIS FILE WAS AUTOMATICALLY\n" + " * GENERATED BY tools/knarc\n" + " * DO NOT MODIFY!!!\n" + " */\n" + "\n" + "#ifndef NARC_" << stem_upper << "_NAIX_\n" + "#define NARC_" << stem_upper << "_NAIX_\n" + "\n" + "enum {\n"; + } vector<FileAllocationTableEntry> fatEntries; uint16_t directoryCounter = 1; @@ -153,6 +187,7 @@ bool Narc::Pack(const fs::path& fileName, const fs::path& directory) ignore_patterns.push_back(".*keep"); WildcardVector keep_patterns(directory / ".knarckeep"); + int memberNo = 0; for (const auto& de : OrderedDirectoryIterator(directory, true)) { if (is_directory(de)) @@ -164,6 +199,12 @@ bool Narc::Pack(const fs::path& fileName, const fs::path& directory) if (debug) { cerr << "DEBUG: adding file " << de.path() << endl; } + if (output_header) + { + string de_stem = de.path().filename().string(); + std::replace(de_stem.begin(), de_stem.end(), '.', '_'); + ofhs << "\tNARC_" << stem << "_" << de_stem << " = " << (memberNo++) << ",\n"; + } fatEntries.push_back(FileAllocationTableEntry { .Start = 0x0, @@ -183,6 +224,11 @@ bool Narc::Pack(const fs::path& fileName, const fs::path& directory) fatEntries.back().End = fatEntries.back().Start + static_cast<uint32_t>(file_size(de)); } } + if (output_header) + { + ofhs << "};\n\n#endif //NARC_" << stem_upper << "_NAIX_\n"; + ofhs.close(); + } FileAllocationTable fat { diff --git a/tools/knarc/Source.cpp b/tools/knarc/Source.cpp index d9a5cf83..587c8527 100644 --- a/tools/knarc/Source.cpp +++ b/tools/knarc/Source.cpp @@ -8,6 +8,7 @@ using namespace std; bool debug = false; bool pack_no_fnt = true; +bool output_header = false; void PrintError(NarcError error) { @@ -40,6 +41,7 @@ static inline void usage() { cout << "\t-n\tBuild the filename table (default: discards filenames)" << endl; cout << "\t-D/--debug\tPrint additional debug messages" << endl; cout << "\t-h/--help\tPrint this message and exit" << endl; + cout << "\t-i\tOutput a .naix header" << endl; } int main(int argc, char* argv[]) @@ -104,6 +106,9 @@ int main(int argc, char* argv[]) else if (!strcmp(argv[i], "-n")) { pack_no_fnt = false; } + else if (!strcmp(argv[i], "-i")) { + output_header = true; + } else { usage(); cerr << "ERROR: Unrecognized argument: " << argv[i] << endl; diff --git a/tools/o2narc/o2narc.cpp b/tools/o2narc/o2narc.cpp index 1381788a..60e4e242 100644 --- a/tools/o2narc/o2narc.cpp +++ b/tools/o2narc/o2narc.cpp @@ -3,6 +3,7 @@ #include <getopt.h> #include <cstring> #include <vector> +#include <iomanip> #include "elf.h" #include "Narc.h" @@ -49,6 +50,7 @@ class Elf { public: ShdrTab shdr; Symtab symtab; + Elf(string const& filename) : Elf(filename.c_str()) {} Elf(const char * filename) { // Read the ELF header phdr = nullptr; @@ -155,25 +157,29 @@ static inline void usage() { cout << "\toutfile\tOutput NARC file" << endl; cout << "Options:" << endl; cout << "\t-f|--flatten\tDon't generate NARC headers" << endl; + cout << "\t-i|--output-header\tCreate a .naix file" << endl; } int main(int argc, char ** argv) { // CLI arguments - int flatten = 0; + int flatten = 0, output_header = 0; char padding = '\xFF'; static option options [] { { "flatten", no_argument, &flatten, 1 }, { "padding", required_argument, nullptr, 'p' }, + { "output_header", no_argument, &output_header, 1 }, {nullptr, 0, nullptr, 0} }; int opt_index; int c; - while ((c = getopt_long(argc, argv, "fp:", options, &opt_index)) != -1) + while ((c = getopt_long(argc, argv, "fp:i", options, &opt_index)) != -1) { if (c == 'f') { flatten = 1; } else if (c == 'p') { padding = strtol(optarg, NULL, 0); + } else if (c == 'i') { + output_header = 1; } } argv += optind; @@ -188,8 +194,13 @@ int main(int argc, char ** argv) { cerr << "Excess arguments: first unrecognized '" << argv[2] << "'" << endl; return 1; } - char * infname = argv[0]; - char * outfname = argv[1]; + if (output_header && flatten) { + usage(); + cerr << "Incompatible flags: -i, -f" << endl; + return 1; + } + const char * infname = argv[0]; + const char * outfname = argv[1]; // Read the ELF file Elf elf(infname); @@ -201,15 +212,45 @@ int main(int argc, char ** argv) { exit(1); } - fstream ofile; - ofile.open(outfname, ios_base::out | ios_base::binary); + ofstream ofile; + ofile.open(outfname, ios_base::binary); if (!ofile.good()) { cerr << "ERROR: Unable to open '" << outfname << "' for writing" << endl; exit(1); } - if (!flatten) // then build the NARC chunks { + string stem, stem_upper; + ofstream ofheader; + if (output_header) + { + string outhname = outfname; + outhname.replace(outhname.find(".narc"), 5, ".naix"); + ofheader.open(outhname); + if (!ofheader.good()) + { + ofile.close(); + cerr << "ERROR: Unable to open '" << outhname << "' for writing" << endl; + exit(1); + } + stem = outfname; + stem = stem.substr(0, stem.rfind(".")); + stem = stem.substr(stem.rfind("/") + 1); + stem_upper = stem; + for (char &_c : stem_upper) + { _c = toupper(_c); } + + ofheader << "/*\n" + " * THIS FILE WAS AUTOMATICALLY\n" + " * GENERATED BY tools/o2narc\n" + " * DO NOT MODIFY!!!\n" + " */\n" + "\n" + "#ifndef NARC_" << stem_upper << "_NAIX_\n" + "#define NARC_" << stem_upper << "_NAIX_\n" + "\n" + "enum {\n"; + } // .data contains the size table Elf32_Shdr & data_sec = elf.shdr[".data"]; uint32_t * _data = (uint32_t *)elf.read(data_sec); @@ -275,6 +316,15 @@ int main(int argc, char ** argv) { { _rodata[fat_entries[i].Start + j] = padding; } + if (output_header) + { + ofheader << "\tNARC_" << stem << "_narc_" << setw(4) << setfill('0') << i << " = " << i << ",\n"; + } + } + if (output_header) + { + ofheader << "};\n\n#endif //NARC_" << stem_upper << "_NAIX_\n"; + ofheader.close(); } // These NARCs have empty FNTs FileNameTable fnt{ |