diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-03 17:40:43 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-03 17:40:43 -0400 |
| commit | 7e441db918ef6fe1c76d36702249d53cd7c82fda (patch) | |
| tree | acce6757c8ae000042ee200def2da0ee2612c296 /arm9/modules/12/asm/module_12.s | |
| parent | 74146cdcf551dd0c96152e9ada119a821bdf2e10 (diff) | |
Name high-level overlay loading routines
Diffstat (limited to 'arm9/modules/12/asm/module_12.s')
| -rw-r--r-- | arm9/modules/12/asm/module_12.s | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 3f005555..9748eb5c 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -524,16 +524,16 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl FUN_020168D0 bl FUN_02083404 bl FUN_02033ED0 - ldr r0, _0222DADC ; =0x00000008 - bl FUN_02005F60 - ldr r0, _0222DAE0 ; =0x00000011 - bl FUN_02005F60 + ldr r0, _0222DADC ; =SDK_MODULE_08_ID + bl UnloadOverlayByID + ldr r0, _0222DAE0 ; =SDK_MODULE_17_ID + bl UnloadOverlayByID mov r0, #1 pop {r3, r4, r5, pc} nop _0222DAD8: .word 0x0000081C -_0222DADC: .word 0x00000008 -_0222DAE0: .word 0x00000011 +_0222DADC: .word SDK_MODULE_08_ID +_0222DAE0: .word SDK_MODULE_17_ID thumb_func_start MOD12_0222DAE4 MOD12_0222DAE4: ; 0x0222DAE4 @@ -3689,15 +3689,15 @@ _0222F3AE: bl FUN_020168D0 bl FUN_02083404 bl FUN_02033ED0 - ldr r0, _0222F450 ; =0x00000008 - bl FUN_02005F60 - ldr r0, _0222F454 ; =0x00000011 - bl FUN_02005F60 + ldr r0, _0222F450 ; =SDK_MODULE_08_ID + bl UnloadOverlayByID + ldr r0, _0222F454 ; =SDK_MODULE_17_ID + bl UnloadOverlayByID mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop -_0222F450: .word 0x00000008 -_0222F454: .word 0x00000011 +_0222F450: .word SDK_MODULE_08_ID +_0222F454: .word SDK_MODULE_17_ID thumb_func_start MOD12_0222F458 MOD12_0222F458: ; 0x0222F458 @@ -5533,17 +5533,17 @@ _02230296: bl FUN_020168D0 bl FUN_02083404 bl FUN_02033ED0 - ldr r0, _022303B8 ; =0x00000008 - bl FUN_02005F60 - ldr r0, _022303BC ; =0x00000011 - bl FUN_02005F60 + ldr r0, _022303B8 ; =SDK_MODULE_08_ID + bl UnloadOverlayByID + ldr r0, _022303BC ; =SDK_MODULE_17_ID + bl UnloadOverlayByID mov r0, #1 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _022303B0: .word 0x00001130 _022303B4: .word 0x0000110C -_022303B8: .word 0x00000008 -_022303BC: .word 0x00000011 +_022303B8: .word SDK_MODULE_08_ID +_022303BC: .word SDK_MODULE_17_ID thumb_func_start MOD12_022303C0 MOD12_022303C0: ; 0x022303C0 @@ -7447,16 +7447,16 @@ _022312B8: .word 0x00000127 thumb_func_start MOD12_022312BC MOD12_022312BC: ; 0x022312BC push {r3, lr} - ldr r0, _022312D0 ; =0x00000008 + ldr r0, _022312D0 ; =SDK_MODULE_08_ID mov r1, #2 - bl FUN_02005FDC - ldr r0, _022312D4 ; =0x00000011 + bl HandleLoadOverlay + ldr r0, _022312D4 ; =SDK_MODULE_17_ID mov r1, #2 - bl FUN_02005FDC + bl HandleLoadOverlay pop {r3, pc} .align 2, 0 -_022312D0: .word 0x00000008 -_022312D4: .word 0x00000011 +_022312D0: .word SDK_MODULE_08_ID +_022312D4: .word SDK_MODULE_17_ID thumb_func_start MOD12_022312D8 MOD12_022312D8: ; 0x022312D8 @@ -41601,10 +41601,10 @@ _022415D4: lsl r2, r2, #8 bl MIi_CpuClear16 bl FUN_02033ED0 - ldr r0, _0224174C ; =0x00000008 - bl FUN_02005F60 - ldr r0, _02241750 ; =0x00000011 - bl FUN_02005F60 + ldr r0, _0224174C ; =SDK_MODULE_08_ID + bl UnloadOverlayByID + ldr r0, _02241750 ; =SDK_MODULE_17_ID + bl UnloadOverlayByID mov r0, #1 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -41614,8 +41614,8 @@ _0224173C: .word 0x00007FFF _02241740: .word 0x05000200 _02241744: .word 0x05000400 _02241748: .word 0x05000600 -_0224174C: .word 0x00000008 -_02241750: .word 0x00000011 +_0224174C: .word SDK_MODULE_08_ID +_02241750: .word SDK_MODULE_17_ID thumb_func_start MOD12_02241754 MOD12_02241754: ; 0x02241754 |