diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-29 11:17:47 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-29 11:17:47 -0400 |
commit | fea86c63479708926cce890f65cf7c9217f6fc4c (patch) | |
tree | fbeaa84706a7e6354163c80b9311f796ec111cc7 | |
parent | 1521f64f6f055c9fd236a9e2c72ffe3860c5eb14 (diff) |
Name funcs in gf_gfx_loader
95 files changed, 1039 insertions, 1020 deletions
diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s index 3f62a449..119c68ff 100644 --- a/arm9/asm/unk_02002C14.s +++ b/arm9/asm/unk_02002C14.s @@ -411,7 +411,7 @@ FUN_02002ED0: ; 0x02002ED0 mov r0, #0xe mov r1, #0x6 add r2, r4, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x8 pop {r4, pc} @@ -427,6 +427,6 @@ FUN_02002EEC: ; 0x02002EEC mov r0, #0xe mov r1, #0x7 add r2, r4, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x8 pop {r4, pc} diff --git a/arm9/asm/unk_02002F08.s b/arm9/asm/unk_02002F08.s index c37869ed..fb6f96ff 100644 --- a/arm9/asm/unk_02002F08.s +++ b/arm9/asm/unk_02002F08.s @@ -226,7 +226,7 @@ FUN_02003084: ; 0x02003084 add r1, r2, #0x0 add r2, sp, #0x4 ldr r4, [sp, #0x1c] - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r6, r0, #0x0 bne _0200309E bl GF_AssertFail diff --git a/arm9/asm/unk_020030E8.s b/arm9/asm/unk_020030E8.s index 30d0ea43..f9b9de1f 100644 --- a/arm9/asm/unk_020030E8.s +++ b/arm9/asm/unk_020030E8.s @@ -72,7 +72,7 @@ FUN_0200317C: ; 0x0200317C add r5, r3, #0x0 add r2, sp, #0x0 add r3, r4, #0x0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0x0 bne _02003192 bl GF_AssertFail @@ -1387,7 +1387,7 @@ FUN_02003B40: ; 0x02003B40 add r0, r1, #0x0 add r1, r2, #0x0 add r2, sp, #0x4 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0x0 bne _02003B58 bl GF_AssertFail diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s index 92341f16..31aabcc3 100644 --- a/arm9/asm/unk_02008DEC.s +++ b/arm9/asm/unk_02008DEC.s @@ -1604,7 +1604,7 @@ FUN_02009978: ; 0x02009978 add r1, r3, #0x0 ldr r2, [sp, #0x10] ldr r3, [sp, #0x24] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, r0, #0x0 ldr r0, [r5, #0x0] ldr r2, [sp, #0x14] diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s index bf4889d8..9e8b3189 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -42,7 +42,7 @@ FUN_0200CABC: ; 0x0200CABC mov r0, #0x26 add r2, r5, #0x0 add r3, r4, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r3-r5, pc} _0200CAE2: @@ -55,7 +55,7 @@ _0200CAE2: mov r0, #0x26 add r2, r5, #0x0 add r3, r4, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r3-r5, pc} @@ -89,7 +89,7 @@ _0200CB18: str r0, [sp, #0xc] mov r0, #0x26 add r3, r5, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, sp, #0x10 ldrb r0, [r0, #0x10] cmp r0, #0x2 @@ -108,7 +108,7 @@ _0200CB3C: str r0, [sp, #0x4] mov r0, #0x26 lsl r3, r4, #0x5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4-r6, pc} _0200CB56: @@ -119,7 +119,7 @@ _0200CB56: str r0, [sp, #0x4] mov r0, #0x26 lsl r3, r4, #0x5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4-r6, pc} @@ -394,7 +394,7 @@ FUN_0200CD68: ; 0x0200CD68 str r0, [sp, #0xc] mov r0, #0x26 add r3, r5, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData cmp r5, #0x4 bhs _0200CDB8 add r0, r7, #0x0 @@ -407,7 +407,7 @@ FUN_0200CD68: ; 0x0200CD68 str r0, [sp, #0x4] mov r0, #0x26 lsl r3, r4, #0x5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x14 pop {r4-r7, pc} _0200CDB8: @@ -421,7 +421,7 @@ _0200CDB8: str r0, [sp, #0x4] mov r0, #0x26 lsl r3, r4, #0x5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x14 pop {r4-r7, pc} .balign 4 @@ -908,7 +908,7 @@ FUN_0200D18C: ; 0x0200D18C mov r1, #0x16 mov r2, #0x0 add r3, sp, #0x3c - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x2c] ldr r0, [sp, #0x3c] mov r7, #0x0 @@ -1006,7 +1006,7 @@ FUN_0200D274: ; 0x0200D274 str r0, [sp, #0x0] mov r0, #0x26 add r3, sp, #0x10 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0xc] mov r1, #0x9 ldr r0, [sp, #0x2c] @@ -1077,7 +1077,7 @@ FUN_0200D300: ; 0x0200D300 mov r0, #0x24 add r3, r6, #0x0 str r4, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x24 ; NARC_GRAPHIC_FIELD_BOARD mov r1, #0x1 add r2, r4, #0x0 @@ -1144,7 +1144,7 @@ _0200D390: str r0, [sp, #0xc] mov r0, #0x24 add r3, r4, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r3-r5, pc} @@ -1792,7 +1792,7 @@ _0200D8DA: mov r0, #0x26 mov r2, #0x0 add r3, sp, #0x30 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r2, #0x80 add r5, r0, #0x0 str r2, [sp, #0x0] diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s index 8ee30228..bc9652c8 100644 --- a/arm9/asm/unk_02011744.s +++ b/arm9/asm/unk_02011744.s @@ -46,7 +46,7 @@ _02011766: mov r2, #0x0 add r3, r4, #0x0 str r7, [sp, #0x0] - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x0] cmp r0, #0x0 bne _0201177E diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index aa2f249b..189206a3 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -471,7 +471,7 @@ _020148EA: ldr r0, [r5, #0x8] ldr r1, [r7, #0xc] add r3, r6, #0x0 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r4, #0x8] ldr r0, [r4, #0x18] ldr r1, [r5, #0x1c] @@ -672,7 +672,7 @@ _02014A58: add r0, r7, #0x0 mov r2, #0x1 add r3, r4, #0x4 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [r4, #0x8] str r5, [r4, #0x0] ldr r0, [sp, #0x20] @@ -710,7 +710,7 @@ _02014AA6: ldr r3, [sp, #0x1c] add r0, r7, #0x0 add r2, r4, #0x0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r4, #0x4] str r5, [r4, #0x8] ldr r0, [sp, #0x18] diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 96cfbab6..780c4833 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -49,7 +49,7 @@ FUN_02048120: ; 0x02048120 mov r1, #0x6 mov r2, #0x0 lsl r3, r3, #0x4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x8 pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0205363C.s b/arm9/asm/unk_0205363C.s index 2e5f334e..aa73064c 100644 --- a/arm9/asm/unk_0205363C.s +++ b/arm9/asm/unk_0205363C.s @@ -165,7 +165,7 @@ FUN_02053708: ; 0x02053708 mov r1, #0x7 add r2, sp, #0x0 add r3, r5, #0x0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData mov r1, #0x9 add r4, r0, #0x0 add r0, r5, #0x0 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 2499c108..295f1006 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2365,7 +2365,7 @@ _0206DA26: str r0, [sp, #0xc] mov r0, #0x76 mov r3, #0x3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -2376,7 +2376,7 @@ _0206DA26: str r0, [sp, #0xc] mov r0, #0x76 mov r3, #0x3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0x0 str r1, [sp, #0x0] mov r0, #0x40 @@ -2441,7 +2441,7 @@ _0206DA26: mov r0, #0xc add r2, r4, #0x0 mov r3, #0x4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -2453,7 +2453,7 @@ _0206DA26: mov r0, #0xc add r2, r4, #0x0 mov r3, #0x4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x1 str r0, [sp, #0x0] mov r0, #0x20 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index a50d92bf..17adb2d2 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1256,7 +1256,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0xf mov r3, #0x3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -1267,7 +1267,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0x11 mov r3, #0x3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x14 ; NARC_GRAPHIC_PLIST_GRA mov r1, #0x10 mov r2, #0xc @@ -1331,7 +1331,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0x3 mov r3, #0x4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0x20 mov r1, #0x4 str r3, [sp, #0x0] @@ -1339,7 +1339,7 @@ FUN_0206FD24: ; 0x0206FD24 str r0, [sp, #0x4] mov r0, #0x14 add r2, r1, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -1349,7 +1349,7 @@ FUN_0206FD24: ; 0x0206FD24 ldr r2, [r5, #0x0] mov r0, #0x14 mov r3, #0x5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -1360,7 +1360,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0xe mov r3, #0x5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp, #0x0] mov r0, #0xc @@ -1369,7 +1369,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r1, #0xd mov r2, #0x4 mov r3, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r2, #0x99 lsl r2, r2, #0x2 mov r3, #0xf9 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 34c0bc89..87e9cab0 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -2269,7 +2269,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f add r2, r1, #0x0 add r3, r1, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp, #0x0] mov r0, #0x12 @@ -2278,7 +2278,7 @@ FUN_02077FE8: ; 0x02077FE8 add r1, r0, #0x0 mov r2, #0x4 mov r3, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x4 mov r1, #0x0 bl FUN_02017FE4 @@ -2295,7 +2295,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f add r2, r4, #0x0 add r3, r1, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x6 @@ -2309,7 +2309,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r1, #0x4 add r2, r4, #0x0 mov r3, #0x2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x2 @@ -2322,7 +2322,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f mov r1, #0x2 add r2, r4, #0x0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0xe @@ -2335,7 +2335,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f mov r1, #0x6 add r2, r4, #0x0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0x0 mov r0, #0xe str r3, [sp, #0x0] @@ -2348,7 +2348,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r0, #0x1f mov r1, #0x7 add r2, r4, #0x0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0x6 mov r0, #0x0 lsl r1, r1, #0x6 @@ -2382,7 +2382,7 @@ FUN_02077FE8: ; 0x02077FE8 mov r1, #0x10 mov r2, #0x1 add r3, r5, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData ldr r1, _0207810C ; =0x000004AC str r0, [r5, r1] add sp, #0x10 @@ -2533,7 +2533,7 @@ _0207818C: mov r0, #0x13 mov r2, #0x0 add r3, r5, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData ldr r1, _02078320 ; =0x000004B4 str r0, [r5, r1] add r0, r1, #0x4 @@ -2547,7 +2547,7 @@ _0207818C: lsl r2, r0, #0x6 add r2, r5, r2 mov r3, #0x12 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData ldr r1, _02078324 ; =0x000004BC str r0, [r5, r1] add r0, r1, #0x4 @@ -3131,7 +3131,7 @@ _020786F0: mov r0, #0x1f add r1, r7, #0x6 add r3, r6, #0x0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0x0 add r1, r6, #0x0 bl FUN_02078BA8 @@ -3435,7 +3435,7 @@ FUN_0207890C: ; 0x0207890C ldr r2, [r5, r2] mov r0, #0x1f mov r1, #0x9 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x46 mov r1, #0x4 lsl r0, r0, #0x4 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 625807ae..3134a96c 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -551,7 +551,7 @@ FUN_0207A0CC: ; 0x0207A0CC ldr r2, [r4, #0x0] mov r0, #0x27 mov r3, #0x3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -562,7 +562,7 @@ FUN_0207A0CC: ; 0x0207A0CC ldr r2, [r4, #0x0] mov r0, #0x27 add r3, r1, #0x0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0x0 str r2, [sp, #0x0] mov r0, #0x13 @@ -570,7 +570,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0x1 add r3, r2, #0x0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -581,7 +581,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0xb mov r3, #0x2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -592,7 +592,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0x2 mov r3, #0x4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -603,7 +603,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0x10 mov r3, #0x5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -614,7 +614,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0xf mov r3, #0x5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0x0 str r3, [sp, #0x0] mov r0, #0x13 @@ -622,7 +622,7 @@ FUN_0207A0CC: ; 0x0207A0CC mov r0, #0x27 mov r1, #0xe mov r2, #0x4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4, pc} diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index 58dba10d..a64d7ab7 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -177,7 +177,7 @@ _0208292A: mov r0, #0x5a add r2, r1, #0x0 add r3, r5, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0x14] mov r0, #0x5a mov r1, #0x0 @@ -513,7 +513,7 @@ FUN_02082B90: ; 0x02082B90 mov r0, #0x5a mov r1, #0x2 mov r2, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0x14] ldr r1, _02082D10 ; =0x00000121 ldr r0, [sp, #0x8] @@ -938,7 +938,7 @@ FUN_02082ED0: ; 0x02082ED0 add r2, r5, #0x0 add r4, r5, #0x0 str r1, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0x14] mov r0, #0x5a mov r1, #0x1 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index e5739d5b..54ce0190 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -772,7 +772,7 @@ FUN_0208699C: ; 0x0208699C mov r0, #0x76 add r2, r5, #0x0 mov r3, #0x3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -783,7 +783,7 @@ FUN_0208699C: ; 0x0208699C mov r0, #0x76 add r2, r5, #0x0 mov r3, #0x3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0x0 str r1, [sp, #0x0] mov r0, #0x40 @@ -815,7 +815,7 @@ FUN_020869F0: ; 0x020869F0 mov r1, #0xa add r2, r5, #0x0 mov r3, #0x4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -827,7 +827,7 @@ FUN_020869F0: ; 0x020869F0 mov r1, #0xb add r2, r5, #0x0 mov r3, #0x4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x1 str r0, [sp, #0x0] mov r0, #0x20 diff --git a/arm9/asm/unk_02087A6C.s b/arm9/asm/unk_02087A6C.s index c508e978..1ab7b908 100644 --- a/arm9/asm/unk_02087A6C.s +++ b/arm9/asm/unk_02087A6C.s @@ -249,7 +249,7 @@ FUN_02087C18: ; 0x02087C18 mov r0, #0x4b add r2, r1, #0x0 str r1, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc pop {r3, pc} .balign 4 @@ -261,7 +261,7 @@ FUN_02087C2C: ; 0x02087C2C mov r0, #0x4b mov r1, #0x1 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc pop {r3, pc} .balign 4 @@ -277,14 +277,14 @@ FUN_02087C40: ; 0x02087C40 mov r0, #0x4b mov r1, #0x9 add r3, r6, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0xa add r3, r6, #0x0 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -302,14 +302,14 @@ FUN_02087C70: ; 0x02087C70 mov r0, #0x4b mov r1, #0x7 add r3, r6, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x8 add r3, r6, #0x0 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -327,14 +327,14 @@ FUN_02087CA0: ; 0x02087CA0 mov r0, #0x4b mov r1, #0x5 add r3, r6, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x6 add r3, r6, #0x0 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} @@ -352,14 +352,14 @@ FUN_02087CD0: ; 0x02087CD0 mov r0, #0x4b mov r1, #0x3 add r3, r6, #0x0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r5, #0x0] mov r2, #0x0 mov r0, #0x4b mov r1, #0x4 add r3, r6, #0x0 str r2, [sp, #0x0] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x0] add sp, #0x4 pop {r3-r6, pc} diff --git a/arm9/global.inc b/arm9/global.inc index fda0c781..19284cbe 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -394,22 +394,22 @@ .extern NARC_ReadFromMember .extern NARC_ReadFile .extern NARC_GetFileCount -.extern FUN_0200687C -.extern FUN_020068C8 -.extern FUN_02006930 -.extern FUN_02006948 -.extern FUN_02006A34 -.extern FUN_02006A8C -.extern FUN_02006AE4 -.extern FUN_02006B38 -.extern FUN_02006BB0 -.extern FUN_02006BDC -.extern FUN_02006C08 -.extern FUN_02006C30 -.extern FUN_02006C5C -.extern FUN_02006C88 -.extern UncompressFromNarc -.extern FUN_02006D18 +.extern GfGfxLoader_LoadCharData +.extern GfGfxLoader_LoadScrnData +.extern GfGfxLoader_GXLoadPal +.extern GfGfxLoader_GXLoadPalWithSrcOffset +.extern GfGfxLoader_LoadWholePalette +.extern GfGfxLoader_PartiallyLoadPalette +.extern GfGfxLoader_LoadImageMapping +.extern GfGfxLoader_SetObjCntFlagsAndLoadImageMapping +.extern GfGfxLoader_GetCharData +.extern GfGfxLoader_GetScrnData +.extern GfGfxLoader_GetPlttData +.extern GfGfxLoader_GetCellBank +.extern GfGfxLoader_GetAnimBank +.extern GfGfxLoader_UncompressFromNarc +.extern GfGfxLoader_LoadFromNarc +.extern GfGfxLoader_LoadFromNarc_GetSizeOut .extern FUN_02006D98 .extern FUN_02006ED4 .extern FUN_020072E8 diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index 8d4f91fa..7b1e767f 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -520,7 +520,7 @@ MOD05_021DC480: ; 0x021DC480 add r1, r5, #0 mov r2, #0 mov r3, #4 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r5, r0, #0 add r1, r4, #0 mov r2, #4 diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s index 73ee60ca..42f9037e 100644 --- a/arm9/modules/05/asm/mod05_021E3444.s +++ b/arm9/modules/05/asm/mod05_021E3444.s @@ -1170,7 +1170,7 @@ MOD05_021E3D20: ; 0x021E3D20 str r0, [sp, #4] mov r0, #0x70 add r2, r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1181,7 +1181,7 @@ MOD05_021E3D20: ; 0x021E3D20 add r1, r6, #0 add r2, r4, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1192,7 +1192,7 @@ MOD05_021E3D20: ; 0x021E3D20 add r1, r5, #0 add r2, r4, #0 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r4, r5, r6, pc} @@ -1464,7 +1464,7 @@ MOD05_021E3F68: ; 0x021E3F68 ldrh r1, [r1, #8] add r2, sp, #4 add r3, r4, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 add r0, sp, #0x20 ldrh r0, [r0, #0x10] @@ -1549,7 +1549,7 @@ MOD05_021E4014: ; 0x021E4014 ldrh r1, [r1, #0xa] mov r2, #0 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #4] ldr r0, [sp, #0xc] ldr r0, [r0, #0x14] diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 4662c7cc..006e8bb1 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -26118,7 +26118,7 @@ MOD05_021F5268: ; 0x021F5268 add r1, r2, #0 str r5, [sp] add r2, r5, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4] bl NNS_G3dGetMdlSet str r0, [r4, #4] @@ -26211,7 +26211,7 @@ MOD05_021F531C: ; 0x021F531C ldr r3, [sp, #0x18] add r2, r6, #0 str r6, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r2, r0, #0 ldr r3, [sp, #0x1c] add r0, r5, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 62890044..9a618431 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 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 215c03c6..80472fdf 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -2010,7 +2010,7 @@ MOD07_02212E90: ; 0x02212E90 str r0, [sp, #0xc] ldr r2, [r4, #0xc] mov r0, #0x6c - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2022,7 +2022,7 @@ MOD07_02212E90: ; 0x02212E90 str r0, [sp, #0xc] ldr r2, [r4, #0xc] mov r0, #0x6c - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2034,7 +2034,7 @@ MOD07_02212E90: ; 0x02212E90 str r0, [sp, #0xc] ldr r2, [r4, #0xc] mov r0, #0x6c - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2046,7 +2046,7 @@ MOD07_02212E90: ; 0x02212E90 str r0, [sp, #0xc] ldr r2, [r4, #0xc] mov r0, #0x6c - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] ldr r0, [r4] @@ -2055,7 +2055,7 @@ MOD07_02212E90: ; 0x02212E90 add r3, r2, #0 str r0, [sp, #4] mov r0, #0x6c - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 ldr r0, [r4, #8] add r2, r1, #0 @@ -3299,7 +3299,7 @@ MOD07_02213924: ; 0x02213924 str r0, [sp, #0xc] ldr r2, [r5, #0xc] mov r0, #0x14 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3311,7 +3311,7 @@ MOD07_02213924: ; 0x02213924 str r0, [sp, #0xc] ldr r2, [r5, #0xc] mov r0, #0x14 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r2, [r5] mov r0, #0x14 ldr r2, [r2, #0x24] diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index 3c0363b4..a02c3f48 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -3198,7 +3198,7 @@ _02213500: mov r0, #7 add r1, r7, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData cmp r4, #1 bne _022135AC ldr r0, [r5] @@ -4144,7 +4144,7 @@ MOD08_02213C94: ; 0x02213C94 ldr r2, [r2] mov r0, #7 add r3, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [sp, #0x10] mov r1, #1 bl MOD08_022156AC @@ -4198,7 +4198,7 @@ _02213D18: ldr r2, [r5] mov r0, #7 add r3, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -4640,7 +4640,7 @@ _02214078: add r2, #0xc4 ldr r2, [r2] mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0x66 lsl r2, r2, #2 add r1, r2, #0 @@ -4681,7 +4681,7 @@ _022140CC: add r2, #0xc4 ldr r2, [r2] mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldrb r0, [r4, #5] add r0, r0, #1 strb r0, [r4, #5] @@ -5016,7 +5016,7 @@ _0221436A: add r2, #0xc4 ldr r2, [r2] mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0x66 lsl r2, r2, #2 add r1, r2, #0 @@ -5057,7 +5057,7 @@ _022143BE: add r2, #0xc4 ldr r2, [r2] mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #3 mov r1, #1 bl FUN_0201797C @@ -5608,7 +5608,7 @@ _022147E4: ldr r1, [r5, r1] ldr r2, [r2] add r3, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData b _0221482A _02214822: add r0, r5, #0 @@ -5630,7 +5630,7 @@ _0221482A: add r5, #0xc4 ldr r2, [r5] add r3, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} @@ -5932,7 +5932,7 @@ MOD08_02214A4C: ; 0x02214A4C ldr r2, [r2] mov r0, #7 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 mov r1, #1 bl MOD08_022156AC @@ -5943,7 +5943,7 @@ MOD08_02214A4C: ; 0x02214A4C add r3, r2, #0 str r0, [sp, #4] mov r0, #7 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 mov r1, #2 bl MOD08_022156AC @@ -5959,7 +5959,7 @@ MOD08_02214A4C: ; 0x02214A4C ldr r2, [r5] mov r0, #7 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -15585,7 +15585,7 @@ _02219228: mov r0, #7 add r1, r6, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r7, #0 mov r1, #1 bl MOD08_022156AC @@ -15639,7 +15639,7 @@ _022192BC: mov r0, #7 add r1, r6, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0xa ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] @@ -15989,7 +15989,7 @@ _02219550: mov r0, #7 add r1, r6, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r7, #0 mov r1, #1 bl MOD08_022156AC @@ -16043,7 +16043,7 @@ _022195EA: mov r0, #7 add r1, r6, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0xa ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] @@ -42742,7 +42742,7 @@ MOD08_02227068: ; 0x02227068 add r3, r4, #0 ldr r1, [r1, r2] ldr r2, [r5, #0x2c] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -42774,7 +42774,7 @@ MOD08_02227068: ; 0x02227068 add r3, r4, #0 ldr r1, [r1, r2] ldr r2, [r5, #0x2c] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r4, r5, r6, pc} nop diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index a3085247..003e2dc8 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2177,7 +2177,7 @@ MOD09_02212F8C: ; 0x02212F8C mov r0, #0x48 mov r1, #0x16 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r2, [r5] mov r0, #0x48 ldr r2, [r2, #0xc] @@ -2279,7 +2279,7 @@ MOD09_02212F8C: ; 0x02212F8C ldr r2, [r5, r2] mov r0, #0x26 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 bl FUN_0200CD64 add r2, r0, #0 @@ -13991,7 +13991,7 @@ MOD09_022191C0: ; 0x022191C0 str r0, [sp, #0xc] ldr r2, [r5, #4] mov r0, #0x4d - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -14002,7 +14002,7 @@ MOD09_022191C0: ; 0x022191C0 str r0, [sp, #0xc] ldr r2, [r5, #4] mov r0, #0x4d - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r2, [r5] mov r0, #0x4d ldr r2, [r2, #0xc] @@ -14059,7 +14059,7 @@ MOD09_022191C0: ; 0x022191C0 str r0, [sp, #0xc] ldr r2, [r5, #4] mov r0, #0x26 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 bl FUN_0200CD64 add r2, r0, #0 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 9fedcb0a..2a6bb196 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -527,7 +527,7 @@ _0222D99A: mov r0, #7 add r1, r1, #3 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r5, #0 bl MOD11_02230C68 add r2, r0, #0 @@ -581,7 +581,7 @@ _0222D99A: mov r0, #7 mov r1, #2 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 lsl r0, r0, #0x1a ldr r2, [r0] @@ -1547,7 +1547,7 @@ _0222E2F0: add r1, r1, #3 add r2, r4, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r5, #0 bl MOD11_02230C68 add r6, r0, #0 @@ -1601,7 +1601,7 @@ _0222E2F0: mov r1, #2 add r2, r4, #0 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 lsl r0, r0, #0x1a ldr r2, [r0] diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index b22a9a77..88362b01 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -84494,7 +84494,7 @@ _02258512: mov r0, #7 mov r2, #1 add r3, sp, #0x18 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r5, r0, #0 lsl r0, r4, #2 add r0, r6, r0 @@ -84597,7 +84597,7 @@ _022585DE: mov r1, #0xca add r2, sp, #0x14 mov r3, #5 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp, #0x14] ldr r1, [r6, #0x60] @@ -84696,7 +84696,7 @@ MOD11_022586BC: ; 0x022586BC mov r1, #0x11 add r2, r5, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r2, _02258790 ; =0x00004E2D add r0, r6, #0 add r1, r4, #0 @@ -88713,7 +88713,7 @@ _0225A7CE: ldr r0, [sp, #0x40] mov r2, #1 add r3, sp, #0x4c - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x44] ldr r0, [sp, #0x4c] ldr r1, [sp, #0x1c] diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 1448f650..effb333a 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -1054,7 +1054,7 @@ MOD12_0222DF30: ; 0x0222DF30 mov r0, #0x2d mov r1, #3 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1066,7 +1066,7 @@ MOD12_0222DF30: ; 0x0222DF30 mov r0, #0x2d mov r1, #5 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 add r1, r0, #0 bl FUN_020178BC @@ -1117,7 +1117,7 @@ MOD12_0222DFC4: ; 0x0222DFC4 ldr r2, [r5, #0x30] mov r0, #0x2d mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1129,7 +1129,7 @@ MOD12_0222DFC4: ; 0x0222DFC4 mov r0, #0x2d mov r1, #2 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1140,7 +1140,7 @@ MOD12_0222DFC4: ; 0x0222DFC4 ldr r2, [r5, #0x30] mov r0, #0x2d mov r1, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1151,7 +1151,7 @@ MOD12_0222DFC4: ; 0x0222DFC4 ldr r2, [r5, #0x30] mov r0, #0x2d mov r1, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 add r0, r5, #0 add r2, r1, #0 @@ -4185,7 +4185,7 @@ MOD12_0222F834: ; 0x0222F834 ldr r2, [r5, #0x30] mov r0, #0x2d mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4197,7 +4197,7 @@ MOD12_0222F834: ; 0x0222F834 mov r0, #0x2d mov r1, #0x15 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x30] mov r1, #1 bl FUN_02018744 @@ -4260,7 +4260,7 @@ MOD12_0222F834: ; 0x0222F834 mov r0, #0x2d mov r1, #0x17 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4272,7 +4272,7 @@ MOD12_0222F834: ; 0x0222F834 mov r0, #0x2d mov r1, #0x14 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -4310,7 +4310,7 @@ MOD12_0222F938: ; 0x0222F938 mov r0, #0x2d mov r1, #0x12 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4322,7 +4322,7 @@ MOD12_0222F938: ; 0x0222F938 mov r0, #0x2d mov r1, #0x13 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 str r0, [sp] mov r0, #0 @@ -6184,7 +6184,7 @@ MOD12_022308F0: ; 0x022308F0 mov r0, #0x2d mov r1, #0xd mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6196,7 +6196,7 @@ MOD12_022308F0: ; 0x022308F0 mov r0, #0x2d mov r1, #0xe mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8440,7 +8440,7 @@ _02231A4C: mov r0, #0x2d mov r2, #1 add r3, sp, #0xc - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r6, r0, #0 lsl r0, r5, #2 add r0, r4, r0 @@ -8679,7 +8679,7 @@ _02231C40: mov r0, #0x2d mov r2, #1 add r3, r7, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0xb6 lsl r1, r1, #2 str r0, [r7, r1] @@ -15831,7 +15831,7 @@ _02235382: mov r0, #0x2d ldr r2, [r2, #0x30] mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldrb r0, [r4, #8] add sp, #0x10 add r0, r0, #1 @@ -25820,7 +25820,7 @@ _02239C90: ldr r2, [r6, #0x30] mov r0, #0x2d mov r1, #0x14 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, _02239D84 ; =MOD12_02239D8C ldr r2, _02239D88 ; =0x00007530 add r1, r4, #0 @@ -28948,7 +28948,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #9 mov r2, #1 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r5, r0, #0 ldr r0, [sp, #0xc] add r1, r4, #0 @@ -28966,7 +28966,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #0x11 mov r2, #1 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r5, r0, #0 ldr r0, [sp, #0xc] add r1, r4, #0 @@ -28984,7 +28984,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #0xf mov r2, #1 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r5, r0, #0 ldr r0, [sp, #0xc] add r1, r4, #0 @@ -29002,7 +29002,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #7 mov r2, #1 add r3, sp, #8 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r1, r4, #0 add r5, r0, #0 ldr r0, [sp, #8] @@ -29020,7 +29020,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #8 mov r2, #1 add r3, sp, #8 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r1, r4, #0 add r5, r0, #0 ldr r0, [sp, #8] @@ -29038,7 +29038,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #0x10 mov r2, #1 add r3, sp, #8 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r1, r4, #0 add r5, r0, #0 ldr r0, [sp, #8] @@ -29056,7 +29056,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 mov r1, #0x1b mov r2, #1 add r3, sp, #8 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r1, r4, #0 add r5, r0, #0 ldr r0, [sp, #8] @@ -42170,7 +42170,7 @@ MOD12_02241BA0: ; 0x02241BA0 mov r0, #0x2d mov r1, #0x12 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -42182,7 +42182,7 @@ MOD12_02241BA0: ; 0x02241BA0 mov r0, #0x2d mov r1, #0x13 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 str r0, [sp] mov r0, #0 @@ -43630,7 +43630,7 @@ MOD12_022426BC: ; 0x022426BC mov r0, #0x2d mov r1, #0x16 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -43642,7 +43642,7 @@ MOD12_022426BC: ; 0x022426BC mov r0, #0x2d mov r1, #0x15 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x30] mov r1, #1 bl FUN_02018744 @@ -43789,7 +43789,7 @@ MOD12_02242804: ; 0x02242804 mov r0, #0x2d mov r1, #0x1a mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -43800,7 +43800,7 @@ MOD12_02242804: ; 0x02242804 ldr r2, [r6, #0x30] mov r0, #0x2d mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -43812,7 +43812,7 @@ MOD12_02242804: ; 0x02242804 mov r0, #0x2d mov r1, #0x19 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r6, #0x30] mov r1, #1 bl FUN_02018744 @@ -47817,7 +47817,7 @@ MOD12_0224473C: ; 0x0224473C mov r0, #0x5a add r1, r1, #3 str r2, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc pop {r3, pc} .align 2, 0 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index af35772e..bdfed5b1 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -10558,7 +10558,7 @@ _021DC79C: mov r1, #0x1a add r2, r5, #0 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #0 mov r1, #0xa bl FUN_02002C84 @@ -12965,7 +12965,7 @@ MOD14_021DDB50: ; 0x021DDB50 ldr r2, [r5, r2] mov r0, #0x12 mov r1, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -12996,7 +12996,7 @@ MOD14_021DDB50: ; 0x021DDB50 ldr r2, [r5, r2] mov r0, #0x12 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0xe0 str r0, [sp] mov r0, #0xa @@ -13005,7 +13005,7 @@ MOD14_021DDB50: ; 0x021DDB50 mov r0, #0x12 mov r1, #5 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 bl MOD14_021DC3C4 cmp r0, #4 @@ -13022,7 +13022,7 @@ MOD14_021DDB50: ; 0x021DDB50 ldr r2, [r5, r2] mov r0, #0x12 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _021DDBF2: mov r0, #0x43 lsl r0, r0, #4 @@ -13736,7 +13736,7 @@ MOD14_021DE138: ; 0x021DE138 ldrb r1, [r1, r2] add r2, sp, #8 mov r3, #0xa - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [sp, #4] cmp r0, #0 beq _021DE1C0 @@ -13810,7 +13810,7 @@ MOD14_021DE1D0: ; 0x021DE1D0 ldr r1, _021DE26C ; =MOD14_021E65AD ldrb r1, [r1, r3] mov r3, #0xa - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0x10] cmp r0, #0 beq _021DE268 @@ -13890,7 +13890,7 @@ MOD14_021DE278: ; 0x021DE278 ldr r1, _021DE2E0 ; =MOD14_021E65AC ldrb r1, [r1, r3] mov r3, #0xa - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #4] cmp r0, #0 beq _021DE2DC @@ -15753,7 +15753,7 @@ MOD14_021DF07C: ; 0x021DF07C mov r0, #0x12 mov r1, #0xd add r3, #0x1c - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x14] mov r0, #0xa add r3, r5, #0 @@ -15762,7 +15762,7 @@ MOD14_021DF07C: ; 0x021DF07C mov r1, #0xe mov r2, #1 add r3, #0x20 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5, #0x18] ldr r0, [r5, #0x14] cmp r0, #0 @@ -15806,7 +15806,7 @@ MOD14_021DF144: ; 0x021DF144 str r0, [sp, #0x10] mov r0, #0x12 mov r1, #0xc - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping ldr r0, _021DF310 ; =0x00000785 ldrb r0, [r4, r0] cmp r0, #1 @@ -18645,13 +18645,13 @@ MOD14_021E078C: ; 0x021E078C mov r0, #0x13 mov r2, #1 mov r3, #0x40 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette bl FUN_0206B888 add r1, r0, #0 mov r0, #0x13 add r2, sp, #0x14 mov r3, #0xa - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [sp, #0xc] cmp r0, #0 beq _021E0818 @@ -18697,7 +18697,7 @@ _021E0818: mov r1, #0x15 mov r2, #1 add r3, #0x10 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #8] mov r0, #0xa str r0, [sp] @@ -18705,7 +18705,7 @@ _021E0818: mov r1, #0x16 mov r2, #1 add r3, r5, #4 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5] mov r0, #0xa add r3, r5, #0 @@ -18714,7 +18714,7 @@ _021E0818: mov r1, #0x17 mov r2, #1 add r3, #0x1c - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x14] mov r0, #0xa add r3, r5, #0 @@ -18723,7 +18723,7 @@ _021E0818: mov r1, #0x18 mov r2, #1 add r3, #0x20 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5, #0x18] mov r0, #0x13 mov r1, #0xa @@ -19277,7 +19277,7 @@ MOD14_021E0C7C: ; 0x021E0C7C mov r0, #0x12 mov r2, #1 add r3, #0x10 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r4, #8] mov r0, #0xa add r3, r4, #0 @@ -19286,7 +19286,7 @@ MOD14_021E0C7C: ; 0x021E0C7C mov r1, #0xb mov r2, #1 add r3, #0x14 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r4, #0xc] ldr r0, [r4, #8] cmp r0, #0 @@ -19324,7 +19324,7 @@ MOD14_021E0CCC: ; 0x021E0CCC str r0, [sp, #0x10] mov r0, #0x12 mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping ldr r0, [r4, #0x44] bl MOD14_021DDD48 add r2, r0, #0 @@ -19450,7 +19450,7 @@ _021E0DAC: mov r1, #0x10 mov r2, #1 add r3, #0x2c - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x28] mov r0, #0 str r0, [r5, #0x30] @@ -19472,7 +19472,7 @@ _021E0DAC: add r0, r4, #0 mov r2, #1 add r3, #0x38 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank mov r1, #0 str r0, [r5, #0x34] add r2, r5, #0 @@ -19696,7 +19696,7 @@ MOD14_021E0FA8: ; 0x021E0FA8 ldr r0, [sp, #0x1c] mov r2, #1 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 mov r6, #0x5e str r0, [sp, #0x14] @@ -19720,7 +19720,7 @@ _021E0FE0: ldr r1, [sp, #0x18] mov r2, #1 mov r3, #0 - bl FUN_02006B38 + bl GfGfxLoader_SetObjCntFlagsAndLoadImageMapping ldr r0, [r5, #0x14] bl MOD14_021DDD48 add r2, r0, #0 @@ -19772,7 +19772,7 @@ _021E103E: str r0, [sp, #0x10] mov r0, #0x12 mov r1, #0xf - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping ldr r0, [r5, #0x14] bl MOD14_021DDD48 add r2, r0, #0 @@ -20131,7 +20131,7 @@ _021E12EC: str r0, [sp, #8] add r0, r6, #0 lsl r3, r3, #0xa - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette ldr r0, [r4, #0x3c] bl FUN_0202011C add r6, r0, #0 @@ -20180,7 +20180,7 @@ _021E12EC: str r0, [sp, #8] add r0, r6, #0 lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #9 ldr r1, [sp, #0x10] lsl r0, r0, #0xe @@ -20679,7 +20679,7 @@ MOD14_021E1750: ; 0x021E1750 mov r1, #0x19 mov r2, #1 add r3, #0x28 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [r4, #0x24] cmp r0, #0 beq _021E17B6 @@ -20781,7 +20781,7 @@ _021E1848: ldr r2, [r6] mov r0, #0x26 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] mov r0, #0xa @@ -20790,7 +20790,7 @@ _021E1848: mov r1, #0x18 mov r2, #0 mov r3, #0xe0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r6, #0x20] ldr r2, _021E1898 ; =0x00000209 lsl r0, r0, #0x18 @@ -21443,12 +21443,12 @@ MOD14_021E1D38: ; 0x021E1D38 mov r0, #0x12 mov r1, #4 add r3, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x12 mov r1, #0x1b add r2, sp, #0x14 mov r3, #0xa - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp, #0x14] add r1, r5, #0 @@ -21462,7 +21462,7 @@ MOD14_021E1D38: ; 0x021E1D38 mov r1, #0x14 add r2, sp, #0x14 mov r3, #0xa - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp, #0x14] mov r1, #0x49 @@ -21522,7 +21522,7 @@ _021E1DBC: mov r1, #0x11 mov r2, #1 add r3, #0x18 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [r5, #0x14] mov r0, #0xa str r0, [sp] @@ -21531,7 +21531,7 @@ _021E1DBC: add r1, r0, #0 mov r2, #1 add r3, #0x20 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5, #0x1c] mov r0, #0xa add r3, r5, #0 @@ -21540,7 +21540,7 @@ _021E1DBC: mov r1, #2 mov r2, #1 add r3, #0x38 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x34] mov r0, #0xa add r3, r5, #0 @@ -21549,7 +21549,7 @@ _021E1DBC: mov r1, #3 mov r2, #1 add r3, #0x30 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x2c] mov r0, #2 mov r1, #0xd @@ -22998,7 +22998,7 @@ MOD14_021E2940: ; 0x021E2940 mov r0, #0x10 mov r2, #0 add r3, sp, #8 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r6, r0, #0 mov r0, #1 lsl r0, r0, #0x1a @@ -23025,7 +23025,7 @@ MOD14_021E2940: ; 0x021E2940 mov r0, #0x10 mov r2, #1 mov r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #1 @@ -23141,7 +23141,7 @@ _021E2A74: mov r1, #6 mov r2, #1 add r3, #0x18 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x14] cmp r0, #0 beq _021E2AB6 @@ -24602,7 +24602,7 @@ MOD14_021E355C: ; 0x021E355C mov r0, #0x12 mov r1, #0x67 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -24614,7 +24614,7 @@ MOD14_021E355C: ; 0x021E355C mov r0, #0x12 mov r1, #0x64 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -24626,7 +24626,7 @@ MOD14_021E355C: ; 0x021E355C mov r0, #0x12 mov r1, #0x65 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -24638,7 +24638,7 @@ MOD14_021E355C: ; 0x021E355C mov r0, #0x12 mov r1, #0x66 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] ldr r0, [r4, #8] @@ -24698,7 +24698,7 @@ MOD14_021E355C: ; 0x021E355C mov r1, #0x68 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 bl MOD14_021E3664 _021E365C: @@ -24727,7 +24727,7 @@ MOD14_021E3664: ; 0x021E3664 mov r0, #0x12 mov r1, #0x72 mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping add r0, r4, #0 add r0, #0xa4 ldr r0, [r0] @@ -24790,7 +24790,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r1, #0x73 mov r2, #1 add r3, #0x9c - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank add r1, r4, #0 add r1, #0x98 str r0, [r1] @@ -24801,7 +24801,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r1, #0x74 mov r2, #1 add r3, #0xa4 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank add r1, r4, #0 add r1, #0xa0 str r0, [r1] @@ -24812,7 +24812,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r1, #0x76 mov r2, #1 add r3, #0xac - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank add r1, r4, #0 add r1, #0xa8 str r0, [r1] @@ -24823,7 +24823,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r1, #0x77 mov r2, #1 add r3, #0xb4 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank add r1, r4, #0 add r1, #0xb0 str r0, [r1] @@ -24838,7 +24838,7 @@ MOD14_021E36FC: ; 0x021E36FC mov r2, #2 mov r3, #0 str r4, [sp, #4] - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette add sp, #8 pop {r4, pc} .align 2, 0 @@ -25767,7 +25767,7 @@ MOD14_021E3E1C: ; 0x021E3E1C mov r0, #0x12 mov r1, #0x75 mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping add r7, r5, #0 mov r6, #0 add r4, r5, #0 @@ -27182,7 +27182,7 @@ MOD14_021E4890: ; 0x021E4890 mov r0, #0x10 mov r2, #0 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #8] cmp r0, #0 beq _021E4950 @@ -27406,7 +27406,7 @@ _021E4A54: str r0, [sp, #8] ldr r3, [r3, r4] mov r0, #0x10 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette lsl r0, r7, #0x10 lsr r0, r0, #0x10 mov r1, #2 @@ -27421,7 +27421,7 @@ _021E4A54: mov r0, #0x10 mov r2, #1 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r1, [sp, #0xc] add r5, #0x1c lsl r4, r6, #2 @@ -27537,7 +27537,7 @@ MOD14_021E4B58: ; 0x021E4B58 str r0, [sp, #8] ldr r3, [r3, r6] mov r0, #0x10 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette lsl r0, r7, #0x10 lsr r0, r0, #0x10 mov r1, #2 @@ -27552,7 +27552,7 @@ MOD14_021E4B58: ; 0x021E4B58 mov r0, #0x10 mov r2, #1 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r1, [sp, #0xc] add r5, #0x1c lsl r4, r4, #2 @@ -28191,7 +28191,7 @@ _021E5064: mov r1, #7 mov r2, #1 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData mov r3, #0x37 lsl r3, r3, #4 str r0, [r4, r3] @@ -28202,7 +28202,7 @@ _021E5064: mov r1, #8 mov r2, #1 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData mov r1, #0xdd lsl r1, r1, #2 str r0, [r4, r1] @@ -28277,7 +28277,7 @@ MOD14_021E5128: ; 0x021E5128 mov r0, #0x12 mov r1, #0x6c mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -28289,7 +28289,7 @@ MOD14_021E5128: ; 0x021E5128 mov r0, #0x12 mov r1, #0x69 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -28301,7 +28301,7 @@ MOD14_021E5128: ; 0x021E5128 mov r0, #0x12 mov r1, #0x6a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -28313,7 +28313,7 @@ MOD14_021E5128: ; 0x021E5128 mov r0, #0x12 mov r1, #0x6b mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x80 str r0, [sp] mov r0, #0xa @@ -28322,7 +28322,7 @@ MOD14_021E5128: ; 0x021E5128 mov r1, #0x6d mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal bl FUN_0206B888 mov r3, #0x80 add r1, r0, #0 @@ -28331,7 +28331,7 @@ MOD14_021E5128: ; 0x021E5128 str r0, [sp, #4] mov r0, #0x13 mov r2, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #4 mov r1, #0x20 mov r2, #0 @@ -29404,7 +29404,7 @@ MOD14_021E5A08: ; 0x021E5A08 mov r1, #0x6f mov r2, #1 add r3, #0x60 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r7, #0x5c] mov r0, #0xa add r3, r7, #0 @@ -29413,7 +29413,7 @@ MOD14_021E5A08: ; 0x021E5A08 mov r1, #0x70 mov r2, #1 add r3, #0x68 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r7, #0x64] mov r0, #0x60 str r0, [sp] @@ -29423,7 +29423,7 @@ MOD14_021E5A08: ; 0x021E5A08 mov r1, #0x71 mov r2, #5 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, sp, #0x48 bl NNS_G2dInitImageProxy mov r3, #0 @@ -29438,7 +29438,7 @@ MOD14_021E5A08: ; 0x021E5A08 mov r0, #0x12 mov r1, #0x6e mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping str r0, [sp, #0x20] ldr r0, [r7, #4] bl MOD14_021DDD48 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 3bc1378b..97282c02 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2951,7 +2951,7 @@ MOD15_021D8AB4: ; 0x021D8AB4 str r0, [sp, #0x10] mov r0, #0x4c mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x23 str r0, [sp] mov r0, #0x66 @@ -2962,7 +2962,7 @@ MOD15_021D8AB4: ; 0x021D8AB4 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r1, #7 mov r0, #0x23 lsl r3, r1, #6 @@ -2970,7 +2970,7 @@ MOD15_021D8AB4: ; 0x021D8AB4 mov r0, #0x4c mov r2, #1 add r3, r4, r3 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank mov r3, #0x1d lsl r3, r3, #4 str r0, [r4, r3] @@ -2981,7 +2981,7 @@ MOD15_021D8AB4: ; 0x021D8AB4 mov r1, #8 mov r2, #1 add r3, r4, r3 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank mov r1, #0x76 lsl r1, r1, #2 str r0, [r4, r1] @@ -4419,7 +4419,7 @@ MOD15_021D9694: ; 0x021D9694 mov r0, #0x4c add r2, r6, #0 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -4429,7 +4429,7 @@ MOD15_021D9694: ; 0x021D9694 str r0, [sp, #0xc] mov r0, #0x4c add r2, r6, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData lsr r4, r0, #5 mov r0, #1 str r0, [sp] @@ -4495,7 +4495,7 @@ MOD15_021D9694: ; 0x021D9694 mov r0, #0x26 add r2, r6, #0 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 add r0, #0xc2 str r0, [r5, #0x60] @@ -4508,7 +4508,7 @@ MOD15_021D9694: ; 0x021D9694 mov r1, #0x18 mov r2, #0 lsl r3, r3, #6 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r5, #4] bl MOD15_021D87E0 lsl r0, r0, #0x18 @@ -4565,12 +4565,12 @@ MOD15_021D97E4: ; 0x021D97E4 mov r0, #0x4c mov r1, #6 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x4c mov r1, #6 add r2, sp, #8 mov r3, #0x23 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp, #8] add r1, r5, #0 @@ -5605,7 +5605,7 @@ MOD15_021D9FD4: ; 0x021D9FD4 mov r1, #4 add r2, r4, #0 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5617,7 +5617,7 @@ MOD15_021D9FD4: ; 0x021D9FD4 mov r1, #5 add r2, r4, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r1, _021DA03C ; =0x021DBA00 add r0, r4, #0 mov r2, #0 @@ -5863,7 +5863,7 @@ MOD15_021DA1D0: ; 0x021DA1D0 mov r0, #0x4c mov r1, #2 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5874,7 +5874,7 @@ MOD15_021DA1D0: ; 0x021DA1D0 mov r0, #0x4c mov r1, #3 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r2, r0, #0 add r0, r5, #0 add r1, r4, #0 @@ -7494,7 +7494,7 @@ MOD15_021DAEB4: ; 0x021DAEB4 mov r1, #0x15 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7506,7 +7506,7 @@ MOD15_021DAEB4: ; 0x021DAEB4 mov r0, #0x4c mov r1, #0xb mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 bl MOD15_021DAFAC add r0, r4, #0 @@ -7613,7 +7613,7 @@ _021DAFB8: mov r0, #0x4c mov r2, #1 add r3, sp, #4 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r7, r0, #0 beq _021DAFE6 ldr r0, [sp, #4] @@ -7675,7 +7675,7 @@ MOD15_021DAFF8: ; 0x021DAFF8 mov r1, #0x14 mov r2, #1 add r3, sp, #0xc - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #8] cmp r0, #0 beq _021DB0D4 @@ -7812,7 +7812,7 @@ MOD15_021DB154: ; 0x021DB154 mov r1, #0x19 mov r2, #2 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r3, #0 str r3, [sp] mov r0, #2 @@ -7825,7 +7825,7 @@ MOD15_021DB154: ; 0x021DB154 mov r0, #0x4c mov r1, #0x18 mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping add r0, r4, #0 add r0, #0x1c mov r1, #0x4c @@ -7906,7 +7906,7 @@ MOD15_021DB224: ; 0x021DB224 add r0, r4, #0 mov r2, #1 add r3, r5, #4 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5] mov r0, #0x23 add r3, r5, #0 @@ -7915,7 +7915,7 @@ MOD15_021DB224: ; 0x021DB224 add r1, r6, #0 mov r2, #1 add r3, #0xc - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5, #8] add sp, #4 pop {r3, r4, r5, r6, pc} diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 2f05ad9a..82ff69c0 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -6027,7 +6027,7 @@ _021DA196: mov r0, #0x4b add r1, r5, #0 add r3, r6, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut ldr r1, [sp, #8] lsr r1, r1, #1 str r1, [r4] @@ -9949,7 +9949,7 @@ _021DBD82: mov r0, #0x8c .endif add r1, r5, r1 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r4] ldr r0, [sp, #8] lsr r0, r0, #2 @@ -10004,7 +10004,7 @@ MOD16_021DBDE4: ; 0x021DBDE4 mov r0, #0x8c .endif add r2, r1, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut cmp r4, #0 beq _021DBE06 ldr r1, [sp, #8] @@ -10032,7 +10032,7 @@ MOD16_021DBE0C: ; 0x021DBE0C mov r0, #0x8c .endif mov r1, #2 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut add r5, r0, #0 cmp r4, #0 beq _021DBE34 @@ -52059,7 +52059,7 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #6 add r3, r2, #0 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -52070,13 +52070,13 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #0x21 add r2, r5, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData str r4, [sp] mov r0, #0x45 mov r1, #0x32 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r3, #0 str r3, [sp] @@ -52100,7 +52100,7 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #0x33 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r1, #3 str r1, [sp] @@ -52124,7 +52124,7 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #0x34 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r6, r0, #0 ldr r2, [sp, #0x10] mov r0, #8 @@ -52149,7 +52149,7 @@ MOD16_021EF790: ; 0x021EF790 mov r1, #0x36 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r4, r0, #0 ldr r2, [sp, #0x10] mov r0, #0x10 @@ -52192,13 +52192,13 @@ MOD16_021EF8A8: ; 0x021EF8A8 mov r1, #0x21 add r2, r4, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData str r5, [sp] mov r0, #0x45 mov r1, #0x39 mov r2, #1 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r3, #0 str r3, [sp] @@ -52520,7 +52520,7 @@ MOD16_021EFB20: ; 0x021EFB20 mov r1, #0x17 add r2, #8 add r3, r5, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData b _021EFB48 _021EFB3A: add r2, r4, #0 @@ -52528,7 +52528,7 @@ _021EFB3A: mov r1, #0x18 add r2, #8 add r3, r5, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData _021EFB48: add r2, r4, #0 str r0, [r4] @@ -52536,7 +52536,7 @@ _021EFB48: mov r1, #0x1a add r2, #0xc add r3, r5, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r4, #4] mov r1, #0 str r1, [r4, #0x10] diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 74c32457..955741b3 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -1752,7 +1752,7 @@ _021D81AC: add r1, r4, #1 mov r2, #0 mov r3, #0xe - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #4] cmp r0, #0 bne _021D81C6 @@ -1778,7 +1778,7 @@ _021D81C6: mov r0, #0x19 add r2, r1, #0 mov r3, #0xe - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r4, r0, #0 ldr r0, [r6, #0x14] add r1, r4, #0 @@ -1816,7 +1816,7 @@ _021D822A: add r1, #0xce mov r2, #0 mov r3, #0xe - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r2, r4, #0 add r1, r0, #0 add r2, #0x64 @@ -1837,7 +1837,7 @@ _021D822A: str r0, [sp] ldr r1, [sp, #8] mov r0, #0x19 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [sp, #0xc] ldr r0, [r5, #0x14] ldr r1, [sp, #0xc] @@ -1887,7 +1887,7 @@ MOD17_021D82B8: ; 0x021D82B8 mov r0, #0x19 mov r1, #0xeb str r2, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x28] add sp, #4 pop {r3, r4, pc} @@ -8834,7 +8834,7 @@ MOD17_021DB6D8: ; 0x021DB6D8 ldrh r0, [r1] ldrh r1, [r1, #2] mov r3, #0xe - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, r0, #0 add r0, r4, #0 mov r2, #0x76 @@ -8913,7 +8913,7 @@ MOD17_021DB700: ; 0x021DB700 ldrh r0, [r6] ldrh r1, [r6, #2] ldr r3, [sp, #0x30] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, sp, #0x10 add r6, r0, #0 bl NNS_G2dGetUnpackedCharacterData @@ -9813,7 +9813,7 @@ _021DBDAA: ldr r0, [r5] add r3, sp, #0x14 ldr r0, [r0, #4] - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r3, [r5] add r4, r0, #0 ldr r0, [r3, #0x18] @@ -9850,7 +9850,7 @@ MOD17_021DBDE8: ; 0x021DBDE8 ldr r0, [r1, #4] ldr r1, [r1, #8] add r3, sp, #0x14 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r3, [r5] add r4, r0, #0 ldr r0, [r3, #0x18] @@ -10023,7 +10023,7 @@ _021DBF2A: ldr r0, [r5, #4] ldr r1, [r5, #0x10] add r3, sp, #0x24 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x24] str r0, [sp, #0x20] ldrh r0, [r2] @@ -10206,7 +10206,7 @@ _021DC0A0: add r0, r7, #0 mov r2, #0 add r3, r4, #4 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [r4, #8] str r5, [r4] ldr r0, [sp, #0x20] @@ -10245,7 +10245,7 @@ _021DC0EE: ldr r3, [sp, #0x1c] add r0, r7, #0 add r2, r4, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r4, #4] str r5, [r4, #8] ldr r0, [sp, #0x18] @@ -13716,7 +13716,7 @@ _021DDAC6: mov r0, #0x19 add r1, r5, #1 mov r2, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r7, r0, #0 ldr r0, [r4, #0x10] add r1, r7, #0 @@ -13749,7 +13749,7 @@ _021DDB1E: ldr r3, [sp, #0xc] mov r0, #0x19 add r2, r1, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r5, r0, #0 ldr r0, [r4, #0x14] add r1, r5, #0 @@ -14023,7 +14023,7 @@ MOD17_021DDD54: ; 0x021DDD54 mov r1, #0x7e mov r2, #0 mov r3, #0x60 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -14034,7 +14034,7 @@ MOD17_021DDD54: ; 0x021DDD54 mov r0, #0x19 mov r1, #0x7d mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5, #0xc] cmp r0, #0 bne _021DDD92 @@ -14050,7 +14050,7 @@ _021DDD96: mov r0, #0x19 mov r2, #0 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r3, #0 str r3, [sp] @@ -14106,7 +14106,7 @@ MOD17_021DDDFC: ; 0x021DDDFC add r1, r0, #0 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -14118,7 +14118,7 @@ MOD17_021DDDFC: ; 0x021DDDFC mov r0, #0xc mov r1, #0xb mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -14130,7 +14130,7 @@ MOD17_021DDDFC: ; 0x021DDDFC mov r0, #0xc mov r1, #0xa mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index db648255..9b2fdf67 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1788,7 +1788,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r0, #0x34 mov r1, #1 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -1798,7 +1798,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r0, #0x34 add r2, r4, #0 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -1809,7 +1809,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r0, #0x34 mov r1, #2 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r3, #0x80 str r3, [sp] mov r0, #0x1d @@ -1818,7 +1818,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r1, #0x34 mov r2, #0 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 add r1, r6, #0 add r2, r5, #0 @@ -1861,7 +1861,7 @@ MOD18_0223A4D8: ; 0x0223A4D8 mov r1, #9 ldr r2, [r2, #4] mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, _0223A55C ; =0x02251380 ldr r0, [r0] ldr r0, [r0, #4] @@ -2500,7 +2500,7 @@ _0223AA5C: mov r1, #0x34 mov r2, #0 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #2 str r0, [sp] mov r0, #4 @@ -3495,7 +3495,7 @@ _0223B1FC: mov r0, #0x37 mov r2, #0 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal b _0223B248 _0223B218: ldr r5, [sp, #0x18] @@ -3505,7 +3505,7 @@ _0223B218: mov r0, #0x37 add r2, r5, r4 mov r3, #0x1d - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData ldr r1, [sp, #0x18] add r1, r1, r4 str r0, [r1, #0x18] @@ -3533,7 +3533,7 @@ _0223B248: ldrh r1, [r1, #0x10] mov r0, #0x37 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData str r0, [sp, #0x20] ldr r0, [sp, #0x30] str r0, [sp, #0x24] @@ -8073,7 +8073,7 @@ MOD18_0223D414: ; 0x0223D414 mov r1, #0x34 mov r2, #0 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #2 str r0, [sp] mov r0, #4 @@ -14679,7 +14679,7 @@ _022406A4: mov r0, #0x32 mov r1, #9 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add sp, #0x1c add r0, r0, #1 @@ -14694,7 +14694,7 @@ _022406D8: mov r0, #0x32 mov r1, #0xa add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r4] add sp, #0x1c add r0, r0, #1 @@ -14725,7 +14725,7 @@ _022406F6: mov r0, #0x32 mov r1, #8 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData b _02240774 _0224072E: ldr r1, _0224088C ; =0x022500A8 @@ -14760,7 +14760,7 @@ _0224072E: ldr r2, [r4, #0x10] mov r0, #0x32 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _02240774: mov r0, #0 mov r1, #3 @@ -23148,7 +23148,7 @@ MOD18_0224486C: ; 0x0224486C mov r0, #0x1c add r3, r1, #0 str r2, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 mov r0, #5 str r1, [sp] @@ -23160,7 +23160,7 @@ MOD18_0224486C: ; 0x0224486C mov r1, #1 add r2, r5, #0 str r3, [sp, #0xc] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -23172,7 +23172,7 @@ MOD18_0224486C: ; 0x0224486C mov r1, #2 add r2, r5, #0 str r3, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #4 mov r1, #0 bl FUN_02054590 @@ -23195,7 +23195,7 @@ MOD18_0224486C: ; 0x0224486C mov r1, #0x34 add r3, #0xc0 str r2, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #1 bl FUN_0200E394 add sp, #0x64 @@ -26973,7 +26973,7 @@ _02246668: mov r1, #0x34 mov r2, #0 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #2 str r0, [sp] mov r0, #4 diff --git a/arm9/modules/19/asm/module_19.s b/arm9/modules/19/asm/module_19.s index 91c756c6..8f3a28ce 100644 --- a/arm9/modules/19/asm/module_19.s +++ b/arm9/modules/19/asm/module_19.s @@ -42,7 +42,7 @@ MOD19_02252440: ; 0x02252440 mov r1, #0xa add r2, r4, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -54,7 +54,7 @@ MOD19_02252440: ; 0x02252440 mov r1, #0xb add r2, r4, #0 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #8 @@ -63,7 +63,7 @@ MOD19_02252440: ; 0x02252440 add r1, r0, #0 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r2, _022524E0 ; =0x04001000 ldr r0, _022524EC ; =0xFFFF1FFF ldr r1, [r2] diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index 23481e5a..a77f95fc 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -1331,7 +1331,7 @@ MOD20_02252D44: ; 0x02252D44 mov r1, #0 add r2, sp, #0 mov r3, #7 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 beq _02252D7A ldr r0, [sp] @@ -1591,7 +1591,7 @@ MOD20_02252ED0: ; 0x02252ED0 ldr r2, [r4, r2] mov r1, #0xe mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1604,7 +1604,7 @@ MOD20_02252ED0: ; 0x02252ED0 ldr r2, [r4, r2] mov r1, #0xf mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1621,7 +1621,7 @@ MOD20_02252ED0: ; 0x02252ED0 mov r1, #0xd mov r2, #4 lsl r3, r3, #5 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r3, #0 str r3, [sp] mov r0, #0x20 @@ -2232,7 +2232,7 @@ MOD20_02253430: ; 0x02253430 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0x60 str r0, [sp] mov r0, #7 @@ -2241,7 +2241,7 @@ MOD20_02253430: ; 0x02253430 mov r0, #0xc mov r2, #5 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r5, #0 mov r1, #0xf bl MOD20_022534D4 @@ -2994,7 +2994,7 @@ MOD20_022539C4: ; 0x022539C4 mov r0, #0x13 add r2, sp, #0 mov r3, #8 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 beq _02253A02 ldr r0, [sp] @@ -3805,12 +3805,12 @@ MOD20_02253FBC: ; 0x02253FBC str r4, [r5, #0x10] add r0, r6, #0 add r2, r4, #0 - bl FUN_02006C88 + bl GfGfxLoader_UncompressFromNarc str r0, [r5] add r0, r6, #0 add r1, r7, #0 add r2, r4, #0 - bl FUN_02006C88 + bl GfGfxLoader_UncompressFromNarc str r0, [r5, #4] ldr r0, [r5] cmp r0, #0 diff --git a/arm9/modules/21/src/mod21_02254A6C.c b/arm9/modules/21/src/mod21_02254A6C.c index 1dcbe4b8..040ebdaa 100644 --- a/arm9/modules/21/src/mod21_02254A6C.c +++ b/arm9/modules/21/src/mod21_02254A6C.c @@ -5,7 +5,7 @@ extern void MOD20_022536F4(u32 *param0, u32 param1); extern u32 MOD20_02252D34(void); -extern void *FUN_02006BDC(u32 param0, u32 param1, u32 param2, void *param3, u32 param4); +extern void *GfGfxLoader_GetScrnData(u32 param0, u32 param1, u32 param2, void *param3, u32 param4); extern void MOD20_022537E0(void *param0, u32 param1, void *param2, u32 param3, void *param4, u32 param5, u32 param6); UnkOverlayStruct1 const MOD21_02254DAC[] = { @@ -26,8 +26,8 @@ u8 const MOD21_02254D90[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; extern void FUN_02016C18(u32 param0, u32 param1, void *param2, u32 param3); -extern void FUN_0200687C(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); -extern void FUN_020068C8(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); +extern void GfGfxLoader_LoadCharData(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); +extern void GfGfxLoader_LoadScrnData(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7); extern void MOD20_02252D7C(u32 param0, u32 param1); extern void FUN_02017CD0(u32 param0, u32 param1); extern void FUN_020178A0(u32 param0, u32 param1); @@ -45,7 +45,7 @@ THUMB_FUNC BOOL MOD21_02254A6C(UnkStruct02254A6C *param0, void *param1) MOD20_022536F4(strct->Unk08, 8); strct->Unk00 = param1; strct->Unk04 = MOD20_02252D34(); - void *res = FUN_02006BDC(12, 0x19, 1, &sp4, 8); + void *res = GfGfxLoader_GetScrnData(12, 0x19, 1, &sp4, 8); if (res == 0) { FreeToHeap(strct); @@ -105,8 +105,8 @@ THUMB_FUNC BOOL MOD21_02254B60(u32 param0, void *param1) #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); FUN_02016C18(strct->Unk04, 6, MOD21_02254D90, 0); - FUN_0200687C(12, 23, strct->Unk04, 6, 0, 0, 1, 8); - FUN_020068C8(12, 24, strct->Unk04, 6, 0, 0, 1, 8); + GfGfxLoader_LoadCharData(12, 23, strct->Unk04, 6, 0, 0, 1, 8); + GfGfxLoader_LoadScrnData(12, 24, strct->Unk04, 6, 0, 0, 1, 8); MOD20_02252D7C(0, 0); MOD21_02254C5C(strct); FUN_02017CD0(strct->Unk04, 6); diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s index e58e406b..bf11e9db 100644 --- a/arm9/modules/22/asm/module_22.s +++ b/arm9/modules/22/asm/module_22.s @@ -1164,7 +1164,7 @@ MOD22_02255098: ; 0x02255098 mov r0, #0xc mov r1, #0x15 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1176,7 +1176,7 @@ MOD22_02255098: ; 0x02255098 mov r0, #0xc mov r1, #0x14 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -1245,7 +1245,7 @@ MOD22_0225516C: ; 0x0225516C str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -1256,7 +1256,7 @@ MOD22_0225516C: ; 0x0225516C mov r0, #0xc mov r1, #0x16 lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #1 add sp, #0xc pop {pc} diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s index 5550c76b..9f052087 100644 --- a/arm9/modules/23/asm/module_23.s +++ b/arm9/modules/23/asm/module_23.s @@ -1165,7 +1165,7 @@ MOD23_02255088: ; 0x02255088 mov r0, #0xc mov r1, #0x10 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1177,7 +1177,7 @@ MOD23_02255088: ; 0x02255088 mov r0, #0xc mov r1, #0x11 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r5, #0 bl MOD23_02255124 mov r0, #0 diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index 16b8766a..cdf4b770 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -818,7 +818,7 @@ _02254E1E: mov r0, #0xc mov r1, #0x1e mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -830,7 +830,7 @@ _02254E1E: mov r0, #0xc mov r1, #0x1f mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -1110,7 +1110,7 @@ MOD24_02255078: ; 0x02255078 str r0, [sp, #8] mov r0, #0xc mov r1, #0x20 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index 481c98c2..5e70bbbe 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -440,7 +440,7 @@ MOD25_02254B34: ; 0x02254B34 mov r0, #0xc mov r1, #0x17 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -452,7 +452,7 @@ MOD25_02254B34: ; 0x02254B34 mov r0, #0xc mov r1, #0x1a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -587,7 +587,7 @@ MOD25_02254C74: ; 0x02254C74 str r0, [sp, #8] mov r0, #0xc mov r1, #0x1d - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 0bb87572..25e4a4b6 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -528,7 +528,7 @@ MOD27_02254C08: ; 0x02254C08 mov r0, #0xc mov r1, #0x6a mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 lsr r5, r0, #5 str r3, [sp] @@ -898,7 +898,7 @@ MOD27_02254F18: ; 0x02254F18 str r0, [sp, #8] mov r0, #0xc mov r1, #0x6d - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r4, #0 add r0, sp, #0x18 strb r4, [r0, #0xa] diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 3d1890e7..04176ba5 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -559,7 +559,7 @@ MOD28_02254C18: ; 0x02254C18 mov r0, #0xc mov r1, #7 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -623,7 +623,7 @@ MOD28_02254CB4: ; 0x02254CB4 mov r0, #0xc mov r1, #0x23 lsl r3, r0, #9 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0x13 mov r1, #8 bl NARC_ctor diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index 723e8449..9fb45a65 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -539,7 +539,7 @@ MOD29_02254C08: ; 0x02254C08 str r0, [sp, #8] mov r0, #0xc mov r1, #0x2a - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette add r2, r6, #0 ldr r0, [r6, #0x30] ldr r1, _02254C7C ; =MOD29_022550C0 @@ -684,7 +684,7 @@ MOD29_02254D10: ; 0x02254D10 mov r0, #0xc mov r1, #0x27 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -696,7 +696,7 @@ MOD29_02254D10: ; 0x02254D10 mov r0, #0xc mov r1, #0x26 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s index aa55cd5b..5daf123f 100644 --- a/arm9/modules/30/asm/module_30.s +++ b/arm9/modules/30/asm/module_30.s @@ -376,7 +376,7 @@ MOD30_02254AE0: ; 0x02254AE0 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -387,7 +387,7 @@ MOD30_02254AE0: ; 0x02254AE0 mov r0, #0xc mov r1, #0x2f lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -548,7 +548,7 @@ MOD30_02254C18: ; 0x02254C18 mov r0, #0xc mov r1, #0x2c mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -560,7 +560,7 @@ MOD30_02254C18: ; 0x02254C18 mov r0, #0xc mov r1, #0x2b mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s index 7dcd4e3a..5e45ce23 100644 --- a/arm9/modules/31/asm/module_31.s +++ b/arm9/modules/31/asm/module_31.s @@ -366,7 +366,7 @@ MOD31_02254AD4: ; 0x02254AD4 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -377,7 +377,7 @@ MOD31_02254AD4: ; 0x02254AD4 mov r0, #0xc mov r1, #0x34 lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -538,7 +538,7 @@ MOD31_02254C0C: ; 0x02254C0C mov r0, #0xc mov r1, #0x31 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -550,7 +550,7 @@ MOD31_02254C0C: ; 0x02254C0C mov r0, #0xc mov r1, #0x30 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s index 5b40a737..c928dd1a 100644 --- a/arm9/modules/32/asm/module_32.s +++ b/arm9/modules/32/asm/module_32.s @@ -349,7 +349,7 @@ MOD32_02254A9C: ; 0x02254A9C str r0, [sp, #8] mov r0, #0xc mov r1, #0x68 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -465,7 +465,7 @@ MOD32_02254B58: ; 0x02254B58 mov r0, #0xc mov r1, #0x65 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -477,7 +477,7 @@ MOD32_02254B58: ; 0x02254B58 mov r0, #0xc mov r1, #0x64 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s index 6db0efdf..55ccf203 100644 --- a/arm9/modules/33/asm/module_33.s +++ b/arm9/modules/33/asm/module_33.s @@ -313,7 +313,7 @@ MOD33_02254A38: ; 0x02254A38 ldr r2, [r5, #4] mov r0, #0xc mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -333,7 +333,7 @@ MOD33_02254A38: ; 0x02254A38 mov r1, #9 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r5, #4] mov r1, #0xc mov r2, #6 diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s index 84100418..ddc4f587 100644 --- a/arm9/modules/34/asm/module_34.s +++ b/arm9/modules/34/asm/module_34.s @@ -407,7 +407,7 @@ MOD34_02254AE8: ; 0x02254AE8 mov r0, #0xc mov r1, #0x3b mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -419,7 +419,7 @@ MOD34_02254AE8: ; 0x02254AE8 mov r0, #0xc mov r1, #0x3a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index 45cab8d3..f73ad3ff 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -431,7 +431,7 @@ MOD35_02254B54: ; 0x02254B54 str r0, [sp, #8] mov r0, #0xc mov r1, #0x54 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r1, #0x14 bl _u32_div_f ldr r1, [sp, #0xc] @@ -609,7 +609,7 @@ MOD35_02254C98: ; 0x02254C98 mov r0, #0xc mov r1, #0x51 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -621,7 +621,7 @@ MOD35_02254C98: ; 0x02254C98 mov r0, #0xc mov r1, #0x50 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index b0353507..0149e180 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -868,7 +868,7 @@ MOD36_02254E8C: ; 0x02254E8C str r0, [sp, #8] mov r0, #0xc mov r1, #0x59 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -1016,7 +1016,7 @@ _02254F9E: mov r0, #0xc mov r1, #0x56 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r6, r0, #0 mov r0, #0 str r0, [sp] @@ -1029,7 +1029,7 @@ _02254F9E: mov r0, #0xc mov r1, #0x55 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s index 3c7f412c..c2f1439a 100644 --- a/arm9/modules/37/asm/module_37.s +++ b/arm9/modules/37/asm/module_37.s @@ -341,7 +341,7 @@ MOD37_02254AA0: ; 0x02254AA0 str r0, [sp, #8] mov r0, #0xc mov r1, #0x39 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r4, #0 @@ -471,7 +471,7 @@ MOD37_02254B70: ; 0x02254B70 mov r0, #0xc mov r1, #0x36 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -483,7 +483,7 @@ MOD37_02254B70: ; 0x02254B70 mov r0, #0xc mov r1, #0x35 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index 89e7ff79..ee5980ec 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -559,7 +559,7 @@ MOD38_02254C38: ; 0x02254C38 str r0, [sp, #8] mov r0, #0xc mov r1, #0x40 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r6, #0 @@ -753,7 +753,7 @@ MOD38_02254D84: ; 0x02254D84 mov r0, #0xc mov r1, #0x3d mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r4, r0, #0 mov r0, #0 str r0, [sp] @@ -766,7 +766,7 @@ MOD38_02254D84: ; 0x02254D84 mov r0, #0xc mov r1, #0x3c mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index a850e16a..da3f83f4 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -586,7 +586,7 @@ MOD39_02254C6C: ; 0x02254C6C str r0, [sp, #8] mov r0, #0xc mov r1, #0x4a - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r1, #0x14 bl _u32_div_f ldr r1, [sp, #0xc] @@ -800,7 +800,7 @@ MOD39_02254DF4: ; 0x02254DF4 mov r0, #0xc mov r1, #0x47 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -812,7 +812,7 @@ MOD39_02254DF4: ; 0x02254DF4 mov r0, #0xc mov r1, #0x46 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index 713e9ec7..13c9a94f 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -759,7 +759,7 @@ MOD40_02254DBC: ; 0x02254DBC str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -770,7 +770,7 @@ MOD40_02254DBC: ; 0x02254DBC mov r0, #0xc mov r1, #0x4f lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -1050,7 +1050,7 @@ MOD40_02254FE8: ; 0x02254FE8 mov r0, #0xc mov r1, #0x4c mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1062,7 +1062,7 @@ MOD40_02254FE8: ; 0x02254FE8 mov r0, #0xc mov r1, #0x4b mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s index 637c100f..4d1afb06 100644 --- a/arm9/modules/41/asm/module_41.s +++ b/arm9/modules/41/asm/module_41.s @@ -1382,7 +1382,7 @@ MOD41_022552A0: ; 0x022552A0 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -1393,7 +1393,7 @@ MOD41_022552A0: ; 0x022552A0 mov r0, #0xc mov r1, #0x5e lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -1573,7 +1573,7 @@ MOD41_022553F4: ; 0x022553F4 mov r0, #0xc mov r1, #0x5b mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1585,7 +1585,7 @@ MOD41_022553F4: ; 0x022553F4 mov r0, #0xc mov r1, #0x5a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index 5bbfa2ba..03136570 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -659,7 +659,7 @@ MOD42_02254D04: ; 0x02254D04 str r0, [sp, #8] mov r0, #0xc mov r1, #0x78 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -965,7 +965,7 @@ MOD42_02254F3C: ; 0x02254F3C mov r0, #0xc mov r1, #0x75 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -977,7 +977,7 @@ MOD42_02254F3C: ; 0x02254F3C mov r0, #0xc mov r1, #0x73 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index fd20dc17..ce3da4bb 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -573,7 +573,7 @@ MOD43_02254C28: ; 0x02254C28 mov r0, #0xc mov r1, #0x75 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r4, r0, #0 mov r0, #0 str r0, [sp] @@ -586,7 +586,7 @@ MOD43_02254C28: ; 0x02254C28 mov r0, #0xc mov r1, #0x74 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -843,7 +843,7 @@ MOD43_02254E78: ; 0x02254E78 str r0, [sp, #8] mov r0, #0xc mov r1, #0x78 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] mov r0, #0x4e diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s index bf007af4..19726565 100644 --- a/arm9/modules/44/asm/module_44.s +++ b/arm9/modules/44/asm/module_44.s @@ -334,7 +334,7 @@ MOD44_02254A90: ; 0x02254A90 str r0, [sp, #8] mov r0, #0xc mov r1, #0x45 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -468,7 +468,7 @@ MOD44_02254B64: ; 0x02254B64 mov r0, #0xc mov r1, #0x42 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -480,7 +480,7 @@ MOD44_02254B64: ; 0x02254B64 mov r0, #0xc mov r1, #0x41 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index d8d9bf36..95cf3fbc 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -505,7 +505,7 @@ MOD45_02254BE0: ; 0x02254BE0 str r0, [sp, #8] mov r0, #0xc mov r1, #0x72 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r5, #0 @@ -660,7 +660,7 @@ MOD45_02254CCC: ; 0x02254CCC mov r0, #0xc mov r1, #0x6f mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -766,7 +766,7 @@ MOD45_02254DDC: ; 0x02254DDC mov r0, #0xc mov r1, #0x6e mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r6, #4] mov r4, #0 cmp r0, #0 diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s index 9e4c3dc5..66418468 100644 --- a/arm9/modules/46/asm/module_46.s +++ b/arm9/modules/46/asm/module_46.s @@ -313,7 +313,7 @@ MOD46_02254A38: ; 0x02254A38 ldr r2, [r5, #4] mov r0, #0xc mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -333,7 +333,7 @@ MOD46_02254A38: ; 0x02254A38 mov r1, #9 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r5, #4] mov r1, #0x1a mov r2, #6 diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index 3ec4768c..3cd1bb32 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -749,7 +749,7 @@ MOD47_02254D8C: ; 0x02254D8C str r0, [sp, #8] mov r0, #0xc mov r1, #0x63 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r6, #0 @@ -889,7 +889,7 @@ MOD47_02254E74: ; 0x02254E74 mov r0, #0xc mov r1, #0x60 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r4, r0, #0 mov r0, #0 str r0, [sp] @@ -902,7 +902,7 @@ MOD47_02254E74: ; 0x02254E74 mov r0, #0xc mov r1, #0x5f mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index ed66d753..8dfd4e0a 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -438,7 +438,7 @@ MOD48_02254B30: ; 0x02254B30 mov r0, #0xc mov r1, #0x7a mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -450,7 +450,7 @@ MOD48_02254B30: ; 0x02254B30 mov r0, #0xc mov r1, #0x79 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -679,7 +679,7 @@ MOD48_02254D2C: ; 0x02254D2C str r0, [sp, #8] mov r0, #0xc mov r1, #0x7d - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette add r1, r4, #0 lsr r0, r0, #5 add r1, #0xac diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s index f91ae977..5d80d9b6 100644 --- a/arm9/modules/50/asm/module_50.s +++ b/arm9/modules/50/asm/module_50.s @@ -322,7 +322,7 @@ MOD50_02254A48: ; 0x02254A48 ldr r2, [r5, #4] mov r0, #0xc mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -342,7 +342,7 @@ MOD50_02254A48: ; 0x02254A48 mov r1, #9 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r1, [r5] ldr r0, [r5, #4] ldr r1, [r1] diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index aa0549bd..4642f8c1 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -120,7 +120,7 @@ MOD51_022548F0: ; 0x022548F0 mov r1, #3 mov r2, #1 add r3, #0x24 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r4, #0x20] add sp, #4 pop {r3, r4, pc} @@ -477,7 +477,7 @@ MOD51_02254B54: ; 0x02254B54 mov r0, #0x4a add r3, r1, #0 str r2, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -491,7 +491,7 @@ MOD51_02254B54: ; 0x02254B54 mov r1, #2 add r2, r4, #0 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -504,7 +504,7 @@ MOD51_02254B54: ; 0x02254B54 add r2, r4, #0 mov r3, #7 str r1, [sp, #0xc] - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #4 mov r1, #0 bl FUN_02054590 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 1866a427..d070f979 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -768,7 +768,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r0, #0x4e add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x40 str r0, [sp] mov r0, #0x27 @@ -777,7 +777,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r1, #1 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -801,7 +801,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r0, #0x4e add r2, r4, #0 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -815,7 +815,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r1, #4 add r2, r4, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #2 @@ -829,7 +829,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r1, #3 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -843,7 +843,7 @@ MOD53_021D7B60: ; 0x021D7B60 mov r0, #0x4e add r2, r4, #0 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #8] ldr r0, [r0, #8] bl Options_GetFrame diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 42233002..b11b96cf 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -612,7 +612,7 @@ _021D79A6: mov r1, #1 add r2, #0x1c mov r3, #0x33 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r7, #0x18] mov r1, #0x32 ldr r0, _021D7A30 ; =0x00004A44 @@ -694,7 +694,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r0, #0x56 add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x33 @@ -703,7 +703,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 add r1, r0, #0 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -725,7 +725,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r1, #0xa add r2, r4, #0 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -737,7 +737,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r1, #0xb add r2, r4, #0 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #2 @@ -750,7 +750,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r0, #0x56 mov r1, #2 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -763,7 +763,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 mov r0, #0x56 mov r1, #3 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #8] ldr r0, [r0, #8] bl Options_GetFrame @@ -3240,7 +3240,7 @@ MOD54_021D8E64: ; 0x021D8E64 mov r1, #8 add r2, r4, r2 mov r3, #0x33 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData mov r2, #0xcd lsl r2, r2, #2 str r0, [r4, r2] @@ -3249,7 +3249,7 @@ MOD54_021D8E64: ; 0x021D8E64 mov r1, #7 add r2, r4, r2 mov r3, #0x33 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData mov r3, #0xce lsl r3, r3, #2 str r0, [r4, r3] @@ -3260,7 +3260,7 @@ MOD54_021D8E64: ; 0x021D8E64 mov r1, #0x20 mov r2, #1 add r3, r4, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0xc9 lsl r1, r1, #2 str r0, [r4, r1] @@ -3271,7 +3271,7 @@ MOD54_021D8E64: ; 0x021D8E64 mov r1, #9 mov r2, #1 add r3, r4, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0xca lsl r1, r1, #2 str r0, [r4, r1] diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index d9a9cad6..b9f3c277 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -726,7 +726,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x34 @@ -734,7 +734,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #3 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -762,7 +762,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #2 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -772,7 +772,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #8 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -783,7 +783,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r0, #0x59 mov r1, #4 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -794,7 +794,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r1, #0xa add r2, r4, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -805,7 +805,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 mov r1, #0xb add r2, r4, #0 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #8] bl Sav2_PlayerData_GetOptionsAddr bl Options_GetFrame @@ -2723,7 +2723,7 @@ MOD55_021D8A7C: ; 0x021D8A7C ldr r2, [r5, #4] mov r0, #0x59 mov r1, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -2733,7 +2733,7 @@ MOD55_021D8A7C: ; 0x021D8A7C ldr r2, [r5, #4] mov r0, #0x59 mov r1, #8 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2744,7 +2744,7 @@ MOD55_021D8A7C: ; 0x021D8A7C mov r0, #0x59 mov r1, #5 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -3573,7 +3573,7 @@ MOD55_021D9184: ; 0x021D9184 mov r0, #0x59 mov r1, #7 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -4110,7 +4110,7 @@ _021D9618: mov r0, #0x59 mov r1, #2 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4121,7 +4121,7 @@ _021D9618: mov r0, #0x59 mov r1, #8 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4132,7 +4132,7 @@ _021D9618: mov r0, #0x59 mov r1, #6 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 @@ -4910,7 +4910,7 @@ _021D9D16: mov r0, #0x59 mov r1, #0xa mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4921,7 +4921,7 @@ _021D9D16: mov r0, #0x59 mov r1, #0xb mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #3 str r0, [sp] mov r1, #1 @@ -4961,7 +4961,7 @@ MOD55_021D9D88: ; 0x021D9D88 ldr r2, [r6, #4] mov r0, #0x59 mov r1, #8 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4972,7 +4972,7 @@ MOD55_021D9D88: ; 0x021D9D88 mov r0, #0x59 mov r1, #4 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r7, #0x29 mov r4, #0 add r5, r6, #0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index e9abf575..531194c6 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -950,7 +950,7 @@ MOD56_0221257C: ; 0x0221257C mov r0, #0x5c mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x36 @@ -958,7 +958,7 @@ MOD56_0221257C: ; 0x0221257C mov r0, #0x5c mov r1, #3 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -978,7 +978,7 @@ MOD56_0221257C: ; 0x0221257C mov r0, #0x5c mov r1, #2 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -988,7 +988,7 @@ MOD56_0221257C: ; 0x0221257C mov r0, #0x5c mov r1, #4 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -999,7 +999,7 @@ MOD56_0221257C: ; 0x0221257C mov r1, #9 add r2, r4, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1010,7 +1010,7 @@ MOD56_0221257C: ; 0x0221257C mov r1, #0xa add r2, r4, #0 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r5, #0xc4 ldr r0, [r5] bl Sav2_PlayerData_GetOptionsAddr @@ -2464,7 +2464,7 @@ MOD56_02213194: ; 0x02213194 ldr r2, [r2] mov r0, #0x5c mov r1, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] @@ -3644,7 +3644,7 @@ MOD56_02213A94: ; 0x02213A94 ldr r2, [r2] mov r0, #0x5c mov r1, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 @@ -6929,7 +6929,7 @@ MOD56_0221547C: ; 0x0221547C ldr r2, [r2] mov r0, #0x5c mov r1, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xf3 mov r1, #0 lsl r0, r0, #2 @@ -6964,7 +6964,7 @@ MOD56_022154BC: ; 0x022154BC mov r0, #0x5c mov r1, #6 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xcb lsl r0, r0, #2 ldr r0, [r5, r0] @@ -7564,7 +7564,7 @@ MOD56_022159B0: ; 0x022159B0 ldr r2, [r2] mov r0, #0x5c mov r1, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 38bd1306..481488f8 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -667,7 +667,7 @@ _021D7A56: mov r1, #0 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7A66: @@ -675,7 +675,7 @@ _021D7A66: mov r1, #1 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7A76: @@ -683,7 +683,7 @@ _021D7A76: mov r1, #2 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7A86: @@ -691,7 +691,7 @@ _021D7A86: mov r1, #3 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7A96: @@ -699,7 +699,7 @@ _021D7A96: mov r1, #4 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7AA6: @@ -707,7 +707,7 @@ _021D7AA6: mov r1, #5 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7AC4 _021D7AB6: @@ -715,7 +715,7 @@ _021D7AB6: mov r1, #6 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 _021D7AC4: ldr r0, [sp] @@ -754,7 +754,7 @@ _021D7B02: mov r1, #7 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7B30 _021D7B12: @@ -762,7 +762,7 @@ _021D7B12: mov r1, #8 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 b _021D7B30 _021D7B22: @@ -770,7 +770,7 @@ _021D7B22: mov r1, #9 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 _021D7B30: ldr r0, [sp] @@ -802,7 +802,7 @@ MOD57_021D7B5C: ; 0x021D7B5C mov r1, #0x29 add r2, sp, #0 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r6, r0, #0 ldr r0, [sp] lsl r4, r4, #5 @@ -952,7 +952,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 mov r1, #0 add r2, sp, #0x14 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r5, r0, #0 ldr r0, [sp, #0x14] mov r1, #2 @@ -979,7 +979,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 mov r1, #0xa add r2, sp, #0x10 mov r3, #0x19 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r5, r0, #0 ldr r0, [sp, #0x10] mov r1, #2 @@ -1010,7 +1010,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 mov r1, #0x1b mov r3, #0x19 str r2, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc ldr r1, _021D7ECC ; =0x000030B8 str r0, [r4, r1] ldr r0, [r4, r1] @@ -1041,7 +1041,7 @@ _021D7D60: mov r1, #0x23 mov r2, #0 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r1, _021D7ED4 ; =0x000032F8 str r0, [r4, r1] b _021D7DF2 @@ -1052,7 +1052,7 @@ _021D7D86: mov r1, #0x24 mov r2, #0 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r1, _021D7ED4 ; =0x000032F8 str r0, [r4, r1] b _021D7DF2 @@ -1064,7 +1064,7 @@ _021D7D9C: mov r0, #0x33 mov r3, #0x19 str r2, [sp] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc ldr r1, _021D7ECC ; =0x000030B8 str r0, [r4, r1] ldr r0, [r4, r1] @@ -1088,7 +1088,7 @@ _021D7DD0: mov r1, #0x2a mov r2, #0 add r3, r4, r3 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r1, _021D7ED4 ; =0x000032F8 str r0, [r4, r1] add r0, r4, #0 @@ -1109,7 +1109,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x17 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1120,7 +1120,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x1e mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1131,7 +1131,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x18 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1142,7 +1142,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x20 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1152,7 +1152,7 @@ _021D7DF2: ldr r2, [r4] mov r0, #0x33 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1163,7 +1163,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x21 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1174,7 +1174,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x1a mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1185,7 +1185,7 @@ _021D7DF2: mov r0, #0x33 mov r1, #0x22 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 add r0, #0xb4 ldr r0, [r0] @@ -1327,7 +1327,7 @@ _021D7FB0: mov r0, #0x33 mov r1, #0x1f mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #4 add r1, r5, #0 mov r2, #6 @@ -1359,7 +1359,7 @@ _021D8006: mov r0, #0x33 mov r1, #0x1e mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #4 mov r1, #7 mov r2, #0xa diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 501480eb..eb13ddb7 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -580,7 +580,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r0, #0x5f add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x40 str r0, [sp] mov r0, #0x27 @@ -589,7 +589,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #2 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -618,7 +618,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #3 add r2, r4, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -632,7 +632,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #5 add r2, r4, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #2 @@ -646,7 +646,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #4 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -660,7 +660,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #6 add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0xc] bl Options_GetFrame lsl r0, r0, #0x18 diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index a928881a..5604bf3c 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -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 370d58b1..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 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index e697563f..26b7d486 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -3801,7 +3801,7 @@ MOD62_0222F2C8: ; 0x0222F2C8 ldr r2, [r2] add r1, #0xb1 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3816,7 +3816,7 @@ MOD62_0222F2C8: ; 0x0222F2C8 ldr r2, [r2] add r1, #0xc1 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 str r1, [sp] mov r0, #0x40 @@ -3844,7 +3844,7 @@ MOD62_0222F2C8: ; 0x0222F2C8 ldr r2, [r2] add r1, #0xb2 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3858,7 +3858,7 @@ MOD62_0222F2C8: ; 0x0222F2C8 ldr r2, [r4] add r1, #0xc2 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r4, pc} thumb_func_end MOD62_0222F2C8 @@ -3882,7 +3882,7 @@ MOD62_0222F36C: ; 0x0222F36C ldr r2, [r2] add r1, #0xb0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3897,7 +3897,7 @@ MOD62_0222F36C: ; 0x0222F36C ldr r2, [r2] add r1, #0xc0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 str r0, [sp] mov r0, #0x40 @@ -3935,7 +3935,7 @@ MOD62_0222F3D4: ; 0x0222F3D4 ldr r2, [r2] add r1, #0xb0 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3950,7 +3950,7 @@ MOD62_0222F3D4: ; 0x0222F3D4 ldr r2, [r2] add r1, #0xbf mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #1 str r0, [sp] mov r0, #0x40 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 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 16c3724b..7a70bf1f 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -704,7 +704,7 @@ MOD64_021D7A54: ; 0x021D7A54 mov r2, #0 mov r3, #0x40 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r5, #0x98 mov r1, #0 mov r2, #2 @@ -1057,7 +1057,7 @@ MOD64_021D7D7C: ; 0x021D7D7C add r4, r0, #0 str r2, [sp] mov r0, #0x52 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x54] bl NNS_G3dGetMdlSet str r0, [r4, #0x58] @@ -1091,7 +1091,7 @@ MOD64_021D7DC0: ; 0x021D7DC0 str r2, [sp] mov r0, #0x52 add r3, r6, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x64] mov r1, #0 bl NNS_G3dGetAnmByIdx @@ -2920,14 +2920,14 @@ MOD64_021D8B70: ; 0x021D8B70 mov r2, #0 add r3, #0x14 str r6, [sp] - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r2, r5, #0 str r0, [r5, #0xc] mov r0, #0x52 mov r1, #0xf add r2, #0x18 add r3, r6, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r5, #0x10] ldr r0, _021D8C04 ; =0x0000064C ldr r0, [r4, r0] @@ -3386,7 +3386,7 @@ MOD64_021D8EF4: ; 0x021D8EF4 mov r1, #0x11 mov r2, #0 mov r3, #0xa0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r5, [sp, #0x14] mov r4, #0 mov r6, #1 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index f67a1817..60bd02b5 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -351,7 +351,7 @@ MOD67_021D77B0: ; 0x021D77B0 ldr r2, [r4] mov r0, #0x50 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -361,7 +361,7 @@ MOD67_021D77B0: ; 0x021D77B0 ldr r2, [r4] mov r0, #0x50 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x2a @@ -369,7 +369,7 @@ MOD67_021D77B0: ; 0x021D77B0 mov r0, #0x50 mov r1, #4 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal b _021D7844 _021D7802: mov r0, #0 @@ -382,7 +382,7 @@ _021D7802: mov r0, #0x50 mov r1, #3 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -393,7 +393,7 @@ _021D7802: mov r0, #0x50 mov r1, #1 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x2a @@ -401,7 +401,7 @@ _021D7802: mov r0, #0x50 mov r1, #5 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal _021D7844: ldr r0, [r4] mov r1, #2 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index ebb66d25..b2170444 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -340,7 +340,7 @@ MOD68_021D77A4: ; 0x021D77A4 ldr r2, [r5] mov r0, #0x35 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -350,7 +350,7 @@ MOD68_021D77A4: ; 0x021D77A4 ldr r2, [r5] mov r0, #0x35 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -361,7 +361,7 @@ MOD68_021D77A4: ; 0x021D77A4 mov r0, #0x35 mov r1, #1 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x24 @@ -369,7 +369,7 @@ MOD68_021D77A4: ; 0x021D77A4 mov r0, #0x35 mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x24 mov r1, #0x80 bl AllocFromHeap @@ -1286,7 +1286,7 @@ MOD68_021D7EEC: ; 0x021D7EEC str r0, [sp, #0xc] ldr r2, [r4] mov r0, #0x35 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x7e lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1300,7 +1300,7 @@ MOD68_021D7EEC: ; 0x021D7EEC mov r0, #0x35 mov r2, #0 mov r3, #0x60 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 2a478ef5..58d0b4f8 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -533,7 +533,7 @@ _0222DA0E: ldr r2, [r4, #0x10] mov r0, #0x69 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -811,7 +811,7 @@ MOD69_0222DBAC: ; 0x0222DBAC ldr r2, [r4, #0x10] mov r0, #0x69 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -822,7 +822,7 @@ MOD69_0222DBAC: ; 0x0222DBAC ldr r2, [r4, #0x10] mov r0, #0x69 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x60 str r0, [sp] mov r0, #0x3f @@ -831,7 +831,7 @@ MOD69_0222DBAC: ; 0x0222DBAC mov r0, #0x69 mov r1, #4 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -843,7 +843,7 @@ MOD69_0222DBAC: ; 0x0222DBAC ldr r2, [r4, #0x10] mov r0, #0x69 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4, #0x10] mov r1, #1 bl FUN_02017CD0 @@ -1095,7 +1095,7 @@ MOD69_0222DE98: ; 0x0222DE98 mov r1, #0x29 mov r2, #0 add r3, sp, #0x18 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank mov r1, #0x5b lsl r1, r1, #2 str r0, [r4, r1] @@ -1105,7 +1105,7 @@ MOD69_0222DE98: ; 0x0222DE98 mov r1, #0x2a mov r2, #0 add r3, sp, #0x14 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank mov r1, #0x17 lsl r1, r1, #4 str r0, [r4, r1] @@ -1156,13 +1156,13 @@ MOD69_0222DF0C: ; 0x0222DF0C str r0, [sp] mov r0, #0x1b add r3, sp, #0x44 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x28] mov r0, #0x1b mov r1, #0x27 add r2, sp, #0x40 mov r3, #0x3f - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [sp, #0x24] mov r0, #0 str r0, [sp, #0x20] @@ -1303,7 +1303,7 @@ _0222DF98: ldrh r1, [r1, #4] mov r2, #1 add r3, r6, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x81 lsl r1, r1, #2 ldr r1, [r5, r1] @@ -1398,7 +1398,7 @@ _0222E10E: ldrh r1, [r1, #4] mov r2, #1 mov r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp, #0x94] add r0, sp, #0x80 diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index f6d3dc58..9db294af 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -831,7 +831,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 ldr r2, [r5, #0x10] mov r0, #0x65 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -842,7 +842,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 ldr r2, [r5, #0x10] mov r0, #0x65 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x40 str r0, [sp] mov r0, #0x3d @@ -851,7 +851,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 mov r0, #0x65 mov r1, #2 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r2, #0 str r2, [sp] mov r1, #1 @@ -1357,7 +1357,7 @@ MOD70_021D7F70: ; 0x021D7F70 mov r1, #0x29 mov r2, #0 add r3, sp, #8 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank mov r1, #0x5e lsl r1, r1, #2 str r0, [r4, r1] @@ -1367,7 +1367,7 @@ MOD70_021D7F70: ; 0x021D7F70 mov r1, #0x2a mov r2, #0 add r3, sp, #4 - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank mov r1, #0x5f lsl r1, r1, #2 str r0, [r4, r1] @@ -1448,13 +1448,13 @@ MOD70_021D7FF8: ; 0x021D7FF8 add r2, r3, #0 mov r0, #0x1b add r3, sp, #0x14 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0xc] mov r0, #0x1b mov r1, #0x27 add r2, sp, #0x10 mov r3, #0x3d - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData mov r4, #0 ldr r6, _021D80C4 ; =0x021D82AC str r0, [sp, #8] @@ -1605,7 +1605,7 @@ _021D80F4: ldrh r1, [r1, #4] ldr r3, [sp, #0x14] mov r2, #1 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [sp, #0x20] ldr r0, [r0, #0x18] cmp r4, r0 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 00f887bb..303bee40 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -756,7 +756,7 @@ _0222DC0C: mov r0, #0x13 mov r2, #0 add r3, r6, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0x79 lsl r1, r1, #4 str r0, [r5, r1] @@ -1821,7 +1821,7 @@ MOD71_0222E4DC: ; 0x0222E4DC ldrh r1, [r2, r1] mov r2, #5 lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, _0222E548 ; =0x00002110 mov r1, #0 str r1, [r5, r0] @@ -2220,7 +2220,7 @@ MOD71_0222E884: ; 0x0222E884 str r2, [sp] ldr r2, [sp, #0x20] ldr r3, [sp, #0x24] - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r6, r0, #0 beq _0222E8D6 add r1, sp, #4 @@ -2291,7 +2291,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 mov r2, #4 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 mov r0, #0x12 lsl r0, r0, #4 @@ -2301,7 +2301,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 add r1, r0, #0 bl FUN_02017FE4 @@ -2325,7 +2325,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 add r2, r4, #0 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2353,7 +2353,7 @@ MOD71_0222E900: ; 0x0222E900 mov r1, #4 add r2, r4, #0 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 mov r1, #0x40 mov r2, #0x1a @@ -2375,7 +2375,7 @@ MOD71_0222E900: ; 0x0222E900 mov r1, #2 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2389,7 +2389,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 add r2, r4, #0 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2403,7 +2403,7 @@ MOD71_0222E900: ; 0x0222E900 mov r0, #0x36 add r2, r4, #0 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #4 mov r1, #0x40 mov r2, #0x1a @@ -2628,7 +2628,7 @@ _0222EAA6: mov r0, #0x13 mov r2, #1 add r3, #0xc0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD71_0222EA68 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index f8da5256..7d9850cc 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -3681,7 +3681,7 @@ MOD73_021D9258: ; 0x021D9258 mov r0, #0x7a mov r2, #0 add r3, sp, #4 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData add r4, r0, #0 ldr r0, [sp, #4] str r5, [sp, #8] @@ -3705,7 +3705,7 @@ MOD73_021D9288: ; 0x021D9288 add r3, r2, #0 mov r0, #0x7a add r2, sp, #0 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r4, r0, #0 ldr r0, [sp] str r5, [sp, #4] @@ -5042,7 +5042,7 @@ MOD73_021D9CA0: ; 0x021D9CA0 mov r1, #1 mov r2, #4 str r4, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -5051,7 +5051,7 @@ MOD73_021D9CA0: ; 0x021D9CA0 ldr r2, [r5, #4] mov r0, #0x7a mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5, #0x14] cmp r0, #1 bne _021D9CD6 @@ -5065,7 +5065,7 @@ _021D9CD8: mov r0, #0x7a mov r2, #0 add r3, #0x24 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x20] ldr r2, [r5, #0x24] mov r3, #0 @@ -5104,7 +5104,7 @@ _021D9CD8: mov r1, #4 mov r2, #0 add r3, #0x2c - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData str r0, [r5, #0x28] ldr r0, [r5, #4] mov r1, #5 @@ -5997,7 +5997,7 @@ MOD73_021DA374: ; 0x021DA374 mov r2, #0 mov r3, #0x80 str r5, [sp, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6007,13 +6007,13 @@ MOD73_021DA374: ; 0x021DA374 mov r0, #0x7a mov r1, #5 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData str r5, [sp] mov r0, #0x7a mov r1, #7 mov r2, #0 add r3, sp, #0x10 - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData ldr r2, [sp, #0x10] mov r3, #0 str r3, [sp] diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index f84a1de7..3500c458 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -785,7 +785,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #7 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -796,7 +796,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xa mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -807,7 +807,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #9 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #6 @@ -815,7 +815,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #8 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #6 @@ -824,7 +824,7 @@ MOD75_021E7214: ; 0x021E7214 mov r1, #0x12 mov r2, #0 lsl r3, r0, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x16 mov r0, #0 lsl r1, r1, #4 @@ -862,7 +862,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xb mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] mov r0, #6 @@ -870,7 +870,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xc mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -881,7 +881,7 @@ MOD75_021E7214: ; 0x021E7214 ldr r2, [r4] add r1, r0, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -892,7 +892,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0x25 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -903,7 +903,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0x24 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -914,7 +914,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xf mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0x40 str r3, [sp] mov r0, #6 @@ -922,7 +922,7 @@ MOD75_021E7214: ; 0x021E7214 mov r0, #0xd mov r1, #0xe mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index baa825fc..4f32e870 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -402,7 +402,7 @@ MOD76_021D7814: ; 0x021D7814 mov r0, #0x71 mov r1, #0xa mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -413,7 +413,7 @@ MOD76_021D7814: ; 0x021D7814 mov r0, #0x71 mov r1, #0xb mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x43 @@ -421,7 +421,7 @@ MOD76_021D7814: ; 0x021D7814 mov r0, #0x71 mov r1, #0xc add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #7 mov r0, #0 lsl r1, r1, #6 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index bdbf644f..6affcb88 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -897,7 +897,7 @@ MOD77_021D7C64: ; 0x021D7C64 mov r0, #0x66 ldr r3, [r3] mov r1, #0x12 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [sp, #0x18] ldr r0, [sp, #0x20] mov r1, #6 @@ -957,7 +957,7 @@ _021D7CE0: mov r0, #0x66 ldr r3, [r3] mov r2, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [sp, #0x14] ldr r0, [sp, #0x1c] mov r5, #1 @@ -1360,7 +1360,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r1, #5 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x80 str r0, [sp] ldr r0, [r5] @@ -1369,7 +1369,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1381,7 +1381,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 ldr r2, [r5, r2] add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5, #8] bl Options_GetFrame lsl r0, r0, #0x18 @@ -1468,7 +1468,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r1, #5 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x80 str r0, [sp] ldr r0, [r5] @@ -1477,7 +1477,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r1, #6 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1489,7 +1489,7 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #0x81 mov r1, #7 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] ldr r0, [r5] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 9f5fda4b..83e02d71 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -2001,7 +2001,7 @@ _0222E414: mov r0, #0x13 add r2, sp, #0x18 mov r3, #0x3e - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [sp, #0x14] ldr r0, [sp, #0x18] mov r1, #0x60 @@ -2797,7 +2797,7 @@ MOD80_0222EB6C: ; 0x0222EB6C mov r0, #0x68 mov r1, #4 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -2836,7 +2836,7 @@ MOD80_0222EB6C: ; 0x0222EB6C mov r0, #0x68 mov r1, #0xe add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2849,7 +2849,7 @@ MOD80_0222EB6C: ; 0x0222EB6C mov r0, #0x68 mov r1, #0x1e add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2863,7 +2863,7 @@ MOD80_0222EB6C: ; 0x0222EB6C mov r1, #0x1d add r2, r4, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r5, #0 bl MOD80_0222F338 add sp, #0x10 @@ -3790,7 +3790,7 @@ MOD80_0222F338: ; 0x0222F338 mov r1, #5 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #0x2a @@ -3804,7 +3804,7 @@ MOD80_0222F338: ; 0x0222F338 mov r1, #0xf add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -3818,7 +3818,7 @@ MOD80_0222F338: ; 0x0222F338 mov r1, #0x1f add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r4, pc} thumb_func_end MOD80_0222F338 @@ -4081,7 +4081,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r0, #0x68 mov r1, #7 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #1 lsl r0, r0, #8 str r0, [sp] @@ -4091,7 +4091,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r1, #5 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -4130,7 +4130,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r0, #0x68 mov r1, #0x11 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -4143,7 +4143,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r0, #0x68 mov r1, #0x19 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #0x2a @@ -4157,7 +4157,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r1, #0xf add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -4171,7 +4171,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 mov r1, #0x1f add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -5100,7 +5100,7 @@ MOD80_0222FD88: ; 0x0222FD88 ldrh r1, [r1, #4] mov r2, #1 lsl r3, r3, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 bl FreeToHeap add sp, #0x30 @@ -5419,7 +5419,7 @@ MOD80_02230054: ; 0x02230054 mov r0, #0x68 mov r1, #0x11 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x60 str r0, [sp] mov r0, #0x3e @@ -5428,7 +5428,7 @@ MOD80_02230054: ; 0x02230054 mov r0, #0x68 mov r1, #7 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD80_02230054 @@ -5890,7 +5890,7 @@ MOD80_0223043C: ; 0x0223043C ldr r2, [r4, #4] mov r0, #0x68 mov r1, #0x1b - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r2, _022304BC ; =0x00000B34 ldr r0, _022304C0 ; =0x00000F98 mov r3, #0xba @@ -5922,7 +5922,7 @@ _0223048C: ldr r2, [r4, #4] mov r0, #0x68 mov r1, #0x1c - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r2, _022304C4 ; =0x00000B54 ldr r0, _022304C0 ; =0x00000F98 ldr r1, [r4, r2] @@ -6377,7 +6377,7 @@ MOD80_02230840: ; 0x02230840 mov r0, #0x68 mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #1 lsl r0, r0, #8 str r0, [sp] @@ -6387,7 +6387,7 @@ MOD80_02230840: ; 0x02230840 mov r1, #5 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -6426,7 +6426,7 @@ MOD80_02230840: ; 0x02230840 mov r0, #0x68 mov r1, #0xd add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -6439,7 +6439,7 @@ MOD80_02230840: ; 0x02230840 mov r0, #0x68 mov r1, #0x1a add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -8789,7 +8789,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r0, #0x68 mov r1, #2 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #1 lsl r0, r0, #8 str r0, [sp] @@ -8799,7 +8799,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r1, #5 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -8838,7 +8838,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r0, #0x68 mov r1, #0xc add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -8851,7 +8851,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r0, #0x68 mov r1, #0x18 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] mov r0, #6 @@ -8865,7 +8865,7 @@ MOD80_02231BF4: ; 0x02231BF4 mov r1, #0x1d add r2, r4, #0 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD80_02231BF4 @@ -11828,7 +11828,7 @@ MOD80_0223346C: ; 0x0223346C mov r0, #0x68 mov r1, #1 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -11867,7 +11867,7 @@ MOD80_0223346C: ; 0x0223346C mov r0, #0x68 mov r1, #0xb add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -11880,7 +11880,7 @@ MOD80_0223346C: ; 0x0223346C mov r0, #0x68 mov r1, #0x17 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD80_0223346C @@ -13500,7 +13500,7 @@ MOD80_02234204: ; 0x02234204 str r0, [sp, #4] mov r0, #0x4b mov r1, #0xd - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut ldr r1, [sp, #8] lsr r1, r1, #1 str r1, [r4] @@ -13529,7 +13529,7 @@ MOD80_02234228: ; 0x02234228 mov r0, #0x4b mov r1, #0xc add r3, r5, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut add r7, r0, #0 ldr r0, [sp, #8] ldr r5, _02234284 ; =0x00000000 @@ -14372,7 +14372,7 @@ MOD80_022348CC: ; 0x022348CC mov r0, #0x68 add r2, r1, #0 add r3, r1, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -17002,7 +17002,7 @@ MOD80_02235C88: ; 0x02235C88 mov r1, #7 add r2, r4, r2 mov r3, #0x3e - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData ldr r3, _02235CCC ; =0x00000FF8 mov r1, #9 str r0, [r4, r3] @@ -17012,7 +17012,7 @@ MOD80_02235C88: ; 0x02235C88 mov r0, #0x56 mov r2, #1 add r3, r4, r3 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData mov r1, #0xff lsl r1, r1, #4 str r0, [r4, r1] @@ -18003,7 +18003,7 @@ MOD80_02236488: ; 0x02236488 mov r0, #0x5c mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x3e @@ -18011,7 +18011,7 @@ MOD80_02236488: ; 0x02236488 mov r0, #0x5c mov r1, #3 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -18055,7 +18055,7 @@ MOD80_02236488: ; 0x02236488 mov r1, #2 add r2, r4, #0 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -18068,7 +18068,7 @@ MOD80_02236488: ; 0x02236488 mov r1, #4 add r2, r4, #0 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 mov r0, #0x36 str r1, [sp] @@ -18081,7 +18081,7 @@ MOD80_02236488: ; 0x02236488 mov r1, #9 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -18094,7 +18094,7 @@ MOD80_02236488: ; 0x02236488 mov r1, #0xa add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl FUN_02017FE4 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 1d4b48de..9505f17c 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -358,7 +358,7 @@ MOD81_02238118: ; 0x02238118 mov r1, #6 add r2, sp, #4 mov r3, #0x39 - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData add r7, r0, #0 beq _02238152 mov r0, #0 @@ -1072,7 +1072,7 @@ _0223869C: ldrh r0, [r1, #0x10] ldrh r1, [r1, #0x14] lsl r3, r3, #5 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x44 pop {r4, r5, r6, r7, pc} nop @@ -1106,7 +1106,7 @@ _022386DE: mov r0, #7 mov r2, #0 add r3, sp, #0x1c - bl FUN_02006BDC + bl GfGfxLoader_GetScrnData add r7, r0, #0 beq _02238746 mov r0, #0xa @@ -1169,7 +1169,7 @@ MOD81_0223874C: ; 0x0223874C add r0, r4, #0 mov r2, #1 add r3, #8 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r5] mov r0, #0x3a add r3, r5, #0 @@ -1178,7 +1178,7 @@ MOD81_0223874C: ; 0x0223874C add r1, r6, #0 mov r2, #1 add r3, #0xc - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r5, #4] add sp, #4 pop {r3, r4, r5, r6, pc} @@ -1657,7 +1657,7 @@ MOD81_02238A84: ; 0x02238A84 mov r2, #0 mov r3, #0x3a add r5, r4, r6 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, r6] ldr r1, [sp, #4] add r0, r7, #0 @@ -2237,7 +2237,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0xe mov r1, #7 mov r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2249,7 +2249,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x16 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2261,7 +2261,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x15 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -2270,7 +2270,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x17 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2282,7 +2282,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x16 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2294,7 +2294,7 @@ MOD81_02238E44: ; 0x02238E44 mov r0, #0x5d mov r1, #0x15 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -2303,7 +2303,7 @@ MOD81_02238E44: ; 0x02238E44 mov r1, #0x17 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r4, #0x40] mov r1, #1 bl FUN_02017CD0 @@ -2843,7 +2843,7 @@ MOD81_022393F4: ; 0x022393F4 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x5c @@ -2852,7 +2852,7 @@ MOD81_022393F4: ; 0x022393F4 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #2 add r1, r4, #0 str r0, [sp] @@ -3687,7 +3687,7 @@ MOD81_022399FC: ; 0x022399FC ldr r2, [r2] mov r0, #0x5d add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3701,7 +3701,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #2 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 str r1, [sp] add r2, r4, #0 @@ -3714,7 +3714,7 @@ MOD81_022399FC: ; 0x022399FC ldr r2, [r2] mov r0, #0x5d mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -3727,7 +3727,7 @@ MOD81_022399FC: ; 0x022399FC ldr r2, [r2] mov r0, #0x5d mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] bl MOD81_02238828 add r5, r0, #0 @@ -3739,7 +3739,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -3748,7 +3748,7 @@ MOD81_022399FC: ; 0x022399FC mov r1, #3 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, _02239C90 ; =0x0223D07C lsl r1, r5, #1 ldrh r5, [r0, r1] @@ -3762,7 +3762,7 @@ MOD81_022399FC: ; 0x022399FC mov r1, #3 mov r2, #0 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0x20 str r0, [sp] mov r0, #0x40 @@ -3773,7 +3773,7 @@ MOD81_022399FC: ; 0x022399FC mov r1, #3 mov r2, #4 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3787,7 +3787,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #5 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3801,7 +3801,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #5 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3815,7 +3815,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #4 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3829,7 +3829,7 @@ MOD81_022399FC: ; 0x022399FC mov r0, #0x5d mov r1, #4 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x3a mov r1, #0x60 bl AllocFromHeap @@ -4113,7 +4113,7 @@ MOD81_02239E00: ; 0x02239E00 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #0xd - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r3, #0 str r3, [sp] mov r0, #2 @@ -4126,7 +4126,7 @@ MOD81_02239E00: ; 0x02239E00 mov r0, #0x5d mov r1, #0xd mov r2, #1 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x60 @@ -4135,7 +4135,7 @@ MOD81_02239E00: ; 0x02239E00 mov r1, #0xe mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #0x3a str r0, [sp] add r0, sp, #0x60 @@ -4144,7 +4144,7 @@ MOD81_02239E00: ; 0x02239E00 mov r1, #0xe mov r2, #2 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #1 add r1, r7, #0 str r0, [sp] @@ -5775,7 +5775,7 @@ _0223AAE8: mov r0, #0x5d add r1, r7, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5787,7 +5787,7 @@ _0223AAE8: mov r0, #0x5d add r1, r7, #0 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5799,7 +5799,7 @@ _0223AAE8: ldr r2, [r4, #0x24] mov r0, #0x5d mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5811,7 +5811,7 @@ _0223AAE8: ldr r2, [r4, #0x24] mov r0, #0x5d mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -5821,7 +5821,7 @@ _0223AAE8: mov r0, #0x5d add r1, r6, #0 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -5832,7 +5832,7 @@ _0223AAE8: add r1, r6, #0 mov r2, #4 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r1, #3 add r3, r1, #0 ldr r0, [r4, #0x24] @@ -6020,7 +6020,7 @@ MOD81_0223ACE8: ; 0x0223ACE8 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x5c @@ -6029,7 +6029,7 @@ MOD81_0223ACE8: ; 0x0223ACE8 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #0 add r1, r4, #0 str r0, [sp] @@ -6769,7 +6769,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x13 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6781,7 +6781,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x13 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6793,7 +6793,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x12 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6805,7 +6805,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x12 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -6814,7 +6814,7 @@ MOD81_0223B264: ; 0x0223B264 mov r0, #0x5d mov r1, #0x14 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -6823,7 +6823,7 @@ MOD81_0223B264: ; 0x0223B264 mov r1, #0x14 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0xc8 str r0, [sp] mov r1, #1 @@ -7284,7 +7284,7 @@ _0223B6F0: mov r0, #0x5d add r1, r7, #0 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7296,7 +7296,7 @@ _0223B6F0: mov r0, #0x5d add r1, r7, #0 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7308,7 +7308,7 @@ _0223B6F0: ldr r2, [r4, #0x24] mov r0, #0x5d mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7320,7 +7320,7 @@ _0223B6F0: ldr r2, [r4, #0x24] mov r0, #0x5d mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -7330,7 +7330,7 @@ _0223B6F0: mov r0, #0x5d add r1, r6, #0 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -7341,7 +7341,7 @@ _0223B6F0: add r1, r6, #0 mov r2, #4 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r1, #3 ldr r0, [r4, #0x24] add r2, r1, #0 @@ -7539,7 +7539,7 @@ MOD81_0223B908: ; 0x0223B908 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x5c @@ -7548,7 +7548,7 @@ MOD81_0223B908: ; 0x0223B908 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #1 add r1, r4, #0 str r0, [sp] @@ -8417,7 +8417,7 @@ MOD81_0223BF74: ; 0x0223BF74 ldr r2, [r4, #0xc] mov r0, #0x5d add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8429,7 +8429,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #2 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8440,7 +8440,7 @@ MOD81_0223BF74: ; 0x0223BF74 ldr r2, [r4, #0xc] mov r0, #0x5d mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8451,7 +8451,7 @@ MOD81_0223BF74: ; 0x0223BF74 ldr r2, [r4, #0xc] mov r0, #0x5d mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] bl MOD81_02238828 add r5, r0, #0 @@ -8463,7 +8463,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -8472,7 +8472,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r1, #3 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, _0223C1A0 ; =0x0223D280 lsl r1, r5, #1 ldrh r5, [r0, r1] @@ -8486,7 +8486,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r1, #3 mov r2, #0 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0x20 str r0, [sp] mov r0, #0x40 @@ -8497,7 +8497,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r1, #3 mov r2, #4 add r3, r5, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8509,7 +8509,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #5 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8521,7 +8521,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #5 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8533,7 +8533,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #4 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8545,7 +8545,7 @@ MOD81_0223BF74: ; 0x0223BF74 mov r0, #0x5d mov r1, #4 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x3a mov r1, #0x60 bl AllocFromHeap @@ -9289,7 +9289,7 @@ MOD81_0223C658: ; 0x0223C658 mov r0, #0xe mov r1, #7 mov r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r0, [r4, #0x44] mov r1, #1 bl FUN_02017CD0 @@ -9304,7 +9304,7 @@ MOD81_0223C658: ; 0x0223C658 mov r0, #0x5d mov r1, #0x16 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -9316,7 +9316,7 @@ MOD81_0223C658: ; 0x0223C658 mov r0, #0x5d mov r1, #0x15 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x3a @@ -9325,7 +9325,7 @@ MOD81_0223C658: ; 0x0223C658 mov r0, #0x5d mov r1, #0x17 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r4, #0 bl MOD81_0223CAC4 mov r1, #0 @@ -9895,7 +9895,7 @@ MOD81_0223CBE0: ; 0x0223CBE0 str r0, [sp, #0x10] mov r0, #0x5d mov r1, #9 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x3a str r0, [sp] add r0, sp, #0x5c @@ -9904,7 +9904,7 @@ MOD81_0223CBE0: ; 0x0223CBE0 mov r1, #0xa mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #2 add r1, r4, #0 str r0, [sp] diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 7b00d33a..f1a3e494 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -1617,7 +1617,7 @@ MOD82_0222E264: ; 0x0222E264 mov r0, #0x5c mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r3, #0 str r3, [sp] mov r0, #0x44 @@ -1625,7 +1625,7 @@ MOD82_0222E264: ; 0x0222E264 mov r0, #0x5c mov r1, #3 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -1669,7 +1669,7 @@ MOD82_0222E264: ; 0x0222E264 mov r1, #2 add r2, r4, #0 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -1682,7 +1682,7 @@ MOD82_0222E264: ; 0x0222E264 mov r1, #4 add r2, r4, #0 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r1, #0 mov r0, #0x36 str r1, [sp] @@ -1695,7 +1695,7 @@ MOD82_0222E264: ; 0x0222E264 mov r1, #9 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r1, #0 mov r0, #6 str r1, [sp] @@ -1708,7 +1708,7 @@ MOD82_0222E264: ; 0x0222E264 mov r1, #0xa add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl FUN_02017FE4 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index f067a6f1..09c161b4 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -792,7 +792,7 @@ MOD83_0222DBD0: ; 0x0222DBD0 mov r1, #0x29 mov r2, #0 mov r3, #0x80 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0xe lsl r0, r0, #6 str r0, [sp] @@ -807,7 +807,7 @@ MOD83_0222DBD0: ; 0x0222DBD0 mov r0, #0x74 mov r1, #0x28 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2581,7 +2581,7 @@ _0222E960: add r3, r0, #0 add r2, r1, #0 add r3, #0x8c - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -2594,7 +2594,7 @@ _0222E960: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x74 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2607,7 +2607,7 @@ _0222E960: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x74 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -2645,7 +2645,7 @@ MOD83_0222EA88: ; 0x0222EA88 mov r0, #0x74 mov r1, #0 add r3, #0xfc - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -2658,7 +2658,7 @@ MOD83_0222EA88: ; 0x0222EA88 str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x74 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -2672,7 +2672,7 @@ MOD83_0222EA88: ; 0x0222EA88 ldr r2, [r4, #4] mov r0, #0x74 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -5690,7 +5690,7 @@ MOD83_022302B4: ; 0x022302B4 mov r0, #0x74 mov r1, #0 add r3, #0xfc - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -5703,7 +5703,7 @@ MOD83_022302B4: ; 0x022302B4 mov r0, #0x74 add r2, r4, #0 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -5717,7 +5717,7 @@ MOD83_022302B4: ; 0x022302B4 mov r1, #2 add r2, r4, #0 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -5751,7 +5751,7 @@ MOD83_02230330: ; 0x02230330 add r3, r0, #0 add r2, r1, #0 add r3, #0x8c - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -5764,7 +5764,7 @@ MOD83_02230330: ; 0x02230330 mov r0, #0x74 add r2, r4, #0 add r3, r1, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -5777,7 +5777,7 @@ MOD83_02230330: ; 0x02230330 mov r0, #0x74 mov r1, #2 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -8285,7 +8285,7 @@ MOD83_02231820: ; 0x02231820 mov r1, #0xb mov r2, #0 lsl r3, r3, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0x20 str r0, [sp] mov r0, #0x57 @@ -8295,7 +8295,7 @@ MOD83_02231820: ; 0x02231820 mov r1, #0x10 mov r2, #0 lsl r3, r3, #6 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #3 @@ -8308,7 +8308,7 @@ MOD83_02231820: ; 0x02231820 mov r0, #0x74 mov r1, #0x11 add r2, r4, #0 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] mov r0, #6 @@ -8321,7 +8321,7 @@ MOD83_02231820: ; 0x02231820 mov r0, #0x74 mov r1, #0x12 add r2, r4, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -9382,7 +9382,7 @@ MOD83_022320D8: ; 0x022320D8 add r6, r3, #0 ldr r3, [r5] mov r0, #0x74 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, sp, #4 add r7, r0, #0 bl NNS_G2dGetUnpackedScreenData @@ -9417,7 +9417,7 @@ MOD83_02232118: ; 0x02232118 mov r0, #0x74 mov r1, #3 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #3 @@ -9431,7 +9431,7 @@ MOD83_02232118: ; 0x02232118 ldr r2, [r5, r2] mov r0, #0x74 mov r1, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData cmp r4, #0 beq _0223215E cmp r4, #1 @@ -9451,7 +9451,7 @@ _0223215E: ldr r2, [r5, r2] mov r0, #0x74 mov r1, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData b _0223219C _0223217E: mov r0, #0 @@ -9467,7 +9467,7 @@ _0223217E: ldr r2, [r5, r2] mov r0, #0x74 mov r1, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _0223219C: mov r0, #0x20 str r0, [sp] @@ -9478,7 +9478,7 @@ _0223219C: add r3, r0, #0 add r2, r1, #0 add r3, #0xec - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #2 @@ -9492,7 +9492,7 @@ _0223219C: ldr r2, [r5, r2] mov r0, #0x74 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #3 add r0, r5, #0 mov r1, #2 @@ -9622,7 +9622,7 @@ _022322A8: str r0, [sp, #4] mov r0, #0x13 mov r3, #0x60 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal _022322DC: mov r0, #0xb2 mov r6, #0 @@ -9673,7 +9673,7 @@ _02232312: str r0, [sp] mov r0, #0x13 add r3, sp, #0x18 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x14] ldr r0, [sp, #0x18] mov r1, #2 @@ -15800,7 +15800,7 @@ _02235132: str r0, [sp, #4] mov r0, #0x13 add r3, #0xff - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD83_022350EC @@ -17545,7 +17545,7 @@ _02235F48: mov r0, #0x74 mov r1, #0x13 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] mov r0, #5 @@ -17559,7 +17559,7 @@ _02235F48: mov r0, #0x74 mov r1, #0x16 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #2 mov r1, #0x4e bl FUN_02002C50 @@ -17588,7 +17588,7 @@ MOD83_02235FBC: ; 0x02235FBC mov r0, #0x74 mov r1, #0x14 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -17846,7 +17846,7 @@ _02236148: mov r0, #0x74 mov r1, #0x15 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -23956,7 +23956,7 @@ MOD83_02238F94: ; 0x02238F94 str r0, [sp, #4] ldrh r0, [r4] ldrh r1, [r4, #4] - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -24183,7 +24183,7 @@ MOD83_022391CC: ; 0x022391CC mov r0, #0x74 mov r1, #0x1d add r3, #0xfc - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #8 pop {r3, pc} .align 2, 0 @@ -24213,14 +24213,14 @@ MOD83_022391EC: ; 0x022391EC str r0, [sp, #0xc] mov r0, #0x74 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #1 ldr r3, _022392DC ; =MOD83_0223BC30 str r2, [sp] ldr r3, [r3, #4] mov r0, #0x74 mov r1, #0x1f - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc add r1, sp, #0x14 str r0, [sp, #0x10] bl NNS_G2dGetUnpackedScreenData diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index 2f29a2a9..a5838988 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -596,7 +596,7 @@ MOD84_021D7968: ; 0x021D7968 mov r0, #0x7f mov r1, #0x42 add r3, r2, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r3, #0 str r3, [sp] mov r0, #0x20 @@ -606,7 +606,7 @@ MOD84_021D7968: ; 0x021D7968 mov r0, #0x7f mov r1, #0x42 mov r2, #4 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset ldr r2, _021D7A74 ; =0x04000050 mov r0, #0 add r3, r2, #0 @@ -859,7 +859,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 mov r1, #1 mov r3, #0x4b add r4, #0x38 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r5, #0x38] ldr r1, [sp, #8] bl DC_FlushRange @@ -924,7 +924,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 mov r0, #0x7f mov r1, #3 mov r3, #0x4b - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r4, #4] cmp r0, #0 beq _021D7CCC @@ -1129,7 +1129,7 @@ _021D7E08: str r0, [sp, #4] mov r0, #0x7f mov r3, #0x4b - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r4] cmp r0, #0 beq _021D7E9A @@ -1274,7 +1274,7 @@ _021D7F2C: ldrh r1, [r1, r4] mov r0, #0x7f add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x4b ldr r1, _021D7F88 ; =0x021DA662 str r0, [sp] @@ -1286,7 +1286,7 @@ _021D7F2C: mov r0, #0x7f mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette ldr r1, _021D7F8C ; =0x021DA664 ldr r2, _021D7F90 ; =0x021DA666 ldrh r1, [r1, r4] diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index 6a42cff9..17f9316e 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -105,7 +105,7 @@ MOD84_021D81DC: ; 0x021D81DC add r1, r6, #0 mov r2, #0 add r3, #8 - bl FUN_02006C30 + bl GfGfxLoader_GetCellBank str r0, [r4] mov r0, #0x4b add r3, r4, #0 @@ -114,7 +114,7 @@ MOD84_021D81DC: ; 0x021D81DC add r1, r7, #0 mov r2, #0 add r3, #0xc - bl FUN_02006C5C + bl GfGfxLoader_GetAnimBank str r0, [r4, #4] _021D8218: add r0, r4, #0 @@ -940,7 +940,7 @@ MOD84_021D881C: ; 0x021D881C ldr r3, [r4, #8] mov r0, #0x7f mov r1, #0x2a - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -951,7 +951,7 @@ MOD84_021D881C: ; 0x021D881C ldr r3, [r4, #8] mov r0, #0x7f mov r1, #0x2b - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] mov r0, #0x4b @@ -960,7 +960,7 @@ MOD84_021D881C: ; 0x021D881C mov r0, #0x7f mov r1, #0x2c add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -1137,7 +1137,7 @@ _021D899C: mov r0, #0x7f mov r1, #0x41 add r3, r2, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset mov r0, #0x80 str r0, [sp] mov r0, #6 @@ -1149,7 +1149,7 @@ _021D899C: mov r1, #0x41 mov r2, #4 mov r3, #0 - bl FUN_02006948 + bl GfGfxLoader_GXLoadPalWithSrcOffset ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1165,7 +1165,7 @@ _021D89D8: mov r0, #0x7f mov r1, #4 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1176,7 +1176,7 @@ _021D89D8: ldr r2, [r5, #4] mov r0, #0x7f add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1192,7 +1192,7 @@ _021D8A10: mov r0, #0x7f mov r1, #5 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1208,7 +1208,7 @@ _021D8A30: mov r0, #0x7f mov r1, #7 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1420,7 +1420,7 @@ _021D8BB2: mov r0, #0x7f mov r1, #0x24 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1431,7 +1431,7 @@ _021D8BB2: mov r0, #0x7f mov r1, #0x22 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1447,7 +1447,7 @@ _021D8BEA: mov r0, #0x7f mov r1, #0x25 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1463,7 +1463,7 @@ _021D8C0A: mov r0, #0x7f mov r1, #0x23 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1762,7 +1762,7 @@ _021D8E4A: mov r0, #0x7f mov r1, #0x22 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1773,7 +1773,7 @@ _021D8E4A: mov r0, #0x7f mov r1, #0x22 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -1791,7 +1791,7 @@ _021D8E86: mov r0, #0x7f mov r1, #0x23 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -1809,7 +1809,7 @@ _021D8EAA: mov r0, #0x7f mov r1, #0x23 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -1853,7 +1853,7 @@ _021D8EF2: mov r0, #0x7f mov r1, #0x37 add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x4b str r0, [sp] add r4, #0x34 @@ -1862,7 +1862,7 @@ _021D8EF2: mov r2, #1 mov r3, #0 str r4, [sp, #4] - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -1911,7 +1911,7 @@ _021D8F86: mov r1, #0x28 mov r2, #0 add r3, sp, #0x20 - bl FUN_02006BB0 + bl GfGfxLoader_GetCharData str r0, [sp, #0x18] cmp r0, #0 beq _021D8FC8 @@ -2579,7 +2579,7 @@ _021D94BA: mov r0, #0x7f mov r1, #0x26 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2590,7 +2590,7 @@ _021D94BA: mov r0, #0x7f mov r1, #0x22 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2606,7 +2606,7 @@ _021D94F2: mov r0, #0x7f mov r1, #0x27 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2622,7 +2622,7 @@ _021D9512: mov r0, #0x7f mov r1, #0x23 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2861,7 +2861,7 @@ _021D96D4: mov r0, #0x7f mov r1, #0x10 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2872,7 +2872,7 @@ _021D96D4: mov r0, #0x7f mov r1, #0x12 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2883,7 +2883,7 @@ _021D96D4: mov r0, #0x7f mov r1, #0x11 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2894,7 +2894,7 @@ _021D96D4: mov r0, #0x7f mov r1, #0x13 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [r4, #0x64] ldr r0, [r5] @@ -3049,7 +3049,7 @@ _021D986A: mov r0, #0x7f mov r1, #8 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3060,7 +3060,7 @@ _021D986A: mov r0, #0x7f mov r1, #0xa mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3076,7 +3076,7 @@ _021D98A2: mov r0, #0x7f mov r1, #9 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3092,7 +3092,7 @@ _021D98C2: mov r0, #0x7f mov r1, #0xb mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3108,7 +3108,7 @@ _021D98E2: mov r0, #0x7f mov r1, #0xc mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3119,7 +3119,7 @@ _021D98E2: mov r0, #0x7f mov r1, #0xe mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3135,7 +3135,7 @@ _021D991A: mov r0, #0x7f mov r1, #0xd mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3151,7 +3151,7 @@ _021D993A: mov r0, #0x7f mov r1, #0xf mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3178,7 +3178,7 @@ _021D995A: mov r0, #0x7f mov r1, #0x3b add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping add r0, r4, #0 add r0, #0x34 bl NNS_G2dInitImagePaletteProxy @@ -3191,7 +3191,7 @@ _021D995A: mov r1, #0x3c mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #2 str r0, [sp] add r2, r4, #0 @@ -3452,7 +3452,7 @@ _021D9B7A: mov r0, #0x7f mov r1, #0x28 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3463,7 +3463,7 @@ _021D9B7A: mov r0, #0x7f mov r1, #0x22 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3479,7 +3479,7 @@ _021D9BB2: mov r0, #0x7f mov r1, #0x29 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3495,7 +3495,7 @@ _021D9BD2: mov r0, #0x7f mov r1, #0x23 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3560,7 +3560,7 @@ MOD84_021D9C1C: ; 0x021D9C1C mov r1, #0x41 add r2, #0x5c mov r3, #0x4b - bl FUN_02006C08 + bl GfGfxLoader_GetPlttData str r0, [r4, #0x58] cmp r0, #0 beq _021D9C76 @@ -3726,7 +3726,7 @@ _021D9D6A: mov r0, #0x7f mov r1, #0x1c mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3737,7 +3737,7 @@ _021D9D6A: mov r0, #0x7f mov r1, #0x18 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3748,7 +3748,7 @@ _021D9D6A: mov r0, #0x7f mov r1, #0x1d mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3759,7 +3759,7 @@ _021D9D6A: mov r0, #0x7f mov r1, #0x19 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 add r4, #0xec str r0, [r4] @@ -3823,7 +3823,7 @@ _021D9E3C: mov r0, #0x7f mov r1, #0x20 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3834,7 +3834,7 @@ _021D9E3C: mov r0, #0x7f mov r1, #0x1e mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3845,7 +3845,7 @@ _021D9E3C: mov r0, #0x7f mov r1, #0x21 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3856,7 +3856,7 @@ _021D9E3C: mov r0, #0x7f mov r1, #0x1f mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 add r4, #0xec str r0, [r4] @@ -4003,7 +4003,7 @@ _021D9FBE: mov r0, #0x7f mov r1, #0x2a mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4014,7 +4014,7 @@ _021D9FBE: mov r0, #0x7f mov r1, #0x2b mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] mov r0, #0x4b @@ -4023,7 +4023,7 @@ _021D9FBE: mov r0, #0x7f mov r1, #0x2c add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 add r4, #0xec str r0, [r4] @@ -4136,7 +4136,7 @@ _021DA0E2: mov r0, #0x7f mov r1, #0x16 mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4147,7 +4147,7 @@ _021DA0E2: mov r0, #0x7f mov r1, #0x1a mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4163,7 +4163,7 @@ _021DA11A: mov r0, #0x7f mov r1, #0x17 mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4179,7 +4179,7 @@ _021DA13A: mov r0, #0x7f mov r1, #0x1b mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4195,7 +4195,7 @@ _021DA15A: mov r0, #0x7f mov r1, #0x14 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -4206,7 +4206,7 @@ _021DA15A: mov r0, #0x7f mov r1, #0x18 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4222,7 +4222,7 @@ _021DA192: mov r0, #0x7f mov r1, #0x15 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4238,7 +4238,7 @@ _021DA1B2: mov r0, #0x7f mov r1, #0x19 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4276,7 +4276,7 @@ _021DA1E2: mov r0, #0x7f mov r1, #0x3f add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x4b str r0, [sp] add r4, #0x40 @@ -4285,7 +4285,7 @@ _021DA1E2: mov r1, #0x40 mov r2, #1 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4304,7 +4304,7 @@ _021DA238: mov r0, #0x7f mov r1, #0x3f add r3, r2, #0 - bl FUN_02006AE4 + bl GfGfxLoader_LoadImageMapping mov r0, #0x4b str r0, [sp] add r0, r4, #0 @@ -4314,7 +4314,7 @@ _021DA238: mov r1, #0x40 mov r2, #2 mov r3, #0 - bl FUN_02006A8C + bl GfGfxLoader_PartiallyLoadPalette mov r0, #2 str r0, [sp] add r2, r4, #0 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index db86339d..2bd7d12a 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -629,7 +629,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -640,7 +640,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #3 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] ldr r0, [r5] @@ -649,7 +649,7 @@ _021D7A06: ldr r1, [sp, #0x14] mov r0, #0x84 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -660,7 +660,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -671,7 +671,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] ldr r0, [r5] @@ -680,7 +680,7 @@ _021D7A06: mov r0, #0x84 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -691,7 +691,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -715,7 +715,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0x20 str r3, [sp] ldr r0, [r5] @@ -723,7 +723,7 @@ _021D7A06: str r0, [sp, #4] mov r0, #0x84 mov r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -734,7 +734,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #5 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -759,7 +759,7 @@ _021D7A06: ldr r2, [r5, #0x10] mov r0, #0x84 mov r3, #5 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0x20 str r3, [sp] ldr r0, [r5] @@ -767,7 +767,7 @@ _021D7A06: str r0, [sp, #4] mov r0, #0x84 mov r2, #4 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 ldr r3, [r5] mov r1, #0x20 diff --git a/arm9/src/gf_gfx_loader.c b/arm9/src/gf_gfx_loader.c index d9d6d411..31dda0f3 100644 --- a/arm9/src/gf_gfx_loader.c +++ b/arm9/src/gf_gfx_loader.c @@ -1,56 +1,52 @@ #include "global.h"
#include "filesystem.h"
#include "NNS_g2d.h"
-#include "unk_02016B94.h"
#include "GXS_ioreg.h"
+#include "gf_gfx_loader.h"
-void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd);
-
-THUMB_FUNC u32 FUN_0200687C(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
+THUMB_FUNC u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
{
NNSG2dCharacterData * pCharData;
- void * r7 = UncompressFromNarc(narcId, memberNo, isCompressed, heap_id, FALSE);
- if (r7 != NULL)
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
{
- if (NNS_G2dGetUnpackedBGCharacterData(r7, &pCharData))
+ if (NNS_G2dGetUnpackedBGCharacterData(pFile, &pCharData))
{
if (szByte == 0)
szByte = pCharData->szByte;
FUN_02017E14(unkStruct02016B94_2, (u8)a3, pCharData->pRawData, szByte, a4);
}
- FreeToHeap(r7);
+ FreeToHeap(pFile);
}
return szByte;
}
-THUMB_FUNC void FUN_020068C8(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
+THUMB_FUNC void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id)
{
NNSG2dScreenData * pScreenData;
- void * r7 = UncompressFromNarc(narcId, memberNo, isCompressed, heap_id, TRUE);
- if (r7 != NULL)
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, isCompressed, heap_id, TRUE);
+ if (pFile != NULL)
{
- if (NNS_G2dGetUnpackedScreenData(r7, &pScreenData))
+ if (NNS_G2dGetUnpackedScreenData(pFile, &pScreenData))
{
if (szByte == 0)
szByte = pScreenData->szByte;
- if (FUN_0201886C(unkStruct02016B94_2, a3) != NULL)
+ if (FUN_0201886C(unkStruct02016B94_2, (u8)a3) != NULL)
FUN_02017DFC(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte);
FUN_02017CE8(unkStruct02016B94_2, (u8)a3, pScreenData->rawData, szByte, a4);
}
- FreeToHeap(r7);
+ FreeToHeap(pFile);
}
}
-void FUN_02006948(NarcId narcId, s32 memberNo, u32 r4, u32 r7, u32 r6, u32 r5, u32 heap_id);
-
-THUMB_FUNC void FUN_02006930(NarcId narcId, s32 memberNo, u32 r2, u32 r3, u32 sp10, u32 heap_id)
+THUMB_FUNC void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 baseAddr, u32 szByte, u32 heap_id)
{
- FUN_02006948(narcId, memberNo, r2, 0, r3, sp10, heap_id);
+ GfGfxLoader_GXLoadPalWithSrcOffset(narcId, memberNo, whichRoutine, 0, baseAddr, szByte, heap_id);
}
-THUMB_FUNC void FUN_02006948(NarcId narcId, s32 memberNo, u32 r4, u32 r7, u32 r6, u32 r5, u32 heap_id)
+THUMB_FUNC void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 srcOffset, u32 baseAddr, u32 szByte, u32 heap_id)
{
- static void (*const UNK_020ECBB0[])(void *, u32, u32) = {
+ static void (*const load_funcs[])(void *, u32, u32) = {
GX_LoadBGPltt,
GX_LoadOBJPltt,
GX_LoadBGExtPltt,
@@ -60,101 +56,101 @@ THUMB_FUNC void FUN_02006948(NarcId narcId, s32 memberNo, u32 r4, u32 r7, u32 r6 GXS_LoadBGExtPltt,
GXS_LoadOBJExtPltt
};
- NNSG2dPaletteData * sp8;
- void * sp4 = UncompressFromNarc(narcId, memberNo, FALSE, heap_id, TRUE);
- if (sp4 != NULL)
+ NNSG2dPaletteData * pPltData;
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberNo, FALSE, heap_id, TRUE);
+ if (pFile != NULL)
{
- if (NNS_G2dGetUnpackedPaletteData(sp4, &sp8))
+ if (NNS_G2dGetUnpackedPaletteData(pFile, &pPltData))
{
- sp8->pRawData = (void *)((u32)sp8->pRawData + r7);
- if (r5 == 0)
- r5 = sp8->szByte - r7;
- DC_FlushRange(sp8->pRawData, r5);
- switch (r4)
+ pPltData->pRawData = (void *)((u32)pPltData->pRawData + srcOffset);
+ if (szByte == 0)
+ szByte = pPltData->szByte - srcOffset;
+ DC_FlushRange(pPltData->pRawData, szByte);
+ switch (whichRoutine)
{
case 2:
GX_BeginLoadBGExtPltt();
- UNK_020ECBB0[r4](sp8->pRawData, r6, r5);
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
GX_EndLoadBGExtPltt();
break;
case 6:
GXS_BeginLoadBGExtPltt();
- UNK_020ECBB0[r4](sp8->pRawData, r6, r5);
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
GXS_EndLoadBGExtPltt();
break;
case 3:
GX_BeginLoadOBJExtPltt();
- UNK_020ECBB0[r4](sp8->pRawData, r6, r5);
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
GX_EndLoadOBJExtPltt();
break;
case 7:
GXS_BeginLoadOBJExtPltt();
- UNK_020ECBB0[r4](sp8->pRawData, r6, r5);
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
GXS_EndLoadOBJExtPltt();
break;
default:
- UNK_020ECBB0[r4](sp8->pRawData, r6, r5);
+ load_funcs[whichRoutine](pPltData->pRawData, baseAddr, szByte);
break;
}
}
- FreeToHeap(sp4);
+ FreeToHeap(pFile);
}
}
-THUMB_FUNC u32 FUN_02006A34(NarcId narcId, s32 memberId, u32 r5, u32 r6, u32 r4, BOOL isCompressed, u32 heap_id)
+THUMB_FUNC u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 whichRoutine, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id)
{
- static void (*const UNK_020ECBA0[])(void *, u32, u32) = {
+ static void (*const load_funcs[])(void *, u32, u32) = {
GX_LoadOBJ,
GXS_LoadOBJ
};
- NNSG2dCharacterData* sp4;
- void * r7 = UncompressFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
- if (r7 != NULL)
+ NNSG2dCharacterData* pCharData;
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
+ if (pFile != NULL)
{
- if (NNS_G2dGetUnpackedCharacterData(r7, &sp4))
+ if (NNS_G2dGetUnpackedCharacterData(pFile, &pCharData))
{
- if (r4 == 0)
- r4 = sp4->szByte;
- DC_FlushRange(sp4->pRawData, r4);
- UNK_020ECBA0[r5](sp4->pRawData, r6, r4);
+ if (szByte == 0)
+ szByte = pCharData->szByte;
+ DC_FlushRange(pCharData->pRawData, szByte);
+ load_funcs[whichRoutine](pCharData->pRawData, baseAddr, szByte);
}
- FreeToHeap(r7);
+ FreeToHeap(pFile);
}
- return r4;
+ return szByte;
}
-THUMB_FUNC void FUN_02006A8C(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE r5, u32 r4, u32 heap_id, NNSG2dImagePaletteProxy * sp24)
+THUMB_FUNC void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heap_id, NNSG2dImagePaletteProxy * pPltProxy)
{
- void * r6 = UncompressFromNarc(narcId, memberId, FALSE, heap_id, TRUE);
- NNSG2dPaletteData* sp8;
- NNSG2dPaletteCompressInfo* sp4;
- if (r6 != NULL)
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heap_id, TRUE);
+ NNSG2dPaletteData* pPlttData;
+ NNSG2dPaletteCompressInfo* pCompressInfo;
+ if (pFile != NULL)
{
- BOOL r7 = NNS_G2dGetUnpackedPaletteCompressInfo(r6, &sp4);
- if (NNS_G2dGetUnpackedPaletteData(r6, &sp8))
+ BOOL isCompressed = NNS_G2dGetUnpackedPaletteCompressInfo(pFile, &pCompressInfo);
+ if (NNS_G2dGetUnpackedPaletteData(pFile, &pPlttData))
{
- if (r7)
+ if (isCompressed)
{
- NNS_G2dLoadPaletteEx(sp8, sp4, r4, r5, sp24);
+ NNS_G2dLoadPaletteEx(pPlttData, pCompressInfo, baseAddr, vramType, pPltProxy);
}
else
{
- NNS_G2dLoadPalette(sp8, r4, r5, sp24);
+ NNS_G2dLoadPalette(pPlttData, baseAddr, vramType, pPltProxy);
}
}
- FreeToHeap(r6);
+ FreeToHeap(pFile);
}
}
-THUMB_FUNC u32 FUN_02006AE4(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy *pImgProxy)
+THUMB_FUNC u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy *pImgProxy)
{
- static void (*const UNK_020ECBA8[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = {
+ static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = {
NNS_G2dLoadImage1DMapping,
NNS_G2dLoadImage2DMapping
};
- void * pFile = UncompressFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
u32 retSize = 0;
NNSG2dCharacterData * pSrcData;
if (pFile != NULL)
@@ -163,7 +159,7 @@ THUMB_FUNC u32 FUN_02006AE4(NarcId narcId, s32 memberId, BOOL isCompressed, u32 {
if (szByte != 0)
pSrcData->szByte = szByte;
- UNK_020ECBA8[whichRoutine](pSrcData, baseAddr, type, pImgProxy);
+ load_funcs[whichRoutine](pSrcData, baseAddr, type, pImgProxy);
retSize = pSrcData->szByte;
}
FreeToHeap(pFile);
@@ -171,113 +167,113 @@ THUMB_FUNC u32 FUN_02006AE4(NarcId narcId, s32 memberId, BOOL isCompressed, u32 return retSize;
}
-THUMB_FUNC void FUN_02006B38(NarcId narcId, s32 memberId, BOOL isCompressed, u32 r5, u32 sp18, NNS_G2D_VRAM_TYPE sp1C, u32 sp20, u32 heap_id, NNSG2dImageProxy * sp28)
+THUMB_FUNC void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy * pImageProxy)
{
- static void (*const UNK_020ECB98[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = {
+ static void (*const load_funcs[])(const NNSG2dCharacterData *, u32, NNS_G2D_VRAM_TYPE, NNSG2dImageProxy *) = {
NNS_G2dLoadImage1DMapping,
NNS_G2dLoadImage2DMapping
};
- NNSG2dCharacterData * sp4;
- void * r4 = UncompressFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
- if (r4 != NULL)
+ NNSG2dCharacterData * pCharacterData;
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, TRUE);
+ if (pFile != NULL)
{
- if (NNS_G2dGetUnpackedCharacterData(r4, &sp4))
+ if (NNS_G2dGetUnpackedCharacterData(pFile, &pCharacterData))
{
- if (sp18 != 0)
- sp4->szByte = sp18;
- switch (sp1C)
+ if (szByte != 0)
+ pCharacterData->szByte = szByte;
+ switch (type)
{
case NNS_G2D_VRAM_TYPE_2DMAIN:
- sp4->mapingType = reg_GX_DISPCNT & (REG_GX_DISPCNT_EXOBJ_CH_MASK | REG_GX_DISPCNT_OBJMAP_CH_MASK);
+ pCharacterData->mapingType = (GXOBJVRamModeChar)(reg_GX_DISPCNT & (REG_GX_DISPCNT_EXOBJ_CH_MASK | REG_GX_DISPCNT_OBJMAP_CH_MASK));
break;
case NNS_G2D_VRAM_TYPE_2DSUB:
- sp4->mapingType = reg_GXS_DB_DISPCNT & (REG_GXS_DB_DISPCNT_EXOBJ_MASK | REG_GXS_DB_DISPCNT_OBJMAP_CH_MASK);
+ pCharacterData->mapingType = (GXOBJVRamModeChar)(reg_GXS_DB_DISPCNT & (REG_GXS_DB_DISPCNT_EXOBJ_MASK | REG_GXS_DB_DISPCNT_OBJMAP_CH_MASK));
break;
default:
;
}
- UNK_020ECB98[r5](sp4, sp20, sp1C, sp28);
+ load_funcs[whichRoutine](pCharacterData, baseAddr, type, pImageProxy);
}
- FreeToHeap(r4);
+ FreeToHeap(pFile);
}
}
-THUMB_FUNC void * FUN_02006BB0(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** r4, u32 heap_id)
+THUMB_FUNC void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, u32 heap_id)
{
- void * r5 = UncompressFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
- if (r5 != NULL)
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
{
- if (!NNS_G2dGetUnpackedBGCharacterData(r5, r4))
+ if (!NNS_G2dGetUnpackedBGCharacterData(pFile, ppCharData))
{
- FreeToHeap(r5);
+ FreeToHeap(pFile);
return NULL;
}
}
- return r5;
+ return pFile;
}
-THUMB_FUNC void * FUN_02006BDC(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** r4, u32 heap_id)
+THUMB_FUNC void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** ppScrData, u32 heap_id)
{
- void * r5 = UncompressFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
- if (r5 != NULL)
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
{
- if (!NNS_G2dGetUnpackedScreenData(r5, r4))
+ if (!NNS_G2dGetUnpackedScreenData(pFile, ppScrData))
{
- FreeToHeap(r5);
+ FreeToHeap(pFile);
return NULL;
}
}
- return r5;
+ return pFile;
}
-THUMB_FUNC void * FUN_02006C08(NarcId narcId, s32 memberId, NNSG2dPaletteData ** r4, u32 heap_id)
+THUMB_FUNC void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData ** ppPltData, u32 heap_id)
{
- void * r5 = UncompressFromNarc(narcId, memberId, FALSE, heap_id, FALSE);
- if (r5 != NULL)
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, FALSE, heap_id, FALSE);
+ if (pFile != NULL)
{
- if (!NNS_G2dGetUnpackedPaletteData(r5, r4))
+ if (!NNS_G2dGetUnpackedPaletteData(pFile, ppPltData))
{
- FreeToHeap(r5);
+ FreeToHeap(pFile);
return NULL;
}
}
- return r5;
+ return pFile;
}
-THUMB_FUNC void * FUN_02006C30(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** r4, u32 heap_id)
+THUMB_FUNC void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** ppCellBank, u32 heap_id)
{
- void * r5 = UncompressFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
- if (r5 != NULL)
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
{
- if (!NNS_G2dGetUnpackedCellBank(r5, r4))
+ if (!NNS_G2dGetUnpackedCellBank(pFile, ppCellBank))
{
- FreeToHeap(r5);
+ FreeToHeap(pFile);
return NULL;
}
}
- return r5;
+ return pFile;
}
-THUMB_FUNC void * FUN_02006C5C(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** r4, u32 heap_id)
+THUMB_FUNC void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** ppAnimBank, u32 heap_id)
{
- void * r5 = UncompressFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
- if (r5 != NULL)
+ void * pFile = GfGfxLoader_LoadFromNarc(narcId, memberId, isCompressed, heap_id, FALSE);
+ if (pFile != NULL)
{
- if (!NNS_G2dGetUnpackedAnimBank(r5, r4))
+ if (!NNS_G2dGetUnpackedAnimBank(pFile, ppAnimBank))
{
- FreeToHeap(r5);
+ FreeToHeap(pFile);
return NULL;
}
}
- return r5;
+ return pFile;
}
-THUMB_FUNC void * FUN_02006C88(NarcId narcId, s32 memberId, u32 heap_id)
+THUMB_FUNC void * GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, u32 heap_id)
{
- return UncompressFromNarc(narcId, memberId, TRUE, heap_id, FALSE);
+ return GfGfxLoader_LoadFromNarc(narcId, memberId, TRUE, heap_id, FALSE);
}
-THUMB_FUNC void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd)
+THUMB_FUNC void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd)
{
void * dest;
void * dest2;
@@ -315,7 +311,7 @@ THUMB_FUNC void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompres return dest;
}
-THUMB_FUNC void * FUN_02006D18(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd, u32 *size_p)
+THUMB_FUNC void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd, u32 *size_p)
{
void * dest;
void * dest2;
diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 596056b1..1242d550 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -20,8 +20,8 @@ extern u32 GetCityNamesMsgdataIdByCountry(u32); extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1); extern void StringCat_HandleTrainerName(struct String * dest, const struct String * src); extern void StrAddChar(struct String * str, u16 val); -extern void * FUN_02006BB0(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); -extern void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd); +extern void * GfGfxLoader_GetCharData(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); +extern void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd); const u16 UNK_020ECE6C[][2] = { { 0x0140, 0x0008 }, @@ -751,7 +751,7 @@ struct UnkStruct_0200B870 * MessagePrinter_new(u32 r5, u32 r6, u32 sp4, u32 r4) struct UnkStruct_0200B870 * sp8 = AllocFromHeap(r4, sizeof(struct UnkStruct_0200B870)); if (sp8 != NULL) { - sp8->unk_0 = FUN_02006BB0(NARC_GRAPHIC_FONT, 4, 1, &sp8->unk_4, r4); + sp8->unk_0 = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, 4, 1, &sp8->unk_4, r4); int i; u8 * ptr = sp8->unk_4->unk_14; for (i = 0; i < sp8->unk_4->unk_10; i++) diff --git a/arm9/src/text.c b/arm9/src/text.c index 8676cbcc..36349b8b 100644 --- a/arm9/src/text.c +++ b/arm9/src/text.c @@ -21,7 +21,7 @@ extern void FUN_0201C1A8(struct TextPrinter *printer); extern u32 FontFunc(u8 fontId, struct TextPrinter *printer); -extern void * FUN_02006BB0(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); +extern void * GfGfxLoader_GetCharData(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); THUMB_FUNC void SetFontsPointer(const struct FontInfo *fonts) @@ -330,7 +330,7 @@ THUMB_FUNC u16 *FUN_0201C1B0(void) { void *res = AllocFromHeap(0, 32 * 24 * sizeof(u16)); struct UnkStruct_0200B870_sub * var; - void *tmp = FUN_02006BB0(NARC_GRAPHIC_FONT, 5, 0, &var, 0); + void *tmp = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, 5, 0, &var, 0); MI_CpuCopy32(var->unk_14, res, 32 * 24 * sizeof(u16)); FreeToHeap(tmp); return res; diff --git a/include/gf_gfx_loader.h b/include/gf_gfx_loader.h new file mode 100644 index 00000000..b95075dc --- /dev/null +++ b/include/gf_gfx_loader.h @@ -0,0 +1,23 @@ +#ifndef POKEDIAMOND_GF_GFX_LOADER_H
+#define POKEDIAMOND_GF_GFX_LOADER_H
+
+#include "unk_02016B94.h"
+
+u32 GfGfxLoader_LoadCharData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
+void GfGfxLoader_LoadScrnData(NarcId narcId, s32 memberNo, struct UnkStruct_02016B94_2 * unkStruct02016B94_2, u32 a3, u32 a4, u32 szByte, BOOL isCompressed, u32 heap_id);
+void GfGfxLoader_GXLoadPal(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 baseAddr, u32 szByte, u32 heap_id);
+void GfGfxLoader_GXLoadPalWithSrcOffset(NarcId narcId, s32 memberNo, u32 whichRoutine, u32 srcOffset, u32 baseAddr, u32 szByte, u32 heap_id);
+u32 GfGfxLoader_LoadWholePalette(NarcId narcId, s32 memberId, u32 whichRoutine, u32 baseAddr, u32 szByte, BOOL isCompressed, u32 heap_id);
+void GfGfxLoader_PartiallyLoadPalette(NarcId narcId, s32 memberId, NNS_G2D_VRAM_TYPE vramType, u32 baseAddr, u32 heap_id, NNSG2dImagePaletteProxy * pPltProxy);
+u32 GfGfxLoader_LoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy *pImgProxy);
+void GfGfxLoader_SetObjCntFlagsAndLoadImageMapping(NarcId narcId, s32 memberId, BOOL isCompressed, u32 whichRoutine, u32 szByte, NNS_G2D_VRAM_TYPE type, u32 baseAddr, u32 heap_id, NNSG2dImageProxy * pImageProxy);
+void * GfGfxLoader_GetCharData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCharacterData ** ppCharData, u32 heap_id);
+void * GfGfxLoader_GetScrnData(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dScreenData ** ppScrData, u32 heap_id);
+void * GfGfxLoader_GetPlttData(NarcId narcId, s32 memberId, NNSG2dPaletteData ** ppPltData, u32 heap_id);
+void * GfGfxLoader_GetCellBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dCellDataBank ** ppCellBank, u32 heap_id);
+void * GfGfxLoader_GetAnimBank(NarcId narcId, s32 memberId, BOOL isCompressed, NNSG2dAnimBankData ** ppAnimBank, u32 heap_id);
+void * GfGfxLoader_UncompressFromNarc(NarcId narcId, s32 memberId, u32 heap_id);
+void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd);
+void * GfGfxLoader_LoadFromNarc_GetSizeOut(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd, u32 *size_p);
+
+#endif //POKEDIAMOND_GF_GFX_LOADER_H
|