Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-03-21 17:54:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

module to overlay

Browse Source
This commit is contained in:
red031000 2023-06-21 04:29:41 +01:00
parent 53c9db80e2
commit d78883ab5b
No known key found for this signature in database
GPG Key ID: D27E50C050AE0CE1
377 changed files with 108878 additions and 108876 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/calcrom/BuildAnalyzer.cpp vendored
View File

@ -90,7 +90,7 @@ BuildAnalyzer &BuildAnalyzer::operator()() {
if (analyzed) {
reset();
}
string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/*/{src,asm},modules/*/{asm,src}}/*.{c,s,cpp}";
string pattern = srcbase.string() + "/{src,asm,lib/{src,asm},lib/*/{src,asm},overlays/*/{asm,src}}/*.{c,s,cpp}";
for (char const * & fname : Glob(pattern, GLOB_TILDE | GLOB_BRACE | GLOB_NOSORT)) {
if (string(fname).find("lib/syscall/") == string::npos) {
AnalyzeObject(fname);

6
.gitignore vendored
View File

@ -36,9 +36,9 @@ arm*/baserom.*
*.lcf.template
# Working files
arm9/modules/module_*.s
arm9/modules/module_*.sbin
arm9/modules/module_*.cfg
arm9/overlays/overlay_*.s
arm9/overlays/overlay_*.sbin
arm9/overlays/overlay_*.cfg
# Dism scripts
dism.sh

6
CONTRIBUTING.md
View File

