summaryrefslogtreecommitdiff
path: root/arm9/modules/59
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/59')
-rw-r--r--arm9/modules/59/asm/mod59_021D74E0_asm.s56
-rw-r--r--arm9/modules/59/asm/mod59_021D9868.s16
2 files changed, 36 insertions, 36 deletions
diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s
index c86d2c94..5604bf3c 100644
--- a/arm9/modules/59/asm/mod59_021D74E0_asm.s
+++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s
@@ -883,7 +883,7 @@ _021D7C5E:
add r0, #0x1c
mov r1, #0xf
add r3, r2, #0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r0, r5, #0
ldr r2, _021D7D60 ; =0x000003E2
add r0, #0x1c
@@ -1051,7 +1051,7 @@ _021D7DC4:
bl FUN_02019150
ldr r1, [r5]
add r0, r6, #0
- bl ListMenu_ctor
+ bl ListMenuItems_ctor
mov r7, #0
str r0, [r5, #0x44]
cmp r6, #0
@@ -1061,7 +1061,7 @@ _021D7DDE:
ldr r1, [r5, #0x4c]
ldr r2, [r4]
ldr r3, [r4, #4]
- bl ListMenu_ItemFromMsgData
+ bl ListMenuItems_AppendFromMsgData
add r7, r7, #1
add r4, #8
cmp r7, r6
@@ -1096,7 +1096,7 @@ _021D7DF2:
lsl r3, r3, #0x18
add r2, r1, #0
lsr r3, r3, #0x18
- bl FUN_020010A8
+ bl ListMenuInit
str r0, [r5, #0x40]
ldr r0, [sp, #0x10]
ldr r2, _021D7EC4 ; =0x000003D9
@@ -1111,7 +1111,7 @@ _021D7DF2:
b _021D7E96
_021D7E4C:
ldr r0, [r5, #0x40]
- bl FUN_02001204
+ bl ListMenu_ProcessInput
mov r1, #0
mvn r1, r1
str r0, [r5, #0x48]
@@ -1133,9 +1133,9 @@ _021D7E66:
mov r1, #0
ldr r0, [r5, #0x40]
add r2, r1, #0
- bl FUN_02001300
+ bl DestroyListMenu
ldr r0, [r5, #0x44]
- bl ListMenu_dtor
+ bl ListMenuItems_dtor
ldr r0, _021D7EC8 ; =0x000005DC
bl FUN_020054C8
mov r0, #0
@@ -1234,7 +1234,7 @@ _021D7EFA:
add r0, #0x1c
add r2, r1, #0
add r3, r1, #0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r1, r5, #0
str r1, [sp]
ldr r0, _021D8048 ; =0x00010200
@@ -1273,7 +1273,7 @@ _021D7F7C:
add r0, #0x1c
add r2, r1, #0
add r3, r1, #0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r1, r5, #0
str r1, [sp]
ldr r0, _021D804C ; =0x000F0200
@@ -1367,7 +1367,7 @@ MOD59_021D8058: ; 0x021D8058
str r0, [sp, #0xc]
ldr r2, [r5, #0x18]
mov r0, #0x7d
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
ldr r3, [r5]
mov r1, #0x20
@@ -1383,7 +1383,7 @@ MOD59_021D8058: ; 0x021D8058
ldr r2, [r5, #0x18]
mov r0, #0x7d
mov r3, #7
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
ldr r0, _021D80F8 ; =gGameVersion
ldrb r0, [r0]
cmp r0, #0xa
@@ -1402,7 +1402,7 @@ _021D80AA:
str r0, [sp, #4]
mov r0, #0x7d
add r3, r2, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0xa0
str r0, [sp]
ldr r0, [r5]
@@ -1411,7 +1411,7 @@ _021D80AA:
mov r0, #0x7d
mov r2, #4
mov r3, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
add r0, r5, #0
bl MOD59_021D80FC
add r0, r5, #0
@@ -1460,7 +1460,7 @@ MOD59_021D80FC: ; 0x021D80FC
ldr r2, [r3, #0x18]
mov r0, #0x7d
mov r3, #3
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
_021D8138:
add sp, #0x24
pop {r4, r5, pc}
@@ -1500,7 +1500,7 @@ _021D814C:
ldr r2, [r4, #0x18]
mov r0, #0x7d
mov r3, #1
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0x20
str r0, [sp]
ldr r0, [r4]
@@ -1514,7 +1514,7 @@ _021D814C:
add r1, sp, #0x14
ldr r1, [r1, r2]
mov r2, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1525,7 +1525,7 @@ _021D814C:
ldr r2, [r4, #0x18]
mov r0, #0x7d
mov r3, #1
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
add r0, r4, #0
mov r1, #1
mov r2, #7
@@ -1550,7 +1550,7 @@ _021D81BE:
ldr r2, [r4, #0x18]
mov r0, #0x7d
mov r3, #2
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0x20
str r0, [sp]
ldr r0, [r4]
@@ -1565,7 +1565,7 @@ _021D81BE:
ldr r1, [r1, r2]
mov r2, #0
add r3, #0x83
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1576,7 +1576,7 @@ _021D81BE:
ldr r2, [r4, #0x18]
mov r0, #0x7d
mov r3, #2
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
add r0, r4, #0
mov r1, #2
mov r2, #8
@@ -1618,7 +1618,7 @@ MOD59_021D8234: ; 0x021D8234
ldr r2, [r4, #0x18]
mov r0, #0x7d
mov r3, #7
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
add r0, r4, #0
add r0, #0x8b
ldrb r0, [r0]
@@ -1813,7 +1813,7 @@ MOD59_021D83F8: ; 0x021D83F8
ldr r2, [r4, #0x18]
mov r0, #0x7d
mov r3, #6
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
add r0, r4, #0
mov r1, #6
mov r2, #9
@@ -1826,7 +1826,7 @@ MOD59_021D83F8: ; 0x021D83F8
mov r0, #0x7d
mov r2, #4
mov r3, #0xe0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
ldr r3, [r4]
mov r0, #6
mov r1, #0x20
@@ -1843,7 +1843,7 @@ MOD59_021D83F8: ; 0x021D83F8
ldr r2, [r4, #0x18]
mov r0, #0x7d
mov r3, #6
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
add sp, #0x10
pop {r4, pc}
.align 2, 0
@@ -2007,7 +2007,7 @@ _021D8546:
lsl r1, r1, #2
ldr r1, [r2, r1]
ldr r2, [r4, #0x18]
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
add sp, #0x30
pop {r3, r4, r5, pc}
_021D858E:
@@ -2070,7 +2070,7 @@ _021D85C2:
lsl r1, r1, #2
ldr r1, [r2, r1]
ldr r2, [r4, #0x18]
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
add sp, #0x30
pop {r3, r4, r5, pc}
nop
@@ -2167,7 +2167,7 @@ _021D8698:
ldr r2, [r3, #0x18]
mov r0, #0x7d
mov r3, #1
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
_021D86AE:
add r0, r4, #0
add sp, #0x40
@@ -3374,7 +3374,7 @@ _021D90A2:
str r0, [sp, #0xc]
ldr r2, [r4, #0x18]
mov r0, #0x7d
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
add r0, r4, #0
add r0, #0x94
ldr r0, [r0]
diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s
index 6d2d6e6b..2925c404 100644
--- a/arm9/modules/59/asm/mod59_021D9868.s
+++ b/arm9/modules/59/asm/mod59_021D9868.s
@@ -289,7 +289,7 @@ _021D9A2C:
str r0, [sp, #0xc]
ldr r2, [r4, #4]
mov r0, #0x88
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r3, #0
str r3, [sp]
str r3, [sp, #4]
@@ -299,7 +299,7 @@ _021D9A2C:
str r0, [sp, #0xc]
ldr r2, [r4, #4]
mov r0, #0x88
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
ldr r5, _021D9BC4 ; =0x021DA064
add r3, sp, #0x2c
ldmia r5!, {r0, r1}
@@ -325,7 +325,7 @@ _021D9A2C:
ldr r2, [r4, #4]
mov r0, #0x88
mov r3, #1
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -336,7 +336,7 @@ _021D9A2C:
ldr r2, [r4, #4]
mov r0, #0x88
mov r3, #1
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
ldr r5, _021D9BC8 ; =0x021DA0B8
add r3, sp, #0x10
ldmia r5!, {r0, r1}
@@ -361,7 +361,7 @@ _021D9A2C:
str r0, [sp, #0xc]
ldr r2, [r4, #4]
mov r0, #0x88
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -372,7 +372,7 @@ _021D9A2C:
ldr r2, [r4, #4]
mov r0, #0x88
add r3, r1, #0
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r2, #0
str r2, [sp]
ldr r0, [r4]
@@ -380,7 +380,7 @@ _021D9A2C:
str r0, [sp, #4]
mov r0, #0x88
add r3, r2, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
ldr r2, [r4]
mov r0, #0
mov r1, #0x20
@@ -536,7 +536,7 @@ _021D9C9A:
add r0, #0x10
add r2, r1, #0
add r3, r1, #0
- bl FUN_020196F4
+ bl FillWindowPixelRect
add r0, r5, #0
add r1, r6, #0
add r2, r0, #0
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 10:43:13 +0000