summaryrefslogtreecommitdiff
path: root/arm9/modules/06/asm/module_06.s
diff options
context:
space:
mode:
authorAkira Akashi <rubenru09@aol.com>2021-05-31 23:37:21 +0100
committerGitHub <noreply@github.com>2021-05-31 23:37:21 +0100
commit901807cd6f693ffa9941ddd167ef0ad9a5cf3d51 (patch)
treefe0b64d8a1f4545690d5c9088b31c84553b61a91 /arm9/modules/06/asm/module_06.s
parent5fb5906a0eb46382ba540660da560fad4400988b (diff)
parentcf0a465d2cd604c0d44a64adfe938551ba5e3800 (diff)
Merge pull request #392 from PikalaxALT/pikalax_work
Decompile gf_gfx_loader.c
Diffstat (limited to 'arm9/modules/06/asm/module_06.s')
-rw-r--r--arm9/modules/06/asm/module_06.s12
1 files changed, 6 insertions, 6 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 1005a2f0..3b86cb19 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -8879,7 +8879,7 @@ MOD06_0223D9E8: ; 0x0223D9E8
ldr r2, [r4]
mov r0, #0x3e
mov r3, #1
- bl FUN_0200687C
+ bl GfGfxLoader_LoadCharData
ldr r0, _0223DA88 ; =0x00000241
ldrb r0, [r4, r0]
cmp r0, #0
@@ -8894,7 +8894,7 @@ MOD06_0223D9E8: ; 0x0223D9E8
mov r0, #0x3e
mov r1, #2
mov r3, #1
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
b _0223DA3E
_0223DA26:
mov r0, #0
@@ -8907,7 +8907,7 @@ _0223DA26:
mov r0, #0x3e
mov r1, #3
mov r3, #1
- bl FUN_020068C8
+ bl GfGfxLoader_LoadScrnData
_0223DA3E:
mov r0, #0x20
str r0, [sp]
@@ -8917,7 +8917,7 @@ _0223DA3E:
mov r0, #0x3e
mov r1, #1
add r3, r2, #0
- bl FUN_02006930
+ bl GfGfxLoader_GXLoadPal
mov r0, #0
str r0, [sp]
mov r3, #0xb
@@ -30992,7 +30992,7 @@ _0224886C:
mov r0, #0x73
add r1, r6, #0
add r3, r5, #0
- bl UncompressFromNarc
+ bl GfGfxLoader_LoadFromNarc
str r0, [r4]
str r5, [r4, #0x10]
str r6, [r4, #0xc]
@@ -44316,7 +44316,7 @@ _0224EFCC:
add r1, r4, #4
mov r2, #0
mov r3, #4
- bl UncompressFromNarc
+ bl GfGfxLoader_LoadFromNarc
str r0, [r6, r7]
add r4, r4, #1
add r6, r6, #4