From 7e441db918ef6fe1c76d36702249d53cd7c82fda Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 3 May 2020 17:40:43 -0400 Subject: Name high-level overlay loading routines --- arm9/modules/11/asm/module_11.s | 70 ++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'arm9/modules/11') diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 21634f2b..1f539d08 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -128,8 +128,8 @@ _0222D6AC: bl MOD11_0222FC38 cmp r0, #1 bne _0222D6D2 - ldr r0, _0222D7F0 ; =0x00000007 - bl FUN_02005F60 + ldr r0, _0222D7F0 ; =SDK_MODULE_07_ID + bl UnloadOverlayByID mov r0, #7 str r0, [r4] mov r0, #0x3d @@ -147,9 +147,9 @@ _0222D6D4: str r0, [r4] b _0222D7EA _0222D6DA: - ldr r0, _0222D7F4 ; =0x00000008 + ldr r0, _0222D7F4 ; =SDK_MODULE_08_ID mov r1, #2 - bl FUN_02005FDC + bl HandleLoadOverlay add r0, r6, #0 bl MOD11_0222DB50 mov r0, #9 @@ -184,8 +184,8 @@ _0222D720: bl MOD11_0222FE58 cmp r0, #1 bne _0222D7EA - ldr r0, _0222D7F0 ; =0x00000007 - bl FUN_02005F60 + ldr r0, _0222D7F0 ; =SDK_MODULE_07_ID + bl UnloadOverlayByID mov r0, #5 bl FUN_020168D0 mov r0, #0x3e @@ -279,8 +279,8 @@ _0222D7EA: add sp, #0x28 pop {r4, r5, r6, pc} .align 2, 0 -_0222D7F0: .word 0x00000007 -_0222D7F4: .word 0x00000008 +_0222D7F0: .word SDK_MODULE_07_ID +_0222D7F4: .word SDK_MODULE_08_ID thumb_func_start MOD11_0222D7F8 MOD11_0222D7F8: ; 0x0222D7F8 @@ -302,16 +302,16 @@ MOD11_0222D7F8: ; 0x0222D7F8 add r0, r4, #0 mov r1, #3 bl MOD11_02231338 - ldr r0, _0222D838 ; =0x00000008 - bl FUN_02005F60 - ldr r0, _0222D83C ; =0x00000009 + ldr r0, _0222D838 ; =SDK_MODULE_08_ID + bl UnloadOverlayByID + ldr r0, _0222D83C ; =SDK_MODULE_09_ID mov r1, #2 - bl FUN_02005FDC + bl HandleLoadOverlay pop {r4, pc} .align 2, 0 _0222D834: .word 0x000023FB -_0222D838: .word 0x00000008 -_0222D83C: .word 0x00000009 +_0222D838: .word SDK_MODULE_08_ID +_0222D83C: .word SDK_MODULE_09_ID thumb_func_start MOD11_0222D840 MOD11_0222D840: ; 0x0222D840 @@ -349,11 +349,11 @@ MOD11_0222D840: ; 0x0222D840 MOD11_0222D88C: ; 0x0222D88C push {r3, r4, r5, lr} add r4, r0, #0 - ldr r0, _0222D938 ; =0x00000009 - bl FUN_02005F60 - ldr r0, _0222D93C ; =0x00000008 + ldr r0, _0222D938 ; =SDK_MODULE_09_ID + bl UnloadOverlayByID + ldr r0, _0222D93C ; =SDK_MODULE_08_ID mov r1, #2 - bl FUN_02005FDC + bl HandleLoadOverlay add r0, r4, #0 mov r1, #0 bl MOD11_02231338 @@ -415,8 +415,8 @@ MOD11_0222D88C: ; 0x0222D88C bl FUN_02008D24 pop {r3, r4, r5, pc} .align 2, 0 -_0222D938: .word 0x00000009 -_0222D93C: .word 0x00000008 +_0222D938: .word SDK_MODULE_09_ID +_0222D93C: .word SDK_MODULE_08_ID _0222D940: .word 0x000023FB thumb_func_start MOD11_0222D944 @@ -1396,13 +1396,13 @@ _0222E220: bl FUN_0201C350 add r0, r4, #0 bl FUN_02016A18 - ldr r0, _0222E25C ; =0x00000008 - bl FUN_02005F60 + ldr r0, _0222E25C ; =SDK_MODULE_08_ID + bl UnloadOverlayByID bl FUN_02033590 cmp r0, #0 bne _0222E244 - ldr r0, _0222E260 ; =0x00000010 - bl FUN_02005F60 + ldr r0, _0222E260 ; =SDK_MODULE_16_ID + bl UnloadOverlayByID _0222E244: pop {r3, r4, r5, r6, r7, pc} nop @@ -1411,8 +1411,8 @@ _0222E24C: .word 0x00002410 _0222E250: .word 0x000023F9 _0222E254: .word 0x00002430 _0222E258: .word 0x00000704 -_0222E25C: .word 0x00000008 -_0222E260: .word 0x00000010 +_0222E25C: .word SDK_MODULE_08_ID +_0222E260: .word SDK_MODULE_16_ID thumb_func_start MOD11_0222E264 MOD11_0222E264: ; 0x0222E264 @@ -3384,13 +3384,13 @@ MOD11_0222F284: ; 0x0222F284 bl FUN_02033590 cmp r0, #0 bne _0222F296 - ldr r0, _0222F298 ; =0x00000010 + ldr r0, _0222F298 ; =SDK_MODULE_16_ID mov r1, #2 - bl FUN_02005FDC + bl HandleLoadOverlay _0222F296: pop {r3, pc} .align 2, 0 -_0222F298: .word 0x00000010 +_0222F298: .word SDK_MODULE_16_ID thumb_func_start MOD11_0222F29C MOD11_0222F29C: ; 0x0222F29C @@ -4244,9 +4244,9 @@ _0222F9C6: mov r0, #0 pop {r4, r5, r6, pc} _0222F9CA: - ldr r0, _0222FAB8 ; =0x00000007 + ldr r0, _0222FAB8 ; =SDK_MODULE_07_ID mov r1, #2 - bl FUN_02005FDC + bl HandleLoadOverlay ldr r1, [r4, #0x2c] mov r0, #8 tst r0, r1 @@ -4363,7 +4363,7 @@ _0222FAA4: pop {r4, r5, r6, pc} nop _0222FAB4: .word 0x00002444 -_0222FAB8: .word 0x00000007 +_0222FAB8: .word SDK_MODULE_07_ID thumb_func_start MOD11_0222FABC MOD11_0222FABC: ; 0x0222FABC @@ -4612,9 +4612,9 @@ _0222FCA2: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0222FCA8: - ldr r0, _0222FE54 ; =0x00000007 + ldr r0, _0222FE54 ; =SDK_MODULE_07_ID mov r1, #2 - bl FUN_02005FDC + bl HandleLoadOverlay mov r0, #5 mov r1, #0x2c bl FUN_02016998 @@ -4818,7 +4818,7 @@ _0222FE48: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0222FE54: .word 0x00000007 +_0222FE54: .word SDK_MODULE_07_ID thumb_func_start MOD11_0222FE58 MOD11_0222FE58: ; 0x0222FE58 -- cgit v1.2.3