summaryrefslogtreecommitdiff
path: root/arm9/modules/63
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/63')
-rw-r--r--arm9/modules/63/asm/mod63_021D74E0.s36
-rw-r--r--arm9/modules/63/asm/mod63_021D8890.s64
2 files changed, 50 insertions, 50 deletions
diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s
index ab30c4e0..ea96bf3b 100644
--- a/arm9/modules/63/asm/mod63_021D74E0.s
+++ b/arm9/modules/63/asm/mod63_021D74E0.s
@@ -1880,7 +1880,7 @@ MOD63_021D83A8: ; 0x021D83A8
add r2, r5, #0
add r3, r1, #0
str r4, [sp, #0xc]
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1890,7 +1890,7 @@ MOD63_021D83A8: ; 0x021D83A8
add r2, r5, #0
mov r3, #3
str r4, [sp, #0xc]
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1900,7 +1900,7 @@ MOD63_021D83A8: ; 0x021D83A8
add r2, r5, #0
mov r3, #7
str r4, [sp, #0xc]
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1910,7 +1910,7 @@ MOD63_021D83A8: ; 0x021D83A8
add r2, r5, #0
mov r3, #3
str r4, [sp, #0xc]
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
ldr r0, _021D85C8 ; =gGameVersion
ldrb r7, [r0]
cmp r7, #0xa ; VERSION_DIAMOND
@@ -1929,14 +1929,14 @@ _021D8420:
mov r0, #0x30
mov r2, #4
str r4, [sp, #4]
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r2, #0
str r2, [sp]
ldr r1, [sp, #0x18]
mov r0, #0x30
add r3, r2, #0
str r4, [sp, #4]
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
cmp r7, #0xa
bne _021D8448
mov r1, #1
@@ -1954,7 +1954,7 @@ _021D844C:
add r2, r5, #0
mov r3, #6
str r4, [sp, #0xc]
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
mov r3, #1
@@ -1963,7 +1963,7 @@ _021D844C:
mov r2, #6
lsl r3, r3, #0xe
str r4, [sp, #4]
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r1, #0
str r1, [sp]
str r1, [sp, #4]
@@ -1972,7 +1972,7 @@ _021D844C:
add r2, r5, #0
mov r3, #6
str r4, [sp, #0xc]
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1982,7 +1982,7 @@ _021D844C:
add r2, r5, #0
mov r3, #5
str r4, [sp, #0xc]
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
mov r1, #0x10
@@ -1990,7 +1990,7 @@ _021D844C:
mov r2, #6
lsl r3, r1, #9
str r4, [sp, #4]
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -2000,7 +2000,7 @@ _021D844C:
add r2, r5, #0
mov r3, #5
str r4, [sp, #0xc]
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -2010,7 +2010,7 @@ _021D844C:
add r2, r5, #0
mov r3, #1
str r4, [sp, #0xc]
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -2020,7 +2020,7 @@ _021D844C:
add r2, r5, #0
mov r3, #1
str r4, [sp, #0xc]
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0x60
str r0, [sp]
mov r0, #0x30
@@ -2028,7 +2028,7 @@ _021D844C:
mov r2, #0
mov r3, #0x20
str r4, [sp, #4]
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
add r1, r0, #0
bl FUN_02017FE4
@@ -2150,7 +2150,7 @@ _021D85FE:
add r2, r7, #0
mov r3, #5
str r5, [sp, #0xc]
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
mov r0, #0x80
@@ -2158,7 +2158,7 @@ _021D85FE:
mov r2, #6
lsl r3, r0, #6
str r5, [sp, #4]
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -2168,7 +2168,7 @@ _021D85FE:
add r2, r7, #0
mov r3, #5
str r5, [sp, #0xc]
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
_021D863A:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s
index db832531..6f6f8f75 100644
--- a/arm9/modules/63/asm/mod63_021D8890.s
+++ b/arm9/modules/63/asm/mod63_021D8890.s
@@ -849,7 +849,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x13
mov r3, #2
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -860,7 +860,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x13
mov r3, #6
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -871,7 +871,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x14
mov r3, #2
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -882,7 +882,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x15
mov r3, #6
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r2, #0
str r2, [sp]
mov r0, #0x4c
@@ -890,7 +890,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x12
add r3, r2, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r3, #0
str r3, [sp]
mov r0, #0x4c
@@ -898,7 +898,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x12
mov r2, #4
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -909,7 +909,7 @@ MOD63_021D8F38: ; 0x021D8F38
ldr r2, [r4, #0xc]
mov r0, #0x80
add r3, r1, #0
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -920,7 +920,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #2
mov r3, #1
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r1, #0
mov r0, #0x20
str r0, [sp]
@@ -929,7 +929,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
add r2, r1, #0
add r3, r1, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -940,7 +940,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x16
mov r3, #3
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -951,7 +951,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x16
mov r3, #7
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -962,7 +962,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x48
mov r3, #5
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -973,7 +973,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r0, #0x80
mov r1, #0x49
mov r3, #5
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0x20
str r0, [sp]
mov r0, #0x4c
@@ -982,7 +982,7 @@ MOD63_021D8F38: ; 0x021D8F38
mov r1, #0x47
mov r2, #4
mov r3, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #4
mov r1, #0
bl GX_EngineAToggleLayers
@@ -1794,7 +1794,7 @@ _021D96F8:
mov r0, #0x80
mov r1, #0x1c
mov r3, #3
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1805,7 +1805,7 @@ _021D96F8:
mov r0, #0x80
mov r1, #0x1a
mov r3, #3
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r1, #0
str r1, [sp]
ldr r0, [r5, #0x2c]
@@ -1822,7 +1822,7 @@ _021D96F8:
mov r0, #0x80
mov r1, #0x11
mov r3, #4
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1833,7 +1833,7 @@ _021D96F8:
mov r0, #0x80
mov r1, #0xf
mov r3, #4
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #1
lsl r0, r0, #8
str r0, [sp]
@@ -1843,7 +1843,7 @@ _021D96F8:
mov r1, #0x10
mov r2, #4
mov r3, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1854,7 +1854,7 @@ _021D96F8:
mov r0, #0x80
mov r1, #0x1b
mov r3, #1
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1865,7 +1865,7 @@ _021D96F8:
mov r0, #0x80
mov r1, #0x19
mov r3, #1
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -1876,7 +1876,7 @@ _021D96F8:
mov r0, #0x80
mov r1, #0x18
mov r3, #2
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
ldr r0, [r5, #0x10]
bl MOD63_021DA6E8
ldr r0, [r5, #0x10]
@@ -3072,7 +3072,7 @@ _021DA192:
mov r0, #0x80
mov r1, #0x36
mov r3, #1
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3083,7 +3083,7 @@ _021DA192:
mov r0, #0x80
mov r1, #0x3b
mov r3, #1
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3094,7 +3094,7 @@ _021DA192:
mov r0, #0x80
mov r1, #0x38
mov r3, #2
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3105,7 +3105,7 @@ _021DA192:
mov r0, #0x80
mov r1, #0x3d
mov r3, #2
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3116,7 +3116,7 @@ _021DA192:
mov r0, #0x80
mov r1, #0x39
mov r3, #3
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3127,7 +3127,7 @@ _021DA192:
mov r0, #0x80
mov r1, #0x3e
mov r3, #3
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r3, #0
str r3, [sp]
str r3, [sp, #4]
@@ -3137,7 +3137,7 @@ _021DA192:
ldr r2, [r4, #0xc]
mov r0, #0x80
mov r1, #0x3a
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r3, #0
str r3, [sp]
str r3, [sp, #4]
@@ -3147,7 +3147,7 @@ _021DA192:
ldr r2, [r4, #0xc]
mov r0, #0x80
mov r1, #0x3f
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3158,7 +3158,7 @@ _021DA192:
mov r0, #0x80
mov r1, #0x37
mov r3, #5
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3169,7 +3169,7 @@ _021DA192:
mov r0, #0x80
mov r1, #0x3c
mov r3, #5
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
mov r0, #0xe
mov r1, #1
bl GX_EngineAToggleLayers
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 22:34:55 +0000