@ -17,7 +17,7 @@ root
`- lib
`- src
`- include
`- modules
`- overlays
`- 00
`- asm
`- src
@ -86,7 +86,7 @@ After placing your C file into the LSF as described above, test your build by ru
Append the line `.extern sub_0201B578` to arm9/global.inc and recompile.
build/arm9.sbin: FAILED
build/MODULE_00.sbin: FAILED
build/OVERLAY_00.sbin: FAILED
...
Your attempt was incorrect. Don't be discouraged, this is all part of the process. The following bash script will allow you to compare your code to the original ROM; save it as arm9/asmdiff.sh
@ -109,7 +109,7 @@ Place a clean version of the ARM9 binary as arm9/baserom.sbin (arm9/build/arm9.b
**This section describes a target repository specification and does not reflect the current state of the project.**
ASM files may own one or more data/RAM sections. The types of these sections is not guaranteed to be accurate. When decompiling data, you are expected to translate the raw bytes into the actual structures used by the source code. These may be simple values (char, short, word, or pointer), or they could be C structs or unions. Some overlay modules are suspected to contain C++ classes, the handling of which is not yet described.
ASM files may own one or more data/RAM sections. The types of these sections is not guaranteed to be accurate. When decompiling data, you are expected to translate the raw bytes into the actual structures used by the source code. These may be simple values (char, short, word, or pointer), or they could be C structs or unions. Some overlays are suspected to contain C++ classes, the handling of which is not yet described.
Because the Nintendo DS architecture is ARM, all data is aligned. This means 16-bit integers are aligned to 2 bytes within a structure, and anything 4 bytes or wider is aligned to 4 bytes (long, long long, float, double, struct, union, void *). All data requiring alignment are padded with 0. For example:
```armasm

4
arm9/CMakeLists.txt
View File

@ -12,8 +12,8 @@ enable_language(ASM)
add_compile_options(-fms-extensions)
file(GLOB_RECURSE SOURCES "*.c" "*.cpp" "*.s")
file(GLOB MODULE_INC modules/*/include)
file(GLOB OVERLAY_INC overlays/*/include)
add_executable(DP_Arm9 ${SOURCES})
target_include_directories(DP_Arm9 PRIVATE ../include ../include-mw lib/NitroSDK/include lib/libc/include lib/libnns/include ${MODULE_INC} ../files)
target_include_directories(DP_Arm9 PRIVATE ../include ../include-mw lib/NitroSDK/include lib/libc/include lib/libnns/include ${OVERLAY_INC} ../files)
target_compile_definitions(DP_Arm9 PUBLIC __CLION_IDE__)

8
arm9/Makefile
View File

@ -57,11 +57,11 @@ LD_TEMPLATE := ARM9-TS.lcf.template
# Directories containing source files
# sorting wildcards required for versions of make >= 3.8.2 and < 4.3 for consistent builds
SRC_DIRS := src lib lib/libnns/src lib/NitroSDK/src lib/libc/src $(sort $(wildcard modules/*/src))
ASM_DIRS := asm data files $(sort $(wildcard modules/*/asm))
SRC_DIRS := src lib lib/libnns/src lib/NitroSDK/src lib/libc/src $(sort $(wildcard overlays/*/src))
ASM_DIRS := asm data files $(sort $(wildcard overlays/*/asm))
LIBASM_DIRS := lib/syscall
INCLUDE_RECURSIVE_DIRS := ../include-mw lib/libc/include lib/libnns/include lib/NitroSDK/include
INCLUDE_DIRS := ../include $(sort $(wildcard modules/*/include)) ../files
INCLUDE_DIRS := ../include $(sort $(wildcard overlays/*/include)) ../files
C_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.c)))
CXX_FILES := $(foreach dir,$(SRC_DIRS),$(sort $(wildcard $(dir)/*.cpp)))
@ -79,7 +79,7 @@ O_FILES := $(C_OBJS) $(CXX_OBJS) $(S_OBJS)
GLOBAL_ASM_C_FILES != grep -rl 'GLOBAL_ASM(' $(C_FILES)
GLOBAL_ASM_O_FILES = $(addprefix $(BUILD_DIR)/,$(GLOBAL_ASM_C_FILES:.c=.o))
# Overlay modules
# Overlays
OVERLAYS := $(shell grep -oE "Overlay \w+" $(LD_SPEC) | cut -d' ' -f2)
.SECONDARY:

756
arm9/arm9.lsf
View File

File diff suppressed because it is too large Load Diff

6
arm9/asm/libVCT.s
View File

@ -1818,7 +1818,7 @@ _020AA144:
ldr r2, [r6, #0x0]
str r3, [r7, #0x8cc]
and r0, r0, #0xff
bl MOD04_021EAE90
bl ov04_021EAE90
ldr r0, [r7, #0x8cc]
cmp r0, #0x0
bne _020AA1A0
@ -4475,7 +4475,7 @@ sub_020AC554:
_020AC57C:
ldrb r0, [r0, #0x4]
mov r2, #0x10
bl MOD04_021EB044
bl ov04_021EB044
cmp r0, #0x0
addeq sp, sp, #0x4
moveq r0, #0x0
@ -4554,7 +4554,7 @@ _020AC654:
mov r1, r10
mov r2, r6
strb r8, [r10, #0x9]
bl MOD04_021EB044
bl ov04_021EB044
cmp r0, #0x0
addne r9, r9, #0x1
_020AC694:

96
arm9/asm/scrcmd_10.s
View File

@ -33,7 +33,7 @@ ScrCmd_Unk01DA: ; 0x02042354
add r0, #0x80
ldr r0, [r0, #0x0]
add r0, #0xa8
bl MOD06_022434BC
bl ov06_022434BC
mov r0, #0x0
pop {r3, pc}
@ -52,7 +52,7 @@ ScrCmd_Unk01DB: ; 0x02042364
bl ScriptEnvironment_GetSavePtr
add r1, r4, #0x0
add r2, r6, #0x0
bl MOD06_022434D0
bl ov06_022434D0
add r5, #0x80
ldr r1, [r5, #0x0]
add r1, #0xa8
@ -68,7 +68,7 @@ ScrCmd_Unk01DC: ; 0x02042394
ldr r0, [r0, #0x0]
add r0, #0xa8
ldr r0, [r0, #0x0]
bl MOD06_02243694
bl ov06_02243694
add r4, #0x80
ldr r1, [r4, #0x0]
mov r0, #0x0
@ -221,7 +221,7 @@ _02042406: ; jump table (using 16-bit offset)
.short _020426E6 - _02042406 - 2; case 100
_020424D0:
add r0, r6, #0x0
bl MOD06_0224312C
bl ov06_0224312C
strh r0, [r4, #0x0]
b _020426FA
_020424DA:
@ -229,76 +229,76 @@ _020424DA:
bne _020424EA
ldrb r0, [r5, #0xe]
ldr r1, [r1, #0xc]
bl MOD06_022432E4
bl ov06_022432E4
strh r0, [r4, #0x0]
b _020426FA
_020424EA:
ldr r1, [r1, #0xc]
add r0, r6, #0x0
bl MOD06_022432E4
bl ov06_022432E4
strh r0, [r4, #0x0]
b _020426FA
_020424F6:
bl MOD06_0224339C
bl ov06_0224339C
b _020426FA
_020424FC:
ldr r0, [r1, #0xc]
bl SaveStruct23_GetSubstruct1
bl MOD06_022433A8
bl ov06_022433A8
b _020426FA
_02042508:
ldr r0, [r1, #0xc]
bl SaveStruct23_GetSubstruct1
bl MOD06_022433B0
bl ov06_022433B0
strh r0, [r4, #0x0]
b _020426FA
_02042516:
add r0, r1, #0x0
bl MOD06_022433B8
bl ov06_022433B8
b _020426FA
_0204251E:
add r0, r1, #0x0
bl MOD06_022433F8
bl ov06_022433F8
b _020426FA
_02042526:
ldr r0, [r1, #0xc]
add r1, r6, #0x0
bl MOD06_02243408
bl ov06_02243408
strh r0, [r4, #0x0]
b _020426FA
_02042532:
ldr r1, [r1, #0xc]
mov r0, #0x0
mov r2, #0x2
bl MOD06_02243E74
bl ov06_02243E74
strh r0, [r4, #0x0]
b _020426FA
_02042540:
mov r0, #0x0
ldr r1, [r1, #0xc]
add r2, r0, #0x0
bl MOD06_02243E74
bl ov06_02243E74
strh r0, [r4, #0x0]
b _020426FA
_0204254E:
ldr r0, [r1, #0xc]
lsl r1, r6, #0x18
lsr r1, r1, #0x18
bl MOD06_02243428
bl ov06_02243428
b _020426FA
_0204255A:
ldr r0, [r1, #0xc]
bl MOD06_02243448
bl ov06_02243448
strh r0, [r4, #0x0]
b _020426FA
_02042564:
ldr r0, [r1, #0xc]
bl MOD06_0224345C
bl ov06_0224345C
strh r0, [r4, #0x0]
b _020426FA
_0204256E:
ldr r0, [r1, #0xc]
bl MOD06_022434AC
bl ov06_022434AC
strh r0, [r4, #0x0]
b _020426FA
_02042578:
@ -317,7 +317,7 @@ _0204258A:
add r2, r0, #0x0
ldr r1, [r7, #0x74]
add r0, r5, #0x0
bl MOD06_022436C8
bl ov06_022436C8
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
@ -330,60 +330,60 @@ _020425A2:
add r1, r0, #0x0
ldr r2, [r2, #0xc]
add r0, r5, #0x0
bl MOD06_022436E8
bl ov06_022436E8
strh r0, [r4, #0x0]
b _020426FA
_020425BC:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
bl MOD06_02243780
bl ov06_02243780
strh r0, [r4, #0x0]
b _020426FA
_020425C8:
add r0, r5, #0x0
bl MOD06_022438DC
bl ov06_022438DC
strh r0, [r4, #0x0]
b _020426FA
_020425D2:
add r0, r5, #0x0
bl MOD06_022438E0
bl ov06_022438E0
strh r0, [r4, #0x0]
b _020426FA
_020425DC:
add r0, r5, #0x0
bl MOD06_022438FC
bl ov06_022438FC
strh r0, [r4, #0x0]
b _020426FA
_020425E6:
add r0, r5, #0x0
bl MOD06_02243920
bl ov06_02243920
strh r0, [r4, #0x0]
b _020426FA
_020425F0:
add r0, r5, #0x0
bl MOD06_022439F8
bl ov06_022439F8
b _020426FA
_020425F8:
add r0, r5, #0x0
bl MOD06_02243AD8
bl ov06_02243AD8
b _020426FA
_02042600:
add r0, r5, #0x0
bl MOD06_02243BA8
bl ov06_02243BA8
b _020426FA
_02042608:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
bl MOD06_02243C5C
bl ov06_02243C5C
b _020426FA
_02042612:
add r0, r5, #0x0
bl MOD06_02243D3C
bl ov06_02243D3C
b _020426FA
_0204261A:
add r0, r5, #0x0
add r1, r6, #0x0
bl MOD06_02243DA0
bl ov06_02243DA0
strh r0, [r4, #0x0]
b _020426FA
_02042626:
@ -395,45 +395,45 @@ _02042626:
ldr r0, [r7, #0x0]
add r1, r5, #0x0
ldr r0, [r0, #0x10]
bl MOD06_02243DB8
bl ov06_02243DB8
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
_02042642:
add r0, r5, #0x0
bl MOD06_02243DC0
bl ov06_02243DC0
strh r0, [r4, #0x0]
b _020426FA
_0204264C:
add r0, r5, #0x0
add r1, r6, #0x0
bl MOD06_02243DC4
bl ov06_02243DC4
b _020426FA
_02042656:
add r0, r5, #0x0
bl MOD06_02243DD8
bl ov06_02243DD8
strh r0, [r4, #0x0]
b _020426FA
_02042660:
add r0, r5, #0x0
bl MOD06_02243DE0
bl ov06_02243DE0
strh r0, [r4, #0x0]
b _020426FA
_0204266A:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
bl MOD06_02243E34
bl ov06_02243E34
b _020426FA
_02042674:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
bl MOD06_02243F18
bl ov06_02243F18
strh r0, [r4, #0x0]
b _020426FA
_02042680:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
bl MOD06_02243F50
bl ov06_02243F50
strh r0, [r4, #0x0]
b _020426FA
_0204268C:
@ -456,7 +456,7 @@ _020426A0:
_020426AA:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
bl MOD06_02243838
bl ov06_02243838
b _020426FA
_020426B4:
add r0, r5, r6
@ -468,7 +468,7 @@ _020426BE:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
mov r2, #0x1
bl MOD06_02243E74
bl ov06_02243E74
strh r0, [r4, #0x0]
b _020426FA
_020426CC:
@ -481,7 +481,7 @@ _020426CC:
_020426DA:
ldr r1, [r1, #0xc]
add r0, r5, #0x0
bl MOD06_02243F9C
bl ov06_02243F9C
strh r0, [r4, #0x0]
b _020426FA
_020426E6:
@ -644,14 +644,14 @@ _0204281E:
add r0, #0xa8
ldr r0, [r0, #0x0]
ldr r1, [r1, #0xc]
bl MOD06_022446FC
bl ov06_022446FC
b _0204284C
_02042830:
add r5, #0x80
ldr r0, [r5, #0x0]
add r0, #0xa8
ldr r0, [r0, #0x0]
bl MOD06_02244758
bl ov06_02244758
b _0204284C
_0204283E:
add r5, #0x80
@ -659,7 +659,7 @@ _0204283E:
add r1, r7, #0x0
add r0, #0xa8
ldr r0, [r0, #0x0]
bl MOD06_02244770
bl ov06_02244770
_0204284C:
bl sub_02031190
ldr r1, _02042860 ; =0x0000083E
@ -812,7 +812,7 @@ ScrCmd_Unk0294: ; 0x02042950
ldr r0, [r5, #0x0]
add r1, r6, #0x0
add r2, r4, #0x0
bl MOD05_021E2A70
bl ov05_021E2A70
str r0, [r7, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@ -825,7 +825,7 @@ ScrCmd_Unk0295: ; 0x02042980
mov r1, #0x26
bl FieldSysGetAttrAddr
ldr r0, [r0, #0x0]
bl MOD05_021E29B4
bl ov05_021E29B4
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -842,7 +842,7 @@ ScrCmd_Unk0296: ; 0x02042998
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r1, [r1, #0x0]
bl MOD05_021E2AD4
bl ov05_021E2AD4
mov r0, #0x0
pop {r4, pc}
.balign 4

6
arm9/asm/scrcmd_3.s
View File

@ -924,7 +924,7 @@ ScrCmd_Unk0113: ; 0x02040638
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x4]
ldr r0, [r0, #0x1c]
bl MOD05_021F4608
bl ov05_021F4608
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -936,7 +936,7 @@ ScrCmd_Unk0114: ; 0x0204064C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x4]
ldr r0, [r0, #0x1c]
bl MOD05_021F45E8
bl ov05_021F45E8
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -995,6 +995,6 @@ _020406BA:
ScrCmd_Unk0116: ; 0x020406C0
push {r3, lr}
ldr r0, [r0, #0x74]
bl MOD06_0224D3E8
bl ov06_0224D3E8
mov r0, #0x1
pop {r3, pc}

16
arm9/asm/scrcmd_9.s
View File

@ -67,7 +67,7 @@ _02041E68:
add r4, #0x80
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl MOD06_02248CD0
bl ov06_02248CD0
strh r0, [r5, #0x0]
b _02041FD2
_02041E88:
@ -95,7 +95,7 @@ _02041E88:
strh r0, [r5, #0x0]
ldr r0, [r4, #0x0]
add r1, r7, #0x0
bl MOD06_02249038
bl ov06_02249038
strh r0, [r6, #0x0]
b _02041FD2
_02041ECA:
@ -134,12 +134,12 @@ _02041ECA:
ldr r1, [r5, #0x0]
add r2, r6, #0x0
add r3, r7, #0x0
bl MOD06_022490A0
bl ov06_022490A0
b _02041FD2
_02041F24:
add r4, #0x80
ldr r0, [r4, #0x0]
bl MOD06_02248CC0
bl ov06_02248CC0
b _02041FD2
_02041F2E:
add r0, r4, #0x0
@ -163,7 +163,7 @@ _02041F2E:
add r4, #0x80
strh r0, [r5, #0x0]
ldr r0, [r4, #0x0]
bl MOD06_022491FC
bl ov06_022491FC
strh r0, [r6, #0x0]
b _02041FD2
_02041F68:
@ -195,7 +195,7 @@ _02041F68:
ldr r0, [r4, #0x0]
add r1, r6, #0x0
add r2, r7, #0x0
bl MOD06_02248F70
bl ov06_02248F70
strh r0, [r5, #0x0]
b _02041FD2
_02041FB4:
@ -209,7 +209,7 @@ _02041FB4:
add r4, #0x80
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl MOD06_02248FE0
bl ov06_02248FE0
strh r0, [r5, #0x0]
_02041FD2:
mov r0, #0x0
@ -564,7 +564,7 @@ sub_020422A8: ; 0x020422A8
ldr r0, [r0, #0x4]
add r4, r1, #0x0
ldr r0, [r0, #0x14]
bl MOD20_02252538
bl ov20_02252538
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x0

104
arm9/asm/scrcmd_asm.s
View File

@ -929,7 +929,7 @@ ScrCmd_Unk018C: ; 0x0203DB88
_0203DBC6:
add r0, r5, #0x0
add r1, r4, #0x0
bl MOD05_021F1EC0
bl ov05_021F1EC0
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
@ -992,7 +992,7 @@ ScrCmd_Unk0168: ; 0x0203DC00
ldr r0, [r5, #0x0]
add r1, r7, r1
add r2, r2, r4
bl MOD05_021DAE40
bl ov05_021DAE40
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
@ -1006,7 +1006,7 @@ ScrCmd_Unk0169: ; 0x0203DC58
add r0, #0x80
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
bl MOD05_021DAF78
bl ov05_021DAF78
mov r0, #0x1
pop {r3, pc}
.balign 4
@ -1020,7 +1020,7 @@ ScrCmd_Unk016A: ; 0x0203DC70
add r0, #0x80
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
bl MOD05_021DAF98
bl ov05_021DAF98
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -1034,7 +1034,7 @@ ScrCmd_Unk016B: ; 0x0203DC88
add r0, #0x80
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
bl MOD05_021DAED4
bl ov05_021DAED4
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -1048,7 +1048,7 @@ ScrCmd_Unk016C: ; 0x0203DCA0
add r0, #0x80
ldrb r1, [r2, #0x0]
ldr r0, [r0, #0x0]
bl MOD05_021DAF28
bl ov05_021DAF28
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -1068,7 +1068,7 @@ ScrCmd_Unk0170: ; 0x0203DCC8
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
bl MOD06_02241230
bl ov06_02241230
mov r0, #0x1
pop {r3, pc}
.balign 4
@ -1088,7 +1088,7 @@ ScrCmd_Unk0172: ; 0x0203DCE8
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
bl MOD06_02241914
bl ov06_02241914
mov r0, #0x1
pop {r3, pc}
.balign 4
@ -1140,7 +1140,7 @@ ScrCmd_Unk0176: ; 0x0203DD34
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
add r0, r3, #0x0
bl MOD06_02242A38
bl ov06_02242A38
mov r0, #0x1
pop {r3, pc}
.balign 4
@ -1188,7 +1188,7 @@ ScrCmd_Unk019E: ; 0x0203DD60
add r2, r0, #0x0
ldr r1, [r1, #0x0]
add r0, r7, #0x0
bl MOD18_0224CA54
bl ov18_0224CA54
str r0, [r4, #0x0]
ldr r1, _0203DDBC ; =sub_0203DDC0
add r0, r5, #0x0
@ -1216,7 +1216,7 @@ sub_0203DDC0: ; 0x0203DDC0
bl GetVarPointer
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl MOD18_0224CA2C
bl ov18_0224CA2C
strh r0, [r5, #0x0]
ldrh r1, [r5, #0x0]
ldr r0, _0203DDFC ; =0x0000FFFE
@ -1246,7 +1246,7 @@ ScrCmd_Unk019F: ; 0x0203DE00
add r0, #0x80
ldr r0, [r0, #0x0]
bl VarGet
bl MOD18_0224CA58
bl ov18_0224CA58
strb r0, [r4, #0x0]
ldr r1, _0203DE34 ; =sub_0203DE38
add r0, r5, #0x0
@ -1270,7 +1270,7 @@ sub_0203DE38: ; 0x0203DE38
thumb_func_start ScrCmd_Unk01A0
ScrCmd_Unk01A0: ; 0x0203DE4C
push {r3, lr}
bl MOD11_0224CA94
bl ov11_0224CA94
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -1290,7 +1290,7 @@ ScrCmd_Unk01A1: ; 0x0203DE58
bl VarGet
add r1, r0, #0x0
add r0, r5, #0x0
bl MOD18_0224CAA0
bl ov18_0224CAA0
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
@ -1310,7 +1310,7 @@ ScrCmd_Unk01A2: ; 0x0203DE80
bl VarGet
add r1, r0, #0x0
add r0, r5, #0x0
bl MOD18_0224CAB4
bl ov18_0224CAB4
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
@ -1325,7 +1325,7 @@ ScrCmd_Unk003F: ; 0x0203DEA8
mov r1, #0x1
ldr r0, [r0, #0x74]
add r2, r1, #0x0
bl MOD06_02242BE0
bl ov06_02242BE0
mov r0, #0x1
add sp, #0x8
pop {r3, pc}
@ -1516,7 +1516,7 @@ ScrCmd_Unk01C1: ; 0x0203E018
bl VarGet
add r1, r0, #0x0
add r0, r4, #0x0
bl MOD05_021F3A18
bl ov05_021F3A18
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@ -1536,7 +1536,7 @@ ScrCmd_Unk01C2: ; 0x0203E054
bl VarGet
add r1, r0, #0x0
add r0, r5, #0x0
bl MOD05_021F3AB4
bl ov05_021F3AB4
mov r0, #0x0
pop {r3-r5, pc}
@ -1574,7 +1574,7 @@ ScrCmd_Unk01C3: ; 0x0203E078
add r0, r4, #0x0
lsr r1, r1, #0x18
lsr r2, r2, #0x18
bl MOD05_021F3B7C
bl ov05_021F3B7C
mov r0, #0x0
pop {r3-r7, pc}
@ -1612,7 +1612,7 @@ ScrCmd_Unk01C4: ; 0x0203E0CC
add r0, r4, #0x0
lsr r1, r1, #0x18
lsr r2, r2, #0x18
bl MOD05_021F3B4C
bl ov05_021F3B4C
mov r0, #0x0
pop {r3-r7, pc}
@ -2046,7 +2046,7 @@ ScrCmd_Unk01EC: ; 0x0203E4A0
add r0, #0x80
ldr r0, [r0, #0x0]
ldr r0, [r0, #0xc]
bl MOD06_0224CBB0
bl ov06_0224CBB0
mov r0, #0x0
pop {r3, pc}
@ -2064,7 +2064,7 @@ ScrCmd_Unk01ED: ; 0x0203E4B0
add r4, r0, #0x0
ldr r0, [r5, #0x0]
ldr r0, [r0, #0xc]
bl MOD06_0224CC24
bl ov06_0224CC24
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@ -2294,7 +2294,7 @@ ScrCmd_Unk020D: ; 0x0203E684
add r6, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r4, #0x0
bl MOD06_022456E8
bl ov06_022456E8
strh r0, [r6, #0x0]
mov r0, #0x1
pop {r4-r6, pc}
@ -2332,7 +2332,7 @@ ScrCmd_Unk020F: ; 0x0203E6C4
ldrh r1, [r4, #0x0]
ldr r0, [r5, #0x0]
add r2, r6, #0x0
bl MOD06_0224525C
bl ov06_0224525C
mov r0, #0x1
pop {r4-r6, pc}
@ -2353,7 +2353,7 @@ ScrCmd_Unk0210: ; 0x0203E6FC
add r4, r0, #0x0
ldr r0, [r5, #0x0]
add r1, r6, #0x0
bl MOD06_02245340
bl ov06_02245340
strh r0, [r4, #0x0]
mov r0, #0x0
pop {r4-r6, pc}
@ -2537,7 +2537,7 @@ ScrCmd_Unk0226: ; 0x0203E870
str r0, [r5, #0x8]
ldrb r1, [r1, #0x0]
mov r0, #0xb
bl MOD06_0224884C
bl ov06_0224884C
str r0, [r4, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@ -2559,7 +2559,7 @@ ScrCmd_Unk0227: ; 0x0203E894
bl GetVarPointer
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl MOD06_022488EC
bl ov06_022488EC
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@ -2582,7 +2582,7 @@ ScrCmd_Unk0228: ; 0x0203E8C4
bl GetVarPointer
add r5, r0, #0x0
ldr r0, [r4, #0x0]
bl MOD06_022488F4
bl ov06_022488F4
strh r0, [r5, #0x0]
mov r0, #0x0
pop {r3-r5, pc}
@ -2621,7 +2621,7 @@ ScrCmd_Unk022A: ; 0x0203E928
mov r1, #0x14
bl FieldSysGetAttrAddr
ldr r0, [r0, #0x0]
bl MOD06_022488CC
bl ov06_022488CC
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -2796,7 +2796,7 @@ ScrCmd_Unk0239: ; 0x0203EA90
bl GetVarPointer
add r1, r0, #0x0
ldr r0, [r4, #0x74]
bl MOD06_022411F4
bl ov06_022411F4
mov r0, #0x1
pop {r4, pc}
@ -2839,10 +2839,10 @@ ScrCmd_Unk023A: ; 0x0203EAB0
lsl r0, r0, #0x10
lsr r5, r0, #0x10
add r0, r5, #0x0
bl MOD05_021F61E8
bl ov05_021F61E8
strh r0, [r4, #0x0]
add r0, r5, #0x0
bl MOD05_021F61DC
bl ov05_021F61DC
strh r0, [r6, #0x0]
mov r0, #0x0
pop {r3-r7, pc}
@ -2863,7 +2863,7 @@ ScrCmd_Unk023B: ; 0x0203EB20
lsl r1, r1, #0x18
ldr r0, [r4, #0x0]
lsr r1, r1, #0x18
bl MOD06_0224C27C
bl ov06_0224C27C
mov r0, #0x1
pop {r4, pc}
.balign 4
@ -2893,7 +2893,7 @@ ScrCmd_Unk023C: ; 0x0203EB48
ldr r0, [r5, #0x0]
lsr r1, r1, #0x18
lsr r2, r2, #0x18
bl MOD06_0224C520
bl ov06_0224C520
mov r0, #0x1
pop {r3-r5, pc}
.balign 4
@ -3001,7 +3001,7 @@ ScrCmd_GiveWallpaper: ; 0x0203EBE4
ldr r2, [sp, #0x8]
ldr r3, [sp, #0xc]
add r1, r7, #0x0
bl MOD06_0224D14C
bl ov06_0224D14C
add r5, r0, #0x0
mov r0, #0x0
mvn r0, r0
@ -3067,7 +3067,7 @@ ScrCmd_Unk024B: ; 0x0203ECD8
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
add r0, r3, #0x0
bl MOD06_0224C678
bl ov06_0224C678
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -3083,7 +3083,7 @@ ScrCmd_Unk024C: ; 0x0203ECF4
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
add r0, r3, #0x0
bl MOD06_0224C6E8
bl ov06_0224C6E8
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -3099,7 +3099,7 @@ ScrCmd_Unk024D: ; 0x0203ED10
str r1, [r0, #0x8]
ldrb r1, [r2, #0x0]
add r0, r3, #0x0
bl MOD06_0224C6F4
bl ov06_0224C6F4
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -3173,7 +3173,7 @@ ScrCmd_Unk0258: ; 0x0203EDA4
add r5, #0x80
str r0, [r4, #0x0]
ldr r0, [r5, #0x0]
bl MOD05_021E7184
bl ov05_021E7184
str r0, [r4, #0x0]
mov r0, #0x1
pop {r3-r5, pc}
@ -3187,7 +3187,7 @@ ScrCmd_Unk0259: ; 0x0203EDC8
mov r1, #0x16
bl FieldSysGetAttrAddr
ldr r0, [r0, #0x0]
bl MOD05_021E71E8
bl ov05_021E71E8
mov r0, #0x1
pop {r3, pc}
.balign 4
@ -3207,7 +3207,7 @@ ScrCmd_Unk025A: ; 0x0203EDE0
lsl r1, r1, #0x18
ldr r0, [r4, #0x0]
lsr r1, r1, #0x18
bl MOD06_0224E554
bl ov06_0224E554
mov r0, #0x1
pop {r4, pc}
.balign 4
@ -3263,7 +3263,7 @@ ScrCmd_Unk025E: ; 0x0203EE58
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
bl MOD06_0224E764
bl ov06_0224E764
mov r0, #0x0
pop {r3, pc}
.balign 4
@ -3273,7 +3273,7 @@ ScrCmd_Unk025F: ; 0x0203EE68
push {r3, lr}
add r0, #0x80
ldr r0, [r0, #0x0]
bl MOD06_0224E7C4
bl ov06_0224E7C4
mov r0, #0x1
pop {r3, pc}
.balign 4
@ -4597,17 +4597,17 @@ ScrCmd_Unk029E: ; 0x0203F8C0
_0203F8FC:
mov r2, #0x0
mov r3, #0x20
bl MOD06_0224F12C
bl ov06_0224F12C
b _0203F91E
_0203F906:
mov r2, #0x1
mov r3, #0x20
bl MOD06_0224F12C
bl ov06_0224F12C
b _0203F91E
_0203F910:
mov r2, #0x2
mov r3, #0x20
bl MOD06_0224F12C
bl ov06_0224F12C
b _0203F91E
_0203F91A:
bl GF_AssertFail
@ -4654,13 +4654,13 @@ ScrCmd_Unk029F: ; 0x0203F954
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r0, [r0, #0x10]
bl MOD06_02239944
bl ov06_02239944
b _0203F982
_0203F978:
add r4, #0x80
ldr r0, [r4, #0x0]
ldr r0, [r0, #0x10]
bl MOD06_02239AAC
bl ov06_02239AAC
_0203F982:
mov r0, #0x1
pop {r4, pc}
@ -5041,9 +5041,9 @@ ScrCmd_Unk02C1: ; 0x0203FC80
add r0, r5, #0x0
mov r1, #0x4
mov r2, #0x3
bl MOD05_021E8588
bl ov05_021E8588
str r0, [r4, #0x0]
bl MOD05_021E84F4
bl ov05_021E84F4
_0203FCAA:
mov r0, #0x0
pop {r3-r5, pc}
@ -5063,9 +5063,9 @@ ScrCmd_Unk02C2: ; 0x0203FCB0
cmp r0, #0x0
bne _0203FCD6
ldr r0, [r4, #0x0]
bl MOD05_021E856C
bl ov05_021E856C
ldr r0, [r4, #0x0]
bl MOD05_021E85E4
bl ov05_021E85E4
_0203FCD6:
mov r0, #0x0
pop {r3-r5, pc}

4
arm9/asm/unk_02026CD0.s
View File

@ -63,9 +63,9 @@ sub_02026D34: ; 0x02026D34
add r0, r4, #0x0
add r1, sp, #0x4
add r2, sp, #0x8
bl MOD17_021DB858
bl ov17_021DB858
add r0, r4, #0x0
bl MOD17_021DB7E8
bl ov17_021DB7E8
add r4, r0, #0x0
mov r0, #0x1
ldr r1, [sp, #0x4]

40
arm9/asm/unk_02035068.s
View File

@ -484,7 +484,7 @@ _02035398:
add r0, r6, #0x0
bl sub_02035734
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0xe
strh r0, [r4, #0x2a]
b _02035484
@ -494,7 +494,7 @@ _020353C0:
cmp r0, #0x0
beq _02035484
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x9
strh r0, [r4, #0x2a]
b _02035484
@ -519,7 +519,7 @@ _020353F6:
ldr r0, [r5, #0x34]
bl sub_02058780
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0xb
strh r0, [r4, #0x2a]
b _02035484
@ -1225,7 +1225,7 @@ sub_020359B8: ; 0x020359B8
add r0, #0x38
mov r2, #0x8
mov r3, #0xb
bl MOD05_021D959C
bl ov05_021D959C
mov r0, #0x2
str r0, [sp, #0x0]
mov r0, #0x1
@ -1237,7 +1237,7 @@ sub_020359B8: ; 0x020359B8
mov r2, #0x5
add r0, #0x38
mov r3, #0x0
bl MOD05_021D967C
bl ov05_021D967C
ldr r0, _02035B64 ; =0x000034D8
mov r1, #0x42
str r0, [sp, #0x0]
@ -1245,7 +1245,7 @@ sub_020359B8: ; 0x020359B8
mov r2, #0x1
add r0, #0x38
mov r3, #0x0
bl MOD05_021D96F4
bl ov05_021D96F4
ldr r0, _02035B64 ; =0x000034D8
mov r2, #0x0
str r0, [sp, #0x0]
@ -1253,7 +1253,7 @@ sub_020359B8: ; 0x020359B8
mov r1, #0x42
add r0, #0x38
add r3, r2, #0x0
bl MOD05_021D9708
bl ov05_021D9708
mov r0, #0x1
str r0, [sp, #0x0]
ldr r0, _02035B64 ; =0x000034D8
@ -1263,11 +1263,11 @@ sub_020359B8: ; 0x020359B8
mov r2, #0x2
add r0, #0x38
mov r3, #0x0
bl MOD05_021D971C
bl ov05_021D971C
ldr r0, [sp, #0xc]
ldr r1, _02035B68 ; =UNK_020F2B14
add r0, #0x38
bl MOD05_021D9820
bl ov05_021D9820
mov r2, #0x67
ldr r1, [sp, #0xc]
lsl r2, r2, #0x2
@ -1284,7 +1284,7 @@ sub_020359B8: ; 0x020359B8
mov r2, #0x4
add r0, #0x38
mov r3, #0x0
bl MOD05_021D96F4
bl ov05_021D96F4
ldr r0, _02035B6C ; =0x000034D9
mov r1, #0x42
str r0, [sp, #0x0]
@ -1292,7 +1292,7 @@ sub_020359B8: ; 0x020359B8
mov r2, #0x3
add r0, #0x38
mov r3, #0x0
bl MOD05_021D9708
bl ov05_021D9708
mov r0, #0x1
str r0, [sp, #0x0]
ldr r0, _02035B6C ; =0x000034D9
@ -1302,7 +1302,7 @@ sub_020359B8: ; 0x020359B8
mov r2, #0x6
add r0, #0x38
mov r3, #0x0
bl MOD05_021D971C
bl ov05_021D971C
ldr r0, [sp, #0x14]
mov r4, #0x0
cmp r0, #0x0
@ -1360,7 +1360,7 @@ _02035AF2:
ldr r0, [sp, #0xc]
add r1, sp, #0x68
add r0, #0x38
bl MOD05_021D9820
bl ov05_021D9820
mov r1, #0x1a
lsl r1, r1, #0x4
add r2, sp, #0x5c
@ -1445,7 +1445,7 @@ _02035B90:
_02035BA6:
add r5, #0x38
add r0, r5, #0x0
bl MOD05_021D99F8
bl ov05_021D99F8
pop {r3-r7, pc}
thumb_func_start sub_02035BB0
@ -1637,7 +1637,7 @@ sub_02035D10: ; 0x02035D10
bl sub_0204652C
add r4, r0, #0x0
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x72
ldr r1, _02035D30 ; =sub_02035D34
lsl r0, r0, #0x2
@ -1744,7 +1744,7 @@ sub_02035DF8: ; 0x02035DF8
bl sub_0204652C
add r4, r0, #0x0
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x72
ldr r1, _02035E18 ; =sub_02035E1C
lsl r0, r0, #0x2
@ -2274,7 +2274,7 @@ sub_02036284: ; 0x02036284
bl sub_0204652C
add r4, r0, #0x0
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x72
ldr r1, _020362A4 ; =sub_020362A8
lsl r0, r0, #0x2
@ -2569,7 +2569,7 @@ sub_02036510: ; 0x02036510
bl sub_0204652C
add r4, r0, #0x0
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x72
ldr r1, _02036530 ; =sub_02036534
lsl r0, r0, #0x2
@ -2748,7 +2748,7 @@ sub_02036684: ; 0x02036684
bl sub_0204652C
add r4, r0, #0x0
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x72
ldr r1, _020366A4 ; =sub_020366A8
lsl r0, r0, #0x2
@ -2809,7 +2809,7 @@ sub_02036700: ; 0x02036700
bl sub_0204652C
add r4, r0, #0x0
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x72
ldr r1, _02036720 ; =sub_02036724
lsl r0, r0, #0x2

62
arm9/asm/unk_020372D4.s
View File

@ -66,17 +66,17 @@ _0203732E:
sub_02037334: ; 0x02037334
push {r3, lr}
bl sub_020374B0
ldr r0, _02037348 ; =SDK_OVERLAY_MODULE_63_ID
ldr r1, _0203734C ; =MOD63_021DBAB8
ldr r0, _02037348 ; =SDK_OVERLAY_OVERLAY_63_ID
ldr r1, _0203734C ; =ov63_021DBAB8
bl RegisterMainOverlay
mov r0, #0x1
pop {r3, pc}
nop
_02037348: .word SDK_OVERLAY_MODULE_63_ID
_0203734C: .word MOD63_021DBAB8
_02037348: .word SDK_OVERLAY_OVERLAY_63_ID
_0203734C: .word ov63_021DBAB8
thumb_func_start LoadOverlay_MODULE_05
LoadOverlay_MODULE_05: ; 0x02037350
thumb_func_start LoadOverlay_OVERLAY_05
LoadOverlay_OVERLAY_05: ; 0x02037350
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
@ -91,7 +91,7 @@ _02037360:
beq _0203736C
bl GF_AssertFail
_0203736C:
ldr r0, _0203738C ; =SDK_OVERLAY_MODULE_05_ID
ldr r0, _0203738C ; =SDK_OVERLAY_OVERLAY_05_ID
mov r1, #0x2
bl HandleLoadOverlay
mov r1, #0x0
@ -99,15 +99,15 @@ _0203736C:
ldr r0, [r4, #0x0]
mov r2, #0xb
str r1, [r0, #0x8]
ldr r0, _02037390 ; =UNK05_021F64C8
ldr r0, _02037390 ; =ov05_021F64C8
add r1, r4, #0x0
bl OverlayManager_New
ldr r1, [r4, #0x0]
str r0, [r1, #0x0]
pop {r4, pc}
.balign 4
_0203738C: .word SDK_OVERLAY_MODULE_05_ID
_02037390: .word UNK05_021F64C8
_0203738C: .word SDK_OVERLAY_OVERLAY_05_ID
_02037390: .word ov05_021F64C8
thumb_func_start sub_02037394
sub_02037394: ; 0x02037394
@ -322,7 +322,7 @@ sub_02037524: ; 0x02037524
mov r1, #0x0
add r0, r4, #0x0
add r2, r1, #0x0
bl MOD05_021EFA9C
bl ov05_021EFA9C
_02037546:
ldr r0, [r4, #0x0]
ldr r1, [r0, #0x0]
@ -333,7 +333,7 @@ _02037546:
ldr r0, [r0, #0x0]
cmp r0, #0x0
bne _0203756E
ldr r0, _02037590 ; =SDK_OVERLAY_MODULE_05_ID
ldr r0, _02037590 ; =SDK_OVERLAY_OVERLAY_05_ID
bl UnloadOverlayByID
b _0203756E
_02037562:
@ -362,7 +362,7 @@ _0203758C:
mov r0, #0x0
pop {r4, pc}
.balign 4
_02037590: .word SDK_OVERLAY_MODULE_05_ID
_02037590: .word SDK_OVERLAY_OVERLAY_05_ID
thumb_func_start sub_02037594
sub_02037594: ; 0x02037594
@ -395,7 +395,7 @@ _020375B4:
add r1, r4, #0x0
lsr r2, r2, #0x10
lsr r3, r3, #0x10
bl MOD05_021D8164
bl ov05_021D8164
_020375D4:
ldr r0, [r4, #0x1c]
ldr r2, [r4, #0x6c]
@ -427,7 +427,7 @@ _020375FC:
beq _02037610
add r0, sp, #0x8
add r1, r4, #0x0
bl MOD05_021D85FC
bl ov05_021D85FC
_02037610:
add r0, r4, #0x0
add r1, r5, #0x0
@ -442,7 +442,7 @@ _0203761C:
beq _02037638
add r0, sp, #0x8
add r1, r4, #0x0
bl MOD04_021D865C
bl ov04_021D865C
cmp r0, #0x1
bne _0203763A
mov r5, #0x0
@ -462,7 +462,7 @@ _02037646:
_0203764C:
add r0, sp, #0x8
add r1, r4, #0x0
bl MOD05_021D8758
bl ov05_021D8758
cmp r0, #0x1
beq _02037754
add r3, sp, #0x8
@ -482,21 +482,21 @@ _02037672:
beq _02037754
add r0, sp, #0x8
add r1, r4, #0x0
bl MOD05_021D8820
bl ov05_021D8820
cmp r0, #0x1
bne _020376A6
ldr r0, [r4, #0x4]
ldr r0, [r0, #0x8]
bl MOD05_021E32F0
bl ov05_021E32F0
add r0, r4, #0x0
mov r1, #0x4
bl MOD05_021E81BC
bl ov05_021E81BC
ldr r0, [r4, #0x38]
bl MOD05_021E7138
bl ov05_021E7138
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x1
bl MOD05_021EFA9C
bl ov05_021EFA9C
add sp, #0x10
pop {r3-r5, pc}
_020376A6:
@ -507,13 +507,13 @@ _020376A6:
beq _020376B8
ldr r0, [r4, #0x4]
ldr r0, [r0, #0x8]
bl MOD05_021E32F0
bl ov05_021E32F0
_020376B8:
mov r5, #0x0
bl sub_02037790
cmp r0, #0x0
beq _020376C8
bl MOD20_02252534
bl ov20_02252534
add r5, r0, #0x0
_020376C8:
add r3, sp, #0x8
@ -533,23 +533,23 @@ _020376E2:
beq _02037754
add r0, sp, #0x8
add r1, r4, #0x0
bl MOD05_021D8320
bl ov05_021D8320
cmp r0, #0x1
bne _0203771C
ldr r0, [r4, #0x4]
ldr r0, [r0, #0x8]
bl MOD05_021E32F0
bl ov05_021E32F0
add r0, r4, #0x0
mov r1, #0x4
bl MOD05_021E81BC
bl ov05_021E81BC
ldr r0, [r4, #0x38]
bl sub_02055B14
ldr r0, [r4, #0x38]
bl MOD05_021E7138
bl ov05_021E7138
add r0, r4, #0x0
mov r1, #0x0
mov r2, #0x1
bl MOD05_021EFA9C
bl ov05_021EFA9C
add sp, #0x10
pop {r3-r5, pc}
_0203771C:
@ -560,13 +560,13 @@ _0203771C:
beq _0203772E
ldr r0, [r4, #0x4]
ldr r0, [r0, #0x8]
bl MOD05_021E32F0
bl ov05_021E32F0
_0203772E:
mov r5, #0x0
bl sub_02037790
cmp r0, #0x0
beq _0203773E
bl MOD20_02252534
bl ov20_02252534
add r5, r0, #0x0
_0203773E:
add r3, sp, #0x8

72
arm9/asm/unk_020377F0.s
View File

@ -43,142 +43,142 @@ UNK_020F2BE8: ; 0x020F2BE8
.balign 4
.global UNK_020F2BF4
UNK_020F2BF4: ; 0x020F2BF4
.word MOD70_021D74E0, MOD70_021D758C, MOD70_021D755C, SDK_OVERLAY_MODULE_70_ID
.word ov70_021D74E0, ov70_021D758C, ov70_021D755C, SDK_OVERLAY_OVERLAY_70_ID
.balign 4
.global UNK_020F2C04
UNK_020F2C04: ; 0x020F2C04
.word MOD84_021D74E0, MOD84_021D7748, MOD84_021D76A4, SDK_OVERLAY_MODULE_84_ID
.word ov84_021D74E0, ov84_021D7748, ov84_021D76A4, SDK_OVERLAY_OVERLAY_84_ID
.balign 4
.global UNK_020F2C14
UNK_020F2C14: ; 0x020F2C14
.word MOD85_021D74E0, MOD85_021D75A0, MOD85_021D7644, SDK_OVERLAY_MODULE_85_ID
.word ov85_021D74E0, ov85_021D75A0, ov85_021D7644, SDK_OVERLAY_OVERLAY_85_ID
.balign 4
.global UNK_020F2C24
UNK_020F2C24: ; 0x020F2C24
.word MOD58_021D9A20, MOD58_021D9B8C, MOD58_021D9BF0, SDK_OVERLAY_MODULE_58_ID
.word ov58_021D9A20, ov58_021D9B8C, ov58_021D9BF0, SDK_OVERLAY_OVERLAY_58_ID
.balign 4
.global UNK_020F2C34
UNK_020F2C34: ; 0x020F2C34
.word MOD64_021D74E0, MOD64_021D7640, MOD64_021D76F4, SDK_OVERLAY_MODULE_64_ID
.word ov64_021D74E0, ov64_021D7640, ov64_021D76F4, SDK_OVERLAY_OVERLAY_64_ID
.balign 4
.global UNK_020F2C44
UNK_020F2C44: ; 0x020F2C44
.word MOD16_021D74E0, MOD16_021D7588, MOD16_021D7614, SDK_OVERLAY_MODULE_16_ID
.word ov16_021D74E0, ov16_021D7588, ov16_021D7614, SDK_OVERLAY_OVERLAY_16_ID
.balign 4
.global UNK_020F2C54
UNK_020F2C54: ; 0x020F2C54
.word MOD57_021D74E0, MOD57_021D7714, MOD57_021D7944, SDK_OVERLAY_MODULE_57_ID
.word ov57_021D74E0, ov57_021D7714, ov57_021D7944, SDK_OVERLAY_OVERLAY_57_ID
.balign 4
.global UNK_020F2C64
UNK_020F2C64: ; 0x020F2C64
.word MOD80_0222DFD0, MOD80_0222E134, MOD80_0222E25C, SDK_OVERLAY_MODULE_80_ID
.word ov80_0222DFD0, ov80_0222E134, ov80_0222E25C, SDK_OVERLAY_OVERLAY_80_ID
.balign 4
.global UNK_020F2C74
UNK_020F2C74: ; 0x020F2C74
.word MOD82_0222DA34, MOD82_0222DB7C, MOD82_0222DC50, SDK_OVERLAY_MODULE_82_ID
.word ov82_0222DA34, ov82_0222DB7C, ov82_0222DC50, SDK_OVERLAY_OVERLAY_82_ID
.balign 4
.global UNK_020F2C84
UNK_020F2C84: ; 0x020F2C84
.word MOD76_021D74E0, MOD76_021D7568, MOD76_021D761C, SDK_OVERLAY_MODULE_76_ID
.word ov76_021D74E0, ov76_021D7568, ov76_021D761C, SDK_OVERLAY_OVERLAY_76_ID
.balign 4
.global UNK_020F2C94
UNK_020F2C94: ; 0x020F2C94
.word MOD53_021D74E0, MOD53_021D7654, MOD53_021D7764, SDK_OVERLAY_MODULE_53_ID
.word ov53_021D74E0, ov53_021D7654, ov53_021D7764, SDK_OVERLAY_OVERLAY_53_ID
.balign 4
.global UNK_020F2CA4
UNK_020F2CA4: ; 0x020F2CA4
.word MOD81_02237E40, MOD81_02238064, MOD81_02238004, SDK_OVERLAY_MODULE_81_ID
.word ov81_02237E40, ov81_02238064, ov81_02238004, SDK_OVERLAY_OVERLAY_81_ID
.balign 4
.global UNK_020F2CB4
UNK_020F2CB4: ; 0x020F2CB4
.word MOD74_021D74E0, MOD74_021D755C, MOD74_021D7540, SDK_OVERLAY_MODULE_74_ID
.word ov74_021D74E0, ov74_021D755C, ov74_021D7540, SDK_OVERLAY_OVERLAY_74_ID
.balign 4
.global UNK_020F2CC4
UNK_020F2CC4: ; 0x020F2CC4
.word MOD60_021D74E0, MOD60_021D76B8, MOD60_021D75B0, SDK_OVERLAY_MODULE_60_ID
.word ov60_021D74E0, ov60_021D76B8, ov60_021D75B0, SDK_OVERLAY_OVERLAY_60_ID
.balign 4
.global UNK_020F2CD4
UNK_020F2CD4: ; 0x020F2CD4
.word MOD66_021D74E0, MOD66_021D7538, MOD66_021D75B0, SDK_OVERLAY_MODULE_66_ID
.word ov66_021D74E0, ov66_021D7538, ov66_021D75B0, SDK_OVERLAY_OVERLAY_66_ID
.balign 4
.global UNK_020F2CE4
UNK_020F2CE4: ; 0x020F2CE4
.word MOD15_021D74E0, MOD15_021D7558, MOD15_021D7608, SDK_OVERLAY_MODULE_15_ID
.word ov15_021D74E0, ov15_021D7558, ov15_021D7608, SDK_OVERLAY_OVERLAY_15_ID
.balign 4
.global UNK_020F2CF4
UNK_020F2CF4: ; 0x020F2CF4
.word StoragePC_Overlay_Init, StoragePC_Overlay_Run, StoragePC_Overlay_Teardown, SDK_OVERLAY_MODULE_14_ID
.word StoragePC_Overlay_Init, StoragePC_Overlay_Run, StoragePC_Overlay_Teardown, SDK_OVERLAY_OVERLAY_14_ID
.balign 4
.global UNK_020F2D04
UNK_020F2D04: ; 0x020F2D04
.word MOD54_021D74E0, MOD54_021D764C, MOD54_021D7740, SDK_OVERLAY_MODULE_54_ID
.word ov54_021D74E0, ov54_021D764C, ov54_021D7740, SDK_OVERLAY_OVERLAY_54_ID
.balign 4
.global UNK_020F2D14
UNK_020F2D14: ; 0x020F2D14
.word MOD77_021D74E0, MOD77_021D7604, MOD77_021D7BAC, SDK_OVERLAY_MODULE_77_ID
.word ov77_021D74E0, ov77_021D7604, ov77_021D7BAC, SDK_OVERLAY_OVERLAY_77_ID
.balign 4
.global UNK_020F2D24
UNK_020F2D24: ; 0x020F2D24
.word MOD67_021D74E0, MOD67_021D75D0, MOD67_021D7624, SDK_OVERLAY_MODULE_67_ID
.word ov67_021D74E0, ov67_021D75D0, ov67_021D7624, SDK_OVERLAY_OVERLAY_67_ID
.balign 4
.global UNK_020F2D34
UNK_020F2D34: ; 0x020F2D34
.word MOD55_021D7614, MOD55_021D76BC, MOD55_021D77AC, SDK_OVERLAY_MODULE_55_ID
.word ov55_021D7614, ov55_021D76BC, ov55_021D77AC, SDK_OVERLAY_OVERLAY_55_ID
.balign 4
.global UNK_020F2D44
UNK_020F2D44: ; 0x020F2D44
.word MOD68_021D74E0, MOD68_021D75D8, MOD68_021D762C, SDK_OVERLAY_MODULE_68_ID
.word ov68_021D74E0, ov68_021D75D8, ov68_021D762C, SDK_OVERLAY_OVERLAY_68_ID
.balign 4
.global UNK_020F2D54
UNK_020F2D54: ; 0x020F2D54
.word MOD55_021D756C, MOD55_021D76BC, MOD55_021D77AC, SDK_OVERLAY_MODULE_55_ID
.word ov55_021D756C, ov55_021D76BC, ov55_021D77AC, SDK_OVERLAY_OVERLAY_55_ID
.balign 4
.global UNK_020F2D64
UNK_020F2D64: ; 0x020F2D64
.word HOF_OverlayInit, HOF_OverlayRun, HOF_OverlayTeardown, SDK_OVERLAY_MODULE_69_ID
.word HOF_OverlayInit, HOF_OverlayRun, HOF_OverlayTeardown, SDK_OVERLAY_OVERLAY_69_ID
.balign 4
.global UNK_020F2D74
UNK_020F2D74: ; 0x020F2D74
.word MOD75_021E6BA0, MOD75_021E6D6C, MOD75_021E6F00, SDK_OVERLAY_MODULE_75_ID
.word ov75_021E6BA0, ov75_021E6D6C, ov75_021E6F00, SDK_OVERLAY_OVERLAY_75_ID
.balign 4
.global UNK_020F2D84
UNK_020F2D84: ; 0x020F2D84
.word MOD78_021D74E0, MOD78_021D75D0, MOD78_021D76B8, SDK_OVERLAY_MODULE_78_ID
.word ov78_021D74E0, ov78_021D75D0, ov78_021D76B8, SDK_OVERLAY_OVERLAY_78_ID
.balign 4
.global UNK_020F2D94
UNK_020F2D94: ; 0x020F2D94
.word sub_020377F0, sub_020377F4, sub_02037808, SDK_OVERLAY_MODULE_11_ID
.word sub_020377F0, sub_020377F4, sub_02037808, SDK_OVERLAY_OVERLAY_11_ID
.balign 4
.global UNK_020F2DA4
UNK_020F2DA4: ; 0x020F2DA4
.word MOD86_021D74E0, MOD86_021D758C, MOD86_021D76B0, SDK_OVERLAY_MODULE_86_ID
.word ov86_021D74E0, ov86_021D758C, ov86_021D76B0, SDK_OVERLAY_OVERLAY_86_ID
.section .data
@ -190,17 +190,17 @@ UNK_02105DB8: ; 0x02105DB8
.balign 4
.global UNK_02105DBC
UNK_02105DBC: ; 0x02105DBC
.word MOD71_0222D5C0, MOD71_0222D9C8, MOD71_0222E438, SDK_OVERLAY_MODULE_71_ID
.word ov71_0222D5C0, ov71_0222D9C8, ov71_0222E438, SDK_OVERLAY_OVERLAY_71_ID
.balign 4
.global UNK_02105DCC
UNK_02105DCC: ; 0x02105DCC
.word MOD17_021DDB58, MOD17_021DDC30, MOD17_021DDCF4, SDK_OVERLAY_MODULE_17_ID
.word ov17_021DDB58, ov17_021DDC30, ov17_021DDCF4, SDK_OVERLAY_OVERLAY_17_ID
.balign 4
.global UNK_02105DDC
UNK_02105DDC: ; 0x02105DDC
.word MOD17_021D83E4, MOD17_021D84F0, MOD17_021D8738, SDK_OVERLAY_MODULE_17_ID
.word ov17_021D83E4, ov17_021D84F0, ov17_021D8738, SDK_OVERLAY_OVERLAY_17_ID
.text
@ -212,7 +212,7 @@ sub_020377F0: ; 0x020377F0
thumb_func_start sub_020377F4
sub_020377F4: ; 0x020377F4
push {r3, lr}
bl MOD11_0222D5C0
bl ov11_0222D5C0
cmp r0, #0x0
beq _02037802
mov r0, #0x1
@ -2330,7 +2330,7 @@ sub_020388B4: ; 0x020388B4
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl SaveArray_PlayerParty_Get
bl MOD05_021ED49C
bl ov05_021ED49C
add r5, r0, #0x0
bne _020388CC
bl GF_AssertFail
@ -2558,11 +2558,11 @@ sub_02038AB0: ; 0x02038AB0
push {r4, lr}
bl sub_0204652C
add r4, r0, #0x0
bl MOD06_0224D79C
bl ov06_0224D79C
cmp r0, #0x1
bne _02038ACA
add r0, r4, #0x0
bl MOD06_0224D76C
bl ov06_0224D76C
mov r0, #0x1
pop {r4, pc}
_02038ACA:
@ -2579,7 +2579,7 @@ sub_02038AD0: ; 0x02038AD0
ldr r1, [r2, #0xc]
ldr r2, [r2, #0x8]
mov r0, #0x4
bl MOD06_0224D70C
bl ov06_0224D70C
add r2, r0, #0x0
ldr r1, _02038AF0 ; =sub_02038AB0
add r0, r4, #0x0

10
arm9/asm/unk_0204653C.s
View File

@ -539,7 +539,7 @@ sub_02046948: ; 0x02046948
bl sub_02046528
add r1, r0, #0x0
add r0, r4, #0x0
bl MOD06_02244558
bl ov06_02244558
add r4, r0, #0x0
bl sub_020475A0
add r6, r0, #0x0
@ -815,7 +815,7 @@ _02046BA0:
_02046BAE:
ldr r1, [r4, #0x10]
add r0, r5, #0x0
bl MOD06_02248724
bl ov06_02248724
add r0, r6, #0x0
bl sub_0204B00C
ldr r0, [r4, #0x0]
@ -1077,7 +1077,7 @@ SetupAndStartHoneyTreeBattle: ; 0x02046DB4
str r1, [r4, r0]
add r0, r5, #0x0
add r1, r4, #0x0
bl MOD06_0223CCDC
bl ov06_0223CCDC
ldr r0, [r5, #0xc]
bl Save_GameStats_Get
mov r1, #0x7
@ -1119,7 +1119,7 @@ SetupAndStartWildBattle: ; 0x02046E18
add r0, r5, #0x0
add r1, r7, #0x0
add r3, r4, #0x0
bl MOD06_0223CD7C
bl ov06_0223CD7C
ldr r0, [sp, #0x20]
cmp r0, #0x0
beq _02046E60
@ -1299,7 +1299,7 @@ SetupAndStartFirstBattle: ; 0x02046FA0
add r1, r6, #0x0
add r2, r7, #0x0
add r3, r4, #0x0
bl MOD06_0223CD7C
bl ov06_0223CD7C
mov r0, #0x63
mov r1, #0x1
lsl r0, r0, #0x2

2
arm9/asm/unk_02047500.s
View File

@ -88,7 +88,7 @@ _0204756A:
cmp r0, r1
bne _0204757C
add r0, r4, #0x0
bl MOD05_021E495C
bl ov05_021E495C
_0204757C:
pop {r3-r5, pc}
nop

50
arm9/asm/unk_02048904.s
View File

@ -833,7 +833,7 @@ _02048F9A:
str r1, [r6, #0x0]
add r0, r4, #0x0
add r2, r6, #0x0
bl MOD05_021E7750
bl ov05_021E7750
ldr r0, [r5, #0x0]
add r0, r0, #0x1
str r0, [r5, #0x0]
@ -1404,7 +1404,7 @@ _02049408:
str r0, [r4, #0x0]
b _0204942C
_02049416:
bl MOD05_021E331C
bl ov05_021E331C
add r0, r5, #0x0
bl sub_02049430
ldr r0, [r4, #0x0]
@ -1438,7 +1438,7 @@ _02049452:
bl PlayerAvatar_GetGender
add r1, r0, #0x0
add r0, r5, #0x0
bl MOD06_022483BC
bl ov06_022483BC
str r0, [r4, #0x4]
ldr r1, _02049470 ; =sub_02049474
add r0, r6, #0x0
@ -1454,11 +1454,11 @@ sub_02049474: ; 0x02049474
bl sub_0204652C
add r4, r0, #0x0
ldr r0, [r4, #0x4]
bl MOD06_022483E0
bl ov06_022483E0
cmp r0, #0x1
bne _02049490
ldr r0, [r4, #0x4]
bl MOD06_022483EC
bl ov06_022483EC
mov r0, #0x1
pop {r4, pc}
_02049490:
@ -1654,7 +1654,7 @@ _020495F0:
b _02049616
_020495FE:
add r0, r6, #0x0
bl MOD05_021E331C
bl ov05_021E331C
add r0, r5, #0x0
bl sub_0204961C
ldr r0, [r4, #0x0]
@ -1688,14 +1688,14 @@ _0204963E:
ldr r2, [r6, #0x4]
add r0, r4, #0x0
mov r1, #0x4
bl MOD06_0224C8C8
bl ov06_0224C8C8
add r2, r0, #0x0
ldr r1, _02049654 ; =MOD06_0224C8E8
ldr r1, _02049654 ; =ov06_0224C8E8
add r0, r5, #0x0
bl sub_0204640C
pop {r4-r6, pc}
.balign 4
_02049654: .word MOD06_0224C8E8
_02049654: .word ov06_0224C8E8
thumb_func_start sub_02049658
sub_02049658: ; 0x02049658
@ -1729,7 +1729,7 @@ _0204968E:
add r0, r7, #0x0
mov r1, #0x1
add r2, r4, #0x4
bl MOD05_021E7750
bl ov05_021E7750
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@ -1773,7 +1773,7 @@ _020496EA:
str r1, [r4, #0x4]
add r0, r7, #0x0
add r2, r4, #0x4
bl MOD05_021E7750
bl ov05_021E7750
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@ -2096,9 +2096,9 @@ _02049976:
add r0, r5, #0x0
mov r1, #0xb
mov r2, #0x3
bl MOD05_021E8588
bl ov05_021E8588
str r0, [r4, #0x20]
bl MOD05_021E84F4
bl ov05_021E84F4
add r3, r4, #0x0
mov r2, #0x0
ldr r1, _02049AC4 ; =0x000007D5
@ -2120,9 +2120,9 @@ _020499A2:
b _02049AB2
_020499B2:
ldr r0, [r4, #0x20]
bl MOD05_021E856C
bl ov05_021E856C
ldr r0, [r4, #0x20]
bl MOD05_021E85E4
bl ov05_021E85E4
ldrh r0, [r4, #0x1c]
cmp r0, #0x0
bne _020499CA
@ -2169,7 +2169,7 @@ _02049A06:
_02049A14:
mov r0, #0x1
str r0, [r5, #0x6c]
ldr r0, _02049AC8 ; =SDK_OVERLAY_MODULE_18_ID
ldr r0, _02049AC8 ; =SDK_OVERLAY_OVERLAY_18_ID
mov r1, #0x2
bl HandleLoadOverlay
add r0, r5, #0x0
@ -2209,7 +2209,7 @@ _02049A64:
beq _02049AB2
bl sub_0204FCA0
add r0, r5, #0x0
bl MOD18_02244824
bl ov18_02244824
mov r1, #0x0
str r0, [r5, #0x68]
mov r0, #0x2
@ -2229,7 +2229,7 @@ _02049A96:
cmp r0, #0x0
beq _02049AB2
mov r0, #0x1
bl MOD18_02247970
bl ov18_02247970
add r0, r4, #0x0
bl FreeToHeap
add sp, #0x8
@ -2244,7 +2244,7 @@ _02049AB8: .word 0x000003D9
_02049ABC: .word UNK_020F46D8
_02049AC0: .word 0x000007F2
_02049AC4: .word 0x000007D5
_02049AC8: .word SDK_OVERLAY_MODULE_18_ID
_02049AC8: .word SDK_OVERLAY_OVERLAY_18_ID
thumb_func_start sub_02049ACC
sub_02049ACC: ; 0x02049ACC
@ -2276,10 +2276,10 @@ _02049AF2: ; jump table (using 16-bit offset)
.short _02049BD2 - _02049AF2 - 2; case 7
_02049B02:
mov r0, #0x0
bl MOD18_02247970
bl ov18_02247970
bl sub_0204FCD8
ldr r0, [r5, #0x68]
bl MOD18_0224484C
bl ov18_0224484C
mov r0, #0x2
str r0, [sp, #0x0]
mov r0, #0x1e
@ -2330,7 +2330,7 @@ _02049B68:
_02049B76:
mov r0, #0x0
str r0, [r5, #0x6c]
ldr r0, _02049BE4 ; =SDK_OVERLAY_MODULE_18_ID
ldr r0, _02049BE4 ; =SDK_OVERLAY_OVERLAY_18_ID
bl UnloadOverlayByID
ldr r0, [r4, #0x14]
mov r2, #0x1
@ -2379,7 +2379,7 @@ _02049BDC:
add sp, #0x8
pop {r4-r6, pc}
nop
_02049BE4: .word SDK_OVERLAY_MODULE_18_ID
_02049BE4: .word SDK_OVERLAY_OVERLAY_18_ID
thumb_func_start sub_02049BE8
sub_02049BE8: ; 0x02049BE8
@ -2558,7 +2558,7 @@ _02049D30:
add r0, r7, #0x0
mov r1, #0x1
add r2, r5, #0x4
bl MOD05_021E7750
bl ov05_021E7750
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]
@ -2712,7 +2712,7 @@ _02049E74:
str r1, [r5, #0x4]
add r0, r7, #0x0
add r2, r5, #0x4
bl MOD05_021E7750
bl ov05_021E7750
ldr r0, [r4, #0x0]
add r0, r0, #0x1
str r0, [r4, #0x0]

50
arm9/asm/unk_0204A498.s
View File

@ -58,7 +58,7 @@ sub_0204A4A4: ; 0x0204A4A4
ldr r2, [r2, #0x0]
add r0, r7, #0x0
add r3, sp, #0x28
bl MOD05_021F4520
bl ov05_021F4520
str r0, [sp, #0x20]
lsr r0, r7, #0x5
str r0, [sp, #0x18]
@ -82,7 +82,7 @@ sub_0204A4A4: ; 0x0204A4A4
mul r0, r1
ldr r1, [sp, #0xc]
add r0, r7, r0
bl MOD05_021EF620
bl ov05_021EF620
ldr r2, [sp, #0x14]
add r1, r0, #0x0
add r3, r2, #0x0
@ -91,7 +91,7 @@ sub_0204A4A4: ; 0x0204A4A4
mul r3, r0
ldr r0, [sp, #0x18]
add r0, r0, r3
bl MOD05_021EF654
bl ov05_021EF654
add r1, r0, #0x0
cmp r1, #0x3
bls _0204A53C
@ -101,14 +101,14 @@ _0204A53C:
lsl r1, r1, #0x18
ldr r0, [sp, #0x8]
lsr r1, r1, #0x18
bl MOD05_021EF8C8
bl ov05_021EF8C8
add r3, r0, #0x0
add r0, sp, #0x30
str r0, [sp, #0x0]
ldr r0, [sp, #0x4]
ldr r1, [sp, #0x2c]
ldr r2, [sp, #0x34]
bl MOD05_021F3DA4
bl ov05_021F3DA4
add r4, r0, #0x0
_0204A558:
ldr r0, [sp, #0x20]
@ -118,7 +118,7 @@ _0204A558:
add r5, #0x9c
ldrb r0, [r0, #0x0]
ldr r1, [r5, #0x0]
bl MOD05_021F4568
bl ov05_021F4568
add r5, r0, #0x0
cmp r4, #0x0
beq _0204A59E
@ -181,7 +181,7 @@ sub_0204A5C0: ; 0x0204A5C0
asr r1, r1, #0x10
asr r2, r2, #0x10
mov r3, #0x0
bl MOD05_021EF844
bl ov05_021EF844
ldr r1, [sp, #0x8]
cmp r1, #0x0
beq _0204A5EE
@ -208,7 +208,7 @@ sub_0204A5F4: ; 0x0204A5F4
add r3, sp, #0x0
add r5, r1, #0x0
add r6, r2, #0x0
bl MOD05_021EF844
bl ov05_021EF844
cmp r0, #0x0
bne _0204A612
mov r0, #0xff
@ -219,7 +219,7 @@ _0204A612:
add r1, sp, #0x0
ldrb r1, [r1, #0x0]
add r0, r7, #0x0
bl MOD05_021EF8DC
bl ov05_021EF8DC
lsr r2, r5, #0x1f
lsl r1, r5, #0x1b
sub r1, r1, r2
@ -564,7 +564,7 @@ sub_0204A87C: ; 0x0204A87C
add r4, r2, #0x0
add r0, sp, #0x0
add r1, r3, #0x0
bl MOD05_021E7EA0
bl ov05_021E7EA0
ldr r1, [sp, #0x0]
ldr r0, [r4, #0x0]
ldr r2, [sp, #0x8]
@ -609,11 +609,11 @@ _0204A8D4:
ldr r0, [sp, #0x8]
ldr r1, [r1, #0x24]
add r2, sp, #0xc
bl MOD05_021EF604
bl ov05_021EF604
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x8]
ldr r0, [r0, #0x24]
bl MOD05_021EF824
bl ov05_021EF824
add r4, r0, #0x0
ldr r0, [sp, #0x0]
ldr r0, [r0, #0x28]
@ -626,7 +626,7 @@ _0204A8D4:
_0204A900:
ldr r0, [sp, #0xc]
add r1, r5, #0x0
bl MOD05_021E7ED0
bl ov05_021E7ED0
add r1, r7, #0x0
add r2, sp, #0x10
add r4, r0, #0x0
@ -634,7 +634,7 @@ _0204A900:
cmp r0, #0x0
beq _0204A92E
add r0, r4, #0x0
bl MOD05_021E7EC4
bl ov05_021E7EC4
cmp r0, r6
bne _0204A92E
ldr r0, [sp, #0x4]
@ -677,11 +677,11 @@ _0204A95C:
ldr r0, [sp, #0x8]
ldr r1, [r1, #0x24]
add r2, sp, #0xc
bl MOD05_021EF604
bl ov05_021EF604
ldr r0, [sp, #0x0]
ldr r1, [sp, #0x8]
ldr r0, [r0, #0x24]
bl MOD05_021EF824
bl ov05_021EF824
add r6, r0, #0x0
ldr r0, [sp, #0x0]
ldr r0, [r0, #0x28]
@ -694,7 +694,7 @@ _0204A95C:
_0204A988:
ldr r0, [sp, #0xc]
add r1, r6, #0x0
bl MOD05_021E7ED0
bl ov05_021E7ED0
ldr r1, [sp, #0x4]
add r2, sp, #0x10
add r7, r0, #0x0
@ -702,7 +702,7 @@ _0204A988:
cmp r0, #0x0
beq _0204A9D2
add r0, r7, #0x0
bl MOD05_021E7EC4
bl ov05_021E7EC4
mov r1, #0x0
cmp r4, #0x0
bls _0204A9D2
@ -761,14 +761,14 @@ _0204A9FE:
add r0, r7, #0x0
ldr r1, [r1, #0x24]
add r2, sp, #0xc
bl MOD05_021EF604
bl ov05_021EF604
mov r4, #0x0
_0204AA0C:
ldr r0, [sp, #0xc]
add r1, r4, #0x0
bl MOD05_021E7ED0
bl ov05_021E7ED0
add r6, r0, #0x0
bl MOD05_021E7EC4
bl ov05_021E7EC4
cmp r0, r5
bne _0204AA40
ldr r0, [sp, #0x4]
@ -782,7 +782,7 @@ _0204AA26:
ldr r0, [sp, #0x0]
add r1, r7, #0x0
ldr r0, [r0, #0x24]
bl MOD05_021EF824
bl ov05_021EF824
ldr r1, [sp, #0x8]
str r0, [r1, #0x0]
_0204AA3A:
@ -820,14 +820,14 @@ _0204AA6C:
ldr r0, [sp, #0x8]
ldr r1, [r1, #0x24]
add r2, sp, #0xc
bl MOD05_021EF604
bl ov05_021EF604
mov r6, #0x0
_0204AA7A:
ldr r0, [sp, #0xc]
add r1, r6, #0x0
bl MOD05_021E7ED0
bl ov05_021E7ED0
add r7, r0, #0x0
bl MOD05_021E7EC4
bl ov05_021E7EC4
mov r1, #0x0
cmp r4, #0x0
bls _0204AAB6

8
arm9/asm/unk_0204B34C.s
View File

@ -137,7 +137,7 @@ sub_0204B410: ; 0x0204B410
add r5, r1, #0x0
add r0, r4, #0x0
mov r1, #0x11
bl MOD05_021E4C54
bl ov05_021E4C54
add r1, r0, #0x0
ldr r0, [r5, #0x0]
bl AllocFromHeap
@ -145,7 +145,7 @@ sub_0204B410: ; 0x0204B410
ldr r2, [r5, #0x60]
add r0, r4, #0x0
mov r1, #0x11
bl MOD05_021E4C60
bl ov05_021E4C60
add r0, r5, #0x0
add r1, r5, #0x0
add r5, #0x60
@ -157,11 +157,11 @@ sub_0204B410: ; 0x0204B410
thumb_func_start sub_0204B444
sub_0204B444: ; 0x0204B444
ldr r3, _0204B44C ; =MOD05_021E4C00
ldr r3, _0204B44C ; =ov05_021E4C00
ldr r0, [r0, #0x60]
bx r3
nop
_0204B44C: .word MOD05_021E4C00
_0204B44C: .word ov05_021E4C00
thumb_func_start sub_0204B450
sub_0204B450: ; 0x0204B450

72
arm9/asm/unk_0204C1B4.s
View File

@ -71,7 +71,7 @@ sub_0204C1F4: ; 0x0204C1F4
_0204C214:
ldr r0, [r5, #0x4]
ldr r0, [r0, #0x1c]
bl MOD05_021F4608
bl ov05_021F4608
ldr r0, [r4, #0x14]
str r0, [sp, #0x0]
ldr r0, [r4, #0x18]
@ -93,7 +93,7 @@ _0204C23C:
beq _0204C258
ldr r0, [r5, #0x4]
ldr r0, [r0, #0x1c]
bl MOD05_021F45E8
bl ov05_021F45E8
add r0, r4, #0x0
bl FreeToHeap
add sp, #0xc
@ -333,7 +333,7 @@ _0204C41E:
add r0, r7, #0x0
bl sub_0204AD8C
add r0, r7, #0x0
bl MOD05_021E331C
bl ov05_021E331C
mov r0, #0x0
str r0, [r4, #0x4]
ldr r1, [r4, #0x20]
@ -415,7 +415,7 @@ _0204C4C8: ; jump table (using 16-bit offset)
.short _0204C510 - _0204C4C8 - 2; case 2
.short _0204C51E - _0204C4C8 - 2; case 3
_0204C4D0:
bl MOD05_021DA5B8
bl ov05_021DA5B8
str r0, [r4, #0x1c]
ldr r0, [r5, #0x38]
bl GetPlayerXCoord
@ -425,7 +425,7 @@ _0204C4D0:
add r1, r0, #0x0
ldr r2, [r4, #0x1c]
add r0, r6, #0x0
bl MOD05_021DA5D0
bl ov05_021DA5D0
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@ -433,11 +433,11 @@ _0204C4D0:
_0204C4F6:
ldr r1, [r4, #0x1c]
add r0, r5, #0x0
bl MOD05_021DA5D8
bl ov05_021DA5D8
cmp r0, #0x0
beq _0204C522
ldr r0, [r4, #0x1c]
bl MOD05_021DA5C8
bl ov05_021DA5C8
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@ -475,7 +475,7 @@ sub_0204C528: ; 0x0204C528
beq _0204C598
b _0204C59C
_0204C54A:
bl MOD05_021DA5B8
bl ov05_021DA5B8
str r0, [r4, #0x1c]
ldr r0, [r5, #0x38]
bl GetPlayerXCoord
@ -485,7 +485,7 @@ _0204C54A:
add r1, r0, #0x0
ldr r2, [r4, #0x1c]
add r0, r6, #0x0
bl MOD05_021DA5D0
bl ov05_021DA5D0
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@ -499,11 +499,11 @@ _0204C570:
add r0, r5, #0x0
add r1, r6, #0x0
lsr r2, r2, #0x18
bl MOD05_021DAC70
bl ov05_021DAC70
cmp r0, #0x0
beq _0204C59C
ldr r0, [r4, #0x1c]
bl MOD05_021DA5C8
bl ov05_021DA5C8
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@ -579,7 +579,7 @@ _0204C61C:
ldr r0, _0204C640 ; =0x00000603
bl PlaySE
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@ -614,9 +614,9 @@ sub_0204C644: ; 0x0204C644
beq _0204C67E
b _0204C682
_0204C668:
bl MOD05_021DB030
bl ov05_021DB030
add r2, r0, #0x0
ldr r1, _0204C688 ; =MOD05_021DB1D0
ldr r1, _0204C688 ; =ov05_021DB1D0
add r0, r5, #0x0
bl sub_0204640C
ldr r0, [r4, #0x4]
@ -630,7 +630,7 @@ _0204C682:
mov r0, #0x0
pop {r4-r6, pc}
nop
_0204C688: .word MOD05_021DB1D0
_0204C688: .word ov05_021DB1D0
thumb_func_start sub_0204C68C
sub_0204C68C: ; 0x0204C68C
@ -650,9 +650,9 @@ sub_0204C68C: ; 0x0204C68C
beq _0204C6C6
b _0204C6CA
_0204C6B0:
bl MOD05_021DB030
bl ov05_021DB030
add r2, r0, #0x0
ldr r1, _0204C6D0 ; =MOD05_021DB144
ldr r1, _0204C6D0 ; =ov05_021DB144
add r0, r5, #0x0
bl sub_0204640C
ldr r0, [r4, #0x4]
@ -666,7 +666,7 @@ _0204C6CA:
mov r0, #0x0
pop {r4-r6, pc}
nop
_0204C6D0: .word MOD05_021DB144
_0204C6D0: .word ov05_021DB144
thumb_func_start sub_0204C6D4
sub_0204C6D4: ; 0x0204C6D4
@ -714,16 +714,16 @@ _0204C700:
str r0, [r5, #0x4]
b _0204C798
_0204C736:
bl MOD05_021DB030
bl ov05_021DB030
add r2, r0, #0x0
ldr r1, _0204C79C ; =MOD05_021DB250
ldr r1, _0204C79C ; =ov05_021DB250
add r0, r6, #0x0
bl sub_0204640C
mov r0, #0x3
str r0, [r5, #0x4]
b _0204C798
_0204C74A:
bl MOD05_021DA5B8
bl ov05_021DA5B8
str r0, [r5, #0x1c]
ldr r0, [r4, #0x38]
bl GetPlayerXCoord
@ -733,7 +733,7 @@ _0204C74A:
add r1, r0, #0x0
ldr r2, [r5, #0x1c]
add r0, r6, #0x0
bl MOD05_021DA5D0
bl ov05_021DA5D0
ldr r0, [r5, #0x4]
add r0, r0, #0x1
str r0, [r5, #0x4]
@ -742,11 +742,11 @@ _0204C770:
ldr r5, [r5, #0x1c]
add r0, r4, #0x0
add r1, r5, #0x0
bl MOD05_021DA7B4
bl ov05_021DA7B4
cmp r0, #0x0
beq _0204C798
add r0, r5, #0x0
bl MOD05_021DA5C8
bl ov05_021DA5C8
ldr r0, [r4, #0x38]
bl PlayerAvatar_GetMapObject
mov r1, #0x0
@ -760,7 +760,7 @@ _0204C798:
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
_0204C79C: .word MOD05_021DB250
_0204C79C: .word ov05_021DB250
thumb_func_start sub_0204C7A0
sub_0204C7A0: ; 0x0204C7A0
@ -804,9 +804,9 @@ _0204C7BE:
bl sub_020463EC
b _0204C818
_0204C7FE:
bl MOD05_021DB030
bl ov05_021DB030
add r2, r0, #0x0
ldr r1, _0204C820 ; =MOD05_021DB380
ldr r1, _0204C820 ; =ov05_021DB380
add r0, r6, #0x0
bl sub_0204640C
ldr r0, [r4, #0x4]
@ -821,7 +821,7 @@ _0204C818:
pop {r3-r7, pc}
.balign 4
_0204C81C: .word sub_0204C6D4
_0204C820: .word MOD05_021DB380
_0204C820: .word ov05_021DB380
thumb_func_start sub_0204C824
sub_0204C824: ; 0x0204C824
@ -841,7 +841,7 @@ sub_0204C824: ; 0x0204C824
beq _0204C894
b _0204C898
_0204C846:
bl MOD05_021DA5B8
bl ov05_021DA5B8
str r0, [r4, #0x1c]
ldr r0, [r5, #0x38]
bl GetPlayerXCoord
@ -851,7 +851,7 @@ _0204C846:
add r1, r0, #0x0
ldr r2, [r4, #0x1c]
add r0, r6, #0x0
bl MOD05_021DA5D0
bl ov05_021DA5D0
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@ -865,11 +865,11 @@ _0204C86C:
add r0, r5, #0x0
add r1, r6, #0x0
lsr r2, r2, #0x18
bl MOD05_021DAAA4
bl ov05_021DAAA4
cmp r0, #0x0
beq _0204C898
ldr r0, [r4, #0x1c]
bl MOD05_021DA5C8
bl ov05_021DA5C8
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]
@ -906,7 +906,7 @@ _0204C8C0: ; jump table (using 16-bit offset)
.short _0204C932 - _0204C8C0 - 2; case 3
_0204C8C8:
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
ldr r0, [r5, #0x38]
bl PlayerAvatar_GetMapObject
add r6, r0, #0x0
@ -979,9 +979,9 @@ sub_0204C93C: ; 0x0204C93C
beq _0204C976
b _0204C97A
_0204C960:
bl MOD05_021DB030
bl ov05_021DB030
add r2, r0, #0x0
ldr r1, _0204C980 ; =MOD05_021DB040
ldr r1, _0204C980 ; =ov05_021DB040
add r0, r5, #0x0
bl sub_0204640C
ldr r0, [r4, #0x4]
@ -995,7 +995,7 @@ _0204C97A:
mov r0, #0x0
pop {r4-r6, pc}
nop
_0204C980: .word MOD05_021DB040
_0204C980: .word ov05_021DB040
thumb_func_start sub_0204C984
sub_0204C984: ; 0x0204C984

140
arm9/asm/unk_0204CB20.s
View File

@ -68,7 +68,7 @@ _0204CB40:
cmp r5, #0x0
str r2, [r0, #0x4]
beq _0204CB6C
bl MOD18_02244D1C
bl ov18_02244D1C
add r1, r0, #0x0
mov r0, #0xf
bl AllocFromHeap
@ -77,7 +77,7 @@ _0204CB40:
str r0, [r2, #0x4]
ldr r0, [r1, #0x0]
ldr r0, [r0, #0x4]
bl MOD18_02244D20
bl ov18_02244D20
_0204CB6C:
ldr r0, _0204CC34 ; =UNK_021C5A68
ldr r7, _0204CC3C ; =0x0000FFFF
@ -322,7 +322,7 @@ _0204CD2C:
ldr r0, [r0, #0x4]
cmp r0, #0x0
beq _0204CD60
bl MOD18_02244D3C
bl ov18_02244D3C
ldr r0, _0204CD70 ; =UNK_021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x4]
@ -1148,7 +1148,7 @@ _0204D3B2:
cmp r0, #0x0
beq _0204D3DC
add r0, r5, #0x0
bl MOD18_0223E4D4
bl ov18_0223E4D4
_0204D3DC:
ldr r0, _0204D430 ; =UNK_021C5A68
ldr r1, _0204D438 ; =0x000002BE
@ -1173,7 +1173,7 @@ _0204D3DC:
ldrh r1, [r1, #0x0]
ldrh r3, [r3, #0x0]
mov r2, #0x0
bl MOD05_021E5B30
bl ov05_021E5B30
_0204D40E:
ldr r0, _0204D430 ; =UNK_021C5A68
mov r1, #0x1
@ -1312,7 +1312,7 @@ sub_0204D4F0: ; 0x0204D4F0
ldr r0, [r0, #0x4]
cmp r0, #0x0
beq _0204D52A
bl MOD18_02244D58
bl ov18_02244D58
b _0204D52A
_0204D524:
add r0, r4, #0x0
@ -1337,7 +1337,7 @@ _0204D536:
cmp r0, #0x0
bne _0204D556
add r0, r5, #0x0
bl MOD18_02245358
bl ov18_02245358
_0204D556:
add r5, r5, #0x1
cmp r5, #0x8
@ -1374,7 +1374,7 @@ _0204D58A:
cmp r0, #0x0
beq _0204D5A0
add r0, r5, #0x0
bl MOD18_02247614
bl ov18_02247614
_0204D5A0:
lsl r0, r5, #0x10
lsr r0, r0, #0x10
@ -1408,9 +1408,9 @@ _0204D5C6:
cmp r0, #0x0
beq _0204D5F0
add r0, r5, #0x0
bl MOD18_0223EB8C
bl ov18_0223EB8C
add r0, r5, #0x0
bl MOD18_0223CB08
bl ov18_0223CB08
_0204D5F0:
strb r5, [r6, #0x0]
ldr r3, [r4, #0x0]
@ -1701,7 +1701,7 @@ _0204D7F6:
beq _0204D812
add r0, r5, #0x0
add r1, r6, #0x0
bl MOD18_02246F1C
bl ov18_02246F1C
cmp r0, #0x0
bne _0204D812
mov r0, #0x1
@ -1728,8 +1728,8 @@ sub_0204D830: ; 0x0204D830
ldr r0, [r0, #0x4]
cmp r0, #0x0
beq _0204D852
bl MOD18_02244D40
bl MOD18_02244DA0
bl ov18_02244D40
bl ov18_02244DA0
cmp r0, #0x0
bne _0204D84E
mov r0, #0x1
@ -1817,7 +1817,7 @@ _0204D8AA:
cmp r0, #0x0
beq _0204D8E0
add r1, r5, #0x0
bl MOD18_02244D40
bl ov18_02244D40
str r0, [sp, #0x4]
_0204D8E0:
ldr r1, [r6, #0x0]
@ -1826,7 +1826,7 @@ _0204D8E0:
cmp r0, #0x0
beq _0204D8F4
add r0, r5, #0x0
bl MOD18_02245F4C
bl ov18_02245F4C
cmp r0, #0x0
bne _0204D976
_0204D8F4:
@ -1853,7 +1853,7 @@ _0204D90A:
cmp r0, #0x0
beq _0204D93C
add r0, r5, #0x0
bl MOD18_0223F8D8
bl ov18_0223F8D8
cmp r0, #0x0
bne _0204D976
add r0, r5, #0x0
@ -1861,14 +1861,14 @@ _0204D90A:
cmp r0, #0x0
bne _0204D93C
add r0, r5, #0x0
bl MOD18_02247544
bl ov18_02247544
cmp r0, #0x0
bne _0204D976
_0204D93C:
ldr r0, [sp, #0x4]
cmp r0, #0x0
beq _0204D94A
bl MOD18_02244DB0
bl ov18_02244DB0
cmp r0, #0x0
beq _0204D976
_0204D94A:
@ -2010,7 +2010,7 @@ _0204DA44:
ldr r1, [sp, #0xc]
ldr r2, [sp, #0x8]
add r0, r5, #0x0
bl MOD18_0224566C
bl ov18_0224566C
cmp r0, #0x1
beq _0204DAE2
_0204DA66:
@ -2073,7 +2073,7 @@ _0204DA8E:
add r0, r5, #0x0
add r2, sp, #0x14
mov r3, #0x0
bl MOD18_0224089C
bl ov18_0224089C
_0204DAE2:
ldr r0, [sp, #0x0]
add r5, r5, #0x1
@ -2206,7 +2206,7 @@ sub_0204DBCC: ; 0x0204DBCC
cmp r0, #0x0
beq _0204DC14
add r0, r4, #0x0
bl MOD18_0223E554
bl ov18_0223E554
ldr r0, _0204DC28 ; =UNK_021C5A68
ldr r3, [r0, #0x0]
ldr r0, _0204DC30 ; =0x000002BD
@ -2222,7 +2222,7 @@ sub_0204DBCC: ; 0x0204DBCC
ldrh r1, [r1, #0x0]
ldrh r3, [r3, #0x0]
mov r2, #0x0
bl MOD05_021E5B30
bl ov05_021E5B30
_0204DC14:
mov r1, #0x0
add r0, r4, #0x0
@ -2883,7 +2883,7 @@ _0204E124:
add r0, r5, #0x0
add r2, sp, #0x4
mov r3, #0x0
bl MOD18_0224089C
bl ov18_0224089C
add sp, #0x8
mov r0, #0x1
pop {r3-r7, pc}
@ -3130,11 +3130,11 @@ sub_0204E2E0: ; 0x0204E2E0
thumb_func_start sub_0204E2F0
sub_0204E2F0: ; 0x0204E2F0
ldr r3, _0204E2F8 ; =MOD18_0223E4BC
ldr r3, _0204E2F8 ; =ov18_0223E4BC
ldrb r0, [r2, #0x0]
bx r3
nop
_0204E2F8: .word MOD18_0223E4BC
_0204E2F8: .word ov18_0223E4BC
thumb_func_start sub_0204E2FC
sub_0204E2FC: ; 0x0204E2FC
@ -3745,9 +3745,9 @@ sub_0204E758: ; 0x0204E758
ldr r0, [r0, #0x0]
add r1, r2, #0x0
ldr r0, [r0, #0x4]
bl MOD18_02244D40
bl ov18_02244D40
add r1, r4, #0x0
bl MOD18_02244D98
bl ov18_02244D98
pop {r4, pc}
nop
_0204E774: .word UNK_021C5A68
@ -3759,9 +3759,9 @@ sub_0204E778: ; 0x0204E778
ldr r0, _0204E790 ; =UNK_021C5A68
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x4]
bl MOD18_02244D40
bl ov18_02244D40
mov r1, #0x0
bl MOD18_02244D98
bl ov18_02244D98
pop {r3, pc}
nop
_0204E790: .word UNK_021C5A68
@ -3817,7 +3817,7 @@ sub_0204E7CC: ; 0x0204E7CC
ldrh r3, [r4, #0x2]
ldr r0, [r0, #0x54]
mov r2, #0x0
bl MOD05_021E5B30
bl ov05_021E5B30
_0204E7FA:
strh r6, [r4, #0x0]
ldr r0, [sp, #0x0]
@ -3845,7 +3845,7 @@ _0204E81A:
ldrh r1, [r4, #0x0]
ldrh r3, [r4, #0x2]
mov r2, #0x0
bl MOD05_021E5B30
bl ov05_021E5B30
_0204E832:
ldr r0, _0204E848 ; =UNK_021C5A68
ldr r1, [r0, #0x0]
@ -3981,7 +3981,7 @@ sub_0204E8FC: ; 0x0204E8FC
ldr r1, [r1, #0x0]
ldr r0, _0204E968 ; =sub_0204D308
ldr r1, [r1, #0x54]
bl MOD18_022494C8
bl ov18_022494C8
pop {r4, pc}
_0204E936:
ldrb r0, [r4, #0x0]
@ -4003,7 +4003,7 @@ _0204E936:
ldr r1, [r1, #0x0]
ldr r0, _0204E968 ; =sub_0204D308
ldr r1, [r1, #0x54]
bl MOD18_0224A7C8
bl ov18_0224A7C8
_0204E962:
pop {r4, pc}
.balign 4
@ -4033,11 +4033,11 @@ _0204E988:
cmp r1, r0
bne _0204E9AA
bl sub_0204F7E4
bl MOD18_0223D638
bl ov18_0223D638
ldr r3, _0204EAD0 ; =sub_0204E2AC
mov r1, #0x48
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
_0204E9AA:
ldrb r0, [r5, #0x0]
cmp r0, #0x1
@ -4058,7 +4058,7 @@ _0204E9B8:
ldr r2, [r2, #0x0]
ldr r1, _0204EAD4 ; =sub_0204D308
ldr r2, [r2, #0x54]
bl MOD18_02247A34
bl ov18_02247A34
ldr r0, _0204EACC ; =UNK_021C5A68
ldrb r4, [r5, #0x1]
ldr r2, [r0, #0x0]
@ -4148,7 +4148,7 @@ _0204EA7C:
ldr r2, [r2, #0x0]
add r0, r4, #0x0
ldr r2, [r2, #0x54]
bl MOD18_02248DF8
bl ov18_02248DF8
_0204EA9A:
ldrb r0, [r5, #0x0]
cmp r0, #0x2
@ -4158,18 +4158,18 @@ _0204EA9A:
cmp r1, r0
bne _0204EABC
bl sub_0204F7E4
bl MOD18_0223D638
bl ov18_0223D638
ldr r3, _0204EAD0 ; =sub_0204E2AC
mov r1, #0x2
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
_0204EABC:
ldrb r0, [r5, #0x0]
cmp r0, #0x1
bne _0204EACA
ldrb r0, [r5, #0x1]
ldrb r1, [r5, #0x2]
bl MOD18_0223E4A8
bl ov18_0223E4A8
_0204EACA:
pop {r4-r6, pc}
.balign 4
@ -4865,7 +4865,7 @@ _0204F004:
bne _0204F01E
add r0, r1, #0x0
bl PlayerAvatar_GetMapObject
bl MOD05_021E5970
bl ov05_021E5970
ldr r1, _0204F06C ; =UNK_021C5A68
ldr r2, [r1, #0x0]
lsl r1, r4, #0x2
@ -4885,7 +4885,7 @@ _0204F02C:
bne _0204F068
add r0, r1, #0x0
bl PlayerAvatar_GetMapObject
bl MOD05_021E57D4
bl ov05_021E57D4
ldr r1, _0204F06C ; =UNK_021C5A68
ldr r2, [r1, #0x0]
lsl r1, r4, #0x2
@ -4898,7 +4898,7 @@ _0204F048:
bne _0204F068
add r0, r1, #0x0
bl PlayerAvatar_GetMapObject
bl MOD05_021E5614
bl ov05_021E5614
ldr r1, _0204F06C ; =UNK_021C5A68
ldr r2, [r1, #0x0]
lsl r1, r4, #0x2
@ -5006,8 +5006,8 @@ sub_0204F108: ; 0x0204F108
push {r3, lr}
bl sub_02031190
bl sub_0204F0A8
bl MOD18_0223D648
bl MOD18_0224DD94
bl ov18_0223D648
bl ov18_0224DD94
mov r0, #0x4
bl sub_0204F774
pop {r3, pc}
@ -5165,18 +5165,18 @@ sub_0204F23C: ; 0x0204F23C
sub sp, #0x8
add r5, r0, #0x0
add r4, r1, #0x0
bl MOD18_0223E6B8
bl ov18_0223E6B8
mov r0, #0x0
bl sub_0204D628
mov r0, #0x4
bl sub_0204F74C
bl MOD18_0223D648
bl ov18_0223D648
add r6, r0, #0x0
ldrb r0, [r5, #0x1]
bl sub_0202DFA4
add r1, r0, #0x0
add r0, r6, #0x0
bl MOD18_0224DDB8
bl ov18_0224DDB8
cmp r4, #0x0
beq _0204F29C
bl sub_02031190
@ -5190,18 +5190,18 @@ sub_0204F23C: ; 0x0204F23C
bl sub_0204F0A8
bl sub_02031190
bl sub_0204F074
bl MOD18_0223D648
bl ov18_0223D648
ldr r3, _0204F2CC ; =sub_0204F108
mov r1, #0xa
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
b _0204F2AA
_0204F29C:
bl MOD18_0223D648
bl ov18_0223D648
ldr r3, _0204F2CC ; =sub_0204F108
mov r1, #0xb
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
_0204F2AA:
mov r0, #0xff
str r0, [sp, #0x0]
@ -5282,11 +5282,11 @@ _0204F346:
b _0204F5DA
_0204F348:
bl sub_0204F7E4
bl MOD18_0223D648
bl ov18_0223D648
ldr r3, _0204F5E4 ; =sub_0204E2B4
mov r1, #0x2
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
mov r0, #0xff
str r0, [sp, #0x0]
mov r3, #0x0
@ -5350,11 +5350,11 @@ _0204F3AC:
add r0, r4, #0x0
bl sub_02026C00
bl sub_0204F7E4
bl MOD18_0223D648
bl ov18_0223D648
ldr r3, _0204F5EC ; =sub_0204E2AC
mov r1, #0xd
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
ldr r0, _0204F5F0 ; =0x00000625
bl PlaySE
b _0204F410
@ -5369,7 +5369,7 @@ _0204F3FC:
bl sub_0204F23C
_0204F410:
ldrb r0, [r5, #0x1]
bl MOD18_022472AC
bl ov18_022472AC
add sp, #0xc
pop {r4-r5, pc}
_0204F41A:
@ -5386,18 +5386,18 @@ _0204F41A:
bl sub_02026970
mov r0, #0x1
bl sub_0204F74C
bl MOD18_0223D648
bl ov18_0223D648
add r4, r0, #0x0
ldrb r0, [r5, #0x2]
bl sub_0202DFA4
add r1, r0, #0x0
add r0, r4, #0x0
bl MOD18_0224DDB8
bl MOD18_0223D648
bl ov18_0224DDB8
bl ov18_0223D648
ldr r3, _0204F5F4 ; =sub_0204E2D4
mov r1, #0xc
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
ldr r0, _0204F5F8 ; =0x00000425
bl sub_0200521C
ldr r0, _0204F5F0 ; =0x00000625
@ -5415,7 +5415,7 @@ _0204F46C:
_0204F480:
ldrb r0, [r5, #0x1]
ldrb r1, [r5, #0x2]
bl MOD18_02247294
bl ov18_02247294
add sp, #0xc
pop {r4-r5, pc}
_0204F48C:
@ -5425,11 +5425,11 @@ _0204F48C:
bne _0204F4B8
mov r0, #0x2
bl sub_0204F74C
bl MOD18_0223D648
bl ov18_0223D648
ldr r3, _0204F5FC ; =sub_0204E2BC
mov r1, #0x6
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
add sp, #0xc
pop {r4-r5, pc}
_0204F4AE:
@ -5442,11 +5442,11 @@ _0204F4B8:
_0204F4BA:
mov r0, #0x20
bl sub_0204F74C
bl MOD18_0223D648
bl ov18_0223D648
ldr r3, _0204F600 ; =sub_0204E2C8
mov r1, #0x5
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
add sp, #0xc
pop {r4-r5, pc}
_0204F4D2:
@ -5511,11 +5511,11 @@ _0204F54A:
ldrb r1, [r1, #0x0]
cmp r1, r0
bne _0204F572
bl MOD18_0223D648
bl ov18_0223D648
ldr r3, _0204F5EC ; =sub_0204E2AC
mov r1, #0x7
mov r2, #0x1
bl MOD18_0224DCB8
bl ov18_0224DCB8
b _0204F57A
_0204F572:
mov r0, #0x60
@ -5886,7 +5886,7 @@ sub_0204F80C: ; 0x0204F80C
pop {r3, pc}
_0204F832:
bl sub_02031190
bl MOD12_0223E734
bl ov12_0223E734
cmp r0, #0x0
beq _0204F84C
bl sub_0204F7FC
@ -5915,7 +5915,7 @@ sub_0204F858: ; 0x0204F858
cmp r0, #0x0
beq _0204F880
bl sub_02031190
bl MOD12_0223E734
bl ov12_0223E734
cmp r0, #0x0
bne _0204F880
mov r0, #0x0

104
arm9/asm/unk_0204FBA8.s
View File

@ -186,7 +186,7 @@ sub_0204FCA0: ; 0x0204FCA0
ldr r0, _0204FCD0 ; =UNK_021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
bl MOD18_0223E060
bl ov18_0223E060
ldr r0, _0204FCD4 ; =sub_020500A4
mov r1, #0x0
bl sub_02050094
@ -228,7 +228,7 @@ sub_0204FD08: ; 0x0204FD08
bl sub_0202EDD8
cmp r0, #0x0
bne _0204FD1E
bl MOD18_02245F1C
bl ov18_02245F1C
ldr r0, _0204FD20 ; =sub_020500A4
mov r1, #0x0
bl sub_02050094
@ -702,12 +702,12 @@ _020500B6:
ldr r0, _02050108 ; =UNK_021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
bl MOD18_0223E1E0
bl ov18_0223E1E0
bl sub_0202DBE0
mov r0, #0x0
bl sub_0204D168
bl MOD18_0223EF7C
bl MOD18_02245FA0
bl ov18_0223EF7C
bl ov18_02245FA0
ldr r0, _02050108 ; =UNK_021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
@ -777,7 +777,7 @@ _02050164: .word sub_02050168
thumb_func_start sub_02050168
sub_02050168: ; 0x02050168
push {r3, lr}
bl MOD18_0223DFB4
bl ov18_0223DFB4
bl sub_0204F80C
bl sub_020318C4
cmp r0, #0x0
@ -785,7 +785,7 @@ sub_02050168: ; 0x02050168
bl sub_02031190
cmp r0, #0x0
bne _02050190
bl MOD18_02245324
bl ov18_02245324
ldr r0, _0205019C ; =sub_0205024C
mov r1, #0x3c
bl sub_02050094
@ -846,17 +846,17 @@ _020501DC:
cmp r0, r1
bne _0205023C
_02050202:
bl MOD18_0223E6B8
bl ov18_0223E6B8
mov r0, #0x0
bl sub_0204D040
mov r0, #0x0
add r1, r0, #0x0
add r2, r0, #0x0
add r3, r0, #0x0
bl MOD18_022408FC
bl ov18_022408FC
mov r0, #0x0
mov r1, #0x1
bl MOD18_0223FCE8
bl ov18_0223FCE8
mov r0, #0x0
bl sub_0202DE78
mov r0, #0x0
@ -877,7 +877,7 @@ _02050248: .word sub_02050350
thumb_func_start sub_0205024C
sub_0205024C: ; 0x0205024C
push {r3, lr}
bl MOD18_0223DFB4
bl ov18_0223DFB4
ldr r0, _020502A0 ; =UNK_021C5A6C
ldr r1, [r0, #0x0]
ldrh r0, [r1, #0x3c]
@ -895,7 +895,7 @@ _02050260:
cmp r0, #0x0
bne _0205029E
_02050272:
bl MOD18_0223E6B8
bl ov18_0223E6B8
cmp r0, #0x0
beq _0205027E
bl sub_0204F7FC
@ -905,8 +905,8 @@ _0205027E:
mov r0, #0x0
bl sub_0204D168
bl sub_0204F930
bl MOD18_02245FA0
bl MOD18_0223E7FC
bl ov18_02245FA0
bl ov18_0223E7FC
ldr r0, _020502A8 ; =sub_020502AC
mov r1, #0x0
bl sub_02050094
@ -920,7 +920,7 @@ _020502A8: .word sub_020502AC
thumb_func_start sub_020502AC
sub_020502AC: ; 0x020502AC
push {r3, lr}
bl MOD18_0223DFB4
bl ov18_0223DFB4
ldr r0, _02050314 ; =UNK_021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
@ -942,15 +942,15 @@ sub_020502AC: ; 0x020502AC
bne _02050310
_020502E2:
mov r0, #0x0
bl MOD18_02245358
bl ov18_02245358
bl sub_0204F90C
bl MOD18_02247808
bl ov18_02247808
mov r0, #0x2b
bl sub_020311DC
bl sub_02031190
mov r1, #0x1
bl MOD18_0223FCE8
bl MOD18_0223E6B8
bl ov18_0223FCE8
bl ov18_0223E6B8
bl sub_020318B4
ldr r0, _02050318 ; =sub_02050458
mov r1, #0x0
@ -974,15 +974,15 @@ _0205032C: .word sub_02050330
thumb_func_start sub_02050330
sub_02050330: ; 0x02050330
ldr r3, _02050334 ; =MOD18_0223DFB4
ldr r3, _02050334 ; =ov18_0223DFB4
bx r3
.balign 4
_02050334: .word MOD18_0223DFB4
_02050334: .word ov18_0223DFB4
thumb_func_start sub_02050338
sub_02050338: ; 0x02050338
push {r3, lr}
bl MOD18_02245F1C
bl ov18_02245F1C
bl sub_0204CC9C
ldr r0, _0205034C ; =sub_020502AC
mov r1, #0x0
@ -1000,7 +1000,7 @@ sub_02050350: ; 0x02050350
cmp r0, #0x9
bne _02050364
bl sub_0202DBE0
bl MOD18_0223E7FC
bl ov18_0223E7FC
_02050364:
ldr r0, _020503A8 ; =UNK_021C5A6C
ldr r0, [r0, #0x0]
@ -1043,7 +1043,7 @@ sub_020503B4: ; 0x020503B4
bl sub_0204FB00
cmp r0, #0x0
beq _020503CC
bl MOD18_0223EF7C
bl ov18_0223EF7C
ldr r0, _020503E8 ; =sub_020503F0
mov r1, #0x0
bl sub_02050094
@ -1068,13 +1068,13 @@ _020503EC: .word UNK_021C5A6C
thumb_func_start sub_020503F0
sub_020503F0: ; 0x020503F0
push {r3, lr}
bl MOD18_0223F4D8
bl ov18_0223F4D8
cmp r0, #0x0
beq _02050412
ldr r0, _02050418 ; =UNK_02105E94
bl sub_0204FBAC
bl MOD18_0223F4F4
bl MOD18_02245FA0
bl ov18_0223F4F4
bl ov18_02245FA0
ldr r0, _0205041C ; =sub_02050420
mov r1, #0x0
bl sub_02050094
@ -1089,12 +1089,12 @@ _0205041C: .word sub_02050420
thumb_func_start sub_02050420
sub_02050420: ; 0x02050420
push {r3, lr}
bl MOD18_022461A4
bl ov18_022461A4
cmp r0, #0x0
beq _0205044A
ldr r0, _02050450 ; =UNK_02105EB0
bl sub_0204FBAC
bl MOD18_022461B8
bl ov18_022461B8
mov r0, #0x1
bl sub_0204D168
mov r0, #0x1f
@ -1177,10 +1177,10 @@ _020504CC: .word sub_020500A4
thumb_func_start sub_020504D0
sub_020504D0: ; 0x020504D0
ldr r3, _020504D4 ; =MOD18_0223DFB4
ldr r3, _020504D4 ; =ov18_0223DFB4
bx r3
.balign 4
_020504D4: .word MOD18_0223DFB4
_020504D4: .word ov18_0223DFB4
thumb_func_start sub_020504D8
sub_020504D8: ; 0x020504D8
@ -1191,12 +1191,12 @@ sub_020504D8: ; 0x020504D8
ldr r0, _02050508 ; =UNK_021C5A6C
ldr r0, [r0, #0x0]
ldr r0, [r0, #0x18]
bl MOD18_0223E1E0
bl ov18_0223E1E0
bl sub_0202DBE0
mov r0, #0x0
bl sub_0204D168
bl MOD18_0223EF7C
bl MOD18_02245FA0
bl ov18_0223EF7C
bl ov18_02245FA0
ldr r0, _0205050C ; =sub_020504D0
mov r1, #0x0
bl sub_02050094
@ -1211,13 +1211,13 @@ sub_02050510: ; 0x02050510
push {r3, lr}
bl sub_02031190
mov r1, #0x1
bl MOD18_0223FCE8
bl ov18_0223FCE8
bl sub_02031190
mov r1, #0x1
bl MOD18_02247728
bl MOD18_0223CACC
bl ov18_02247728
bl ov18_0223CACC
bl sub_0204CEF8
bl MOD18_0223E6B8
bl ov18_0223E6B8
bl sub_02031880
bl sub_0204FB28
ldr r0, _02050544 ; =sub_020504A4
@ -1230,7 +1230,7 @@ _02050544: .word sub_020504A4
thumb_func_start sub_02050548
sub_02050548: ; 0x02050548
push {r3, lr}
bl MOD18_0223DFB4
bl ov18_0223DFB4
bl sub_0204F80C
ldr r0, _02050574 ; =UNK_021C5A6C
ldr r0, [r0, #0x0]
@ -1264,15 +1264,15 @@ _02050588: .word sub_0205058C
thumb_func_start sub_0205058C
sub_0205058C: ; 0x0205058C
ldr r3, _02050590 ; =MOD18_02247830
ldr r3, _02050590 ; =ov18_02247830
bx r3
.balign 4
_02050590: .word MOD18_02247830
_02050590: .word ov18_02247830
thumb_func_start sub_02050594
sub_02050594: ; 0x02050594
push {r3, lr}
bl MOD18_02245F1C
bl ov18_02245F1C
bl sub_0204CC9C
bl sub_0202EE44
cmp r0, #0x0
@ -1281,9 +1281,9 @@ sub_02050594: ; 0x02050594
cmp r0, #0x0
beq _020505CC
_020505AE:
bl MOD18_022452A4
bl ov18_022452A4
bl sub_0204CEF8
bl MOD18_0223E6B8
bl ov18_0223E6B8
bl sub_02031880
bl sub_0204FB28
ldr r0, _020505D8 ; =sub_020504A4
@ -1318,7 +1318,7 @@ sub_020505F4: ; 0x020505F4
thumb_func_start sub_020505F8
sub_020505F8: ; 0x020505F8
push {r3, lr}
bl MOD18_02245F1C
bl ov18_02245F1C
bl sub_0204CC9C
ldr r0, _0205060C ; =sub_02050168
mov r1, #0x0
@ -1346,7 +1346,7 @@ sub_02050624: ; 0x02050624
thumb_func_start sub_02050628
sub_02050628: ; 0x02050628
push {r3, lr}
bl MOD18_02245F1C
bl ov18_02245F1C
bl sub_0204CC9C
ldr r0, _0205063C ; =sub_020504D0
mov r1, #0x0
@ -1362,7 +1362,7 @@ sub_02050640: ; 0x02050640
bl sub_02030E7C
cmp r0, #0x0
beq _0205065E
bl MOD06_02240834
bl ov06_02240834
bl sub_0202DBE0
ldr r0, _02050660 ; =sub_02050664
mov r1, #0x0
@ -1383,7 +1383,7 @@ sub_02050668: ; 0x02050668
bl sub_0202E4C8
cmp r0, #0x0
beq _0205067E
bl MOD06_022407CC
bl ov06_022407CC
ldr r0, _02050680 ; =sub_02050684
mov r1, #0x0
bl sub_02050094
@ -2276,7 +2276,7 @@ sub_02050D54: ; 0x02050D54
strh r0, [r1, #0x3c]
pop {r3, pc}
_02050D66:
bl MOD18_0223E1A4
bl ov18_0223E1A4
bl sub_02031860
mov r0, #0x21
bl DestroyHeap
@ -2358,7 +2358,7 @@ _02050E02:
mov r0, #0x0
pop {r3, pc}
_02050E06:
bl MOD18_0223E2AC
bl ov18_0223E2AC
pop {r3, pc}
.balign 4
_02050E0C: .word UNK_021C5A6C
@ -2374,7 +2374,7 @@ sub_02050E10: ; 0x02050E10
ldrb r0, [r0, #0x0]
cmp r0, #0x0
beq _02050E26
bl MOD18_0223E118
bl ov18_0223E118
_02050E26:
pop {r3, pc}
.balign 4
@ -2391,7 +2391,7 @@ sub_02050E2C: ; 0x02050E2C
ldrb r0, [r0, #0x0]
cmp r0, #0x0
beq _02050E42
bl MOD18_0223E154
bl ov18_0223E154
_02050E42:
pop {r3, pc}
.balign 4

10
arm9/asm/unk_02050E48.s
View File

@ -273,7 +273,7 @@ sub_0205104C: ; 0x0205104C
cmp r0, #0x0
beq _02051066
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
bl sub_0204CC9C
mov r0, #0x1
pop {r3, pc}
@ -566,7 +566,7 @@ _02051288:
b _020517B8
_0205129C:
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0xe
str r0, [r4, #0x34]
b _020517B8
@ -1037,7 +1037,7 @@ _02051642:
b _020517B8
_0205167A:
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x21
str r0, [r4, #0x34]
b _020517B8
@ -2207,7 +2207,7 @@ _02051F7C:
add r0, #0x8
bl RemoveWindow
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
ldr r0, [r4, #0x28]
add r0, r0, #0x1
str r0, [r4, #0x28]
@ -2250,7 +2250,7 @@ _0205200C:
cmp r0, #0x0
bne _0205203A
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
bl sub_0204CC9C
ldr r0, [r4, #0x28]
add r0, r0, #0x1

10
arm9/asm/unk_02052EE8.s
View File

@ -680,7 +680,7 @@ _020533CC:
cmp r0, #0x1
bne _0205342A
add r0, r4, #0x0
bl MOD06_02249668
bl ov06_02249668
str r0, [r5, #0x14]
b _02053438
_0205342A:
@ -688,7 +688,7 @@ _0205342A:
blo _02053438
add r0, r4, #0x0
mov r1, #0x2
bl MOD06_02249668
bl ov06_02249668
str r0, [r5, #0x14]
_02053438:
mov r0, #0x0
@ -735,7 +735,7 @@ sub_02053478: ; 0x02053478
cmp r0, #0x0
bne _0205349C
add r0, r1, #0x0
bl MOD05_021EDA48
bl ov05_021EDA48
str r0, [r4, #0x10]
mov r0, #0x1e
strh r0, [r4, #0x6]
@ -837,7 +837,7 @@ _02053524:
bne _02053566
add r0, r4, #0x0
mov r1, #0x1
bl MOD06_02249668
bl ov06_02249668
str r0, [r5, #0x14]
b _02053574
_02053566:
@ -845,7 +845,7 @@ _02053566:
blo _02053574
add r0, r4, #0x0
mov r1, #0x2
bl MOD06_02249668
bl ov06_02249668
str r0, [r5, #0x14]
_02053574:
mov r0, #0x0

4
arm9/asm/unk_02055068.s
View File

@ -87,7 +87,7 @@ _02055118:
add r0, r4, #0x0
bl sub_02058578
add r0, r5, #0x0
bl MOD05_021EDBC8
bl ov05_021EDBC8
add r0, r5, #0x0
bl PlayerAvatar_GetState
cmp r0, #0x2
@ -106,7 +106,7 @@ _02055118:
add r0, r4, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
bl MOD06_0224ABAC
bl ov06_0224ABAC
add r1, r0, #0x0
add r0, r5, #0x0
bl sub_02055450

6
arm9/asm/unk_020557F4.s
View File

@ -57,7 +57,7 @@ _02055812:
cmp r0, #0x1
bne _0205584E
add r0, r5, #0x0
bl MOD05_021E7138
bl ov05_021E7138
pop {r3-r7, pc}
_0205584E:
add r0, r5, #0x0
@ -70,14 +70,14 @@ _0205584E:
cmp r0, #0x0
beq _0205586C
add r0, r5, #0x0
bl MOD05_021E7138
bl ov05_021E7138
b _02055878
_0205586C:
ldr r0, [sp, #0x1c]
cmp r0, #0x1
bne _02055878
add r0, r5, #0x0
bl MOD05_021E70F0
bl ov05_021E70F0
_02055878:
add r0, sp, #0x8
ldrh r0, [r0, #0x10]

14
arm9/asm/unk_02057380.s
View File

@ -95,7 +95,7 @@ _02057430:
bl sub_020583A0
add r1, r0, #0x0
ldr r0, [sp, #0x0]
bl MOD05_021F2AF4
bl ov05_021F2AF4
add sp, #0x8
pop {r3-r7, pc}
.balign 4
@ -1355,7 +1355,7 @@ sub_02057F18: ; 0x02057F18
lsl r1, r1, #0xc
cmp r0, r1
bne _02057F2C
ldr r5, _02057F7C ; =UNK05_021F9080
ldr r5, _02057F7C ; =ov05_021F9080
b _02057F32
_02057F2C:
bl sub_02058D4C
@ -1388,7 +1388,7 @@ _02057F32:
bl sub_020586D4
pop {r3-r5, pc}
nop
_02057F7C: .word UNK05_021F9080
_02057F7C: .word ov05_021F9080
thumb_func_start sub_02057F80
sub_02057F80: ; 0x02057F80
@ -1705,7 +1705,7 @@ sub_020581B4: ; 0x020581B4
bl sub_02058544
add r0, r4, #0x0
mov r1, #0x0
bl MOD05_021F2E0C
bl ov05_021F2E0C
add r0, r4, #0x0
bl sub_02058884
cmp r0, #0x0
@ -1898,7 +1898,7 @@ sub_02058348: ; 0x02058348
cmp r0, #0x1
bne _0205835E
add r0, r4, #0x0
bl MOD05_021F1D8C
bl ov05_021F1D8C
_0205835E:
pop {r4, pc}
@ -3782,7 +3782,7 @@ sub_02058D48: ; 0x02058D48
thumb_func_start sub_02058D4C
sub_02058D4C: ; 0x02058D4C
push {r3, lr}
ldr r3, _02058D6C ; =UNK05_021F9494
ldr r3, _02058D6C ; =ov05_021F9494
ldr r1, _02058D70 ; =0x0000FFFF
_02058D52:
ldr r2, [r3, #0x0]
@ -3799,7 +3799,7 @@ _02058D5C:
mov r0, #0x0
pop {r3, pc}
.balign 4
_02058D6C: .word UNK05_021F9494
_02058D6C: .word ov05_021F9494
_02058D70: .word 0x0000FFFF
thumb_func_start sub_02058D74

48
arm9/asm/unk_02058EE8.s
View File

@ -1396,7 +1396,7 @@ sub_02059064: ; 0x02059064
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
bl MOD05_021F1DC8
bl ov05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@ -1459,7 +1459,7 @@ sub_020590F4: ; 0x020590F4
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
bl MOD05_021F1DC8
bl ov05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@ -1537,7 +1537,7 @@ sub_020591A8: ; 0x020591A8
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
bl MOD05_021F1DC8
bl ov05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@ -1585,7 +1585,7 @@ sub_02059214: ; 0x02059214
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
bl MOD05_021F1DC8
bl ov05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@ -1638,7 +1638,7 @@ sub_0205928C: ; 0x0205928C
lsl r0, r0, #0x18
lsr r4, r0, #0x18
add r0, r5, #0x0
bl MOD05_021F1DC8
bl ov05_021F1DC8
add r7, r0, #0x0
add r0, r5, #0x0
add r1, r6, #0x0
@ -1813,7 +1813,7 @@ sub_0205941C: ; 0x0205941C
bne _02059432
add r0, r4, #0x0
mov r1, #0x0
bl MOD06_0224B568
bl ov06_0224B568
_02059432:
pop {r4, pc}
@ -1827,7 +1827,7 @@ sub_02059434: ; 0x02059434
bne _0205944A
add r0, r4, #0x0
mov r1, #0x1
bl MOD06_0224B568
bl ov06_0224B568
_0205944A:
pop {r4, pc}
@ -1851,13 +1851,13 @@ sub_0205944C: ; 0x0205944C
cmp r0, #0x1
bne _02059478
add r0, r5, #0x0
bl MOD06_02249E6C
bl ov06_02249E6C
pop {r4-r6, pc}
_02059478:
cmp r0, #0x2
bne _020594BC
add r0, r5, #0x0
bl MOD06_02249E78
bl ov06_02249E78
pop {r4-r6, pc}
_02059484:
add r0, r4, #0x0
@ -1874,7 +1874,7 @@ _02059484:
beq _020594AA
_020594A2:
add r0, r5, #0x0
bl MOD06_02249E90
bl ov06_02249E90
pop {r4-r6, pc}
_020594AA:
add r0, r5, #0x0
@ -1883,7 +1883,7 @@ _020594AA:
cmp r0, #0x1
bne _020594BC
add r0, r5, #0x0
bl MOD06_02249E84
bl ov06_02249E84
_020594BC:
pop {r4-r6, pc}
.balign 4
@ -1902,7 +1902,7 @@ sub_020594C0: ; 0x020594C0
bne _020594F2
add r0, r4, #0x0
mov r1, #0x1
bl MOD06_0224B9E0
bl ov06_0224B9E0
add r0, r4, #0x0
mov r1, #0x1
bl sub_020589E4
@ -1990,7 +1990,7 @@ _02059584:
cmp r0, #0x0
bne _020595A2
add r0, r5, #0x0
bl MOD06_02249508
bl ov06_02249508
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0xe
@ -2090,7 +2090,7 @@ sub_0205962C: ; 0x0205962C
cmp r0, #0x1
beq _02059674
add r0, r5, #0x0
bl MOD06_0224BBEC
bl ov06_0224BBEC
_02059674:
pop {r3-r5, pc}
.balign 4
@ -2105,7 +2105,7 @@ sub_02059678: ; 0x02059678
bne _0205968E
add r0, r4, #0x0
mov r1, #0x0
bl MOD06_0224BD90
bl ov06_0224BD90
_0205968E:
pop {r4, pc}
@ -2119,7 +2119,7 @@ sub_02059690: ; 0x02059690
bne _020596A6
add r0, r4, #0x0
mov r1, #0x1
bl MOD06_0224BD90
bl ov06_0224BD90
_020596A6:
pop {r4, pc}
@ -2133,7 +2133,7 @@ sub_020596A8: ; 0x020596A8
bne _020596BE
add r0, r4, #0x0
mov r1, #0x0
bl MOD06_0224C038
bl ov06_0224C038
_020596BE:
pop {r4, pc}
@ -2147,7 +2147,7 @@ sub_020596C0: ; 0x020596C0
bne _020596D6
add r0, r4, #0x0
mov r1, #0x1
bl MOD06_0224C038
bl ov06_0224C038
_020596D6:
pop {r4, pc}
@ -2171,7 +2171,7 @@ sub_020596D8: ; 0x020596D8
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
bl MOD06_0224B124
bl ov06_0224B124
_02059708:
pop {r4-r6, pc}
.balign 4
@ -2196,7 +2196,7 @@ sub_0205970C: ; 0x0205970C
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
bl MOD06_0224B124
bl ov06_0224B124
_0205973C:
pop {r4-r6, pc}
.balign 4
@ -2221,7 +2221,7 @@ sub_02059740: ; 0x02059740
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
bl MOD06_0224B2C4
bl ov06_0224B2C4
_02059770:
pop {r4-r6, pc}
.balign 4
@ -2246,7 +2246,7 @@ sub_02059774: ; 0x02059774
add r0, r5, #0x0
add r1, r4, #0x0
add r2, r6, #0x0
bl MOD06_0224B2C4
bl ov06_0224B2C4
_020597A4:
pop {r4-r6, pc}
.balign 4
@ -2286,12 +2286,12 @@ _020597DE:
bne _020597FA
add r0, r5, #0x0
mov r1, #0x0
bl MOD06_022497E8
bl ov06_022497E8
pop {r4-r6, pc}
_020597FA:
add r0, r5, #0x0
mov r1, #0x1
bl MOD06_022497E8
bl ov06_022497E8
_02059802:
pop {r4-r6, pc}

6
arm9/asm/unk_0205AD98.s
View File

@ -2002,7 +2002,7 @@ sub_0205BB90: ; 0x0205BB90
add r0, r5, #0x0
add r1, r6, #0x0
mov r2, #0x1
bl MOD05_021E7AC0
bl ov05_021E7AC0
str r0, [r4, #0x4]
add r0, r5, #0x0
bl sub_02058700
@ -2015,7 +2015,7 @@ sub_0205BBB4: ; 0x0205BBB4
bl sub_02058600
add r4, r0, #0x0
ldr r0, [r4, #0x4]
bl MOD05_021E799C
bl ov05_021E799C
cmp r0, #0x1
bne _0205BBD8
ldr r0, [r4, #0x4]
@ -2339,7 +2339,7 @@ _0205BDFE:
add r0, r4, #0x0
bl sub_02058B94
add r0, r4, #0x0
bl MOD06_0224D2E0
bl ov06_0224D2E0
ldr r1, _0205BE34 ; =0x00010004
add r0, r4, #0x0
bl sub_02058410

40
arm9/asm/unk_0205C334.s
View File

@ -89,7 +89,7 @@ sub_0205C3B0: ; 0x0205C3B0
mov r1, #0x0
str r1, [r0, #0x4]
add r0, r4, #0x0
bl MOD06_0224A310
bl ov06_0224A310
pop {r4, pc}
nop
_0205C3CC: .word 0x0000FFFF
@ -109,7 +109,7 @@ sub_0205C3D0: ; 0x0205C3D0
bl sub_0204B5FC
add r6, r0, #0x0
add r0, r5, #0x0
bl MOD05_021F2E28
bl ov05_021F2E28
cmp r0, #0x1
beq _0205C488
ldr r0, [r4, #0x4]
@ -119,7 +119,7 @@ sub_0205C3D0: ; 0x0205C3D0
ldr r2, [r4, #0x0]
add r0, r5, #0x0
add r1, #0x8
bl MOD05_021F2094
bl ov05_021F2094
add r0, r5, #0x0
bl MapObject_GetFieldSysPtr
add r1, r5, #0x0
@ -134,13 +134,13 @@ sub_0205C3D0: ; 0x0205C3D0
cmp r0, #0x0
beq _0205C432
add r0, r5, #0x0
bl MOD06_0224A528
bl ov06_0224A528
_0205C432:
add r1, r4, #0x0
ldr r2, [r4, #0x0]
add r0, r5, #0x0
add r1, #0x8
bl MOD05_021F1F78
bl ov05_021F1F78
b _0205C450
_0205C440:
cmp r0, #0x0
@ -149,23 +149,23 @@ _0205C440:
cmp r0, #0x0
bne _0205C450
add r0, r5, #0x0
bl MOD06_0224A528
bl ov06_0224A528
_0205C450:
mov r0, #0x0
strh r0, [r7, #0x2]
_0205C454:
add r0, r5, #0x0
str r6, [r4, #0x4]
bl MOD05_021F2E28
bl ov05_021F2E28
cmp r0, #0x1
beq _0205C488
ldr r1, [r4, #0x8]
cmp r1, #0x0
beq _0205C488
add r0, r5, #0x0
bl MOD05_021F2F48
bl ov05_021F2F48
add r0, r5, #0x0
bl MOD05_021F1DFC
bl ov05_021F1DFC
cmp r0, #0x0
bne _0205C480
mov r1, #0x1
@ -175,7 +175,7 @@ _0205C454:
_0205C480:
ldr r1, [r4, #0x8]
add r0, r5, #0x0
bl MOD05_021F2F6C
bl ov05_021F2F6C
_0205C488:
pop {r3-r7, pc}
nop
@ -191,7 +191,7 @@ sub_0205C490: ; 0x0205C490
ldr r2, [r2, #0x0]
add r0, r4, #0x0
add r1, #0x8
bl MOD05_021F2094
bl ov05_021F2094
pop {r4, pc}
thumb_func_start sub_0205C4A8
@ -205,13 +205,13 @@ sub_0205C4A8: ; 0x0205C4A8
beq _0205C4C0
add r1, r4, #0x0
add r1, #0xc
bl MOD05_021F20D8
bl ov05_021F20D8
_0205C4C0:
add r1, r4, #0x0
ldr r2, [r4, #0x0]
add r0, r5, #0x0
add r1, #0x8
bl MOD05_021F2094
bl ov05_021F2094
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0x14
@ -225,7 +225,7 @@ sub_0205C4D8: ; 0x0205C4D8
bl sub_02058628
add r4, r0, #0x0
add r0, r5, #0x0
bl MOD05_021F2E28
bl ov05_021F2E28
cmp r0, #0x1
beq _0205C536
ldr r0, [r4, #0x8]
@ -238,7 +238,7 @@ sub_0205C4D8: ; 0x0205C4D8
add r1, r4, #0x0
add r0, r5, #0x0
add r1, #0x8
bl MOD05_021F1F78
bl ov05_021F1F78
b _0205C510
_0205C506:
mov r1, #0x2
@ -247,17 +247,17 @@ _0205C506:
bl sub_02058418
_0205C510:
add r0, r5, #0x0
bl MOD06_0224A310
bl ov06_0224A310
_0205C516:
ldr r0, [r4, #0x8]
cmp r0, #0x0
beq _0205C536
add r1, r4, #0x0
add r1, #0xc
bl MOD05_021F20F8
bl ov05_021F20F8
ldr r1, [r4, #0x8]
add r0, r5, #0x0
bl MOD05_021F2F48
bl ov05_021F2F48
mov r1, #0x2
add r0, r5, #0x0
lsl r1, r1, #0x14
@ -284,7 +284,7 @@ _0205C54C:
_0205C550:
sub r2, r0, #0x1
mov r0, #0xc
ldr r3, _0205C594 ; =UNK05_021F9194
ldr r3, _0205C594 ; =ov05_021F9194
mul r0, r2
add r2, r3, r0
cmp r1, #0x5
@ -321,4 +321,4 @@ _0205C588:
pop {r3, pc}
.balign 4
_0205C590: .word 0x0000FFFF
_0205C594: .word UNK05_021F9194
_0205C594: .word ov05_021F9194

6
arm9/asm/unk_0205C598.s
View File

@ -775,7 +775,7 @@ sub_0205CB30: ; 0x0205CB30
_0205CB44:
ldr r0, [r4, #0x24]
ldr r1, [r4, #0x8]
bl MOD05_021F1EC0
bl ov05_021F1EC0
add r0, r5, #0x0
mov r1, #0x40
bl sub_02058410
@ -877,7 +877,7 @@ sub_0205CBF8: ; 0x0205CBF8
mov r1, #0x0
ldr r0, [r4, #0x24]
add r2, r1, #0x0
bl MOD05_021E7AC0
bl ov05_021E7AC0
str r0, [r4, #0x20]
mov r0, #0x6
str r0, [r4, #0x0]
@ -889,7 +889,7 @@ sub_0205CC10: ; 0x0205CC10
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x20]
bl MOD05_021E799C
bl ov05_021E799C
cmp r0, #0x1
bne _0205CC28
ldr r0, [r4, #0x20]

12
arm9/asm/unk_0205CDB4.s
View File

@ -5,18 +5,18 @@
.global UNK_020F7200
UNK_020F7200: ; 0x020F7200
.word 0x00000000, 0x00000000, 0x00000000, MOD06_02242444
.word MOD06_02242698, MOD06_022429B0, 0x00000000, 0x00000000
.word 0x00000000, 0x00000000, 0x00000000, ov06_02242444
.word ov06_02242698, ov06_022429B0, 0x00000000, 0x00000000
.global UNK_020F7220
UNK_020F7220: ; 0x020F7220
.word 0x00000000, MOD06_02241670, MOD06_0224186C, MOD06_02242224
.word MOD06_022425C8, MOD06_022428D8, MOD06_022451F4, sub_020647A4
.word 0x00000000, ov06_02241670, ov06_0224186C, ov06_02242224
.word ov06_022425C8, ov06_022428D8, ov06_022451F4, sub_020647A4
.global UNK_020F7240
UNK_020F7240: ; 0x020F7240
.word 0x00000000, MOD06_022412F4, 0x00000000, MOD06_02242458
.word MOD06_022426F4, MOD06_022429C4, 0x00000000, 0x00000000
.word 0x00000000, ov06_022412F4, 0x00000000, ov06_02242458
.word ov06_022426F4, ov06_022429C4, 0x00000000, 0x00000000
.text

50
arm9/asm/unk_0205CE48.s
View File

@ -1128,7 +1128,7 @@ sub_0205D6BC: ; 0x0205D6BC
add r4, r0, #0x0
add r0, r6, #0x0
bl sub_0204649C
bl MOD05_021F57EC
bl ov05_021F57EC
str r0, [sp, #0x0]
ldr r1, [sp, #0x0]
mov r0, #0xb
@ -1138,7 +1138,7 @@ sub_0205D6BC: ; 0x0205D6BC
add r7, r0, #0x0
bl memset
mov r0, #0x72
ldr r1, _0205D710 ; =MOD05_021F57F0
ldr r1, _0205D710 ; =ov05_021F57F0
lsl r0, r0, #0x2
str r1, [r4, r0]
add r0, #0x30
@ -1153,7 +1153,7 @@ sub_0205D6BC: ; 0x0205D6BC
bl Bag_TakeItem
pop {r3-r7, pc}
.balign 4
_0205D710: .word MOD05_021F57F0
_0205D710: .word ov05_021F57F0
thumb_func_start sub_0205D714
sub_0205D714: ; 0x0205D714
@ -1202,13 +1202,13 @@ sub_0205D74C: ; 0x0205D74C
add r0, r5, #0x0
bl sub_0204649C
mov r0, #0x72
ldr r1, _0205D784 ; =MOD05_021F5C70
ldr r1, _0205D784 ; =ov05_021F5C70
lsl r0, r0, #0x2
str r1, [r4, r0]
add r0, r5, #0x0
mov r1, #0xb
mov r2, #0x0
bl MOD05_021F5C44
bl ov05_021F5C44
mov r1, #0x7e
lsl r1, r1, #0x2
str r0, [r4, r1]
@ -1216,7 +1216,7 @@ sub_0205D74C: ; 0x0205D74C
strh r0, [r4, #0x2a]
pop {r3-r5, pc}
.balign 4
_0205D784: .word MOD05_021F5C70
_0205D784: .word ov05_021F5C70
thumb_func_start sub_0205D788
sub_0205D788: ; 0x0205D788
@ -1225,15 +1225,15 @@ sub_0205D788: ; 0x0205D788
ldr r0, [r4, #0x0]
mov r1, #0x4
mov r2, #0x0
bl MOD05_021F5C44
bl ov05_021F5C44
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D7A4 ; =MOD05_021F5C70
ldr r1, _0205D7A4 ; =ov05_021F5C70
bl sub_020463CC
mov r0, #0x0
pop {r4, pc}
.balign 4
_0205D7A4: .word MOD05_021F5C70
_0205D7A4: .word ov05_021F5C70
thumb_func_start sub_0205D7A8
sub_0205D7A8: ; 0x0205D7A8
@ -1248,13 +1248,13 @@ sub_0205D7A8: ; 0x0205D7A8
add r0, r5, #0x0
bl sub_0204649C
mov r0, #0x72
ldr r1, _0205D7E0 ; =MOD05_021F5C70
ldr r1, _0205D7E0 ; =ov05_021F5C70
lsl r0, r0, #0x2
str r1, [r4, r0]
add r0, r5, #0x0
mov r1, #0xb
mov r2, #0x1
bl MOD05_021F5C44
bl ov05_021F5C44
mov r1, #0x7e
lsl r1, r1, #0x2
str r0, [r4, r1]
@ -1262,7 +1262,7 @@ sub_0205D7A8: ; 0x0205D7A8
strh r0, [r4, #0x2a]
pop {r3-r5, pc}
.balign 4
_0205D7E0: .word MOD05_021F5C70
_0205D7E0: .word ov05_021F5C70
thumb_func_start sub_0205D7E4
sub_0205D7E4: ; 0x0205D7E4
@ -1271,15 +1271,15 @@ sub_0205D7E4: ; 0x0205D7E4
ldr r0, [r4, #0x0]
mov r1, #0x4
mov r2, #0x1
bl MOD05_021F5C44
bl ov05_021F5C44
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D800 ; =MOD05_021F5C70
ldr r1, _0205D800 ; =ov05_021F5C70
bl sub_020463CC
mov r0, #0x0
pop {r4, pc}
.balign 4
_0205D800: .word MOD05_021F5C70
_0205D800: .word ov05_021F5C70
thumb_func_start sub_0205D804
sub_0205D804: ; 0x0205D804
@ -1294,13 +1294,13 @@ sub_0205D804: ; 0x0205D804
add r0, r5, #0x0
bl sub_0204649C
mov r0, #0x72
ldr r1, _0205D83C ; =MOD05_021F5C70
ldr r1, _0205D83C ; =ov05_021F5C70
lsl r0, r0, #0x2
str r1, [r4, r0]
add r0, r5, #0x0
mov r1, #0xb
mov r2, #0x2
bl MOD05_021F5C44
bl ov05_021F5C44
mov r1, #0x7e
lsl r1, r1, #0x2
str r0, [r4, r1]
@ -1308,7 +1308,7 @@ sub_0205D804: ; 0x0205D804
strh r0, [r4, #0x2a]
pop {r3-r5, pc}
.balign 4
_0205D83C: .word MOD05_021F5C70
_0205D83C: .word ov05_021F5C70
thumb_func_start sub_0205D840
sub_0205D840: ; 0x0205D840
@ -1317,15 +1317,15 @@ sub_0205D840: ; 0x0205D840
ldr r0, [r4, #0x0]
mov r1, #0x4
mov r2, #0x2
bl MOD05_021F5C44
bl ov05_021F5C44
add r2, r0, #0x0
ldr r0, [r4, #0x0]
ldr r1, _0205D85C ; =MOD05_021F5C70
ldr r1, _0205D85C ; =ov05_021F5C70
bl sub_020463CC
mov r0, #0x0
pop {r4, pc}
.balign 4
_0205D85C: .word MOD05_021F5C70
_0205D85C: .word ov05_021F5C70
thumb_func_start sub_0205D860
sub_0205D860: ; 0x0205D860
@ -1611,7 +1611,7 @@ sub_0205DAAC: ; 0x0205DAAC
add r4, r0, #0x0
bl sub_02046528
mov r1, #0xb
bl MOD06_0224C700
bl ov06_0224C700
add r2, r0, #0x0
ldr r1, _0205DAC8 ; =0x0224C721
add r0, r4, #0x0
@ -1619,7 +1619,7 @@ sub_0205DAAC: ; 0x0205DAAC
mov r0, #0x0
pop {r4, pc}
.balign 4
_0205DAC8: .word MOD06_0224C720
_0205DAC8: .word ov06_0224C720
thumb_func_start sub_0205DACC
sub_0205DACC: ; 0x0205DACC
@ -1831,7 +1831,7 @@ _0205DC68:
ldr r0, [r5, #0x34]
bl sub_02058780
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x1
add r4, #0x2a
strb r0, [r4, #0x0]
@ -1879,7 +1879,7 @@ _0205DCC4:
ldr r0, [r5, #0x34]
bl sub_02058780
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x4
add r4, #0x2a
strb r0, [r4, #0x0]

10
arm9/asm/unk_0205DD18.s
View File

@ -318,7 +318,7 @@ _0205DF4C:
beq _0205DF6E
add r0, r5, #0x0
mov r3, #0x2
bl MOD06_0224B818
bl ov06_0224B818
str r0, [r4, #0x34]
b _0205DF90
_0205DF6E:
@ -327,13 +327,13 @@ _0205DF6E:
bne _0205DF80
add r0, r5, #0x0
mov r3, #0x0
bl MOD06_0224B818
bl ov06_0224B818
str r0, [r4, #0x34]
b _0205DF90
_0205DF80:
add r0, r5, #0x0
mov r3, #0x1
bl MOD06_0224B818
bl ov06_0224B818
str r0, [r4, #0x34]
b _0205DF90
_0205DF8C:
@ -360,7 +360,7 @@ _0205DFA4:
ldr r0, [r5, #0x34]
cmp r0, #0x0
beq _0205DFCA
bl MOD06_0224B86C
bl ov06_0224B86C
cmp r0, #0x0
beq _0205DFD0
ldr r0, [r5, #0x34]
@ -700,7 +700,7 @@ sub_0205E1F0: ; 0x0205E1F0
ldr r2, [r5, #0x8]
lsl r1, r1, #0x2
strh r2, [r4, r1]
bl MOD06_02245844
bl ov06_02245844
add r0, r5, #0x0
add r0, #0xd0
ldrb r0, [r0, #0x0]

6
arm9/asm/unk_0205E4EC.s
View File

@ -744,7 +744,7 @@ sub_0205EA64: ; 0x0205EA64
bl sub_0205EB20
cmp r0, #0x0
beq _0205EA72
bl MOD05_021E4DE4
bl ov05_021E4DE4
_0205EA72:
pop {r3, pc}
@ -787,7 +787,7 @@ sub_0205EAB0: ; 0x0205EAB0
cmp r1, #0x0
bne _0205EACA
ldrb r1, [r4, #0x1]
bl MOD06_0224CECC
bl ov06_0224CECC
add r1, r0, #0x0
add r0, r5, #0x0
bl sub_0205EB14
@ -819,7 +819,7 @@ sub_0205EAE0: ; 0x0205EAE0
bne _0205EB0E
ldrb r1, [r4, #0x1]
add r0, r5, #0x0
bl MOD06_0224CECC
bl ov06_0224CECC
add r1, r0, #0x0
add r0, r5, #0x0
bl sub_0205EB14

14
arm9/asm/unk_0205EB38.s
View File

@ -46,7 +46,7 @@ sub_0205EB38: ; 0x0205EB38
add r1, sp, #0xc
mov r2, #0x2
mov r3, #0xb
bl MOD05_021D959C
bl ov05_021D959C
mov r0, #0x2
str r0, [sp, #0x0]
mov r0, #0x1
@ -57,21 +57,21 @@ sub_0205EB38: ; 0x0205EB38
add r0, r7, #0x0
mov r1, #0x55
add r3, r2, #0x0
bl MOD05_021D967C
bl ov05_021D967C
ldr r0, _0205EBE4 ; =0x000034D8
mov r1, #0x55
str r0, [sp, #0x0]
add r0, r7, #0x0
mov r2, #0x2
mov r3, #0x0
bl MOD05_021D96F4
bl ov05_021D96F4
ldr r0, _0205EBE4 ; =0x000034D8
mov r1, #0x55
str r0, [sp, #0x0]
add r0, r7, #0x0
mov r2, #0x3
mov r3, #0x0
bl MOD05_021D9708
bl ov05_021D9708
mov r2, #0x1
ldr r0, _0205EBE4 ; =0x000034D8
str r2, [sp, #0x0]
@ -79,14 +79,14 @@ sub_0205EB38: ; 0x0205EB38
add r0, r7, #0x0
mov r1, #0x55
mov r3, #0x0
bl MOD05_021D971C
bl ov05_021D971C
ldr r4, _0205EBE8 ; =UNK_020F73C8
mov r6, #0x0
add r5, r7, #0x0
_0205EBC0:
add r0, r7, #0x0
add r1, r4, #0x0
bl MOD05_021D9820
bl ov05_021D9820
mov r1, #0x59
lsl r1, r1, #0x2
str r0, [r5, r1]
@ -122,7 +122,7 @@ _0205EC02:
cmp r4, #0x2
blt _0205EBF8
add r0, r7, #0x0
bl MOD05_021D99F8
bl ov05_021D99F8
add r0, r7, #0x0
bl FreeToHeap
pop {r3-r7, pc}

6
arm9/asm/unk_020606B0.s
View File

@ -5,7 +5,7 @@
.global UNK_020F7630
UNK_020F7630: ; 0x020F7630
.word MOD81_02237E40, MOD81_02238064, MOD81_02238004, SDK_OVERLAY_MODULE_81_ID
.word ov81_02237E40, ov81_02238064, ov81_02238004, SDK_OVERLAY_OVERLAY_81_ID
.text
@ -62,11 +62,11 @@ _02060704:
ldr r1, [r4, #0x0]
ldr r2, [r4, #0x8]
add r0, r6, #0x0
bl MOD06_0224891C
bl ov06_0224891C
ldr r1, [r4, #0x0]
ldr r2, [r4, #0x8]
add r0, r6, #0x0
bl MOD06_022488FC
bl ov06_022488FC
ldr r0, [r4, #0x4]
add r0, r0, #0x1
str r0, [r4, #0x4]

24
arm9/asm/unk_020607D4.s
View File

@ -292,23 +292,23 @@ _020609EC:
ldr r0, [r5, #0x50]
mov r1, #0x1
mov r2, #0x0
bl MOD05_021DA4EC
bl ov05_021DA4EC
ldr r0, [r5, #0x50]
mov r1, #0x2
mov r2, #0x0
bl MOD05_021DA4EC
bl ov05_021DA4EC
ldr r0, _02060B08 ; =0x000006DE
bl PlaySE
b _02060B00
_02060A2C:
ldr r0, [r5, #0x50]
mov r1, #0x1
bl MOD05_021DA58C
bl ov05_021DA58C
cmp r0, #0x0
beq _02060B00
ldr r0, [r5, #0x50]
mov r1, #0x2
bl MOD05_021DA58C
bl ov05_021DA58C
cmp r0, #0x0
beq _02060B00
cmp r6, #0x0
@ -354,11 +354,11 @@ _02060A8A:
ldr r0, [r5, #0x4c]
ldr r1, [r5, #0x50]
mov r2, #0x1
bl MOD05_021DA54C
bl ov05_021DA54C
ldr r0, [r5, #0x4c]
ldr r1, [r5, #0x50]
mov r2, #0x2
bl MOD05_021DA54C
bl ov05_021DA54C
_02060AA8:
add r0, r6, #0x0
bl sub_0204AF3C
@ -416,7 +416,7 @@ sub_02060B0C: ; 0x02060B0C
add r4, r0, #0x0
ldr r1, [r4, #0x30]
add r0, sp, #0x0
bl MOD05_021E7EA0
bl ov05_021E7EA0
ldrb r0, [r4, #0x1]
cmp r0, #0x3
bhi _02060B7C
@ -496,7 +496,7 @@ _02060B86:
_02060BA6:
ldr r0, [r4, #0x30]
add r1, sp, #0x0
bl MOD05_021E7EB0
bl ov05_021E7EB0
ldr r1, [r4, #0x14]
ldr r0, [r4, #0x7c]
add r1, r1, r0
@ -554,7 +554,7 @@ _02060BF6:
beq _02060C6A
ldr r1, [r5, #0x2c]
add r0, r4, #0x0
bl MOD05_021F4BD0
bl ov05_021F4BD0
ldr r0, [r0, #0x0]
bl NNS_G3dGetMdlSet
ldrh r1, [r0, #0xe]
@ -572,10 +572,10 @@ _02060BF6:
bl GF_AssertFail
_02060C38:
ldr r0, [sp, #0x20]
bl MOD05_021E7EC8
bl ov05_021E7EC8
str r0, [sp, #0x1c]
ldr r0, [r5, #0x2c]
bl MOD05_021F4C88
bl ov05_021F4C88
ldr r1, [sp, #0x1c]
add r2, sp, #0x24
str r1, [sp, #0x0]
@ -591,7 +591,7 @@ _02060C38:
ldr r0, [r5, #0x4c]
ldr r1, [r5, #0x50]
add r3, r4, #0x0
bl MOD05_021DA464
bl ov05_021DA464
b _02060C6E
_02060C6A:
bl GF_AssertFail

96
arm9/asm/unk_02060CCC.s
View File

@ -175,7 +175,7 @@ sub_02060CF8: ; 0x02060CF8
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B6C
bl ov06_02248B6C
add r4, r0, #0x0
cmp r4, #0x0
ble _02060D0E
@ -291,13 +291,13 @@ sub_02060DCC: ; 0x02060DCC
add r5, r0, #0x0
add r0, r6, #0x0
add r4, r1, #0x0
bl MOD06_02248B5C
bl ov06_02248B5C
add r7, r0, #0x0
add r0, r6, #0x0
bl MOD06_02248B54
bl ov06_02248B54
str r0, [sp, #0x8]
add r0, r6, #0x0
bl MOD06_02248B58
bl ov06_02248B58
str r0, [sp, #0x0]
mov r0, #0x1
str r0, [sp, #0x4]
@ -715,7 +715,7 @@ sub_020610F8: ; 0x020610F8
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldrb r0, [r4, #0xb]
cmp r0, #0x0
@ -797,7 +797,7 @@ sub_020611A8: ; 0x020611A8
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -831,7 +831,7 @@ sub_020611E8: ; 0x020611E8
bl Save_Pokedex_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r1, r0, #0x0
ldrh r1, [r1, #0x6]
add r0, r4, #0x0
@ -874,7 +874,7 @@ sub_0206123C: ; 0x0206123C
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -910,7 +910,7 @@ sub_02061288: ; 0x02061288
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r4, #0x8]
cmp r0, #0x0
@ -977,10 +977,10 @@ sub_02061304: ; 0x02061304
add r4, r2, #0x0
add r0, r4, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r6, r0, #0x0
add r0, r4, #0x0
bl MOD06_02248B58
bl ov06_02248B58
str r0, [sp, #0x0]
mov r1, #0x1
add r0, r5, #0x0
@ -1004,10 +1004,10 @@ sub_0206133C: ; 0x0206133C
add r4, r2, #0x0
add r0, r4, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r6, r0, #0x0
add r0, r4, #0x0
bl MOD06_02248B58
bl ov06_02248B58
str r0, [sp, #0x0]
mov r1, #0x1
add r0, r5, #0x0
@ -1051,7 +1051,7 @@ sub_0206139C: ; 0x0206139C
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldrh r2, [r4, #0x2]
add r0, r5, #0x0
@ -1103,7 +1103,7 @@ sub_02061404: ; 0x02061404
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldrh r2, [r4, #0x6]
add r0, r5, #0x0
@ -1132,7 +1132,7 @@ sub_02061444: ; 0x02061444
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -1176,7 +1176,7 @@ sub_02061498: ; 0x02061498
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1224,7 +1224,7 @@ sub_020614FC: ; 0x020614FC
bl Save_Pokedex_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r1, r0, #0x0
ldrh r1, [r1, #0x0]
add r0, r4, #0x0
@ -1253,7 +1253,7 @@ sub_02061534: ; 0x02061534
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1315,7 +1315,7 @@ sub_020615B0: ; 0x020615B0
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1351,7 +1351,7 @@ sub_020615F8: ; 0x020615F8
bl Save_Pokedex_Get
add r4, r0, #0x0
add r0, r5, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r1, r0, #0x0
ldrh r1, [r1, #0x0]
add r0, r4, #0x0
@ -1391,7 +1391,7 @@ sub_02061648: ; 0x02061648
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1420,7 +1420,7 @@ sub_02061688: ; 0x02061688
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -1473,7 +1473,7 @@ sub_020616E8: ; 0x020616E8
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1503,7 +1503,7 @@ sub_02061728: ; 0x02061728
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1524,7 +1524,7 @@ sub_02061750: ; 0x02061750
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1589,7 +1589,7 @@ sub_020617D8: ; 0x020617D8
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1629,7 +1629,7 @@ sub_02061834: ; 0x02061834
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -1657,7 +1657,7 @@ sub_02061868: ; 0x02061868
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
bl PlayerProfile_sizeof
ldr r1, [r4, #0x0]
@ -1771,7 +1771,7 @@ sub_0206193C: ; 0x0206193C
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1811,7 +1811,7 @@ sub_02061990: ; 0x02061990
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -1861,7 +1861,7 @@ sub_020619F0: ; 0x020619F0
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -1917,7 +1917,7 @@ sub_02061A70: ; 0x02061A70
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -1954,7 +1954,7 @@ sub_02061AB0: ; 0x02061AB0
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -2012,7 +2012,7 @@ sub_02061B24: ; 0x02061B24
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -2060,7 +2060,7 @@ sub_02061B80: ; 0x02061B80
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -2125,7 +2125,7 @@ sub_02061C00: ; 0x02061C00
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
mov r1, #0x0
add r4, r0, #0x0
str r1, [sp, #0x0]
@ -2208,7 +2208,7 @@ sub_02061CA8: ; 0x02061CA8
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldrb r0, [r4, #0x5]
cmp r0, #0x0
@ -2270,7 +2270,7 @@ sub_02061D30: ; 0x02061D30
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -2287,7 +2287,7 @@ sub_02061D4C: ; 0x02061D4C
ldr r0, [r5, #0x4]
add r4, r1, #0x0
ldr r0, [r0, #0x14]
bl MOD20_02252538
bl ov20_02252538
str r0, [sp, #0x0]
add r0, sp, #0x0
strh r4, [r0, #0x4]
@ -2306,7 +2306,7 @@ sub_02061D74: ; 0x02061D74
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -2362,7 +2362,7 @@ sub_02061DE4: ; 0x02061DE4
add r6, r2, #0x0
add r0, r6, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldrb r0, [r4, #0x5]
mov r1, #0x0
@ -2417,7 +2417,7 @@ sub_02061E60: ; 0x02061E60
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -2455,7 +2455,7 @@ sub_02061EAC: ; 0x02061EAC
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -2477,7 +2477,7 @@ sub_02061EDC: ; 0x02061EDC
push {r3-r5, lr}
add r5, r0, #0x0
add r0, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
ldr r0, [r5, #0xc]
bl Save_Pokedex_Get
@ -2504,7 +2504,7 @@ sub_02061F0C: ; 0x02061F0C
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0
@ -2547,7 +2547,7 @@ sub_02061F60: ; 0x02061F60
add r7, r2, #0x0
add r0, r7, #0x0
add r5, r1, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r6, r0, #0x0
ldrb r4, [r6, #0x1]
add r0, r5, #0x0
@ -2630,7 +2630,7 @@ sub_02061FF8: ; 0x02061FF8
add r6, r2, #0x0
add r5, r1, #0x0
add r0, r6, #0x0
bl MOD06_02248B60
bl ov06_02248B60
add r4, r0, #0x0
add r0, r5, #0x0
mov r1, #0x0

14
arm9/asm/unk_020625EC.s
View File

@ -1255,7 +1255,7 @@ sub_02062F3C: ; 0x02062F3C
ldr r3, [r6, #0x0]
add r0, r6, r0
mov r2, #0x2
bl MOD05_021D959C
bl ov05_021D959C
mov r0, #0x3
str r0, [sp, #0x0]
mov r0, #0x1
@ -1268,7 +1268,7 @@ sub_02062F3C: ; 0x02062F3C
add r0, r6, r0
mov r1, #0x82
add r3, r2, #0x0
bl MOD05_021D967C
bl ov05_021D967C
ldr r0, _02062FF4 ; =0x000034D8
mov r1, #0x82
str r0, [sp, #0x0]
@ -1277,7 +1277,7 @@ sub_02062F3C: ; 0x02062F3C
add r0, r6, r0
mov r2, #0x2
mov r3, #0x0
bl MOD05_021D96F4
bl ov05_021D96F4
ldr r0, _02062FF4 ; =0x000034D8
mov r1, #0x82
str r0, [sp, #0x0]
@ -1286,7 +1286,7 @@ sub_02062F3C: ; 0x02062F3C
add r0, r6, r0
mov r2, #0x3
mov r3, #0x0
bl MOD05_021D9708
bl ov05_021D9708
mov r2, #0x1
ldr r0, _02062FF4 ; =0x000034D8
str r2, [sp, #0x0]
@ -1296,7 +1296,7 @@ sub_02062F3C: ; 0x02062F3C
add r0, r6, r0
mov r1, #0x82
mov r3, #0x0
bl MOD05_021D971C
bl ov05_021D971C
ldr r4, _02062FF8 ; =UNK_020F7C7C
mov r7, #0x0
add r5, r6, #0x0
@ -1305,7 +1305,7 @@ _02062FC4:
lsl r0, r0, #0x2
add r0, r6, r0
add r1, r4, #0x0
bl MOD05_021D9820
bl ov05_021D9820
mov r1, #0xa6
lsl r1, r1, #0x2
str r0, [r5, r1]
@ -1346,7 +1346,7 @@ _02063012:
mov r0, #0x4d
lsl r0, r0, #0x2
add r0, r7, r0
bl MOD05_021D99F8
bl ov05_021D99F8
pop {r3-r7, pc}
.balign 4

6
arm9/asm/unk_02063888.s
View File

@ -55,7 +55,7 @@ _020638DA:
ldr r0, [r4, #0x0]
ldr r2, [r4, #0x10]
mov r1, #0x1
bl MOD06_0224666C
bl ov06_0224666C
str r0, [r4, #0x14]
ldr r0, [r4, #0x4]
add r0, r0, #0x1
@ -63,11 +63,11 @@ _020638DA:
b _02063942
_020638F8:
ldr r0, [r4, #0x14]
bl MOD06_022466A0
bl ov06_022466A0
cmp r0, #0x0
beq _02063942
ldr r0, [r4, #0x14]
bl MOD06_022466AC
bl ov06_022466AC
mov r1, #0xa
mov r2, #0xc
ldrh r0, [r4, #0x8]

20
arm9/asm/unk_02063948.s
View File

@ -106,7 +106,7 @@ _020639B6:
ldr r0, [r5, #0x38]
add r1, r7, #0x0
add r2, r6, #0x0
bl MOD05_021E643C
bl ov05_021E643C
cmp r0, #0x0
beq _020639FE
ldrh r1, [r4, #0xc]
@ -118,7 +118,7 @@ _020639FE:
bl PlayerAvatar_GetFacingDirection
add r1, r0, #0x0
add r0, r6, #0x0
bl MOD05_021E69BC
bl ov05_021E69BC
cmp r0, #0x0
beq _02063A18
ldrh r1, [r4, #0xc]
@ -1099,18 +1099,18 @@ sub_02064174: ; 0x02064174
ldr r1, [r4, #0x0]
add r0, r6, #0x0
mov r2, #0x4
bl MOD06_0224CB30
bl ov06_0224CB30
add r6, r0, #0x0
add r0, r4, #0x0
bl FreeToHeap
ldr r1, _020641A8 ; =MOD06_0224CB54
ldr r1, _020641A8 ; =ov06_0224CB54
add r0, r5, #0x0
add r2, r6, #0x0
bl sub_020463EC
mov r0, #0x0
pop {r4-r6, pc}
nop
_020641A8: .word MOD06_0224CB54
_020641A8: .word ov06_0224CB54
thumb_func_start sub_020641AC
sub_020641AC: ; 0x020641AC
@ -1191,7 +1191,7 @@ sub_02064230: ; 0x02064230
ldr r1, [r6, #0x0]
add r0, r4, #0x0
mov r2, #0xb
bl MOD06_0224CA88
bl ov06_0224CA88
ldr r1, [r4, #0x1c]
add r7, r0, #0x0
ldr r1, [r1, #0x0]
@ -1207,14 +1207,14 @@ sub_02064230: ; 0x02064230
bl sub_02028AD4
add r0, r6, #0x0
bl FreeToHeap
ldr r1, _02064280 ; =MOD06_0224CAAC
ldr r1, _02064280 ; =ov06_0224CAAC
add r0, r5, #0x0
add r2, r7, #0x0
bl sub_020463EC
mov r0, #0x0
pop {r3-r7, pc}
nop
_02064280: .word MOD06_0224CAAC
_02064280: .word ov06_0224CAAC
thumb_func_start sub_02064284
sub_02064284: ; 0x02064284
@ -1265,7 +1265,7 @@ sub_020642B4: ; 0x020642B4
add r0, r5, #0x0
bl sub_0204649C
mov r0, #0x72
ldr r1, _0206430C ; =MOD05_021F6360
ldr r1, _0206430C ; =ov05_021F6360
lsl r0, r0, #0x2
str r1, [r4, r0]
add r0, #0x30
@ -1286,7 +1286,7 @@ sub_020642B4: ; 0x020642B4
bl sub_02028AD4
pop {r4-r6, pc}
.balign 4
_0206430C: .word MOD05_021F6360
_0206430C: .word ov05_021F6360
thumb_func_start sub_02064310
sub_02064310: ; 0x02064310

26
arm9/asm/unk_020647A4.s
View File

@ -82,12 +82,12 @@ sub_020647A4: ; 0x020647A4
ldr r0, [r0, #0x0]
ldr r1, [r4, #0x2c]
mov r3, r12
bl MOD05_021E7FBC
bl ov05_021E7FBC
add r0, r4, #0x0
add r0, #0xa0
ldr r0, [r0, #0x0]
ldr r1, _02064864 ; =0x00000102
bl MOD05_021E7ED8
bl ov05_021E7ED8
str r0, [sp, #0x14]
b _0206482C
_0206480A:
@ -109,11 +109,11 @@ _0206480A:
_0206482C:
ldr r1, [sp, #0x14]
add r0, sp, #0x18
bl MOD05_021E7EA0
bl ov05_021E7EA0
ldr r0, [sp, #0x14]
add r1, sp, #0x18
str r5, [sp, #0x1c]
bl MOD05_021E7EB0
bl ov05_021E7EB0
mov r0, #0x2
str r0, [sp, #0x0]
str r5, [sp, #0x4]
@ -124,7 +124,7 @@ _0206482C:
ldr r1, [r6, #0x8]
ldr r2, [r6, #0xc]
mov r0, #0x0
bl MOD05_021F44D8
bl ov05_021F44D8
add sp, #0x30
pop {r3-r7, pc}
nop
@ -456,7 +456,7 @@ _02064AB4:
add r0, #0xa0
ldr r0, [r0, #0x0]
ldr r1, _02064B64 ; =0x00000102
bl MOD05_021E7ED8
bl ov05_021E7ED8
str r0, [sp, #0xc]
b _02064AEC
_02064ACA:
@ -478,7 +478,7 @@ _02064ACA:
_02064AEC:
ldr r1, [sp, #0xc]
add r0, sp, #0x10
bl MOD05_021E7EA0
bl ov05_021E7EA0
ldr r0, [r4, #0xc]
cmp r0, #0x0
bne _02064AFE
@ -506,7 +506,7 @@ _02064B1C:
bl sub_02055540
ldr r0, [sp, #0xc]
add r1, sp, #0x10
bl MOD05_021E7EB0
bl ov05_021E7EB0
b _02064B5C
_02064B2E:
add r2, r5, #0x0
@ -514,7 +514,7 @@ _02064B2E:
ldr r1, [r4, #0x4]
ldr r2, [r2, #0x0]
mov r0, #0x0
bl MOD05_021F4594
bl ov05_021F4594
ldr r0, [r5, #0x38]
mov r1, #0x1
bl sub_0205557C
@ -580,7 +580,7 @@ _02064BB4:
add r0, #0xa0
ldr r0, [r0, #0x0]
ldr r1, _02064C58 ; =0x00000102
bl MOD05_021E7ED8
bl ov05_021E7ED8
str r0, [sp, #0xc]
b _02064BEC
_02064BCA:
@ -602,7 +602,7 @@ _02064BCA:
_02064BEC:
ldr r1, [sp, #0xc]
add r0, sp, #0x10
bl MOD05_021E7EA0
bl ov05_021E7EA0
mov r0, #0x1
ldr r1, [sp, #0x14]
lsl r0, r0, #0xc
@ -623,7 +623,7 @@ _02064C12:
bl sub_02055540
ldr r0, [sp, #0xc]
add r1, sp, #0x10
bl MOD05_021E7EB0
bl ov05_021E7EB0
b _02064C52
_02064C24:
add r2, r5, #0x0
@ -631,7 +631,7 @@ _02064C24:
ldr r1, [r4, #0x4]
ldr r2, [r2, #0x0]
mov r0, #0x0
bl MOD05_021F4594
bl ov05_021F4594
ldr r0, [r5, #0x38]
mov r1, #0x1
bl sub_0205557C

8
arm9/asm/unk_020653EC.s
View File

@ -2301,12 +2301,12 @@ _020665E6:
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x5a
bl MOD06_0224C678
bl ov06_0224C678
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r4, r0]
mov r1, #0x5a
bl MOD06_0224C6E8
bl ov06_0224C6E8
ldrh r0, [r4, #0x12]
add r0, r0, #0x1
strh r0, [r4, #0x12]
@ -2317,7 +2317,7 @@ _02066614:
ldr r0, [r4, r0]
mov r1, #0x5a
ldr r0, [r0, #0x50]
bl MOD05_021DA58C
bl ov05_021DA58C
cmp r0, #0x0
beq _0206662E
mov r0, #0x0
@ -2338,7 +2338,7 @@ sub_02066634: ; 0x02066634
add r4, r1, #0x0
ldr r0, [r5, r0]
mov r1, #0x5a
bl MOD05_021DAF98
bl ov05_021DAF98
cmp r4, #0x0
bne _02066652
add r0, r5, #0x0

40
arm9/asm/unk_0206BF90.s
View File

@ -40,10 +40,10 @@ sub_0206BF90: ; 0x0206BF90
strb r0, [r6, #0x4]
add r0, r5, #0x0
add r1, r4, #0x4
bl MOD11_02231344
bl ov11_02231344
add r0, r5, #0x0
add r1, r6, #0x4
bl MOD11_02231350
bl ov11_02231350
ldr r0, _0206BFE8 ; =sub_0206C550
add r1, r4, #0x0
mov r2, #0x0
@ -226,13 +226,13 @@ sub_0206C0C8: ; 0x0206C0C8
bl AllocFromHeap
add r6, r0, #0x0
ldr r0, [sp, #0x0]
bl MOD11_022300D4
bl ov11_022300D4
add r5, r0, #0x0
ldr r0, [sp, #0x0]
bl MOD11_022300F4
bl ov11_022300F4
add r4, r0, #0x0
ldr r0, [sp, #0x0]
bl MOD11_02230100
bl ov11_02230100
mov r12, r0
add r0, sp, #0x10
ldrh r3, [r4, #0x0]
@ -292,13 +292,13 @@ sub_0206C154: ; 0x0206C154
add r0, r3, #0x0
add r5, r1, #0x0
add r6, r2, #0x0
bl MOD11_022300DC
bl ov11_022300DC
add r7, r0, #0x0
ldr r0, [sp, #0x0]
bl MOD11_02230118
bl ov11_02230118
add r4, r0, #0x0
ldr r0, [sp, #0x0]
bl MOD11_02230124
bl ov11_02230124
ldrh r1, [r4, #0x0]
add r2, r1, r5
add r3, r2, #0x1
@ -850,16 +850,16 @@ sub_0206C550: ; 0x0206C550
add r5, r1, #0x0
str r0, [sp, #0x0]
ldr r0, [r5, #0x0]
bl MOD11_022300D4
bl ov11_022300D4
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl MOD11_022300E8
bl ov11_022300E8
add r4, r0, #0x0
ldr r0, [r5, #0x0]
bl MOD11_022300F4
bl ov11_022300F4
str r0, [sp, #0x4]
ldr r0, [r5, #0x0]
bl MOD11_02230100
bl ov11_02230100
add r7, r0, #0x0
ldrb r0, [r5, #0x4]
cmp r0, #0x0
@ -918,16 +918,16 @@ sub_0206C5DC: ; 0x0206C5DC
add r5, r1, #0x0
str r0, [sp, #0x0]
ldr r0, [r5, #0x0]
bl MOD11_022300DC
bl ov11_022300DC
add r6, r0, #0x0
ldr r0, [r5, #0x0]
bl MOD11_0223010C
bl ov11_0223010C
add r4, r0, #0x0
ldr r0, [r5, #0x0]
bl MOD11_02230118
bl ov11_02230118
add r7, r0, #0x0
ldr r0, [r5, #0x0]
bl MOD11_02230124
bl ov11_02230124
ldrb r1, [r5, #0x4]
cmp r1, #0x0
beq _0206C60A
@ -948,7 +948,7 @@ _0206C61E:
ldrh r1, [r4, #0x0]
ldr r0, [r5, #0x0]
add r1, r6, r1
bl MOD11_022567E0
bl ov11_022567E0
ldrh r0, [r4, #0x0]
add r1, r0, #0x2
ldrb r2, [r6, r1]
@ -974,13 +974,13 @@ sub_0206C64C: ; 0x0206C64C
add r4, r3, #0x0
add r0, r4, #0x0
mov r1, #0xff
bl MOD11_0223135C
bl ov11_0223135C
add r0, r4, #0x0
mov r1, #0xff
bl MOD11_02231368
bl ov11_02231368
add r0, r4, #0x0
mov r1, #0x1
bl MOD11_02231374
bl ov11_02231374
pop {r4, pc}
.balign 4

4
arm9/asm/unk_0206F1F0.s
View File

@ -5,7 +5,7 @@
.global UNK_020F943C
UNK_020F943C: ; 0x020F943C
.word MOD56_02212084, MOD56_02212164, MOD56_02212240, SDK_OVERLAY_MODULE_56_ID
.word ov56_02212084, ov56_02212164, ov56_02212240, SDK_OVERLAY_OVERLAY_56_ID
.text
@ -206,7 +206,7 @@ _0206F34A:
bl CreateHeap
bl sub_02088878 ; Loads overlay 13
mov r0, #0x36
bl MOD13_02211E60
bl ov13_02211E60
mov r0, #0x0
bl OS_ResetSystem
b _0206F380

10
arm9/asm/unk_02080C38.s
View File

@ -21,23 +21,23 @@ UNK_020FBBAC: ; 0x020FBBAC
.global UNK_020FBBB8
UNK_020FBBB8: ; 0x020FBBB8
.word MOD12_02241210, MOD12_02241490, MOD12_022415A8, SDK_OVERLAY_MODULE_12_ID
.word ov12_02241210, ov12_02241490, ov12_022415A8, SDK_OVERLAY_OVERLAY_12_ID
.global UNK_020FBBC8
UNK_020FBBC8: ; 0x020FBBC8
.word MOD12_0222EF04, MOD12_0222F19C, MOD12_0222F324, SDK_OVERLAY_MODULE_12_ID
.word ov12_0222EF04, ov12_0222F19C, ov12_0222F324, SDK_OVERLAY_OVERLAY_12_ID
.global UNK_020FBBD8
UNK_020FBBD8: ; 0x020FBBD8
.word MOD17_021D8818, MOD17_021D8998, MOD17_021D8C9C, SDK_OVERLAY_MODULE_17_ID
.word ov17_021D8818, ov17_021D8998, ov17_021D8C9C, SDK_OVERLAY_OVERLAY_17_ID
.global UNK_020FBBE8
UNK_020FBBE8: ; 0x020FBBE8
.word MOD12_0222D5C0, MOD12_0222D89C, MOD12_0222D9B0, SDK_OVERLAY_MODULE_12_ID
.word ov12_0222D5C0, ov12_0222D89C, ov12_0222D9B0, SDK_OVERLAY_OVERLAY_12_ID
.global UNK_020FBBF8
UNK_020FBBF8: ; 0x020FBBF8
.word MOD12_0222FE4C, MOD12_02230128, MOD12_0223023C, SDK_OVERLAY_MODULE_12_ID
.word ov12_0222FE4C, ov12_02230128, ov12_0223023C, SDK_OVERLAY_OVERLAY_12_ID
.text

4
arm9/asm/unk_020834D0.s
View File

@ -148,11 +148,11 @@ sub_020835A0: ; 0x020835A0
mov r0, #0x5b
lsl r0, r0, #0x2
ldr r0, [r3, r0]
ldr r3, _020835AC ; =MOD12_0223D1CC
ldr r3, _020835AC ; =ov12_0223D1CC
add r1, r2, #0x0
bx r3
.balign 4
_020835AC: .word MOD12_0223D1CC
_020835AC: .word ov12_0223D1CC
thumb_func_start sub_020835B0
sub_020835B0: ; 0x020835B0

6
arm9/asm/unk_02083B84.s
View File

@ -77,21 +77,21 @@ sub_02083BAC: ; 0x02083BAC
add r0, r4, #0x0
mov r1, #0x1b
mov r2, #0x0
bl MOD71_0222F440
bl ov71_0222F440
b _02083C14
_02083BF6:
bl sub_02031190
ldr r1, _02083C20 ; =0x00002218
ldr r2, [r4, #0x50]
ldr r1, [r4, r1]
bl MOD71_0222F480
bl ov71_0222F480
b _02083C14
_02083C06:
bl sub_02031190
ldr r1, _02083C20 ; =0x00002218
ldr r2, [r4, #0x50]
ldr r1, [r4, r1]
bl MOD71_0222F480
bl ov71_0222F480
_02083C14:
ldr r0, [r4, #0x50]
add r0, r0, #0x1

14
arm9/asm/unk_02083D48.s
View File

@ -262,7 +262,7 @@ sub_02083E4C: ; 0x02083E4C
add r0, r4, #0x0
mov r1, #0x3
mov r2, #0x0
bl MOD53_021D8B64
bl ov53_021D8B64
ldr r1, _02083E8C ; =0x000043D0
mov r2, #0xe1
mov r0, #0x0
@ -327,7 +327,7 @@ _02083ED0:
ldr r1, [r4, r1]
cmp r1, r0
bne _02083EFE
bl MOD53_021D917C
bl ov53_021D917C
mov r1, #0xc6
lsl r1, r1, #0x2
ldr r1, [r4, r1]
@ -383,7 +383,7 @@ _02083F3C:
add r0, r4, #0x0
mov r1, #0x9
add r2, r6, #0x0
bl MOD53_021D8B64
bl ov53_021D8B64
add sp, #0x4
pop {r3-r6, pc}
_02083F5A:
@ -393,14 +393,14 @@ _02083F5A:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x8
bl MOD53_021D8B64
bl ov53_021D8B64
add sp, #0x4
pop {r3-r6, pc}
_02083F6E:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x15
bl MOD53_021D8B64
bl ov53_021D8B64
_02083F78:
add sp, #0x4
pop {r3-r6, pc}
@ -420,7 +420,7 @@ sub_02083F88: ; 0x02083F88
add r4, r3, #0x0
add r0, r4, #0x0
mov r1, #0x1
bl MOD53_021D8B64
bl ov53_021D8B64
bl sub_02031190
cmp r0, #0x0
bne _02083FB6
@ -460,7 +460,7 @@ sub_02083FC4: ; 0x02083FC4
add r0, r4, #0x0
mov r1, #0xf
mov r2, #0x0
bl MOD53_021D8B64
bl ov53_021D8B64
_02083FDA:
pop {r4, pc}

20
arm9/asm/unk_02084098.s
View File

@ -165,12 +165,12 @@ sub_020840CC: ; 0x020840CC
add r0, r4, #0x0
bl sub_02084270
add r0, r4, #0x0
bl MOD54_021D844C
bl ov54_021D844C
lsl r2, r5, #0x18
add r0, r4, #0x0
mov r1, #0x19
lsr r2, r2, #0x18
bl MOD54_021D88E4
bl ov54_021D88E4
mov r0, #0x1
add r1, r0, #0x0
bl sub_020334E8
@ -184,12 +184,12 @@ _02084110: .word 0x00000658
thumb_func_start sub_02084114
sub_02084114: ; 0x02084114
add r0, r3, #0x0
ldr r3, _02084120 ; =MOD54_021D88E4
ldr r3, _02084120 ; =ov54_021D88E4
mov r1, #0x2
mov r2, #0x0
bx r3
nop
_02084120: .word MOD54_021D88E4
_02084120: .word ov54_021D88E4
thumb_func_start sub_02084124
sub_02084124: ; 0x02084124
@ -227,7 +227,7 @@ _0208415E:
ldr r1, [r4, r1]
cmp r1, r0
bne _02084186
bl MOD54_021D8C24
bl ov54_021D8C24
ldr r1, _02084208 ; =0x00004A48
ldr r1, [r4, r1]
cmp r1, r0
@ -283,7 +283,7 @@ _020841C8:
add r0, r4, #0x0
mov r1, #0x8
add r2, r6, #0x0
bl MOD54_021D88E4
bl ov54_021D88E4
add sp, #0x4
pop {r3-r6, pc}
_020841E6:
@ -293,14 +293,14 @@ _020841E6:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x7
bl MOD54_021D88E4
bl ov54_021D88E4
add sp, #0x4
pop {r3-r6, pc}
_020841FA:
ldrb r2, [r5, #0x0]
add r0, r4, #0x0
mov r1, #0x13
bl MOD54_021D88E4
bl ov54_021D88E4
_02084204:
add sp, #0x4
pop {r3-r6, pc}
@ -315,7 +315,7 @@ sub_02084210: ; 0x02084210
add r4, r3, #0x0
add r0, r4, #0x0
mov r1, #0x1
bl MOD54_021D89CC
bl ov54_021D89CC
bl sub_02031190
cmp r0, #0x0
bne _0208422E
@ -346,7 +346,7 @@ sub_02084238: ; 0x02084238
add r0, r4, #0x0
mov r1, #0xd
mov r2, #0x0
bl MOD54_021D88E4
bl ov54_021D88E4
_0208424E:
pop {r4, pc}

18
arm9/asm/unk_020842D0.s
View File

@ -5,15 +5,15 @@
.global UNK_020FCA3C
UNK_020FCA3C: ; 0x020FCA3C
.word MOD73_021D8EA8, MOD73_021D907C, 0x00000000
.word MOD73_021D8EB4, MOD73_021D907C, 0x00000000
.word MOD73_021D8EC0, MOD73_021D9084, 0x00000000
.word MOD73_021D8EFC, MOD73_021D9088, 0x00000000
.word MOD73_021D8F8C, MOD73_021D908C, 0x00000000
.word MOD73_021D8FA8, MOD73_021D9090, 0x00000000
.word MOD73_021D8FC8, sub_02027E30, 0x00000000
.word MOD73_021D8FE0, MOD73_021D9080, 0x00000000
.word MOD73_021D9000, MOD73_021D9080, 0x00000000
.word ov73_021D8EA8, ov73_021D907C, 0x00000000
.word ov73_021D8EB4, ov73_021D907C, 0x00000000
.word ov73_021D8EC0, ov73_021D9084, 0x00000000
.word ov73_021D8EFC, ov73_021D9088, 0x00000000
.word ov73_021D8F8C, ov73_021D908C, 0x00000000
.word ov73_021D8FA8, ov73_021D9090, 0x00000000
.word ov73_021D8FC8, sub_02027E30, 0x00000000
.word ov73_021D8FE0, ov73_021D9080, 0x00000000
.word ov73_021D9000, ov73_021D9080, 0x00000000
.text

4
arm9/asm/unk_020854E0.s
View File

@ -5,11 +5,11 @@
.global UNK_020FCAA8
UNK_020FCAA8: ; 0x020FCAA8
.word MOD61_021D74E0, MOD61_021D7550, MOD61_021D7568, SDK_OVERLAY_MODULE_61_ID
.word ov61_021D74E0, ov61_021D7550, ov61_021D7568, SDK_OVERLAY_OVERLAY_61_ID
.global UNK_020FCAB8
UNK_020FCAB8: ; 0x020FCAB8
.word MOD15_021D74E0, MOD15_021D7558, MOD15_021D7608, SDK_OVERLAY_MODULE_15_ID
.word ov15_021D74E0, ov15_021D7558, ov15_021D7608, SDK_OVERLAY_OVERLAY_15_ID
.global UNK_020FCAC8
UNK_020FCAC8: ; 0x020FCAC8

42
arm9/asm/unk_020859C0.s
View File

@ -7,7 +7,7 @@
.global UNK_020FCAD8
UNK_020FCAD8: ; 0x020FCAD8
.word sub_020859C0, sub_02085BB0, sub_02085C08, SDK_OVERLAY_MODULE_62_ID
.word sub_020859C0, sub_02085BB0, sub_02085C08, SDK_OVERLAY_OVERLAY_62_ID
.global UNK_020FCAE8
UNK_020FCAE8: ; 0x020FCAE8
@ -186,8 +186,8 @@ sub_020859C0: ; 0x020859C0
lsl r2, r2, #0x12
bl CreateHeap
mov r0, #0x35
bl MOD62_02230F3C
bl MOD62_0222F7E0
bl ov62_02230F3C
bl ov62_0222F7E0
ldr r1, _02085BA0 ; =0x0000042C
add r0, r5, #0x0
mov r2, #0x35
@ -196,7 +196,7 @@ sub_020859C0: ; 0x020859C0
mov r1, #0x0
add r4, r0, #0x0
bl memset
bl MOD62_0222E2BC
bl ov62_0222E2BC
mov r1, #0x23
lsl r1, r1, #0x4
str r0, [r4, r1]
@ -332,8 +332,8 @@ _02085A9A:
add r0, r4, #0x0
add r0, #0xe4
ldr r0, [r0, #0x0]
bl MOD62_02230F80
bl MOD62_0222E360
bl ov62_02230F80
bl ov62_0222E360
mov r0, #0x35
bl sub_02006D98
mov r1, #0x69
@ -357,7 +357,7 @@ _02085A9A:
ldr r0, [r0, #0x0]
ldr r1, [r1, #0x0]
add r2, r5, #0x0
bl MOD62_0222ED34
bl ov62_0222ED34
add r0, r4, #0x0
add r1, r4, #0x0
add r0, #0xe4
@ -365,20 +365,20 @@ _02085A9A:
ldr r0, [r0, #0x0]
ldr r1, [r1, #0x0]
add r2, r5, #0x0
bl MOD62_0222EDBC
bl ov62_0222EDBC
add r0, r4, #0x0
add r0, #0xd4
bl MOD62_0222E7E8
bl ov62_0222E7E8
bl sub_0201CC08
mov r0, #0x4
bl sub_0201CC24
add r0, r4, #0x0
bl MOD62_022300E4
ldr r0, _02085BAC ; =MOD62_022310CC
bl ov62_022300E4
ldr r0, _02085BAC ; =ov62_022310CC
add r1, r4, #0x0
bl Main_SetVBlankIntrCB
add r0, r4, #0x0
bl MOD62_0222DD1C
bl ov62_0222DD1C
mov r1, #0x0
mov r0, #0x3b
add r2, r1, #0x0
@ -389,7 +389,7 @@ _02085A9A:
_02085BA0: .word 0x0000042C
_02085BA4: .word 0x00000428
_02085BA8: .word 0x0000041C
_02085BAC: .word MOD62_022310CC
_02085BAC: .word ov62_022310CC
thumb_func_start sub_02085BB0
sub_02085BB0: ; 0x02085BB0
@ -413,7 +413,7 @@ _02085BCA:
str r0, [r5, #0x0]
b _02085C02
_02085BD8:
bl MOD12_0222F990
bl ov12_0222F990
cmp r0, #0x0
bne _02085BE6
mov r0, #0x2
@ -424,7 +424,7 @@ _02085BE6:
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl sub_02006ED4
bl MOD62_0222E3A0
bl ov62_0222E3A0
b _02085C02
_02085BF6:
bl IsPaletteFadeFinished
@ -541,7 +541,7 @@ sub_02085C08: ; 0x02085C08
ldr r0, [r4, r0]
bl FreeToHeap
add r0, r4, #0x0
bl MOD62_0222DAEC
bl ov62_0222DAEC
mov r0, #0x73
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@ -555,29 +555,29 @@ sub_02085C08: ; 0x02085C08
ldr r0, [r4, r0]
bl sub_02014C28
add r0, r4, #0x0
bl MOD62_0222DD38
bl ov62_0222DD38
add r0, r4, #0x0
add r0, #0xd4
bl MOD62_0222E874
bl ov62_0222E874
bl sub_0201C29C
mov r0, #0x23
lsl r0, r0, #0x4
ldr r0, [r4, r0]
bl sub_020223BC
mov r0, #0x35
bl MOD62_02230F70
bl ov62_02230F70
add r0, r5, #0x0
bl OverlayManager_FreeData
bl sub_0201CD04
mov r0, #0x35
bl DestroyHeap
ldr r0, _02085D68 ; =SDK_OVERLAY_MODULE_08_ID
ldr r0, _02085D68 ; =SDK_OVERLAY_OVERLAY_08_ID
bl UnloadOverlayByID
mov r0, #0x1
pop {r3-r5, pc}
nop
_02085D64: .word 0x00000428
_02085D68: .word SDK_OVERLAY_MODULE_08_ID
_02085D68: .word SDK_OVERLAY_OVERLAY_08_ID
thumb_func_start sub_02085D6C
sub_02085D6C: ; 0x02085D6C

2
arm9/asm/unk_02086084.s
View File

@ -253,7 +253,7 @@ _020862A0: ; jump table (using 16-bit offset)
_020862AE:
ldr r0, [r4, #0xc]
mov r1, #0xb
bl MOD05_021ED940
bl ov05_021ED940
add r0, r5, #0x0
bl sub_0204AF3C
ldr r0, [r4, #0x0]

2
arm9/asm/unk_02087A6C.s
View File

@ -5,7 +5,7 @@
.global UNK_020FD144
UNK_020FD144: ; 0x020FD144
.word MOD59_IntroInit, MOD59_IntroMain, MOD59_IntroExit, SDK_OVERLAY_MODULE_59_ID
.word ov59_IntroInit, ov59_IntroMain, ov59_IntroExit, SDK_OVERLAY_OVERLAY_59_ID
.text

4
arm9/asm/unk_02087D00.s
View File

@ -16,11 +16,11 @@ UNK_020FD158: ; 0x020FD158
.global UNK_020FD15C
UNK_020FD15C: ; 0x020FD15C
.word MOD65_021D74E0, MOD65_021D7524, MOD65_021D753C, SDK_OVERLAY_MODULE_65_ID
.word ov65_021D74E0, ov65_021D7524, ov65_021D753C, SDK_OVERLAY_OVERLAY_65_ID
.global UNK_020FD16C
UNK_020FD16C: ; 0x020FD16C
.word MOD65_021D8A08, MOD65_021D8A40, MOD65_021D8BBC, SDK_OVERLAY_MODULE_65_ID
.word ov65_021D8A08, ov65_021D8A40, ov65_021D8BBC, SDK_OVERLAY_OVERLAY_65_ID
.global UNK_020FD17C
UNK_020FD17C: ; 0x020FD17C

118
arm9/asm/unk_02088814.s
View File

@ -7,80 +7,80 @@
UNK_020FD1C4: ; 0x020FD1C4
.word sub_0204DB18, sub_0204DC34, 0x00000000
.word sub_0204DC38, sub_0204E2A8, 0x00000000
.word MOD18_0223E660, sub_0202DA84, 0x00000000
.word ov18_0223E660, sub_0202DA84, 0x00000000
.word sub_0204E2E0, sub_0202DA80, 0x00000000
.word sub_0204E2F0, sub_0202DA84, 0x00000000
.word sub_0204E850, sub_0202DA80, 0x00000000
.word MOD18_0223DD78, MOD18_0223DD74, 0x00000000
.word ov18_0223DD78, ov18_0223DD74, 0x00000000
.word sub_0204E8FC, sub_0202DA78, 0x00000000
.word sub_0204E96C, sub_0202DA78, 0x00000000
.word MOD18_0223E858, sub_0202DA80, 0x00000000
.word MOD18_0223EF98, sub_0202DA84, 0x00000000
.word MOD18_0223F404, MOD18_0223F424, 0x00000000
.word MOD18_0223F360, MOD18_0223F0C4, 0x00000000
.word MOD18_0223F428, MOD18_0223ECEC, 0x00000000
.word MOD18_0223F4A8, MOD18_0223F4D4, 0x00000000
.word MOD18_0223F918, MOD18_0223F778, 0x00000000
.word MOD18_0223FA74, sub_0202DA84, 0x00000000
.word MOD18_0223FAA8, sub_02088814, 0x00000000
.word MOD18_022409D0, sub_0202DA84, 0x00000000
.word MOD18_0224089C, sub_0202DA80, 0x00000000
.word MOD18_02240944, MOD18_02240898, 0x00000000
.word MOD18_022408FC, sub_0202DA80, 0x00000000
.word MOD18_02240A44, MOD18_02240B24, 0x00000000
.word MOD18_0223FB08, sub_0202DA84, 0x00000000
.word MOD18_02240C74, sub_0202DA80, 0x00000000
.word MOD18_02240D2C, MOD18_02240D98, 0x00000000
.word MOD18_0223DA98, MOD18_0223F508, 0x00000000
.word MOD18_0223DAC4, sub_0202DA78, 0x00000000
.word MOD18_0223DAF4, sub_0202DA78, 0x00000000
.word MOD18_0223F5CC, MOD18_0223F5C8, 0x00000000
.word ov18_0223E858, sub_0202DA80, 0x00000000
.word ov18_0223EF98, sub_0202DA84, 0x00000000
.word ov18_0223F404, ov18_0223F424, 0x00000000
.word ov18_0223F360, ov18_0223F0C4, 0x00000000
.word ov18_0223F428, ov18_0223ECEC, 0x00000000
.word ov18_0223F4A8, ov18_0223F4D4, 0x00000000
.word ov18_0223F918, ov18_0223F778, 0x00000000
.word ov18_0223FA74, sub_0202DA84, 0x00000000
.word ov18_0223FAA8, sub_02088814, 0x00000000
.word ov18_022409D0, sub_0202DA84, 0x00000000
.word ov18_0224089C, sub_0202DA80, 0x00000000
.word ov18_02240944, ov18_02240898, 0x00000000
.word ov18_022408FC, sub_0202DA80, 0x00000000
.word ov18_02240A44, ov18_02240B24, 0x00000000
.word ov18_0223FB08, sub_0202DA84, 0x00000000
.word ov18_02240C74, sub_0202DA80, 0x00000000
.word ov18_02240D2C, ov18_02240D98, 0x00000000
.word ov18_0223DA98, ov18_0223F508, 0x00000000
.word ov18_0223DAC4, sub_0202DA78, 0x00000000
.word ov18_0223DAF4, sub_0202DA78, 0x00000000
.word ov18_0223F5CC, ov18_0223F5C8, 0x00000000
.word sub_0204DBCC, sub_0202DA84, 0x00000000
.word MOD18_02246108, MOD18_022461A0, 0x00000000
.word MOD18_02245FE0, MOD18_022461A0, 0x00000000
.word MOD18_02246250, MOD18_02246308, 0x00000000
.word MOD18_02245F28, sub_0202DA80, 0x00000000
.word MOD18_02245E90, MOD18_02245E8C, 0x00000000
.word MOD18_02245438, MOD18_022454B8, 0x00000000
.word MOD18_022454BC, MOD18_02245524, 0x00000000
.word MOD18_02247248, MOD18_02247278, 0x00000000
.word MOD18_0224548C, sub_0202DA84, 0x00000000
.word ov18_02246108, ov18_022461A0, 0x00000000
.word ov18_02245FE0, ov18_022461A0, 0x00000000
.word ov18_02246250, ov18_02246308, 0x00000000
.word ov18_02245F28, sub_0202DA80, 0x00000000
.word ov18_02245E90, ov18_02245E8C, 0x00000000
.word ov18_02245438, ov18_022454B8, 0x00000000
.word ov18_022454BC, ov18_02245524, 0x00000000
.word ov18_02247248, ov18_02247278, 0x00000000
.word ov18_0224548C, sub_0202DA84, 0x00000000
.word sub_0204D67C, sub_0202DA84, 0x00000000
.word MOD18_0223CE68, sub_0202DA84, 0x00000000
.word MOD18_02239F34, sub_0202DA84, 0x00000000
.word MOD18_0223A058, sub_0202DA84, 0x00000000
.word MOD18_0223A0EC, sub_0202DA84, 0x00000000
.word MOD18_0223A120, sub_0202DA84, 0x00000000
.word MOD18_0223A138, MOD18_0223A150, 0x00000000
.word MOD18_0223A154, MOD18_0223A184, 0x00000000
.word MOD18_0223E82C, MOD18_0223E854, 0x00000000
.word MOD18_0223C884, sub_0202DA80, 0x00000000
.word MOD18_0223C910, MOD18_0223C9B4, 0x00000000
.word MOD18_02248E6C, MOD18_02248EF0, 0x00000000
.word MOD18_02248E78, MOD18_02248EF0, 0x00000000
.word MOD18_02248E84, MOD18_02248EF0, 0x00000000
.word MOD18_02248EB4, MOD18_02248EF0, 0x00000000
.word MOD18_02248EF4, MOD18_02248F74, 0x00000000
.word MOD18_02248F00, MOD18_02248F74, 0x00000000
.word MOD18_02248F78, MOD18_02248FC4, 0x00000000
.word MOD18_02248F84, MOD18_02248FC4, 0x00000000
.word MOD18_0224D734, sub_0202DA78, 0x00000000
.word MOD18_0224D744, sub_0202DA78, 0x00000000
.word MOD18_0224B128, MOD18_0224B18C, 0x00000000
.word ov18_0223CE68, sub_0202DA84, 0x00000000
.word ov18_02239F34, sub_0202DA84, 0x00000000
.word ov18_0223A058, sub_0202DA84, 0x00000000
.word ov18_0223A0EC, sub_0202DA84, 0x00000000
.word ov18_0223A120, sub_0202DA84, 0x00000000
.word ov18_0223A138, ov18_0223A150, 0x00000000
.word ov18_0223A154, ov18_0223A184, 0x00000000
.word ov18_0223E82C, ov18_0223E854, 0x00000000
.word ov18_0223C884, sub_0202DA80, 0x00000000
.word ov18_0223C910, ov18_0223C9B4, 0x00000000
.word ov18_02248E6C, ov18_02248EF0, 0x00000000
.word ov18_02248E78, ov18_02248EF0, 0x00000000
.word ov18_02248E84, ov18_02248EF0, 0x00000000
.word ov18_02248EB4, ov18_02248EF0, 0x00000000
.word ov18_02248EF4, ov18_02248F74, 0x00000000
.word ov18_02248F00, ov18_02248F74, 0x00000000
.word ov18_02248F78, ov18_02248FC4, 0x00000000
.word ov18_02248F84, ov18_02248FC4, 0x00000000
.word ov18_0224D734, sub_0202DA78, 0x00000000
.word ov18_0224D744, sub_0202DA78, 0x00000000
.word ov18_0224B128, ov18_0224B18C, 0x00000000
.word sub_0204F0C8, sub_0202DA84, 0x00000000
.word sub_0204F2D8, sub_0204F0C4, 0x00000000
.word MOD18_02246AFC, sub_0202DA84, 0x00000000
.word MOD18_02246C94, MOD18_02246AF8, 0x00000000
.word ov18_02246AFC, sub_0202DA84, 0x00000000
.word ov18_02246C94, ov18_02246AF8, 0x00000000
.word sub_02050BE8, sub_02088830, sub_02050BF8
.word MOD18_0224BF18, MOD18_0224B18C, 0x00000000
.word MOD18_0224BF34, MOD18_0224B18C, 0x00000000
.word ov18_0224BF18, ov18_0224B18C, 0x00000000
.word ov18_0224BF34, ov18_0224B18C, 0x00000000
.word sub_0204F9BC, sub_0204F9B8, 0x00000000
.word sub_0204FA78, sub_0204FACC, sub_0204FA64
.word sub_0204FAD0, sub_0202DA84, 0x00000000
.word sub_0204EC00, sub_0202DA84, 0x00000000
.word sub_02050A48, sub_0202DA84, 0x00000000
.word MOD18_02247414, sub_0202DA84, 0x00000000
.word MOD18_02247428, MOD18_02247470, 0x00000000
.word ov18_02247414, sub_0202DA84, 0x00000000
.word ov18_02247428, ov18_02247470, 0x00000000
.word sub_020526B4, PlayerProfile_sizeof, 0x00000000
.word sub_020526D8, sub_0202DA84, 0x00000000
.word sub_020526B8, sub_0202DA84, 0x00000000

26
arm9/asm/unk_02088858.s
View File

@ -12,40 +12,40 @@ UNK_020FD6D4: ; 0x020FD6D4
thumb_func_start sub_02088858
sub_02088858: ; 0x02088858
ldr r3, _02088860 ; =HandleLoadOverlay
ldr r0, _02088864 ; =SDK_OVERLAY_MODULE_04_ID
ldr r0, _02088864 ; =SDK_OVERLAY_OVERLAY_04_ID
mov r1, #0x2
bx r3
.balign 4
_02088860: .word HandleLoadOverlay
_02088864: .word SDK_OVERLAY_MODULE_04_ID
_02088864: .word SDK_OVERLAY_OVERLAY_04_ID
thumb_func_start sub_02088868
sub_02088868: ; 0x02088868
ldr r3, _02088870 ; =UnloadOverlayByID
ldr r0, _02088874 ; =SDK_OVERLAY_MODULE_04_ID
ldr r0, _02088874 ; =SDK_OVERLAY_OVERLAY_04_ID
bx r3
nop
_02088870: .word UnloadOverlayByID
_02088874: .word SDK_OVERLAY_MODULE_04_ID
_02088874: .word SDK_OVERLAY_OVERLAY_04_ID
thumb_func_start sub_02088878
sub_02088878: ; 0x02088878
ldr r3, _02088880 ; =HandleLoadOverlay
ldr r0, _02088884 ; =SDK_OVERLAY_MODULE_13_ID
ldr r0, _02088884 ; =SDK_OVERLAY_OVERLAY_13_ID
mov r1, #0x2
bx r3
.balign 4
_02088880: .word HandleLoadOverlay
_02088884: .word SDK_OVERLAY_MODULE_13_ID
_02088884: .word SDK_OVERLAY_OVERLAY_13_ID
thumb_func_start sub_02088888
sub_02088888: ; 0x02088888
ldr r3, _02088890 ; =UnloadOverlayByID
ldr r0, _02088894 ; =SDK_OVERLAY_MODULE_13_ID
ldr r0, _02088894 ; =SDK_OVERLAY_OVERLAY_13_ID
bx r3
nop
_02088890: .word UnloadOverlayByID
_02088894: .word SDK_OVERLAY_MODULE_13_ID
_02088894: .word SDK_OVERLAY_OVERLAY_13_ID
thumb_func_start sub_02088898
sub_02088898: ; 0x02088898
@ -54,7 +54,7 @@ sub_02088898: ; 0x02088898
bl sub_02088858
bl sub_02088878
add r0, r4, #0x0
bl MOD07_02211E60
bl ov07_02211E60
bl sub_02088888
bl sub_02088868
mov r0, #0x0
@ -65,21 +65,21 @@ sub_02088898: ; 0x02088898
thumb_func_start sub_020888BC
sub_020888BC: ; 0x020888BC
ldr r3, _020888C4 ; =HandleLoadOverlay
ldr r0, _020888C8 ; =SDK_OVERLAY_MODULE_79_ID
ldr r0, _020888C8 ; =SDK_OVERLAY_OVERLAY_79_ID
mov r1, #0x2
bx r3
.balign 4
_020888C4: .word HandleLoadOverlay
_020888C8: .word SDK_OVERLAY_MODULE_79_ID
_020888C8: .word SDK_OVERLAY_OVERLAY_79_ID
thumb_func_start sub_020888CC
sub_020888CC: ; 0x020888CC
ldr r3, _020888D4 ; =UnloadOverlayByID
ldr r0, _020888D8 ; =SDK_OVERLAY_MODULE_79_ID
ldr r0, _020888D8 ; =SDK_OVERLAY_OVERLAY_79_ID
bx r3
nop
_020888D4: .word UnloadOverlayByID
_020888D8: .word SDK_OVERLAY_MODULE_79_ID
_020888D8: .word SDK_OVERLAY_OVERLAY_79_ID
thumb_func_start sub_020888DC
sub_020888DC: ; 0x020888DC

8
arm9/asm/unk_02089960.s
View File

@ -142,14 +142,14 @@ sub_02089A40: ; 0x02089A40
bl OverlayManager_FreeData
add r0, r4, #0x0
bl DestroyHeap
ldr r0, _02089A64 ; =SDK_OVERLAY_MODULE_83_ID
ldr r1, _02089A68 ; =MOD83_0223A360
ldr r0, _02089A64 ; =SDK_OVERLAY_OVERLAY_83_ID
ldr r1, _02089A68 ; =ov83_0223A360
bl RegisterMainOverlay
mov r0, #0x1
pop {r3-r5, pc}
nop
_02089A64: .word SDK_OVERLAY_MODULE_83_ID
_02089A68: .word MOD83_0223A360
_02089A64: .word SDK_OVERLAY_OVERLAY_83_ID
_02089A68: .word ov83_0223A360
thumb_func_start sub_02089A6C
sub_02089A6C: ; 0x02089A6C

4
arm9/asm/unk_0208A258.s
View File

@ -73,7 +73,7 @@ sub_0208A2C4: ; 0x0208A2C4
cmp r0, #0x0
beq _0208A2F6
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
ldr r1, _0208A2F8 ; =0x0223D4AD
add r0, r5, #0x0
add r2, r4, #0x0
@ -84,5 +84,5 @@ sub_0208A2C4: ; 0x0208A2C4
_0208A2F6:
pop {r4-r6, pc}
.balign 4
_0208A2F8: .word MOD06_0223D4AC
_0208A2F8: .word ov06_0223D4AC
_0208A2FC: .word 0x0000022F

4
arm9/asm/unk_0208A338.s
View File

@ -269,7 +269,7 @@ _0208A566:
cmp r0, #0x0
beq _0208A5B0
mov r0, #0x0
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x5
str r0, [r4, #0x54]
b _0208A6C8
@ -310,7 +310,7 @@ _0208A5BE:
cmp r0, #0x0
beq _0208A6C8
mov r0, #0x1
bl MOD05_021D7CA4
bl ov05_021D7CA4
mov r0, #0x8
str r0, [r4, #0x54]
b _0208A6C8

4738
arm9/global.inc
View File

File diff suppressed because it is too large Load Diff

145
arm9/modules/04/asm/mod04_021DD82C.s
View File

@ -1,145 +0,0 @@
.include "asm/macros.inc"
.include "global.inc"
.section .text
.balign 4, 0
arm_func_start MOD04_021DD82C
MOD04_021DD82C: ; 0x021DD82C
ldr ip, _021DD840 ; =MOD04_021DD904
mov r1, r0
mov r0, #5
mov r2, #0
bx ip
.align 2, 0
_021DD840: .word MOD04_021DD904
arm_func_end MOD04_021DD82C
arm_func_start MOD04_021DD844
MOD04_021DD844: ; 0x021DD844
ldr ip, _021DD85C ; =MOD04_021DD8E8
mov r2, r1
mov r1, r0
mov r3, r2
mov r0, #5
bx ip
.align 2, 0
_021DD85C: .word MOD04_021DD8E8
arm_func_end MOD04_021DD844
arm_func_start MOD04_021DD860
MOD04_021DD860: ; 0x021DD860
ldr ip, _021DD870 ; =MOD04_021DD944
mov r1, r0
mov r0, #5
bx ip
.align 2, 0
_021DD870: .word MOD04_021DD944
arm_func_end MOD04_021DD860
arm_func_start MOD04_021DD874
MOD04_021DD874: ; 0x021DD874
stmdb sp!, {r4, r5, r6, r7, r8, lr}
ldr ip, _021DD8E0 ; =UNK04_02210514
mov r4, r2
mov r7, r3
mov r5, r1
ldr r2, [sp, #0x18]
ldr r3, [ip]
mov r1, r7
mov r8, r0
blx r3
movs r6, r0
moveq r0, #0
ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
cmp r5, #0
beq _021DD8D8
mov r0, r5
mov r1, r6
mov r2, r7
bl MI_CpuCopy8
ldr r1, _021DD8E4 ; =UNK04_02210510
mov r0, r8
ldr r3, [r1]
mov r1, r5
mov r2, r4
blx r3
_021DD8D8:
mov r0, r6
ldmia sp!, {r4, r5, r6, r7, r8, pc}
.align 2, 0
_021DD8E0: .word UNK04_02210514
_021DD8E4: .word UNK04_02210510
arm_func_end MOD04_021DD874
arm_func_start MOD04_021DD8E8
MOD04_021DD8E8: ; 0x021DD8E8
stmdb sp!, {lr}
sub sp, sp, #4
mov ip, #0x20
str ip, [sp]
bl MOD04_021DD874
add sp, sp, #4
ldmfd sp!, {pc}
arm_func_end MOD04_021DD8E8
arm_func_start MOD04_021DD904
MOD04_021DD904: ; 0x021DD904
stmdb sp!, {lr}
sub sp, sp, #4
ldr r3, _021DD920 ; =UNK04_02210510
ldr r3, [r3]
blx r3
add sp, sp, #4
ldmfd sp!, {pc}
.align 2, 0
_021DD920: .word UNK04_02210510
arm_func_end MOD04_021DD904
arm_func_start MOD04_021DD924
MOD04_021DD924: ; 0x021DD924
stmdb sp!, {lr}
sub sp, sp, #4
ldr r3, _021DD940 ; =UNK04_02210514
ldr r3, [r3]
blx r3
add sp, sp, #4
ldmfd sp!, {pc}
.align 2, 0
_021DD940: .word UNK04_02210514
arm_func_end MOD04_021DD924
arm_func_start MOD04_021DD944
MOD04_021DD944: ; 0x021DD944
stmdb sp!, {lr}
sub sp, sp, #4
ldr r3, _021DD964 ; =UNK04_02210514
mov r2, #0x20
ldr r3, [r3]
blx r3
add sp, sp, #4
ldmfd sp!, {pc}
.align 2, 0
_021DD964: .word UNK04_02210514
arm_func_end MOD04_021DD944
arm_func_start MOD04_021DD968
MOD04_021DD968: ; 0x021DD968
ldr r3, _021DD97C ; =UNK04_02210514
ldr r2, _021DD980 ; =UNK04_02210510
str r0, [r3]
str r1, [r2]
bx lr
.align 2, 0
_021DD97C: .word UNK04_02210514
_021DD980: .word UNK04_02210510
arm_func_end MOD04_021DD968
.section .bss
.global UNK04_02210510
UNK04_02210510: ; 0x02210510
.space 0x4
.global UNK04_02210514
UNK04_02210514: ; 0x02210514
.space 0x4

176
arm9/modules/05/asm/mod05_021DBE04.s
View File

@ -1,176 +0,0 @@
.include "asm/macros.inc"
.include "global.inc"
.section .text
.balign 4, 0
thumb_func_start MOD05_021DBE04
MOD05_021DBE04: ; 0x021DBE04
push {r4, lr}
ldr r4, [r0, #0x18]
cmp r4, #0
bne _021DBE10
bl GF_AssertFail
_021DBE10:
cmp r4, #5
blt _021DBE18
bl GF_AssertFail
_021DBE18:
sub r0, r4, #1
pop {r4, pc}
thumb_func_start MOD05_021DBE1C
MOD05_021DBE1C: ; 0x021DBE1C
push {r4, lr}
add r4, r0, #0
bl MOD05_021DBE04
add r1, r0, #0
lsl r2, r1, #4
ldr r1, _021DBE34 ; =UNK05_021F6788
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
pop {r4, pc}
nop
_021DBE34: .word UNK05_021F6788
thumb_func_start MOD05_021DBE38
MOD05_021DBE38: ; 0x021DBE38
push {r4, lr}
add r4, r0, #0
bl MOD05_021DBE04
lsl r1, r0, #4
ldr r0, _021DBE54 ; =UNK05_021F678C
ldr r1, [r0, r1]
cmp r1, #0
bne _021DBE4E
mov r0, #1
pop {r4, pc}
_021DBE4E:
add r0, r4, #0
blx r1
pop {r4, pc}
.balign 4, 0
_021DBE54: .word UNK05_021F678C
thumb_func_start MOD05_021DBE58
MOD05_021DBE58: ; 0x021DBE58
push {r4, lr}
add r4, r0, #0
bl MOD05_021DBE04
add r1, r0, #0
lsl r2, r1, #4
ldr r1, _021DBE70 ; =UNK05_021F6790
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
pop {r4, pc}
nop
_021DBE70: .word UNK05_021F6790
thumb_func_start MOD05_021DBE74
MOD05_021DBE74: ; 0x021DBE74
push {r4, lr}
add r4, r0, #0
bl MOD05_021DBE04
add r1, r0, #0
lsl r2, r1, #4
ldr r1, _021DBE8C ; =UNK05_021F6794
add r0, r4, #0
ldr r1, [r1, r2]
blx r1
pop {r4, pc}
nop
_021DBE8C: .word UNK05_021F6794
thumb_func_start MOD05_021DBE90
MOD05_021DBE90: ; 0x021DBE90
ldr r3, _021DBE94 ; =MOD05_021EFAAC
bx r3
.balign 4, 0
_021DBE94: .word MOD05_021EFAAC
thumb_func_start MOD05_021DBE98
MOD05_021DBE98: ; 0x021DBE98
ldr r3, _021DBE9C ; =sub_02050E2C
bx r3
.balign 4, 0
_021DBE9C: .word sub_02050E2C
thumb_func_start MOD05_021DBEA0
MOD05_021DBEA0: ; 0x021DBEA0
push {r4, lr}
add r4, r0, #0
ldr r0, _021DBEB8 ; =SDK_OVERLAY_MODULE_51_ID
mov r1, #2
bl HandleLoadOverlay
add r0, r4, #0
bl MOD51_02254A68
add r4, #0x80
str r0, [r4]
pop {r4, pc}
.balign 4, 0
_021DBEB8: .word SDK_OVERLAY_MODULE_51_ID
thumb_func_start MOD05_021DBEBC
MOD05_021DBEBC: ; 0x021DBEBC
ldr r3, _021DBEC0 ; =MOD05_021EFB14
bx r3
.balign 4, 0
_021DBEC0: .word MOD05_021EFB14
thumb_func_start MOD05_021DBEC4
MOD05_021DBEC4: ; 0x021DBEC4
ldr r3, _021DBEC8 ; =sub_02050E10
bx r3
.balign 4, 0
_021DBEC8: .word sub_02050E10
thumb_func_start MOD05_021DBECC
MOD05_021DBECC: ; 0x021DBECC
push {r3, lr}
add r0, #0x80
ldr r0, [r0]
bl MOD51_02254AB8
ldr r0, _021DBEE0 ; =SDK_OVERLAY_MODULE_51_ID
bl UnloadOverlayByID
pop {r3, pc}
nop
_021DBEE0: .word SDK_OVERLAY_MODULE_51_ID
thumb_func_start MOD05_021DBEE4
MOD05_021DBEE4: ; 0x021DBEE4
ldr r3, _021DBEE8 ; =MOD05_021EFB50
bx r3
.balign 4, 0
_021DBEE8: .word MOD05_021EFB50
thumb_func_start MOD05_021DBEEC
MOD05_021DBEEC: ; 0x021DBEEC
mov r0, #1
bx lr
thumb_func_start MOD05_021DBEF0
MOD05_021DBEF0: ; 0x021DBEF0
mov r0, #1
bx lr
.section .rodata
.global UNK05_021F6788
UNK05_021F6788: ; 0x021F6788
.word MOD05_021DBE90
.global UNK05_021F678C
UNK05_021F678C: ; 0x021F678C
.word 0x00000000
.global UNK05_021F6790
UNK05_021F6790: ; 0x021F6790
.word MOD05_021DBEBC
.global UNK05_021F6794
UNK05_021F6794: ; 0x021F6794
.word MOD05_021DBEE4, MOD05_021DBE98, 0x00000000, MOD05_021DBEC4
.word MOD05_021DBEF0, MOD05_021DBEA0, 0x00000000, MOD05_021DBECC
.word MOD05_021DBEEC, MOD05_021EFBB4, 0x00000000, MOD05_021EFBCC
.word MOD05_021EFBD8

23
arm9/modules/05/include/mod05_021E72FC.h
View File

@ -1,23 +0,0 @@
#ifndef POKEDIAMOND_MOD05_021E72FC_H
#define POKEDIAMOND_MOD05_021E72FC_H
#include "nitro/types.h"
typedef struct UnkStruct021E7358
{
u32 Unk00;
u32 Unk04;
u32 Unk08;
u32 Unk0C;
u32 Unk10;
} UnkStruct021E7358;
BOOL MOD05_021E72FC(u32 param0, u32 param1);
void MOD05_021E7358(u32 param0, u32 param1, u32 param2);
u32 MOD05_021E7388(u32 param0);
BOOL MOD05_021E73B4(UnkStruct021E7358 *param0);
UnkStruct021E7358 *MOD05_021E74D4(u32 param0);
void MOD05_021E74F8(UnkStruct021E7358 *param0);
#endif //POKEDIAMOND_MOD05_021E72FC_H

14
arm9/modules/06/include/module_06.h
View File

@ -1,14 +0,0 @@
#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 TaskManager *, struct FieldSystem *, const u16 *, enum MartType, u32);
#endif //POKEDIAMOND_MODULE_06_H

10
arm9/modules/19/include/module_19.h
View File

@ -1,10 +0,0 @@
#ifndef POKEDIAMOND_MODULE_19_H
#define POKEDIAMOND_MODULE_19_H
#include "bg_window.h"
void MOD19_02252440(struct BgConfig * bgConfig);
void MOD19_022524F4(struct BgConfig * bgConfig);
BOOL MOD19_02252504(struct BgConfig * bgConfig);
#endif //POKEDIAMOND_MODULE_19_H

36
arm9/modules/21/include/mod21_02254854.h
View File

@ -1,36 +0,0 @@
#ifndef POKEDIAMOND_MOD21_02254854_H
#define POKEDIAMOND_MOD21_02254854_H
#include "nitro/types.h"
#include "mod21_02254A6C.h"
typedef struct Time
{
u32 hour;
u32 minute;
} Time;
typedef struct UnkStruct02254854
{
u8 bytearray[8];
u8 padding0[8];
BOOL Unk10;
Time time;
u8 padding1[4];
u32 Unk20;
void *Unk24;
u32 Unk28;
} UnkStruct02254854;
BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param2, u32 param3);
BOOL MOD21_0225489C(UnkStruct02254854 *param0, u32 param1, u32 param2, u32 param3);
void MOD21_02254918(UnkStruct02254854 *param0);
void MOD21_02254930(u32 param0, UnkStruct02254854 *param1);
void MOD21_0225496C(UnkStruct02254854 *param0);
void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3);
void MOD21_02254990(UnkStruct02254854 * param0, u8 param1);
BOOL MOD21_022549A4(UnkStruct02254854 * param0);
BOOL MOD21_022549E4(UnkStruct02254854 * param0);
BOOL MOD21_02254A38(UnkStruct02254854 * param0);
#endif //POKEDIAMOND_MOD21_02254854_H

38
arm9/modules/21/include/mod21_02254A6C.h
View File

@ -1,38 +0,0 @@
#ifndef POKEDIAMOND_MOD21_02254A6C_H
#define POKEDIAMOND_MOD21_02254A6C_H
#include "nitro/types.h"
typedef struct UnkStruct02254A6C UnkStruct02254A6C;
struct UnkStruct02254A6C
{
UnkStruct02254A6C *Unk00;
u32 Unk04;
u32 Unk08[1];
u32 Unk0C;
u8 padding0[0x20];
u32 Unk30[1];
};
typedef struct UnkOverlayStruct1
{
u32 number;
BOOL (*func)(u32 param0, void *param1);
u32 Unk08;
} UnkOverlayStruct1; //todo should probably be in mod 20 header
BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1);
void MOD21_02254AD4(void *param0, void *param1);
void MOD21_02254B04(void *param0);
void MOD21_02254B10(u32 *param0, u32 param1);
BOOL MOD21_02254B34(void *param0, u32 param1);
BOOL MOD21_02254B40(void *param0);
BOOL MOD21_02254B4C(void *param0);
BOOL MOD21_02254B60(u32 param0, void *param1);
BOOL MOD21_02254BF4(u32 param0, void *param1);
BOOL MOD21_02254C14(u32 param0, void *param1);
BOOL MOD21_02254C40(u32 param0, void *param1);
void MOD21_02254C5C(UnkStruct02254A6C *param0);
#endif //POKEDIAMOND_MOD21_02254A6C_H

13
arm9/modules/22/src/module_22_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD22_02254854();
extern void MOD22_022549D8();
static void MOD22_02254840(void)
{
Poketch_InitApp(MOD22_02254854, MOD22_022549D8);
}
#define NitroStaticInit MOD22_02254840
#include "sinit.h"

13
arm9/modules/23/src/module_23_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD23_02254854();
extern void MOD23_022549A4();
static void MOD23_02254840(void)
{
Poketch_InitApp(MOD23_02254854, MOD23_022549A4);
}
#define NitroStaticInit MOD23_02254840
#include "sinit.h"

13
arm9/modules/24/src/module_24_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD24_02254854();
extern void MOD24_02254990();
static void MOD24_02254840(void)
{
Poketch_InitApp(MOD24_02254854, MOD24_02254990);
}
#define NitroStaticInit MOD24_02254840
#include "sinit.h"

13
arm9/modules/25/src/module_25_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD25_02254854();
extern void MOD25_0225496C();
static void MOD25_02254840(void)
{
Poketch_InitApp(MOD25_02254854, MOD25_0225496C);
}
#define NitroStaticInit MOD25_02254840
#include "sinit.h"

13
arm9/modules/26/src/module_26_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD26_02254854();
extern void MOD26_02254A84();
static void MOD26_02254840(void)
{
Poketch_InitApp(MOD26_02254854, MOD26_02254A84);
}
#define NitroStaticInit MOD26_02254840
#include "sinit.h"

13
arm9/modules/27/src/module_27_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD27_02254854();
extern void MOD27_0225492C();
static void MOD27_02254840(void)
{
Poketch_InitApp(MOD27_02254854, MOD27_0225492C);
}
#define NitroStaticInit MOD27_02254840
#include "sinit.h"

13
arm9/modules/28/src/module_28_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD28_02254854();
extern void MOD28_022549F4();
static void MOD28_02254840(void)
{
Poketch_InitApp(MOD28_02254854, MOD28_022549F4);
}
#define NitroStaticInit MOD28_02254840
#include "sinit.h"

13
arm9/modules/29/src/module_29_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD29_02254854();
extern void MOD29_02254914();
static void MOD29_02254840(void)
{
Poketch_InitApp(MOD29_02254854, MOD29_02254914);
}
#define NitroStaticInit MOD29_02254840
#include "sinit.h"

13
arm9/modules/30/src/module_30_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD30_02254854();
extern void MOD30_0225496C();
static void MOD30_02254840(void)
{
Poketch_InitApp(MOD30_02254854, MOD30_0225496C);
}
#define NitroStaticInit MOD30_02254840
#include "sinit.h"

13
arm9/modules/31/src/module_31_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD31_02254854();
extern void MOD31_02254954();
static void MOD31_02254840(void)
{
Poketch_InitApp(MOD31_02254854, MOD31_02254954);
}
#define NitroStaticInit MOD31_02254840
#include "sinit.h"

13
arm9/modules/32/src/module_32_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD32_02254854();
extern void MOD32_0225495C();
static void MOD32_02254840(void)
{
Poketch_InitApp(MOD32_02254854, MOD32_0225495C);
}
#define NitroStaticInit MOD32_02254840
#include "sinit.h"

13
arm9/modules/33/src/module_33_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD33_02254854();
extern void MOD33_02254908();
static void MOD33_02254840(void)
{
Poketch_InitApp(MOD33_02254854, MOD33_02254908);
}
#define NitroStaticInit MOD33_02254840
#include "sinit.h"

13
arm9/modules/34/src/module_34_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD34_02254854();
extern void MOD34_02254948();
static void MOD34_02254840(void)
{
Poketch_InitApp(MOD34_02254854, MOD34_02254948);
}
#define NitroStaticInit MOD34_02254840
#include "sinit.h"

13
arm9/modules/35/src/module_35_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD35_02254854();
extern void MOD35_02254924();
static void MOD35_02254840(void)
{
Poketch_InitApp(MOD35_02254854, MOD35_02254924);
}
#define NitroStaticInit MOD35_02254840
#include "sinit.h"

13
arm9/modules/36/src/module_36_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD36_02254854();
extern void MOD36_02254990();
static void MOD36_02254840(void)
{
Poketch_InitApp(MOD36_02254854, MOD36_02254990);
}
#define NitroStaticInit MOD36_02254840
#include "sinit.h"

13
arm9/modules/37/src/module_37_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD37_02254854();
extern void MOD37_02254934();
static void MOD37_02254840(void)
{
Poketch_InitApp(MOD37_02254854, MOD37_02254934);
}
#define NitroStaticInit MOD37_02254840
#include "sinit.h"

13
arm9/modules/38/src/module_38_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD38_02254854();
extern void MOD38_02254990();
static void MOD38_02254840(void)
{
Poketch_InitApp(MOD38_02254854, MOD38_02254990);
}
#define NitroStaticInit MOD38_02254840
#include "sinit.h"

13
arm9/modules/39/src/module_39_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD39_02254854();
extern void MOD39_022549D4();
static void MOD39_02254840(void)
{
Poketch_InitApp(MOD39_02254854, MOD39_022549D4);
}
#define NitroStaticInit MOD39_02254840
#include "sinit.h"

13
arm9/modules/40/src/module_40_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD40_02254854();
extern void MOD40_022549D4();
static void MOD40_02254840(void)
{
Poketch_InitApp(MOD40_02254854, MOD40_022549D4);
}
#define NitroStaticInit MOD40_02254840
#include "sinit.h"

13
arm9/modules/41/src/module_41_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD41_02254854();
extern void MOD41_02254AD8();
static void MOD41_02254840(void)
{
Poketch_InitApp(MOD41_02254854, MOD41_02254AD8);
}
#define NitroStaticInit MOD41_02254840
#include "sinit.h"

13
arm9/modules/42/src/module_42_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD42_02254854();
extern void MOD42_02254A38();
static void MOD42_02254840(void)
{
Poketch_InitApp(MOD42_02254854, MOD42_02254A38);
}
#define NitroStaticInit MOD42_02254840
#include "sinit.h"

13
arm9/modules/43/src/module_43_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD43_02254854();
extern void MOD43_02254970();
static void MOD43_02254840(void)
{
Poketch_InitApp(MOD43_02254854, MOD43_02254970);
}
#define NitroStaticInit MOD43_02254840
#include "sinit.h"

13
arm9/modules/44/src/module_44_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD44_02254854();
extern void MOD44_02254920();
static void MOD44_02254840(void)
{
Poketch_InitApp(MOD44_02254854, MOD44_02254920);
}
#define NitroStaticInit MOD44_02254840
#include "sinit.h"

13
arm9/modules/45/src/module_45_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD45_02254854();
extern void MOD45_02254A30();
static void MOD45_02254840(void)
{
Poketch_InitApp(MOD45_02254854, MOD45_02254A30);
}
#define NitroStaticInit MOD45_02254840
#include "sinit.h"

13
arm9/modules/46/src/module_46_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD46_02254854();
extern void MOD46_02254908();
static void MOD46_02254840(void)
{
Poketch_InitApp(MOD46_02254854, MOD46_02254908);
}
#define NitroStaticInit MOD46_02254840
#include "sinit.h"

13
arm9/modules/47/src/module_47_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD47_02254854();
extern void MOD47_0225491C();
static void MOD47_02254840(void)
{
Poketch_InitApp(MOD47_02254854, MOD47_0225491C);
}
#define NitroStaticInit MOD47_02254840
#include "sinit.h"

13
arm9/modules/48/src/module_48_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD48_02254854();
extern void MOD48_0225498C();
static void MOD48_02254840(void)
{
Poketch_InitApp(MOD48_02254854, MOD48_0225498C);
}
#define NitroStaticInit MOD48_02254840
#include "sinit.h"

13
arm9/modules/49/src/module_49_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD49_02254854();
extern void MOD49_02254974();
static void MOD49_02254840(void)
{
Poketch_InitApp(MOD49_02254854, MOD49_02254974);
}
#define NitroStaticInit MOD49_02254840
#include "sinit.h"

13
arm9/modules/50/src/module_50_sinit.c
View File

@ -1,13 +0,0 @@
#include "global.h"
extern void Poketch_InitApp(void *func1, void *func2);
extern void MOD50_02254854();
extern void MOD50_02254908();
static void MOD50_02254840(void)
{
Poketch_InitApp(MOD50_02254854, MOD50_02254908);
}
#define NitroStaticInit MOD50_02254840
#include "sinit.h"

Some files were not shown because too many files have changed in this diff Show More