diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 18:27:52 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-03 18:27:52 -0400 |
| commit | 94eb56526428935ea1f49d2b8912b5b3022d99b7 (patch) | |
| tree | 8aeb29623e5160c304da993439f488b54254d23e /arm9/modules/17 | |
| parent | d9562dc1675e93f565e63eeba35369688bb70742 (diff) | |
Rename window-related structs; port g2 reg inlines
Diffstat (limited to 'arm9/modules/17')
| -rw-r--r-- | arm9/modules/17/asm/module_17.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index e761b2d7..236cbc5a 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4687,7 +4687,7 @@ MOD17_021D9918: ; 0x021D9918 str r0, [sp, #0x10] ldr r0, [r5, #0x38] ldr r1, [r5, r1] - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _021D99D4 ; =0x000006A8 mov r1, #0xf ldr r0, [r5, r0] @@ -4906,7 +4906,7 @@ MOD17_021D9B30: ; 0x021D9B30 bl FUN_02019570 ldr r0, _021D9B48 ; =0x000006A8 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} nop _021D9B48: .word 0x000006A8 @@ -11279,7 +11279,7 @@ _021DC898: add r1, r4, #0 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -11814,7 +11814,7 @@ MOD17_021DCC68: ; 0x021DCC68 str r0, [sp, #0x10] ldr r1, [r5] add r0, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5] mov r1, #0xf bl FillWindowPixelBuffer @@ -14260,7 +14260,7 @@ MOD17_021DDF1C: ; 0x021DDF1C ldr r1, [r4, r1] mov r2, #3 mov r3, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 mov r1, #0xa0 mov r2, #0xe @@ -14295,7 +14295,7 @@ MOD17_021DDF84: ; 0x021DDF84 mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] |