diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-05-23 22:30:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-23 22:30:03 +0100 |
| commit | a978faa0d8c222c5fce4db4f0dad19ed235eecfc (patch) | |
| tree | b49471083bf3db7a922a9392ca5168202c740b4a /arm9/modules/61/asm/module_61.s | |
| parent | efd77268ed8b1845922ac72f3b104d01ffd971c4 (diff) | |
| parent | a6f7fce337711f4b9f2619177b4b6a3380c3cb4f (diff) | |
Merge pull request #385 from PikalaxALT/pikalax_work
[LEAK-INFORMED] Split nitro system libraries
Diffstat (limited to 'arm9/modules/61/asm/module_61.s')
| -rw-r--r-- | arm9/modules/61/asm/module_61.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 54af7ce1..ed9e0e05 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -737,7 +737,7 @@ _021D7A7A: beq _021D7A88 bl FUN_0200BC30 _021D7A88: - bl FUN_020AEEB8 + bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x18] bl FUN_0201AB60 ldr r3, _021D7AA0 ; =0x027E0000 @@ -1087,7 +1087,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 bl NARC_ReadWholeMember add r0, r7, #0 add r1, sp, #0x28 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r3, [sp, #0x28] mov r0, #0 str r0, [sp] @@ -1119,7 +1119,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 bl NARC_ReadWholeMember add r0, r4, #0 add r1, sp, #0x24 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r2, [sp, #0x24] mov r0, #4 ldr r1, [r2, #0xc] @@ -1253,7 +1253,7 @@ _021D7E00: add r1, r5, #0 ldr r0, [r5, #0x34] add r1, #0x3c - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData mov r0, #0x4f mov r1, #0x24 bl GetNarcMemberSizeByIdPair @@ -1268,7 +1268,7 @@ _021D7E00: add r1, r5, #0 ldr r0, [r5, #0x38] add r1, #0x40 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData add r0, r6, #0 bl NARC_dtor mov r3, #0 |