diff options
Diffstat (limited to 'arm9/modules')
121 files changed, 4266 insertions, 4595 deletions
diff --git a/arm9/modules/04/asm/thumb_04.s b/arm9/modules/04/asm/thumb_04.s index 6b6a6f27..6f673fe8 100644 --- a/arm9/modules/04/asm/thumb_04.s +++ b/arm9/modules/04/asm/thumb_04.s @@ -12,7 +12,7 @@ MOD04_021D74E0: ; 0x021D74E0 ldr r0, [r0, #4] cmp r0, #0 beq _021D74F2 - bl ErrorHandling + bl GF_AssertFail _021D74F2: ldr r1, _021D7648 ; =0x00001FAC add r0, r4, #0 @@ -61,7 +61,7 @@ _021D74F2: bic r0, r1 mov r1, #0x2b lsl r1, r1, #0xc - bl tempName_NNS_FndCreateExpHeapEx + bl NNS_FndCreateExpHeapEx ldr r1, _021D7644 ; =UNK04_0220FBC0 ldr r3, _021D7654 ; =0x00001F08 ldr r2, [r1] @@ -195,20 +195,20 @@ MOD04_021D7660: ; 0x021D7660 beq _021D7698 ldr r0, _021D76A4 ; =0x00001F08 ldr r0, [r1, r0] - bl thunk_FUN_020adc8c + bl NNS_FndDestroyExpHeap ldr r0, _021D76A0 ; =UNK04_0220FBC0 ldr r1, _021D76A8 ; =0x00001F54 ldr r2, [r0] ldr r0, [r2, r1] sub r1, #0x50 ldr r1, [r2, r1] - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r1, _021D76A0 ; =UNK04_0220FBC0 ldr r0, _021D76A8 ; =0x00001F54 ldr r2, [r1] ldr r1, [r1, #4] ldr r0, [r2, r0] - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, _021D76A0 ; =UNK04_0220FBC0 mov r1, #0 str r1, [r0, #4] @@ -1130,7 +1130,7 @@ MOD04_021D7DA8: ; 0x021D7DA8 ldr r0, _021D7DE8 ; =0x00001F08 ldr r0, [r1, r0] add r1, r5, #0 - bl tempName_NNS_FndAllocFromExpHeapEx + bl NNS_FndAllocFromExpHeapEx add r5, r0, #0 bne _021D7DD8 mov r0, #1 @@ -1160,7 +1160,7 @@ MOD04_021D7DEC: ; 0x021D7DEC ldr r0, _021D7E14 ; =0x00001F08 ldr r0, [r1, r0] add r1, r5, #0 - bl FUN_020ADDF0 + bl NNS_FndFreeToExpHeap add r0, r4, #0 bl OS_RestoreInterrupts _021D7E0C: @@ -2347,12 +2347,12 @@ _021D86CE: str r1, [r2, r0] mov r0, #1 bl FUN_020AA770 - bl SDAT_Init + bl NNS_SndInit ldr r0, _021D8718 ; =UNK04_0220FBC8 ldr r1, [r0, #4] ldr r0, _021D8728 ; =0x00003504 add r0, r1, r0 - bl FUN_020C16FC + bl NNS_SndStrmInit ldr r1, _021D8718 ; =UNK04_0220FBC8 mov r0, #0 ldr r2, [r1, #4] @@ -2887,13 +2887,13 @@ _021D8ACA: ldr r0, [r5, #4] add r2, sp, #0x10 add r0, r0, r3 - bl FUN_020C169C + bl NNS_SndStrmAllocChannel add r0, r5, #0 ldr r1, [r0, #4] ldr r0, _021D8BDC ; =0x00003504 add r0, r1, r0 mov r1, #0 - bl FUN_020C13C4 + bl NNS_SndStrmSetVolume mov r0, #0x41 str r0, [sp] mov r0, #2 @@ -2914,7 +2914,7 @@ _021D8ACA: add r2, r3, r2 mov r1, #1 lsl r3, r7, #1 - bl FUN_020C14AC + bl NNS_SndStrmSetup ldr r2, _021D8BCC ; =UNK04_0220FBC8 ldr r1, _021D8BE4 ; =0x000034F8 ldr r0, [r2, #4] @@ -2975,14 +2975,14 @@ _021D8BEC: .word 0x000034FC thumb_func_start MOD04_021D8BF0 MOD04_021D8BF0: ; 0x021D8BF0 ldr r0, _021D8BFC ; =UNK04_0220FBC8 - ldr r3, _021D8C00 ; =FUN_020C1458 + ldr r3, _021D8C00 ; =NNS_SndStrmStart ldr r1, [r0, #4] ldr r0, _021D8C04 ; =0x00003504 add r0, r1, r0 bx r3 .align 2, 0 _021D8BFC: .word UNK04_0220FBC8 -_021D8C00: .word FUN_020C1458 +_021D8C00: .word NNS_SndStrmStart _021D8C04: .word 0x00003504 thumb_func_start MOD04_021D8C08 @@ -3052,12 +3052,12 @@ MOD04_021D8C6C: ; 0x021D8C6C ldr r1, [r0, #4] ldr r0, _021D8CC4 ; =0x00003504 add r0, r1, r0 - bl FUN_020C1430 + bl NNS_SndStrmStop ldr r0, _021D8CBC ; =UNK04_0220FBC8 ldr r1, [r0, #4] ldr r0, _021D8CC4 ; =0x00003504 add r0, r1, r0 - bl FUN_020C1674 + bl NNS_SndStrmFreeChannel bl VCT_Cleanup ldr r1, _021D8CBC ; =UNK04_0220FBC8 mov r0, #0x35 @@ -3065,7 +3065,7 @@ MOD04_021D8C6C: ; 0x021D8C6C lsl r0, r0, #8 ldr r0, [r2, r0] ldr r1, [r1] - bl FUN_02016A8C + bl FreeToHeapExplicit mov r1, #0 ldr r0, _021D8CBC ; =UNK04_0220FBC8 cmp r4, #0 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index e66ad6aa..730bfc00 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -73,7 +73,7 @@ _021D7564: ldr r0, [r4, #4] cmp r0, #0 beq _021D757A - bl ErrorHandling + bl GF_AssertFail _021D757A: mov r0, #4 mov r1, #0x28 @@ -250,7 +250,7 @@ _021D76E2: ldr r0, [r4, #0x4c] cmp r0, #0 bne _021D7720 - bl ErrorHandling + bl GF_AssertFail _021D7720: ldr r0, [r4, #0x24] bl MOD05_021EF514 @@ -727,7 +727,7 @@ MOD05_021D7B10: ; 0x021D7B10 MOD05_021D7B38: ; 0x021D7B38 push {lr} sub sp, #0x14 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7c @@ -826,7 +826,7 @@ MOD05_021D7BE0: ; 0x021D7BE0 ldr r0, [r0] ldr r1, [r4, #0x2c] bl MOD05_021E805C - ldr r5, _021D7C98 ; =UNK_021CED20 + ldr r5, _021D7C98 ; =NNS_G3dGlb + 0x8 add r3, sp, #0x40 mov r2, #8 _021D7C0E: @@ -859,29 +859,29 @@ _021D7C1C: orr r2, r0 add r0, r1, r2 str r0, [sp, #0x38] - ldr r1, _021D7C98 ; =UNK_021CED20 + ldr r1, _021D7C98 ; =NNS_G3dGlb + 0x8 add r0, sp, #0 mov r2, #0x40 bl MIi_CpuCopyFast - ldr r1, _021D7C9C ; =UNK_021CED98 + ldr r1, _021D7C9C ; =NNS_G3dGlb + 0x80 mov r0, #0x50 ldr r2, [r1, #0x7c] bic r2, r0 str r2, [r1, #0x7c] - bl FUN_020B849C + bl NNS_G3dGlbFlushP ldr r0, [r4, #0x3c] bl MOD05_021E4BA0 bl FUN_0201F178 - ldr r1, _021D7C98 ; =UNK_021CED20 + ldr r1, _021D7C98 ; =NNS_G3dGlb + 0x8 add r0, sp, #0x40 mov r2, #0x40 bl MIi_CpuCopyFast - ldr r1, _021D7C9C ; =UNK_021CED98 + ldr r1, _021D7C9C ; =NNS_G3dGlb + 0x80 mov r0, #0x50 ldr r2, [r1, #0x7c] bic r2, r0 str r2, [r1, #0x7c] - bl FUN_020B849C + bl NNS_G3dGlbFlushP ldr r0, [r4, #4] ldr r0, [r0, #4] bl MOD05_021D7FD0 @@ -892,8 +892,8 @@ _021D7C1C: add sp, #0x80 pop {r3, r4, r5, pc} nop -_021D7C98: .word UNK_021CED20 -_021D7C9C: .word UNK_021CED98 +_021D7C98: .word NNS_G3dGlb + 0x8 +_021D7C9C: .word NNS_G3dGlb + 0x80 _021D7CA0: .word UNK_02105BB8 thumb_func_start MOD05_021D7CA4 @@ -931,7 +931,7 @@ _021D7CC6: add sp, #0xc pop {pc} _021D7CE6: - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {pc} .balign 4, 0 @@ -965,7 +965,7 @@ MOD05_021D7CF0: ; 0x021D7CF0 ldr r0, [r5, #0x30] cmp r0, #0 beq _021D7D36 - bl ErrorHandling + bl GF_AssertFail _021D7D36: mov r0, #4 add r1, r4, #0 diff --git a/arm9/modules/05/asm/mod05_021D7F4C.s b/arm9/modules/05/asm/mod05_021D7F4C.s index 2ba8b668..fd877faf 100644 --- a/arm9/modules/05/asm/mod05_021D7F4C.s +++ b/arm9/modules/05/asm/mod05_021D7F4C.s @@ -147,12 +147,12 @@ _021D8034: ldr r0, [r4, #4] cmp r0, #0 bne _021D8062 - bl ErrorHandling + bl GF_AssertFail _021D8062: ldr r0, [r4, #8] cmp r0, #0 bne _021D806C - bl ErrorHandling + bl GF_AssertFail _021D806C: ldrh r1, [r6, #4] cmp r1, #0 @@ -177,7 +177,7 @@ _021D808C: cmp r1, r2 blt _021D8034 _021D8094: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index c00cb45f..e228ee0a 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -1674,7 +1674,7 @@ _021D8E84: mov r0, #2 b _021D8E96 _021D8E8C: - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 mov r0, #0 pop {r3, r4, r5, pc} @@ -1702,7 +1702,7 @@ _021D8EB0: beq _021D8ED2 cmp r0, #3 beq _021D8ED2 - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 mov r0, #0 pop {r3, r4, r5, pc} @@ -2118,7 +2118,7 @@ _021D91DC: ldr r0, _021D9244 ; =0x00000FFF cmp r1, r0 beq _021D91F2 - bl ErrorHandling + bl GF_AssertFail _021D91F2: ldr r0, [r4, #0xc] bl FUN_02034E30 diff --git a/arm9/modules/05/asm/mod05_021D9320.s b/arm9/modules/05/asm/mod05_021D9320.s index 4d0220e5..ec304548 100644 --- a/arm9/modules/05/asm/mod05_021D9320.s +++ b/arm9/modules/05/asm/mod05_021D9320.s @@ -295,7 +295,7 @@ MOD05_021D9510: ; 0x021D9510 bl FUN_0201FE94 add r5, r0, #0 bne _021D9580 - bl ErrorHandling + bl GF_AssertFail _021D9580: ldrh r1, [r4, #0xa] add r0, r5, #0 @@ -444,7 +444,7 @@ MOD05_021D967C: ; 0x021D967C bl FUN_0200945C cmp r0, #0 bne _021D96A0 - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D96A0: @@ -468,7 +468,7 @@ _021D96A0: bl FUN_02009D68 cmp r0, #1 beq _021D96D0 - bl ErrorHandling + bl GF_AssertFail _021D96D0: mov r0, #0x53 lsl r0, r0, #2 @@ -481,7 +481,7 @@ _021D96D0: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D96E8: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -526,7 +526,7 @@ MOD05_021D971C: ; 0x021D971C bl FUN_0200945C cmp r0, #0 bne _021D9740 - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} _021D9740: @@ -554,7 +554,7 @@ _021D9740: add sp, #0xc pop {r4, r5, r6, r7, pc} _021D9774: - bl ErrorHandling + bl GF_AssertFail add sp, #0xc pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -610,7 +610,7 @@ MOD05_021D97B4: ; 0x021D97B4 bl FUN_0200945C cmp r0, #0 bne _021D97DE - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _021D97DE: @@ -635,11 +635,11 @@ _021D97DE: bl MOD05_021D9780 cmp r0, #1 beq _021D9818 - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _021D9814: - bl ErrorHandling + bl GF_AssertFail _021D9818: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -865,7 +865,7 @@ _021D99A6: bl FUN_02020248 b _021D99EE _021D99EA: - bl ErrorHandling + bl GF_AssertFail _021D99EE: add r0, r6, #0 add sp, #0x74 diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s index 2e5469f9..ee169f98 100644 --- a/arm9/modules/05/asm/mod05_021D9A48.s +++ b/arm9/modules/05/asm/mod05_021D9A48.s @@ -15,7 +15,7 @@ MOD05_021D9A48: ; 0x021D9A48 add r4, r3, #0 cmp r1, r0 bne _021D9A60 - bl ErrorHandling + bl GF_AssertFail _021D9A60: mov r0, #0 add r1, r6, #0 @@ -70,7 +70,7 @@ MOD05_021D9AA8: ; 0x021D9AA8 add r5, r3, #0 cmp r4, r0 bne _021D9ABE - bl ErrorHandling + bl GF_AssertFail _021D9ABE: add r0, r6, #0 add r1, r4, #0 @@ -78,29 +78,29 @@ _021D9ABE: bl NARC_AllocAndReadWholeMember add r4, r0, #0 bne _021D9AD0 - bl ErrorHandling + bl GF_AssertFail _021D9AD0: add r0, r4, #0 mov r1, #0 - bl FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx add r6, r0, #0 bne _021D9AE0 - bl ErrorHandling + bl GF_AssertFail _021D9AE0: ldr r0, [sp, #0x1c] add r1, r6, #0 add r2, r7, #0 - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r5] cmp r5, #0 bne _021D9AF4 - bl ErrorHandling + bl GF_AssertFail _021D9AF4: ldr r0, [r5] ldr r3, [sp, #0x18] add r1, r6, #0 add r2, r7, #0 - bl FUN_020B8110 + bl NNS_G3dAnmObjInit add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -117,7 +117,7 @@ _021D9B0E: mov r0, #0 pop {r3, pc} _021D9B16: - bl FUN_020B7E28 + bl NNS_G3dRenderObjRemoveAnmObj mov r0, #1 pop {r3, pc} .balign 4, 0 @@ -257,7 +257,7 @@ MOD05_021D9C00: ; 0x021D9C00 ldr r0, [r4, #4] cmp r0, #1 beq _021D9C0E - bl ErrorHandling + bl GF_AssertFail _021D9C0E: ldr r0, [r4, #0x1c] pop {r4, pc} @@ -280,7 +280,7 @@ MOD05_021D9C14: ; 0x021D9C14 bl NARC_ReadWholeMember cmp r4, #4 blt _021D9C38 - bl ErrorHandling + bl GF_AssertFail _021D9C38: lsl r1, r4, #2 add r0, sp, #0x14 @@ -312,7 +312,7 @@ _021D9C66: ldr r0, [r4, #0x34] cmp r5, r0 bne _021D9C74 - bl ErrorHandling + bl GF_AssertFail _021D9C74: add r6, r6, #1 add r4, #0x28 @@ -368,7 +368,7 @@ _021D9CD8: add r1, #0x28 cmp r2, #0x10 blt _021D9C80 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -470,7 +470,7 @@ _021D9D9C: _021D9DA4: cmp r4, #0x10 bne _021D9DAC - bl ErrorHandling + bl GF_AssertFail _021D9DAC: ldr r0, [sp, #0x10] add r0, r0, #4 @@ -495,7 +495,7 @@ MOD05_021D9DC0: ; 0x021D9DC0 str r3, [sp] cmp r6, #0 bne _021D9DDC - bl ErrorHandling + bl GF_AssertFail add sp, #0x18 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -516,7 +516,7 @@ _021D9DEC: bl NARC_ReadWholeMember cmp r4, #4 blt _021D9E02 - bl ErrorHandling + bl GF_AssertFail _021D9E02: lsl r1, r4, #2 add r0, sp, #8 @@ -571,7 +571,7 @@ _021D9E58: add r1, r6, r1 ldr r0, [sp] ldr r1, [r1, #0x10] - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj _021D9E6A: add sp, #0x18 mov r0, #1 @@ -596,7 +596,7 @@ MOD05_021D9E80: ; 0x021D9E80 add r4, r2, #0 str r0, [sp] bne _021D9E94 - bl ErrorHandling + bl GF_AssertFail _021D9E94: add r0, r4, #0 bl MOD05_021DA220 @@ -671,7 +671,7 @@ _021D9F12: add r1, r4, r1 ldr r0, [sp, #0xc] ldr r1, [r1, #0x10] - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj mov r0, #1 str r0, [sp] b _021D9F32 @@ -709,7 +709,7 @@ _021D9F54: bne _021D9F6E ldr r1, [r5, #0x10] add r0, r6, #0 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj str r7, [r5, #0x10] ldr r0, [r5, #0x24] bl FreeToHeap @@ -734,7 +734,7 @@ MOD05_021D9F80: ; 0x021D9F80 beq _021D9FB2 cmp r5, #0 bne _021D9F90 - bl ErrorHandling + bl GF_AssertFail _021D9F90: ldr r0, [r5, #4] cmp r0, #0 @@ -743,7 +743,7 @@ _021D9F90: bne _021D9FAC ldr r1, [r5] add r0, r4, #0 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj mov r0, #0 str r0, [r5] ldr r0, [r5, #0x14] @@ -770,7 +770,7 @@ MOD05_021D9FB4: ; 0x021D9FB4 bl NARC_ReadWholeMember cmp r5, #4 blt _021D9FD4 - bl ErrorHandling + bl GF_AssertFail _021D9FD4: lsl r1, r5, #2 add r0, sp, #4 @@ -779,7 +779,7 @@ _021D9FD4: mvn r0, r0 cmp r5, r0 bne _021D9FE6 - bl ErrorHandling + bl GF_AssertFail _021D9FE6: mov r0, #0 mov r2, #0x28 @@ -834,7 +834,7 @@ MOD05_021DA03C: ; 0x021DA03C add r4, r1, #0 cmp r5, #0 bne _021DA04A - bl ErrorHandling + bl GF_AssertFail _021DA04A: mov r6, #0 add r1, r6, #0 @@ -850,7 +850,7 @@ _021DA050: ldr r0, [r6, #4] cmp r0, #0 bne _021DA072 - bl ErrorHandling + bl GF_AssertFail b _021DA072 _021DA06A: add r1, r1, #1 @@ -860,7 +860,7 @@ _021DA06A: _021DA072: cmp r6, #0 bne _021DA07A - bl ErrorHandling + bl GF_AssertFail _021DA07A: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -881,7 +881,7 @@ MOD05_021DA080: ; 0x021DA080 bl NARC_ReadWholeMember cmp r4, #4 blt _021DA0A0 - bl ErrorHandling + bl GF_AssertFail _021DA0A0: lsl r1, r4, #2 add r0, sp, #4 @@ -900,7 +900,7 @@ _021DA0AC: ldr r0, [r4, #4] cmp r0, #0 bne _021DA0CE - bl ErrorHandling + bl GF_AssertFail b _021DA0CE _021DA0C6: add r2, r2, #1 @@ -910,7 +910,7 @@ _021DA0C6: _021DA0CE: cmp r4, #0 bne _021DA0D6 - bl ErrorHandling + bl GF_AssertFail _021DA0D6: add r0, r4, #0 add sp, #0x14 @@ -1171,7 +1171,7 @@ MOD05_021DA26C: ; 0x021DA26C add r5, r0, #0 add r4, r1, #0 bne _021DA278 - bl ErrorHandling + bl GF_AssertFail _021DA278: mov r1, #0x10 mov r0, #0 @@ -1203,7 +1203,7 @@ _021DA292: strb r4, [r0] b _021DA2B6 _021DA2AE: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _021DA2B6: @@ -1265,7 +1265,7 @@ MOD05_021DA304: ; 0x021DA304 add r6, r2, #0 cmp r4, #4 ble _021DA314 - bl ErrorHandling + bl GF_AssertFail _021DA314: cmp r5, #0 beq _021DA31A @@ -1284,7 +1284,7 @@ MOD05_021DA320: ; 0x021DA320 add r6, r2, #0 cmp r4, r0 blt _021DA332 - bl ErrorHandling + bl GF_AssertFail _021DA332: lsl r0, r4, #2 str r6, [r5, r0] @@ -1299,7 +1299,7 @@ MOD05_021DA338: ; 0x021DA338 add r4, r1, #0 cmp r4, r0 blt _021DA34A - bl ErrorHandling + bl GF_AssertFail _021DA34A: lsl r0, r4, #2 ldr r0, [r5, r0] @@ -1320,7 +1320,7 @@ _021DA360: bl MOD05_021D9B04 ldr r0, [r6, #0x14] ldr r1, [sp] - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj _021DA378: add r0, r4, #1 lsl r0, r0, #0x18 @@ -1368,7 +1368,7 @@ _021DA3AC: bl MOD05_021D9C14 add r4, r0, #0 bne _021DA3D2 - bl ErrorHandling + bl GF_AssertFail _021DA3D2: ldr r0, [sp, #0x4c] add r1, r5, #0 @@ -1464,7 +1464,7 @@ MOD05_021DA464: ; 0x021DA464 bl MOD05_021DA26C add r5, r0, #0 bne _021DA482 - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021DA482: @@ -1476,7 +1476,7 @@ _021DA482: ldrb r4, [r0] cmp r4, #0 bne _021DA498 - bl ErrorHandling + bl GF_AssertFail _021DA498: cmp r4, #0 bne _021DA49E @@ -1506,7 +1506,7 @@ MOD05_021DA4BC: ; 0x021DA4BC add r6, r3, #0 cmp r4, #6 blo _021DA4CE - bl ErrorHandling + bl GF_AssertFail _021DA4CE: add r0, r5, #0 add r1, r7, #0 @@ -1517,7 +1517,7 @@ _021DA4CE: ldr r0, [r5, r4] cmp r0, #0 beq _021DA4E6 - bl ErrorHandling + bl GF_AssertFail _021DA4E6: str r6, [r5, r4] pop {r3, r4, r5, r6, r7, pc} @@ -1531,7 +1531,7 @@ MOD05_021DA4EC: ; 0x021DA4EC add r6, r2, #0 cmp r4, #0 bne _021DA4FC - bl ErrorHandling + bl GF_AssertFail _021DA4FC: add r0, r5, #0 add r1, r4, #0 @@ -1552,7 +1552,7 @@ MOD05_021DA514: ; 0x021DA514 add r4, r3, #0 cmp r5, #0 bne _021DA526 - bl ErrorHandling + bl GF_AssertFail _021DA526: add r0, r6, #0 add r1, r5, #0 @@ -1578,7 +1578,7 @@ MOD05_021DA54C: ; 0x021DA54C add r4, r1, #0 add r6, r2, #0 bne _021DA55A - bl ErrorHandling + bl GF_AssertFail _021DA55A: add r0, r4, #0 add r1, r6, #0 @@ -1597,7 +1597,7 @@ MOD05_021DA574: ; 0x021DA574 add r5, r0, #0 add r4, r1, #0 bne _021DA580 - bl ErrorHandling + bl GF_AssertFail _021DA580: add r0, r5, #0 add r1, r4, #0 @@ -1611,7 +1611,7 @@ MOD05_021DA58C: ; 0x021DA58C bl MOD05_021DA574 add r4, r0, #0 bne _021DA59A - bl ErrorHandling + bl GF_AssertFail _021DA59A: add r0, r4, #0 bl MOD05_021DA20C diff --git a/arm9/modules/05/asm/mod05_021DA5B8.s b/arm9/modules/05/asm/mod05_021DA5B8.s index e961bb5a..b4648ab3 100644 --- a/arm9/modules/05/asm/mod05_021DA5B8.s +++ b/arm9/modules/05/asm/mod05_021DA5B8.s @@ -115,7 +115,7 @@ _021DA606: bl MOD05_021DA464 b _021DA692 _021DA688: - bl ErrorHandling + bl GF_AssertFail add sp, #0x84 mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -156,7 +156,7 @@ _021DA6CC: mov r2, #0 b _021DA6DA _021DA6D4: - bl ErrorHandling + bl GF_AssertFail mov r2, #0 _021DA6DA: ldr r0, [r5, #0x50] @@ -220,7 +220,7 @@ _021DA752: mov r2, #1 b _021DA760 _021DA75A: - bl ErrorHandling + bl GF_AssertFail mov r2, #1 _021DA760: ldr r0, [r5, #0x50] @@ -350,7 +350,7 @@ _021DA7E4: bl MOD05_021DA464 b _021DA878 _021DA864: - bl ErrorHandling + bl GF_AssertFail mov r0, #1 bl MOD05_021D7CA4 mov r0, #6 @@ -412,7 +412,7 @@ _021DA8D6: mov r2, #2 b _021DA8E4 _021DA8DE: - bl ErrorHandling + bl GF_AssertFail mov r2, #0 _021DA8E4: ldr r0, [r5, #0x50] @@ -477,7 +477,7 @@ _021DA960: mov r2, #3 b _021DA96E _021DA968: - bl ErrorHandling + bl GF_AssertFail mov r2, #1 _021DA96E: ldr r0, [r5, #0x50] @@ -737,7 +737,7 @@ _021DAB10: bl MOD05_021DA464 b _021DAB68 _021DAB5E: - bl ErrorHandling + bl GF_AssertFail add sp, #0x40 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -753,7 +753,7 @@ _021DAB68: bl FUN_0205ADDC b _021DAB86 _021DAB82: - bl ErrorHandling + bl GF_AssertFail _021DAB86: ldr r0, [r4] add r0, r0, #1 @@ -784,7 +784,7 @@ _021DABBA: bl FUN_0205ADDC b _021DABC6 _021DABC2: - bl ErrorHandling + bl GF_AssertFail _021DABC6: ldr r0, [r4] add r0, r0, #1 @@ -958,7 +958,7 @@ _021DACDA: bl MOD05_021DA464 b _021DAD34 _021DAD2A: - bl ErrorHandling + bl GF_AssertFail add sp, #0x40 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -974,7 +974,7 @@ _021DAD34: bl FUN_0205ADDC b _021DAD52 _021DAD4E: - bl ErrorHandling + bl GF_AssertFail _021DAD52: ldr r0, [r4] add r0, r0, #1 @@ -1003,7 +1003,7 @@ _021DAD80: bl FUN_0205ADDC b _021DAD8C _021DAD88: - bl ErrorHandling + bl GF_AssertFail _021DAD8C: ldr r0, [r4] add r0, r0, #1 @@ -1152,7 +1152,7 @@ _021DAE50: add sp, #0x84 pop {r4, r5, r6, r7, pc} _021DAEC8: - bl ErrorHandling + bl GF_AssertFail add sp, #0x84 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -1189,7 +1189,7 @@ _021DAF04: mov r2, #0 b _021DAF12 _021DAF0C: - bl ErrorHandling + bl GF_AssertFail mov r2, #0 _021DAF12: ldr r0, [r5, #0x50] @@ -1232,7 +1232,7 @@ _021DAF58: mov r2, #1 b _021DAF66 _021DAF60: - bl ErrorHandling + bl GF_AssertFail mov r2, #1 _021DAF66: ldr r0, [r5, #0x50] @@ -1302,7 +1302,7 @@ MOD05_021DAFA8: ; 0x021DAFA8 bl FUN_0204A94C cmp r0, #0 bne _021DAFEA - bl ErrorHandling + bl GF_AssertFail _021DAFEA: ldr r0, [sp, #0x18] bl MOD05_021E7EC8 @@ -1315,7 +1315,7 @@ _021DAFEA: bl MOD05_021D9DC0 cmp r0, #0 bne _021DB008 - bl ErrorHandling + bl GF_AssertFail _021DB008: ldr r0, [sp, #0x14] ldr r2, [r4, #0x4c] @@ -1675,7 +1675,7 @@ _021DB2E6: mov r6, #0x27 b _021DB2EE _021DB2EA: - bl ErrorHandling + bl GF_AssertFail _021DB2EE: mov r1, #0 str r1, [sp] diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s index b606312e..eaee32f8 100644 --- a/arm9/modules/05/asm/mod05_021DB44C.s +++ b/arm9/modules/05/asm/mod05_021DB44C.s @@ -10,7 +10,7 @@ MOD05_021DB44C: ; 0x021DB44C add r5, r0, #0 cmp r6, #3 blo _021DB45A - bl ErrorHandling + bl GF_AssertFail _021DB45A: mov r0, #4 mov r1, #0x14 @@ -60,14 +60,14 @@ MOD05_021DB4B0: ; 0x021DB4B0 push {r4, lr} add r4, r0, #0 bne _021DB4BA - bl ErrorHandling + bl GF_AssertFail _021DB4BA: ldr r0, [r4] add r0, r0, #4 bl MOD05_021DB7A0 ldr r1, [r4] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4] pop {r4, pc} @@ -77,7 +77,7 @@ MOD05_021DB4D0: ; 0x021DB4D0 push {r3, r4, r5, lr} add r4, r0, #0 bne _021DB4DA - bl ErrorHandling + bl GF_AssertFail _021DB4DA: bl GF_RTC_TimeToSec lsr r1, r0, #0x1f @@ -229,21 +229,21 @@ MOD05_021DB5EC: ; 0x021DB5EC add r4, r0, #0 mov r1, #0 mov r2, #0x40 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag add r0, r4, #0 mov r1, #0 mov r2, #0x80 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag mov r2, #2 add r0, r4, #0 mov r1, #0 lsl r2, r2, #8 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag mov r2, #1 add r0, r4, #0 mov r1, #0 lsl r2, r2, #0xa - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag pop {r4, pc} thumb_func_start MOD05_021DB61C @@ -419,7 +419,7 @@ _021DB73E: _021DB78A: ldr r1, [sp, #0x14] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [sp, #8] add sp, #0x1fc add sp, #0x20 @@ -433,7 +433,7 @@ MOD05_021DB7A0: ; 0x021DB7A0 add r4, r0, #0 ldr r1, [r4] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4] pop {r4, pc} diff --git a/arm9/modules/05/asm/mod05_021DB900.s b/arm9/modules/05/asm/mod05_021DB900.s index 9edf9e7c..931fcfad 100644 --- a/arm9/modules/05/asm/mod05_021DB900.s +++ b/arm9/modules/05/asm/mod05_021DB900.s @@ -11,7 +11,7 @@ MOD05_021DB900: ; 0x021DB900 bl AllocFromHeap add r4, r0, #0 bne _021DB912 - bl ErrorHandling + bl GF_AssertFail _021DB912: add r0, r4, #0 pop {r4, pc} @@ -37,7 +37,7 @@ MOD05_021DB918: ; 0x021DB918 bl FS_ReadFile cmp r0, #0 bge _021DB946 - bl ErrorHandling + bl GF_AssertFail _021DB946: add r0, sp, #4 add r1, sp, #0 @@ -45,7 +45,7 @@ _021DB946: bl FS_ReadFile cmp r0, #0 bge _021DB958 - bl ErrorHandling + bl GF_AssertFail _021DB958: add r0, sp, #0 ldrh r1, [r0, #2] @@ -58,7 +58,7 @@ _021DB958: str r0, [r5] cmp r0, #0 bne _021DB974 - bl ErrorHandling + bl GF_AssertFail _021DB974: mov r0, #4 add r1, r4, #0 @@ -66,7 +66,7 @@ _021DB974: str r0, [r5, #4] cmp r0, #0 bne _021DB986 - bl ErrorHandling + bl GF_AssertFail _021DB986: ldr r1, [r5] add r0, sp, #4 @@ -74,7 +74,7 @@ _021DB986: bl FS_ReadFile cmp r0, #0 bge _021DB998 - bl ErrorHandling + bl GF_AssertFail _021DB998: ldr r1, [r5, #4] add r0, sp, #4 @@ -82,14 +82,14 @@ _021DB998: bl FS_ReadFile cmp r0, #0 bge _021DB9AA - bl ErrorHandling + bl GF_AssertFail _021DB9AA: add r0, sp, #4 bl FS_CloseFile add sp, #0x4c pop {r3, r4, r5, r6, pc} _021DB9B4: - bl ErrorHandling + bl GF_AssertFail add sp, #0x4c pop {r3, r4, r5, r6, pc} diff --git a/arm9/modules/05/asm/mod05_021DBA00.s b/arm9/modules/05/asm/mod05_021DBA00.s index 22e64df5..d0d97f37 100644 --- a/arm9/modules/05/asm/mod05_021DBA00.s +++ b/arm9/modules/05/asm/mod05_021DBA00.s @@ -24,7 +24,7 @@ MOD05_021DBA1C: ; 0x021DBA1C add r4, r0, #0 ldr r1, [r4] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4] pop {r4, pc} diff --git a/arm9/modules/05/asm/mod05_021DBABC.s b/arm9/modules/05/asm/mod05_021DBABC.s index 28a15fb2..2c2bb7d6 100644 --- a/arm9/modules/05/asm/mod05_021DBABC.s +++ b/arm9/modules/05/asm/mod05_021DBABC.s @@ -24,7 +24,7 @@ MOD05_021DBAD8: ; 0x021DBAD8 add r4, r0, #0 ldr r1, [r4] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4] pop {r4, pc} @@ -51,7 +51,7 @@ _021DBAFA: ldrsh r2, [r5, r2] ldrsh r3, [r5, r3] add r0, r4, #0 - bl FUN_020B8418 + bl NNS_G3dGlbLightVector _021DBB14: add r1, r4, #4 mov r0, #1 @@ -60,7 +60,7 @@ _021DBB14: beq _021DBB26 ldrh r1, [r6, #0x18] add r0, r4, #0 - bl FUN_020B8404 + bl NNS_G3dGlbLightColor _021DBB26: add r4, r4, #1 add r5, r5, #6 @@ -77,7 +77,7 @@ _021DBB26: ldrh r0, [r0, #0x20] ldrh r1, [r1, #0x22] ldr r2, [r2, #0x28] - bl FUN_020B83E0 + bl NNS_G3dGlbMaterialColorDiffAmb _021DBB48: mov r0, #3 lsl r0, r0, #0xa @@ -89,7 +89,7 @@ _021DBB48: ldrh r0, [r0, #0x24] ldrh r1, [r1, #0x26] ldr r2, [r2, #0x2c] - bl FUN_020B83BC + bl NNS_G3dGlbMaterialColorSpecEmi _021DBB60: mov r0, #1 lsl r0, r0, #0xc @@ -109,7 +109,7 @@ _021DBB60: ldr r0, [r0, #0x30] ldr r2, [r2, #0x38] ldr r3, [r3, #0x3c] - bl FUN_020B8390 + bl NNS_G3dGlbPolygonAttr _021DBB88: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -126,7 +126,7 @@ MOD05_021DBB8C: ; 0x021DBB8C beq _021DBBA4 ldrh r1, [r5, #0x20] add r0, r6, #0 - bl FUN_020BBC34 + bl NNS_G3dMdlSetMdlDiffAll _021DBBA4: mov r0, #2 lsl r0, r0, #8 @@ -134,7 +134,7 @@ _021DBBA4: beq _021DBBB4 ldrh r1, [r5, #0x22] add r0, r6, #0 - bl FUN_020BBBF4 + bl NNS_G3dMdlSetMdlAmbAll _021DBBB4: mov r0, #1 lsl r0, r0, #0xa @@ -142,7 +142,7 @@ _021DBBB4: beq _021DBBC4 ldrh r1, [r5, #0x24] add r0, r6, #0 - bl FUN_020BBBB4 + bl NNS_G3dMdlSetMdlSpecAll _021DBBC4: mov r0, #2 lsl r0, r0, #0xa @@ -150,7 +150,7 @@ _021DBBC4: beq _021DBBD4 ldrh r1, [r5, #0x26] add r0, r6, #0 - bl FUN_020BBB74 + bl NNS_G3dMdlSetMdlEmiAll _021DBBD4: mov r0, #1 lsl r0, r0, #0xc @@ -158,7 +158,7 @@ _021DBBD4: beq _021DBBE4 ldr r1, [r5, #0x30] add r0, r6, #0 - bl FUN_020BBB34 + bl NNS_G3dMdlSetMdlLightEnableFlagAll _021DBBE4: mov r0, #2 lsl r0, r0, #0xc @@ -166,7 +166,7 @@ _021DBBE4: beq _021DBBF4 ldr r1, [r5, #0x34] add r0, r6, #0 - bl FUN_020BBAF4 + bl NNS_G3dMdlSetMdlPolygonModeAll _021DBBF4: mov r0, #1 lsl r0, r0, #0xe @@ -174,7 +174,7 @@ _021DBBF4: beq _021DBC04 ldr r1, [r5, #0x38] add r0, r6, #0 - bl FUN_020BBAB4 + bl NNS_G3dMdlSetMdlCullModeAll _021DBC04: mov r0, #2 lsl r0, r0, #0xe @@ -182,7 +182,7 @@ _021DBC04: beq _021DBC14 ldr r1, [r5, #0x3c] add r0, r6, #0 - bl FUN_020BBA74 + bl NNS_G3dMdlSetMdlPolygonIDAll _021DBC14: mov r0, #1 lsl r0, r0, #0x10 @@ -190,7 +190,7 @@ _021DBC14: beq _021DBC24 ldr r1, [r5, #0x40] add r0, r6, #0 - bl FUN_020BBA34 + bl NNS_G3dMdlSetMdlAlphaAll _021DBC24: mov r1, #2 lsl r1, r1, #0x10 @@ -201,7 +201,7 @@ _021DBC24: lsr r1, r1, #2 add r0, r6, #0 and r1, r2 - bl FUN_020BB9F4 + bl NNS_G3dMdlSetMdlFogEnableFlagAll _021DBC3A: mov r1, #1 lsl r1, r1, #0x12 @@ -212,7 +212,7 @@ _021DBC3A: lsr r1, r1, #4 add r0, r6, #0 and r1, r2 - bl FUN_020BB9B4 + bl NNS_G3dMdlSetMdlDepthTestCondAll _021DBC50: mov r1, #2 lsl r1, r1, #0x12 @@ -223,7 +223,7 @@ _021DBC50: lsr r1, r1, #6 add r0, r6, #0 and r1, r2 - bl FUN_020BB974 + bl NNS_G3dMdlSetMdl1DotAll _021DBC66: mov r1, #1 lsl r1, r1, #0x14 @@ -234,7 +234,7 @@ _021DBC66: lsr r1, r1, #8 add r0, r6, #0 and r1, r2 - bl FUN_020BB934 + bl NNS_G3dMdlSetMdlFarClipAll _021DBC7C: mov r1, #2 lsl r1, r1, #0x14 @@ -245,7 +245,7 @@ _021DBC7C: lsr r1, r1, #0xa add r0, r6, #0 and r1, r2 - bl FUN_020BB8F4 + bl NNS_G3dMdlSetMdlXLDepthUpdateAll _021DBC92: pop {r4, r5, r6, pc} @@ -268,7 +268,7 @@ MOD05_021DBC94: ; 0x021DBC94 ldrsh r1, [r5, r4] ldrsh r2, [r2, r4] ldrsh r3, [r3, r4] - bl FUN_020B8418 + bl NNS_G3dGlbLightVector pop {r4, r5, r6, pc} thumb_func_start MOD05_021DBCBC @@ -280,7 +280,7 @@ MOD05_021DBCBC: ; 0x021DBCBC strh r2, [r4, r3] add r0, r1, #0 ldrh r1, [r4, r3] - bl FUN_020B8404 + bl NNS_G3dGlbLightColor pop {r4, pc} thumb_func_start MOD05_021DBCD0 diff --git a/arm9/modules/05/asm/mod05_021DBD84.s b/arm9/modules/05/asm/mod05_021DBD84.s index 7c107314..9a6cb847 100644 --- a/arm9/modules/05/asm/mod05_021DBD84.s +++ b/arm9/modules/05/asm/mod05_021DBD84.s @@ -16,7 +16,7 @@ MOD05_021DBD84: ; 0x021DBD84 add r4, r1, r0 cmp r2, #0x10 blo _021DBD9E - bl ErrorHandling + bl GF_AssertFail _021DBD9E: mov r0, #4 bl FUN_0201EB64 diff --git a/arm9/modules/05/asm/mod05_021DBE04.s b/arm9/modules/05/asm/mod05_021DBE04.s index 4b4b5177..873fd482 100644 --- a/arm9/modules/05/asm/mod05_021DBE04.s +++ b/arm9/modules/05/asm/mod05_021DBE04.s @@ -9,11 +9,11 @@ MOD05_021DBE04: ; 0x021DBE04 ldr r4, [r0, #0x18] cmp r4, #0 bne _021DBE10 - bl ErrorHandling + bl GF_AssertFail _021DBE10: cmp r4, #5 blt _021DBE18 - bl ErrorHandling + bl GF_AssertFail _021DBE18: sub r0, r4, #1 pop {r4, pc} diff --git a/arm9/modules/05/asm/mod05_021DBEF4.s b/arm9/modules/05/asm/mod05_021DBEF4.s index 1d56d13e..f65de9d8 100644 --- a/arm9/modules/05/asm/mod05_021DBEF4.s +++ b/arm9/modules/05/asm/mod05_021DBEF4.s @@ -133,7 +133,7 @@ _021DBFA8: str r0, [r1, r5] add r0, r1, #0 ldr r0, [r0, r5] - bl FUN_020BC0FC + bl NNS_G3dGetTex add r1, r6, r5 str r0, [r1, #8] add r0, r4, #0 diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index ab06fed1..7b1e767f 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -68,7 +68,7 @@ MOD05_021DC124: ; 0x021DC124 add r4, r1, #0 cmp r0, #6 beq _021DC134 - bl ErrorHandling + bl GF_AssertFail _021DC134: ldr r2, [r5, #4] cmp r2, r4 @@ -78,7 +78,7 @@ _021DC134: bl MOD05_021DC608 cmp r0, #0 bne _021DC14A - bl ErrorHandling + bl GF_AssertFail _021DC14A: ldr r0, [r5] mov r1, #0 @@ -86,7 +86,7 @@ _021DC14A: bl MOD05_021DC608 cmp r0, #0 bne _021DC15C - bl ErrorHandling + bl GF_AssertFail _021DC15C: ldr r0, [r5] mov r1, #3 @@ -94,7 +94,7 @@ _021DC15C: bl MOD05_021DC608 cmp r0, #0 bne _021DC16E - bl ErrorHandling + bl GF_AssertFail _021DC16E: str r4, [r5, #4] _021DC170: @@ -122,7 +122,7 @@ _021DC190: ldr r0, [r5, #0x14] cmp r0, #0 beq _021DC19A - bl ErrorHandling + bl GF_AssertFail _021DC19A: str r4, [r5, #8] ldr r0, [r5, #4] @@ -182,7 +182,7 @@ _021DC1F6: bl MOD05_021DC608 cmp r0, #0 bne _021DC208 - bl ErrorHandling + bl GF_AssertFail _021DC208: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -200,7 +200,7 @@ _021DC210: bl MOD05_021DC608 cmp r0, #0 bne _021DC22E - bl ErrorHandling + bl GF_AssertFail _021DC22E: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -213,7 +213,7 @@ _021DC236: bl MOD05_021DC608 cmp r0, #0 bne _021DC248 - bl ErrorHandling + bl GF_AssertFail _021DC248: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -236,7 +236,7 @@ _021DC264: bl MOD05_021DC608 cmp r0, #0 bne _021DC276 - bl ErrorHandling + bl GF_AssertFail _021DC276: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -288,7 +288,7 @@ _021DC2C4: bl MOD05_021DC608 cmp r0, #0 bne _021DC2D6 - bl ErrorHandling + bl GF_AssertFail _021DC2D6: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -311,7 +311,7 @@ _021DC2F2: bl MOD05_021DC608 cmp r0, #0 bne _021DC304 - bl ErrorHandling + bl GF_AssertFail _021DC304: ldr r0, [r4] ldr r2, [r4, #8] @@ -319,7 +319,7 @@ _021DC304: bl MOD05_021DC608 cmp r0, #0 bne _021DC316 - bl ErrorHandling + bl GF_AssertFail _021DC316: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -337,7 +337,7 @@ _021DC31E: bl MOD05_021DC608 cmp r0, #0 bne _021DC33C - bl ErrorHandling + bl GF_AssertFail _021DC33C: ldr r0, [r4, #0xc] add r0, r0, #1 @@ -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 @@ -692,7 +692,7 @@ _021DC5A2: bl NARC_dtor ldr r1, [r4] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4] _021DC5FE: @@ -1220,7 +1220,7 @@ _021DC998: str r2, [r1, r0] ldr r1, [r4, #0xc] add r0, r3, #4 - ldr r6, _021DCA38 ; =UNK_021CEF70 + ldr r6, _021DCA38 ; =NNS_G3dGlb + 0x258 add r5, r1, r0 ldmia r6!, {r0, r1} stmia r5!, {r0, r1} @@ -1271,7 +1271,7 @@ _021DCA30: pop {r4, r5, r6, pc} .balign 4, 0 _021DCA34: .word 0x00000F48 -_021DCA38: .word UNK_021CEF70 +_021DCA38: .word NNS_G3dGlb + 0x258 _021DCA3C: .word 0x00000F58 _021DCA40: .word 0x0400000C @@ -1362,7 +1362,7 @@ _021DCAD2: bl MOD05_021DC880 ldr r1, [r4, #0x10] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4, #0x10] ldr r0, [r4, #0x1c] @@ -1390,7 +1390,7 @@ _021DCB14: cmp r1, #0 beq _021DCB2C mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r1, [r4, #0xc] ldr r0, _021DCB64 ; =0x00000F58 mov r2, #0 @@ -1414,7 +1414,7 @@ _021DCB3E: _021DCB4C: ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4, #0xc] _021DCB58: @@ -1559,7 +1559,7 @@ _021DCC66: bl MOD05_021DCD68 cmp r0, #0 bne _021DCC74 - bl ErrorHandling + bl GF_AssertFail _021DCC74: ldr r0, [r4, #0x18] add r0, r0, #1 @@ -1897,7 +1897,7 @@ MOD05_021DCECC: ; 0x021DCECC bl NARC_AllocAndReadWholeMember add r1, sp, #0x14 str r0, [sp] - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r1, [sp, #0x14] mov r0, #2 ldr r1, [r1, #0xc] @@ -1934,7 +1934,7 @@ MOD05_021DCF14: ; 0x021DCF14 bl NARC_AllocAndReadWholeMember add r1, sp, #0x14 str r0, [sp, #8] - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r3, [sp, #0x14] mov r0, #0 str r0, [sp] @@ -1981,11 +1981,11 @@ MOD05_021DCF68: ; 0x021DCF68 str r0, [sp, #0x14] cmp r0, #0 bne _021DCFA0 - bl ErrorHandling + bl GF_AssertFail _021DCFA0: ldr r0, [sp, #0x14] add r1, sp, #0x18 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData ldr r3, [sp, #0x18] mov r0, #0 str r0, [sp] @@ -2043,15 +2043,15 @@ MOD05_021DD010: ; 0x021DD010 add r4, r1, #0 cmp r0, #0 beq _021DD020 - bl ErrorHandling + bl GF_AssertFail _021DD020: cmp r4, #0 bgt _021DD028 - bl ErrorHandling + bl GF_AssertFail _021DD028: cmp r4, #0x28 bls _021DD030 - bl ErrorHandling + bl GF_AssertFail _021DD030: add r0, r5, #0 add r0, #0xc @@ -2285,7 +2285,7 @@ MOD05_021DD180: ; 0x021DD180 ldr r0, [sp, #0xc] lsl r1, r1, #0x12 bl FX_Div - ldr r3, _021DD2B0 ; =UNK_021CEF70 + ldr r3, _021DD2B0 ; =NNS_G3dGlb + 0x258 str r0, [sp, #0xc] ldmia r3!, {r0, r1} add r2, sp, #0x14 @@ -2391,7 +2391,7 @@ _021DD2A4: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 -_021DD2B0: .word UNK_021CEF70 +_021DD2B0: .word NNS_G3dGlb + 0x258 _021DD2B4: .word 0x00000F4C _021DD2B8: .word 0xFFFFF000 @@ -10147,7 +10147,7 @@ MOD05_021E0FA4: ; 0x021E0FA4 ldr r0, [r5, r0] cmp r0, #0 beq _021E0FB6 - bl ErrorHandling + bl GF_AssertFail _021E0FB6: ldr r1, _021E0FCC ; =0x00000F5C mov r0, #1 diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index df43ddb9..0e1a6b44 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -17,7 +17,7 @@ MOD05_021E1374: ; 0x021E1374 bl AllocFromHeap add r4, r0, #0 bne _021E1396 - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021E1396: mov r2, #0x47 @@ -493,7 +493,7 @@ MOD05_021E1724: ; 0x021E1724 bl AllocFromHeap add r4, r0, #0 bne _021E173C - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _021E173C: ldr r0, _021E1750 ; =MOD05_021E1754 @@ -520,7 +520,7 @@ MOD05_021E1754: ; 0x021E1754 ldrh r0, [r1, r0] cmp r0, #0 bne _021E1770 - bl ErrorHandling + bl GF_AssertFail _021E1770: ldr r2, [r4, #8] ldr r0, _021E1790 ; =0x00000112 @@ -533,7 +533,7 @@ _021E1770: bl FUN_0200CAB4 mov r0, #4 add r1, r4, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit _021E178E: pop {r4, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 0b72da2a..c41f4c57 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -738,7 +738,7 @@ _021E2032: add r0, r4, r0 mov r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0x6d lsl r1, r1, #2 str r0, [r4, r1] @@ -1012,13 +1012,13 @@ MOD05_021E2278: ; 0x021E2278 mov r1, #3 mov r2, #0xf mov r3, #4 - bl FUN_020013E8 + bl ListMenuOverrideSetColors pop {r3, pc} _021E228E: mov r1, #1 mov r2, #0xf mov r3, #2 - bl FUN_020013E8 + bl ListMenuOverrideSetColors pop {r3, pc} .balign 4, 0 @@ -1045,7 +1045,7 @@ _021E22B8: mov r0, #0x6d lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #0x6d mov r1, #0xb5 @@ -1054,7 +1054,7 @@ _021E22B8: ldrh r6, [r5, r1] ldr r0, [r5, r0] add r1, r5, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId mov r0, #0xb5 lsl r0, r0, #2 ldrh r0, [r5, r0] @@ -1134,7 +1134,7 @@ MOD05_021E2368: ; 0x021E2368 mov r1, #0 ldr r0, [r6, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r6, r0] @@ -1189,7 +1189,7 @@ MOD05_021E23D0: ; 0x021E23D0 add r6, r0, #0 ldr r0, [r5, #0x18] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -1226,7 +1226,7 @@ MOD05_021E2434: ; 0x021E2434 ldr r0, [r4, r1] add r1, r1, #6 add r1, r4, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId ldr r0, _021E2460 ; =0x000001BA ldrh r1, [r4, r0] add r0, #0xe2 @@ -1259,7 +1259,7 @@ MOD05_021E2464: ; 0x021E2464 add r5, r0, #0 add r0, r4, #0 add r1, r0, #0 - bl FUN_02002E4C + bl GetFontAttribute lsl r1, r0, #3 mov r0, #7 tst r0, r1 @@ -1318,7 +1318,7 @@ _021E2496: add r0, #8 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r2, #0 add r0, r5, #0 mov r1, #0xf @@ -1718,7 +1718,7 @@ MOD05_021E27E8: ; 0x021E27E8 add r6, r2, #0 mov r0, #4 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows add r4, r0, #0 str r6, [sp] mov r0, #0xa @@ -1750,7 +1750,7 @@ MOD05_021E27E8: ; 0x021E27E8 bl FUN_0200CCA4 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0x7a mov r0, #0 mov r1, #0x1a @@ -1807,7 +1807,7 @@ MOD05_021E28A0: ; 0x021E28A0 mov r1, #0xf mov r2, #0 str r3, [sp, #4] - bl FUN_020196F4 + bl FillWindowPixelRect mov r2, #0x7a mov r0, #0 mov r1, #0x1a @@ -1878,7 +1878,7 @@ MOD05_021E2950: ; 0x021E2950 add r6, r2, #0 mov r0, #4 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows add r4, r0, #0 str r6, [sp] mov r0, #0xa @@ -1936,7 +1936,7 @@ MOD05_021E29C8: ; 0x021E29C8 str r1, [sp, #0xc] add r0, r1, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021E2A6C ; =0x00000141 mov r0, #0 mov r1, #0x1a @@ -2007,7 +2007,7 @@ MOD05_021E2A70: ; 0x021E2A70 add r6, r2, #0 mov r0, #4 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows add r4, r0, #0 str r6, [sp] mov r0, #0xa @@ -2054,7 +2054,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 str r1, [sp, #0xc] add r0, r1, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021E2B7C ; =0x00000141 mov r0, #0 mov r1, #0x1a diff --git a/arm9/modules/05/asm/mod05_021E2B80.s b/arm9/modules/05/asm/mod05_021E2B80.s index 16e19ae0..8a1f9413 100644 --- a/arm9/modules/05/asm/mod05_021E2B80.s +++ b/arm9/modules/05/asm/mod05_021E2B80.s @@ -296,7 +296,7 @@ MOD05_CreateMessageBox: ; 0x021E2D9C _021E2DC8: ldr r0, [r4, #0xc] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer pop {r3, r4, r5, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index 0666b52d..a81ba2f1 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -146,7 +146,7 @@ _021E2F92: add r0, r5, #0 add r0, #0x20 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #8 str r2, [sp] add r0, r5, #0 @@ -159,7 +159,7 @@ _021E2F92: ldr r1, [r5, #0x34] add r0, #0x20 ldr r1, [r1, #0x14] - bl FUN_02019658 + bl BlitBitmapRectToWindow ldr r0, [sp, #0x18] mov r1, #8 add r0, r0, #1 @@ -178,7 +178,7 @@ _021E2F92: ldr r1, [r1, #0x14] add r0, #0x20 mov r2, #0x18 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r0, #8 str r0, [sp] str r0, [sp, #4] @@ -192,7 +192,7 @@ _021E2F92: ldr r1, [r1, #0x14] add r0, #0x20 mov r2, #0x38 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r1, #8 str r1, [sp] lsl r0, r4, #0x10 @@ -208,7 +208,7 @@ _021E2F92: add r0, #0x20 mov r2, #0x40 mov r3, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r1, #8 str r1, [sp] str r1, [sp, #4] @@ -223,7 +223,7 @@ _021E2F92: ldr r1, [r1, #0x14] add r0, #0x20 mov r2, #0x20 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r1, #8 str r1, [sp] lsl r0, r4, #0x10 @@ -240,7 +240,7 @@ _021E2F92: add r0, #0x20 mov r2, #0x30 mov r3, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow ldr r0, [sp, #0x18] mov r7, #0 cmp r0, #0 @@ -266,7 +266,7 @@ _021E3078: ldr r1, [r1, #0x14] mov r2, #0x10 mov r3, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r0, #8 str r0, [sp] str r0, [sp, #4] @@ -282,7 +282,7 @@ _021E3078: ldr r1, [r1, #0x14] mov r2, #0x48 mov r3, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r0, #8 str r0, [sp] str r0, [sp, #4] @@ -299,7 +299,7 @@ _021E3078: ldr r1, [r1, #0x14] mov r2, #0x28 mov r3, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow add r0, r7, #1 lsl r0, r0, #0x18 lsr r7, r0, #0x18 @@ -568,7 +568,7 @@ _021E32E0: str r0, [r4, #0x14] pop {r4, pc} _021E32E6: - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} .balign 4, 0 _021E32EC: .word MOD05_021E3124 diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s index 27446591..42f9037e 100644 --- a/arm9/modules/05/asm/mod05_021E3444.s +++ b/arm9/modules/05/asm/mod05_021E3444.s @@ -495,7 +495,7 @@ MOD05_021E37CC: ; 0x021E37CC ldr r4, [sp, #0x20] cmp r0, #0 beq _021E37E4 - bl ErrorHandling + bl GF_AssertFail _021E37E4: mov r0, #0 str r0, [r6, #0x18] @@ -587,7 +587,7 @@ MOD05_021E3888: ; 0x021E3888 bl MOD05_021E35AC cmp r0, #0 beq _021E389E - bl ErrorHandling + bl GF_AssertFail _021E389E: str r4, [r5, #0x18] mov r0, #0 @@ -837,7 +837,7 @@ MOD05_021E3A70: ; 0x021E3A70 add r7, r3, #0 cmp r0, #0 beq _021E3A84 - bl ErrorHandling + bl GF_AssertFail _021E3A84: mov r1, #0 str r1, [r5, #0x18] @@ -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} @@ -1232,7 +1232,7 @@ MOD05_021E3DA0: ; 0x021E3DA0 bl MTX_Identity22_ add r0, sp, #8 ldrh r0, [r0, #0x14] - ldr r3, _021E3E0C ; =UNK_020FFA38 + ldr r3, _021E3E0C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1271,7 +1271,7 @@ MOD05_021E3DA0: ; 0x021E3DA0 bl FUN_0200CA98 pop {r3, r4, r5, r6, r7, pc} nop -_021E3E0C: .word UNK_020FFA38 +_021E3E0C: .word FX_SinCosTable_ _021E3E10: .word MOD05_021E3D70 thumb_func_start MOD05_021E3E14 @@ -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] @@ -1508,7 +1508,7 @@ MOD05_021E3FC4: ; 0x021E3FC4 bl FUN_0201FF84 add r4, r0, #0 bne _021E3FF2 - bl ErrorHandling + bl GF_AssertFail _021E3FF2: add r0, r4, #0 add sp, #0x20 @@ -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] @@ -1652,7 +1652,7 @@ MOD05_021E40F0: ; 0x021E40F0 bl DC_FlushRange add r0, r6, #0 mov r1, #1 - bl FUN_020B19C4 + bl NNS_G2dGetImagePaletteLocation add r1, r0, #0 add r0, r5, #0 add r2, r4, #0 @@ -1671,7 +1671,7 @@ MOD05_021E4118: ; 0x021E4118 bl DC_FlushRange add r0, r6, #0 mov r1, #1 - bl FUN_020B1A14 + bl NNS_G2dGetImageLocation add r1, r0, #0 add r0, r5, #0 add r2, r4, #0 @@ -1709,7 +1709,7 @@ MOD05_021E4160: ; 0x021E4160 add r7, r3, #0 cmp r0, #0 beq _021E4176 - bl ErrorHandling + bl GF_AssertFail _021E4176: ldr r3, [sp, #0x1c] add r0, r5, #0 @@ -1827,7 +1827,7 @@ MOD05_021E4240: ; 0x021E4240 add r7, r3, #0 cmp r0, #0 beq _021E4256 - bl ErrorHandling + bl GF_AssertFail _021E4256: ldr r3, [sp, #0x1c] add r0, r5, #0 @@ -1989,7 +1989,7 @@ _021E4370: ldrb r1, [r1, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect _021E4390: add sp, #8 pop {r3, r4, r5, pc} @@ -2286,7 +2286,7 @@ MOD05_021E45A0: ; 0x021E45A0 add r4, r1, #0 lsl r1, r0, #1 lsl r0, r1, #1 - ldr r2, _021E4680 ; =UNK_020FFA38 + ldr r2, _021E4680 ; =FX_SinCosTable_ add r1, r1, #1 lsl r1, r1, #1 ldrsh r0, [r2, r0] @@ -2297,7 +2297,7 @@ MOD05_021E45A0: ; 0x021E45A0 asr r0, r4, #4 lsl r1, r0, #1 lsl r0, r1, #1 - ldr r2, _021E4680 ; =UNK_020FFA38 + ldr r2, _021E4680 ; =FX_SinCosTable_ add r1, r1, #1 lsl r1, r1, #1 ldrsh r0, [r2, r0] @@ -2389,7 +2389,7 @@ _021E464C: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 -_021E4680: .word UNK_020FFA38 +_021E4680: .word FX_SinCosTable_ _021E4684: .word 0x00000000 thumb_func_start MOD05_021E4688 @@ -2569,7 +2569,7 @@ MOD05_021E47BC: ; 0x021E47BC add r5, r3, #0 cmp r0, #0 beq _021E47D8 - bl ErrorHandling + bl GF_AssertFail _021E47D8: mov r1, #0 str r1, [r4, #0x18] @@ -2787,7 +2787,7 @@ _021E4976: mov r6, #0 b _021E4980 _021E497A: - bl ErrorHandling + bl GF_AssertFail mov r6, #0 _021E4980: ldr r0, [r5, #4] diff --git a/arm9/modules/05/asm/mod05_021E4AE4.s b/arm9/modules/05/asm/mod05_021E4AE4.s index b05969ea..98146a9c 100644 --- a/arm9/modules/05/asm/mod05_021E4AE4.s +++ b/arm9/modules/05/asm/mod05_021E4AE4.s @@ -76,7 +76,7 @@ MOD05_021E4B64: ; 0x021E4B64 bl MOD05_021E4D2C cmp r0, #0 beq _021E4B78 - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} _021E4B78: add r0, r5, #0 @@ -166,7 +166,7 @@ MOD05_021E4C08: ; 0x021E4C08 bl MOD05_021E4D2C cmp r0, #0 bne _021E4C1A - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} _021E4C1A: @@ -333,7 +333,7 @@ _021E4D1C: sub r4, r4, #1 bne _021E4D0E _021E4D22: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -402,7 +402,7 @@ _021E4D7A: cmp r2, #0x20 bne _021E4D72 _021E4D82: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -454,7 +454,7 @@ MOD05_021E4DC4: ; 0x021E4DC4 bl FUN_020644E4 add r4, r0, #0 bne _021E4DDE - bl ErrorHandling + bl GF_AssertFail _021E4DDE: add r0, r4, #0 add sp, #8 @@ -566,14 +566,14 @@ MOD05_021E4E90: ; 0x021E4E90 bl FUN_0201F6E8 add r4, r0, #0 bne _021E4EC0 - bl ErrorHandling + bl GF_AssertFail _021E4EC0: cmp r4, #0 beq _021E4EDA add r0, r4, #0 bl FUN_0201F8E0 mov r1, #1 - bl FUN_020BB9F4 + bl NNS_G3dMdlSetMdlFogEnableFlagAll add r0, r4, #0 bl FUN_0201F8E0 bl MOD05_021DB5EC @@ -618,7 +618,7 @@ MOD05_021E4EFC: ; 0x021E4EFC bl FUN_02021050 add r4, r0, #0 bne _021E4F2E - bl ErrorHandling + bl GF_AssertFail _021E4F2E: add r0, r4, #0 bl FUN_020210AC @@ -638,7 +638,7 @@ _021E4F3C: bl MOD05_021E4FC8 add r4, r0, #0 bne _021E4F58 - bl ErrorHandling + bl GF_AssertFail _021E4F58: add r0, r4, #0 add sp, #0x1c @@ -700,7 +700,7 @@ _021E4FBA: add r3, #8 sub r2, r2, #1 bne _021E4FAE - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} .balign 4, 0 @@ -742,7 +742,7 @@ _021E4FFC: _021E5002: cmp r4, #0 bne _021E500A - bl ErrorHandling + bl GF_AssertFail _021E500A: add r0, r4, #0 mov r1, #0 @@ -790,7 +790,7 @@ _021E505C: add r3, #8 sub r2, r2, #1 bne _021E5052 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .balign 4, 0 @@ -884,7 +884,7 @@ MOD05_021E50D4: ; 0x021E50D4 bl FUN_02020F54 cmp r0, #0 bne _021E5106 - bl ErrorHandling + bl GF_AssertFail _021E5106: ldr r2, [r4, #0x18] add r0, r5, #0 @@ -969,7 +969,7 @@ MOD05_021E5198: ; 0x021E5198 ldr r0, [r4] add r6, r1, #0 add r5, r2, #0 - bl FUN_020BC0FC + bl NNS_G3dGetTex cmp r0, #0 beq _021E51C8 bl FUN_0201B254 @@ -979,13 +979,13 @@ MOD05_021E5198: ; 0x021E5198 ldr r1, [r0, #8] bl DC_FlushRange ldr r0, [r4] - bl FUN_020BB59C + bl NNS_G3dResDefaultSetup cmp r0, #0 bne _021E51C8 - bl ErrorHandling + bl GF_AssertFail _021E51C8: ldr r0, [r4] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r1, r0, r1 ldr r1, [r1, #0xc] @@ -993,11 +993,11 @@ _021E51C8: str r0, [r5] cmp r5, #0 bne _021E51E0 - bl ErrorHandling + bl GF_AssertFail _021E51E0: ldr r1, [r5] add r0, r6, #0 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit pop {r4, r5, r6, pc} .balign 4, 0 @@ -1038,7 +1038,7 @@ MOD05_021E5224: ; 0x021E5224 add r2, r3, #0 bl MOD05_021E4C6C str r0, [r4] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet str r0, [r4, #4] ldrh r1, [r0, #0xe] add r1, r0, r1 @@ -1046,7 +1046,7 @@ MOD05_021E5224: ; 0x021E5224 add r0, r0, r1 str r0, [r4, #8] ldr r0, [r4] - bl FUN_020BC0FC + bl NNS_G3dGetTex str r0, [r4, #0xc] cmp r0, #0 beq _021E525A @@ -1071,17 +1071,17 @@ MOD05_021E5260: ; 0x021E5260 bl MOD05_021E4C6C str r0, [r5] mov r1, #0 - bl FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx str r0, [r5, #4] ldr r1, [r5, #4] ldr r2, [r4, #8] add r0, r6, #0 - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r5, #8] ldr r1, [r5, #4] ldr r2, [r4, #8] ldr r3, [r4, #0xc] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/mod05_021E55BC.s b/arm9/modules/05/asm/mod05_021E55BC.s index 43186ebe..517222fb 100644 --- a/arm9/modules/05/asm/mod05_021E55BC.s +++ b/arm9/modules/05/asm/mod05_021E55BC.s @@ -134,7 +134,7 @@ MOD05_021E569C: ; 0x021E569C bl FUN_020582A8 cmp r0, #0 bne _021E56B8 - bl ErrorHandling + bl GF_AssertFail _021E56B8: ldr r0, [r4] cmp r0, #0 @@ -207,7 +207,7 @@ _021E5716: lsl r0, r0, #0xc sub r0, r1, r0 str r0, [sp, #0x5c] - bl FUN_020B8344 + bl NNS_G3dGlbGetInvV mov r2, #0 add r5, r0, #0 add r0, sp, #0x24 diff --git a/arm9/modules/05/asm/mod05_021E577C.s b/arm9/modules/05/asm/mod05_021E577C.s index bf86c095..bad97efe 100644 --- a/arm9/modules/05/asm/mod05_021E577C.s +++ b/arm9/modules/05/asm/mod05_021E577C.s @@ -134,7 +134,7 @@ MOD05_021E585C: ; 0x021E585C bl FUN_020582A8 cmp r0, #0 bne _021E5878 - bl ErrorHandling + bl GF_AssertFail _021E5878: add r0, r5, #0 add r1, sp, #0 @@ -186,7 +186,7 @@ _021E58B2: lsl r0, r0, #0xc sub r0, r1, r0 str r0, [sp, #0x5c] - bl FUN_020B8344 + bl NNS_G3dGlbGetInvV mov r2, #0 add r5, r0, #0 add r0, sp, #0x24 diff --git a/arm9/modules/05/asm/mod05_021E5918.s b/arm9/modules/05/asm/mod05_021E5918.s index 0322f00e..8459b021 100644 --- a/arm9/modules/05/asm/mod05_021E5918.s +++ b/arm9/modules/05/asm/mod05_021E5918.s @@ -188,7 +188,7 @@ _021E5A4E: lsl r0, r0, #0xc sub r0, r1, r0 str r0, [sp, #0x5c] - bl FUN_020B8344 + bl NNS_G3dGlbGetInvV mov r2, #0 add r5, r0, #0 add r0, sp, #0x24 diff --git a/arm9/modules/05/asm/mod05_021E5AB4.s b/arm9/modules/05/asm/mod05_021E5AB4.s index ff3779f5..3b0d6a5f 100644 --- a/arm9/modules/05/asm/mod05_021E5AB4.s +++ b/arm9/modules/05/asm/mod05_021E5AB4.s @@ -131,13 +131,13 @@ MOD05_021E5B80: ; 0x021E5B80 add r0, r4, #4 ldr r1, [r2, #0x18] ldr r2, [r2, #0xc] - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r4] ldr r3, [r5, #8] ldr r1, [r3, #0x18] ldr r2, [r3, #0xc] ldr r3, [r3, #0x10] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit ldr r1, [r5, #8] add r0, r4, #0 add r0, #0x18 @@ -146,7 +146,7 @@ MOD05_021E5B80: ; 0x021E5B80 add r0, r4, #0 ldr r1, [r4] add r0, #0x18 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r0, r6, #0 add r1, sp, #0 bl FUN_0206477C @@ -166,7 +166,7 @@ MOD05_021E5BF8: ; 0x021E5BF8 ldr r4, [r1] ldr r1, [r4] add r0, r4, #4 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj add r0, r4, #0 bl MOD05_021E4C00 pop {r4, pc} @@ -209,7 +209,7 @@ _021E5C40: bne _021E5C40 ldr r0, [r5] str r0, [r3] - bl FUN_020B8344 + bl NNS_G3dGlbGetInvV mov r2, #0 add r5, r0, #0 add r0, sp, #0x24 diff --git a/arm9/modules/05/asm/mod05_021E5C8C.s b/arm9/modules/05/asm/mod05_021E5C8C.s index ab321b6f..dc59dcec 100644 --- a/arm9/modules/05/asm/mod05_021E5C8C.s +++ b/arm9/modules/05/asm/mod05_021E5C8C.s @@ -129,13 +129,13 @@ MOD05_021E5D50: ; 0x021E5D50 add r0, r4, #4 ldr r1, [r2, #0x1c] ldr r2, [r2, #0x10] - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r4] ldr r3, [r5, #8] ldr r1, [r3, #0x1c] ldr r2, [r3, #0x10] ldr r3, [r3, #0x14] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit ldr r1, [r5, #8] add r0, r4, #0 add r0, #0x18 @@ -144,7 +144,7 @@ MOD05_021E5D50: ; 0x021E5D50 add r0, r4, #0 ldr r1, [r4] add r0, #0x18 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r0, r6, #0 add r1, sp, #0 bl FUN_0206477C @@ -164,7 +164,7 @@ MOD05_021E5DC8: ; 0x021E5DC8 ldr r4, [r1] ldr r1, [r4] add r0, r4, #4 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj add r0, r4, #0 bl MOD05_021E4C00 pop {r4, pc} diff --git a/arm9/modules/05/asm/mod05_021E5E10.s b/arm9/modules/05/asm/mod05_021E5E10.s index e2e6814e..f5f3ef70 100644 --- a/arm9/modules/05/asm/mod05_021E5E10.s +++ b/arm9/modules/05/asm/mod05_021E5E10.s @@ -165,13 +165,13 @@ MOD05_021E5F18: ; 0x021E5F18 add r0, r4, #4 ldr r1, [r2, #0x18] ldr r2, [r2, #0xc] - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r4] ldr r3, [r5, #8] ldr r1, [r3, #0x18] ldr r2, [r3, #0xc] ldr r3, [r3, #0x10] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit ldr r1, [r5, #8] add r0, r4, #0 add r0, #0x18 @@ -180,7 +180,7 @@ MOD05_021E5F18: ; 0x021E5F18 add r0, r4, #0 ldr r1, [r4] add r0, #0x18 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r0, r6, #0 add r1, sp, #0 bl FUN_0206477C @@ -200,7 +200,7 @@ MOD05_021E5F90: ; 0x021E5F90 ldr r4, [r1] ldr r1, [r4] add r0, r4, #4 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj add r0, r4, #0 bl MOD05_021E4C00 pop {r4, pc} diff --git a/arm9/modules/05/asm/mod05_021E5FD8.s b/arm9/modules/05/asm/mod05_021E5FD8.s index 8ce2cd0f..f341dfd8 100644 --- a/arm9/modules/05/asm/mod05_021E5FD8.s +++ b/arm9/modules/05/asm/mod05_021E5FD8.s @@ -825,7 +825,7 @@ MOD05_021E6638: ; 0x021E6638 str r0, [r4, #0x14] cmp r0, #0 bne _021E6666 - bl ErrorHandling + bl GF_AssertFail _021E6666: ldr r1, _021E6674 ; =MOD05_021E6678 add r0, r5, #0 @@ -1685,13 +1685,13 @@ MOD05_021E6CC4: ; 0x021E6CC4 ldr r0, [r5, #0x30] cmp r1, r0 bgt _021E6D2A - bl ErrorHandling + bl GF_AssertFail _021E6D2A: ldr r1, [sp, #0x10] ldr r0, [r5, #0x2c] cmp r1, r0 blt _021E6D36 - bl ErrorHandling + bl GF_AssertFail _021E6D36: mov r0, #0 str r0, [sp] @@ -1807,13 +1807,13 @@ _021E6E06: ldr r0, [r4, #0x30] cmp r1, r0 beq _021E6E12 - bl ErrorHandling + bl GF_AssertFail _021E6E12: ldr r1, [sp, #4] ldr r0, [r4, #0x2c] cmp r1, r0 beq _021E6E1E - bl ErrorHandling + bl GF_AssertFail _021E6E1E: ldr r0, [r4, #0x3c] ldr r1, [r4, #0xc] @@ -1918,13 +1918,13 @@ MOD05_021E6E90: ; 0x021E6E90 ldr r0, [r5, #0x30] cmp r1, r0 blt _021E6EFA - bl ErrorHandling + bl GF_AssertFail _021E6EFA: ldr r1, [sp, #0x10] ldr r0, [r5, #0x2c] cmp r1, r0 bgt _021E6F06 - bl ErrorHandling + bl GF_AssertFail _021E6F06: mov r0, #0 str r0, [sp] @@ -2053,13 +2053,13 @@ _021E6FEC: ldr r0, [r4, #0x30] cmp r1, r0 beq _021E6FF8 - bl ErrorHandling + bl GF_AssertFail _021E6FF8: ldr r1, [sp, #4] ldr r0, [r4, #0x2c] cmp r1, r0 beq _021E7004 - bl ErrorHandling + bl GF_AssertFail _021E7004: ldr r0, [r4, #0x3c] ldr r1, [r4, #0xc] @@ -2274,7 +2274,7 @@ _021E7198: bl FUN_0200CA44 add r4, r0, #0 bne _021E71DA - bl ErrorHandling + bl GF_AssertFail _021E71DA: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -2397,7 +2397,7 @@ MOD05_021E72B8: ; 0x021E72B8 bl AllocFromHeapAtEnd add r4, r0, #0 bne _021E72CC - bl ErrorHandling + bl GF_AssertFail _021E72CC: add r0, r4, #0 mov r1, #0 @@ -2409,12 +2409,12 @@ _021E72CC: thumb_func_start MOD05_021E72DC MOD05_021E72DC: ; 0x021E72DC - ldr r3, _021E72E4 ; =FUN_02016A8C + ldr r3, _021E72E4 ; =FreeToHeapExplicit add r1, r0, #0 mov r0, #4 bx r3 .balign 4, 0 -_021E72E4: .word FUN_02016A8C +_021E72E4: .word FreeToHeapExplicit thumb_func_start MOD05_021E72E8 MOD05_021E72E8: ; 0x021E72E8 diff --git a/arm9/modules/05/asm/mod05_021E779C.s b/arm9/modules/05/asm/mod05_021E779C.s index ad4118ff..7c09387c 100644 --- a/arm9/modules/05/asm/mod05_021E779C.s +++ b/arm9/modules/05/asm/mod05_021E779C.s @@ -38,7 +38,7 @@ MOD05_021E77C8: ; 0x021E77C8 sub r1, r1, #1 str r1, [r0] bpl _021E77D6 - bl ErrorHandling + bl GF_AssertFail _021E77D6: pop {r3, pc} @@ -56,7 +56,7 @@ MOD05_021E77E0: ; 0x021E77E0 sub r1, r1, #1 str r1, [r0, #4] bpl _021E77EE - bl ErrorHandling + bl GF_AssertFail _021E77EE: pop {r3, pc} @@ -544,7 +544,7 @@ MOD05_021E7B78: ; 0x021E7B78 bl FUN_020582A8 cmp r0, #0 bne _021E7B94 - bl ErrorHandling + bl GF_AssertFail _021E7B94: add r0, r6, #0 add r1, sp, #0 diff --git a/arm9/modules/05/asm/mod05_021E7C00.s b/arm9/modules/05/asm/mod05_021E7C00.s index 2e968e4f..aaa4fb70 100644 --- a/arm9/modules/05/asm/mod05_021E7C00.s +++ b/arm9/modules/05/asm/mod05_021E7C00.s @@ -83,7 +83,7 @@ MOD05_021E7C80: ; 0x021E7C80 add r4, r1, #0 cmp r5, #0x20 blt _021E7C90 - bl ErrorHandling + bl GF_AssertFail _021E7C90: add r6, sp, #0 mov r3, #0 @@ -427,7 +427,7 @@ MOD05_021E7EEC: ; 0x021E7EEC add r5, r0, #0 cmp r4, #0x20 blt _021E7EFA - bl ErrorHandling + bl GF_AssertFail _021E7EFA: mov r0, #0x8c mul r0, r4 @@ -435,7 +435,7 @@ _021E7EFA: ldr r0, [r4, #4] cmp r0, #0 bne _021E7F0A - bl ErrorHandling + bl GF_AssertFail _021E7F0A: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -448,14 +448,14 @@ MOD05_021E7F10: ; 0x021E7F10 add r4, r3, #0 bl MOD05_021F4BD0 ldr r0, [r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r1, r0, r1 ldr r1, [r1, #0xc] add r1, r0, r1 add r0, r5, #0 str r1, [r4] - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit pop {r3, r4, r5, pc} .balign 4, 0 @@ -466,18 +466,18 @@ MOD05_021E7F34: ; 0x021E7F34 add r0, r1, #0 add r4, r2, #0 add r5, r3, #0 - bl FUN_020B8474 - ldr r1, _021E7FB4 ; =UNK_021CEDD4 + bl NNS_G3dGlbSetBaseTrans + ldr r1, _021E7FB4 ; =NNS_G3dGlb + 0xBC add r0, r4, #0 bl MI_Copy36B - ldr r1, _021E7FB8 ; =UNK_021CED98 + ldr r1, _021E7FB8 ; =NNS_G3dGlb + 0x80 mov r0, #0xa4 ldr r2, [r1, #0x7c] bic r2, r0 add r0, r5, #0 str r2, [r1, #0x7c] - bl FUN_020B844C - bl FUN_020B849C + bl NNS_G3dGlbSetBaseScale + bl NNS_G3dGlbFlushP add r2, sp, #0 ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] @@ -511,7 +511,7 @@ _021E7F98: ldrh r2, [r2, #2] add r0, r7, #0 add r1, r5, #0 - bl FUN_020BAFB8 + bl NNS_G3dDraw1Mat1Shp add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -522,8 +522,8 @@ _021E7F98: _021E7FB0: pop {r3, r4, r5, r6, r7, pc} nop -_021E7FB4: .word UNK_021CEDD4 -_021E7FB8: .word UNK_021CED98 +_021E7FB4: .word NNS_G3dGlb + 0xBC +_021E7FB8: .word NNS_G3dGlb + 0x80 thumb_func_start MOD05_021E7FBC MOD05_021E7FBC: ; 0x021E7FBC @@ -602,7 +602,7 @@ _021E8044: lsr r4, r1, #0x18 cmp r4, #0x20 blo _021E7FD4 - bl ErrorHandling + bl GF_AssertFail mov r0, #0x20 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s index 7a66cdcb..5bf27853 100644 --- a/arm9/modules/05/asm/mod05_021E8310.s +++ b/arm9/modules/05/asm/mod05_021E8310.s @@ -139,11 +139,11 @@ MOD05_021E8410: ; 0x021E8410 add r5, r0, #0 mov r0, #0 mov r1, #1 - bl FUN_02002E4C + bl GetFontAttribute add r4, r0, #0 mov r0, #0 mov r1, #3 - bl FUN_02002E4C + bl GetFontAttribute add r0, r4, r0 str r0, [sp, #0x14] mov r4, #0 @@ -204,7 +204,7 @@ _021E846E: add r6, r0, #0 mov r0, #0 mov r1, #2 - bl FUN_02002E4C + bl GetFontAttribute add r2, r0, #0 mov r0, #0 add r1, r6, #0 @@ -276,10 +276,10 @@ MOD05_021E84F4: ; 0x021E84F4 bl FUN_0200CB00 mov r0, #0 mov r1, #6 - bl FUN_02002E4C + bl GetFontAttribute add r1, r0, #0 ldr r0, [r4, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl MOD05_021E8410 ldr r0, [r4, #0x10] diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index fe346300..006e8bb1 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -339,7 +339,7 @@ MOD05_021E88C0: ; 0x021E88C0 bl GX_EngineAToggleLayers ldr r1, [r4] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit pop {r4, pc} thumb_func_start MOD05_021E88E8 @@ -513,7 +513,7 @@ _021E8A42: bl MOD05_021E37A4 ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C _021E8A56: @@ -695,7 +695,7 @@ _021E8BC2: bl MOD05_021E37A4 ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C _021E8BD6: @@ -851,7 +851,7 @@ _021E8CE6: _021E8D00: ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C mov r0, #1 @@ -1008,7 +1008,7 @@ _021E8E1C: _021E8E36: ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C mov r0, #1 @@ -1256,7 +1256,7 @@ _021E8FFC: _021E9010: ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C mov r0, #1 @@ -1391,7 +1391,7 @@ _021E910C: _021E9120: ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C mov r0, #1 @@ -1794,7 +1794,7 @@ _021E944E: bl MOD05_021E37A4 ldr r1, [r7, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [sp, #0x10] bl FUN_0200621C _021E948A: @@ -2151,7 +2151,7 @@ _021E974A: bl MOD05_021E3A48 ldr r1, [r6, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [sp, #0x10] bl FUN_0200621C _021E9786: @@ -2594,7 +2594,7 @@ _021E9AF0: bl MOD05_021E3E44 ldr r1, [r7, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [sp, #0x14] bl FUN_0200621C add sp, #0x58 @@ -2737,7 +2737,7 @@ _021E9C02: bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows mov r1, #0x83 lsl r1, r1, #2 str r0, [r4, r1] @@ -2766,7 +2766,7 @@ _021E9C02: lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3183,7 +3183,7 @@ _021E9FA4: ldr r1, [sp, #0x1c] mov r0, #4 ldr r1, [r1, #0xc] - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [sp, #0x18] bl FUN_0200621C add sp, #0x44 @@ -3594,7 +3594,7 @@ _021EA354: bl MOD05_021E3E44 ldr r1, [r5, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C _021EA382: @@ -3709,7 +3709,7 @@ _021EA430: bl GX_EngineAToggleLayers mov r0, #4 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows mov r1, #2 lsl r1, r1, #8 str r0, [r4, r1] @@ -3738,7 +3738,7 @@ _021EA430: lsl r0, r0, #8 ldr r0, [r4, r0] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -4116,7 +4116,7 @@ _021EA76C: ldr r1, [sp, #0x18] mov r0, #4 ldr r1, [r1, #0xc] - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [sp, #0x14] bl FUN_0200621C _021EA7DE: @@ -4472,7 +4472,7 @@ _021EAA98: bl MOD05_021E3E44 ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C _021EAAC6: @@ -4781,7 +4781,7 @@ _021EAD1A: bl MOD05_021E3E44 ldr r1, [r6, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [sp, #0x10] bl FUN_0200621C _021EAD4C: @@ -5156,7 +5156,7 @@ _021EB01A: ldr r1, [sp, #0x14] mov r0, #4 ldr r1, [r1, #0xc] - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [sp, #0x10] bl FUN_0200621C _021EB04A: @@ -5380,7 +5380,7 @@ _021EB18E: str r0, [r4, #4] mov r0, #4 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r4] mov r3, #0 str r3, [sp] @@ -5404,7 +5404,7 @@ _021EB18E: bl FUN_02017FB4 ldr r0, [r4] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] bl FUN_02019220 ldr r0, [r5] @@ -5586,7 +5586,7 @@ _021EB394: strb r1, [r0] ldr r1, [r5, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C _021EB3F2: @@ -5797,7 +5797,7 @@ _021EB56C: _021EB58A: ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C mov r0, #1 @@ -6008,7 +6008,7 @@ _021EB720: _021EB73E: ldr r1, [r4, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r0, r6, #0 bl FUN_0200621C mov r0, #1 @@ -6506,7 +6506,7 @@ _021EBB60: str r0, [r2] ldr r1, [r5, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add sp, #0x30 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -7514,7 +7514,7 @@ _021EC37A: bl MOD05_021E3E44 ldr r1, [r5, #0xc] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add sp, #0x4c mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -7747,8 +7747,8 @@ _021EC544: cmp r0, #0 bne _021EC572 add r0, r7, #0 - bl FUN_02029EF8 - bl FUN_02029F08 + bl Sav2_Chatot_get + bl Chatot_invalidate _021EC572: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -11065,7 +11065,7 @@ _021EDFA6: str r0, [r4] pop {r3, r4, r5, r6, r7, pc} _021EDFB6: - bl ErrorHandling + bl GF_AssertFail _021EDFBA: pop {r3, r4, r5, r6, r7, pc} @@ -11212,7 +11212,7 @@ MOD05_021EE0C0: ; 0x021EE0C0 bl NARC_ReadFromMember b _021EE0FC _021EE0E6: - bl ErrorHandling + bl GF_AssertFail mov r0, #0x10 str r0, [sp] mov r0, #0x43 @@ -11664,7 +11664,7 @@ MOD05_021EE470: ; 0x021EE470 ldr r0, [r0, r5] cmp r0, #0 beq _021EE498 - bl ErrorHandling + bl GF_AssertFail _021EE498: ldr r0, [sp, #4] mov r1, #1 @@ -11768,7 +11768,7 @@ MOD05_021EE52C: ; 0x021EE52C ldr r0, [r0] cmp r1, r0 ble _021EE560 - bl ErrorHandling + bl GF_AssertFail _021EE560: ldr r0, [r4, #0x10] ldr r1, [r0] @@ -11819,7 +11819,7 @@ _021EE5B2: ror r1, r0 add r0, r2, r1 beq _021EE5C6 - bl ErrorHandling + bl GF_AssertFail _021EE5C6: mov r0, #0 str r0, [r4, #0x18] @@ -11836,7 +11836,7 @@ _021EE5D0: ldr r0, [r2, #8] cmp r1, r0 beq _021EE5E8 - bl ErrorHandling + bl GF_AssertFail b _021EE6B0 _021EE5E8: cmp r3, r7 @@ -11887,7 +11887,7 @@ _021EE632: ror r1, r0 add r0, r2, r1 beq _021EE6A8 - bl ErrorHandling + bl GF_AssertFail b _021EE6A8 _021EE648: add r1, r5, #0 @@ -11939,7 +11939,7 @@ _021EE694: ror r1, r0 add r0, r2, r1 beq _021EE6A8 - bl ErrorHandling + bl GF_AssertFail _021EE6A8: ldrb r0, [r4, #0x1c] add r1, r5, #0 @@ -12073,7 +12073,7 @@ _021EE78C: bne _021EE7C4 sub r0, #0x10 ldr r0, [r2, r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet add r7, r0, #0 ldrh r0, [r7, #0xe] add r0, r7, r0 @@ -12233,7 +12233,7 @@ MOD05_021EE8CC: ; 0x021EE8CC ldr r6, [sp, #0x30] cmp r0, #1 bne _021EE8E6 - bl ErrorHandling + bl GF_AssertFail _021EE8E6: add r0, r6, #0 add r1, r4, #0 @@ -12310,7 +12310,7 @@ _021EE964: bl MOD05_021EE470 cmp r0, #1 beq _021EE984 - bl ErrorHandling + bl GF_AssertFail _021EE984: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -12470,7 +12470,7 @@ _021EEA9E: mvn r4, r4 b _021EEAB4 _021EEAB0: - bl ErrorHandling + bl GF_AssertFail _021EEAB4: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -12578,7 +12578,7 @@ _021EEB7C: mvn r4, r4 b _021EEB86 _021EEB82: - bl ErrorHandling + bl GF_AssertFail _021EEB86: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -12782,7 +12782,7 @@ _021EED0A: mvn r4, r4 b _021EED14 _021EED10: - bl ErrorHandling + bl GF_AssertFail _021EED14: ldr r2, [sp, #0x10] ldr r3, [sp, #0xc] @@ -12799,7 +12799,7 @@ _021EED14: add sp, #0x14 pop {r4, r5, r6, r7, pc} _021EED32: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -12954,7 +12954,7 @@ _021EEE4E: mov r0, #0 pop {r3, pc} _021EEE56: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .balign 4, 0 @@ -13015,7 +13015,7 @@ _021EEEB8: add r0, r4, #0 pop {r3, r4, r5, pc} _021EEEC0: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 _021EEEC6: pop {r3, r4, r5, pc} @@ -13084,7 +13084,7 @@ _021EEF22: lsr r6, r0, #0x18 b _021EEF62 _021EEF30: - bl ErrorHandling + bl GF_AssertFail b _021EEF62 _021EEF36: cmp r5, r0 @@ -13106,10 +13106,10 @@ _021EEF4A: lsr r6, r0, #0x18 b _021EEF62 _021EEF58: - bl ErrorHandling + bl GF_AssertFail b _021EEF62 _021EEF5E: - bl ErrorHandling + bl GF_AssertFail _021EEF62: strb r6, [r4] pop {r4, r5, r6, pc} @@ -13145,7 +13145,7 @@ _021EEF90: mov r0, #1 pop {r3, pc} _021EEF94: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -13193,7 +13193,7 @@ MOD05_021EEFD0: ; 0x021EEFD0 add r4, #0x64 cmp r0, #0 beq _021EEFEC - bl ErrorHandling + bl GF_AssertFail _021EEFEC: add r1, r5, #0 add r1, #0xa1 @@ -13290,13 +13290,13 @@ MOD05_021EF094: ; 0x021EF094 add r4, #0x64 cmp r0, #2 blo _021EF0A8 - bl ErrorHandling + bl GF_AssertFail _021EF0A8: add r0, r5, #0 bl MOD05_021EEFD0 cmp r0, #1 beq _021EF0B6 - bl ErrorHandling + bl GF_AssertFail _021EF0B6: mov r0, #0x86 ldr r2, [r4, #0x10] @@ -13694,7 +13694,7 @@ _021EF39A: mov r7, #0 b _021EF3AE _021EF3AA: - bl ErrorHandling + bl GF_AssertFail _021EF3AE: add r0, r7, #0 bl MOD05_021F3BC0 @@ -13883,8 +13883,8 @@ MOD05_021EF514: ; 0x021EF514 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 bl FUN_020162FC - bl FUN_020AF6A4 - bl FUN_020AFA30 + bl NNS_GfdResetLnkTexVramState + bl NNS_GfdResetLnkPlttVramState mov r4, #0 add r6, r5, #4 mov r7, #0x30 @@ -14073,7 +14073,7 @@ _021EF66A: mvn r0, r0 cmp r5, r0 bne _021EF676 - bl ErrorHandling + bl GF_AssertFail _021EF676: add r0, r4, #0 add r0, #0xac @@ -14309,7 +14309,7 @@ MOD05_021EF824: ; 0x021EF824 add r4, r0, #0 cmp r5, #4 blo _021EF832 - bl ErrorHandling + bl GF_AssertFail _021EF832: lsl r0, r5, #2 add r0, r4, r0 @@ -14363,7 +14363,7 @@ _021EF882: mul r0, r1 cmp r7, r0 blo _021EF898 - bl ErrorHandling + bl GF_AssertFail _021EF898: add r0, r5, #0 add r0, #0xc8 @@ -14531,23 +14531,23 @@ _021EF9B0: _021EF9B6: ldr r0, [r4, #0xc] ldr r0, [r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet add r5, r0, #0 ldrb r0, [r5, #9] cmp r0, #1 beq _021EF9CA - bl ErrorHandling + bl GF_AssertFail _021EF9CA: ldrh r0, [r5, #0xe] add r0, r5, r0 ldr r0, [r0, #0xc] add r5, r5, r0 bne _021EF9D8 - bl ErrorHandling + bl GF_AssertFail _021EF9D8: ldr r0, [r4, #8] add r1, r5, #0 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit ldr r0, [r4, #0x18] mov r1, #1 str r1, [r0] @@ -14618,27 +14618,27 @@ MOD05_021EFA40: ; 0x021EFA40 bl FUN_0201B3A8 cmp r0, #0 bne _021EFA6A - bl ErrorHandling + bl GF_AssertFail _021EFA6A: ldr r0, [r4] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrb r0, [r0, #9] cmp r0, #1 beq _021EFA7A - bl ErrorHandling + bl GF_AssertFail _021EFA7A: ldr r0, [r4] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r1, r0, r1 ldr r1, [r1, #0xc] add r4, r0, r1 bne _021EFA8E - bl ErrorHandling + bl GF_AssertFail _021EFA8E: add r0, r5, #0 add r1, r4, #0 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit add r0, r4, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -15197,7 +15197,7 @@ MOD05_021EFEDC: ; 0x021EFEDC add r7, r0, #0 add r0, r7, #1 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5] mov r0, #1 str r0, [sp] @@ -15238,7 +15238,7 @@ _021EFF2E: ldr r0, [r5] ldr r1, [r5, #8] add r2, r4, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem _021EFF54: add r4, r4, #1 cmp r4, #0x20 @@ -15248,7 +15248,7 @@ _021EFF54: ldr r0, [r5] ldr r1, [r5, #0x3c] sub r3, #0xd - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r4, _021EFFC0 ; =UNK05_021F8B4C add r3, sp, #0x14 add r2, r3, #0 @@ -15277,7 +15277,7 @@ _021EFF54: add r0, r2, #0 add r2, r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #4] add r0, r5, #0 add r0, #0x20 @@ -15298,7 +15298,7 @@ MOD05_021EFFC8: ; 0x021EFFC8 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 ldr r0, [r5, #4] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #1 mvn r0, r0 @@ -15366,9 +15366,9 @@ _021F0056: mov r1, #0 ldr r0, [r5, #4] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r5] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #0 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -15780,7 +15780,7 @@ _021F03A8: asr r0, r1, #4 lsl r3, r0, #1 lsl r1, r3, #1 - ldr r2, _021F0438 ; =UNK_020FFA38 + ldr r2, _021F0438 ; =FX_SinCosTable_ add r3, r3, #1 lsl r3, r3, #1 ldrsh r1, [r2, r1] @@ -15794,7 +15794,7 @@ _021F03A8: asr r0, r5, #4 lsl r2, r0, #1 lsl r1, r2, #1 - ldr r3, _021F0438 ; =UNK_020FFA38 + ldr r3, _021F0438 ; =FX_SinCosTable_ add r2, r2, #1 lsl r2, r2, #1 ldrsh r1, [r3, r1] @@ -15839,7 +15839,7 @@ _021F03A8: pop {r4, r5, r6, r7, pc} nop _021F0434: .word UNK05_021F8B6C -_021F0438: .word UNK_020FFA38 +_021F0438: .word FX_SinCosTable_ thumb_func_start MOD05_021F043C MOD05_021F043C: ; 0x021F043C @@ -15866,7 +15866,7 @@ MOD05_021F0454: ; 0x021F0454 bl FUN_0201F008 strh r0, [r5] ldrh r0, [r5] - ldr r2, _021F04F0 ; =UNK_020FFA38 + ldr r2, _021F04F0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r1, r0, #1 lsl r0, r1, #1 @@ -15909,7 +15909,7 @@ MOD05_021F0454: ; 0x021F0454 str r0, [r5, #0x1c] add r0, sp, #0 ldrh r0, [r0] - ldr r3, _021F04F0 ; =UNK_020FFA38 + ldr r3, _021F04F0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -15924,7 +15924,7 @@ MOD05_021F0454: ; 0x021F0454 add sp, #0x2c pop {r4, r5, pc} nop -_021F04F0: .word UNK_020FFA38 +_021F04F0: .word FX_SinCosTable_ _021F04F4: .word UNK05_021F8B78 thumb_func_start MOD05_021F04F8 @@ -15935,7 +15935,7 @@ MOD05_021F04F8: ; 0x021F04F8 cmp r0, #0 beq _021F0512 bne _021F0508 - bl ErrorHandling + bl GF_AssertFail _021F0508: ldr r0, [r4] bl FreeToHeap @@ -16156,7 +16156,7 @@ MOD05_021F067C: ; 0x021F067C add r5, r0, #0 cmp r5, #9 blt _021F06B6 - bl ErrorHandling + bl GF_AssertFail _021F06B6: lsl r6, r5, #2 ldr r5, _021F06EC ; UNK05_021FC4B4 @@ -16608,7 +16608,7 @@ MOD05_021F0A28: ; 0x021F0A28 add r5, r0, #0 cmp r5, #0xa blt _021F0A3E - bl ErrorHandling + bl GF_AssertFail _021F0A3E: lsl r6, r5, #2 ldr r5, _021F0A74 ; =UNK05_021FC528 @@ -17068,7 +17068,7 @@ MOD05_021F0DB4: ; 0x021F0DB4 add r5, r0, #0 cmp r5, #0xa blt _021F0DEE - bl ErrorHandling + bl GF_AssertFail _021F0DEE: lsl r6, r5, #2 ldr r5, _021F0E24 ; =UNK05_021FC500 @@ -17634,7 +17634,7 @@ MOD05_021F1234: ; 0x021F1234 str r0, [sp, #4] cmp r0, #0xc blt _021F1272 - bl ErrorHandling + bl GF_AssertFail _021F1272: mov r1, #2 ldrsb r2, [r4, r1] @@ -17886,7 +17886,7 @@ MOD05_021F1440: ; 0x021F1440 add r5, r0, #0 cmp r5, #4 blt _021F147A - bl ErrorHandling + bl GF_AssertFail _021F147A: lsl r6, r5, #2 ldr r5, _021F14B8 ; =UNK05_021FC40C @@ -18654,7 +18654,7 @@ MOD05_021F1A78: ; 0x021F1A78 ldr r0, [r4] cmp r0, #0 beq _021F1A8C - bl ErrorHandling + bl GF_AssertFail _021F1A8C: add r0, r5, #0 bl MOD06_0224A130 @@ -18671,7 +18671,7 @@ MOD05_021F1A98: ; 0x021F1A98 ldr r0, [r4] cmp r0, #0 beq _021F1AAC - bl ErrorHandling + bl GF_AssertFail _021F1AAC: add r0, r5, #0 bl MOD06_0224A6B8 @@ -18688,7 +18688,7 @@ MOD05_021F1AB8: ; 0x021F1AB8 ldr r0, [r4] cmp r0, #0 beq _021F1ACC - bl ErrorHandling + bl GF_AssertFail _021F1ACC: add r0, r5, #0 bl MOD06_0224A8D4 @@ -18705,7 +18705,7 @@ MOD05_021F1AD8: ; 0x021F1AD8 ldr r0, [r4] cmp r0, #0 beq _021F1AEC - bl ErrorHandling + bl GF_AssertFail _021F1AEC: add r0, r5, #0 bl MOD06_0224AA40 @@ -18968,7 +18968,7 @@ MOD05_021F1CB8: ; 0x021F1CB8 bl FUN_02058390 cmp r0, #0 beq _021F1CD2 - bl ErrorHandling + bl GF_AssertFail _021F1CD2: add r0, r5, #0 bl MOD05_021F1D68 @@ -19014,7 +19014,7 @@ MOD05_021F1D2C: ; 0x021F1D2C bl FUN_020587E0 cmp r0, #1 beq _021F1D3C - bl ErrorHandling + bl GF_AssertFail _021F1D3C: add r0, r4, #0 bl FUN_020583A0 @@ -19104,7 +19104,7 @@ _021F1DE4: ldr r2, [r3] cmp r2, r1 bne _021F1DDA - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .balign 4, 0 @@ -19382,7 +19382,7 @@ MOD05_021F1FE0: ; 0x021F1FE0 bl MOD05_021F21CC add r4, r0, #0 bne _021F200C - bl ErrorHandling + bl GF_AssertFail _021F200C: add r0, r6, #0 add r1, sp, #0 @@ -19393,7 +19393,7 @@ _021F200C: bl MOD05_021F2E70 add r4, r0, #0 bne _021F2026 - bl ErrorHandling + bl GF_AssertFail _021F2026: add r0, r4, #0 add sp, #0xc @@ -19567,7 +19567,7 @@ MOD05_021F2160: ; 0x021F2160 str r4, [r0] cmp r4, #0 bne _021F2180 - bl ErrorHandling + bl GF_AssertFail _021F2180: mov r0, #4 lsl r1, r6, #3 @@ -19577,7 +19577,7 @@ _021F2180: str r5, [r7] cmp r5, #0 bne _021F2196 - bl ErrorHandling + bl GF_AssertFail _021F2196: ldr r0, _021F21A8 ; =0x0000FFFF _021F2198: @@ -19600,11 +19600,11 @@ MOD05_021F21AC: ; 0x021F21AC add r1, #0xe4 ldr r1, [r1] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit add r4, #0xf4 ldr r1, [r4] mov r0, #4 - bl FUN_02016A8C + bl FreeToHeapExplicit pop {r4, pc} thumb_func_start MOD05_021F21CC @@ -19875,7 +19875,7 @@ _021F23BE: bl _021F238C add r7, r0, #0 bne _021F23D0 - bl ErrorHandling + bl GF_AssertFail _021F23D0: mov r0, #0x41 lsl r0, r0, #2 @@ -20217,7 +20217,7 @@ MOD05_021F2628: ; 0x021F2628 bl MOD05_021F25C8 cmp r0, #0 bne _021F264C - bl ErrorHandling + bl GF_AssertFail _021F264C: pop {r4, r5, r6, pc} nop @@ -20256,7 +20256,7 @@ MOD05_021F2670: ; 0x021F2670 bl MOD05_021F25C8 cmp r0, #0 bne _021F269E - bl ErrorHandling + bl GF_AssertFail _021F269E: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -20370,7 +20370,7 @@ MOD05_021F2764: ; 0x021F2764 bl MOD05_021F25C8 cmp r0, #0 bne _021F2788 - bl ErrorHandling + bl GF_AssertFail _021F2788: pop {r4, r5, r6, pc} nop @@ -20409,7 +20409,7 @@ MOD05_021F27AC: ; 0x021F27AC bl MOD05_021F25C8 cmp r0, #0 bne _021F27DA - bl ErrorHandling + bl GF_AssertFail _021F27DA: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -20523,7 +20523,7 @@ MOD05_021F28A0: ; 0x021F28A0 bl MOD05_021F25C8 cmp r0, #0 bne _021F28C4 - bl ErrorHandling + bl GF_AssertFail _021F28C4: pop {r4, r5, r6, pc} nop @@ -20586,7 +20586,7 @@ MOD05_021F2914: ; 0x021F2914 bl MOD05_021F25C8 cmp r0, #0 bne _021F2942 - bl ErrorHandling + bl GF_AssertFail _021F2942: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -21247,7 +21247,7 @@ _021F2DD0: ldr r2, [r3] cmp r2, r1 bne _021F2DC6 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .balign 4, 0 @@ -21368,7 +21368,7 @@ MOD05_021F2E70: ; 0x021F2E70 add r0, r4, #0 bl FUN_0201F8E0 mov r1, #1 - bl FUN_020BB9F4 + bl NNS_G3dMdlSetMdlFogEnableFlagAll add r0, r4, #0 bl FUN_0201F8E0 bl MOD05_021DB5EC @@ -21557,7 +21557,7 @@ _021F301C: cmp r2, r3 blt _021F3004 _021F3024: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _021F302C: @@ -21769,7 +21769,7 @@ MOD05_021F317C: ; 0x021F317C bl FUN_02020F54 cmp r0, #0 bne _021F31A2 - bl ErrorHandling + bl GF_AssertFail _021F31A2: add r0, r5, #0 add r1, r4, #0 @@ -21820,7 +21820,7 @@ _021F31F4: cmp r2, r6 blt _021F31DE _021F31FC: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} .balign 4, 0 @@ -21963,7 +21963,7 @@ _021F32EA: cmp r4, r6 blt _021F32CE _021F32F2: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD05_021F32F8 @@ -22050,7 +22050,7 @@ MOD05_021F3364: ; 0x021F3364 ldr r0, [r0] cmp r0, #0 bne _021F338A - bl ErrorHandling + bl GF_AssertFail _021F338A: ldr r0, [r4, #4] mov r1, #0 @@ -22095,7 +22095,7 @@ MOD05_021F33B4: ; 0x021F33B4 bl AllocFromHeap add r4, r0, #0 bne _021F33E2 - bl ErrorHandling + bl GF_AssertFail _021F33E2: ldr r2, [sp, #8] add r0, r4, #0 @@ -22249,7 +22249,7 @@ _021F352E: ldr r0, _021F36C8 ; =0x0000FFFF cmp r1, r0 bne _021F3538 - bl ErrorHandling + bl GF_AssertFail _021F3538: ldr r0, [sp, #0x18] ldr r1, [r4, #4] @@ -22272,7 +22272,7 @@ _021F355C: ldr r0, _021F36C8 ; =0x0000FFFF cmp r1, r0 bne _021F3566 - bl ErrorHandling + bl GF_AssertFail _021F3566: ldr r0, [sp, #0x18] ldr r1, [r4, #4] @@ -22296,14 +22296,14 @@ _021F358C: ldr r0, _021F36C8 ; =0x0000FFFF cmp r1, r0 bne _021F3596 - bl ErrorHandling + bl GF_AssertFail _021F3596: ldr r0, [sp, #0x18] ldr r1, [r4, #4] mov r2, #0 bl MOD05_021F2DB0 str r0, [r5, #0x10] - bl FUN_020BC0FC + bl NNS_G3dGetTex add r4, r0, #0 add r0, r6, #0 bl MOD05_021F2E00 @@ -22333,7 +22333,7 @@ _021F3596: str r0, [r5, #0x24] cmp r0, #0 bne _021F35EC - bl ErrorHandling + bl GF_AssertFail _021F35EC: ldr r0, [sp, #0x10] bl FUN_0201F844 @@ -22415,7 +22415,7 @@ _021F367A: bl FUN_0200CA98 add r4, r0, #0 bne _021F36B6 - bl ErrorHandling + bl GF_AssertFail _021F36B6: add r0, r4, #0 add r1, r5, #0 @@ -22536,7 +22536,7 @@ MOD05_021F37AC: ; 0x021F37AC bl AllocFromHeap add r4, r0, #0 bne _021F37BC - bl ErrorHandling + bl GF_AssertFail _021F37BC: add r2, r4, #0 mov r1, #0x10 @@ -22552,12 +22552,12 @@ _021F37C2: thumb_func_start MOD05_021F37D0 MOD05_021F37D0: ; 0x021F37D0 - ldr r3, _021F37D8 ; =FUN_02016A8C + ldr r3, _021F37D8 ; =FreeToHeapExplicit add r1, r0, #0 ldr r0, [r1] bx r3 .balign 4, 0 -_021F37D8: .word FUN_02016A8C +_021F37D8: .word FreeToHeapExplicit thumb_func_start MOD05_021F37DC MOD05_021F37DC: ; 0x021F37DC @@ -22588,7 +22588,7 @@ _021F37FC: bne _021F37F0 ldr r0, [r5] ldr r1, [r5, #0xc] - bl FUN_02016A8C + bl FreeToHeapExplicit _021F380E: pop {r3, r4, r5, pc} @@ -22606,7 +22606,7 @@ MOD05_021F3810: ; 0x021F3810 str r0, [r4, #0xc] cmp r0, #0 bne _021F382E - bl ErrorHandling + bl GF_AssertFail _021F382E: ldr r0, [r4, #0xc] mov r1, #0 @@ -23816,7 +23816,7 @@ _021F4174: lsl r0, r0, #0xc cmp r3, r0 ble _021F4180 - bl ErrorHandling + bl GF_AssertFail _021F4180: pop {r4, r5, r6, pc} .balign 4, 0 @@ -24324,7 +24324,7 @@ MOD05_021F4520: ; 0x021F4520 str r3, [sp] cmp r3, #0 bne _021F4532 - bl ErrorHandling + bl GF_AssertFail _021F4532: ldr r0, [r5] mov r4, #0 @@ -24364,7 +24364,7 @@ MOD05_021F4568: ; 0x021F4568 ldr r0, [r4] cmp r5, r0 blt _021F4578 - bl ErrorHandling + bl GF_AssertFail _021F4578: mov r0, #0x18 add r6, r5, #0 @@ -24374,7 +24374,7 @@ _021F4578: ldr r0, [r0, #0x14] cmp r0, #0 bne _021F458C - bl ErrorHandling + bl GF_AssertFail _021F458C: ldr r0, [r4, #4] add r0, r0, r6 @@ -24390,7 +24390,7 @@ MOD05_021F4594: ; 0x021F4594 add r4, r1, #0 cmp r5, r0 blt _021F45A6 - bl ErrorHandling + bl GF_AssertFail _021F45A6: mov r0, #0x18 ldr r1, [r6, #4] @@ -24438,7 +24438,7 @@ MOD05_021F45E8: ; 0x021F45E8 bl FUN_02015F34 cmp r0, #1 beq _021F45FC - bl ErrorHandling + bl GF_AssertFail _021F45FC: mov r0, #1 str r0, [r4] @@ -24455,7 +24455,7 @@ MOD05_021F4608: ; 0x021F4608 bl FUN_02015F34 cmp r0, #1 beq _021F461C - bl ErrorHandling + bl GF_AssertFail _021F461C: mov r0, #0 str r0, [r4] @@ -24470,7 +24470,7 @@ MOD05_021F4624: ; 0x021F4624 bl MOD05_021F46A8 add r4, r0, #0 bne _021F4636 - bl ErrorHandling + bl GF_AssertFail _021F4636: cmp r4, #0 beq _021F4642 @@ -24623,7 +24623,7 @@ MOD05_021F4724: ; 0x021F4724 ldr r0, [r4] cmp r0, #0 beq _021F4732 - bl ErrorHandling + bl GF_AssertFail _021F4732: mov r0, #0x31 lsl r0, r0, #4 @@ -24984,7 +24984,7 @@ MOD05_021F49AC: ; 0x021F49AC strh r1, [r7, #8] cmp r1, r0 blo _021F49E4 - bl ErrorHandling + bl GF_AssertFail _021F49E4: ldr r1, _021F4BA8 ; =0x000008A4 mov r0, #0 @@ -25006,7 +25006,7 @@ _021F49E4: str r0, [r5, r1] sub r0, r1, #4 ldr r0, [r5, r0] - bl FUN_020BC0FC + bl NNS_G3dGetTex ldr r1, _021F4BA8 ; =0x000008A4 str r0, [r5, r1] ldrh r0, [r7, #8] @@ -25014,7 +25014,7 @@ _021F49E4: beq _021F4A2C sub r0, r1, #4 ldr r0, [r5, r0] - bl FUN_020BC0FC + bl NNS_G3dGetTex ldr r1, _021F4BB0 ; =0x000008A8 str r0, [r5, r1] b _021F4A32 @@ -25028,7 +25028,7 @@ _021F4A32: bl FUN_0201B3C4 cmp r0, #0 bne _021F4A42 - bl ErrorHandling + bl GF_AssertFail _021F4A42: ldr r1, _021F4BAC ; =0x0000089C ldr r0, [r5, r1] @@ -25042,7 +25042,7 @@ _021F4A42: bl FUN_0201B3C4 cmp r0, #0 bne _021F4A62 - bl ErrorHandling + bl GF_AssertFail _021F4A62: mov r1, #0x8a lsl r1, r1, #4 @@ -25088,7 +25088,7 @@ _021F4AA6: ldr r0, [r4, #4] cmp r0, #0 beq _021F4ABE - bl ErrorHandling + bl GF_AssertFail _021F4ABE: ldr r0, [sp, #0xc] add r1, r6, #0 @@ -25099,7 +25099,7 @@ _021F4ABE: cmp r6, r0 bge _021F4AEC ldr r0, [r4, #4] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet add r1, r0, #0 ldrh r2, [r1, #0xe] ldr r3, [r7, #4] @@ -25117,7 +25117,7 @@ _021F4AEC: bl FUN_0201B3A8 cmp r0, #0 bne _021F4AFE - bl ErrorHandling + bl GF_AssertFail _021F4AFE: ldr r0, [sp] ldrh r1, [r7, #8] @@ -25137,20 +25137,20 @@ _021F4B10: mov r2, #4 bl NARC_AllocAndReadWholeMember str r0, [r5, #4] - bl FUN_020BC0FC + bl NNS_G3dGetTex add r4, r0, #0 beq _021F4B46 bl FUN_0201B3C4 cmp r0, #0 bne _021F4B36 - bl ErrorHandling + bl GF_AssertFail _021F4B36: ldr r0, [r5, #4] add r1, r4, #0 bl FUN_0201B3A8 cmp r0, #0 bne _021F4B46 - bl ErrorHandling + bl GF_AssertFail _021F4B46: ldr r0, [sp, #0xc] bl NARC_dtor @@ -25211,7 +25211,7 @@ MOD05_021F4BD0: ; 0x021F4BD0 add r5, r0, #0 add r4, r1, #0 bne _021F4BDC - bl ErrorHandling + bl GF_AssertFail _021F4BDC: add r2, r4, #4 lsl r1, r5, #2 @@ -25221,7 +25221,7 @@ _021F4BDC: ldr r0, [r4, #4] cmp r0, #0 bne _021F4BF0 - bl ErrorHandling + bl GF_AssertFail _021F4BF0: add r0, r4, #4 pop {r3, r4, r5, pc} @@ -25292,7 +25292,7 @@ MOD05_021F4C74: ; 0x021F4C74 push {r4, lr} add r4, r0, #0 bne _021F4C7E - bl ErrorHandling + bl GF_AssertFail _021F4C7E: ldr r0, _021F4C84 ; =0x000008A4 ldr r0, [r4, r0] @@ -25305,7 +25305,7 @@ MOD05_021F4C88: ; 0x021F4C88 push {r4, lr} add r4, r0, #0 bne _021F4C92 - bl ErrorHandling + bl GF_AssertFail _021F4C92: ldr r0, _021F4C98 ; =0x000008A8 ldr r0, [r4, r0] @@ -25458,7 +25458,7 @@ MOD05_021F4D80: ; 0x021F4D80 add r5, r0, #0 cmp r5, #0x15 bne _021F4D96 - bl ErrorHandling + bl GF_AssertFail _021F4D96: ldr r0, [r4, #0xc] bl FUN_0202A9B0 @@ -25494,7 +25494,7 @@ MOD05_021F4DC8: ; 0x021F4DC8 add r5, r0, #0 cmp r5, #0x15 bne _021F4DDE - bl ErrorHandling + bl GF_AssertFail _021F4DDE: ldr r0, [r6, #0xc] bl FUN_0202A9B0 @@ -25525,7 +25525,7 @@ _021F4DDE: lsr r6, r0, #0x10 cmp r6, #0x64 blo _021F4E2E - bl ErrorHandling + bl GF_AssertFail _021F4E2E: cmp r6, #0x5a bhs _021F4E42 @@ -25574,7 +25574,7 @@ MOD05_021F4E7C: ; 0x021F4E7C add r4, r0, #0 cmp r4, #0x15 bne _021F4E94 - bl ErrorHandling + bl GF_AssertFail _021F4E94: add r0, r5, #0 add r0, #0xa4 @@ -25627,7 +25627,7 @@ MOD05_021F4EE4: ; 0x021F4EE4 lsr r4, r0, #0x10 cmp r4, #0x64 blo _021F4F02 - bl ErrorHandling + bl GF_AssertFail _021F4F02: cmp r6, #0 beq _021F4F2A @@ -25681,7 +25681,7 @@ MOD05_021F4F44: ; 0x021F4F44 lsr r5, r0, #0x10 cmp r5, #0x64 blo _021F4F60 - bl ErrorHandling + bl GF_AssertFail _021F4F60: cmp r5, #5 bge _021F4F6A @@ -25744,7 +25744,7 @@ MOD05_021F4FAC: ; 0x021F4FAC lsr r5, r0, #0x10 cmp r5, #0x64 blo _021F4FC8 - bl ErrorHandling + bl GF_AssertFail _021F4FC8: cmp r4, #3 bne _021F4FE8 @@ -26044,7 +26044,7 @@ MOD05_021F51D0: ; 0x021F51D0 add r5, r0, #0 cmp r5, #0x15 bne _021F51E6 - bl ErrorHandling + bl GF_AssertFail _021F51E6: ldr r0, [r4, #0xc] bl FUN_0202A9B0 @@ -26090,7 +26090,7 @@ MOD05_021F522C: ; 0x021F522C add r4, r0, #0 cmp r4, #0x15 bne _021F5242 - bl ErrorHandling + bl GF_AssertFail _021F5242: add r0, r5, #0 add r0, #0xa4 @@ -26118,9 +26118,9 @@ MOD05_021F5268: ; 0x021F5268 add r1, r2, #0 str r5, [sp] add r2, r5, #0 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet str r0, [r4, #4] ldrh r1, [r0, #0xe] add r1, r0, r1 @@ -26128,7 +26128,7 @@ MOD05_021F5268: ; 0x021F5268 add r0, r0, r1 str r0, [r4, #8] ldr r0, [r4] - bl FUN_020BC0FC + bl NNS_G3dGetTex str r0, [r4, #0xc] cmp r0, #0 beq _021F52A4 @@ -26166,18 +26166,18 @@ MOD05_021F52C8: ; 0x021F52C8 beq _021F52F8 add r1, sp, #4 add r2, sp, #0 - bl FUN_020B7CF0 - ldr r1, _021F5314 ; =UNK_021064BC + bl NNS_G3dTexReleaseTexKey + ldr r1, _021F5314 ; =NNS_GfdDefaultFuncFreeTexVram ldr r0, [sp, #4] ldr r1, [r1] blx r1 - ldr r1, _021F5314 ; =UNK_021064BC + ldr r1, _021F5314 ; =NNS_GfdDefaultFuncFreeTexVram ldr r0, [sp] ldr r1, [r1] blx r1 ldr r0, [r4, #0xc] - bl FUN_020B7C58 - ldr r1, _021F5318 ; =UNK_021064C4 + bl NNS_G3dPlttReleasePlttKey + ldr r1, _021F5318 ; =NNS_GfdDefaultFuncFreePlttVram ldr r1, [r1] blx r1 _021F52F8: @@ -26196,8 +26196,8 @@ _021F5306: add sp, #8 pop {r4, pc} nop -_021F5314: .word UNK_021064BC -_021F5318: .word UNK_021064C4 +_021F5314: .word NNS_GfdDefaultFuncFreeTexVram +_021F5318: .word NNS_GfdDefaultFuncFreePlttVram thumb_func_start MOD05_021F531C MOD05_021F531C: ; 0x021F531C @@ -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 @@ -26241,7 +26241,7 @@ MOD05_021F5358: ; 0x021F5358 beq _021F5376 add r0, r1, #0 ldr r1, [r4, #8] - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj ldr r0, [r4, #0x10] cmp r0, #0 bne _021F5376 @@ -26343,7 +26343,7 @@ MOD05_021F5400: ; 0x021F5400 bl memset ldr r1, [r5, #8] add r0, r4, #0 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit mov r0, #1 str r0, [r4, #0x6c] lsl r0, r0, #0xc @@ -26354,11 +26354,11 @@ MOD05_021F5400: ; 0x021F5400 thumb_func_start MOD05_021F5424 MOD05_021F5424: ; 0x021F5424 - ldr r3, _021F542C ; =FUN_020B7EFC + ldr r3, _021F542C ; =NNS_G3dRenderObjAddAnmObj ldr r1, [r1, #8] bx r3 nop -_021F542C: .word FUN_020B7EFC +_021F542C: .word NNS_G3dRenderObjAddAnmObj thumb_func_start MOD05_021F5430 MOD05_021F5430: ; 0x021F5430 @@ -26373,7 +26373,7 @@ MOD05_021F5430: ; 0x021F5430 add r0, r4, #0 add r0, #0x70 ldrh r0, [r0] - ldr r3, _021F54C8 ; =UNK_020FFA38 + ldr r3, _021F54C8 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -26390,7 +26390,7 @@ MOD05_021F5430: ; 0x021F5430 add r0, r4, #0 add r0, #0x74 ldrh r0, [r0] - ldr r3, _021F54C8 ; =UNK_020FFA38 + ldr r3, _021F54C8 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -26407,7 +26407,7 @@ MOD05_021F5430: ; 0x021F5430 add r0, r4, #0 add r0, #0x72 ldrh r0, [r0] - ldr r3, _021F54C8 ; =UNK_020FFA38 + ldr r3, _021F54C8 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -26432,7 +26432,7 @@ _021F54C4: add sp, #0x48 pop {r4, pc} .balign 4, 0 -_021F54C8: .word UNK_020FFA38 +_021F54C8: .word FX_SinCosTable_ thumb_func_start MOD05_021F54CC MOD05_021F54CC: ; 0x021F54CC @@ -26471,17 +26471,17 @@ MOD05_021F54EC: ; 0x021F54EC add r0, r2, #0 mov r1, #0 add r6, r3, #0 - bl FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx str r0, [r5, #4] ldr r1, [r5, #4] ldr r2, [r4, #8] add r0, r6, #0 - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r5, #8] ldr r1, [r5, #4] ldr r2, [r4, #8] ldr r3, [r4, #0xc] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit pop {r4, r5, r6, pc} thumb_func_start MOD05_021F5518 @@ -27024,7 +27024,7 @@ _021F5924: bl MOD06_0223BE70 cmp r0, #0 bne _021F5980 - bl ErrorHandling + bl GF_AssertFail b _021F5980 _021F5936: mov r0, #0xa @@ -27062,7 +27062,7 @@ _021F5978: mov r0, #1 pop {r4, r5, r6, pc} _021F597C: - bl ErrorHandling + bl GF_AssertFail _021F5980: mov r0, #0 pop {r4, r5, r6, pc} @@ -27087,7 +27087,7 @@ MOD05_021F5990: ; 0x021F5990 bl FUN_0201681C cmp r0, #1 beq _021F59B2 - bl ErrorHandling + bl GF_AssertFail _021F59B2: sub r5, r6, r5 add r0, r7, #0 @@ -27095,7 +27095,7 @@ _021F59B2: bl AllocFromHeap add r4, r0, #0 bne _021F59C4 - bl ErrorHandling + bl GF_AssertFail _021F59C4: add r0, r4, #0 mov r1, #0 @@ -27164,7 +27164,7 @@ MOD05_021F5A28: ; 0x021F5A28 str r0, [sp] cmp r0, #0 bne _021F5A40 - bl ErrorHandling + bl GF_AssertFail _021F5A40: add r0, r5, #0 add r1, r6, #0 @@ -27198,7 +27198,7 @@ MOD05_021F5A74: ; 0x021F5A74 bl MOD05_021F5B3C add r4, r0, #0 bne _021F5A82 - bl ErrorHandling + bl GF_AssertFail _021F5A82: ldr r0, [r4] bl MOD05_021F5B34 @@ -27212,7 +27212,7 @@ MOD05_021F5A90: ; 0x021F5A90 bl MOD05_021F5B3C add r4, r0, #0 bne _021F5A9E - bl ErrorHandling + bl GF_AssertFail _021F5A9E: ldr r0, [r4] pop {r4, pc} @@ -27291,7 +27291,7 @@ _021F5B26: add r4, r0, #0 cmp r4, #0 bne _021F5B30 - bl ErrorHandling + bl GF_AssertFail _021F5B30: add r0, r4, #0 pop {r4, pc} @@ -28037,7 +28037,7 @@ MOD05_021F6074: ; 0x021F6074 bl AllocFromHeapAtEnd add r4, r0, #0 bne _021F6088 - bl ErrorHandling + bl GF_AssertFail _021F6088: add r0, r4, #0 mov r1, #0 @@ -28198,7 +28198,7 @@ MOD05_021F61B0: ; 0x021F61B0 beq _021F61C6 cmp r0, #2 beq _021F61CA - bl ErrorHandling + bl GF_AssertFail _021F61C2: ldr r0, _021F61D0 ; =0x000001BD pop {r3, pc} diff --git a/arm9/modules/05/src/mod05_021E72FC.c b/arm9/modules/05/src/mod05_021E72FC.c index c24a7bd3..73fddb7e 100644 --- a/arm9/modules/05/src/mod05_021E72FC.c +++ b/arm9/modules/05/src/mod05_021E72FC.c @@ -148,7 +148,7 @@ THUMB_FUNC UnkStruct021E7358 *MOD05_021E74D4(u32 param0) UnkStruct021E7358 *res = (UnkStruct021E7358 *)AllocFromHeapAtEnd(4, param0); if (res == NULL) { - ErrorHandling(); + GF_AssertFail(); } memset((void *)res, 0, param0); return res; @@ -156,5 +156,5 @@ THUMB_FUNC UnkStruct021E7358 *MOD05_021E74D4(u32 param0) THUMB_FUNC void MOD05_021E74F8(UnkStruct021E7358 *param0) { - FUN_02016A8C(4, param0); + FreeToHeapExplicit(4, param0); } diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index d46e003b..3b86cb19 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -75,7 +75,7 @@ MOD06_02239714: ; 0x02239714 ldr r0, [r4, #0x38] cmp r0, #2 beq _02239722 - bl ErrorHandling + bl GF_AssertFail _02239722: mov r0, #3 str r0, [r4, #0x38] @@ -1124,7 +1124,7 @@ MOD06_02239F04: ; 0x02239F04 bl FUN_02058060 add r5, r0, #0 bne _02239F18 - bl ErrorHandling + bl GF_AssertFail _02239F18: add r0, r5, #0 bl FUN_02058B2C @@ -2298,7 +2298,7 @@ MOD06_0223A790: ; 0x0223A790 ldr r0, [r4, r0] cmp r0, #5 beq _0223A7A2 - bl ErrorHandling + bl GF_AssertFail _0223A7A2: add r0, r4, #0 bl FreeToHeap @@ -2339,7 +2339,7 @@ MOD06_0223A7DC: ; 0x0223A7DC ldr r0, [r4, r0] cmp r0, #2 beq _0223A7EE - bl ErrorHandling + bl GF_AssertFail _0223A7EE: mov r0, #0x4b mov r1, #3 @@ -2393,7 +2393,7 @@ MOD06_0223A828: ; 0x0223A828 str r1, [r0] mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N add r4, #0x40 add r0, r4, #0 bl MOD06_0223A400 @@ -2401,7 +2401,7 @@ MOD06_0223A828: ; 0x0223A828 mov r0, #0x12 add r1, sp, #0 str r2, [sp] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N _0223A860: add sp, #4 pop {r3, r4, pc} @@ -3119,7 +3119,7 @@ MOD06_0223ADB4: ; 0x0223ADB4 str r0, [r4] cmp r0, #0 bne _0223ADCA - bl ErrorHandling + bl GF_AssertFail _0223ADCA: mov r0, #0 str r0, [r4, #0x24] @@ -3693,7 +3693,7 @@ MOD06_0223B20C: ; 0x0223B20C add r7, r3, #0 cmp r0, #0 beq _0223B224 - bl ErrorHandling + bl GF_AssertFail _0223B224: mov r0, #0x71 mov r1, #0 @@ -3749,7 +3749,7 @@ MOD06_0223B268: ; 0x0223B268 bl MOD06_0223B438 add r4, r0, #0 bne _0223B290 - bl ErrorHandling + bl GF_AssertFail _0223B290: mov r1, #0x73 lsl r1, r1, #2 @@ -3897,7 +3897,7 @@ MOD06_0223B378: ; 0x0223B378 add r7, r3, #0 cmp r0, #0 beq _0223B38C - bl ErrorHandling + bl GF_AssertFail _0223B38C: add r0, r5, #0 add r0, #0x7c @@ -4562,7 +4562,7 @@ MOD06_0223B814: ; 0x0223B814 ldr r0, [r4, #0x14] cmp r0, #2 beq _0223B822 - bl ErrorHandling + bl GF_AssertFail _0223B822: mov r0, #3 str r0, [r4, #0x14] @@ -5133,7 +5133,7 @@ _0223BC90: bl MOD06_0223C438 b _0223BCCC _0223BCBC: - bl ErrorHandling + bl GF_AssertFail ldr r0, [sp, #0x2c] bl FUN_02047964 add sp, #0xb4 @@ -5154,13 +5154,13 @@ _0223BCDE: bl FUN_02016B90 cmp r0, #0 bne _0223BCEC - bl ErrorHandling + bl GF_AssertFail _0223BCEC: mov r0, #0xb bl FUN_02016B90 cmp r0, #0 bne _0223BCFA - bl ErrorHandling + bl GF_AssertFail _0223BCFA: ldr r0, [sp, #0x10] cmp r0, #0 @@ -5222,7 +5222,7 @@ _0223BD2E: lsr r5, r0, #0x10 cmp r5, #0x64 blo _0223BD80 - bl ErrorHandling + bl GF_AssertFail _0223BD80: cmp r5, r6 blt _0223BD8A @@ -5570,7 +5570,7 @@ _0223C034: bl MOD06_0223C438 b _0223C06A _0223C060: - bl ErrorHandling + bl GF_AssertFail add sp, #0xac mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -5583,7 +5583,7 @@ _0223C06A: bl FUN_02046A20 b _0223C07E _0223C07A: - bl ErrorHandling + bl GF_AssertFail _0223C07E: mov r0, #0 add r5, #0x74 @@ -5851,7 +5851,7 @@ _0223C2A2: bl MOD06_0223C3F4 b _0223C2DC _0223C2CC: - bl ErrorHandling + bl GF_AssertFail ldr r0, [r4] bl FUN_02047964 add sp, #0xac @@ -5867,13 +5867,13 @@ _0223C2E4: bl FUN_02016B90 cmp r0, #0 bne _0223C2F2 - bl ErrorHandling + bl GF_AssertFail _0223C2F2: mov r0, #0xb bl FUN_02016B90 cmp r0, #0 bne _0223C300 - bl ErrorHandling + bl GF_AssertFail _0223C300: ldr r0, [sp, #0x10] cmp r0, #0 @@ -6089,7 +6089,7 @@ MOD06_0223C470: ; 0x0223C470 lsr r4, r0, #0x10 cmp r4, #0x64 blo _0223C4A8 - bl ErrorHandling + bl GF_AssertFail _0223C4A8: cmp r4, #5 blo _0223C4B0 @@ -6133,7 +6133,7 @@ _0223C4EC: lsr r6, r0, #0x10 cmp r6, #0x64 blo _0223C504 - bl ErrorHandling + bl GF_AssertFail _0223C504: cmp r6, r4 bge _0223C518 @@ -6217,7 +6217,7 @@ MOD06_0223C584: ; 0x0223C584 lsr r5, r0, #0x10 cmp r5, #0x64 blo _0223C5A0 - bl ErrorHandling + bl GF_AssertFail _0223C5A0: cmp r5, r4 blo _0223C5A8 @@ -6238,7 +6238,7 @@ MOD06_0223C5AC: ; 0x0223C5AC lsr r4, r0, #0x10 cmp r4, #0x64 blo _0223C5C6 - bl ErrorHandling + bl GF_AssertFail _0223C5C6: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -6328,7 +6328,7 @@ MOD06_0223C648: ; 0x0223C648 lsr r4, r0, #0x10 cmp r4, #0x64 blo _0223C662 - bl ErrorHandling + bl GF_AssertFail _0223C662: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -6373,7 +6373,7 @@ MOD06_0223C694: ; 0x0223C694 lsr r6, r0, #0x10 cmp r6, #0x64 blo _0223C6B2 - bl ErrorHandling + bl GF_AssertFail _0223C6B2: lsl r0, r6, #0x18 lsr r0, r0, #0x18 @@ -6454,7 +6454,7 @@ _0223C72C: mov r4, #4 b _0223C734 _0223C730: - bl ErrorHandling + bl GF_AssertFail _0223C734: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -6522,7 +6522,7 @@ MOD06_0223C78C: ; 0x0223C78C lsr r5, r0, #0x10 cmp r5, #2 blo _0223C7AC - bl ErrorHandling + bl GF_AssertFail _0223C7AC: cmp r5, #0 bne _0223C7C6 @@ -6543,7 +6543,7 @@ _0223C7C6: lsr r4, r0, #0x10 cmp r4, #0x19 blo _0223C7DC - bl ErrorHandling + bl GF_AssertFail _0223C7DC: lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -6593,7 +6593,7 @@ _0223C82C: lsr r7, r0, #0x10 cmp r7, #2 blo _0223C83C - bl ErrorHandling + bl GF_AssertFail _0223C83C: cmp r7, #0 bne _0223C848 @@ -6646,7 +6646,7 @@ MOD06_0223C854: ; 0x0223C854 lsr r4, r0, #0x10 cmp r4, #3 blo _0223C8A6 - bl ErrorHandling + bl GF_AssertFail _0223C8A6: cmp r4, #0 beq _0223C8E0 @@ -6667,7 +6667,7 @@ _0223C8BE: lsr r4, r0, #0x10 cmp r4, #2 blo _0223C8D2 - bl ErrorHandling + bl GF_AssertFail _0223C8D2: cmp r4, #0 bne _0223C8E0 @@ -6691,7 +6691,7 @@ _0223C8EC: add r7, r0, #0 cmp r7, #2 bne _0223C904 - bl ErrorHandling + bl GF_AssertFail _0223C904: ldr r0, [sp, #0x24] cmp r7, r0 @@ -6731,7 +6731,7 @@ _0223C92E: bl MOD06_0223D1BC cmp r0, #0 bne _0223C95A - bl ErrorHandling + bl GF_AssertFail _0223C95A: ldr r0, [sp, #0x1c] bl FreeToHeap @@ -6780,7 +6780,7 @@ _0223C998: lsr r6, r0, #0x10 cmp r6, #3 blo _0223C9BE - bl ErrorHandling + bl GF_AssertFail _0223C9BE: cmp r6, #0 beq _0223CA28 @@ -6800,7 +6800,7 @@ _0223C9D8: mov r6, #1 b _0223C9E4 _0223C9E0: - bl ErrorHandling + bl GF_AssertFail _0223C9E4: ldr r0, [sp, #0x28] add r1, r5, #0 @@ -6825,7 +6825,7 @@ _0223C9E4: bl MOD06_0223D1BC cmp r0, #0 bne _0223CA1E - bl ErrorHandling + bl GF_AssertFail _0223CA1E: add r0, r4, #0 bl FreeToHeap @@ -6852,7 +6852,7 @@ _0223CA28: bl MOD06_0223D1BC cmp r0, #0 bne _0223CA5C - bl ErrorHandling + bl GF_AssertFail _0223CA5C: add r0, r4, #0 bl FreeToHeap @@ -6999,7 +6999,7 @@ _0223CB74: add r7, r0, #0 b _0223CB8A _0223CB86: - bl ErrorHandling + bl GF_AssertFail _0223CB8A: add r0, r5, #0 add r1, r6, #0 @@ -7048,7 +7048,7 @@ MOD06_0223CBD4: ; 0x0223CBD4 add r7, r3, #0 cmp r5, #0 bne _0223CBE8 - bl ErrorHandling + bl GF_AssertFail _0223CBE8: lsl r0, r4, #0x18 lsr r1, r0, #0x18 @@ -7197,7 +7197,7 @@ MOD06_0223CCDC: ; 0x0223CCDC lsr r6, r0, #0x10 cmp r6, #0xb blo _0223CD1A - bl ErrorHandling + bl GF_AssertFail _0223CD1A: add r0, r6, #5 lsl r0, r0, #0x18 @@ -7219,7 +7219,7 @@ _0223CD36: lsr r6, r0, #0x10 cmp r6, #2 blo _0223CD46 - bl ErrorHandling + bl GF_AssertFail _0223CD46: cmp r6, #0 beq _0223CD4C @@ -7353,7 +7353,7 @@ _0223CE32: ldr r0, [r0, r1] pop {r4, pc} _0223CE3A: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} .align 2, 0 @@ -7454,7 +7454,7 @@ MOD06_0223CED4: ; 0x0223CED4 lsr r4, r0, #0x10 cmp r4, #2 blo _0223CEFA - bl ErrorHandling + bl GF_AssertFail _0223CEFA: cmp r4, #0 bne _0223CF0E @@ -7569,7 +7569,7 @@ _0223CFAC: lsr r4, r0, #0x10 cmp r4, #2 blo _0223CFC2 - bl ErrorHandling + bl GF_AssertFail _0223CFC2: cmp r4, #0 bne _0223CFCA @@ -7705,7 +7705,7 @@ MOD06_0223D044: ; 0x0223D044 bl AddMonToParty cmp r0, #0 bne _0223D0D8 - bl ErrorHandling + bl GF_AssertFail _0223D0D8: add r0, r4, #0 bl FreeToHeap @@ -7768,7 +7768,7 @@ _0223D148: lsr r4, r0, #0x10 cmp r4, #2 blo _0223D158 - bl ErrorHandling + bl GF_AssertFail _0223D158: cmp r4, #0 bne _0223D162 @@ -7780,7 +7780,7 @@ _0223D162: bls _0223D1AA cmp r5, #0 bne _0223D16E - bl ErrorHandling + bl GF_AssertFail _0223D16E: cmp r5, #1 bhi _0223D176 @@ -7802,7 +7802,7 @@ _0223D176: lsr r4, r0, #0x10 cmp r4, r5 blo _0223D19E - bl ErrorHandling + bl GF_AssertFail _0223D19E: lsl r1, r4, #2 add r0, sp, #8 @@ -7940,7 +7940,7 @@ _0223D296: lsr r6, r0, #0x10 cmp r6, #2 blo _0223D2A6 - bl ErrorHandling + bl GF_AssertFail _0223D2A6: cmp r6, #0 bne _0223D2AE @@ -8020,7 +8020,7 @@ _0223D308: beq _0223D342 cmp r1, #8 ble _0223D338 - bl ErrorHandling + bl GF_AssertFail _0223D338: add r5, #0xa0 ldr r0, [r5] @@ -8427,7 +8427,7 @@ MOD06_0223D63C: ; 0x0223D63C mov r4, #3 add r0, r4, #0 mov r1, #0xb - bl ListMenu_ctor + bl ListMenuItems_ctor add r1, r5, #0 add r1, #0x84 str r0, [r1] @@ -8439,7 +8439,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r1, [r1] mov r2, #0xf mov r3, #2 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r5, #0 add r1, r5, #0 add r0, #0x84 @@ -8448,7 +8448,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r1, [r1] mov r2, #0x10 mov r3, #0xe - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r5, #0 add r1, r5, #0 add r0, #0x84 @@ -8458,7 +8458,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r0, [r0] ldr r1, [r1] sub r3, #0x13 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData mov r3, #1 str r3, [sp] mov r1, #0xd @@ -8478,7 +8478,7 @@ _0223D6B8: mov r4, #2 add r0, r4, #0 mov r1, #0xb - bl ListMenu_ctor + bl ListMenuItems_ctor add r1, r5, #0 add r1, #0x84 str r0, [r1] @@ -8490,7 +8490,7 @@ _0223D6B8: ldr r1, [r1] mov r2, #0xf add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r5, #0 add r1, r5, #0 add r0, #0x84 @@ -8500,7 +8500,7 @@ _0223D6B8: ldr r0, [r0] ldr r1, [r1] sub r3, #0x13 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData mov r3, #1 str r3, [sp] mov r1, #0xd @@ -8618,7 +8618,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 add r0, r4, #0 add r0, #0x84 ldr r0, [r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r4, #8 add r0, r4, #0 bl FUN_02019178 @@ -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 @@ -9146,7 +9146,7 @@ _0223DC34: ldrb r0, [r5, r0] mov r1, #0xb add r0, r0, #1 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x7c] mov r0, #0x8b lsl r0, r0, #2 @@ -9172,7 +9172,7 @@ _0223DC52: ldr r0, [r5, #0x7c] ldrh r2, [r2, r4] add r1, r7, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r0, r7, #0 bl String_dtor mov r0, #0x8b @@ -9190,7 +9190,7 @@ _0223DC8E: ldr r0, [r5, #0x7c] ldr r1, [r1] sub r3, #0xa - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, [sp] bl DestroyMsgData ldr r4, _0223DCEC ; =0x0224F38C @@ -9220,7 +9220,7 @@ _0223DC8E: add r0, r2, #0 add r2, r1, #0 str r5, [sp, #0x20] - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x78] add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -9236,7 +9236,7 @@ MOD06_0223DCF0: ; 0x0223DCF0 mov r1, #0x13 str r0, [sp, #0x10] add r6, r2, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField add r4, r0, #0 cmp r6, #1 beq _0223DD0C @@ -9246,7 +9246,7 @@ _0223DD0C: add r0, r4, #0 add r0, #0x18 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #1 mvn r1, r1 cmp r5, r1 @@ -9328,7 +9328,7 @@ _0223DDBA: ldr r0, [sp, #0x10] add r1, #2 add r2, sp, #0x14 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, sp, #0x14 ldrh r0, [r0, #2] cmp r0, #0 @@ -9348,7 +9348,7 @@ _0223DDE4: _0223DDF0: ldr r0, [sp, #0x10] mov r1, #2 - bl FUN_02001470 + bl ListMenuGetTemplateField cmp r0, #7 bls _0223DE16 add r1, sp, #0x14 @@ -9383,7 +9383,7 @@ MOD06_0223DE34: ; 0x0223DE34 add r4, r1, #0 mov r1, #0x13 add r7, r2, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField mov r1, #1 mvn r1, r1 add r5, r0, #0 @@ -9456,7 +9456,7 @@ MOD06_0223DED0: ; 0x0223DED0 bne _0223DF1C add r0, #0x28 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x28 mov r1, #1 @@ -9491,7 +9491,7 @@ _0223DF1C: mov r1, #0xf mov r2, #0 str r3, [sp, #4] - bl FUN_020196F4 + bl FillWindowPixelRect _0223DF30: mov r0, #0x10 mov r1, #0xb @@ -9558,14 +9558,14 @@ MOD06_0223DFB4: ; 0x0223DFB4 ldr r0, [r5, #0x78] mov r1, #0 add r2, #2 - bl FUN_02001448 + bl ListMenuGetScrollAndRow ldr r0, [r5, #0x78] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 ldr r0, [r5, #0x78] mov r1, #0 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, sp, #0 ldrh r2, [r0] ldrh r0, [r0, #2] @@ -9595,9 +9595,9 @@ _0223E006: mov r1, #0 ldr r0, [r5, #0x78] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r5, #0x7c] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r5, #0 bl MOD06_0223D9C0 add r0, r5, #0 @@ -9637,7 +9637,7 @@ _0223E034: add r0, r5, #0 add r0, #0x58 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x18 bl FUN_02019570 @@ -9832,7 +9832,7 @@ _0223E214: add r0, r5, #0 add r0, #0x48 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x48 mov r1, #1 @@ -9934,7 +9934,7 @@ _0223E2C4: add r0, r4, #0 add r0, #0x58 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0223E380 ; =0x000005DC bl FUN_020054C8 add r0, r4, #0 @@ -10167,7 +10167,7 @@ MOD06_0223E4E8: ; 0x0223E4E8 add r4, r1, #0 add r0, #0x38 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r4, #0 bne _0223E50A add r0, r5, #0 @@ -10429,7 +10429,7 @@ _0223E704: add r0, r5, #0 add r0, #0x58 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0x23 lsl r2, r2, #4 ldr r1, [r5, r2] @@ -10644,7 +10644,7 @@ _0223E88A: add r0, r5, #0 add r0, #0x58 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0x23 lsl r2, r2, #4 ldr r1, [r5, r2] @@ -11388,7 +11388,7 @@ _0223EEB8: mov r1, #0 add r0, r2, #0 add r2, r1, #0 - bl FUN_020010A8 + bl ListMenuInit ldr r1, _0223EF10 ; =0x02252420 ldr r2, [r1] str r0, [r2, #0x5c] @@ -11412,7 +11412,7 @@ MOD06_0223EF18: ; 0x0223EF18 ldr r0, [r0] cmp r0, #0 beq _0223EF28 - bl ErrorHandling + bl GF_AssertFail _0223EF28: mov r0, #4 mov r1, #0x9c @@ -11454,15 +11454,15 @@ _0223EF28: str r0, [r2, #0x7c] ldr r0, [r1] add r0, #0x20 - bl FUN_0201901C + bl InitWindow ldr r0, _0223EFF4 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_0201901C + bl InitWindow ldr r0, _0223EFF4 ; =0x02252420 ldr r0, [r0] add r0, #0x40 - bl FUN_0201901C + bl InitWindow mov r0, #4 bl ScrStrBufs_new ldr r1, _0223EFF4 ; =0x02252420 @@ -11619,7 +11619,7 @@ MOD06_0223F0C8: ; 0x0223F0C8 mov r1, #3 add r5, r0, #0 mov r4, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField cmp r0, #0 bls _0223F0F6 add r6, r4, #0 @@ -11633,7 +11633,7 @@ _0223F0DC: add r0, r5, #0 add r1, r7, #0 add r4, r4, #1 - bl FUN_02001470 + bl ListMenuGetTemplateField cmp r4, r0 blo _0223F0DC _0223F0F6: @@ -11655,7 +11655,7 @@ MOD06_0223F0F8: ; 0x0223F0F8 cmp r0, #0 beq _0223F11A add r1, sp, #0xc - bl FUN_02001448 + bl ListMenuGetScrollAndRow _0223F11A: add r0, sp, #0xc ldrh r1, [r0] @@ -11665,7 +11665,7 @@ _0223F11A: lsl r5, r5, #4 ldr r0, [r0] add r0, #0x20 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, #8 lsl r0, r0, #0x10 @@ -11680,7 +11680,7 @@ _0223F11A: add r0, #0x20 mov r2, #8 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect add r0, sp, #0xc ldrh r2, [r0] cmp r2, r4 @@ -11853,7 +11853,7 @@ _0223F2AA: mov r1, #0xf ldr r0, [r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0223F330 ; =0x02252420 ldr r0, [r0] add r0, #0x30 @@ -11977,7 +11977,7 @@ MOD06_0223F3B8: ; 0x0223F3B8 beq _0223F450 mov r0, #0x10 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r4, _0223F454 ; =0x02252420 mov r5, #0 ldr r1, [r4] @@ -12006,7 +12006,7 @@ _0223F3E0: mov r2, #0 ldr r0, [r1, #0x64] ldr r1, [r1] - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r5, r5, #1 cmp r5, #0x10 blt _0223F3E0 @@ -12074,7 +12074,7 @@ _0223F49A: ldr r0, _0223F518 ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput _0223F4A4: mov r1, #1 mvn r1, r1 @@ -12105,7 +12105,7 @@ _0223F4D8: add r1, r4, #0 ldr r0, [r4, #0x5c] add r1, #0x8e - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId add r0, r4, #0 add r0, #0x8e ldrh r5, [r0] @@ -12160,7 +12160,7 @@ _0223F53C: mov r2, #8 add r0, #0x20 mov r3, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _0223F580 ; =0x02252420 mov r1, #0 ldr r0, [r0] @@ -12451,7 +12451,7 @@ MOD06_0223F7C4: ; 0x0223F7C4 cmp r0, #0 beq _0223F7E0 add r1, sp, #0xc - bl FUN_02001448 + bl ListMenuGetScrollAndRow _0223F7E0: add r0, sp, #0xc ldrh r1, [r0] @@ -12611,7 +12611,7 @@ _0223F910: mov r1, #0xf ldr r0, [r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0223F950 ; =0x02252420 ldr r0, [r0] add r0, #0x30 @@ -12651,7 +12651,7 @@ _0223F966: ldrb r0, [r0] cmp r0, #0x11 blo _0223F982 - bl ErrorHandling + bl GF_AssertFail _0223F982: ldr r0, _0223F9D4 ; =0x02252420 ldr r0, [r0] @@ -12727,7 +12727,7 @@ _0223FA02: mov r1, #0xf ldr r0, [r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0223FA5C ; =0x02252420 add r1, r4, #0 ldr r2, [r0] @@ -12821,7 +12821,7 @@ MOD06_0223FAB8: ; 0x0223FAB8 beq _0223FB4C mov r0, #5 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r4, _0223FB50 ; =0x02252420 mov r5, #0 ldr r1, [r4] @@ -12834,7 +12834,7 @@ _0223FAE6: ldr r0, [r1, #0x64] ldr r1, [r1, #0x74] add r3, r7, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r5, r5, #1 cmp r5, #5 blt _0223FAE6 @@ -12966,13 +12966,13 @@ _0223FBDA: strb r0, [r2] ldr r0, [r1] ldr r0, [r0, #0x5c] - bl FUN_02001328 + bl RedrawListMenu ldr r0, _0223FCF0 ; =0x02252420 mov r1, #3 ldr r0, [r0] mov r5, #0 ldr r0, [r0, #0x5c] - bl FUN_02001470 + bl ListMenuGetTemplateField cmp r0, #0 bls _0223FC32 ldr r4, _0223FCF0 ; =0x02252420 @@ -12989,13 +12989,13 @@ _0223FC14: add r1, r7, #0 ldr r0, [r0, #0x5c] add r5, r5, #1 - bl FUN_02001470 + bl ListMenuGetTemplateField cmp r5, r0 blo _0223FC14 _0223FC32: ldr r0, [sp, #4] ldr r0, [r0, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 bl FUN_0202DF08 cmp r0, #0xff @@ -13094,7 +13094,7 @@ MOD06_0223FD08: ; 0x0223FD08 add r0, r4, #0 bl MOD06_0223F9D8 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, [r4, #0x60] mov r1, #4 bl FUN_020021AC @@ -13421,7 +13421,7 @@ MOD06_0223FFD4: ; 0x0223FFD4 mov r0, #0 bl FUN_02031A24 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, _02240020 ; =0x02252420 ldr r0, [r0] add r0, #0x94 @@ -13459,7 +13459,7 @@ MOD06_02240030: ; 0x02240030 add r0, r5, #0 bl MOD06_0223F9D8 ldr r0, [r5, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, [r5, #0x60] mov r1, #4 bl FUN_020021AC @@ -13681,7 +13681,7 @@ MOD06_02240204: ; 0x02240204 add r0, r4, #0 bl MOD06_0223F9D8 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, _02240248 ; =0x02252420 ldr r0, [r0] add r0, #0x94 @@ -13719,7 +13719,7 @@ MOD06_02240258: ; 0x02240258 add r0, r5, #0 bl MOD06_0223F9D8 ldr r0, [r5, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, [r5, #0x60] mov r1, #4 bl FUN_020021AC @@ -13778,7 +13778,7 @@ _022402DC: add r0, r4, #0 bl MOD06_0223F9D8 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r0, #0xa bl FUN_020315D8 cmp r0, #0 @@ -13804,7 +13804,7 @@ MOD06_02240310: ; 0x02240310 add r0, r4, #0 bl MOD06_0223F9D8 ldr r0, [r4, #0x5c] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r0, _02240354 ; =0x02252420 ldr r0, [r0] add r0, #0x94 @@ -13843,17 +13843,17 @@ MOD06_02240364: ; 0x02240364 ldr r0, [r0] mov r1, #0xf add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x20 mov r1, #0 bl FUN_0200CCF8 ldr r0, [r4, #0x64] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r1, #0 ldr r0, [r4, #0x5c] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #0x20 bl FUN_02019570 @@ -14473,7 +14473,7 @@ MOD06_02240864: ; 0x02240864 bne _0224089E add r0, r5, #0 add r0, #0x54 - bl FUN_0201901C + bl InitWindow ldr r0, [r5, #0x10] add r1, r5, #0 ldr r0, [r0, #8] @@ -14577,7 +14577,7 @@ _02240940: bne _022409D2 add r0, r6, #2 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #8] mov r3, #1 str r3, [sp] @@ -14605,7 +14605,7 @@ _02240940: ldr r1, [r5, #0x68] mov r2, #0x7b mov r3, #0xc - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData mov r4, #0 cmp r6, #0 ble _022409C4 @@ -14625,7 +14625,7 @@ _02240998: ldr r0, [r5, #8] ldr r1, [r5, #0x20] add r2, r4, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r4, r4, #1 cmp r4, r6 blt _02240998 @@ -14635,7 +14635,7 @@ _022409C4: ldr r0, [r5, #8] ldr r1, [r5, #0x68] sub r3, #0x74 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData _022409D2: ldr r4, _02240A24 ; =0x0224F704 add r3, sp, #0x14 @@ -14666,7 +14666,7 @@ _022409D2: add r2, #0x78 ldrh r2, [r2] mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5] add r5, #0x34 add r0, r5, #0 @@ -14686,7 +14686,7 @@ MOD06_02240A28: ; 0x02240A28 beq _02240A62 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #0x34 mov r1, #1 @@ -14700,7 +14700,7 @@ MOD06_02240A28: ; 0x02240A28 add r0, #0x34 bl FUN_02019178 ldr r0, [r4, #8] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #0 str r0, [r4] _02240A62: @@ -14711,20 +14711,20 @@ MOD06_02240A64: ; 0x02240A64 push {r4, r5, r6, lr} add r5, r0, #0 ldr r0, [r5] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r2, r5, #0 ldr r0, [r5] mov r1, #0 add r2, #0x78 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, r5, #0 add r0, #0x80 ldrh r6, [r0] add r1, r5, #0 ldr r0, [r5] add r1, #0x80 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId add r0, r5, #0 add r0, #0x80 ldrh r0, [r0] @@ -14792,7 +14792,7 @@ MOD06_02240B04: ; 0x02240B04 mov r0, #3 mov r1, #4 ldr r4, _02240BA8 ; =MOD6_022522E4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0xc] mov r0, #0xa str r0, [sp] @@ -14823,7 +14823,7 @@ _02240B4A: ldr r1, [r5, #0x68] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #3 @@ -14855,7 +14855,7 @@ _02240B4A: add r2, #0x7a ldrh r2, [r2] mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #4] add r5, #0x44 add r0, r5, #0 @@ -14873,20 +14873,20 @@ MOD06_02240BB8: ; 0x02240BB8 push {r4, r5, r6, lr} add r5, r0, #0 ldr r0, [r5, #4] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r2, r5, #0 ldr r0, [r5, #4] mov r1, #0 add r2, #0x7a - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, r5, #0 add r0, #0x82 ldrh r6, [r0] add r1, r5, #0 ldr r0, [r5, #4] add r1, #0x82 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId add r0, r5, #0 add r0, #0x82 ldrh r0, [r0] @@ -14921,7 +14921,7 @@ _02240C1A: beq _02240C50 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 add r0, #0x44 mov r1, #1 @@ -14935,7 +14935,7 @@ _02240C1A: add r0, #0x44 bl FUN_02019178 ldr r0, [r5, #0xc] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #0 str r0, [r5, #4] _02240C50: @@ -14992,7 +14992,7 @@ MOD06_02240C58: ; 0x02240C58 bl FUN_0200CCA4 ldr r0, [sp, #0x24] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x14] add r1, r0, #0 add r1, #0x78 @@ -15741,7 +15741,7 @@ _022412C8: strb r0, [r5] pop {r4, r5, pc} _022412DC: - bl ErrorHandling + bl GF_AssertFail _022412E0: add sp, #0x2c pop {r4, r5, pc} @@ -15994,7 +15994,7 @@ _022414DA: str r0, [r5] b _02241580 _022414E6: - bl ErrorHandling + bl GF_AssertFail b _02241580 _022414EC: add r4, #0xa0 @@ -16251,7 +16251,7 @@ _022416EA: str r7, [sp, #0xc] b _02241702 _022416F6: - bl ErrorHandling + bl GF_AssertFail mov r5, #0 mov r6, #1 add r7, r6, #0 @@ -16360,7 +16360,7 @@ _022417E4: mov r5, #2 b _022417F4 _022417F0: - bl ErrorHandling + bl GF_AssertFail _022417F4: add r0, r6, #0 add r1, r7, #0 @@ -16460,7 +16460,7 @@ _022418D0: lsl r4, r4, #0x10 b _022418DC _022418D6: - bl ErrorHandling + bl GF_AssertFail mov r4, #0 _022418DC: add r0, r5, #0 @@ -17241,7 +17241,7 @@ _02241F00: str r0, [r4] b _02241F2E _02241F2A: - bl ErrorHandling + bl GF_AssertFail _02241F2E: ldr r0, [r6, #0x38] ldr r1, [sp, #4] @@ -17393,7 +17393,7 @@ _0224205A: bl FUN_0205ADDC b _02242072 _0224206E: - bl ErrorHandling + bl GF_AssertFail _02242072: ldr r0, [sp] add r1, sp, #0x10 @@ -17553,7 +17553,7 @@ _022421AA: bl FUN_0205ADDC b _022421C2 _022421BE: - bl ErrorHandling + bl GF_AssertFail _022421C2: ldr r0, [sp] add r1, sp, #0x10 @@ -17886,7 +17886,7 @@ MOD06_02242458: ; 0x02242458 lsr r5, r0, #0x18 cmp r5, #3 bls _02242478 - bl ErrorHandling + bl GF_AssertFail _02242478: ldr r1, _02242498 ; =0x0224FC00 lsl r0, r5, #0xa @@ -17897,7 +17897,7 @@ _02242478: lsl r0, r0, #0xa cmp r4, r0 blt _0224248E - bl ErrorHandling + bl GF_AssertFail _0224248E: ldrb r1, [r5, r4] ldr r0, [sp, #0x10] @@ -18344,7 +18344,7 @@ _022427DC: str r0, [r4] b _022427FE _022427FA: - bl ErrorHandling + bl GF_AssertFail _022427FE: add r0, r6, #0 add r1, sp, #0 @@ -18399,7 +18399,7 @@ _0224285C: mov r0, #0xd pop {r3, pc} _02242860: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -18423,7 +18423,7 @@ _02242882: add r7, r2, #0 b _0224288A _02242886: - bl ErrorHandling + bl GF_AssertFail _0224288A: ldrb r0, [r5, #7] mov r4, #0 @@ -18431,7 +18431,7 @@ _0224288A: lsr r0, r0, #0x1e cmp r0, #3 bls _0224289A - bl ErrorHandling + bl GF_AssertFail _0224289A: ldrb r0, [r5, #7] lsl r0, r0, #0x1e @@ -18442,7 +18442,7 @@ _0224289A: asr r4, r0, #0x10 cmp r6, #3 bls _022428B0 - bl ErrorHandling + bl GF_AssertFail _022428B0: lsl r0, r6, #0x1e asr r1, r0, #0x10 @@ -18462,7 +18462,7 @@ _022428C4: asr r4, r0, #0x10 b _022428D4 _022428D0: - bl ErrorHandling + bl GF_AssertFail _022428D4: str r4, [r7] pop {r3, r4, r5, r6, r7, pc} @@ -18719,7 +18719,7 @@ _02242AAA: asr r0, r0, #0x18 b _02242ACE _02242AC8: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _02242ACE: str r0, [r6] @@ -18829,7 +18829,7 @@ _02242B96: add r6, r0, #0 b _02242B9E _02242B9A: - bl ErrorHandling + bl GF_AssertFail _02242B9E: ldr r0, [r6] lsl r0, r0, #0x10 @@ -18885,7 +18885,7 @@ MOD06_02242BE0: ; 0x02242BE0 bl AllocFromHeap add r4, r0, #0 bne _02242C0E - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02242C0E: @@ -19028,7 +19028,7 @@ MOD06_02242CDC: ; 0x02242CDC mov r1, #0 add r2, r5, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit add r4, #0x88 str r0, [r4] add sp, #0x14 @@ -19219,13 +19219,13 @@ MOD06_02242E9C: ; 0x02242E9C mov r1, #3 mov r2, #0xf mov r3, #4 - bl FUN_020013E8 + bl ListMenuOverrideSetColors pop {r3, pc} _02242EB2: mov r1, #1 mov r2, #0xf mov r3, #2 - bl FUN_020013E8 + bl ListMenuOverrideSetColors pop {r3, pc} .align 2, 0 @@ -19287,7 +19287,7 @@ MOD06_02242F1C: ; 0x02242F1C add r4, r0, #0 add r0, #0x88 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #1 mvn r1, r1 cmp r0, r1 @@ -19331,7 +19331,7 @@ _02242F6E: add r0, r4, #0 add r0, #0x88 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #1 mvn r1, r1 cmp r0, r1 @@ -19439,7 +19439,7 @@ MOD06_02243024: ; 0x02243024 mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r6, #0x74] mov r1, #0 bl FUN_0200CCF8 @@ -19480,7 +19480,7 @@ MOD06_02243080: ; 0x02243080 add r0, r5, #0 add r0, #0x14 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x54] ldr r1, [sp, #0xc] add r2, r4, #0 @@ -20044,7 +20044,7 @@ MOD06_022434BC: ; 0x022434BC ldr r0, [r4] cmp r0, #0 beq _022434CA - bl ErrorHandling + bl GF_AssertFail _022434CA: mov r0, #0 str r0, [r4] @@ -20265,7 +20265,7 @@ MOD06_02243694: ; 0x02243694 ldr r0, _022436C0 ; =0x12345678 cmp r1, r0 beq _022436A6 - bl ErrorHandling + bl GF_AssertFail _022436A6: ldr r2, _022436C4 ; =0x000008CC ldr r5, [r4, #4] @@ -22907,7 +22907,7 @@ MOD06_02244AEC: ; 0x02244AEC ldrb r0, [r0, #0x10] cmp r0, #4 bls _02244B18 - bl ErrorHandling + bl GF_AssertFail _02244B18: add r0, sp, #0x80 ldrb r6, [r0, #0x10] @@ -23537,11 +23537,11 @@ MOD06_02244F84: ; 0x02244F84 add r7, r0, #0 add r0, r5, #0 mov r1, #1 - bl FUN_020B1A14 + bl NNS_G2dGetImageLocation str r0, [sp] add r0, r7, #0 mov r1, #1 - bl FUN_020B19C4 + bl NNS_G2dGetImagePaletteLocation mov r1, #0x32 add r5, r0, #0 add r0, r4, #0 @@ -23683,7 +23683,7 @@ _02245098: lsr r4, r0, #0x10 cmp r4, #0xc blo _02245104 - bl ErrorHandling + bl GF_AssertFail _02245104: lsl r1, r4, #2 add r0, sp, #4 @@ -23716,7 +23716,7 @@ _02245132: lsr r6, r0, #0x10 cmp r6, #0x24 blo _02245148 - bl ErrorHandling + bl GF_AssertFail _02245148: lsl r0, r6, #0x18 lsr r2, r0, #0x16 @@ -23962,7 +23962,7 @@ _02245302: str r0, [r5, #0x10] b _02245316 _02245312: - bl ErrorHandling + bl GF_AssertFail _02245316: ldr r0, [sp] str r0, [r5, #8] @@ -24040,7 +24040,7 @@ _02245392: ldr r1, [r5, #0x2c] bl MOD05_021F4BD0 ldr r0, [r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r1, r0, r1 ldr r1, [r1, #0xc] @@ -24454,7 +24454,7 @@ _022456DC: mov r4, #5 b _022456E4 _022456E0: - bl ErrorHandling + bl GF_AssertFail _022456E4: add r0, r4, #0 pop {r4, pc} @@ -24553,7 +24553,7 @@ _02245790: str r0, [r1] b _022457A0 _0224579C: - bl ErrorHandling + bl GF_AssertFail _022457A0: mov r0, #0 pop {r3, pc} @@ -24589,7 +24589,7 @@ MOD06_022457CC: ; 0x022457CC add r5, r0, #0 cmp r4, #3 blo _022457DC - bl ErrorHandling + bl GF_AssertFail _022457DC: ldr r0, [r5, #0xc] bl FUN_0202A9B0 @@ -24611,7 +24611,7 @@ MOD06_022457F8: ; 0x022457F8 add r5, r0, #0 cmp r4, #3 blo _02245808 - bl ErrorHandling + bl GF_AssertFail _02245808: ldr r0, [r5, #0xc] bl FUN_0202A9B0 @@ -25141,7 +25141,7 @@ _02245BF2: cmp r2, r5 blt _02245BB6 _02245BFA: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -25173,7 +25173,7 @@ _02245C2A: cmp r2, r3 blt _02245C18 _02245C32: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD06_02245C38 @@ -25203,7 +25203,7 @@ _02245C5E: cmp r2, r3 blt _02245C4C _02245C66: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD06_02245C6C @@ -25262,7 +25262,7 @@ _02245CCC: cmp r2, r5 blt _02245C8E _02245CD4: - bl ErrorHandling + bl GF_AssertFail add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -25293,7 +25293,7 @@ _02245D02: cmp r2, r3 blt _02245CF0 _02245D0A: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD06_02245D10 @@ -25323,7 +25323,7 @@ _02245D36: cmp r2, r3 blt _02245D24 _02245D3E: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD06_02245D44 @@ -25381,7 +25381,7 @@ _02245DA2: cmp r2, r5 blt _02245D66 _02245DAA: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -25441,7 +25441,7 @@ _02245E12: cmp r2, r5 blt _02245DD6 _02245E1A: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -25510,7 +25510,7 @@ _02245E3E: bl FUN_0201FF84 add r4, r0, #0 bne _02245EA6 - bl ErrorHandling + bl GF_AssertFail _02245EA6: add r0, r4, #0 add sp, #0x70 @@ -28280,7 +28280,7 @@ _02247392: bl FUN_0201FF84 add r4, r0, #0 bne _022473BE - bl ErrorHandling + bl GF_AssertFail _022473BE: add r0, r4, #0 add sp, #0x70 @@ -28438,7 +28438,7 @@ _022474E4: _022474EC: cmp r5, #4 blt _022474F4 - bl ErrorHandling + bl GF_AssertFail _022474F4: mov r0, #0x72 mov r5, #0 @@ -28474,7 +28474,7 @@ _02247528: _02247530: cmp r5, #4 blt _02247538 - bl ErrorHandling + bl GF_AssertFail _02247538: add r0, r6, #0 bl NARC_dtor @@ -28490,7 +28490,7 @@ MOD06_02247544: ; 0x02247544 bl NARC_AllocAndReadWholeMember add r1, r5, #0 add r4, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r1, [r5] mov r0, #3 ldr r1, [r1, #0xc] @@ -28513,7 +28513,7 @@ MOD06_0224756C: ; 0x0224756C bl NARC_AllocAndReadWholeMember add r1, r4, #0 add r6, r0, #0 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r3, [r4] mov r0, #0 str r0, [sp] @@ -28551,7 +28551,7 @@ MOD06_022475A4: ; 0x022475A4 bl NARC_AllocAndReadWholeMember add r1, r4, #0 add r6, r0, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData ldr r3, [r4] add r0, r5, #0 add r2, r3, #0 @@ -28656,7 +28656,7 @@ MOD06_0224767C: ; 0x0224767C ldr r0, [r4, r0] cmp r0, #0 beq _0224768E - bl ErrorHandling + bl GF_AssertFail _0224768E: ldr r0, _022476A0 ; =MOD06_022476D4 add r1, r4, #0 @@ -28678,7 +28678,7 @@ MOD06_022476A4: ; 0x022476A4 ldr r0, [r4, r0] cmp r0, #0 bne _022476B6 - bl ErrorHandling + bl GF_AssertFail _022476B6: mov r0, #0x86 lsl r0, r0, #2 @@ -28805,7 +28805,7 @@ MOD06_0224778C: ; 0x0224778C bl AllocFromHeap add r4, r0, #0 bne _022477A8 - bl ErrorHandling + bl GF_AssertFail _022477A8: mov r1, #0 add r0, r6, #0 @@ -28870,7 +28870,7 @@ MOD06_02247808: ; 0x02247808 bl FUN_020094F0 bl FUN_02009C5C mov r1, #1 - bl FUN_020B1A14 + bl NNS_G2dGetImageLocation mov r1, #0x32 add r5, r0, #0 add r0, r4, #0 @@ -28923,7 +28923,7 @@ MOD06_02247860: ; 0x02247860 add r1, r6, #0 bl FUN_02009E54 mov r1, #1 - bl FUN_020B19C4 + bl NNS_G2dGetImagePaletteLocation add r5, r0, #0 add r0, r4, #0 mov r1, #0x20 @@ -28974,7 +28974,7 @@ _022478E6: _022478EE: cmp r0, #4 blt _022478F6 - bl ErrorHandling + bl GF_AssertFail _022478F6: mov r0, #0x1a lsl r0, r0, #4 @@ -29011,7 +29011,7 @@ _02247930: _02247938: cmp r0, #3 blt _02247940 - bl ErrorHandling + bl GF_AssertFail _02247940: mov r0, #0x69 lsl r0, r0, #2 @@ -29048,7 +29048,7 @@ _0224797A: _02247982: cmp r0, #4 blt _0224798A - bl ErrorHandling + bl GF_AssertFail _0224798A: pop {r3, r4, r5, pc} @@ -30697,7 +30697,7 @@ MOD06_02248634: ; 0x02248634 bl AllocFromHeapAtEnd add r4, r0, #0 bne _02248644 - bl ErrorHandling + bl GF_AssertFail _02248644: add r0, r4, #0 mov r1, #0 @@ -30891,7 +30891,7 @@ _022487AC: lsr r4, r0, #0x10 cmp r4, #0x64 blo _022487C4 - bl ErrorHandling + bl GF_AssertFail _022487C4: cmp r4, #0x1e bhs _022487D2 @@ -30973,7 +30973,7 @@ MOD06_0224884C: ; 0x0224884C add r5, r0, #0 cmp r6, #4 blo _0224885C - bl ErrorHandling + bl GF_AssertFail _0224885C: add r0, r5, #0 mov r1, #0x14 @@ -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] @@ -31284,7 +31284,7 @@ CreateInGameTradeMon: ; 0x022489D4 bl MonIsShiny cmp r0, #0 beq _02248B08 - bl ErrorHandling + bl GF_AssertFail _02248B08: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -31596,7 +31596,7 @@ MOD06_02248D00: ; 0x02248D00 cmp r4, #9 blo _02248D5A _02248D56: - bl ErrorHandling + bl GF_AssertFail _02248D5A: add r0, r4, #0 add sp, #0xc @@ -31619,7 +31619,7 @@ MOD06_02248D60: ; 0x02248D60 ldrb r0, [r0] cmp r0, #5 blo _02248D84 - bl ErrorHandling + bl GF_AssertFail _02248D84: add r0, sp, #4 ldrb r0, [r0] @@ -31983,7 +31983,7 @@ MOD06_02249018: ; 0x02249018 add r4, r0, #0 cmp r4, #8 bls _02249028 - bl ErrorHandling + bl GF_AssertFail _02249028: ldr r2, _02249034 ; =0x02251738 sub r1, r4, #1 @@ -32019,7 +32019,7 @@ _0224905E: ; jump table .short _02249096 - _0224905E - 2 ; case 2 .short _0224909A - _0224905E - 2 ; case 3 _02249066: - bl ErrorHandling + bl GF_AssertFail _0224906A: bl GF_RTC_GetTimeOfDay cmp r0, #0 @@ -32286,12 +32286,12 @@ _02249244: ldr r0, [sp, #4] cmp r0, #0 bne _02249254 - bl ErrorHandling + bl GF_AssertFail _02249254: ldr r0, [sp, #4] cmp r0, #0xc bls _0224925E - bl ErrorHandling + bl GF_AssertFail _0224925E: ldr r0, [sp, #4] ldr r3, _022492A8 ; =0x0225181C @@ -32641,12 +32641,12 @@ MOD06_022494E4: ; 0x022494E4 ldr r0, [r5, r0] mov r1, #1 lsl r2, r2, #0x10 - bl FUN_020BC02C + bl NNSi_G3dModifyPolygonAttrMask mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r5, r0] add r1, r4, #0 - bl FUN_020BBA34 + bl NNS_G3dMdlSetMdlAlphaAll pop {r3, r4, r5, pc} thumb_func_start MOD06_02249508 @@ -33786,7 +33786,7 @@ _02249DD6: _02249DEC: cmp r4, #0 bne _02249DF4 - bl ErrorHandling + bl GF_AssertFail _02249DF4: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -33846,7 +33846,7 @@ _02249E40: _02249E52: cmp r4, #0 bne _02249E5A - bl ErrorHandling + bl GF_AssertFail _02249E5A: add r0, r4, #0 pop {r4, pc} @@ -34087,10 +34087,10 @@ _0224A000: ldr r0, [r4, #0x18] mov r1, #1 lsl r2, r2, #0x10 - bl FUN_020BC02C + bl NNSi_G3dModifyPolygonAttrMask ldr r0, [r4, #0x18] ldr r1, [r4, #0xc] - bl FUN_020BBA34 + bl NNS_G3dMdlSetMdlAlphaAll ldr r0, [r4, #0x14] add r1, sp, #0x30 add r2, sp, #0 @@ -34240,7 +34240,7 @@ _0224A124: mov r0, #5 pop {r3, pc} _0224A128: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -34683,7 +34683,7 @@ MOD06_0224A478: ; 0x0224A478 sub r1, r1, #1 str r1, [r0] bpl _0224A486 - bl ErrorHandling + bl GF_AssertFail _0224A486: pop {r3, pc} @@ -35048,13 +35048,13 @@ MOD06_0224A710: ; 0x0224A710 add r0, r4, #4 ldr r1, [r2, #0x18] ldr r2, [r2, #0xc] - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r4] ldr r3, [r5, #0x14] ldr r1, [r3, #0x18] ldr r2, [r3, #0xc] ldr r3, [r3, #0x10] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit ldr r1, [r5, #0x14] add r0, r4, #0 add r0, #0x18 @@ -35063,7 +35063,7 @@ MOD06_0224A710: ; 0x0224A710 add r0, r4, #0 ldr r1, [r4] add r0, #0x18 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj ldr r0, [r5, #0x18] bl FUN_02058448 str r0, [r5, #4] @@ -35108,7 +35108,7 @@ MOD06_0224A7C8: ; 0x0224A7C8 ldr r4, [r1, #0x1c] ldr r1, [r4] add r0, r4, #4 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj add r0, r4, #0 bl MOD05_021E4C00 pop {r4, pc} @@ -35970,7 +35970,7 @@ MOD06_0224AE3C: ; 0x0224AE3C sub r1, r1, #1 str r1, [r0] bpl _0224AE4A - bl ErrorHandling + bl GF_AssertFail _0224AE4A: pop {r3, pc} @@ -36429,13 +36429,13 @@ MOD06_0224B188: ; 0x0224B188 add r0, r4, #4 ldr r1, [r2, #0x18] ldr r2, [r2, #0xc] - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r4] ldr r3, [r5, #8] ldr r1, [r3, #0x18] ldr r2, [r3, #0xc] ldr r3, [r3, #0x10] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit ldr r1, [r5, #8] add r0, r4, #0 add r0, #0x18 @@ -36444,7 +36444,7 @@ MOD06_0224B188: ; 0x0224B188 add r0, r4, #0 ldr r1, [r4] add r0, #0x18 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r0, r6, #0 add r1, sp, #0 bl FUN_0206477C @@ -36464,7 +36464,7 @@ MOD06_0224B200: ; 0x0224B200 ldr r4, [r1] ldr r1, [r4] add r0, r4, #4 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj add r0, r4, #0 bl MOD05_021E4C00 pop {r4, pc} @@ -36635,13 +36635,13 @@ MOD06_0224B324: ; 0x0224B324 add r0, r4, #4 ldr r1, [r2, #0x18] ldr r2, [r2, #0xc] - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r4] ldr r3, [r5, #8] ldr r1, [r3, #0x18] ldr r2, [r3, #0xc] ldr r3, [r3, #0x10] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit ldr r1, [r5, #8] add r0, r4, #0 add r0, #0x18 @@ -36650,7 +36650,7 @@ MOD06_0224B324: ; 0x0224B324 add r0, r4, #0 ldr r1, [r4] add r0, #0x18 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r0, r6, #0 add r1, sp, #0 bl FUN_0206477C @@ -36670,7 +36670,7 @@ MOD06_0224B39C: ; 0x0224B39C ldr r4, [r1] ldr r1, [r4] add r0, r4, #4 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj add r0, r4, #0 bl MOD05_021E4C00 pop {r4, pc} @@ -38573,7 +38573,7 @@ MOD06_0224C27C: ; 0x0224C27C add sp, #0x20 pop {r4, r5, r6, pc} _0224C2E8: - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 pop {r4, r5, r6, pc} .align 2, 0 @@ -38617,14 +38617,14 @@ _0224C328: bl MOD05_021F4BD0 str r0, [sp, #0x18] ldr r0, [r6] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r1, r0, r1 ldr r1, [r1, #0xc] add r7, r0, r1 ldr r0, [sp, #0x18] ldr r0, [r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r1, r0, r1 ldr r1, [r1, #0xc] @@ -38651,7 +38651,7 @@ _0224C328: bl FUN_0204A9F0 cmp r0, #0 bne _0224C390 - bl ErrorHandling + bl GF_AssertFail _0224C390: ldr r0, [sp, #0x1c] bl MOD05_021E7EC8 @@ -38774,7 +38774,7 @@ _0224C476: mov r2, #0 bl MOD05_021DA4EC ldr r0, _0224C51C ; =0x0000048E - bl PlayBGM + bl PlaySound ldrb r0, [r4, #0xf] add r0, r0, #1 strb r0, [r4, #0xf] @@ -38865,7 +38865,7 @@ MOD06_0224C520: ; 0x0224C520 bl FUN_0204640C pop {r4, r5, r6, pc} _0224C552: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} .align 2, 0 _0224C558: .word 0x000001F2 @@ -38901,7 +38901,7 @@ _0224C590: ldr r1, [r5, #0x2c] bl MOD05_021F4BD0 ldr r0, [r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r2, sp, #0x18 mov r3, #0 @@ -38913,7 +38913,7 @@ _0224C590: bl FUN_0204A9F0 cmp r0, #0 bne _0224C5BA - bl ErrorHandling + bl GF_AssertFail _0224C5BA: ldr r0, [sp, #0x18] bl MOD05_021E7EC8 @@ -38949,7 +38949,7 @@ _0224C5EE: _0224C5FC: cmp r1, #0 bne _0224C604 - bl ErrorHandling + bl GF_AssertFail _0224C604: ldrb r2, [r4, #1] ldr r0, [r5, #0x50] @@ -39050,7 +39050,7 @@ MOD06_0224C678: ; 0x0224C678 add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} _0224C6DA: - bl ErrorHandling + bl GF_AssertFail add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop @@ -39670,7 +39670,7 @@ MOD06_0224CB90: ; 0x0224CB90 bl AllocFromHeapAtEnd add r4, r0, #0 bne _0224CBA0 - bl ErrorHandling + bl GF_AssertFail _0224CBA0: add r0, r4, #0 mov r1, #0 @@ -39722,7 +39722,7 @@ _0224CBF2: lsr r5, r0, #0x10 cmp r5, #0x10 blo _0224CC02 - bl ErrorHandling + bl GF_AssertFail _0224CC02: lsl r0, r5, #2 ldr r0, [r4, r0] @@ -39753,7 +39753,7 @@ MOD06_0224CC24: ; 0x0224CC24 ldr r0, _0224CC5C ; =0x0000FFFF cmp r1, r0 bne _0224CC40 - bl ErrorHandling + bl GF_AssertFail _0224CC40: mov r0, #0x6a mov r1, #8 @@ -39780,7 +39780,7 @@ MOD06_0224CC60: ; 0x0224CC60 lsr r4, r0, #0x10 cmp r4, #2 blo _0224CC76 - bl ErrorHandling + bl GF_AssertFail _0224CC76: cmp r4, #0 bne _0224CC80 @@ -39853,7 +39853,7 @@ _0224CCEA: str r0, [sp, #0x10] cmp r0, r1 blt _0224CD0C - bl ErrorHandling + bl GF_AssertFail _0224CD0C: lsr r2, r4, #0x1f lsl r1, r4, #0x1e @@ -40892,7 +40892,7 @@ MOD06_0224D46C: ; 0x0224D46C bl FUN_0200CCA4 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x64 mov r1, #0xb bl String_ctor @@ -41135,7 +41135,7 @@ _0224D6FE: sub r0, r4, r0 pop {r4, r5, r6, pc} _0224D702: - bl ErrorHandling + bl GF_AssertFail add r0, r4, #0 pop {r4, r5, r6, pc} .align 2, 0 @@ -41794,7 +41794,7 @@ MOD06_0224DC5C: ; 0x0224DC5C str r3, [r5, #8] add r0, r2, #0 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r5, #4] mov r0, #0x13 str r0, [sp] @@ -41813,7 +41813,7 @@ MOD06_0224DC5C: ; 0x0224DC5C bl FUN_02019064 ldr r0, [r5, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #4] mov r1, #0 mov r2, #1 @@ -41855,11 +41855,11 @@ MOD06_0224DCD8: ; 0x0224DCD8 add r6, r2, #0 cmp r0, #0 beq _0224DCEC - bl ErrorHandling + bl GF_AssertFail _0224DCEC: ldr r0, [r5, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r1, r6, #0 bl StringDup @@ -42039,7 +42039,7 @@ MOD06_0224DE60: ; 0x0224DE60 beq _0224DED2 add r0, r3, #0 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r6, #4] mov r0, #0xb str r0, [sp] @@ -42077,7 +42077,7 @@ _0224DEA8: str r0, [r6, #0xc] ldr r0, [r6, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [r6] _0224DED2: @@ -42148,7 +42148,7 @@ MOD06_0224DF1C: ; 0x0224DF1C bl BufferIntegerAsString ldr r0, [r5, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r7, #0 add r6, r5, #0 add r4, r7, #0 @@ -42214,7 +42214,7 @@ _0224DFC0: add r2, #0x14 str r0, [r5, r2] ldr r0, [sp, #0x14] - bl FUN_02018FF4 + bl AllocWindows str r0, [r5, #4] mov r0, #1 str r0, [sp] @@ -42332,7 +42332,7 @@ _0224E084: mov r1, #0 ldr r0, _0224E16C ; =MOD6_022523A0 add r2, r1, #0 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #8] ldr r0, [r5, #4] mov r1, #0 @@ -42445,7 +42445,7 @@ _0224E1C0: mov r1, #0 ldr r0, [r6, #8] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r6, #4] bl FUN_02019570 ldr r0, [r6, #4] @@ -42463,7 +42463,7 @@ MOD06_0224E1E4: ; 0x0224E1E4 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #8] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0 add r4, r0, #0 mvn r1, r1 @@ -42471,7 +42471,7 @@ MOD06_0224E1E4: ; 0x0224E1E4 bne _0224E22A ldr r0, [r5, #8] add r1, sp, #0 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId mov r2, #0x4b add r0, sp, #0 lsl r2, r2, #2 @@ -42685,7 +42685,7 @@ MOD06_0224E39C: ; 0x0224E39C ldr r0, [r4, #8] add r1, sp, #0 mov r2, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, sp, #0 ldrh r0, [r0] cmp r0, #0 @@ -42916,7 +42916,7 @@ MOD06_0224E520: ; 0x0224E520 bl Bag_TakeItem cmp r0, #1 beq _0224E550 - bl ErrorHandling + bl GF_AssertFail _0224E550: pop {r4, r5, r6, pc} .align 2, 0 @@ -42972,7 +42972,7 @@ MOD06_0224E554: ; 0x0224E554 add sp, #0x20 pop {r4, r5, r6, pc} _0224E5C0: - bl ErrorHandling + bl GF_AssertFail add sp, #0x20 pop {r4, r5, r6, pc} .align 2, 0 @@ -43012,7 +43012,7 @@ _0224E604: ldr r1, [r6, #0x2c] bl MOD05_021F4BD0 ldr r0, [r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r1, r0, r1 ldr r1, [r1, #0xc] @@ -43336,7 +43336,7 @@ _0224E8A4: add r5, r5, #1 b _0224E8AC _0224E8A8: - bl ErrorHandling + bl GF_AssertFail _0224E8AC: mov r3, #2 lsl r1, r5, #0x10 @@ -43392,7 +43392,7 @@ _0224E90C: add r5, r5, #1 b _0224E914 _0224E910: - bl ErrorHandling + bl GF_AssertFail _0224E914: mov r3, #2 lsl r1, r5, #0x10 @@ -44042,7 +44042,7 @@ MOD06_0224EDB0: ; 0x0224EDB0 add r5, r3, #0 cmp r0, #0 beq _0224EDC8 - bl ErrorHandling + bl GF_AssertFail _0224EDC8: add r0, r6, #0 add r1, sp, #0 @@ -44265,7 +44265,7 @@ _0224EF70: add r1, #0xcc cmp r2, #0x10 blt _0224EF44 - bl ErrorHandling + bl GF_AssertFail pop {r4, pc} .align 2, 0 @@ -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/06/include/module_06.h b/arm9/modules/06/include/module_06.h new file mode 100644 index 00000000..d9915f00 --- /dev/null +++ b/arm9/modules/06/include/module_06.h @@ -0,0 +1,14 @@ +#ifndef POKEDIAMOND_MODULE_06_H
+#define POKEDIAMOND_MODULE_06_H
+
+enum MartType
+{
+ MART_ITEMS = 0,
+ MART_GOODS,
+ MART_SEALS,
+ MART_DECORATIONS = MART_GOODS,
+};
+
+void MOD06_0223D3D0(struct UnkStruct_0204639C *, struct UnkSavStruct80 *, const u16 *, enum MartType, u32);
+
+#endif //POKEDIAMOND_MODULE_06_H
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 3cef2d24..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 @@ -3155,7 +3155,7 @@ _0221380C: .word 0x00000B58 thumb_func_start MOD07_02213810 MOD07_02213810: ; 0x02213810 push {r4, lr} - ldr r3, _02213830 ; =UNK_021064B8 + ldr r3, _02213830 ; =NNS_GfdDefaultFuncAllocTexVram mov r2, #0 ldr r3, [r3] blx r3 @@ -3163,18 +3163,18 @@ MOD07_02213810: ; 0x02213810 bl FUN_0201327C cmp r4, #0 bne _02213828 - bl ErrorHandling + bl GF_AssertFail _02213828: lsl r0, r4, #0x10 lsr r0, r0, #0xd pop {r4, pc} nop -_02213830: .word UNK_021064B8 +_02213830: .word NNS_GfdDefaultFuncAllocTexVram thumb_func_start MOD07_02213834 MOD07_02213834: ; 0x02213834 push {r4, lr} - ldr r3, _02213854 ; =UNK_021064C0 + ldr r3, _02213854 ; =NNS_GfdDefaultFuncAllocPlttVram mov r2, #1 ldr r3, [r3] blx r3 @@ -3182,13 +3182,13 @@ MOD07_02213834: ; 0x02213834 bl FUN_020132BC cmp r4, #0 bne _0221384C - bl ErrorHandling + bl GF_AssertFail _0221384C: lsl r0, r4, #0x10 lsr r0, r0, #0xd pop {r4, pc} nop -_02213854: .word UNK_021064C0 +_02213854: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_start MOD07_02213858 MOD07_02213858: ; 0x02213858 @@ -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] @@ -3319,7 +3319,7 @@ MOD07_02213924: ; 0x02213924 bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x10 add r4, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r2, [sp, #0x10] mov r0, #3 ldr r1, [r2, #0xc] @@ -4858,7 +4858,7 @@ _0221459E: mov r1, #0xa mov r2, #0 mov r3, #2 - bl FUN_020196F4 + bl FillWindowPixelRect lsl r0, r5, #0x10 lsr r0, r0, #0x10 str r0, [sp] @@ -4868,7 +4868,7 @@ _0221459E: mov r1, #9 mov r2, #0 mov r3, #3 - bl FUN_020196F4 + bl FillWindowPixelRect lsl r0, r5, #0x10 lsr r0, r0, #0x10 str r0, [sp] @@ -4878,7 +4878,7 @@ _0221459E: mov r1, #0xa mov r2, #0 mov r3, #5 - bl FUN_020196F4 + bl FillWindowPixelRect add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -4900,19 +4900,19 @@ MOD07_02214600: ; 0x02214600 mov r1, #0 str r2, [sp, #0xc] str r3, [sp, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 add r0, #0x20 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 add r0, #0x30 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x28] ldr r1, [sp, #8] str r0, [sp] diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index b6af83a9..a02c3f48 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -110,7 +110,7 @@ _02211F06: strh r0, [r1] b _02211F18 _02211F14: - bl ErrorHandling + bl GF_AssertFail _02211F18: ldr r2, [sp, #0x10] add r0, r5, #0 @@ -144,7 +144,7 @@ _02211F40: strh r0, [r1] b _02211F52 _02211F4E: - bl ErrorHandling + bl GF_AssertFail _02211F52: add r0, r4, #0 bl FUN_0200CAB4 @@ -162,7 +162,7 @@ MOD08_02211F5C: ; 0x02211F5C bne _02211F78 cmp r4, #0 bne _02211F74 - bl ErrorHandling + bl GF_AssertFail _02211F74: mov r0, #0 pop {r3, r4, r5, pc} @@ -187,7 +187,7 @@ _02211F78: cmp r0, #0 bne _02211FAC bne _02211FA8 - bl ErrorHandling + bl GF_AssertFail _02211FA8: mov r0, #0 pop {r3, r4, r5, pc} @@ -235,7 +235,7 @@ MOD08_02211FF0: ; 0x02211FF0 add r4, r1, #0 cmp r5, #0 bne _02211FFE - bl ErrorHandling + bl GF_AssertFail _02211FFE: str r4, [r5, #8] pop {r3, r4, r5, pc} @@ -246,7 +246,7 @@ MOD08_02212004: ; 0x02212004 push {r4, lr} add r4, r0, #0 bne _0221200E - bl ErrorHandling + bl GF_AssertFail _0221200E: ldr r0, [r4, #8] pop {r4, pc} @@ -257,7 +257,7 @@ MOD08_02212014: ; 0x02212014 push {r4, lr} add r4, r0, #0 bne _0221201E - bl ErrorHandling + bl GF_AssertFail _0221201E: ldr r0, [r4] pop {r4, pc} @@ -412,7 +412,7 @@ _02212096: ldr r0, [r0] cmp r0, #0 bne _02212148 - bl ErrorHandling + bl GF_AssertFail _02212148: ldr r0, [sp, #4] mov r5, #0 @@ -605,7 +605,7 @@ _022122A6: cmp r0, #0 bne _022122C6 bne _022122C0 - bl ErrorHandling + bl GF_AssertFail _022122C0: add sp, #0x3c mov r0, #0 @@ -737,7 +737,7 @@ MOD08_022123B0: ; 0x022123B0 cmp r0, #0 bne _022123C2 bne _022123BE - bl ErrorHandling + bl GF_AssertFail _022123BE: mov r0, #0 pop {r3, pc} @@ -891,7 +891,7 @@ MOD08_02212498: ; 0x02212498 add r4, r0, #0 cmp r5, #0xa blt _022124A6 - bl ErrorHandling + bl GF_AssertFail _022124A6: lsl r0, r5, #2 add r0, r4, r0 @@ -906,18 +906,18 @@ MOD08_022124B0: ; 0x022124B0 add r5, r0, #0 cmp r4, #0xa blt _022124BE - bl ErrorHandling + bl GF_AssertFail _022124BE: cmp r5, #0 bne _022124C6 - bl ErrorHandling + bl GF_AssertFail _022124C6: add r5, #0xdc lsl r4, r4, #2 ldr r0, [r5, r4] cmp r0, #0 bne _022124D4 - bl ErrorHandling + bl GF_AssertFail _022124D4: ldr r0, [r5, r4] pop {r3, r4, r5, pc} @@ -929,11 +929,11 @@ MOD08_022124D8: ; 0x022124D8 add r5, r0, #0 cmp r4, #5 blt _022124E6 - bl ErrorHandling + bl GF_AssertFail _022124E6: cmp r5, #0 bne _022124EE - bl ErrorHandling + bl GF_AssertFail _022124EE: mov r0, #0x4f lsl r0, r0, #2 @@ -942,7 +942,7 @@ _022124EE: ldr r0, [r5, r4] cmp r0, #0 bne _02212500 - bl ErrorHandling + bl GF_AssertFail _02212500: ldr r0, [r5, r4] pop {r3, r4, r5, pc} @@ -952,7 +952,7 @@ MOD08_02212504: ; 0x02212504 push {r4, lr} add r4, r0, #0 bne _0221250E - bl ErrorHandling + bl GF_AssertFail _0221250E: mov r0, #0x4e lsl r0, r0, #2 @@ -985,7 +985,7 @@ MOD08_0221252C: ; 0x0221252C bl AllocFromHeap add r4, r0, #0 bne _02212544 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02212544: @@ -1494,7 +1494,7 @@ _022128A4: str r1, [r0, #4] pop {r3, r4, r5, r6, r7, pc} _022128B8: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -2079,7 +2079,7 @@ _02212D04: ldr r4, [r1, r0] cmp r4, #0xff bne _02212D44 - bl ErrorHandling + bl GF_AssertFail _02212D44: sub r0, r4, #1 add sp, #0x90 @@ -2122,7 +2122,7 @@ _02212D5C: ldr r4, [r1, r0] cmp r4, #0xff bne _02212D9C - bl ErrorHandling + bl GF_AssertFail _02212D9C: add r0, r4, #0 add sp, #0x90 @@ -2369,7 +2369,7 @@ MOD08_02212F58: ; 0x02212F58 ldr r0, [r0, #0x1c] cmp r0, #0 beq _02212F7C - bl ErrorHandling + bl GF_AssertFail _02212F7C: ldr r0, [r5, #0x18] mov r2, #0 @@ -2413,7 +2413,7 @@ MOD08_02212FAC: ; 0x02212FAC ldr r0, [r0, #0x1c] cmp r0, #0 beq _02212FD2 - bl ErrorHandling + bl GF_AssertFail _02212FD2: ldr r0, [r5, #0x18] mov r1, #0x64 @@ -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] @@ -3660,7 +3660,7 @@ _02213926: ldr r0, [r6, r5] cmp r0, #0 beq _0221393A - bl ErrorHandling + bl GF_AssertFail _0221393A: mov r0, #0x15 str r7, [r6, 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} @@ -4271,7 +4271,7 @@ MOD08_02213DA8: ; 0x02213DA8 bl AllocFromHeap add r4, r0, #0 bne _02213DC0 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} _02213DC0: @@ -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 @@ -5230,7 +5230,7 @@ MOD08_02214524: ; 0x02214524 push {r4, lr} add r4, r0, #0 bne _0221452E - bl ErrorHandling + bl GF_AssertFail _0221452E: mov r0, #6 lsl r0, r0, #6 @@ -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 @@ -6523,7 +6523,7 @@ MOD08_02214ED4: ; 0x02214ED4 ldr r0, [r6, r4] cmp r0, #0 beq _02214EFC - bl ErrorHandling + bl GF_AssertFail _02214EFC: add r0, r5, #0 add r0, #0xc0 @@ -6535,7 +6535,7 @@ _02214EFC: ldr r0, [r6, r4] cmp r0, #0 bne _02214F16 - bl ErrorHandling + bl GF_AssertFail _02214F16: add r0, r5, #0 add r0, #0xc0 @@ -6953,7 +6953,7 @@ _0221521A: ldr r0, [r5, r4] cmp r0, #0 beq _0221524E - bl ErrorHandling + bl GF_AssertFail _0221524E: str r6, [r5, r4] add sp, #0x34 @@ -7009,10 +7009,10 @@ _022152A4: .word FUN_0200C644 thumb_func_start MOD08_022152A8 MOD08_022152A8: ; 0x022152A8 - ldr r3, _022152AC ; =ErrorHandling + ldr r3, _022152AC ; =GF_AssertFail bx r3 .align 2, 0 -_022152AC: .word ErrorHandling +_022152AC: .word GF_AssertFail thumb_func_start MOD08_022152B0 MOD08_022152B0: ; 0x022152B0 @@ -7234,7 +7234,7 @@ MOD08_02215434: ; 0x02215434 beq _02215456 cmp r5, r2 beq _02215452 - bl ErrorHandling + bl GF_AssertFail _02215452: mov r0, #0 pop {r3, r4, r5, pc} @@ -7964,7 +7964,7 @@ MOD08_02215988: ; 0x02215988 push {r4, lr} add r4, r0, #0 bne _02215992 - bl ErrorHandling + bl GF_AssertFail _02215992: ldr r0, [r4, #4] add r0, r4, r0 @@ -8063,7 +8063,7 @@ MOD08_02215A44: ; 0x02215A44 cmp r0, #0 ble _02215A62 bl FUN_020222AC - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera _02215A62: bl FUN_02013388 _02215A66: @@ -8072,7 +8072,7 @@ _02215A66: thumb_func_start MOD08_02215A68 MOD08_02215A68: ; 0x02215A68 push {r4, lr} - ldr r3, _02215A80 ; =UNK_021064B8 + ldr r3, _02215A80 ; =NNS_GfdDefaultFuncAllocTexVram mov r2, #0 ldr r3, [r3] blx r3 @@ -8082,12 +8082,12 @@ MOD08_02215A68: ; 0x02215A68 lsr r0, r0, #0xd pop {r4, pc} nop -_02215A80: .word UNK_021064B8 +_02215A80: .word NNS_GfdDefaultFuncAllocTexVram thumb_func_start MOD08_02215A84 MOD08_02215A84: ; 0x02215A84 push {r4, lr} - ldr r3, _02215A9C ; =UNK_021064C0 + ldr r3, _02215A9C ; =NNS_GfdDefaultFuncAllocPlttVram mov r2, #0 ldr r3, [r3] blx r3 @@ -8097,7 +8097,7 @@ MOD08_02215A84: ; 0x02215A84 lsr r0, r0, #0xd pop {r4, pc} nop -_02215A9C: .word UNK_021064C0 +_02215A9C: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_start MOD08_02215AA0 MOD08_02215AA0: ; 0x02215AA0 @@ -12531,7 +12531,7 @@ _02217BE8: ldrsh r0, [r1, r0] pop {r3, r4, r5, r6, r7, pc} _02217BF8: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -12724,7 +12724,7 @@ MOD08_02217D44: ; 0x02217D44 str r3, [sp] cmp r5, #0 bne _02217D56 - bl ErrorHandling + bl GF_AssertFail _02217D56: cmp r4, r7 bls _02217D62 @@ -12764,7 +12764,7 @@ MOD08_02217D98: ; 0x02217D98 push {r4, lr} add r4, r0, #0 bne _02217DA2 - bl ErrorHandling + bl GF_AssertFail _02217DA2: ldr r0, [r4, #4] cmp r0, #0 @@ -12792,7 +12792,7 @@ _02217DA2: ldr r2, [r4, #0xc] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02217E2C ; =UNK_020FFA38 + ldr r0, _02217E2C ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -12813,7 +12813,7 @@ _02217DA2: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _02217E2C ; =UNK_020FFA38 + ldr r0, _02217E2C ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -12834,7 +12834,7 @@ _02217E26: mov r0, #0 pop {r4, pc} nop -_02217E2C: .word UNK_020FFA38 +_02217E2C: .word FX_SinCosTable_ thumb_func_start MOD08_02217E30 MOD08_02217E30: ; 0x02217E30 @@ -12890,7 +12890,7 @@ MOD08_02217E80: ; 0x02217E80 str r2, [sp] cmp r5, #0 bne _02217E94 - bl ErrorHandling + bl GF_AssertFail _02217E94: strh r4, [r5] strh r6, [r5, #2] @@ -12924,7 +12924,7 @@ MOD08_02217ECC: ; 0x02217ECC push {r4, lr} add r4, r0, #0 bne _02217ED6 - bl ErrorHandling + bl GF_AssertFail _02217ED6: ldr r0, [r4, #4] cmp r0, #0 @@ -13037,11 +13037,11 @@ MOD08_02217F9C: ; 0x02217F9C add r4, r1, #0 cmp r5, #0 bne _02217FAA - bl ErrorHandling + bl GF_AssertFail _02217FAA: cmp r4, #0 bne _02217FB2 - bl ErrorHandling + bl GF_AssertFail _02217FB2: add r0, r5, #0 bl MOD08_02217ECC @@ -13097,7 +13097,7 @@ MOD08_02218008: ; 0x02218008 add r4, r3, #0 cmp r5, #0 bne _0221801A - bl ErrorHandling + bl GF_AssertFail _0221801A: str r6, [r5] lsl r0, r6, #0xc @@ -13119,7 +13119,7 @@ MOD08_02218030: ; 0x02218030 add r4, r3, #0 cmp r5, #0 bne _02218042 - bl ErrorHandling + bl GF_AssertFail _02218042: str r6, [r5] lsl r6, r6, #0xc @@ -13137,7 +13137,7 @@ MOD08_02218058: ; 0x02218058 push {r4, lr} add r4, r0, #0 bne _02218062 - bl ErrorHandling + bl GF_AssertFail _02218062: ldr r0, [r4, #4] cmp r0, #0 @@ -13161,7 +13161,7 @@ MOD08_02218080: ; 0x02218080 push {r4, lr} add r4, r0, #0 bne _0221808A - bl ErrorHandling + bl GF_AssertFail _0221808A: ldr r0, [r4, #4] cmp r0, #0 @@ -13201,7 +13201,7 @@ MOD08_022180C4: ; 0x022180C4 push {r4, lr} add r4, r0, #0 bne _022180CE - bl ErrorHandling + bl GF_AssertFail _022180CE: ldr r0, [r4, #4] cmp r0, #0 @@ -13221,7 +13221,7 @@ _022180CE: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _0221811C ; =UNK_020FFA38 + ldr r0, _0221811C ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -13242,7 +13242,7 @@ _02218116: mov r0, #0 pop {r4, pc} nop -_0221811C: .word UNK_020FFA38 +_0221811C: .word FX_SinCosTable_ thumb_func_start MOD08_02218120 MOD08_02218120: ; 0x02218120 @@ -13253,7 +13253,7 @@ MOD08_02218120: ; 0x02218120 add r7, r3, #0 cmp r4, #0 bne _02218132 - bl ErrorHandling + bl GF_AssertFail _02218132: ldr r0, [sp, #0x18] add r1, r6, #0 @@ -13289,7 +13289,7 @@ MOD08_02218170: ; 0x02218170 push {r4, lr} add r4, r0, #0 bne _0221817A - bl ErrorHandling + bl GF_AssertFail _0221817A: ldr r0, [r4, #4] cmp r0, #0 @@ -13325,7 +13325,7 @@ MOD08_022181A8: ; 0x022181A8 str r3, [sp] cmp r5, #0 bne _022181BA - bl ErrorHandling + bl GF_AssertFail _022181BA: ldr r0, [sp, #0x20] add r1, sp, #8 @@ -13380,7 +13380,7 @@ MOD08_02218224: ; 0x02218224 push {r4, lr} add r4, r0, #0 bne _0221822E - bl ErrorHandling + bl GF_AssertFail _0221822E: ldr r0, [r4, #4] cmp r0, #0 @@ -13602,7 +13602,7 @@ MOD08_022183C0: ; 0x022183C0 add r7, r3, #0 cmp r5, #0 bne _022183D2 - bl ErrorHandling + bl GF_AssertFail _022183D2: str r7, [r5, #4] ldr r0, [sp, #0x18] @@ -13625,7 +13625,7 @@ MOD08_022183F0: ; 0x022183F0 push {r4, lr} add r4, r0, #0 bne _022183FA - bl ErrorHandling + bl GF_AssertFail _022183FA: ldr r0, [r4, #0xc] cmp r0, #0 @@ -14094,7 +14094,7 @@ MOD08_02218740: ; 0x02218740 add r7, r3, #0 cmp r5, #0 bne _02218752 - bl ErrorHandling + bl GF_AssertFail _02218752: mov r0, #1 str r0, [r5, #8] @@ -14122,7 +14122,7 @@ MOD08_02218780: ; 0x02218780 push {r4, lr} add r4, r0, #0 bne _0221878A - bl ErrorHandling + bl GF_AssertFail _0221878A: ldr r0, [r4, #4] cmp r0, #0 @@ -14142,7 +14142,7 @@ MOD08_022187A4: ; 0x022187A4 push {r4, lr} add r4, r0, #0 bne _022187AE - bl ErrorHandling + bl GF_AssertFail _022187AE: mov r0, #0 str r0, [r4, #8] @@ -14199,7 +14199,7 @@ MOD08_022187F4: ; 0x022187F4 bl memset cmp r4, #0 bne _02218816 - bl ErrorHandling + bl GF_AssertFail _02218816: mov r2, #0x32 add r1, r4, #0 @@ -14211,7 +14211,7 @@ _02218816: str r0, [r4, #0x1c] cmp r0, #0 bne _02218830 - bl ErrorHandling + bl GF_AssertFail _02218830: mov r0, #0x62 lsl r0, r0, #4 @@ -14245,7 +14245,7 @@ MOD08_02218870: ; 0x02218870 push {r4, lr} add r4, r0, #0 bne _0221887A - bl ErrorHandling + bl GF_AssertFail _0221887A: add r0, r4, #0 bl MOD08_02218780 @@ -14264,7 +14264,7 @@ MOD08_02218894: ; 0x02218894 push {r4, lr} add r4, r0, #0 bne _0221889E - bl ErrorHandling + bl GF_AssertFail _0221889E: ldr r0, [r4, #0x1c] bl FUN_02012988 @@ -14276,7 +14276,7 @@ MOD08_022188A8: ; 0x022188A8 push {r4, lr} add r4, r0, #0 bne _022188B2 - bl ErrorHandling + bl GF_AssertFail _022188B2: add r0, r4, #0 bl MOD08_022187A4 @@ -14315,7 +14315,7 @@ MOD08_022188DC: ; 0x022188DC bl AllocFromHeap add r4, r0, #0 bne _022188F8 - bl ErrorHandling + bl GF_AssertFail _022188F8: add r0, r4, #0 mov r1, #0 @@ -14359,7 +14359,7 @@ MOD08_0221894C: ; 0x0221894C push {r4, lr} add r4, r0, #0 bne _02218956 - bl ErrorHandling + bl GF_AssertFail _02218956: add r0, r4, #0 bl MOD08_02218780 @@ -14378,7 +14378,7 @@ MOD08_02218970: ; 0x02218970 push {r4, lr} add r4, r0, #0 bne _0221897A - bl ErrorHandling + bl GF_AssertFail _0221897A: ldr r0, [r4, #0x1c] bl FUN_02012B20 @@ -14390,7 +14390,7 @@ MOD08_02218984: ; 0x02218984 push {r4, lr} add r4, r0, #0 bne _0221898E - bl ErrorHandling + bl GF_AssertFail _0221898E: add r0, r4, #0 bl MOD08_022187A4 @@ -14606,7 +14606,7 @@ MOD08_02218AF8: ; 0x02218AF8 push {r4, lr} add r4, r0, #0 bne _02218B02 - bl ErrorHandling + bl GF_AssertFail _02218B02: ldr r0, [r4] pop {r4, pc} @@ -14617,7 +14617,7 @@ MOD08_02218B08: ; 0x02218B08 push {r4, lr} add r4, r0, #0 bne _02218B12 - bl ErrorHandling + bl GF_AssertFail _02218B12: ldr r0, [r4, #4] bl FUN_0200CAB4 @@ -14636,7 +14636,7 @@ MOD08_02218B20: ; 0x02218B20 bl AllocFromHeap add r4, r0, #0 bne _02218B38 - bl ErrorHandling + bl GF_AssertFail _02218B38: str r5, [r4, #0x18] str r6, [r4, #8] @@ -15003,7 +15003,7 @@ MOD08_02218DCC: ; 0x02218DCC bl AllocFromHeap add r4, r0, #0 bne _02218DEA - bl ErrorHandling + bl GF_AssertFail _02218DEA: mov r0, #0 strb r0, [r4] @@ -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] @@ -16348,7 +16348,7 @@ _02219886: str r0, [r4, #0x28] b _022198A4 _022198A0: - bl ErrorHandling + bl GF_AssertFail _022198A4: ldr r0, [r4, #0x28] mov r1, #0 @@ -16667,7 +16667,7 @@ _02219B18: lsl r6, r6, #8 b _02219B22 _02219B1E: - bl ErrorHandling + bl GF_AssertFail _02219B22: add r0, r5, #0 mov r1, #1 @@ -17003,7 +17003,7 @@ _02219D98: str r0, [r6, #4] b _02219DA8 _02219DA4: - bl ErrorHandling + bl GF_AssertFail _02219DA8: ldr r0, [r6, #4] cmp r0, #0 @@ -18152,7 +18152,7 @@ _0221A6CA: add r6, r0, #0 b _0221A6EA _0221A6E6: - bl ErrorHandling + bl GF_AssertFail _0221A6EA: cmp r6, #0xff bne _0221A6F6 @@ -18353,7 +18353,7 @@ _0221A866: add r6, r0, #0 b _0221A886 _0221A882: - bl ErrorHandling + bl GF_AssertFail _0221A886: cmp r6, #0xff bne _0221A892 @@ -19226,7 +19226,7 @@ _0221AFC0: add r6, r0, #0 b _0221AFE0 _0221AFDC: - bl ErrorHandling + bl GF_AssertFail _0221AFE0: cmp r6, #0xff bne _0221AFEC @@ -19478,7 +19478,7 @@ _0221B1DA: str r0, [sp, #8] b _0221B1F0 _0221B1EC: - bl ErrorHandling + bl GF_AssertFail _0221B1F0: add r2, r5, #0 ldr r1, [sp, #8] @@ -19599,7 +19599,7 @@ _0221B2D8: str r0, [sp, #8] b _0221B2EE _0221B2EA: - bl ErrorHandling + bl GF_AssertFail _0221B2EE: add r2, r4, #0 ldr r1, [sp, #8] @@ -19727,7 +19727,7 @@ _0221B3DA: add r6, r0, #0 b _0221B3F0 _0221B3EC: - bl ErrorHandling + bl GF_AssertFail _0221B3F0: add r0, r5, #0 add r1, r6, #0 @@ -20004,7 +20004,7 @@ _0221B622: add r7, r0, #0 b _0221B638 _0221B634: - bl ErrorHandling + bl GF_AssertFail _0221B638: add r0, r5, #0 mov r1, #1 @@ -20139,7 +20139,7 @@ _0221B744: add r4, r0, #0 b _0221B758 _0221B754: - bl ErrorHandling + bl GF_AssertFail _0221B758: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -20834,7 +20834,7 @@ _0221BCEE: ldr r0, [r4, #0x38] cmp r0, #0 bne _0221BCF8 - bl ErrorHandling + bl GF_AssertFail _0221BCF8: pop {r3, r4, r5, pc} nop @@ -21182,7 +21182,7 @@ _0221BFBE: ldr r0, [r4, #0x38] cmp r0, #0 bne _0221BFCA - bl ErrorHandling + bl GF_AssertFail _0221BFCA: ldr r1, [r4, #0x14] add r0, r5, #0 @@ -23309,7 +23309,7 @@ MOD08_0221D0EC: ; 0x0221D0EC bl AllocFromHeap add r4, r0, #0 bne _0221D10A - bl ErrorHandling + bl GF_AssertFail _0221D10A: mov r0, #0 strb r0, [r4, #4] @@ -28315,7 +28315,7 @@ MOD08_0221FA44: ; 0x0221FA44 bl AllocFromHeap add r4, r0, #0 bne _0221FA62 - bl ErrorHandling + bl GF_AssertFail _0221FA62: mov r0, #0 strb r0, [r4, #4] @@ -28769,7 +28769,7 @@ MOD08_0221FDE4: ; 0x0221FDE4 bl AllocFromHeap add r4, r0, #0 bne _0221FE02 - bl ErrorHandling + bl GF_AssertFail _0221FE02: mov r0, #0 strb r0, [r4, #7] @@ -29234,7 +29234,7 @@ MOD08_02220180: ; 0x02220180 bl AllocFromHeap add r4, r0, #0 bne _0222019E - bl ErrorHandling + bl GF_AssertFail _0222019E: mov r0, #0 strb r0, [r4, #1] @@ -36026,7 +36026,7 @@ _02223A38: add sp, #8 pop {r3, pc} _02223A50: - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, pc} @@ -36292,7 +36292,7 @@ _02223C50: add sp, #8 pop {r3, pc} _02223C6A: - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, pc} .align 2, 0 @@ -38351,7 +38351,7 @@ _02224CA6: mul r0, r1 asr r0, r0, #4 lsl r0, r0, #2 - ldr r1, _02224D70 ; =UNK_020FFA38 + ldr r1, _02224D70 ; =FX_SinCosTable_ str r0, [sp, #0x18] add r1, r1, r0 mov r0, #2 @@ -38371,7 +38371,7 @@ _02224CA6: lsl r0, r1, #4 asr r6, r0, #0x10 mov r2, #3 - ldr r1, _02224D70 ; =UNK_020FFA38 + ldr r1, _02224D70 ; =FX_SinCosTable_ ldr r0, [sp, #0x18] lsl r2, r2, #0x10 ldrsh r0, [r1, r0] @@ -38437,7 +38437,7 @@ _02224D50: pop {r3, r4, r5, r6, r7, pc} nop _02224D6C: .word 0x00001555 -_02224D70: .word UNK_020FFA38 +_02224D70: .word FX_SinCosTable_ _02224D74: .word 0x00000000 _02224D78: .word MOD08_02224AF4 @@ -39693,7 +39693,7 @@ _022257C6: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222586C ; =UNK_020FFA38 + ldr r0, _0222586C ; =FX_SinCosTable_ ldr r3, [r6, #0x14] ldrsh r0, [r0, r1] lsl r2, r2, #0xc @@ -39762,7 +39762,7 @@ _02225852: add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop -_0222586C: .word UNK_020FFA38 +_0222586C: .word FX_SinCosTable_ _02225870: .word 0x00000132 _02225874: .word 0x00000000 _02225878: .word 0x00003FFF @@ -40033,7 +40033,7 @@ MOD08_02225A70: ; 0x02225A70 lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02225B30 ; =UNK_020FFA38 + ldr r0, _02225B30 ; =FX_SinCosTable_ lsl r2, r2, #0xc ldrsh r0, [r0, r1] mov r3, #0 @@ -40096,7 +40096,7 @@ _02225B2A: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_02225B30: .word UNK_020FFA38 +_02225B30: .word FX_SinCosTable_ _02225B34: .word 0x00000000 _02225B38: .word 0x45800000 @@ -40407,7 +40407,7 @@ _02225D8C: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02225E0C ; =UNK_020FFA38 + ldr r0, _02225E0C ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -40459,7 +40459,7 @@ _02225E02: pop {r4, r5, r6, r7, pc} nop _02225E08: .word 0x00000199 -_02225E0C: .word UNK_020FFA38 +_02225E0C: .word FX_SinCosTable_ _02225E10: .word 0x00000000 thumb_func_start MOD08_02225E14 @@ -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 @@ -43300,7 +43300,7 @@ _02227514: add r4, r4, #1 cmp r4, #4 blt _022274D0 - bl ErrorHandling + bl GF_AssertFail add r0, r5, #0 _02227520: pop {r4, r5, r6, pc} @@ -43343,7 +43343,7 @@ _02227556: mov r0, #4 pop {r3, pc} _0222755A: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -43450,7 +43450,7 @@ _02227616: mov r5, #7 b _0222761E _0222761A: - bl ErrorHandling + bl GF_AssertFail _0222761E: mov r0, #0x12 lsl r0, r0, #4 @@ -44755,7 +44755,7 @@ MOD08_02228064: ; 0x02228064 add r5, r1, #0 cmp r4, #0 bne _02228072 - bl ErrorHandling + bl GF_AssertFail _02228072: add r0, r4, #0 bl MOD08_02212014 @@ -44763,7 +44763,7 @@ _02228072: bl AllocFromHeap add r4, r0, #0 bne _02228086 - bl ErrorHandling + bl GF_AssertFail _02228086: add r0, r4, #0 mov r1, #0 @@ -44777,7 +44777,7 @@ MOD08_02228094: ; 0x02228094 push {r4, lr} add r4, r0, #0 bne _0222809E - bl ErrorHandling + bl GF_AssertFail _0222809E: add r0, r4, #0 bl FreeToHeap @@ -44989,7 +44989,7 @@ MOD08_022281F4: ; 0x022281F4 bl AllocFromHeap cmp r0, #0 bne _0222820A - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} _0222820A: @@ -45047,7 +45047,7 @@ MOD08_02228244: ; 0x02228244 ldr r0, [r0] cmp r0, #0xd blt _02228272 - bl ErrorHandling + bl GF_AssertFail _02228272: add r0, r4, #0 add r0, #0x9c @@ -45146,7 +45146,7 @@ _022282F8: ldr r0, [r0, #0x14] cmp r0, #0 beq _02228332 - bl ErrorHandling + bl GF_AssertFail _02228332: add r0, r4, #0 add r0, #0x8c @@ -45165,7 +45165,7 @@ _02228332: ldr r0, [r0, #0x14] cmp r0, #0 bne _0222835A - bl ErrorHandling + bl GF_AssertFail _0222835A: ldr r0, [r6] add r0, r0, #1 @@ -45215,7 +45215,7 @@ _02228384: ldr r0, [r0, #0x14] cmp r0, #0 beq _022283BE - bl ErrorHandling + bl GF_AssertFail _022283BE: add r0, r4, #0 add r0, #0x8c @@ -45234,7 +45234,7 @@ _022283BE: ldr r0, [r0, #0x14] cmp r0, #0 bne _022283E6 - bl ErrorHandling + bl GF_AssertFail _022283E6: ldr r0, [r6] add r0, r0, #1 @@ -45284,7 +45284,7 @@ _02228410: ldr r0, [r0, #0x14] cmp r0, #0 beq _0222844A - bl ErrorHandling + bl GF_AssertFail _0222844A: add r0, r4, #0 add r0, #0x8c @@ -45303,7 +45303,7 @@ _0222844A: ldr r0, [r0, #0x14] cmp r0, #0 bne _02228472 - bl ErrorHandling + bl GF_AssertFail _02228472: ldr r0, [r6] add r0, r0, #1 @@ -45353,7 +45353,7 @@ _0222849C: ldr r0, [r0, #0x14] cmp r0, #0 beq _022284D6 - bl ErrorHandling + bl GF_AssertFail _022284D6: add r0, r4, #0 add r0, #0x8c @@ -45372,7 +45372,7 @@ _022284D6: ldr r0, [r0, #0x14] cmp r0, #0 bne _022284FE - bl ErrorHandling + bl GF_AssertFail _022284FE: ldr r0, [r6] add r0, r0, #1 @@ -45485,7 +45485,7 @@ MOD08_022285BC: ; 0x022285BC mov r7, #0 cmp r0, #9 ble _022285CE - bl ErrorHandling + bl GF_AssertFail _022285CE: ldr r0, [r6, #0x10] mov r4, #0 @@ -45612,7 +45612,7 @@ _022286AC: bl AllocFromHeap add r4, r0, #0 bne _022286BC - bl ErrorHandling + bl GF_AssertFail _022286BC: str r7, [r4] ldr r0, [r6, #4] @@ -45629,7 +45629,7 @@ _022286BC: str r0, [r4, #0x14] cmp r0, #0 bne _022286DE - bl ErrorHandling + bl GF_AssertFail _022286DE: ldr r0, [r4, #0x14] bl MOD08_0222A078 @@ -45856,7 +45856,7 @@ MOD08_02228880: ; 0x02228880 bl AllocFromHeap add r4, r0, #0 bne _02228894 - bl ErrorHandling + bl GF_AssertFail _02228894: ldmia r5!, {r0, r1} add r2, r4, #0 @@ -46681,7 +46681,7 @@ _02228E64: ldr r0, [r5, #0x18] cmp r0, #3 blt _02228E6E - bl ErrorHandling + bl GF_AssertFail _02228E6E: ldr r0, [r5, #8] add r0, r0, #1 @@ -48093,7 +48093,7 @@ MOD08_02229918: ; 0x02229918 bl MI_CpuFill8 cmp r4, #0 bne _02229936 - bl ErrorHandling + bl GF_AssertFail _02229936: add r3, r4, #0 add r3, #0x90 @@ -48184,7 +48184,7 @@ MOD08_022299E8: ; 0x022299E8 push {r4, lr} add r4, r0, #0 bne _022299F2 - bl ErrorHandling + bl GF_AssertFail _022299F2: ldr r0, [r4, #0x1c] cmp r0, #0 @@ -48200,7 +48200,7 @@ MOD08_02229A00: ; 0x02229A00 push {r4, lr} add r4, r0, #0 bne _02229A0A - bl ErrorHandling + bl GF_AssertFail _02229A0A: ldr r0, [r4, #0x28] cmp r0, #0 @@ -48233,7 +48233,7 @@ MOD08_02229A2C: ; 0x02229A2C push {r4, lr} add r4, r0, #0 bne _02229A36 - bl ErrorHandling + bl GF_AssertFail _02229A36: add r0, r4, #0 add r0, #0xac @@ -48276,7 +48276,7 @@ MOD08_02229A80: ; 0x02229A80 push {r4, lr} add r4, r0, #0 bne _02229A8A - bl ErrorHandling + bl GF_AssertFail _02229A8A: add r4, #0x98 ldr r0, [r4] @@ -49118,7 +49118,7 @@ MOD08_0222A0D4: ; 0x0222A0D4 bl AllocFromHeap add r4, r0, #0 bne _0222A0EC - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} _0222A0EC: @@ -49172,7 +49172,7 @@ _0222A138: _0222A140: cmp r4, #0 bne _0222A148 - bl ErrorHandling + bl GF_AssertFail _0222A148: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -49234,7 +49234,7 @@ MOD08_0222A1A0: ; 0x0222A1A0 bl AllocFromHeap add r4, r0, #0 bne _0222A1B8 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} _0222A1B8: @@ -49346,7 +49346,7 @@ _0222A26C: sub r0, r5, #5 cmp r0, #0x16 blo _0222A284 - bl ErrorHandling + bl GF_AssertFail add sp, #0x58 mov r0, #0 pop {r3, r4, r5, pc} diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 55a90a71..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] @@ -2185,7 +2185,7 @@ MOD09_02212F8C: ; 0x02212F8C bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x10 add r4, r0, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData ldr r1, [sp, #0x10] add r0, r5, #0 add r1, #0xc @@ -2199,7 +2199,7 @@ MOD09_02212F8C: ; 0x02212F8C bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x10 add r4, r0, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData ldr r1, [sp, #0x10] add r0, r5, #0 add r1, #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 @@ -3409,7 +3409,7 @@ _02213976: bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0xc add r7, r0, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData mov r0, #0 str r0, [sp] mov r0, #0x20 @@ -3922,7 +3922,7 @@ _02213D74: ldr r0, [r4] ldrb r1, [r4, r1] ldr r0, [r0, #0xc] - bl FUN_02018FF4 + bl AllocWindows ldr r1, _02213DDC ; =0x00002070 mov r5, #0 str r0, [r4, r1] @@ -4150,7 +4150,7 @@ _02213F22: bl NewString_ReadMsgData add r6, r0, #0 add r0, r5, r4 - bl FUN_0201AB0C + bl GetWindowWidth str r0, [sp, #0x28] mov r0, #0 add r1, r6, #0 @@ -4196,7 +4196,7 @@ _02213FA6: bl NewString_ReadMsgData add r6, r0, #0 add r0, r5, r4 - bl FUN_0201AB0C + bl GetWindowWidth str r0, [sp, #0x2c] mov r0, #0 add r1, r6, #0 @@ -4419,7 +4419,7 @@ _0221415E: add r0, r0, r5 lsr r1, r1, #0x18 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, [sp, #0x14] add r3, r6, #2 str r0, [sp] @@ -4432,7 +4432,7 @@ _0221415E: add r0, r0, r5 add r1, r7, #0 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, [sp, #0x14] ldr r1, [sp, #0x10] str r0, [sp] @@ -4447,7 +4447,7 @@ _0221415E: add r0, r0, r5 lsr r1, r1, #0x18 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _022141D4 ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 @@ -4623,7 +4623,7 @@ MOD09_022142FC: ; 0x022142FC cmp r0, #2 bne _02214360 add r0, r4, r6 - bl FUN_0201AB0C + bl GetWindowWidth add r5, r0, #0 add r0, sp, #0x20 ldrh r0, [r0, #0x10] @@ -4718,7 +4718,7 @@ MOD09_022143F8: ; 0x022143F8 ldr r0, _02214450 ; =0x00002050 mov r1, #0xf add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02214454 ; =0x00001FA8 add r1, r5, #0 ldr r0, [r4, r0] @@ -4766,7 +4766,7 @@ MOD09_0221445C: ; 0x0221445C bl FUN_02002E14 add r6, r0, #0 add r0, r5, r4 - bl FUN_0201AB0C + bl GetWindowWidth add r3, r0, #0 mov r0, #6 str r0, [sp] @@ -4944,7 +4944,7 @@ _022145F4: ldr r0, [r5, r0] lsl r4, r6, #4 add r0, r0, r4 - bl FUN_0201AB0C + bl GetWindowWidth add r6, r0, #0 mov r0, #0 ldr r1, [sp, #0x10] @@ -5070,7 +5070,7 @@ MOD09_02214694: ; 0x02214694 ldr r0, _02214780 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r7 lsl r0, r0, #0x18 @@ -5179,7 +5179,7 @@ MOD09_02214790: ; 0x02214790 ldr r0, _0221487C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r7 lsl r0, r0, #0x18 @@ -5289,7 +5289,7 @@ MOD09_0221488C: ; 0x0221488C ldr r0, _0221497C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r7 lsl r0, r0, #0x18 @@ -5401,7 +5401,7 @@ MOD09_0221498C: ; 0x0221498C ldr r0, [r4, r0] lsl r5, r5, #4 add r0, r0, r5 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r7 lsl r0, r0, #0x18 @@ -5513,7 +5513,7 @@ MOD09_02214A8C: ; 0x02214A8C ldr r0, [r4, r0] lsl r5, r5, #4 add r0, r0, r5 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r7 lsl r0, r0, #0x18 @@ -5602,7 +5602,7 @@ MOD09_02214B8C: ; 0x02214B8C ldr r0, _02214D14 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_0201AB0C + bl GetWindowWidth lsl r1, r0, #3 ldr r0, [sp, #0x14] ldr r2, [sp, #0x10] @@ -5843,7 +5843,7 @@ MOD09_02214DE8: ; 0x02214DE8 lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r4, r6 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r5 lsl r0, r0, #0x10 @@ -5893,7 +5893,7 @@ _02214E42: lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r4, r6 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r5 lsl r0, r0, #0x10 @@ -5979,7 +5979,7 @@ MOD09_02214F18: ; 0x02214F18 lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r4, r6 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r5 lsl r0, r0, #0x10 @@ -6029,7 +6029,7 @@ _02214F72: lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r4, r6 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r5 lsl r0, r0, #0x10 @@ -6166,7 +6166,7 @@ MOD09_022150C8: ; 0x022150C8 lsl r0, r0, #0x10 lsr r6, r0, #0x10 add r0, r5, r4 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r1, r0, r6 lsr r0, r1, #0x1f @@ -6275,7 +6275,7 @@ MOD09_022151A8: ; 0x022151A8 bl FUN_02002E14 str r0, [sp, #0x1c] add r0, r4, r6 - bl FUN_0201AB0C + bl GetWindowWidth lsl r1, r0, #3 ldr r0, [sp, #0x1c] ldr r2, [sp, #0x18] @@ -6461,7 +6461,7 @@ _02215362: _02215368: add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _022153A8 ; =0x00001FA8 mov r1, #0x3c ldr r0, [r4, r0] @@ -6673,7 +6673,7 @@ MOD09_022154FC: ; 0x022154FC mov r1, #0 lsr r2, r2, #0x10 mov r3, #0x18 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _022155C4 ; =0x00001FA8 mov r1, #0x2c ldr r0, [r5, r0] @@ -6748,7 +6748,7 @@ _022155EE: ldr r0, [sp, #8] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r0, [r6, #8] cmp r0, #0 beq _0221563E @@ -6828,7 +6828,7 @@ MOD09_0221567C: ; 0x0221567C add r0, r0, r4 mov r2, #0x38 mov r3, #0x20 - bl FUN_020196F4 + bl FillWindowPixelRect mov r2, #0x40 str r2, [sp] mov r0, #8 @@ -6838,7 +6838,7 @@ MOD09_0221567C: ; 0x0221567C ldr r0, [r5, r0] mov r3, #0x18 add r0, r0, r4 - bl FUN_020196F4 + bl FillWindowPixelRect mov r0, #0x20 str r0, [sp] add r0, r5, #0 @@ -6884,22 +6884,22 @@ MOD09_022156FC: ; 0x022156FC ldr r0, _02215780 ; =0x00002070 mov r1, #0 ldr r0, [r4, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215780 ; =0x00002070 mov r1, #0 ldr r0, [r4, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215780 ; =0x00002070 mov r1, #0 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215780 ; =0x00002070 mov r1, #0 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4] add r0, r4, #0 ldrb r1, [r1, #0x11] @@ -7030,7 +7030,7 @@ _02215830: mov r4, #8 _02215840: ldr r0, [sp, #0x18] - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r6 sub r0, r0, r7 @@ -7122,7 +7122,7 @@ MOD09_022158EC: ; 0x022158EC lsl r0, r6, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #1 lsl r0, r0, #4 str r0, [sp, #0x18] @@ -7131,7 +7131,7 @@ MOD09_022158EC: ; 0x022158EC ldr r0, [sp, #0x18] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #2 lsl r0, r0, #4 str r0, [sp, #0x14] @@ -7140,7 +7140,7 @@ MOD09_022158EC: ; 0x022158EC ldr r0, [sp, #0x14] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #3 lsl r0, r0, #4 str r0, [sp, #0x10] @@ -7149,7 +7149,7 @@ MOD09_022158EC: ; 0x022158EC ldr r0, [sp, #0x10] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #4 lsl r0, r0, #4 str r0, [sp, #0xc] @@ -7158,12 +7158,12 @@ MOD09_022158EC: ; 0x022158EC ldr r0, [sp, #0xc] add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215A20 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 str r2, [sp] str r2, [sp, #4] @@ -7269,63 +7269,63 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #5 lsl r0, r0, #6 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xe0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xf0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #1 lsl r0, r0, #8 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #0x11 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #0x12 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xd0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] mov r0, #0x15 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] lsl r0, r4, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7333,7 +7333,7 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7341,7 +7341,7 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7349,28 +7349,28 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #5 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #6 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #7 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7378,7 +7378,7 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #0 @@ -7386,35 +7386,35 @@ MOD09_02215A2C: ; 0x02215A2C lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #4 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #1 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #2 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215C40 ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #3 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 str r2, [sp] str r2, [sp, #4] @@ -7502,68 +7502,68 @@ MOD09_02215C44: ; 0x02215C44 mul r4, r1 add r0, #0x60 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x70 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x80 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x90 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xa0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #1 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] lsl r0, r4, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #2 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #3 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #5 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215D9C ; =0x00002070 ldr r1, [r5, r0] add r0, r4, #4 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5] add r2, r5, #0 ldrb r3, [r0, #0x11] @@ -7652,32 +7652,32 @@ MOD09_02215DA8: ; 0x02215DA8 ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02215EC4 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -7785,62 +7785,62 @@ MOD09_02215ED0: ; 0x02215ED0 ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x60 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x70 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x90 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xa0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x80 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216090 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0xb0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -7983,27 +7983,27 @@ MOD09_0221609C: ; 0x0221609C ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216184 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -8112,37 +8112,37 @@ MOD09_022161B0: ; 0x022161B0 ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02216304 ; =0x00002070 mov r1, #0 ldr r0, [r5, r0] add r0, #0x60 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -8275,7 +8275,7 @@ MOD09_02216314: ; 0x02216314 ldr r0, _02216338 ; =0x00002060 mov r1, #0xf add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl MOD09_0221633C pop {r4, pc} @@ -11816,7 +11816,7 @@ _0221803C: lsl r1, r1, #4 add r0, r0, r1 add r1, r7, #0 - bl FUN_0201A8C8 + bl ScrollWindow ldr r1, _022180B0 ; =0x00002070 ldr r0, [r5, r1] add r1, r1, #5 @@ -11839,7 +11839,7 @@ _02218072: add r0, r1, r0 ldr r2, [sp] add r1, r7, #0 - bl FUN_0201A8C8 + bl ScrollWindow ldr r0, _022180B0 ; =0x00002070 ldr r1, [r5, r0] ldrb r0, [r6, r4] @@ -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] @@ -14010,7 +14010,7 @@ MOD09_022191C0: ; 0x022191C0 bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x10 add r4, r0, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData ldr r1, [sp, #0x10] add r0, r5, #0 add r1, #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 @@ -14355,7 +14355,7 @@ _022194C6: add r1, #0x30 ldrb r1, [r1] ldr r0, [r0, #0xc] - bl FUN_02018FF4 + bl AllocWindows str r0, [r5, #0x2c] add r0, r5, #0 add r0, #0x30 @@ -14450,7 +14450,7 @@ MOD09_02219560: ; 0x02219560 bl FUN_02002E14 add r7, r0, #0 add r0, r5, r4 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r7 lsr r3, r0, #1 @@ -14486,7 +14486,7 @@ _022195C4: ldr r0, [r5, #0x2c] add r1, r7, #0 add r0, r0, r4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, #0x10 cmp r6, #5 @@ -14588,7 +14588,7 @@ MOD09_02219694: ; 0x02219694 add r0, r4, r6 mov r1, #0 str r2, [sp, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02219730 ; =0x0000114D lsl r7, r7, #2 ldrb r1, [r5, r0] @@ -14626,7 +14626,7 @@ MOD09_02219694: ; 0x02219694 bl FUN_02002E14 add r7, r0, #0 add r0, r4, r6 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r7 lsr r3, r0, #1 @@ -14664,7 +14664,7 @@ MOD09_02219738: ; 0x02219738 add r0, r4, r7 mov r1, #0 str r2, [sp, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _022197C4 ; =0x0000114D lsl r6, r6, #2 ldrb r1, [r5, r0] @@ -14827,7 +14827,7 @@ MOD09_02219884: ; 0x02219884 lsl r0, r0, #4 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x10] mov r1, #0x1c ldr r4, [r5, #0x2c] @@ -14841,7 +14841,7 @@ MOD09_02219884: ; 0x02219884 mov r0, #0x19 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r0, r0, r7 lsr r6, r0, #1 @@ -14962,7 +14962,7 @@ MOD09_022199B4: ; 0x022199B4 lsl r0, r0, #6 add r0, r1, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02219A6C ; =0x0000114D ldrb r0, [r4, r0] cmp r0, #3 @@ -15089,7 +15089,7 @@ MOD09_02219A8C: ; 0x02219A8C bl StringExpandPlaceholders add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -15170,7 +15170,7 @@ _02219B6C: ldr r0, [r5, #0x2c] add r1, r7, #0 add r0, r0, r4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, #0x10 cmp r6, #4 @@ -15230,7 +15230,7 @@ MOD09_02219BE0: ; 0x02219BE0 add r0, r4, #0 add r0, #0x1c mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl MOD09_02219C08 pop {r4, pc} @@ -16913,7 +16913,7 @@ _0221A93C: ldr r1, [sp] add r2, r7, #0 mov r3, #0 - bl FUN_0201A8C8 + bl ScrollWindow ldrb r0, [r4, r5] ldr r1, [r6, #0x2c] lsl r0, r0, #4 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 32981b60..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] @@ -633,7 +633,7 @@ _0222D99A: bl FUN_02019064 ldr r0, [r5, #8] mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] mov r1, #0 mov r2, #1 @@ -746,7 +746,7 @@ MOD11_0222DB50: ; 0x0222DB50 str r0, [r4, #4] mov r0, #5 mov r1, #3 - bl FUN_02018FF4 + bl AllocWindows mov r7, #0x73 str r0, [r4, #8] mov r6, #0 @@ -795,7 +795,7 @@ _0222DC42: bl FUN_02019064 ldr r0, [r4, #8] mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #8] mov r1, #0 mov r2, #1 @@ -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] @@ -1898,7 +1898,7 @@ _0222E532: ldr r0, [r0, r1] cmp r0, #0 bne _0222E67E - bl ErrorHandling + bl GF_AssertFail _0222E67E: ldr r5, [sp, #4] mov r0, #0 @@ -3061,14 +3061,14 @@ _0222EFD8: .word FUN_020223BC thumb_func_start MOD11_0222EFDC MOD11_0222EFDC: ; 0x0222EFDC push {r3, r4, r5, lr} - ldr r3, _0222F014 ; =UNK_021064B8 + ldr r3, _0222F014 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0222F018 ; =UNK_021064C0 + ldr r3, _0222F018 ; =NNS_GfdDefaultFuncAllocPlttVram mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -3078,17 +3078,17 @@ MOD11_0222EFDC: ; 0x0222EFDC add r5, r0, #0 cmp r4, #0 bne _0222F004 - bl ErrorHandling + bl GF_AssertFail _0222F004: cmp r5, #0 bne _0222F00C - bl ErrorHandling + bl GF_AssertFail _0222F00C: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_0222F014: .word UNK_021064B8 -_0222F018: .word UNK_021064C0 +_0222F014: .word NNS_GfdDefaultFuncAllocTexVram +_0222F018: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_start MOD11_0222F01C MOD11_0222F01C: ; 0x0222F01C diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 62996375..451daa87 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -45,7 +45,7 @@ MOD11_0222F29C: ; 0x0222F29C str r0, [r5, #4] mov r0, #5 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r5, #8] add r0, r5, #0 bl FUN_0206BFF0 @@ -186,7 +186,7 @@ _0222F30E: bl FUN_02019064 ldr r0, [r5, #8] mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] mov r1, #0 mov r2, #1 @@ -2073,7 +2073,7 @@ _02230250: ldr r0, [r6, #0x44] cmp r4, r0 blt _0223025A - bl ErrorHandling + bl GF_AssertFail _0223025A: add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -3553,7 +3553,7 @@ MOD11_02230DE0: ; 0x02230DE0 ldr r0, [r4, #0x30] cmp r0, #0 bne _02230DEE - bl ErrorHandling + bl GF_AssertFail _02230DEE: ldr r1, [r4, #0x30] add r0, r4, #0 @@ -4278,7 +4278,7 @@ MOD11_022312DC: ; 0x022312DC add r4, r0, #0 cmp r5, #4 blt _022312EA - bl ErrorHandling + bl GF_AssertFail _022312EA: lsl r0, r5, #4 ldr r0, [r4, r0] @@ -4292,7 +4292,7 @@ MOD11_022312F0: ; 0x022312F0 add r6, r2, #0 cmp r4, #4 blt _02231300 - bl ErrorHandling + bl GF_AssertFail _02231300: lsl r0, r4, #4 add r0, r5, r0 @@ -4307,7 +4307,7 @@ MOD11_02231308: ; 0x02231308 add r6, r2, #0 cmp r4, #4 blt _02231318 - bl ErrorHandling + bl GF_AssertFail _02231318: lsl r0, r4, #4 add r0, r5, r0 @@ -4322,7 +4322,7 @@ MOD11_02231320: ; 0x02231320 add r6, r2, #0 cmp r4, #4 blt _02231330 - bl ErrorHandling + bl GF_AssertFail _02231330: lsl r0, r4, #4 add r0, r5, r0 @@ -4559,7 +4559,7 @@ MOD11_022314B0: ; 0x022314B0 add r5, r0, #0 cmp r4, #0xf blo _022314BE - bl ErrorHandling + bl GF_AssertFail _022314BE: ldr r1, _022314D0 ; =0x000023FB mov r0, #0xe0 @@ -4854,7 +4854,7 @@ _022316CC: add r4, r0, #0 add r0, r6, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x28] str r3, [sp] @@ -4892,7 +4892,7 @@ _02231708: add r4, r0, #0 add r0, r6, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x28] str r3, [sp] @@ -4917,7 +4917,7 @@ _0223174C: bl GetTrainerMessageByIdPair add r0, r6, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x28] str r3, [sp] @@ -4962,7 +4962,7 @@ MOD11_0223178C: ; 0x0223178C bl MOD11_022321EC add r0, r7, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] ldr r0, _022317DC ; =MOD11_0223220C @@ -5000,7 +5000,7 @@ MOD11_022317E0: ; 0x022317E0 beq _02231814 add r0, r4, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer _02231814: ldr r1, [sp, #0x28] mov r0, #2 @@ -5292,7 +5292,7 @@ _02231A22: strh r0, [r4, #2] pop {r4, r5, r6, pc} _02231A46: - bl ErrorHandling + bl GF_AssertFail _02231A4A: pop {r4, r5, r6, pc} @@ -6036,7 +6036,7 @@ _02232086: bl MOD11_022320C8 pop {r3, r4, r5, pc} _022320C2: - bl ErrorHandling + bl GF_AssertFail _022320C6: pop {r3, r4, r5, pc} @@ -6258,7 +6258,7 @@ _02232234: b _02232252 _0223223C: ldr r0, _02232258 ; =0x00000484 - bl PlayBGM + bl PlaySound b _02232252 _02232244: ldr r0, _0223225C ; =0x000005E6 @@ -6266,7 +6266,7 @@ _02232244: b _02232252 _0223224C: ldr r0, _02232260 ; =0x00000483 - bl PlayBGM + bl PlaySound _02232252: add r0, r4, #0 pop {r4, pc} @@ -9941,7 +9941,7 @@ _02233F10: str r0, [r4] b _02233F42 _02233F1A: - bl ErrorHandling + bl GF_AssertFail b _02233F42 _02233F20: ldr r0, [r4] @@ -9962,7 +9962,7 @@ _02233F36: str r0, [r4] b _02233F42 _02233F3E: - bl ErrorHandling + bl GF_AssertFail _02233F42: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -10847,7 +10847,7 @@ _0223461C: str r0, [sp, #0xc] b _02234648 _02234626: - bl ErrorHandling + bl GF_AssertFail b _02234648 _0223462C: sub r0, r0, r4 @@ -10865,7 +10865,7 @@ _0223463E: str r0, [sp, #0xc] b _02234648 _02234644: - bl ErrorHandling + bl GF_AssertFail _02234648: cmp r6, #0x1a bne _0223465E @@ -11207,7 +11207,7 @@ _022348E8: str r0, [r4] b _022348F6 _022348F2: - bl ErrorHandling + bl GF_AssertFail _022348F6: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -11368,7 +11368,7 @@ _02234A18: str r0, [sp, #0xc] b _02234A26 _02234A22: - bl ErrorHandling + bl GF_AssertFail _02234A26: cmp r5, #0x11 beq _02234A56 @@ -20606,7 +20606,7 @@ _02239324: ldr r0, [sp, #0xc] cmp r0, #0xa blt _0223932E - bl ErrorHandling + bl GF_AssertFail _0223932E: bl LCRandom mov r1, #0x64 @@ -21264,7 +21264,7 @@ _02239872: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _0223987E: - bl ErrorHandling + bl GF_AssertFail _02239882: ldr r0, _022398B0 ; =0x00002D90 add r1, r5, r6 @@ -21323,7 +21323,7 @@ _022398E6: _022398F0: cmp r4, #0 bne _022398F8 - bl ErrorHandling + bl GF_AssertFail _022398F8: bl LCRandom mov r1, #0x64 @@ -23862,7 +23862,7 @@ _0223AC50: bl FUN_02019064 add r0, r5, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 mov r1, #0 mov r2, #1 @@ -23987,7 +23987,7 @@ _0223ADBA: mov r2, #0x50 mov r3, #0 add r7, r0, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 str r1, [sp, #0x4c] add r5, sp, #0xb0 @@ -28099,7 +28099,7 @@ _0223CF5C: add r0, r6, #0 bl String_dtor add r0, sp, #0x68 - bl FUN_0201901C + bl InitWindow mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -36327,7 +36327,7 @@ _02240F28: ldr r0, [r4, r0] cmp r0, #0 blt _02240F4A - bl ErrorHandling + bl GF_AssertFail _02240F4A: ldr r1, [r4, #0x64] add r0, r5, #0 @@ -40690,7 +40690,7 @@ MOD11_022431DC: ; 0x022431DC lsl r1, r1, #6 cmp r0, r1 blo _022431F8 - bl ErrorHandling + bl GF_AssertFail _022431F8: add r0, r5, #0 add r0, #0xac @@ -40723,14 +40723,14 @@ MOD11_0224321C: ; 0x0224321C lsl r1, r1, #6 cmp r0, r1 blo _02243238 - bl ErrorHandling + bl GF_AssertFail _02243238: add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] cmp r0, #4 blt _02243246 - bl ErrorHandling + bl GF_AssertFail _02243246: add r1, r5, #0 add r1, #0xb8 @@ -40861,7 +40861,7 @@ _0224332C: _02243334: cmp r3, #0x10 blt _0224333C - bl ErrorHandling + bl GF_AssertFail _0224333C: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -40874,7 +40874,7 @@ MOD11_02243340: ; 0x02243340 str r2, [sp] add r4, r3, #0 bne _02243350 - bl ErrorHandling + bl GF_AssertFail _02243350: ldr r0, [sp] lsl r6, r5, #6 @@ -40904,7 +40904,7 @@ _02243376: _0224337E: cmp r2, #0x10 blt _02243386 - bl ErrorHandling + bl GF_AssertFail _02243386: pop {r3, r4, r5, r6, r7, pc} @@ -41520,7 +41520,7 @@ _0224378A: bl MOD11_02243420 pop {r4, r5, r6, pc} _02243794: - bl ErrorHandling + bl GF_AssertFail _02243798: mov r0, #0 pop {r4, r5, r6, pc} @@ -41821,7 +41821,7 @@ _022439A8: strb r1, [r0] pop {r4, r5, r6, pc} _022439B4: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _022439BA: ldrb r0, [r3] @@ -42357,7 +42357,7 @@ _02243D94: bl MOD11_0224379C pop {r4, r5, r6, pc} _02243D9E: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} .align 2, 0 _02243DA4: .word 0xF7FFFFFF @@ -42968,7 +42968,7 @@ _022441E8: str r0, [r4, #0x28] pop {r4, r5, r6, pc} _02244200: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} nop _02244208: .word 0xFFFFFC1F @@ -44124,7 +44124,7 @@ _02244AEA: _02244AF4: cmp r6, #0 bne _02244AFC - bl ErrorHandling + bl GF_AssertFail _02244AFC: bl LCRandom mov r1, #0x64 @@ -44193,7 +44193,7 @@ _02244B72: _02244B7C: cmp r7, #0 bne _02244B84 - bl ErrorHandling + bl GF_AssertFail _02244B84: bl LCRandom mov r1, #0x64 @@ -57811,7 +57811,7 @@ MOD11_0224B310: ; 0x0224B310 cmp r0, #1 beq _0224B334 bhi _0224B334 - bl ErrorHandling + bl GF_AssertFail _0224B334: add r0, sp, #0x90 ldrb r0, [r0, #0x1c] @@ -58063,7 +58063,7 @@ _0224B558: ldr r0, [r5, r0] cmp r0, #0xa bge _0224B564 - bl ErrorHandling + bl GF_AssertFail _0224B564: ldr r0, _0224B75C ; =0x00002158 mov r1, #0xa @@ -60136,7 +60136,7 @@ _0224C51E: ldr r0, [r1, r0] pop {r4, pc} _0224C528: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} .align 2, 0 @@ -60219,7 +60219,7 @@ _0224C5C2: strb r4, [r1, r0] pop {r3, r4, r5, pc} _0224C5CA: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 _0224C5D0: .word 0xFFFF8FFF @@ -60275,7 +60275,7 @@ _0224C628: _0224C62E: cmp r4, #0x91 blo _0224C636 - bl ErrorHandling + bl GF_AssertFail _0224C636: ldr r0, _0224C644 ; =MOD11_0225E4C8 lsl r1, r4, #2 @@ -60450,7 +60450,7 @@ _0224C756: ldrb r4, [r1, r0] b _0224C76A _0224C766: - bl ErrorHandling + bl GF_AssertFail _0224C76A: mov r0, #0xc0 mul r0, r6 @@ -62294,7 +62294,7 @@ MOD11_0224D518: ; 0x0224D518 bl MOD11_0222FF6C add r6, r0, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 bl FUN_02019548 mov r1, #0x65 @@ -64173,7 +64173,7 @@ MOD11_0224E410: ; 0x0224E410 add r5, r2, #0 cmp r0, #0 bne _0224E422 - bl ErrorHandling + bl GF_AssertFail _0224E422: add r4, r6, #0 add r4, #0x28 @@ -64241,7 +64241,7 @@ MOD11_0224E49C: ; 0x0224E49C add r5, r2, #0 cmp r0, #0 bne _0224E4AE - bl ErrorHandling + bl GF_AssertFail _0224E4AE: add r4, r6, #0 add r4, #0x28 @@ -64552,7 +64552,7 @@ MOD11_0224E6FC: ; 0x0224E6FC add r4, r2, #0 cmp r0, #0 bne _0224E70E - bl ErrorHandling + bl GF_AssertFail _0224E70E: ldrb r1, [r4, #1] add r0, r5, #0 @@ -69424,7 +69424,7 @@ _02250EB6: bl MOD11_02258820 b _02250EC8 _02250EC4: - bl ErrorHandling + bl GF_AssertFail _02250EC8: add r0, r6, #0 bl MOD11_02258E30 @@ -69807,7 +69807,7 @@ _022511FA: bl FUN_02033590 cmp r0, #0 beq _02251206 - bl ErrorHandling + bl GF_AssertFail _02251206: ldrb r1, [r6, #0x1d] ldr r0, [r6] @@ -70085,7 +70085,7 @@ MOD11_02251420: ; 0x02251420 add r4, r0, #1 cmp r4, #5 blt _02251442 - bl ErrorHandling + bl GF_AssertFail _02251442: ldrb r1, [r5, #0xd] ldr r0, [r5] @@ -71657,7 +71657,7 @@ _022520D2: bl MOD11_0222FF6C add r6, r0, #0 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 bl FUN_02019548 ldr r0, [r4] @@ -72340,7 +72340,7 @@ _02252664: bl MOD11_02258820 b _02252676 _02252672: - bl ErrorHandling + bl GF_AssertFail _02252676: mov r0, #2 add sp, #0x2c @@ -74388,7 +74388,7 @@ MOD11_022536D4: ; 0x022536D4 ldr r0, [r0] cmp r0, #0 beq _022536EE - bl ErrorHandling + bl GF_AssertFail _022536EE: ldrb r2, [r4, #0xd] ldr r0, [r4] @@ -74423,7 +74423,7 @@ MOD11_02253720: ; 0x02253720 ldr r0, [r0] cmp r0, #0 bne _02253734 - bl ErrorHandling + bl GF_AssertFail _02253734: ldr r0, [r4, #4] add r0, #0x8c @@ -81452,7 +81452,7 @@ MOD11_02256D70: ; 0x02256D70 add r4, r2, #0 cmp r0, #0 bne _02256D82 - bl ErrorHandling + bl GF_AssertFail _02256D82: add r0, r5, #0 add r0, #0x25 @@ -82159,7 +82159,7 @@ MOD11_022572C8: ; 0x022572C8 add r7, r2, #0 cmp r0, #0 bne _022572DA - bl ErrorHandling + bl GF_AssertFail _022572DA: add r0, r5, #0 add r0, #0x25 @@ -82211,12 +82211,12 @@ MOD11_02257334: ; 0x02257334 add r5, r1, #0 cmp r4, #0 bne _02257342 - bl ErrorHandling + bl GF_AssertFail _02257342: ldr r0, [r4, #4] cmp r0, #0 bne _0225734C - bl ErrorHandling + bl GF_AssertFail _0225734C: add r0, r4, #0 add r0, #0x4f @@ -83788,7 +83788,7 @@ _02257FB4: mov r0, #5 pop {r3, pc} _02257FB8: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -83834,7 +83834,7 @@ _02257FFA: ldr r0, _02258020 ; =MOD11_0225EBB8 pop {r3, pc} _02257FFE: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -83873,7 +83873,7 @@ _0225804A: mov r0, #0 pop {r3, pc} _0225804E: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} nop @@ -84339,7 +84339,7 @@ MOD11_022583D8: ; 0x022583D8 strb r7, [r5, #9] cmp r7, #0xc blt _022583FE - bl ErrorHandling + bl GF_AssertFail mov r0, #0 strb r0, [r5, #9] _022583FE: @@ -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 @@ -84986,7 +84986,7 @@ MOD11_02258958: ; 0x02258958 cmp r0, #0 beq _02258974 _02258970: - bl ErrorHandling + bl GF_AssertFail _02258974: ldr r0, [sp, #0x14] ldr r0, [r0] @@ -85108,7 +85108,7 @@ _02258A12: ldr r0, [r0, #4] cmp r0, #0 beq _02258A82 - bl ErrorHandling + bl GF_AssertFail _02258A82: ldr r0, _02258AFC ; =MOD11_02258BE0 ldr r1, [sp, #0x14] @@ -85179,7 +85179,7 @@ MOD11_02258B10: ; 0x02258B10 cmp r0, #0 bne _02258B28 _02258B24: - bl ErrorHandling + bl GF_AssertFail _02258B28: ldr r0, [r6] bl MOD11_02230078 @@ -85519,7 +85519,7 @@ MOD11_02258DD0: ; 0x02258DD0 cmp r0, #0 bne _02258DE8 _02258DE4: - bl ErrorHandling + bl GF_AssertFail _02258DE8: ldr r7, _02258E28 ; =0x000005D4 mov r6, #0 @@ -85569,7 +85569,7 @@ MOD11_02258E30: ; 0x02258E30 cmp r0, #0 bne _02258E48 _02258E44: - bl ErrorHandling + bl GF_AssertFail _02258E48: ldr r7, _02258E70 ; =0x000005D4 mov r4, #0 @@ -85602,7 +85602,7 @@ MOD11_02258E74: ; 0x02258E74 sub r0, r6, #1 cmp r1, r0 bne _02258E88 - bl ErrorHandling + bl GF_AssertFail _02258E88: ldr r0, _02258F4C ; =0x0000069F ldr r3, _02258F50 ; =MOD11_0225FAAC @@ -85625,7 +85625,7 @@ _02258EA8: ldr r0, [r4, #0x18] cmp r0, #0 bne _02258EB2 - bl ErrorHandling + bl GF_AssertFail _02258EB2: ldr r0, [r5] bl MOD11_0222FF74 @@ -85833,7 +85833,7 @@ _02259020: mov r0, #0xb pop {r3, pc} _02259024: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -86090,7 +86090,7 @@ MOD11_0225916C: ; 0x0225916C bl FUN_02015F34 cmp r0, #1 beq _02259232 - bl ErrorHandling + bl GF_AssertFail _02259232: ldr r0, _0225926C ; =MOD11_0225B538 add r1, r4, #0 @@ -86503,7 +86503,7 @@ MOD11_022595C8: ; 0x022595C8 add r6, r5, #0 add r6, #0x18 bne _022595D8 - bl ErrorHandling + bl GF_AssertFail _022595D8: ldrb r1, [r6, #0x10] ldr r0, _02259854 ; =0x0000069E @@ -88010,7 +88010,7 @@ _0225A286: ldr r0, [r1, r0] cmp r0, #0 beq _0225A296 - bl ErrorHandling + bl GF_AssertFail _0225A296: lsl r0, r5, #2 add r1, r4, r0 @@ -88018,7 +88018,7 @@ _0225A296: ldr r0, [r1, r0] cmp r0, #0 beq _0225A2A6 - bl ErrorHandling + bl GF_AssertFail _0225A2A6: cmp r6, #5 bhi _0225A2CE @@ -88045,7 +88045,7 @@ _0225A2CA: ldr r6, _0225A3E0 ; =0x00004E42 b _0225A2D8 _0225A2CE: - bl ErrorHandling + bl GF_AssertFail add sp, #0x50 mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -88255,7 +88255,7 @@ MOD11_0225A458: ; 0x0225A458 ldr r4, [sp, #0xa8] cmp r0, #0 beq _0225A472 - bl ErrorHandling + bl GF_AssertFail _0225A472: ldr r0, [r7] bl MOD11_02230080 @@ -88280,7 +88280,7 @@ _0225A49C: cmp r4, #0 bne _0225A4DA add r0, sp, #0x3c - bl FUN_0201901C + bl InitWindow mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -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] @@ -88914,7 +88914,7 @@ MOD11_0225A968: ; 0x0225A968 bl FUN_02019178 _0225A994: add r0, r4, #0 - bl FUN_0201901C + bl InitWindow ldr r0, [r5] bl MOD11_0222FF68 mov r1, #0 @@ -88981,7 +88981,7 @@ _0225AA14: ldr r0, [r1, r0] cmp r0, #0 beq _0225AA24 - bl ErrorHandling + bl GF_AssertFail _0225AA24: ldr r0, [sp, #4] lsl r1, r4, #1 @@ -89425,7 +89425,7 @@ MOD11_0225AD80: ; 0x0225AD80 ldr r0, [r4, #8] cmp r0, #0 beq _0225AD90 - bl ErrorHandling + bl GF_AssertFail _0225AD90: mov r0, #0x6b lsl r0, r0, #4 @@ -92883,7 +92883,7 @@ MOD11_0225C784: ; 0x0225C784 ldrb r0, [r4, r0] cmp r0, #2 blo _0225C7B0 - bl ErrorHandling + bl GF_AssertFail _0225C7B0: ldr r1, _0225C7E4 ; =0x000006FC add r0, r4, #0 @@ -93175,7 +93175,7 @@ MOD11_0225C9F0: ; 0x0225C9F0 ldr r0, [r4, #4] cmp r0, #0 beq _0225C9FE - bl ErrorHandling + bl GF_AssertFail _0225C9FE: add r0, r4, #0 bl FreeToHeap @@ -93264,7 +93264,7 @@ MOD11_0225CA90: ; 0x0225CA90 add r7, r2, #0 cmp r6, #0 bne _0225CAA0 - bl ErrorHandling + bl GF_AssertFail _0225CAA0: add r0, r6, #0 add r1, r4, #0 @@ -93347,7 +93347,7 @@ MOD11_0225CB10: ; 0x0225CB10 _0225CB2A: cmp r1, #0 bne _0225CB32 - bl ErrorHandling + bl GF_AssertFail _0225CB32: add r0, r5, #0 mov r1, #0 @@ -93508,7 +93508,7 @@ MOD11_0225CC68: ; 0x0225CC68 cmp r0, #0 beq _0225CC7E _0225CC7A: - bl ErrorHandling + bl GF_AssertFail _0225CC7E: mov r0, #0 strb r0, [r5, #0x1a] @@ -93682,7 +93682,7 @@ MOD11_0225CDB0: ; 0x0225CDB0 _0225CDCC: cmp r1, #0 bne _0225CDD4 - bl ErrorHandling + bl GF_AssertFail _0225CDD4: add r0, r5, #0 mov r1, #0 @@ -94193,7 +94193,7 @@ MOD11_0225D1A8: ; 0x0225D1A8 cmp r0, #0 beq _0225D1C2 _0225D1BE: - bl ErrorHandling + bl GF_AssertFail _0225D1C2: add r0, r5, #0 mov r1, #0 diff --git a/arm9/modules/11/src/module_11_sinit.c b/arm9/modules/11/src/module_11_sinit.c index 977c4fde..8bf5f6f6 100644 --- a/arm9/modules/11/src/module_11_sinit.c +++ b/arm9/modules/11/src/module_11_sinit.c @@ -1,8 +1,9 @@ #include "global.h" #include "poke_overlay.h" #include "FS_overlay.h" +#include "unk_02031734.h" + -extern u32 FUN_02033590(void); FS_EXTERN_OVERLAY(MODULE_16); THUMB_FUNC static void MOD11_0222F284(void) diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index f717789a..effb333a 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -744,14 +744,14 @@ MOD12_0222DC80: ; 0x0222DC80 thumb_func_start MOD12_0222DCAC MOD12_0222DCAC: ; 0x0222DCAC push {r3, r4, r5, lr} - ldr r3, _0222DCE4 ; =UNK_021064B8 + ldr r3, _0222DCE4 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0222DCE8 ; =UNK_021064C0 + ldr r3, _0222DCE8 ; =NNS_GfdDefaultFuncAllocPlttVram mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -761,17 +761,17 @@ MOD12_0222DCAC: ; 0x0222DCAC add r5, r0, #0 cmp r4, #0 bne _0222DCD4 - bl ErrorHandling + bl GF_AssertFail _0222DCD4: cmp r5, #0 bne _0222DCDC - bl ErrorHandling + bl GF_AssertFail _0222DCDC: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_0222DCE4: .word UNK_021064B8 -_0222DCE8: .word UNK_021064C0 +_0222DCE4: .word NNS_GfdDefaultFuncAllocTexVram +_0222DCE8: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_start MOD12_0222DCEC MOD12_0222DCEC: ; 0x0222DCEC @@ -780,7 +780,7 @@ MOD12_0222DCEC: ; 0x0222DCEC ldr r0, [r4] cmp r0, #0 bne _0222DCFA - bl ErrorHandling + bl GF_AssertFail _0222DCFA: ldr r1, _0222DD1C ; =0x00000172 mov r0, #0 @@ -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 @@ -3999,14 +3999,14 @@ MOD12_0222F6B4: ; 0x0222F6B4 thumb_func_start MOD12_0222F6E0 MOD12_0222F6E0: ; 0x0222F6E0 push {r3, r4, r5, lr} - ldr r3, _0222F718 ; =UNK_021064B8 + ldr r3, _0222F718 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0222F71C ; =UNK_021064C0 + ldr r3, _0222F71C ; =NNS_GfdDefaultFuncAllocPlttVram mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -4016,17 +4016,17 @@ MOD12_0222F6E0: ; 0x0222F6E0 add r5, r0, #0 cmp r4, #0 bne _0222F708 - bl ErrorHandling + bl GF_AssertFail _0222F708: cmp r5, #0 bne _0222F710 - bl ErrorHandling + bl GF_AssertFail _0222F710: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_0222F718: .word UNK_021064B8 -_0222F71C: .word UNK_021064C0 +_0222F718: .word NNS_GfdDefaultFuncAllocTexVram +_0222F71C: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_start MOD12_0222F720 MOD12_0222F720: ; 0x0222F720 @@ -4035,7 +4035,7 @@ MOD12_0222F720: ; 0x0222F720 ldr r0, [r4] cmp r0, #0 bne _0222F72E - bl ErrorHandling + bl GF_AssertFail _0222F72E: mov r3, #0 mov r0, #3 @@ -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 @@ -5408,7 +5408,7 @@ MOD12_0223023C: ; 0x0223023C bl FUN_020133C8 cmp r0, #0 beq _02230254 - bl ErrorHandling + bl GF_AssertFail _02230254: add r0, r4, #0 bl MOD12_02230A40 @@ -5945,7 +5945,7 @@ MOD12_022306F8: ; 0x022306F8 ldr r0, [r5] cmp r0, #0 bne _02230706 - bl ErrorHandling + bl GF_AssertFail _02230706: mov r4, #0xad lsl r4, r4, #4 @@ -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] @@ -6292,7 +6292,7 @@ MOD12_022309D8: ; 0x022309D8 ldr r0, [r4, #0xc] cmp r0, #0 beq _022309E8 - bl ErrorHandling + bl GF_AssertFail _022309E8: mov r1, #0x12 mov r0, #0x17 @@ -6350,7 +6350,7 @@ MOD12_02230A40: ; 0x02230A40 thumb_func_start MOD12_02230A60 MOD12_02230A60: ; 0x02230A60 push {r4, lr} - ldr r3, _02230A78 ; =UNK_021064B8 + ldr r3, _02230A78 ; =NNS_GfdDefaultFuncAllocTexVram mov r2, #0 ldr r3, [r3] blx r3 @@ -6360,12 +6360,12 @@ MOD12_02230A60: ; 0x02230A60 lsr r0, r0, #0xd pop {r4, pc} nop -_02230A78: .word UNK_021064B8 +_02230A78: .word NNS_GfdDefaultFuncAllocTexVram thumb_func_start MOD12_02230A7C MOD12_02230A7C: ; 0x02230A7C push {r4, lr} - ldr r3, _02230A94 ; =UNK_021064C0 + ldr r3, _02230A94 ; =NNS_GfdDefaultFuncAllocPlttVram mov r2, #0 ldr r3, [r3] blx r3 @@ -6375,7 +6375,7 @@ MOD12_02230A7C: ; 0x02230A7C lsr r0, r0, #0xd pop {r4, pc} nop -_02230A94: .word UNK_021064C0 +_02230A94: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_start MOD12_02230A98 MOD12_02230A98: ; 0x02230A98 @@ -7568,7 +7568,7 @@ MOD12_02231380: ; 0x02231380 add r6, r6, #1 _022313B0: add r0, sp, #0x34 - bl FUN_0201901C + bl InitWindow mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -7947,7 +7947,7 @@ _022316A6: mov r6, #0x69 b _022316B2 _022316AA: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} _022316B2: @@ -8241,7 +8241,7 @@ MOD12_022318DC: ; 0x022318DC ldr r0, [r4] cmp r0, #0 bne _022318EA - bl ErrorHandling + bl GF_AssertFail _022318EA: ldr r0, [r4] bl FUN_0200CAB4 @@ -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] @@ -8711,7 +8711,7 @@ MOD12_02231C80: ; 0x02231C80 sub r0, r6, #1 cmp r1, r0 bne _02231C96 - bl ErrorHandling + bl GF_AssertFail _02231C96: mov r0, #0x2e lsl r0, r0, #4 @@ -8730,7 +8730,7 @@ _02231CB0: ldr r0, [r4, #0x18] cmp r0, #0 bne _02231CBA - bl ErrorHandling + bl GF_AssertFail _02231CBA: ldr r0, [r4, #0x14] bl FUN_02020988 @@ -9148,7 +9148,7 @@ _02231FC0: ldrb r0, [r6, r0] cmp r0, #0xff beq _02232000 - bl ErrorHandling + bl GF_AssertFail _02232000: ldr r0, _022320A0 ; =0x000002E1 strb r4, [r6, r0] @@ -9181,7 +9181,7 @@ _02232030: str r0, [sp, #0x1c] cmp r0, #6 ble _02232040 - bl ErrorHandling + bl GF_AssertFail _02232040: mov r0, #0x18 mul r0, r4 @@ -9201,7 +9201,7 @@ _02232054: ldr r0, [r1, r0] cmp r0, #0 beq _02232066 - bl ErrorHandling + bl GF_AssertFail _02232066: ldr r0, [sp, #0x20] ldr r3, _022320BC ; =MOD12_02244E50 @@ -9516,7 +9516,7 @@ MOD12_022322C0: ; 0x022322C0 ldr r4, [sp, #0xa8] cmp r0, #0 beq _022322DA - bl ErrorHandling + bl GF_AssertFail _022322DA: ldr r1, [r7, #4] cmp r4, #0 @@ -9540,7 +9540,7 @@ _022322FE: cmp r4, #0 bne _0223233C add r0, sp, #0x3c - bl FUN_0201901C + bl InitWindow mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -9759,7 +9759,7 @@ _0223249A: ldr r0, [r1, r0] cmp r0, #0 beq _022324AC - bl ErrorHandling + bl GF_AssertFail _022324AC: lsl r0, r4, #1 ldrh r0, [r7, r0] @@ -9989,7 +9989,7 @@ MOD12_02232654: ; 0x02232654 ldr r0, [r4, #0x10] cmp r0, #0 beq _02232664 - bl ErrorHandling + bl GF_AssertFail _02232664: mov r0, #0xb9 lsl r0, r0, #2 @@ -10516,7 +10516,7 @@ MOD12_02232A68: ; 0x02232A68 ldr r0, [r4, #0x14] cmp r0, #0 beq _02232A78 - bl ErrorHandling + bl GF_AssertFail _02232A78: mov r0, #0xc1 lsl r0, r0, #2 @@ -10928,7 +10928,7 @@ MOD12_02232D7C: ; 0x02232D7C bl FUN_02019178 _02232DA8: add r0, r4, #0 - bl FUN_0201901C + bl InitWindow mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -12081,7 +12081,7 @@ MOD12_0223361C: ; 0x0223361C ldrb r0, [r4, #0xb] cmp r0, #0 beq _0223362A - bl ErrorHandling + bl GF_AssertFail _0223362A: ldr r0, [r4, #4] bl FUN_0200CAB4 @@ -12174,7 +12174,7 @@ MOD12_022336AC: ; 0x022336AC ldr r0, [r0, #0x58] cmp r0, #0 bne _022336D4 - bl ErrorHandling + bl GF_AssertFail _022336D4: add r2, r5, #0 add r2, #0x58 @@ -12256,7 +12256,7 @@ _02233772: ldr r0, [r7, #0x58] cmp r0, #0 beq _0223377C - bl ErrorHandling + bl GF_AssertFail _0223377C: mov r1, #0x32 mov r0, #0x15 @@ -12322,7 +12322,7 @@ _022337E6: ldr r0, [r0] cmp r0, #0 beq _0223380C - bl ErrorHandling + bl GF_AssertFail _0223380C: mov r1, #0x32 mov r0, #0x15 @@ -12802,7 +12802,7 @@ MOD12_02233BBC: ; 0x02233BBC ldr r0, [r4, r0] cmp r0, #0 bne _02233BCE - bl ErrorHandling + bl GF_AssertFail _02233BCE: mov r0, #0x5f lsl r0, r0, #2 @@ -12826,7 +12826,7 @@ MOD12_02233BE4: ; 0x02233BE4 add r5, r2, #0 cmp r0, #0 bne _02233BFA - bl ErrorHandling + bl GF_AssertFail _02233BFA: ldr r1, _02233C60 ; =MOD12_02245200 lsl r2, r6, #2 @@ -12893,7 +12893,7 @@ MOD12_02233C74: ; 0x02233C74 ldr r0, [r4, r0] cmp r0, #0 bne _02233C86 - bl ErrorHandling + bl GF_AssertFail _02233C86: mov r0, #0x5f lsl r0, r0, #2 @@ -13217,7 +13217,7 @@ MOD12_02233EEC: ; 0x02233EEC add r4, r1, #0 cmp r0, #0 beq _02233F00 - bl ErrorHandling + bl GF_AssertFail _02233F00: mov r0, #1 str r0, [sp] @@ -14137,7 +14137,7 @@ MOD12_02234628: ; 0x02234628 str r0, [sp, #4] cmp r0, #5 ble _02234644 - bl ErrorHandling + bl GF_AssertFail _02234644: ldr r0, [sp] mov r1, #0x14 @@ -14681,7 +14681,7 @@ MOD12_02234A60: ; 0x02234A60 blt _02234A78 cmp r5, #0 bne _02234A78 - bl ErrorHandling + bl GF_AssertFail _02234A78: cmp r7, #0x1c bls _02234A7E @@ -15213,7 +15213,7 @@ _02234ECC: add sp, #8 pop {r3, r4, r5, r6, r7, pc} _02234EF2: - bl ErrorHandling + bl GF_AssertFail _02234EF6: add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -15225,7 +15225,7 @@ MOD12_02234EFC: ; 0x02234EFC add r4, r0, #0 add r0, #0x34 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0x34 add r0, r4, #0 bl CopyWindowToVram @@ -15275,7 +15275,7 @@ _02234F42: add r0, r5, #0 add r0, #0x34 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -15317,7 +15317,7 @@ MOD12_02234FB0: ; 0x02234FB0 add r6, r3, #0 cmp r5, #0x2f blo _02234FC4 - bl ErrorHandling + bl GF_AssertFail _02234FC4: ldr r0, _02234FE4 ; =MOD12_0224540C + 3 lsl r3, r5, #2 @@ -15734,11 +15734,11 @@ _022352D6: ldr r4, [r0, r1] cmp r4, #0 bge _022352E4 - bl ErrorHandling + bl GF_AssertFail _022352E4: cmp r4, #0x7f ble _022352EC - bl ErrorHandling + bl GF_AssertFail _022352EC: add r0, r4, #0 pop {r4, pc} @@ -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 @@ -24466,13 +24466,13 @@ _02239404: ldrh r0, [r0] cmp r0, #0 bne _02239428 - bl ErrorHandling + bl GF_AssertFail _02239428: ldr r0, [sp, #0x58] ldrb r0, [r0] cmp r0, #3 blo _02239434 - bl ErrorHandling + bl GF_AssertFail _02239434: add sp, #0x44 pop {r4, r5, r6, r7, pc} @@ -25164,7 +25164,7 @@ MOD12_02239838: ; 0x02239838 ldr r0, [r0, #0x48] cmp r0, #0 beq _02239872 - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _02239858: bl FUN_02007534 @@ -25390,7 +25390,7 @@ MOD12_02239A10: ; 0x02239A10 add r4, r1, #0 cmp r0, #0 beq _02239A22 - bl ErrorHandling + bl GF_AssertFail _02239A22: mov r1, #0x30 ldr r2, [r5] @@ -25442,7 +25442,7 @@ MOD12_02239A6C: ; 0x02239A6C beq _02239A82 cmp r6, #0 bne _02239A82 - bl ErrorHandling + bl GF_AssertFail _02239A82: cmp r4, #0 beq _02239ACC @@ -25477,7 +25477,7 @@ _02239A82: add sp, #8 pop {r4, r5, r6, pc} _02239AC8: - bl ErrorHandling + bl GF_AssertFail _02239ACC: add sp, #8 pop {r4, r5, r6, pc} @@ -25518,7 +25518,7 @@ _02239AF4: add r0, r5, #0 add r0, #0x34 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -25547,7 +25547,7 @@ MOD12_02239B48: ; 0x02239B48 add r4, r2, #0 cmp r5, #0xf blo _02239B5A - bl ErrorHandling + bl GF_AssertFail _02239B5A: str r4, [sp] ldr r2, _02239B74 ; =MOD12_02245F48 @@ -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 @@ -27277,7 +27277,7 @@ _0223A886: ldr r0, [r0, #0x24] cmp r0, #0 bne _0223A892 - bl ErrorHandling + bl GF_AssertFail _0223A892: ldr r0, [r4] mov r1, #0 @@ -27863,7 +27863,7 @@ _0223AD20: ldr r0, [r0, #0x24] cmp r0, #0 bne _0223AD2C - bl ErrorHandling + bl GF_AssertFail _0223AD2C: ldrb r0, [r4, #0xf] add r0, r0, #1 @@ -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] @@ -29305,7 +29305,7 @@ MOD12_0223B878: ; 0x0223B878 sub r0, #0x97 cmp r1, r0 bne _0223B88A - bl ErrorHandling + bl GF_AssertFail _0223B88A: mov r0, #0x96 ldrsb r1, [r5, r0] @@ -29323,7 +29323,7 @@ _0223B8A2: ldr r0, [r4, #0x18] cmp r0, #0 bne _0223B8AC - bl ErrorHandling + bl GF_AssertFail _0223B8AC: ldr r0, [r4, #0x14] bl FUN_02020988 @@ -29881,7 +29881,7 @@ MOD12_0223BCD8: ; 0x0223BCD8 ldr r4, [sp, #0x9c] cmp r0, #0 beq _0223BCF0 - bl ErrorHandling + bl GF_AssertFail _0223BCF0: ldr r0, [sp, #0x18] mov r2, #0 @@ -29905,7 +29905,7 @@ _0223BCF0: add r6, r6, #1 _0223BD1C: add r0, sp, #0x38 - bl FUN_0201901C + bl InitWindow mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -30080,7 +30080,7 @@ MOD12_0223BE64: ; 0x0223BE64 ldr r0, [r4, #0xc] cmp r0, #0 beq _0223BE74 - bl ErrorHandling + bl GF_AssertFail _0223BE74: add r0, r4, #0 add r0, #0x98 @@ -30605,7 +30605,7 @@ _0223C252: ldr r0, [r0] cmp r0, #0 beq _0223C262 - bl ErrorHandling + bl GF_AssertFail _0223C262: add r4, r4, #1 _0223C264: @@ -31107,7 +31107,7 @@ _0223C618: add r2, r2, #4 cmp r0, #0x44 blt _0223C602 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 add sp, #0x34 pop {r4, r5, r6, r7, pc} @@ -33052,7 +33052,7 @@ _0223D532: mvn r4, r4 cmp r0, r4 bne _0223D540 - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _0223D540: strb r3, [r1, r0] @@ -33295,7 +33295,7 @@ _0223D6DA: add r7, r0, #0 b _0223D70C _0223D708: - bl ErrorHandling + bl GF_AssertFail _0223D70C: cmp r7, #1 bne _0223D750 @@ -33988,7 +33988,7 @@ MOD12_0223DC28: ; 0x0223DC28 str r2, [sp] cmp r0, #0 beq _0223DC46 - bl ErrorHandling + bl GF_AssertFail _0223DC46: ldr r0, _0223DCB0 ; =0x0000106C mov r2, #0x28 @@ -34173,7 +34173,7 @@ _0223DD92: strb r0, [r2, r3] pop {r3, r4, r5, pc} _0223DDA4: - bl ErrorHandling + bl GF_AssertFail _0223DDA8: pop {r3, r4, r5, pc} nop @@ -34549,7 +34549,7 @@ MOD12_0223E068: ; 0x0223E068 beq _0223E07E cmp r5, #0 bne _0223E07E - bl ErrorHandling + bl GF_AssertFail _0223E07E: cmp r6, #6 bls _0223E084 @@ -34722,7 +34722,7 @@ _0223E16A: add sp, #8 pop {r4, r5, r6, pc} _0223E1E4: - bl ErrorHandling + bl GF_AssertFail _0223E1E8: add sp, #8 pop {r4, r5, r6, pc} @@ -34767,7 +34767,7 @@ _0223E210: add r0, r5, #0 add r0, #0x78 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -34799,7 +34799,7 @@ MOD12_0223E274: ; 0x0223E274 add r6, r2, #0 cmp r4, #8 blo _0223E286 - bl ErrorHandling + bl GF_AssertFail _0223E286: lsl r3, r4, #2 ldr r2, _0223E2A0 ; =MOD12_02246224 @@ -34891,7 +34891,7 @@ MOD12_0223E32C: ; 0x0223E32C ldr r0, [r5, r0] cmp r0, #0 beq _0223E33E - bl ErrorHandling + bl GF_AssertFail _0223E33E: mov r0, #0x17 mov r1, #0x10 @@ -35065,7 +35065,7 @@ MOD12_0223E488: ; 0x0223E488 add r7, r2, #0 cmp r4, #8 blo _0223E49A - bl ErrorHandling + bl GF_AssertFail _0223E49A: ldr r0, _0223E51C ; =0x00001BF1 ldrb r0, [r5, r0] @@ -35104,7 +35104,7 @@ _0223E49A: add r0, r5, #0 add r0, #0x88 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -35570,7 +35570,7 @@ MOD12_0223E868: ; 0x0223E868 ldr r0, [r4, r0] cmp r0, #0 beq _0223E87A - bl ErrorHandling + bl GF_AssertFail _0223E87A: mov r0, #0x81 lsl r0, r0, #2 @@ -35613,7 +35613,7 @@ MOD12_0223E8B4: ; 0x0223E8B4 ldr r0, [r4, #4] cmp r0, #0 bne _0223E8C8 - bl ErrorHandling + bl GF_AssertFail _0223E8C8: cmp r5, #0 bne _0223E8D0 @@ -35753,7 +35753,7 @@ MOD12_0223E9C4: ; 0x0223E9C4 add r6, r2, #0 cmp r5, #0x21 blo _0223E9D6 - bl ErrorHandling + bl GF_AssertFail _0223E9D6: ldr r0, _0223EA3C ; =MOD12_0224637C lsl r1, r5, #2 @@ -38064,7 +38064,7 @@ _0223FBA6: mov r0, #4 pop {r3, pc} _0223FBAA: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -38099,7 +38099,7 @@ _0223FBDC: mov r0, #3 pop {r3, pc} _0223FBE0: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} @@ -39925,7 +39925,7 @@ MOD12_022409CC: ; 0x022409CC add r4, r0, #0 cmp r5, #4 blo _022409DA - bl ErrorHandling + bl GF_AssertFail _022409DA: ldr r0, _02240A0C ; =MOD12_022464C0 cmp r4, #3 @@ -39967,7 +39967,7 @@ MOD12_02240A10: ; 0x02240A10 add r4, r3, #0 cmp r7, #4 blo _02240A22 - bl ErrorHandling + bl GF_AssertFail _02240A22: mov r0, #0 mvn r0, r0 @@ -40469,7 +40469,7 @@ MOD12_02240DC4: ; 0x02240DC4 add r4, r0, #0 cmp r4, #5 blo _02240DD0 - bl ErrorHandling + bl GF_AssertFail _02240DD0: ldr r0, _02240DD8 ; =MOD12_022464D0 lsl r1, r4, #2 @@ -40494,7 +40494,7 @@ MOD12_02240DE4: ; 0x02240DE4 add r4, r0, #0 cmp r4, #5 blo _02240DF0 - bl ErrorHandling + bl GF_AssertFail _02240DF0: ldr r0, _02240DF8 ; =MOD12_022464C8 ldrb r0, [r0, r4] @@ -40660,7 +40660,7 @@ _02240F14: add r4, r4, #1 cmp r4, #0x20 blt _02240F00 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -40695,7 +40695,7 @@ MOD12_02240F3C: ; 0x02240F3C str r3, [sp] cmp r4, r0 bls _02240F5A - bl ErrorHandling + bl GF_AssertFail _02240F5A: add r0, r5, #0 mov r2, #2 @@ -40750,7 +40750,7 @@ MOD12_02240FB0: ; 0x02240FB0 str r3, [sp] cmp r7, r0 bls _02240FCC - bl ErrorHandling + bl GF_AssertFail _02240FCC: add r0, r5, #0 mov r2, #2 @@ -40840,7 +40840,7 @@ _02241066: ldrh r0, [r5, #4] cmp r4, r0 blt _02241070 - bl ErrorHandling + bl GF_AssertFail _02241070: add r0, r5, #0 add r1, r6, #0 @@ -42062,14 +42062,14 @@ _02241B08: .word 0x00000133 thumb_func_start MOD12_02241B0C MOD12_02241B0C: ; 0x02241B0C push {r3, r4, r5, lr} - ldr r3, _02241B44 ; =UNK_021064B8 + ldr r3, _02241B44 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _02241B48 ; =UNK_021064C0 + ldr r3, _02241B48 ; =NNS_GfdDefaultFuncAllocPlttVram mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -42079,17 +42079,17 @@ MOD12_02241B0C: ; 0x02241B0C add r5, r0, #0 cmp r4, #0 bne _02241B34 - bl ErrorHandling + bl GF_AssertFail _02241B34: cmp r5, #0 bne _02241B3C - bl ErrorHandling + bl GF_AssertFail _02241B3C: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_02241B44: .word UNK_021064B8 -_02241B48: .word UNK_021064C0 +_02241B44: .word NNS_GfdDefaultFuncAllocTexVram +_02241B48: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_start MOD12_02241B4C MOD12_02241B4C: ; 0x02241B4C @@ -42098,7 +42098,7 @@ MOD12_02241B4C: ; 0x02241B4C ldr r0, [r4] cmp r0, #0 bne _02241B5A - bl ErrorHandling + bl GF_AssertFail _02241B5A: mov r1, #0xf3 mov r5, #0 @@ -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 @@ -42233,7 +42233,7 @@ _02241C1E: _02241C2C: cmp r5, #4 bne _02241C34 - bl ErrorHandling + bl GF_AssertFail _02241C34: ldr r0, _02241CE8 ; =0x00000438 ldr r1, _02241CEC ; =0x00000439 @@ -43323,7 +43323,7 @@ _02242462: ldr r0, [r0] cmp r0, #0 beq _0224247A - bl ErrorHandling + bl GF_AssertFail _0224247A: mov r1, #0x32 mov r0, #0x18 @@ -43404,7 +43404,7 @@ MOD12_02242500: ; 0x02242500 beq _02242516 cmp r5, #0 bne _02242516 - bl ErrorHandling + bl GF_AssertFail _02242516: cmp r6, #3 bhi _022425EC @@ -43509,7 +43509,7 @@ _02242596: add sp, #8 pop {r4, r5, r6, pc} _022425EC: - bl ErrorHandling + bl GF_AssertFail _022425F0: add sp, #8 pop {r4, r5, r6, pc} @@ -43554,7 +43554,7 @@ _02242618: add r0, r5, #0 add r0, #0x34 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r4, [sp, #4] @@ -43586,7 +43586,7 @@ MOD12_02242678: ; 0x02242678 add r6, r2, #0 cmp r4, #7 blo _0224268A - bl ErrorHandling + bl GF_AssertFail _0224268A: lsl r3, r4, #2 ldr r2, _022426A4 ; =MOD12_0224664C @@ -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 @@ -43894,13 +43894,13 @@ _022428E6: str r0, [sp, #0x14] add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #5 lsl r0, r0, #4 str r0, [sp, #0x18] add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 str r0, [sp] mov r0, #0 @@ -44869,7 +44869,7 @@ _022430EC: add r4, r2, r0 b _02243114 _0224310C: - bl ErrorHandling + bl GF_AssertFail add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _02243114: @@ -44901,7 +44901,7 @@ _02243144: ldr r0, [sp, #0xc] cmp r0, #0xc ble _0224314E - bl ErrorHandling + bl GF_AssertFail _0224314E: mov r0, #0 str r0, [sp, #8] @@ -45562,7 +45562,7 @@ _02243628: str r0, [r4] b _02243638 _02243630: - bl ErrorHandling + bl GF_AssertFail add sp, #0x34 pop {r4, r5, r6, r7, pc} _02243638: @@ -47014,7 +47014,7 @@ _022440EE: ldr r0, [r4] mov r1, #0xff add r0, #0x34 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] add r0, #0x34 bl CopyWindowToVram @@ -47498,7 +47498,7 @@ _022444C4: blt _022444C4 b _022444D8 _022444D4: - bl ErrorHandling + bl GF_AssertFail _022444D8: ldr r0, _022444F0 ; =MOD12_022444F8 ldr r2, _022444F4 ; =0x00007530 @@ -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/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s index 0e89d90f..5aee0b46 100644 --- a/arm9/modules/13/asm/module_13_arm2.s +++ b/arm9/modules/13/asm/module_13_arm2.s @@ -25937,27 +25937,27 @@ _022341D8: .word 0x0000A001 arm_func_start MOD13_022341DC MOD13_022341DC: ; 0x022341DC - ldr ip, _022341E4 ; =FUN_020C01A0 + ldr ip, _022341E4 ; =NNS_SndMain bx ip .align 2, 0 -_022341E4: .word FUN_020C01A0 +_022341E4: .word NNS_SndMain arm_func_start MOD13_022341E8 MOD13_022341E8: ; 0x022341E8 ldr r0, _02234200 ; =0x02243154 - ldr ip, _02234204 ; =FUN_020C10A4 + ldr ip, _02234204 ; =NNS_SndPlayerStopSeq ldr r0, [r0] mov r1, #0 add r0, r0, #0x90 bx ip .align 2, 0 _02234200: .word MOD13_02243154 -_02234204: .word FUN_020C10A4 +_02234204: .word NNS_SndPlayerStopSeq arm_func_start MOD13_02234208 MOD13_02234208: ; 0x02234208 ldr r2, _02234224 ; =0x02243154 - ldr ip, _02234228 ; =FUN_020C0EA4 + ldr ip, _02234228 ; =NNS_SndPlayerSetTrackPitch ldr r3, [r2] mov r2, r1 mov r1, r0 @@ -25965,32 +25965,32 @@ MOD13_02234208: ; 0x02234208 bx ip .align 2, 0 _02234224: .word MOD13_02243154 -_02234228: .word FUN_020C0EA4 +_02234228: .word NNS_SndPlayerSetTrackPitch arm_func_start MOD13_0223422C MOD13_0223422C: ; 0x0223422C ldr r2, _02234244 ; =0x02243154 mov r1, r0 ldr r0, [r2] - ldr ip, _02234248 ; =FUN_020C0F40 + ldr ip, _02234248 ; =NNS_SndPlayerSetVolume add r0, r0, #0x90 bx ip .align 2, 0 _02234244: .word MOD13_02243154 -_02234248: .word FUN_020C0F40 +_02234248: .word NNS_SndPlayerSetVolume arm_func_start MOD13_0223424C MOD13_0223424C: ; 0x0223424C ldr r1, _02234268 ; =0x02243154 mov r2, r0 ldr r0, [r1] - ldr ip, _0223426C ; =FUN_020C3888 + ldr ip, _0223426C ; =NNS_SndArcPlayerStartSeqArc mov r1, #0 add r0, r0, #0x90 bx ip .align 2, 0 _02234268: .word MOD13_02243154 -_0223426C: .word FUN_020C3888 +_0223426C: .word NNS_SndArcPlayerStartSeqArc arm_func_start MOD13_02234270 MOD13_02234270: ; 0x02234270 @@ -26024,17 +26024,17 @@ MOD13_022342A0: ; 0x022342A0 ldr r1, _0223432C ; =0x02243154 ldr r1, [r1] str r0, [r1, #0x94] - bl SDAT_Init + bl NNS_SndInit ldr r0, _0223432C ; =0x02243154 ldr r0, [r0] ldr r1, [r0, #0x94] - bl FUN_020C2444 + bl NNS_SndArcInitOnMemory mov r0, #0 - bl FUN_020C39CC + bl NNS_SndArcPlayerSetup ldr r0, _0223432C ; =0x02243154 ldr r0, [r0] add r0, r0, #0x90 - bl FUN_020C0F80 + bl NNS_SndHandleInit mov r0, #0 ldr r1, _02234334 ; =MOD13_022341DC mov r2, r0 @@ -33219,7 +33219,7 @@ MOD13_0223A440: ; 0x0223A440 str r1, [sp, #0xc] ldrb r1, [r4, #0x36] ldrb r2, [r4, #0x37] - bl FUN_020B5E50 + bl NNS_G2dArrangeOBJ1D add sp, sp, #0x10 ldmia sp!, {r4, r5, r6, r7, r8, pc} @@ -33245,7 +33245,7 @@ MOD13_0223A4F0: ; 0x0223A4F0 str lr, [sp, #8] add r0, r0, #0x20 str ip, [sp, #0xc] - bl FUN_020B7168 + bl NNSi_G2dTextCanvasDrawTextRect add sp, sp, #0x14 ldmia sp!, {pc} @@ -33271,14 +33271,14 @@ _0223A564: ldr r0, [r0] add r5, r0, r4 mov r0, r5 - bl FUN_020B5CE4 + bl NNS_G2dFontFindGlyphIndex mov r1, r0 ldr r0, _0223A5EC ; =0x0000FFFF cmp r1, r0 ldreq r0, [r5] ldreqh r1, [r0, #2] mov r0, r5 - bl FUN_020B5C88 + bl NNS_G2dFontGetCharWidthsFromIndex ldrh r1, [r5, #8] ldrh r2, [r7] ldr r3, [sp, #8] @@ -33319,7 +33319,7 @@ MOD13_0223A5F0: ; 0x0223A5F0 mla r1, ip, r3, lr mov r3, r2 mov r2, r4 - bl FUN_020B63CC + bl NNS_G2dCharCanvasDrawChar add sp, sp, #8 ldmia sp!, {r4, pc} .align 2, 0 @@ -33334,7 +33334,7 @@ MOD13_0223A634: ; 0x0223A634 str lr, [sp] add r0, r0, #0x20 str ip, [sp, #4] - bl FUN_020B7218 + bl NNSi_G2dTextCanvasDrawText add sp, sp, #0xc ldmia sp!, {pc} @@ -33504,7 +33504,7 @@ _0223A88C: mov r0, r6 mov r2, r4 mov r3, r5 - bl FUN_020B6388 + bl NNS_G2dCharCanvasInitForBG ldr r1, _0223A954 ; =0x022431A4 mov r0, #0xc ldr r2, [r1] @@ -33533,7 +33533,7 @@ _0223A8E0: str r7, [sp, #8] mov r4, #0xf str r4, [sp, #0xc] - bl FUN_020B6240 + bl NNS_G2dMapScrToCharText mov r0, r6 mov r1, #0 bl MOD13_0223A4D8 @@ -33601,7 +33601,7 @@ MOD13_0223A9A4: ; 0x0223A9A4 mov r0, r6 strh r1, [r4, #0x34] mov r1, r5 - bl FUN_020B6180 + bl NNSi_G2dCalcRequiredOBJ ldr r1, [sp, #0x20] cmp r7, #1 str r0, [r1] @@ -33614,7 +33614,7 @@ MOD13_0223A9A4: ; 0x0223A9A4 mov r2, r6 mov r3, r5 add r1, ip, r7, lsl #7 - bl FUN_020B62F8 + bl NNS_G2dCharCanvasInitForOBJ1D ldr r2, [r4, #0x18] mov r0, r4 mov r1, #0 @@ -33694,7 +33694,7 @@ _0223AB20: add r0, r2, r8, lsl #2 ldr r1, [r0, #0x78c] add r0, r2, r7 - bl FUN_020B5D3C + bl NNS_G2dFontInitUTF16 add r8, r8, #1 cmp r8, #2 add r7, r7, #0xc @@ -34004,7 +34004,7 @@ MOD13_0223AF48: ; 0x0223AF48 ldr r0, _0223AF8C ; =0x022431A8 mov r1, r5 ldr r0, [r0] - bl FUN_020ADDF0 + bl NNS_FndFreeToExpHeap mov r0, r4 bl OS_EnableIrqMask add sp, sp, #4 @@ -34026,7 +34026,7 @@ MOD13_0223AF90: ; 0x0223AF90 ldmeqia sp!, {r4, r5, pc} ldr r0, _0223AFDC ; =0x022431A8 ldr r0, [r0] - bl FUN_020ADDF0 + bl NNS_FndFreeToExpHeap mov r0, r4 bl OS_EnableIrqMask mov r0, #0 @@ -34060,7 +34060,7 @@ MOD13_0223B004: ; 0x0223B004 ldr r0, [r1] mov r1, r6 mov r2, r5 - bl tempName_NNS_FndAllocFromExpHeapEx + bl NNS_FndAllocFromExpHeapEx movs r5, r0 bne _0223B03C bl OS_Terminate @@ -34078,7 +34078,7 @@ MOD13_0223B050: ; 0x0223B050 sub sp, sp, #4 ldr r0, _0223B078 ; =0x022431A8 ldr r0, [r0] - bl thunk_FUN_020adc8c + bl NNS_FndDestroyExpHeap ldr r0, _0223B078 ; =0x022431A8 mov r1, #0 str r1, [r0] @@ -34097,7 +34097,7 @@ MOD13_0223B07C: ; 0x0223B07C mov r0, r4 mov r1, #0x40000 mov r2, #0 - bl tempName_NNS_FndCreateExpHeapEx + bl NNS_FndCreateExpHeapEx ldr r1, _0223B0B8 ; =0x022431A8 cmp r0, #0 str r0, [r1] diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 37a18d6d..bdfed5b1 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -101,7 +101,7 @@ _021D759E: blx r1 pop {r4, pc} _021D75AA: - bl ErrorHandling + bl GF_AssertFail mov r0, #1 pop {r4, pc} nop @@ -122,8 +122,8 @@ StoragePC_Overlay_Teardown: ; 0x021D75B8 mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02029EF8 - bl FUN_02029F08 + bl Sav2_Chatot_get + bl Chatot_invalidate _021D75DE: mov r0, #0x45 lsl r0, r0, #2 @@ -3418,7 +3418,7 @@ _021D90B0: str r0, [r5] pop {r3, r4, r5, pc} _021D90F2: - bl ErrorHandling + bl GF_AssertFail mov r0, #1 str r0, [r5] pop {r3, r4, r5, pc} @@ -7587,7 +7587,7 @@ MOD14_021DB220: ; 0x021DB220 ldr r0, [r5, r0] cmp r0, #0 bne _021DB2C8 - bl ErrorHandling + bl GF_AssertFail _021DB2C8: mov r0, #0x69 lsl r0, r0, #2 @@ -8399,7 +8399,7 @@ _021DB8B6: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021DB8C6: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -10519,7 +10519,7 @@ _021DC79C: mov r1, #0x10 orr r1, r2 str r1, [r0] - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r2, #0x80 @@ -10547,7 +10547,7 @@ _021DC79C: mov r0, #0x51 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r0, #0xa str r0, [sp] mov r0, #0x51 @@ -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 @@ -10765,7 +10765,7 @@ MOD14_021DCA0C: ; 0x021DCA0C bl MOD14_021DDEF4 bl G3X_ResetMtxStack bl G3X_ResetMtxStack_2 - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera mov r0, #0x56 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -10910,7 +10910,7 @@ _021DCB3A: str r0, [r1, #8] pop {r3, r4, r5, r6, r7, pc} _021DCB78: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021DCB7E: add r4, r4, #1 @@ -10919,7 +10919,7 @@ _021DCB7E: blo _021DCB3A pop {r3, r4, r5, r6, r7, pc} _021DCB88: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} nop _021DCB90: .word MOD14_021E63D0 @@ -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 @@ -13079,7 +13079,7 @@ _021DDC74: .word 0x0000B22C thumb_func_start MOD14_021DDC78 MOD14_021DDC78: ; 0x021DDC78 push {r3, lr} - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack mov r0, #1 add r1, r0, #0 @@ -13475,7 +13475,7 @@ MOD14_021DDF30: ; 0x021DDF30 add r6, r2, #0 cmp r0, #0x20 blo _021DDF44 - bl ErrorHandling + bl GF_AssertFail _021DDF44: ldr r2, _021DDF60 ; =MOD14_021E6A0C mov r1, #0xc @@ -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,17 +13810,17 @@ 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 add r1, sp, #0x14 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 beq _021DE262 mov r0, #0xa mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows add r4, r0, #0 beq _021DE250 ldr r0, _021DE270 ; =0x00005984 @@ -13890,12 +13890,12 @@ 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 add r1, sp, #8 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData ldr r0, _021DE2E4 ; =0x00005984 mov r1, #3 ldr r0, [r5, r0] @@ -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 @@ -15793,7 +15793,7 @@ MOD14_021DF144: ; 0x021DF144 sub sp, #0x38 add r4, r0, #0 add r0, #0x24 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r2, #1 @@ -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 @@ -18635,7 +18635,7 @@ MOD14_021E078C: ; 0x021E078C add r4, r1, #0 add r6, r2, #0 str r3, [sp, #8] - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy bl FUN_0206B888 add r1, r0, #0 mov r0, #0xa @@ -18645,21 +18645,21 @@ 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 add r0, sp, #0x18 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy ldr r0, [sp, #0xc] add r1, sp, #0x10 - bl FUN_020B00F0 + bl NNS_G2dGetUnpackedPaletteCompressInfo ldr r2, [sp, #0x14] add r7, r0, #0 ldr r0, [r2, #0xc] @@ -18678,14 +18678,14 @@ MOD14_021E078C: ; 0x021E078C ldr r1, [sp, #0x10] mov r2, #0xc0 mov r3, #1 - bl FUN_020B10E8 + bl NNS_G2dLoadPaletteEx b _021E0812 _021E0806: ldr r0, [sp, #0x14] mov r1, #0xc0 mov r2, #1 add r3, sp, #0x18 - bl FUN_020B1240 + bl NNS_G2dLoadPalette _021E0812: ldr r0, [sp, #0xc] bl FreeToHeap @@ -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 @@ -18805,7 +18805,7 @@ MOD14_021E08E4: ; 0x021E08E4 _021E08F4: add r0, r5, #4 str r6, [r5] - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, r4, #0 add r5, #0x34 sub r4, r4, #1 @@ -18913,7 +18913,7 @@ MOD14_021E0940: ; 0x021E0940 bl GetBoxMonData strh r0, [r4, #0x2e] add r0, r4, #4 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, r5, #0 add r0, #0x4c str r0, [sp] @@ -18926,7 +18926,7 @@ MOD14_021E0940: ; 0x021E0940 add r0, r5, #0 add r0, #0x4c add r1, sp, #0x1c - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -18942,7 +18942,7 @@ MOD14_021E0940: ; 0x021E0940 ldr r1, [sp, #0x60] ldr r0, [sp, #0x1c] lsl r1, r1, #5 - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping add r0, r4, #4 str r0, [sp, #0x20] ldr r0, [sp, #0x5c] @@ -18957,7 +18957,7 @@ MOD14_021E0940: ; 0x021E0940 str r0, [r4] cmp r0, #0 bne _021E0A36 - bl ErrorHandling + bl GF_AssertFail _021E0A36: ldrh r1, [r4, #0x2c] ldr r0, [r4] @@ -19031,10 +19031,10 @@ MOD14_021E0A60: ; 0x021E0A60 bl GetBoxMonData strh r0, [r4, #0x2e] add r0, r4, #4 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy ldr r0, [sp, #0x58] add r1, sp, #0x18 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -19050,7 +19050,7 @@ MOD14_021E0A60: ; 0x021E0A60 ldr r1, [sp, #0x6c] ldr r0, [sp, #0x18] lsl r1, r1, #5 - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping add r0, r4, #4 str r0, [sp, #0x1c] ldr r0, [sp, #0x68] @@ -19065,7 +19065,7 @@ MOD14_021E0A60: ; 0x021E0A60 str r0, [r4] cmp r0, #0 bne _021E0B28 - bl ErrorHandling + bl GF_AssertFail _021E0B28: ldrh r1, [r4, #0x2c] ldr r0, [r4] @@ -19160,7 +19160,7 @@ MOD14_021E0BBC: ; 0x021E0BBC cmp r0, #0 beq _021E0C18 add r0, r4, #4 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, r5, #0 add r0, #0x4c str r0, [sp] @@ -19173,7 +19173,7 @@ MOD14_021E0BBC: ; 0x021E0BBC add r5, #0x4c add r0, r5, #0 add r1, sp, #4 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -19188,7 +19188,7 @@ MOD14_021E0BBC: ; 0x021E0BBC str r1, [r0, #0x10] ldr r0, [sp, #4] lsl r1, r6, #5 - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping ldr r0, [r4] add r1, r4, #4 bl FUN_02020334 @@ -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 @@ -19309,7 +19309,7 @@ MOD14_021E0CCC: ; 0x021E0CCC sub sp, #0x38 add r4, r0, #0 add r0, #0x18 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 mov r0, #0x9d str r3, [sp] @@ -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 @@ -19634,7 +19634,7 @@ MOD14_021E0F40: ; 0x021E0F40 beq _021E0FA0 mov r0, #0xa mov r1, #4 - bl FUN_02018FF4 + bl AllocWindows str r0, [r5, #4] cmp r0, #0 beq _021E0F94 @@ -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] @@ -19705,7 +19705,7 @@ MOD14_021E0FA8: ; 0x021E0FA8 add r4, r5, #0 _021E0FE0: add r0, sp, #0x44 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r0, #0 str r0, [sp] mov r0, #1 @@ -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 @@ -19744,7 +19744,7 @@ _021E0FE0: str r0, [r4, #0x3c] cmp r0, #0 bne _021E103E - bl ErrorHandling + bl GF_AssertFail _021E103E: ldr r0, [r4, #0x3c] mov r1, #0 @@ -19758,7 +19758,7 @@ _021E103E: cmp r0, #2 blo _021E0FE0 add r0, sp, #0x44 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 mov r0, #0xb9 str r3, [sp] @@ -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 @@ -19829,7 +19829,7 @@ _021E10D8: str r0, [r5, #0x4c] pop {r3, r4, r5, pc} _021E10EA: - bl ErrorHandling + bl GF_AssertFail _021E10EE: pop {r3, r4, r5, pc} .align 2, 0 @@ -19965,7 +19965,7 @@ _021E11CE: add r0, #0x30 mov r2, #4 add r3, r1, #0 - bl FUN_0201A8C8 + bl ScrollWindow ldr r0, [r5, #4] add r0, #0x30 bl FUN_02019548 @@ -20058,7 +20058,7 @@ MOD14_021E1284: ; 0x021E1284 ldr r4, [r0, #4] add r4, #0x30 add r0, r4, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r2, [r5, #2] ldr r1, [r5, #8] add r0, r4, #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 @@ -20233,19 +20233,19 @@ MOD14_021E13F0: ; 0x021E13F0 beq _021E144E ldr r0, [r4, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x10] bl MOD14_021DC408 cmp r0, #0 @@ -20276,19 +20276,19 @@ MOD14_021E1450: ; 0x021E1450 beq _021E14CC ldr r0, [r4, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x24] cmp r0, #0 beq _021E148E @@ -20334,19 +20334,19 @@ MOD14_021E14D0: ; 0x021E14D0 beq _021E153A ldr r0, [r4, #4] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x10 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0xf add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] mov r1, #0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x24] cmp r0, #0 beq _021E150E @@ -20615,7 +20615,7 @@ MOD14_021E1704: ; 0x021E1704 ldr r0, [r5, #4] mov r1, #0 add r0, #0x30 - bl FUN_02019620 + bl FillWindowPixelBuffer ldrb r0, [r4, #0xf] cmp r0, #0 bne _021E1742 @@ -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 @@ -20751,7 +20751,7 @@ MOD14_021E1818: ; 0x021E1818 add r6, r0, #0 mov r0, #0xa mov r1, #2 - bl FUN_02018FF4 + bl AllocWindows str r0, [r6, #0x18] cmp r0, #0 beq _021E1848 @@ -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 @@ -20828,7 +20828,7 @@ MOD14_021E189C: ; 0x021E189C bl MOD14_021E1908 ldr r0, [r5, #0x18] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x10] ldr r2, [r5, #0x30] add r1, r4, #0 @@ -20976,7 +20976,7 @@ _021E19E8: str r0, [sp, #0x14] add r0, #0x10 str r0, [sp, #0x14] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x10] mov r6, #0 add r0, #0x21 @@ -21087,7 +21087,7 @@ _021E1AA0: ldr r1, [r1, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_02019684 + bl BlitBitmapRect add sp, #0x1c pop {r4, r5, pc} .align 2, 0 @@ -21221,7 +21221,7 @@ MOD14_021E1B9C: ; 0x021E1B9C mov r1, #0xf mov r2, #0 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect add r6, #0x20 ldrb r2, [r6] add r0, r4, #0 @@ -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 @@ -21631,7 +21631,7 @@ MOD14_021E1EEC: ; 0x021E1EEC add r7, r0, #0 mov r0, #0xa mov r1, #3 - bl FUN_02018FF4 + bl AllocWindows str r0, [r7, #0x10] cmp r0, #0 beq _021E1F1A @@ -21925,7 +21925,7 @@ _021E211E: ldr r2, [sp, #0x14] ldr r3, [sp, #0x48] lsl r1, r1, #5 - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping add sp, #0x34 pop {r4, r5, r6, r7, pc} _021E2132: @@ -22053,7 +22053,7 @@ MOD14_021E21E4: ; 0x021E21E4 pop {r4, r5, r6, pc} _021E2214: add r0, sp, #4 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, sp, #4 str r0, [sp] add r0, r5, #0 @@ -22100,7 +22100,7 @@ MOD14_021E223C: ; 0x021E223C mov r5, #0x20 _021E227C: add r0, sp, #0x1c - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, sp, #0x1c str r0, [sp] ldr r2, [sp, #8] @@ -22123,7 +22123,7 @@ _021E227C: str r0, [r4, #0x48] cmp r0, #0 bne _021E22B6 - bl ErrorHandling + bl GF_AssertFail _021E22B6: ldr r0, [r4, #0x48] mov r1, #0 @@ -22259,7 +22259,7 @@ MOD14_021E2394: ; 0x021E2394 add r6, r0, #0 add r0, r4, #0 mov r1, #7 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -22288,7 +22288,7 @@ MOD14_021E23F8: ; 0x021E23F8 ldr r4, [r0, #0x10] mov r1, #7 add r0, r4, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl FUN_02019548 pop {r4, pc} @@ -22303,7 +22303,7 @@ MOD14_021E240C: ; 0x021E240C str r0, [sp, #0xc] add r0, #0x10 str r0, [sp, #0xc] - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r7, #0 bl MOD14_021E2188 mov r6, #0 @@ -22345,7 +22345,7 @@ MOD14_021E2464: ; 0x021E2464 mov r1, #4 add r4, #0x10 add r0, r4, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl FUN_02019548 pop {r4, pc} @@ -22698,7 +22698,7 @@ MOD14_021E26E4: ; 0x021E26E4 ldr r0, [r5, #0x10] mov r1, #4 add r0, #0x20 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021E279C ; =0x00004BF8 add r1, r6, #0 ldr r0, [r5, r2] @@ -22987,7 +22987,7 @@ MOD14_021E2940: ; 0x021E2940 add r0, sp, #0x30 bl MOD14_021DDDB4 add r0, sp, #0xc - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy lsl r0, r4, #0x10 lsr r0, r0, #0x10 mov r1, #1 @@ -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 @@ -23012,7 +23012,7 @@ MOD14_021E2940: ; 0x021E2940 mov r1, #0xbe ldr r0, [sp, #8] lsl r1, r1, #8 - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping lsl r0, r4, #0x10 lsr r0, r0, #0x10 mov r1, #2 @@ -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 @@ -24045,7 +24045,7 @@ MOD14_021E3158: ; 0x021E3158 add r5, r0, #0 cmp r4, #6 blo _021E3166 - bl ErrorHandling + bl GF_AssertFail _021E3166: mov r0, #0x34 add r5, #0x3c @@ -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] @@ -24684,7 +24684,7 @@ MOD14_021E355C: ; 0x021E355C add r0, r4, #0 add r0, #0x88 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x88 bl CopyWindowToVram @@ -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: @@ -24714,7 +24714,7 @@ MOD14_021E3664: ; 0x021E3664 add r4, r0, #0 bl MOD14_021E36FC add r0, sp, #0x14 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r0, #2 @@ -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,13 +24823,13 @@ 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] add r0, r4, #0 add r0, #0x18 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r0, #0xa str r0, [sp] add r4, #0x18 @@ -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 @@ -25553,7 +25553,7 @@ _021E3CB2: str r0, [sp, #0x10] _021E3CC2: add r0, sp, #0x14 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, sp, #0x14 str r0, [sp] add r0, r7, #0 @@ -25586,7 +25586,7 @@ _021E3CC2: str r0, [r5, #0x54] cmp r0, #0 bne _021E3D14 - bl ErrorHandling + bl GF_AssertFail _021E3D14: sub r4, r4, #1 bpl _021E3D1A @@ -25752,7 +25752,7 @@ MOD14_021E3E1C: ; 0x021E3E1C bl MOD14_021DC484 str r0, [sp, #0x14] add r0, sp, #0x18 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r0, #2 @@ -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 @@ -25799,7 +25799,7 @@ _021E3E58: str r0, [r4, #0x34] cmp r0, #0 bne _021E3E94 - bl ErrorHandling + bl GF_AssertFail _021E3E94: ldr r1, [sp, #0x14] add r0, r6, #0 @@ -26004,7 +26004,7 @@ MOD14_021E4010: ; 0x021E4010 ldrb r0, [r4, r0] cmp r0, #0 bne _021E4022 - bl ErrorHandling + bl GF_AssertFail _021E4022: ldr r0, _021E4034 ; =0x000001CB ldrb r1, [r4, r0] @@ -26026,7 +26026,7 @@ MOD14_021E4038: ; 0x021E4038 ldr r4, [sp, #0x20] cmp r7, #0 bne _021E404C - bl ErrorHandling + bl GF_AssertFail _021E404C: cmp r4, #0 beq _021E4052 @@ -27058,7 +27058,7 @@ _021E47AE: ldrh r3, [r5, #2] add r0, r7, #0 mov r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r0, #2 ldrsh r0, [r5, r0] mov r1, #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 @@ -27198,12 +27198,12 @@ MOD14_021E4890: ; 0x021E4890 add r5, r6, #0 _021E48EA: add r0, sp, #0x10 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy ldr r0, [sp, #0xc] ldr r1, [r4] mov r2, #1 add r3, sp, #0x10 - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping mov r0, #0 str r0, [sp] mov r0, #1 @@ -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 @@ -28653,11 +28653,11 @@ _021E541E: add r0, r7, #0 add r0, #0x78 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r7, #0 add r0, #0x88 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r7, #0 mov r5, #0 add r4, #0x78 @@ -28797,7 +28797,7 @@ _021E554C: bl FUN_02019270 add r0, r5, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r7, #8 cmp r6, #2 @@ -28983,7 +28983,7 @@ _021E56B4: bl FUN_02019270 add r0, r5, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r7, #8 cmp r6, #2 @@ -29032,7 +29032,7 @@ MOD14_021E5718: ; 0x021E5718 add r7, #0x98 add r0, r7, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] bl MOD14_021DC560 cmp r0, #0 @@ -29116,7 +29116,7 @@ MOD14_021E57CC: ; 0x021E57CC add r4, #0x98 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl FUN_02019548 pop {r4, pc} @@ -29156,7 +29156,7 @@ _021E581A: str r0, [sp, #0x14] add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x18] cmp r0, #1 bne _021E5836 @@ -29299,7 +29299,7 @@ _021E593E: str r0, [sp, #0x18] add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x1c] cmp r0, #1 bne _021E595A @@ -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,9 +29423,9 @@ MOD14_021E5A08: ; 0x021E5A08 mov r1, #0x71 mov r2, #5 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, sp, #0x48 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r0, #2 @@ -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 @@ -29583,11 +29583,11 @@ _021E5BA0: add r0, r0, r6 str r0, [r4, #0x18] add r0, sp, #0x34 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy ldr r2, [r4, #0x18] add r0, sp, #0x34 mov r1, #2 - bl FUN_020B1A1C + bl NNS_G2dSetImageLocation ldr r0, _021E5BFC ; =0x04001000 mov r2, #0 ldr r1, [r0] @@ -29711,7 +29711,7 @@ MOD14_021E5C68: ; 0x021E5C68 add r0, r5, #0 add r0, #0xe8 add r1, sp, #4 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, [sp, #4] mov r1, #2 ldr r0, [r0, #0x14] @@ -29753,7 +29753,7 @@ MOD14_021E5CFC: ; 0x021E5CFC add r4, r1, r0 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] bl MOD14_021DC3F0 cmp r0, #0 @@ -30126,7 +30126,7 @@ _021E601A: strb r0, [r4] pop {r4, r5, r6, pc} _021E6032: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} thumb_func_start MOD14_021E6038 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 560be120..97282c02 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2592,7 +2592,7 @@ MOD15_021D87F8: ; 0x021D87F8 bl FUN_02015F1C str r5, [r4, #0x18] str r6, [r4, #0x1c] - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -2745,7 +2745,7 @@ _021D8944: blt _021D8928 pop {r4, r5, r6, pc} _021D894E: - bl ErrorHandling + bl GF_AssertFail _021D8952: pop {r4, r5, r6, pc} .align 2, 0 @@ -2925,19 +2925,19 @@ MOD15_021D8AB4: ; 0x021D8AB4 mov r0, #0x66 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r0, #0x6b lsl r0, r0, #2 add r0, r4, r0 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r0, #0x15 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r0, #0x5d lsl r0, r0, #2 add r0, r4, r0 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r2, #1 @@ -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] @@ -4345,7 +4345,7 @@ MOD15_021D95E8: ; 0x021D95E8 bl NewMsgDataFromNarc str r0, [r4, #0x48] mov r0, #0x23 - bl FUN_02013690 + bl ListMenuCursorNew str r0, [r4, #0x50] add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -4359,7 +4359,7 @@ MOD15_021D9634: ; 0x021D9634 ldr r0, [r4, #0x50] cmp r0, #0 beq _021D9642 - bl FUN_020136C0 + bl DestroyListMenuCursorObj _021D9642: ldr r0, [r4, #0x3c] cmp r0, #0 @@ -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 @@ -4749,7 +4749,7 @@ MOD15_021D9964: ; 0x021D9964 add r0, r4, #0 add r0, #0xc mov r1, #0xd - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #4] bl MOD15_021D86E4 cmp r0, #0 @@ -5135,7 +5135,7 @@ MOD15_021D9C30: ; 0x021D9C30 ldrh r3, [r3, #2] add r0, r4, #0 mov r1, #0xe - bl FUN_020196F4 + bl FillWindowPixelRect add sp, #0xc pop {r3, r4, pc} @@ -5194,7 +5194,7 @@ MOD15_021D9CB4: ; 0x021D9CB4 add r5, r1, #0 add r0, #0x1c mov r1, #9 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r5, #3 bhi _021D9DB0 add r0, r5, r5 @@ -5462,7 +5462,7 @@ MOD15_021D9ECC: ; 0x021D9ECC add r4, r1, #0 add r0, #0x2c mov r1, #9 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x48] ldr r2, [r5, #0x4c] mov r1, #9 @@ -5509,7 +5509,7 @@ MOD15_021D9ECC: ; 0x021D9ECC add r1, #0x2c mov r2, #0 lsl r3, r4, #4 - bl FUN_020136F8 + bl ListMenuUpdateCursorObj add r5, #0x2c add r0, r5, #0 bl CopyWindowToVram @@ -5533,13 +5533,13 @@ MOD15_021D9F58: ; 0x021D9F58 add r0, #0x2c mov r1, #9 add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, [r5, #0x50] add r5, #0x2c add r1, r5, #0 mov r2, #0 lsl r3, r4, #4 - bl FUN_020136F8 + bl ListMenuUpdateCursorObj add sp, #8 pop {r3, r4, r5, pc} @@ -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 @@ -5650,7 +5650,7 @@ MOD15_021DA044: ; 0x021DA044 bl FUN_02019270 add r0, sp, #0x10 mov r1, #0xe - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, _021DA0B0 ; =0x00000183 mov r0, #0x1a add r2, r4, #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 @@ -5998,7 +5998,7 @@ _021DA310: ldr r0, _021DA3B0 ; =0x000003EE cmp r6, r0 blo _021DA31A - bl ErrorHandling + bl GF_AssertFail _021DA31A: ldr r0, [sp, #0x24] lsl r3, r7, #0x18 @@ -6021,7 +6021,7 @@ _021DA31A: bl FUN_02019064 add r0, sp, #0x28 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -6077,7 +6077,7 @@ MOD15_021DA3B4: ; 0x021DA3B4 str r2, [sp, #0x14] cmp r0, r1 blo _021DA3CC - bl ErrorHandling + bl GF_AssertFail _021DA3CC: mov r0, #0xa str r0, [sp] @@ -6102,7 +6102,7 @@ _021DA3CC: add r4, r0, #0 add r0, sp, #0x20 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer bl MOD15_021DB770 add r7, r0, #0 ldr r5, _021DA474 ; =0x00000000 @@ -6191,7 +6191,7 @@ _021DA4B6: lsl r0, r0, #4 cmp r5, r0 blo _021DA4C2 - bl ErrorHandling + bl GF_AssertFail _021DA4C2: ldrh r0, [r4, #2] add r1, r6, #0 @@ -6215,7 +6215,7 @@ _021DA4C2: bl FUN_02019064 add r0, r6, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] mov r0, #0xff @@ -6769,7 +6769,7 @@ MOD15_021DA8E8: ; 0x021DA8E8 add r0, r5, #0 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x10 bl FUN_02019270 @@ -6853,7 +6853,7 @@ MOD15_021DA9D4: ; 0x021DA9D4 add r6, r0, #0 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 bl MOD15_021DAD78 ldr r0, [r6, #4] @@ -7291,7 +7291,7 @@ _021DAD1A: add r0, r5, #0 add r2, r1, #0 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect add sp, #8 pop {r3, r4, r5, pc} _021DAD3E: @@ -7308,7 +7308,7 @@ _021DAD3E: add r0, #0x10 add r2, r1, #0 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0xd0 str r0, [sp] @@ -7319,7 +7319,7 @@ _021DAD3E: add r0, r5, #0 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add sp, #8 pop {r3, r4, r5, pc} @@ -7378,7 +7378,7 @@ _021DADD4: add r0, r5, #0 add r0, #0x20 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -7416,7 +7416,7 @@ _021DADD4: ldr r1, [r5, #0x2c] add r0, #0x10 add r3, r2, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r1, #0x60 lsl r2, r7, #0x10 lsl r3, r6, #0x10 @@ -7436,7 +7436,7 @@ _021DADD4: ldr r1, [r5, #0x2c] add r0, #0x10 lsr r3, r3, #0x10 - bl FUN_02019658 + bl BlitBitmapRectToWindow add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -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,12 +7675,12 @@ 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 add r0, sp, #0x10 - bl FUN_0201901C + bl InitWindow ldr r0, [r5, #0xc] add r1, sp, #0xc str r0, [sp, #0x10] @@ -7801,9 +7801,9 @@ MOD15_021DB154: ; 0x021DB154 sub sp, #0x4c add r4, r0, #0 add r0, sp, #0x38 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy add r0, sp, #0x14 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r0, #0x23 str r0, [sp] add r0, sp, #0x38 @@ -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} @@ -8609,7 +8609,7 @@ MOD15_021DB774: ; 0x021DB774 add r5, r1, #0 cmp r4, #0x1b blo _021DB782 - bl ErrorHandling + bl GF_AssertFail _021DB782: mov r1, #0xa ldr r2, _021DB794 ; =0x021DBA4C @@ -8630,7 +8630,7 @@ MOD15_021DB798: ; 0x021DB798 add r6, r2, #0 cmp r5, #0x1b blo _021DB7A8 - bl ErrorHandling + bl GF_AssertFail _021DB7A8: mov r0, #0xa add r1, r5, #0 @@ -8652,7 +8652,7 @@ MOD15_021DB7C4: ; 0x021DB7C4 add r4, r0, #0 cmp r4, #0x1b blo _021DB7D0 - bl ErrorHandling + bl GF_AssertFail _021DB7D0: mov r0, #0xa add r1, r4, #0 @@ -8669,7 +8669,7 @@ MOD15_021DB7E0: ; 0x021DB7E0 add r4, r0, #0 cmp r4, #0x1b blo _021DB7EC - bl ErrorHandling + bl GF_AssertFail _021DB7EC: mov r0, #0xa add r1, r4, #0 @@ -8686,7 +8686,7 @@ MOD15_021DB7FC: ; 0x021DB7FC add r4, r0, #0 cmp r4, #0x1b blo _021DB808 - bl ErrorHandling + bl GF_AssertFail _021DB808: mov r0, #0xa add r1, r4, #0 @@ -8703,7 +8703,7 @@ MOD15_021DB818: ; 0x021DB818 add r4, r0, #0 cmp r4, #0x1b blo _021DB824 - bl ErrorHandling + bl GF_AssertFail _021DB824: mov r0, #0xa add r1, r4, #0 @@ -8720,7 +8720,7 @@ MOD15_021DB834: ; 0x021DB834 add r4, r0, #0 cmp r4, #0x1b blo _021DB840 - bl ErrorHandling + bl GF_AssertFail _021DB840: mov r0, #0xa add r1, r4, #0 @@ -8737,7 +8737,7 @@ MOD15_021DB850: ; 0x021DB850 add r4, r0, #0 cmp r4, #0x1b blo _021DB85C - bl ErrorHandling + bl GF_AssertFail _021DB85C: mov r0, #0xa add r1, r4, #0 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 26ae4fbf..e9eedca1 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -23,7 +23,7 @@ MOD16_021D74E0: ; 0x021D74E0 bl OverlayManager_CreateAndGetData add r4, r0, #0 bne _021D750E - bl ErrorHandling + bl GF_AssertFail _021D750E: mov r0, #0 strb r0, [r4] @@ -45,7 +45,7 @@ _021D750E: bl FUN_0201CC24 cmp r0, #1 beq _021D7546 - bl ErrorHandling + bl GF_AssertFail _021D7546: mov r0, #0x25 bl MOD16_021D79FC @@ -161,7 +161,7 @@ MOD16_021D7614: ; 0x021D7614 bl FUN_0201CD04 cmp r0, #1 beq _021D7630 - bl ErrorHandling + bl GF_AssertFail _021D7630: bl MOD16_021D7A10 bl FUN_0201C29C @@ -245,7 +245,7 @@ MOD16_021D76AC: ; 0x021D76AC bl AllocFromHeap add r4, r0, #0 bne _021D76C2 - bl ErrorHandling + bl GF_AssertFail _021D76C2: ldr r2, _021D77D0 ; =0x00001D10 add r0, r4, #0 @@ -391,7 +391,7 @@ MOD16_021D7804: ; 0x021D7804 push {r4, lr} add r4, r0, #0 bne _021D780E - bl ErrorHandling + bl GF_AssertFail _021D780E: add r0, r4, #0 add r0, #0xc @@ -638,7 +638,7 @@ MOD16_021D7A38: ; 0x021D7A38 push {r4, lr} add r4, r0, #0 bne _021D7A42 - bl ErrorHandling + bl GF_AssertFail _021D7A42: mov r0, #0x1d lsl r0, r0, #8 @@ -652,7 +652,7 @@ MOD16_021D7A4C: ; 0x021D7A4C push {r4, lr} add r4, r0, #0 bne _021D7A56 - bl ErrorHandling + bl GF_AssertFail _021D7A56: ldr r0, _021D7A5C ; =0x00001D04 ldr r0, [r4, r0] @@ -666,7 +666,7 @@ MOD16_021D7A60: ; 0x021D7A60 push {r4, lr} add r4, r0, #0 bne _021D7A6A - bl ErrorHandling + bl GF_AssertFail _021D7A6A: ldr r0, _021D7A70 ; =0x00001D08 ldr r0, [r4, r0] @@ -680,7 +680,7 @@ MOD16_021D7A74: ; 0x021D7A74 push {r4, lr} add r4, r0, #0 bne _021D7A7E - bl ErrorHandling + bl GF_AssertFail _021D7A7E: ldr r0, _021D7A84 ; =0x00001D0C ldr r0, [r4, r0] @@ -694,7 +694,7 @@ MOD16_021D7A88: ; 0x021D7A88 push {r4, lr} add r4, r0, #0 bne _021D7A92 - bl ErrorHandling + bl GF_AssertFail _021D7A92: ldr r0, _021D7A98 ; =0x00001A0C ldr r0, [r4, r0] @@ -708,7 +708,7 @@ MOD16_021D7A9C: ; 0x021D7A9C push {r4, lr} add r4, r0, #0 bne _021D7AA6 - bl ErrorHandling + bl GF_AssertFail _021D7AA6: ldr r0, _021D7AAC ; =0x00001A10 ldr r0, [r4, r0] @@ -722,7 +722,7 @@ MOD16_021D7AB0: ; 0x021D7AB0 push {r4, lr} add r4, r0, #0 bne _021D7ABA - bl ErrorHandling + bl GF_AssertFail _021D7ABA: ldr r0, _021D7AC0 ; =0x00001A14 ldr r0, [r4, r0] @@ -736,7 +736,7 @@ MOD16_021D7AC4: ; 0x021D7AC4 push {r4, lr} add r4, r0, #0 bne _021D7ACE - bl ErrorHandling + bl GF_AssertFail _021D7ACE: ldr r0, _021D7AD4 ; =0x00001A18 ldr r0, [r4, r0] @@ -750,7 +750,7 @@ MOD16_021D7AD8: ; 0x021D7AD8 push {r4, lr} add r4, r0, #0 bne _021D7AE2 - bl ErrorHandling + bl GF_AssertFail _021D7AE2: ldr r0, _021D7AE8 ; =0x000019FC add r0, r4, r0 @@ -764,7 +764,7 @@ MOD16_021D7AEC: ; 0x021D7AEC push {r4, lr} add r4, r0, #0 bne _021D7AF6 - bl ErrorHandling + bl GF_AssertFail _021D7AF6: mov r0, #0x1a lsl r0, r0, #8 @@ -778,7 +778,7 @@ MOD16_021D7B00: ; 0x021D7B00 push {r4, lr} add r4, r0, #0 bne _021D7B0A - bl ErrorHandling + bl GF_AssertFail _021D7B0A: ldr r0, _021D7B10 ; =0x00001A04 add r0, r4, r0 @@ -792,7 +792,7 @@ MOD16_021D7B14: ; 0x021D7B14 push {r4, lr} add r4, r0, #0 bne _021D7B1E - bl ErrorHandling + bl GF_AssertFail _021D7B1E: ldr r0, _021D7B24 ; =0x00001A08 add r0, r4, r0 @@ -806,7 +806,7 @@ MOD16_021D7B28: ; 0x021D7B28 push {r4, lr} add r4, r0, #0 bne _021D7B32 - bl ErrorHandling + bl GF_AssertFail _021D7B32: add r0, r4, #0 pop {r4, pc} @@ -818,7 +818,7 @@ MOD16_021D7B38: ; 0x021D7B38 push {r4, lr} add r4, r0, #0 bne _021D7B42 - bl ErrorHandling + bl GF_AssertFail _021D7B42: add r4, #0xc add r0, r4, #0 @@ -830,7 +830,7 @@ MOD16_021D7B48: ; 0x021D7B48 push {r4, lr} add r4, r0, #0 bne _021D7B52 - bl ErrorHandling + bl GF_AssertFail _021D7B52: ldr r0, _021D7B58 ; =0x0000177C add r0, r4, r0 @@ -846,7 +846,7 @@ MOD16_021D7B5C: ; 0x021D7B5C add r5, r0, #0 cmp r4, #0xa blt _021D7B6A - bl ErrorHandling + bl GF_AssertFail _021D7B6A: ldr r0, _021D7B78 ; =0x00001A30 add r1, r5, r0 @@ -865,7 +865,7 @@ MOD16_021D7B7C: ; 0x021D7B7C add r5, r0, #0 cmp r4, #8 blt _021D7B8A - bl ErrorHandling + bl GF_AssertFail _021D7B8A: mov r0, #0x6f lsl r0, r0, #6 @@ -1265,7 +1265,7 @@ MOD16_021D7E68: ; 0x021D7E68 add r7, r0, #0 cmp r7, #0 bgt _021D7E82 - bl ErrorHandling + bl GF_AssertFail _021D7E82: add r0, r4, #0 mov r1, #0xf @@ -1820,7 +1820,7 @@ MOD16_021D8298: ; 0x021D8298 ldr r0, [r6, r0] cmp r0, #0 bne _021D82B0 - bl ErrorHandling + bl GF_AssertFail _021D82B0: ldr r0, _021D83D8 ; =0x00001A0C ldr r0, [r6, r0] @@ -1829,7 +1829,7 @@ _021D82B0: ldr r0, [r6, r0] cmp r0, #0 bne _021D82C4 - bl ErrorHandling + bl GF_AssertFail _021D82C4: ldr r0, _021D83DC ; =0x00001A10 ldr r0, [r6, r0] @@ -1838,7 +1838,7 @@ _021D82C4: ldr r0, [r6, r0] cmp r0, #0 bne _021D82D8 - bl ErrorHandling + bl GF_AssertFail _021D82D8: ldr r0, _021D83E0 ; =0x00001A14 ldr r0, [r6, r0] @@ -1847,7 +1847,7 @@ _021D82D8: ldr r0, [r6, r0] cmp r0, #0 bne _021D82EC - bl ErrorHandling + bl GF_AssertFail _021D82EC: ldr r0, _021D83E4 ; =0x00001A18 ldr r0, [r6, r0] @@ -1857,7 +1857,7 @@ _021D82EC: ldr r0, [r6, r0] cmp r0, #0 bne _021D8302 - bl ErrorHandling + bl GF_AssertFail _021D8302: mov r0, #0x1d lsl r0, r0, #8 @@ -1867,7 +1867,7 @@ _021D8302: ldr r0, [r6, r0] cmp r0, #0 bne _021D8318 - bl ErrorHandling + bl GF_AssertFail _021D8318: ldr r0, _021D83E8 ; =0x00001D04 ldr r0, [r6, r0] @@ -1876,7 +1876,7 @@ _021D8318: ldr r0, [r6, r0] cmp r0, #0 bne _021D832C - bl ErrorHandling + bl GF_AssertFail _021D832C: ldr r0, _021D83EC ; =0x00001D08 ldr r0, [r6, r0] @@ -1885,7 +1885,7 @@ _021D832C: ldr r0, [r6, r0] cmp r0, #0 bne _021D8340 - bl ErrorHandling + bl GF_AssertFail _021D8340: ldr r0, _021D83F0 ; =0x00001D0C ldr r0, [r6, r0] @@ -1996,7 +1996,7 @@ MOD16_021D8424: ; 0x021D8424 push {r4, r5, lr} sub sp, #0x24 add r4, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -2053,7 +2053,7 @@ _021D849C: .word 0x000019FC thumb_func_start MOD16_021D84A0 MOD16_021D84A0: ; 0x021D84A0 push {r3, lr} - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _021D8500 ; =0x04000060 ldr r2, _021D8504 ; =0xFFFFCFFD @@ -2089,11 +2089,11 @@ MOD16_021D84A0: ; 0x021D84A0 str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager pop {r3, pc} .align 2, 0 _021D8500: .word 0x04000060 @@ -2106,8 +2106,8 @@ _021D8510: .word 0xBFFF0000 thumb_func_start MOD16_021D8514 MOD16_021D8514: ; 0x021D8514 push {r3, lr} - bl FUN_020AEAF4 - bl FUN_020AEC60 + bl NNS_GfdResetFrmTexVramState + bl NNS_GfdResetFrmPlttVramState pop {r3, pc} thumb_func_end MOD16_021D8514 @@ -2313,7 +2313,7 @@ MOD16_021D86B4: ; 0x021D86B4 lsl r0, r0, #2 ldr r0, [r4, r0] bl FUN_0201FDEC - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera mov r0, #0x55 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2534,7 +2534,7 @@ MOD16_021D8838: ; 0x021D8838 ldr r0, [r4, r0] cmp r0, #0 bne _021D884A - bl ErrorHandling + bl GF_AssertFail _021D884A: mov r0, #0x6d lsl r0, r0, #2 @@ -2552,7 +2552,7 @@ MOD16_021D8854: ; 0x021D8854 ldr r0, [r4, r0] cmp r0, #0 bne _021D8866 - bl ErrorHandling + bl GF_AssertFail _021D8866: mov r0, #0x6e lsl r0, r0, #2 @@ -2624,7 +2624,7 @@ MOD16_021D88D4: ; 0x021D88D4 add r4, r0, #0 cmp r5, #3 ble _021D88E2 - bl ErrorHandling + bl GF_AssertFail _021D88E2: lsl r0, r5, #2 add r1, r4, r0 @@ -3182,7 +3182,7 @@ MOD16_021D8CB4: ; 0x021D8CB4 add r7, r0, #0 beq _021D8CF6 add r1, sp, #4 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 beq _021D8CF0 cmp r4, #0 @@ -3220,7 +3220,7 @@ MOD16_021D8CFC: ; 0x021D8CFC add r7, r0, #0 beq _021D8D42 add r1, sp, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData cmp r0, #0 beq _021D8D3C cmp r4, #0 @@ -3258,7 +3258,7 @@ MOD16_021D8D48: ; 0x021D8D48 add r4, r0, #0 beq _021D8D6A add r1, r5, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData cmp r0, #0 bne _021D8D6A add r0, r4, #0 @@ -3280,7 +3280,7 @@ MOD16_021D8D70: ; 0x021D8D70 add r4, r0, #0 beq _021D8D92 add r1, r5, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData cmp r0, #0 bne _021D8D92 add r0, r4, #0 @@ -3302,7 +3302,7 @@ MOD16_021D8D98: ; 0x021D8D98 add r4, r0, #0 beq _021D8DBA add r1, r5, #0 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _021D8DBA add r0, r4, #0 @@ -3518,7 +3518,7 @@ MOD16_021D8F60: ; 0x021D8F60 bl FUN_02019064 add r0, r4, #4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #4 bl CopyWindowToVram add sp, #0x14 @@ -3545,14 +3545,14 @@ MOD16_021D8F9C: ; 0x021D8F9C mov r1, #0x55 lsl r1, r1, #2 str r0, [r5, r1] - ldr r3, _021D9030 ; =UNK_021064B8 + ldr r3, _021D9030 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _021D9034 ; =UNK_021064C0 + ldr r3, _021D9034 ; =NNS_GfdDefaultFuncAllocPlttVram add r4, r0, #0 ldr r3, [r3] mov r0, #0x80 @@ -3607,8 +3607,8 @@ _021D9004: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop -_021D9030: .word UNK_021064B8 -_021D9034: .word UNK_021064C0 +_021D9030: .word NNS_GfdDefaultFuncAllocTexVram +_021D9034: .word NNS_GfdDefaultFuncAllocPlttVram _021D9038: .word 0x7FFF0000 _021D903C: .word 0xFFFF0000 _021D9040: .word MOD16_021FF490 @@ -4618,7 +4618,7 @@ _021D97EE: bl MOD16_021D9CB0 cmp r0, #0 bne _021D980C - bl ErrorHandling + bl GF_AssertFail _021D980C: ldr r1, [r4, #0x1c] add r0, r5, #0 @@ -4728,7 +4728,7 @@ MOD16_021D98EC: ; 0x021D98EC add r5, r0, #0 cmp r4, #0x1c blt _021D98FA - bl ErrorHandling + bl GF_AssertFail _021D98FA: ldr r0, [r5] add r1, r4, #0 @@ -4743,7 +4743,7 @@ MOD16_021D9904: ; 0x021D9904 add r5, r0, #0 cmp r4, #2 blt _021D9912 - bl ErrorHandling + bl GF_AssertFail _021D9912: ldr r0, [r5] add r1, r4, #0 @@ -4758,7 +4758,7 @@ MOD16_021D991C: ; 0x021D991C add r5, r0, #0 cmp r4, #2 blt _021D992A - bl ErrorHandling + bl GF_AssertFail _021D992A: ldr r0, [r5] add r1, r4, #0 @@ -4773,7 +4773,7 @@ MOD16_021D9934: ; 0x021D9934 add r5, r0, #0 cmp r4, #3 blt _021D9942 - bl ErrorHandling + bl GF_AssertFail _021D9942: ldr r0, [r5] add r1, r4, #0 @@ -4788,7 +4788,7 @@ MOD16_021D994C: ; 0x021D994C add r5, r0, #0 cmp r4, #3 blt _021D995A - bl ErrorHandling + bl GF_AssertFail _021D995A: ldr r0, [r5] add r1, r4, #0 @@ -5012,7 +5012,7 @@ MOD16_021D9A90: ; 0x021D9A90 bl AllocFromHeapAtEnd add r6, r0, #0 bne _021D9AAE - bl ErrorHandling + bl GF_AssertFail _021D9AAE: ldr r2, _021D9CA8 ; =0x000003DA add r0, r6, #0 @@ -5025,7 +5025,7 @@ _021D9AAE: bl AllocFromHeapAtEnd add r4, r0, #0 bne _021D9ACC - bl ErrorHandling + bl GF_AssertFail _021D9ACC: ldr r2, _021D9CA8 ; =0x000003DA add r0, r4, #0 @@ -6017,7 +6017,7 @@ MOD16_021DA184: ; 0x021DA184 add r4, r2, #0 cmp r5, #0x2f blt _021DA196 - bl ErrorHandling + bl GF_AssertFail _021DA196: mov r2, #0 add r5, #0xb @@ -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] @@ -6095,7 +6095,7 @@ _021DA216: add r6, r0, #0 b _021DA226 _021DA222: - bl ErrorHandling + bl GF_AssertFail _021DA226: cmp r6, #0 beq _021DA24E @@ -6214,7 +6214,7 @@ _021DA2FA: add r4, r0, #0 b _021DA30A _021DA306: - bl ErrorHandling + bl GF_AssertFail _021DA30A: cmp r4, #0 beq _021DA332 @@ -6389,7 +6389,7 @@ _021DA44E: add r4, r0, #0 b _021DA45E _021DA45A: - bl ErrorHandling + bl GF_AssertFail _021DA45E: cmp r4, #0 beq _021DA486 @@ -6543,7 +6543,7 @@ _021DA578: add r4, r0, #0 b _021DA588 _021DA584: - bl ErrorHandling + bl GF_AssertFail _021DA588: cmp r4, #0 beq _021DA5B0 @@ -6618,7 +6618,7 @@ MOD16_021DA5FC: ; 0x021DA5FC bl AllocFromHeap add r4, r0, #0 bne _021DA60E - bl ErrorHandling + bl GF_AssertFail _021DA60E: add r0, r4, #0 mov r1, #0 @@ -6639,17 +6639,17 @@ MOD16_021DA624: ; 0x021DA624 add r4, r1, #0 cmp r5, #0 bne _021DA632 - bl ErrorHandling + bl GF_AssertFail _021DA632: cmp r4, #0 bne _021DA63A - bl ErrorHandling + bl GF_AssertFail _021DA63A: add r0, r5, #0 bl MOD16_021DA7C4 cmp r0, #0 bne _021DA648 - bl ErrorHandling + bl GF_AssertFail _021DA648: ldr r0, [r4] str r0, [r5] @@ -6694,7 +6694,7 @@ MOD16_021DA694: ; 0x021DA694 push {r4, lr} add r4, r0, #0 bne _021DA69E - bl ErrorHandling + bl GF_AssertFail _021DA69E: ldr r0, [r4, #8] cmp r0, #5 @@ -6757,7 +6757,7 @@ _021DA70E: mov r0, #1 pop {r4, pc} _021DA712: - bl ErrorHandling + bl GF_AssertFail _021DA716: mov r0, #0 pop {r4, pc} @@ -6770,7 +6770,7 @@ MOD16_021DA71C: ; 0x021DA71C sub sp, #4 add r4, r0, #0 bne _021DA728 - bl ErrorHandling + bl GF_AssertFail _021DA728: ldr r0, [r4, #8] cmp r0, #5 @@ -6838,7 +6838,7 @@ _021DA7A0: mov r0, #1 pop {r3, r4, pc} _021DA7A6: - bl ErrorHandling + bl GF_AssertFail _021DA7AA: mov r0, #0 add sp, #4 @@ -6856,7 +6856,7 @@ MOD16_021DA7B4: ; 0x021DA7B4 push {r4, lr} add r4, r0, #0 bne _021DA7BE - bl ErrorHandling + bl GF_AssertFail _021DA7BE: mov r0, #1 str r0, [r4, #0x18] @@ -6868,7 +6868,7 @@ MOD16_021DA7C4: ; 0x021DA7C4 push {r4, lr} add r4, r0, #0 bne _021DA7CE - bl ErrorHandling + bl GF_AssertFail _021DA7CE: ldr r0, [r4, #8] cmp r0, #5 @@ -6885,7 +6885,7 @@ MOD16_021DA7DC: ; 0x021DA7DC push {r4, lr} add r4, r0, #0 bne _021DA7E6 - bl ErrorHandling + bl GF_AssertFail _021DA7E6: ldr r0, [r4, #8] cmp r0, #2 @@ -6923,11 +6923,11 @@ MOD16_021DA808: ; 0x021DA808 add r6, r2, #0 cmp r5, #0 bne _021DA818 - bl ErrorHandling + bl GF_AssertFail _021DA818: cmp r4, #0 bne _021DA820 - bl ErrorHandling + bl GF_AssertFail _021DA820: add r0, r4, #0 add r1, r6, #0 @@ -6944,16 +6944,16 @@ MOD16_021DA828: ; 0x021DA828 add r7, r3, #0 cmp r5, #0 bne _021DA83A - bl ErrorHandling + bl GF_AssertFail _021DA83A: cmp r4, #0 bne _021DA842 - bl ErrorHandling + bl GF_AssertFail _021DA842: ldr r0, [sp, #0x18] cmp r0, #0 bne _021DA84C - bl ErrorHandling + bl GF_AssertFail _021DA84C: ldr r3, [sp, #0x18] add r0, r6, #0 @@ -6970,7 +6970,7 @@ MOD16_021DA858: ; 0x021DA858 bl AllocFromHeap add r4, r0, #0 bne _021DA868 - bl ErrorHandling + bl GF_AssertFail _021DA868: mov r0, #0 strb r0, [r4] @@ -6998,7 +6998,7 @@ MOD16_021DA888: ; 0x021DA888 add r6, r2, #0 cmp r5, #0 bne _021DA898 - bl ErrorHandling + bl GF_AssertFail _021DA898: str r4, [r5] str r6, [r5, #4] @@ -7013,7 +7013,7 @@ MOD16_021DA8A0: ; 0x021DA8A0 add r5, r1, #0 cmp r4, #0 bne _021DA8AE - bl ErrorHandling + bl GF_AssertFail _021DA8AE: add r0, r4, #0 bl MOD16_021DA908 @@ -7052,7 +7052,7 @@ MOD16_021DA8F0: ; 0x021DA8F0 push {r4, lr} add r4, r0, #0 bne _021DA8FA - bl ErrorHandling + bl GF_AssertFail _021DA8FA: ldr r0, [r4, #8] cmp r0, #0 @@ -7091,7 +7091,7 @@ _021DA928: ldr r0, [r5] cmp r0, #0 bne _021DA932 - bl ErrorHandling + bl GF_AssertFail _021DA932: ldr r0, [r5] ldr r1, [r0, r4] @@ -7175,7 +7175,7 @@ _021DA9AE: mov r0, #1 pop {r4, pc} _021DA9BC: - bl ErrorHandling + bl GF_AssertFail _021DA9C0: mov r0, #0 pop {r4, pc} @@ -7245,7 +7245,7 @@ _021DAA3A: add sp, #0x10 pop {r3, r4, r5, pc} _021DAA44: - bl ErrorHandling + bl GF_AssertFail _021DAA48: mov r0, #0 add sp, #0x10 @@ -7397,7 +7397,7 @@ _021DAB5E: mov r0, #1 pop {r3, r4, r5, pc} _021DAB68: - bl ErrorHandling + bl GF_AssertFail _021DAB6C: mov r0, #0 add sp, #0x10 @@ -7511,7 +7511,7 @@ _021DAC2E: mov r0, #1 pop {r3, r4, r5, pc} _021DAC38: - bl ErrorHandling + bl GF_AssertFail _021DAC3C: mov r0, #0 add sp, #8 @@ -7557,7 +7557,7 @@ MOD16_021DAC7C: ; 0x021DAC7C ldr r0, [r4, #0x10] cmp r0, #0 bne _021DAC8A - bl ErrorHandling + bl GF_AssertFail _021DAC8A: ldr r0, [r4, #0x10] bl FreeToHeap @@ -7579,7 +7579,7 @@ MOD16_021DAC98: ; 0x021DAC98 bl AllocFromHeap add r4, r0, #0 bne _021DACB2 - bl ErrorHandling + bl GF_AssertFail _021DACB2: add r0, r4, #0 mov r1, #0 @@ -7638,7 +7638,7 @@ MOD16_021DAD20: ; 0x021DAD20 bl AllocFromHeap add r4, r0, #0 bne _021DAD3A - bl ErrorHandling + bl GF_AssertFail _021DAD3A: add r2, r4, #0 mov r1, #0x14 @@ -7681,7 +7681,7 @@ MOD16_021DAD78: ; 0x021DAD78 bl AllocFromHeap add r4, r0, #0 bne _021DAD92 - bl ErrorHandling + bl GF_AssertFail _021DAD92: add r0, r4, #0 mov r1, #0 @@ -7745,7 +7745,7 @@ MOD16_021DAE0C: ; 0x021DAE0C bl AllocFromHeap add r4, r0, #0 bne _021DAE26 - bl ErrorHandling + bl GF_AssertFail _021DAE26: add r0, r4, #0 mov r1, #0 @@ -7805,7 +7805,7 @@ MOD16_021DAE94: ; 0x021DAE94 bl AllocFromHeap add r4, r0, #0 bne _021DAEB0 - bl ErrorHandling + bl GF_AssertFail _021DAEB0: add r0, r6, #0 mov r1, #0 @@ -7835,7 +7835,7 @@ MOD16_021DAED4: ; 0x021DAED4 bl AllocFromHeap add r4, r0, #0 bne _021DAEEE - bl ErrorHandling + bl GF_AssertFail _021DAEEE: add r2, r4, #0 mov r1, #0x18 @@ -7883,7 +7883,7 @@ MOD16_021DAF38: ; 0x021DAF38 bl AllocFromHeap add r4, r0, #0 bne _021DAF52 - bl ErrorHandling + bl GF_AssertFail _021DAF52: add r2, r4, #0 mov r1, #0x18 @@ -7931,7 +7931,7 @@ MOD16_021DAF9C: ; 0x021DAF9C bl AllocFromHeap add r4, r0, #0 bne _021DAFB6 - bl ErrorHandling + bl GF_AssertFail _021DAFB6: add r2, r4, #0 mov r1, #0x18 @@ -7979,7 +7979,7 @@ MOD16_021DB000: ; 0x021DB000 bl AllocFromHeap add r4, r0, #0 bne _021DB01A - bl ErrorHandling + bl GF_AssertFail _021DB01A: mov r0, #0 strb r0, [r4] @@ -8022,7 +8022,7 @@ MOD16_021DB058: ; 0x021DB058 bl AllocFromHeap add r4, r0, #0 bne _021DB072 - bl ErrorHandling + bl GF_AssertFail _021DB072: mov r0, #0 strb r0, [r4] @@ -8065,7 +8065,7 @@ MOD16_021DB0B0: ; 0x021DB0B0 bl AllocFromHeap add r4, r0, #0 bne _021DB0CA - bl ErrorHandling + bl GF_AssertFail _021DB0CA: add r2, r4, #0 mov r1, #0x18 @@ -8113,7 +8113,7 @@ MOD16_021DB114: ; 0x021DB114 bl AllocFromHeap add r4, r0, #0 bne _021DB12E - bl ErrorHandling + bl GF_AssertFail _021DB12E: mov r0, #0 strb r0, [r4] @@ -8156,7 +8156,7 @@ MOD16_021DB16C: ; 0x021DB16C bl AllocFromHeap add r4, r0, #0 bne _021DB186 - bl ErrorHandling + bl GF_AssertFail _021DB186: add r2, r4, #0 mov r1, #0x18 @@ -8204,7 +8204,7 @@ MOD16_021DB1D0: ; 0x021DB1D0 bl AllocFromHeap add r4, r0, #0 bne _021DB1EA - bl ErrorHandling + bl GF_AssertFail _021DB1EA: mov r0, #0 strb r0, [r4] @@ -8244,7 +8244,7 @@ MOD16_021DB228: ; 0x021DB228 bl AllocFromHeap add r4, r0, #0 bne _021DB23C - bl ErrorHandling + bl GF_AssertFail _021DB23C: add r2, r4, #0 mov r1, #0x18 @@ -8265,7 +8265,7 @@ _021DB242: str r0, [r4, #0xc] cmp r0, #0 bne _021DB268 - bl ErrorHandling + bl GF_AssertFail _021DB268: ldr r2, [r5, #8] ldr r0, [r4, #0xc] @@ -8289,7 +8289,7 @@ MOD16_021DB288: ; 0x021DB288 push {r4, lr} add r4, r0, #0 bne _021DB292 - bl ErrorHandling + bl GF_AssertFail _021DB292: add r0, r4, #0 bl MOD16_021DB358 @@ -8335,7 +8335,7 @@ MOD16_021DB2D4: ; 0x021DB2D4 bl MOD16_021DB460 add r4, r0, #0 bne _021DB2EA - bl ErrorHandling + bl GF_AssertFail _021DB2EA: ldr r2, [r5, #0x20] add r0, r6, #0 @@ -8433,9 +8433,9 @@ MOD16_021DB388: ; 0x021DB388 add r4, r1, #0 mov r1, #1 add r6, r2, #0 - bl FUN_02018FF4 + bl AllocWindows add r7, r0, #0 - bl FUN_0201901C + bl InitWindow mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -8473,7 +8473,7 @@ MOD16_021DB3C8: ; 0x021DB3C8 bl NewMsgDataFromNarc add r5, r0, #0 bne _021DB3E4 - bl ErrorHandling + bl GF_AssertFail _021DB3E4: add r0, r5, #0 add r1, r4, #0 @@ -8649,7 +8649,7 @@ _021DB4FC: cmp r4, r0 blt _021DB50A _021DB506: - bl ErrorHandling + bl GF_AssertFail _021DB50A: str r4, [r5, #0xc] pop {r3, r4, r5, pc} @@ -8660,7 +8660,7 @@ _021DB50E: cmp r4, r0 blt _021DB51C _021DB518: - bl ErrorHandling + bl GF_AssertFail _021DB51C: str r4, [r5, #0x10] pop {r3, r4, r5, pc} @@ -8805,7 +8805,7 @@ MOD16_021DB5EC: ; 0x021DB5EC beq _021DB602 cmp r4, #1 beq _021DB602 - bl ErrorHandling + bl GF_AssertFail _021DB602: ldr r0, [r5, #0xc] mov r1, #0x1c @@ -8852,7 +8852,7 @@ MOD16_021DB63C: ; 0x021DB63C beq _021DB652 cmp r4, #1 beq _021DB652 - bl ErrorHandling + bl GF_AssertFail _021DB652: ldr r0, [r5, #0x10] mov r1, #0x1c @@ -9139,7 +9139,7 @@ MOD16_021DB7F4: ; 0x021DB7F4 str r0, [sp, #0x10] str r0, [sp, #0x14] ldr r0, [sp, #0x18] - bl FUN_02019658 + bl BlitBitmapRectToWindow _021DB848: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -9655,7 +9655,7 @@ _021DBBA0: mov r4, #0x2f b _021DBBA8 _021DBBA4: - bl ErrorHandling + bl GF_AssertFail _021DBBA8: add r0, r4, #0 pop {r4, pc} @@ -9767,7 +9767,7 @@ MOD16_021DBC48: ; 0x021DBC48 bne _021DBC74 cmp r4, #1 blt _021DBC6C - bl ErrorHandling + bl GF_AssertFail _021DBC6C: add r0, r5, r4 str r0, [sp, #4] @@ -9781,7 +9781,7 @@ _021DBC6C: _021DBC74: cmp r4, #1 blt _021DBC7C - bl ErrorHandling + bl GF_AssertFail _021DBC7C: ldr r0, [sp, #4] ldr r1, [sp, #0xc] @@ -9851,7 +9851,7 @@ MOD16_021DBCE0: ; 0x021DBCE0 str r0, [r5] cmp r0, #6 blt _021DBCFA - bl ErrorHandling + bl GF_AssertFail _021DBCFA: add r0, r7, #0 bl GetMeisterSpeciesIdx @@ -9859,7 +9859,7 @@ _021DBCFA: ldr r5, [r5] cmp r5, #6 blt _021DBD0C - bl ErrorHandling + bl GF_AssertFail _021DBD0C: cmp r5, #1 bne _021DBD12 @@ -9878,7 +9878,7 @@ _021DBD22: _021DBD24: cmp r0, #0 bne _021DBD2C - bl ErrorHandling + bl GF_AssertFail _021DBD2C: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -9944,12 +9944,12 @@ _021DBD82: add r0, sp, #8 str r0, [sp, #4] .ifdef DIAMOND - mov r0, #0x8b + mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND .else - mov r0, #0x8c + mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL .endif add r1, r5, r1 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut str r0, [r4] ldr r0, [sp, #8] lsr r0, r0, #2 @@ -9972,12 +9972,12 @@ MOD16_021DBDC0: ; 0x021DBDC0 push {r4, lr} add r4, r0, #0 bne _021DBDCA - bl ErrorHandling + bl GF_AssertFail _021DBDCA: ldr r0, [r4] cmp r0, #0 bne _021DBDD4 - bl ErrorHandling + bl GF_AssertFail _021DBDD4: ldr r0, [r4] bl FreeToHeap @@ -9999,12 +9999,12 @@ MOD16_021DBDE4: ; 0x021DBDE4 add r0, sp, #8 str r0, [sp, #4] .ifdef DIAMOND - mov r0, #0x8b + mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND .else - mov r0, #0x8c + mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL .endif add r2, r1, #0 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut cmp r4, #0 beq _021DBE06 ldr r1, [sp, #8] @@ -10027,12 +10027,12 @@ MOD16_021DBE0C: ; 0x021DBE0C add r0, sp, #8 str r0, [sp, #4] .ifdef DIAMOND - mov r0, #0x8b + mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND .else - mov r0, #0x8c + mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL .endif mov r1, #2 - bl FUN_02006D18 + bl GfGfxLoader_LoadFromNarc_GetSizeOut add r5, r0, #0 cmp r4, #0 beq _021DBE34 @@ -10059,7 +10059,7 @@ MOD16_021DBE3C: ; 0x021DBE3C add r0, r1, r0 cmp r0, r2 blt _021DBE54 - bl ErrorHandling + bl GF_AssertFail _021DBE54: ldrb r1, [r4] ldrb r0, [r4, #2] @@ -10067,7 +10067,7 @@ _021DBE54: ldr r0, [sp, #4] cmp r1, r0 blt _021DBE64 - bl ErrorHandling + bl GF_AssertFail _021DBE64: ldrb r7, [r4, #1] ldrb r0, [r4, #3] @@ -10154,7 +10154,7 @@ _021DBEF2: ldr r0, [r0, r7] cmp r0, #0 bne _021DBF00 - bl ErrorHandling + bl GF_AssertFail _021DBF00: mov r1, #0 cmp r4, #0 @@ -10282,13 +10282,13 @@ _021DBFE0: ldr r0, [r0, r6] cmp r0, #0 bne _021DBFEC - bl ErrorHandling + bl GF_AssertFail _021DBFEC: ldr r1, [sp, #0x10] ldr r0, [sp, #0x14] cmp r1, r0 blt _021DBFF8 - bl ErrorHandling + bl GF_AssertFail _021DBFF8: mov r1, #0 cmp r4, #0 @@ -10442,7 +10442,7 @@ MOD16_021DC10C: ; 0x021DC10C bl AllocFromHeap add r4, r0, #0 bne _021DC11E - bl ErrorHandling + bl GF_AssertFail _021DC11E: add r0, r4, #0 mov r1, #0 @@ -10469,7 +10469,7 @@ MOD16_021DC148: ; 0x021DC148 push {r4, lr} add r4, r0, #0 bne _021DC152 - bl ErrorHandling + bl GF_AssertFail _021DC152: add r0, r4, #0 bl FreeToHeap @@ -10485,7 +10485,7 @@ MOD16_021DC15C: ; 0x021DC15C bl AllocFromHeap add r4, r0, #0 bne _021DC16E - bl ErrorHandling + bl GF_AssertFail _021DC16E: mov r0, #0 strb r0, [r4] @@ -10504,7 +10504,7 @@ MOD16_021DC184: ; 0x021DC184 push {r4, lr} add r4, r0, #0 bne _021DC18E - bl ErrorHandling + bl GF_AssertFail _021DC18E: add r0, r4, #0 bl FreeToHeap @@ -10562,7 +10562,7 @@ MOD16_021DC1F8: ; 0x021DC1F8 push {r4, lr} add r4, r0, #0 bne _021DC202 - bl ErrorHandling + bl GF_AssertFail _021DC202: add r0, r4, #0 bl MOD16_021DAC7C @@ -10600,7 +10600,7 @@ MOD16_021DC234: ; 0x021DC234 str r0, [r5, #8] cmp r0, #0 bne _021DC24C - bl ErrorHandling + bl GF_AssertFail _021DC24C: ldr r0, [r5, #8] mov r1, #0 @@ -10698,7 +10698,7 @@ _021DC2E8: bl AllocFromHeap add r7, r0, #0 bne _021DC2FA - bl ErrorHandling + bl GF_AssertFail _021DC2FA: str r7, [r4, #8] add r0, r7, #0 @@ -10782,7 +10782,7 @@ _021DC388: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021DC39C: - bl ErrorHandling + bl GF_AssertFail _021DC3A0: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -10933,7 +10933,7 @@ _021DC4C2: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021DC4C6: - bl ErrorHandling + bl GF_AssertFail _021DC4CA: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -12746,7 +12746,7 @@ MOD16_021DD2F4: ; 0x021DD2F4 str r0, [sp] cmp r0, #0 bne _021DD312 - bl ErrorHandling + bl GF_AssertFail _021DD312: mov r0, #0x15 lsl r0, r0, #4 @@ -13350,7 +13350,7 @@ _021DD77E: ldr r0, [r5] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5] mov r1, #1 ldr r0, [r0] @@ -13505,7 +13505,7 @@ _021DD8A8: ldr r0, [r5] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5] mov r1, #1 ldr r0, [r0] @@ -14019,7 +14019,7 @@ MOD16_021DDCA4: ; 0x021DDCA4 bl AllocFromHeap add r4, r0, #0 bne _021DDCB8 - bl ErrorHandling + bl GF_AssertFail _021DDCB8: add r0, r4, #0 mov r1, #0 @@ -14055,7 +14055,7 @@ MOD16_021DDCEC: ; 0x021DDCEC bl AllocFromHeap add r4, r0, #0 bne _021DDCFE - bl ErrorHandling + bl GF_AssertFail _021DDCFE: mov r0, #0 strb r0, [r4] @@ -14083,7 +14083,7 @@ MOD16_021DDD14: ; 0x021DDD14 bl AllocFromHeap add r4, r0, #0 bne _021DDD34 - bl ErrorHandling + bl GF_AssertFail _021DDD34: add r0, r4, #0 mov r1, #0 @@ -14104,7 +14104,7 @@ MOD16_021DDD50: ; 0x021DDD50 push {r4, lr} add r4, r0, #0 bne _021DDD5A - bl ErrorHandling + bl GF_AssertFail _021DDD5A: add r0, r4, #0 bl FreeToHeap @@ -14117,7 +14117,7 @@ MOD16_021DDD64: ; 0x021DDD64 push {r4, lr} add r4, r0, #0 bne _021DDD6E - bl ErrorHandling + bl GF_AssertFail _021DDD6E: add r0, r4, #0 bl FreeToHeap @@ -14130,7 +14130,7 @@ MOD16_021DDD78: ; 0x021DDD78 push {r4, lr} add r4, r0, #0 bne _021DDD82 - bl ErrorHandling + bl GF_AssertFail _021DDD82: add r0, r4, #0 bl MOD16_021DAC7C @@ -14156,7 +14156,7 @@ MOD16_021DDD94: ; 0x021DDD94 str r0, [r5, #8] cmp r0, #0 bne _021DDDAC - bl ErrorHandling + bl GF_AssertFail _021DDDAC: ldr r0, [r5, #8] mov r1, #0 @@ -14266,7 +14266,7 @@ _021DDE60: str r0, [r4, #8] cmp r0, #0 bne _021DDE72 - bl ErrorHandling + bl GF_AssertFail _021DDE72: ldr r0, [r4, #8] mov r1, #0 @@ -15179,7 +15179,7 @@ MOD16_021DE594: ; 0x021DE594 ldr r4, [r1] cmp r0, #0 bne _021DE5AA - bl ErrorHandling + bl GF_AssertFail _021DE5AA: mov r0, #0x51 lsl r0, r0, #2 @@ -15981,7 +15981,7 @@ MOD16_021DEBA4: ; 0x021DEBA4 ldr r4, [r0] cmp r5, #4 blt _021DEBB2 - bl ErrorHandling + bl GF_AssertFail _021DEBB2: str r5, [r4, #0xc] pop {r3, r4, r5, pc} @@ -16003,7 +16003,7 @@ MOD16_021DEBC0: ; 0x021DEBC0 ldr r4, [r0] cmp r5, #6 blt _021DEBCE - bl ErrorHandling + bl GF_AssertFail _021DEBCE: str r5, [r4, #0x10] pop {r3, r4, r5, pc} @@ -16025,7 +16025,7 @@ MOD16_021DEBDC: ; 0x021DEBDC ldr r4, [r0] cmp r5, #0xa blt _021DEBEA - bl ErrorHandling + bl GF_AssertFail _021DEBEA: str r5, [r4, #0x14] pop {r3, r4, r5, pc} @@ -16048,7 +16048,7 @@ MOD16_021DEBF8: ; 0x021DEBF8 ldr r4, [r0] cmp r5, #0x12 blt _021DEC08 - bl ErrorHandling + bl GF_AssertFail _021DEC08: cmp r6, #0 bne _021DEC10 @@ -16079,7 +16079,7 @@ MOD16_021DEC24: ; 0x021DEC24 ldr r4, [r0] cmp r5, #0xf blt _021DEC32 - bl ErrorHandling + bl GF_AssertFail _021DEC32: str r5, [r4, #0x20] pop {r3, r4, r5, pc} @@ -16136,7 +16136,7 @@ MOD16_021DEC64: ; 0x021DEC64 bl AllocFromHeap add r4, r0, #0 bne _021DEC76 - bl ErrorHandling + bl GF_AssertFail _021DEC76: add r0, r4, #0 mov r1, #0 @@ -16165,7 +16165,7 @@ MOD16_021DECA0: ; 0x021DECA0 bl AllocFromHeap add r4, r0, #0 bne _021DECB2 - bl ErrorHandling + bl GF_AssertFail _021DECB2: mov r0, #0 strb r0, [r4] @@ -16193,7 +16193,7 @@ MOD16_021DECC8: ; 0x021DECC8 bl AllocFromHeap add r4, r0, #0 bne _021DECE8 - bl ErrorHandling + bl GF_AssertFail _021DECE8: add r0, r4, #0 mov r1, #0 @@ -16214,7 +16214,7 @@ MOD16_021DED04: ; 0x021DED04 push {r4, lr} add r4, r0, #0 bne _021DED0E - bl ErrorHandling + bl GF_AssertFail _021DED0E: add r0, r4, #0 bl FreeToHeap @@ -16227,7 +16227,7 @@ MOD16_021DED18: ; 0x021DED18 push {r4, lr} add r4, r0, #0 bne _021DED22 - bl ErrorHandling + bl GF_AssertFail _021DED22: add r0, r4, #0 bl FreeToHeap @@ -16240,7 +16240,7 @@ MOD16_021DED2C: ; 0x021DED2C push {r4, lr} add r4, r0, #0 bne _021DED36 - bl ErrorHandling + bl GF_AssertFail _021DED36: add r0, r4, #0 bl MOD16_021DAC7C @@ -16265,7 +16265,7 @@ MOD16_021DED48: ; 0x021DED48 bl AllocFromHeap add r6, r0, #0 bne _021DED5E - bl ErrorHandling + bl GF_AssertFail _021DED5E: mov r0, #0 strb r0, [r6] @@ -16435,7 +16435,7 @@ _021DEE84: str r0, [r5] b _021DEE9A _021DEE96: - bl ErrorHandling + bl GF_AssertFail _021DEE9A: mov r0, #0 add sp, #0x14 @@ -16653,7 +16653,7 @@ MOD16_021DEFF8: ; 0x021DEFF8 ldr r0, [r5] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5] mov r1, #7 add r0, r0, #4 @@ -16737,7 +16737,7 @@ MOD16_021DF0BC: ; 0x021DF0BC ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] mov r1, #0 add r0, r0, #4 @@ -17058,7 +17058,7 @@ MOD16_021DF350: ; 0x021DF350 mov r1, #0 mov r2, #0x18 mov r3, #8 - bl FUN_020196F4 + bl FillWindowPixelRect cmp r6, #3 bhi _021DF394 add r0, r6, r6 @@ -17135,7 +17135,7 @@ MOD16_021DF3E4: ; 0x021DF3E4 mov r1, #0 mov r2, #0x18 mov r3, #8 - bl FUN_020196F4 + bl FillWindowPixelRect mov r0, #0x5d add r1, r5, #0 bl MOD16_021D8270 @@ -17387,7 +17387,7 @@ MOD16_021DF5D0: ; 0x021DF5D0 mov r1, #0 mov r2, #0x58 mov r3, #0x34 - bl FUN_020196F4 + bl FillWindowPixelRect add r5, #0x51 add r0, r5, #0 add r1, r6, #0 @@ -17433,7 +17433,7 @@ MOD16_021DF630: ; 0x021DF630 mov r1, #0 mov r2, #0x58 mov r3, #0x4d - bl FUN_020196F4 + bl FillWindowPixelRect cmp r6, #9 bhi _021DF698 add r0, r6, r6 @@ -17529,7 +17529,7 @@ MOD16_021DF6D8: ; 0x021DF6D8 mov r1, #0 mov r2, #0x58 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect cmp r6, #0x11 bhi _021DF774 add r0, r6, r6 @@ -17852,7 +17852,7 @@ _021DF92E: ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] add r0, r0, #4 bl FUN_02019220 @@ -17883,7 +17883,7 @@ MOD16_021DF970: ; 0x021DF970 add r4, r1, #0 add r0, r5, #4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x5e add r1, r4, #0 bl MOD16_021D8270 @@ -17928,7 +17928,7 @@ MOD16_021DF9C0: ; 0x021DF9C0 ldr r0, [r5] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4] add r0, r5, #0 add r2, r6, #0 @@ -18023,7 +18023,7 @@ MOD16_021DFAA0: ; 0x021DFAA0 bl AllocFromHeap add r4, r0, #0 bne _021DFAB2 - bl ErrorHandling + bl GF_AssertFail _021DFAB2: add r2, r4, #0 mov r1, #0x10 @@ -18059,7 +18059,7 @@ MOD16_021DFAE8: ; 0x021DFAE8 bl AllocFromHeap add r4, r0, #0 bne _021DFAFA - bl ErrorHandling + bl GF_AssertFail _021DFAFA: mov r0, #0 strb r0, [r4] @@ -18092,7 +18092,7 @@ MOD16_021DFB24: ; 0x021DFB24 push {r4, lr} add r4, r0, #0 bne _021DFB2E - bl ErrorHandling + bl GF_AssertFail _021DFB2E: add r0, r4, #0 bl FreeToHeap @@ -18105,7 +18105,7 @@ MOD16_021DFB38: ; 0x021DFB38 push {r4, lr} add r4, r0, #0 bne _021DFB42 - bl ErrorHandling + bl GF_AssertFail _021DFB42: add r0, r4, #0 bl FreeToHeap @@ -18135,7 +18135,7 @@ MOD16_021DFB54: ; 0x021DFB54 bl AllocFromHeap add r4, r0, #0 bne _021DFB6A - bl ErrorHandling + bl GF_AssertFail _021DFB6A: add r0, r4, #0 mov r1, #0 @@ -22376,7 +22376,7 @@ _021E195A: mov r4, #4 b _021E1962 _021E195E: - bl ErrorHandling + bl GF_AssertFail _021E1962: ldr r0, [r5, #0x18] mov r1, #4 @@ -25366,7 +25366,7 @@ MOD16_021E2F38: ; 0x021E2F38 ldr r4, [r0] cmp r5, #3 blt _021E2F46 - bl ErrorHandling + bl GF_AssertFail _021E2F46: str r5, [r4, #4] pop {r3, r4, r5, pc} @@ -25405,7 +25405,7 @@ MOD16_021E2F64: ; 0x021E2F64 bl AllocFromHeap add r4, r0, #0 bne _021E2F76 - bl ErrorHandling + bl GF_AssertFail _021E2F76: mov r0, #0 strb r0, [r4] @@ -25440,7 +25440,7 @@ MOD16_021E2FA8: ; 0x021E2FA8 bl AllocFromHeap add r4, r0, #0 bne _021E2FBA - bl ErrorHandling + bl GF_AssertFail _021E2FBA: add r2, r4, #0 mov r1, #0x14 @@ -25462,7 +25462,7 @@ MOD16_021E2FD4: ; 0x021E2FD4 push {r4, lr} add r4, r0, #0 bne _021E2FDE - bl ErrorHandling + bl GF_AssertFail _021E2FDE: add r0, r4, #0 bl FreeToHeap @@ -25475,7 +25475,7 @@ MOD16_021E2FE8: ; 0x021E2FE8 push {r4, lr} add r4, r0, #0 bne _021E2FF2 - bl ErrorHandling + bl GF_AssertFail _021E2FF2: add r0, r4, #0 bl FreeToHeap @@ -25499,7 +25499,7 @@ MOD16_021E3000: ; 0x021E3000 bl AllocFromHeap add r4, r0, #0 bne _021E3016 - bl ErrorHandling + bl GF_AssertFail _021E3016: add r0, r4, #0 mov r1, #0 @@ -26488,7 +26488,7 @@ MOD16_021E37E8: ; 0x021E37E8 ldr r7, [r4] cmp r0, #0 bne _021E3800 - bl ErrorHandling + bl GF_AssertFail _021E3800: mov r0, #0x51 ldr r1, [r4] @@ -26946,7 +26946,7 @@ MOD16_021E3B70: ; 0x021E3B70 add r6, r2, #0 add r0, r0, #4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer str r6, [sp] ldr r3, _021E3BBC ; =0x000007F8 ldr r0, [r4] @@ -26985,7 +26985,7 @@ MOD16_021E3BC8: ; 0x021E3BC8 ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] mov r1, #1 ldr r0, [r0] @@ -27335,7 +27335,7 @@ MOD16_021E3E6C: ; 0x021E3E6C ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 lsl r0, r0, #0xa ldr r3, [r5, r0] @@ -27541,7 +27541,7 @@ _021E3FFA: str r0, [sp] b _021E4008 _021E4004: - bl ErrorHandling + bl GF_AssertFail _021E4008: add r0, r5, #0 ldr r2, [sp, #4] @@ -27894,7 +27894,7 @@ MOD16_021E42AC: ; 0x021E42AC bl AllocFromHeap add r4, r0, #0 bne _021E42BE - bl ErrorHandling + bl GF_AssertFail _021E42BE: mov r0, #0 strb r0, [r4] @@ -27925,7 +27925,7 @@ MOD16_021E42E8: ; 0x021E42E8 bl AllocFromHeap add r4, r0, #0 bne _021E42FA - bl ErrorHandling + bl GF_AssertFail _021E42FA: mov r0, #0 strb r0, [r4] @@ -27950,7 +27950,7 @@ MOD16_021E4314: ; 0x021E4314 push {r4, lr} add r4, r0, #0 bne _021E431E - bl ErrorHandling + bl GF_AssertFail _021E431E: add r0, r4, #0 bl FreeToHeap @@ -27963,7 +27963,7 @@ MOD16_021E4328: ; 0x021E4328 push {r4, lr} add r4, r0, #0 bne _021E4332 - bl ErrorHandling + bl GF_AssertFail _021E4332: add r0, r4, #0 bl FreeToHeap @@ -27993,7 +27993,7 @@ MOD16_021E4344: ; 0x021E4344 bl AllocFromHeap add r4, r0, #0 bne _021E435A - bl ErrorHandling + bl GF_AssertFail _021E435A: add r0, r4, #0 mov r1, #0 @@ -28963,7 +28963,7 @@ _021E4A6C: bl FUN_0201C2C8 cmp r0, #0 bne _021E4A86 - bl ErrorHandling + bl GF_AssertFail _021E4A86: pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD16_021E49B8 @@ -29023,7 +29023,7 @@ _021E4ACE: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _021E4B10 ; =UNK_020FFA38 + ldr r0, _021E4B10 ; =FX_SinCosTable_ mov r2, #3 ldrsh r0, [r0, r1] lsl r2, r2, #0x10 @@ -29044,7 +29044,7 @@ _021E4ACE: pop {r3, pc} .align 2, 0 _021E4B0C: .word 0x00007FFF -_021E4B10: .word UNK_020FFA38 +_021E4B10: .word FX_SinCosTable_ thumb_func_end MOD16_021E4AC0 thumb_func_start MOD16_021E4B14 @@ -29157,7 +29157,7 @@ MOD16_021E4BCC: ; 0x021E4BCC bl AllocFromHeap add r4, r0, #0 bne _021E4BDE - bl ErrorHandling + bl GF_AssertFail _021E4BDE: add r0, r4, #0 mov r1, #0 @@ -29186,7 +29186,7 @@ MOD16_021E4C08: ; 0x021E4C08 bl AllocFromHeap add r4, r0, #0 bne _021E4C1A - bl ErrorHandling + bl GF_AssertFail _021E4C1A: mov r0, #0 strb r0, [r4] @@ -29205,7 +29205,7 @@ MOD16_021E4C30: ; 0x021E4C30 push {r4, lr} add r4, r0, #0 bne _021E4C3A - bl ErrorHandling + bl GF_AssertFail _021E4C3A: add r0, r4, #0 bl FreeToHeap @@ -29218,7 +29218,7 @@ MOD16_021E4C44: ; 0x021E4C44 push {r4, lr} add r4, r0, #0 bne _021E4C4E - bl ErrorHandling + bl GF_AssertFail _021E4C4E: add r0, r4, #0 bl FreeToHeap @@ -29593,7 +29593,7 @@ MOD16_021E4EE4: ; 0x021E4EE4 ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r1, r4, #0 bl MOD16_021E5224 @@ -31367,7 +31367,7 @@ MOD16_021E5C88: ; 0x021E5C88 bl AllocFromHeap add r4, r0, #0 bne _021E5C9A - bl ErrorHandling + bl GF_AssertFail _021E5C9A: add r2, r4, #0 mov r1, #0x18 @@ -31400,7 +31400,7 @@ MOD16_021E5CC8: ; 0x021E5CC8 bl AllocFromHeap add r4, r0, #0 bne _021E5CDA - bl ErrorHandling + bl GF_AssertFail _021E5CDA: mov r0, #0 strb r0, [r4] @@ -31427,7 +31427,7 @@ MOD16_021E5D00: ; 0x021E5D00 push {r4, lr} add r4, r0, #0 bne _021E5D0A - bl ErrorHandling + bl GF_AssertFail _021E5D0A: add r0, r4, #0 bl FreeToHeap @@ -31440,7 +31440,7 @@ MOD16_021E5D14: ; 0x021E5D14 push {r4, lr} add r4, r0, #0 bne _021E5D1E - bl ErrorHandling + bl GF_AssertFail _021E5D1E: add r0, r4, #0 bl FreeToHeap @@ -31676,7 +31676,7 @@ _021E5E94: str r0, [r4] b _021E5EC4 _021E5EC0: - bl ErrorHandling + bl GF_AssertFail _021E5EC4: add r0, r6, #0 bl MOD16_021E6E44 @@ -31940,7 +31940,7 @@ MOD16_021E60A8: ; 0x021E60A8 ldr r4, [sp, #0x2c] cmp r5, #2 ble _021E60C0 - bl ErrorHandling + bl GF_AssertFail _021E60C0: ldr r0, [sp, #0x28] cmp r0, #9 @@ -32033,7 +32033,7 @@ _021E615E: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021E6172: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -32809,7 +32809,7 @@ _021E6718: mvn r0, r0 cmp r4, r0 bne _021E673C - bl ErrorHandling + bl GF_AssertFail _021E673C: cmp r4, #0 bne _021E6744 @@ -32871,7 +32871,7 @@ _021E6784: mvn r1, r1 cmp r0, r1 bne _021E67AA - bl ErrorHandling + bl GF_AssertFail _021E67AA: add r0, r4, #1 add r1, sp, #0x18 @@ -32902,7 +32902,7 @@ _021E67C4: mvn r1, r1 cmp r0, r1 bne _021E67EA - bl ErrorHandling + bl GF_AssertFail _021E67EA: add sp, #0x1c pop {r4, r5, r6, r7, pc} @@ -32947,7 +32947,7 @@ _021E681A: mvn r1, r1 cmp r0, r1 bne _021E683C - bl ErrorHandling + bl GF_AssertFail _021E683C: add r0, r4, #1 add r1, sp, #0x10 @@ -32976,7 +32976,7 @@ _021E6856: mvn r1, r1 cmp r0, r1 bne _021E6878 - bl ErrorHandling + bl GF_AssertFail _021E6878: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33020,7 +33020,7 @@ _021E68A6: mvn r1, r1 cmp r0, r1 bne _021E68C8 - bl ErrorHandling + bl GF_AssertFail _021E68C8: add r0, r4, #1 add r1, sp, #0x10 @@ -33049,7 +33049,7 @@ _021E68E2: mvn r1, r1 cmp r0, r1 bne _021E6904 - bl ErrorHandling + bl GF_AssertFail _021E6904: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33093,7 +33093,7 @@ _021E6932: mvn r1, r1 cmp r0, r1 bne _021E6954 - bl ErrorHandling + bl GF_AssertFail _021E6954: add r0, r4, #1 add r1, sp, #0x10 @@ -33122,7 +33122,7 @@ _021E696E: mvn r1, r1 cmp r0, r1 bne _021E6990 - bl ErrorHandling + bl GF_AssertFail _021E6990: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33166,7 +33166,7 @@ _021E69BE: mvn r1, r1 cmp r0, r1 bne _021E69E0 - bl ErrorHandling + bl GF_AssertFail _021E69E0: add r0, r4, #1 add r1, sp, #0x10 @@ -33195,7 +33195,7 @@ _021E69FA: mvn r1, r1 cmp r0, r1 bne _021E6A1C - bl ErrorHandling + bl GF_AssertFail _021E6A1C: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33239,7 +33239,7 @@ _021E6A4A: mvn r1, r1 cmp r0, r1 bne _021E6A6C - bl ErrorHandling + bl GF_AssertFail _021E6A6C: add r0, r4, #1 add r1, sp, #0x10 @@ -33268,7 +33268,7 @@ _021E6A86: mvn r1, r1 cmp r0, r1 bne _021E6AA8 - bl ErrorHandling + bl GF_AssertFail _021E6AA8: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33310,7 +33310,7 @@ _021E6AD6: bl MOD16_021D822C cmp r0, #0xf bne _021E6AF4 - bl ErrorHandling + bl GF_AssertFail _021E6AF4: add r0, r4, #1 add r1, sp, #0x10 @@ -33337,7 +33337,7 @@ _021E6B0E: bl MOD16_021D822C cmp r0, #0xf bne _021E6B2C - bl ErrorHandling + bl GF_AssertFail _021E6B2C: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -33468,7 +33468,7 @@ MOD16_021E6C04: ; 0x021E6C04 ldr r5, [r6] cmp r0, #0 bne _021E6C20 - bl ErrorHandling + bl GF_AssertFail _021E6C20: ldr r1, [sp, #8] ldr r2, [sp, #0x58] @@ -33553,7 +33553,7 @@ MOD16_021E6CB4: ; 0x021E6CB4 mvn r0, r0 cmp r5, r0 bne _021E6CD8 - bl ErrorHandling + bl GF_AssertFail _021E6CD8: cmp r5, #0 beq _021E6CE2 @@ -33567,7 +33567,7 @@ _021E6CE6: mov r4, #0xe b _021E6CEE _021E6CEA: - bl ErrorHandling + bl GF_AssertFail _021E6CEE: add r0, r4, #0 pop {r4, r5, r6, pc} @@ -33688,7 +33688,7 @@ _021E6D80: mov r5, #0x58 b _021E6D8E _021E6D8A: - bl ErrorHandling + bl GF_AssertFail _021E6D8E: str r4, [r6] str r5, [r7] @@ -33933,7 +33933,7 @@ MOD16_021E6F18: ; 0x021E6F18 bl AllocFromHeap add r4, r0, #0 bne _021E6F2A - bl ErrorHandling + bl GF_AssertFail _021E6F2A: add r0, r4, #0 mov r1, #0 @@ -33962,7 +33962,7 @@ MOD16_021E6F54: ; 0x021E6F54 bl AllocFromHeap add r4, r0, #0 bne _021E6F66 - bl ErrorHandling + bl GF_AssertFail _021E6F66: mov r0, #0 strb r0, [r4] @@ -33981,7 +33981,7 @@ MOD16_021E6F7C: ; 0x021E6F7C push {r4, lr} add r4, r0, #0 bne _021E6F86 - bl ErrorHandling + bl GF_AssertFail _021E6F86: add r0, r4, #0 bl FreeToHeap @@ -33994,7 +33994,7 @@ MOD16_021E6F90: ; 0x021E6F90 push {r4, lr} add r4, r0, #0 bne _021E6F9A - bl ErrorHandling + bl GF_AssertFail _021E6F9A: add r0, r4, #0 bl FreeToHeap @@ -34307,7 +34307,7 @@ MOD16_021E71A8: ; 0x021E71A8 ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r1, r4, #0 bl MOD16_021E753C @@ -34471,7 +34471,7 @@ MOD16_021E72E4: ; 0x021E72E4 cmp r0, #2 beq _021E731E mov r7, #0 - bl ErrorHandling + bl GF_AssertFail _021E731E: ldr r0, [r4, #0x18] bl MOD16_021E7A70 @@ -35467,7 +35467,7 @@ _021E7AA6: mov r4, #0x1a b _021E7AAE _021E7AAA: - bl ErrorHandling + bl GF_AssertFail _021E7AAE: add r0, r4, #0 pop {r4, pc} @@ -35605,7 +35605,7 @@ MOD16_021E7BB0: ; 0x021E7BB0 bl AllocFromHeap add r4, r0, #0 bne _021E7BC2 - bl ErrorHandling + bl GF_AssertFail _021E7BC2: add r2, r4, #0 mov r1, #0x18 @@ -35651,7 +35651,7 @@ MOD16_021E7C10: ; 0x021E7C10 bl AllocFromHeap add r4, r0, #0 bne _021E7C22 - bl ErrorHandling + bl GF_AssertFail _021E7C22: mov r0, #0 strb r0, [r4] @@ -35679,7 +35679,7 @@ MOD16_021E7C38: ; 0x021E7C38 bl AllocFromHeap add r4, r0, #0 bne _021E7C58 - bl ErrorHandling + bl GF_AssertFail _021E7C58: add r0, r4, #0 mov r1, #0 @@ -35712,7 +35712,7 @@ MOD16_021E7C90: ; 0x021E7C90 push {r4, lr} add r4, r0, #0 bne _021E7C9A - bl ErrorHandling + bl GF_AssertFail _021E7C9A: add r0, r4, #0 bl FreeToHeap @@ -35725,7 +35725,7 @@ MOD16_021E7CA4: ; 0x021E7CA4 push {r4, lr} add r4, r0, #0 bne _021E7CAE - bl ErrorHandling + bl GF_AssertFail _021E7CAE: add r0, r4, #0 bl FreeToHeap @@ -35738,7 +35738,7 @@ MOD16_021E7CB8: ; 0x021E7CB8 push {r4, lr} add r4, r0, #0 bne _021E7CC2 - bl ErrorHandling + bl GF_AssertFail _021E7CC2: add r0, r4, #0 bl MOD16_021DAC7C @@ -37007,7 +37007,7 @@ MOD16_021E868C: ; 0x021E868C ldr r4, [r1] cmp r0, #0 bne _021E86A0 - bl ErrorHandling + bl GF_AssertFail _021E86A0: mov r0, #0x51 lsl r0, r0, #2 @@ -37367,7 +37367,7 @@ _021E8934: bl FUN_0201C2C8 cmp r0, #0 bne _021E895C - bl ErrorHandling + bl GF_AssertFail _021E895C: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -37714,7 +37714,7 @@ MOD16_021E8BB8: ; 0x021E8BB8 cmp r4, #8 blt _021E8BCC _021E8BC8: - bl ErrorHandling + bl GF_AssertFail _021E8BCC: sub r0, r4, #2 lsl r1, r0, #2 @@ -37806,7 +37806,7 @@ MOD16_021E8C70: ; 0x021E8C70 bl AllocFromHeap add r4, r0, #0 bne _021E8C82 - bl ErrorHandling + bl GF_AssertFail _021E8C82: add r0, r4, #0 mov r1, #0 @@ -37865,7 +37865,7 @@ MOD16_021E8CF4: ; 0x021E8CF4 bl AllocFromHeap add r4, r0, #0 bne _021E8D06 - bl ErrorHandling + bl GF_AssertFail _021E8D06: mov r0, #0 strb r0, [r4] @@ -37893,7 +37893,7 @@ MOD16_021E8D1C: ; 0x021E8D1C bl AllocFromHeap add r4, r0, #0 bne _021E8D3C - bl ErrorHandling + bl GF_AssertFail _021E8D3C: add r0, r4, #0 mov r1, #0 @@ -37957,7 +37957,7 @@ MOD16_021E8DBC: ; 0x021E8DBC push {r4, lr} add r4, r0, #0 bne _021E8DC6 - bl ErrorHandling + bl GF_AssertFail _021E8DC6: add r0, r4, #0 bl FreeToHeap @@ -37970,7 +37970,7 @@ MOD16_021E8DD0: ; 0x021E8DD0 push {r4, lr} add r4, r0, #0 bne _021E8DDA - bl ErrorHandling + bl GF_AssertFail _021E8DDA: add r0, r4, #0 bl FreeToHeap @@ -37983,7 +37983,7 @@ MOD16_021E8DE4: ; 0x021E8DE4 push {r4, lr} add r4, r0, #0 bne _021E8DEE - bl ErrorHandling + bl GF_AssertFail _021E8DEE: add r0, r4, #0 bl MOD16_021DAC7C @@ -38147,7 +38147,7 @@ _021E8F0E: mov r0, #1 pop {r4, r5, r6, r7, pc} _021E8F1A: - bl ErrorHandling + bl GF_AssertFail _021E8F1E: mov r0, #0 add sp, #0x14 @@ -38276,7 +38276,7 @@ _021E9002: mov r0, #1 pop {r4, r5, pc} _021E9008: - bl ErrorHandling + bl GF_AssertFail _021E900C: mov r0, #0 add sp, #0x14 @@ -38525,7 +38525,7 @@ _021E91D0: str r0, [sp, #4] b _021E91DA _021E91D6: - bl ErrorHandling + bl GF_AssertFail _021E91DA: ldr r0, [sp] cmp r0, #4 @@ -38612,7 +38612,7 @@ _021E927E: bl MOD16_021EA25C b _021E928E _021E928A: - bl ErrorHandling + bl GF_AssertFail _021E928E: ldr r0, [sp, #4] add sp, #8 @@ -39050,7 +39050,7 @@ MOD16_021E95D0: ; 0x021E95D0 bl AllocFromHeap add r4, r0, #0 bne _021E95E2 - bl ErrorHandling + bl GF_AssertFail _021E95E2: add r0, r4, #0 mov r1, #0 @@ -39079,7 +39079,7 @@ MOD16_021E960C: ; 0x021E960C bl AllocFromHeap add r4, r0, #0 bne _021E961E - bl ErrorHandling + bl GF_AssertFail _021E961E: mov r0, #0 strb r0, [r4] @@ -39104,7 +39104,7 @@ MOD16_021E9638: ; 0x021E9638 push {r4, lr} add r4, r0, #0 bne _021E9642 - bl ErrorHandling + bl GF_AssertFail _021E9642: add r0, r4, #0 bl FreeToHeap @@ -39117,7 +39117,7 @@ MOD16_021E964C: ; 0x021E964C push {r4, lr} add r4, r0, #0 bne _021E9656 - bl ErrorHandling + bl GF_AssertFail _021E9656: add r0, r4, #0 bl FreeToHeap @@ -39593,7 +39593,7 @@ _021E99AE: str r0, [r4, #0x1c] pop {r4, pc} _021E99BA: - bl ErrorHandling + bl GF_AssertFail _021E99BE: pop {r4, pc} thumb_func_end MOD16_021E9940 @@ -40777,7 +40777,7 @@ MOD16_021EA274: ; 0x021EA274 bl AllocFromHeap add r4, r0, #0 bne _021EA286 - bl ErrorHandling + bl GF_AssertFail _021EA286: add r2, r4, #0 mov r1, #0x10 @@ -40813,7 +40813,7 @@ MOD16_021EA2BC: ; 0x021EA2BC bl AllocFromHeap add r4, r0, #0 bne _021EA2CE - bl ErrorHandling + bl GF_AssertFail _021EA2CE: add r2, r4, #0 mov r1, #0x14 @@ -40835,7 +40835,7 @@ MOD16_021EA2E8: ; 0x021EA2E8 push {r4, lr} add r4, r0, #0 bne _021EA2F2 - bl ErrorHandling + bl GF_AssertFail _021EA2F2: add r0, r4, #0 bl FreeToHeap @@ -40848,7 +40848,7 @@ MOD16_021EA2FC: ; 0x021EA2FC push {r4, lr} add r4, r0, #0 bne _021EA306 - bl ErrorHandling + bl GF_AssertFail _021EA306: add r0, r4, #0 bl FreeToHeap @@ -40875,7 +40875,7 @@ MOD16_021EA314: ; 0x021EA314 bl AllocFromHeap add r4, r0, #0 bne _021EA332 - bl ErrorHandling + bl GF_AssertFail _021EA332: add r2, r4, #0 mov r1, #0x18 @@ -41593,7 +41593,7 @@ MOD16_021EA858: ; 0x021EA858 add r2, r1, #0 add r0, r0, #4 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, [r4] mov r1, #1 ldr r0, [r0] @@ -41901,7 +41901,7 @@ MOD16_021EAAA4: ; 0x021EAAA4 mov r1, #0 lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r1, [sp, #0x38] ldr r0, [sp, #0xc] mov r6, #0 @@ -42016,7 +42016,7 @@ _021EABA2: mov r1, #6 lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect str r5, [r4] add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -42049,7 +42049,7 @@ MOD16_021EABC4: ; 0x021EABC4 mov r1, #0 lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect cmp r5, r6 bge _021EAC18 _021EABFE: @@ -42482,7 +42482,7 @@ MOD16_021EAF18: ; 0x021EAF18 bl AllocFromHeap add r4, r0, #0 bne _021EAF2A - bl ErrorHandling + bl GF_AssertFail _021EAF2A: add r2, r4, #0 mov r1, #0x10 @@ -42515,7 +42515,7 @@ MOD16_021EAF58: ; 0x021EAF58 bl AllocFromHeap add r4, r0, #0 bne _021EAF6A - bl ErrorHandling + bl GF_AssertFail _021EAF6A: mov r0, #0 strb r0, [r4] @@ -42540,7 +42540,7 @@ MOD16_021EAF84: ; 0x021EAF84 push {r4, lr} add r4, r0, #0 bne _021EAF8E - bl ErrorHandling + bl GF_AssertFail _021EAF8E: add r0, r4, #0 bl FreeToHeap @@ -42553,7 +42553,7 @@ MOD16_021EAF98: ; 0x021EAF98 push {r4, lr} add r4, r0, #0 bne _021EAFA2 - bl ErrorHandling + bl GF_AssertFail _021EAFA2: add r0, r4, #0 bl FreeToHeap @@ -45063,7 +45063,7 @@ MOD16_021EC274: ; 0x021EC274 bl AllocFromHeap add r4, r0, #0 bne _021EC286 - bl ErrorHandling + bl GF_AssertFail _021EC286: mov r0, #0 strb r0, [r4] @@ -45101,7 +45101,7 @@ MOD16_021EC2C0: ; 0x021EC2C0 bl AllocFromHeap add r4, r0, #0 bne _021EC2D2 - bl ErrorHandling + bl GF_AssertFail _021EC2D2: mov r0, #0 strb r0, [r4] @@ -45126,7 +45126,7 @@ MOD16_021EC2EC: ; 0x021EC2EC push {r4, lr} add r4, r0, #0 bne _021EC2F6 - bl ErrorHandling + bl GF_AssertFail _021EC2F6: add r0, r4, #0 bl FreeToHeap @@ -45139,7 +45139,7 @@ MOD16_021EC300: ; 0x021EC300 push {r4, lr} add r4, r0, #0 bne _021EC30A - bl ErrorHandling + bl GF_AssertFail _021EC30A: add r0, r4, #0 bl FreeToHeap @@ -45168,7 +45168,7 @@ MOD16_021EC31C: ; 0x021EC31C bl AllocFromHeap add r4, r0, #0 bne _021EC330 - bl ErrorHandling + bl GF_AssertFail _021EC330: mov r0, #0 strb r0, [r4] @@ -45513,7 +45513,7 @@ MOD16_021EC574: ; 0x021EC574 ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] mov r1, #1 ldr r0, [r0] @@ -46227,7 +46227,7 @@ MOD16_021ECB54: ; 0x021ECB54 bl AllocFromHeap add r4, r0, #0 bne _021ECB66 - bl ErrorHandling + bl GF_AssertFail _021ECB66: add r2, r4, #0 mov r1, #0x10 @@ -46262,7 +46262,7 @@ MOD16_021ECB98: ; 0x021ECB98 bl AllocFromHeap add r4, r0, #0 bne _021ECBAA - bl ErrorHandling + bl GF_AssertFail _021ECBAA: mov r0, #0 strb r0, [r4] @@ -46290,7 +46290,7 @@ MOD16_021ECBC0: ; 0x021ECBC0 bl AllocFromHeap add r4, r0, #0 bne _021ECBE0 - bl ErrorHandling + bl GF_AssertFail _021ECBE0: add r0, r4, #0 mov r1, #0 @@ -46316,7 +46316,7 @@ MOD16_021ECC08: ; 0x021ECC08 push {r4, lr} add r4, r0, #0 bne _021ECC12 - bl ErrorHandling + bl GF_AssertFail _021ECC12: add r0, r4, #0 bl FreeToHeap @@ -46329,7 +46329,7 @@ MOD16_021ECC1C: ; 0x021ECC1C push {r4, lr} add r4, r0, #0 bne _021ECC26 - bl ErrorHandling + bl GF_AssertFail _021ECC26: add r0, r4, #0 bl FreeToHeap @@ -46342,7 +46342,7 @@ MOD16_021ECC30: ; 0x021ECC30 push {r4, lr} add r4, r0, #0 bne _021ECC3A - bl ErrorHandling + bl GF_AssertFail _021ECC3A: add r0, r4, #0 bl MOD16_021DAC7C @@ -47231,7 +47231,7 @@ MOD16_021ED2B4: ; 0x021ED2B4 ldr r4, [r1] cmp r0, #0 bne _021ED2C8 - bl ErrorHandling + bl GF_AssertFail _021ED2C8: mov r0, #0x51 lsl r0, r0, #2 @@ -47425,7 +47425,7 @@ _021ED430: bl FUN_0201C2C8 cmp r0, #0 bne _021ED458 - bl ErrorHandling + bl GF_AssertFail _021ED458: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -47642,7 +47642,7 @@ MOD16_021ED5C8: ; 0x021ED5C8 bl AllocFromHeap add r4, r0, #0 bne _021ED5DA - bl ErrorHandling + bl GF_AssertFail _021ED5DA: mov r0, #0 strb r0, [r4] @@ -47674,7 +47674,7 @@ MOD16_021ED604: ; 0x021ED604 bl AllocFromHeap add r4, r0, #0 bne _021ED618 - bl ErrorHandling + bl GF_AssertFail _021ED618: add r0, r4, #0 mov r1, #0 @@ -47702,7 +47702,7 @@ MOD16_021ED648: ; 0x021ED648 push {r4, lr} add r4, r0, #0 bne _021ED652 - bl ErrorHandling + bl GF_AssertFail _021ED652: add r0, r4, #0 bl FreeToHeap @@ -47715,7 +47715,7 @@ MOD16_021ED65C: ; 0x021ED65C push {r4, lr} add r4, r0, #0 bne _021ED666 - bl ErrorHandling + bl GF_AssertFail _021ED666: add r0, r4, #0 bl MOD16_021EE0F0 @@ -47743,7 +47743,7 @@ MOD16_021ED680: ; 0x021ED680 bl AllocFromHeap add r4, r0, #0 bne _021ED696 - bl ErrorHandling + bl GF_AssertFail _021ED696: mov r0, #0 strb r0, [r4] @@ -48265,7 +48265,7 @@ MOD16_021EDA3C: ; 0x021EDA3C ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4] mov r1, #1 ldr r0, [r0] @@ -48398,7 +48398,7 @@ MOD16_021EDAE4: ; 0x021EDAE4 bl FUN_02009D68 cmp r0, #0 bne _021EDB82 - bl ErrorHandling + bl GF_AssertFail _021EDB82: add r0, r4, #0 mov r1, #0x60 @@ -49298,7 +49298,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 lsl r4, r0, #1 add r0, r4, #1 lsl r1, r0, #1 - ldr r0, _021EE354 ; =UNK_020FFA38 + ldr r0, _021EE354 ; =FX_SinCosTable_ mov r3, #0 ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -49312,7 +49312,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 lsr r5, r2, #0xc orr r5, r0 mov r2, #0xe - ldr r0, _021EE354 ; =UNK_020FFA38 + ldr r0, _021EE354 ; =FX_SinCosTable_ lsl r1, r4, #1 ldrsh r0, [r0, r1] lsl r2, r2, #0xe @@ -49364,7 +49364,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_021EE354: .word UNK_020FFA38 +_021EE354: .word FX_SinCosTable_ thumb_func_end MOD16_021EE2A4 thumb_func_start MOD16_021EE358 @@ -49737,7 +49737,7 @@ MOD16_021EE5D0: ; 0x021EE5D0 bl FUN_02003974 ldr r0, [sp, #4] mov r1, #1 - bl FUN_020B19C4 + bl NNS_G2dGetImagePaletteLocation add r2, r5, #0 add r2, #0xbc add r1, r0, #0 @@ -49762,7 +49762,7 @@ MOD16_021EE5D0: ; 0x021EE5D0 bl FUN_02003974 ldr r0, [sp, #8] mov r1, #1 - bl FUN_020B19C4 + bl NNS_G2dGetImagePaletteLocation add r5, #0xc0 add r1, r0, #0 ldr r2, [r5] @@ -49837,7 +49837,7 @@ MOD16_021EE6CC: ; 0x021EE6CC bl AllocFromHeap add r4, r0, #0 bne _021EE6DE - bl ErrorHandling + bl GF_AssertFail _021EE6DE: add r2, r4, #0 mov r1, #0x10 @@ -49873,7 +49873,7 @@ MOD16_021EE714: ; 0x021EE714 bl AllocFromHeap add r4, r0, #0 bne _021EE726 - bl ErrorHandling + bl GF_AssertFail _021EE726: mov r0, #0 strb r0, [r4] @@ -49898,7 +49898,7 @@ MOD16_021EE740: ; 0x021EE740 push {r4, lr} add r4, r0, #0 bne _021EE74A - bl ErrorHandling + bl GF_AssertFail _021EE74A: add r0, r4, #0 bl FreeToHeap @@ -49911,7 +49911,7 @@ MOD16_021EE754: ; 0x021EE754 push {r4, lr} add r4, r0, #0 bne _021EE75E - bl ErrorHandling + bl GF_AssertFail _021EE75E: add r0, r4, #0 bl FreeToHeap @@ -50697,7 +50697,7 @@ MOD16_021EED04: ; 0x021EED04 ldr r4, [r1] cmp r0, #0 bne _021EED18 - bl ErrorHandling + bl GF_AssertFail _021EED18: mov r0, #0x51 lsl r0, r0, #2 @@ -50853,7 +50853,7 @@ _021EEE2C: bl FUN_0201C2C8 cmp r0, #0 bne _021EEE54 - bl ErrorHandling + bl GF_AssertFail _021EEE54: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -51457,7 +51457,7 @@ MOD16_021EF318: ; 0x021EF318 add r5, r0, #0 add r0, r1, #0 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows add r4, r0, #0 mov r3, #0 str r3, [sp] @@ -51473,7 +51473,7 @@ MOD16_021EF318: ; 0x021EF318 bl FUN_02019064 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl CopyWindowToVram add r0, r4, #0 @@ -51809,7 +51809,7 @@ MOD16_021EF598: ; 0x021EF598 str r0, [r5] cmp r0, #0 bne _021EF5DA - bl ErrorHandling + bl GF_AssertFail _021EF5DA: add sp, #0x44 pop {r3, r4, r5, r6, pc} @@ -51856,7 +51856,7 @@ MOD16_021EF5EC: ; 0x021EF5EC str r0, [r5] cmp r0, #0 bne _021EF62E - bl ErrorHandling + bl GF_AssertFail _021EF62E: ldr r0, [r5] mov r1, #0x11 @@ -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] @@ -52280,7 +52280,7 @@ _021EF958: bl FUN_020056AC cmp r0, #0 bne _021EF976 - bl ErrorHandling + bl GF_AssertFail _021EF976: mov r0, #0x6e lsl r0, r0, #2 @@ -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] @@ -54602,7 +54602,7 @@ _021F0AEC: str r0, [r4, r1] pop {r3, r4, r5, pc} _021F0B0C: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} nop _021F0B14: .word 0x000003CF @@ -58151,7 +58151,7 @@ _021F266A: str r0, [r1] pop {r4, r5, r6, pc} _021F2688: - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} nop _021F2690: .word 0x000003CF @@ -58355,11 +58355,11 @@ MOD16_021F2808: ; 0x021F2808 add r6, r0, #0 cmp r4, #1 bne _021F282C - bl ErrorHandling + bl GF_AssertFail _021F282C: cmp r4, #0 bne _021F2834 - bl ErrorHandling + bl GF_AssertFail _021F2834: lsl r1, r4, #0x18 add r0, r5, #0 @@ -58394,11 +58394,11 @@ MOD16_021F2858: ; 0x021F2858 add r6, r0, #0 cmp r4, #1 bne _021F287C - bl ErrorHandling + bl GF_AssertFail _021F287C: cmp r4, #0 bne _021F2884 - bl ErrorHandling + bl GF_AssertFail _021F2884: lsl r1, r4, #0x18 add r0, r5, #0 @@ -58962,7 +58962,7 @@ MOD16_021F2C8C: ; 0x021F2C8C ldrb r0, [r4, r0] cmp r0, #8 bls _021F2CBC - bl ErrorHandling + bl GF_AssertFail _021F2CBC: pop {r3, r4, r5, pc} nop diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 82398e6b..955741b3 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -46,7 +46,7 @@ MOD17_021D7520: ; 0x021D7520 bl MOD17_021D76E0 add r4, r0, #0 bne _021D7532 - bl ErrorHandling + bl GF_AssertFail _021D7532: ldr r0, [r5, #0x18] str r0, [r4] @@ -508,7 +508,7 @@ MOD17_021D786C: ; 0x021D786C push {r4, lr} add r4, r0, #0 bl FUN_020222AC - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera ldr r0, [r4, #0x1c] cmp r0, #0 beq _021D7884 @@ -768,7 +768,7 @@ MOD17_021D7A2C: ; 0x021D7A2C lsl r5, r5, #2 add r0, r6, #0 add r1, r1, r5 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, [r4, #0x30] ldr r0, [r0, r5] pop {r4, r5, r6, pc} @@ -1046,7 +1046,7 @@ MOD17_021D7C28: ; 0x021D7C28 add r6, r2, #0 ldr r7, [sp, #0x18] str r1, [r0] - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera ldr r1, _021D7CB0 ; =0x04000470 lsl r0, r4, #0xc str r0, [r1] @@ -1055,7 +1055,7 @@ MOD17_021D7C28: ; 0x021D7C28 mov r0, #0 str r0, [r1] ldr r0, [sp] - ldr r1, _021D7CB4 ; =UNK_020FFA38 + ldr r1, _021D7CB4 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r0, r2, #1 @@ -1101,7 +1101,7 @@ _021D7CA0: nop _021D7CAC: .word 0x04000454 _021D7CB0: .word 0x04000470 -_021D7CB4: .word UNK_020FFA38 +_021D7CB4: .word FX_SinCosTable_ _021D7CB8: .word 0x0400046C _021D7CBC: .word 0x04000448 thumb_func_end MOD17_021D7C28 @@ -1173,7 +1173,7 @@ _021D7D24: .word MOD17_021DE32C thumb_func_start MOD17_021D7D28 MOD17_021D7D28: ; 0x021D7D28 push {r3, lr} - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack mov r0, #1 add r1, r0, #0 @@ -1218,11 +1218,11 @@ MOD17_021D7D28: ; 0x021D7D28 str r0, [r2] str r1, [r2, #0x40] mov r1, #1 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager pop {r3, pc} .align 2, 0 _021D7D9C: .word 0x04000008 @@ -1253,7 +1253,7 @@ MOD17_021D7DB0: ; 0x021D7DB0 mov r0, #0x10 orr r0, r1 str r0, [r2] - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule bl GX_DisableEngineALayers bl GX_DisableEngineBLayers mov r0, #0x1f @@ -1272,8 +1272,8 @@ _021D7DFC: .word 0xFFCFFFEF thumb_func_start MOD17_021D7E00 MOD17_021D7E00: ; 0x021D7E00 push {r3, lr} - bl FUN_020AEAF4 - bl FUN_020AEC60 + bl NNS_GfdResetFrmTexVramState + bl NNS_GfdResetFrmPlttVramState pop {r3, pc} thumb_func_end MOD17_021D7E00 @@ -1282,7 +1282,7 @@ MOD17_021D7E0C: ; 0x021D7E0C push {r3, lr} bl GX_DisableEngineALayers bl GX_DisableEngineBLayers - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule pop {r3, pc} thumb_func_end MOD17_021D7E0C @@ -1357,7 +1357,7 @@ _021D7E8E: ldr r0, [r5, #8] cmp r1, r0 blt _021D7E9A - bl ErrorHandling + bl GF_AssertFail _021D7E9A: ldr r0, [r4, #4] cmp r0, #0 @@ -1412,7 +1412,7 @@ _021D7EEE: ldr r0, [r5, #0x14] cmp r1, r0 blt _021D7EFA - bl ErrorHandling + bl GF_AssertFail _021D7EFA: ldr r0, [r4, #4] cmp r0, #0 @@ -1658,7 +1658,7 @@ MOD17_021D80CC: ; 0x021D80CC bl FUN_0201E00C bl FUN_0201D168 bl FUN_0201E0BC - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7c @@ -1752,11 +1752,11 @@ _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 - bl ErrorHandling + bl GF_AssertFail _021D81C6: ldr r1, [sp, #4] add r0, r7, #0 @@ -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 @@ -1787,7 +1787,7 @@ _021D81C6: ldr r1, [r6, #8] add r0, r4, #0 add r1, r1, #4 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r1, [r7] ldr r0, [r6, #8] str r1, [r0] @@ -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] @@ -1851,13 +1851,13 @@ _021D822A: ldr r0, [sp, #0xc] add r1, r1, r6 add r1, r1, #4 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r0, [r5, #8] add r0, r0, r6 ldr r0, [r0, #4] cmp r0, #0 bne _021D8298 - bl ErrorHandling + bl GF_AssertFail _021D8298: ldr r1, [r7] ldr r0, [r5, #8] @@ -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} @@ -1914,13 +1914,13 @@ MOD17_021D82E4: ; 0x021D82E4 add r6, r3, #0 bl FUN_02006D98 str r0, [r5, #0x20] - ldr r3, _021D833C ; =UNK_021064B8 + ldr r3, _021D833C ; =NNS_GfdDefaultFuncAllocTexVram mov r1, #0 ldr r3, [r3] add r0, r4, #0 add r2, r1, #0 blx r3 - ldr r3, _021D8340 ; =UNK_021064C0 + ldr r3, _021D8340 ; =NNS_GfdDefaultFuncAllocPlttVram add r4, r0, #0 ldr r3, [r3] add r0, r6, #0 @@ -1948,8 +1948,8 @@ MOD17_021D82E4: ; 0x021D82E4 str r0, [r5, #0x24] pop {r4, r5, r6, pc} nop -_021D833C: .word UNK_021064B8 -_021D8340: .word UNK_021064C0 +_021D833C: .word NNS_GfdDefaultFuncAllocTexVram +_021D8340: .word NNS_GfdDefaultFuncAllocPlttVram _021D8344: .word 0x7FFF0000 _021D8348: .word 0xFFFF0000 thumb_func_end MOD17_021D82E4 @@ -2123,7 +2123,7 @@ MOD17_021D83E4: ; 0x021D83E4 str r0, [r5, r1] mov r0, #0xd mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows ldr r2, _021D84EC ; =0x000006A8 mov r1, #0 str r0, [r5, r2] @@ -2506,7 +2506,7 @@ _021D8780: bl FUN_0201CD04 cmp r0, #1 beq _021D87F0 - bl ErrorHandling + bl GF_AssertFail _021D87F0: add r0, r6, #0 bl OverlayManager_FreeData @@ -2663,7 +2663,7 @@ _021D88F8: str r0, [r4, r1] mov r0, #0xd mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows ldr r1, _021D8994 ; =0x000006A8 mov r2, #0 str r0, [r4, r1] @@ -3114,7 +3114,7 @@ MOD17_021D8C9C: ; 0x021D8C9C bl FUN_0201CD04 cmp r0, #1 beq _021D8D30 - bl ErrorHandling + bl GF_AssertFail _021D8D30: add r0, r5, #0 bl OverlayManager_FreeData @@ -3905,7 +3905,7 @@ _021D9312: bl MOD17_021DA870 cmp r0, #0 bne _021D932A - bl ErrorHandling + bl GF_AssertFail _021D932A: ldr r0, [r4, #0xc] add sp, #4 @@ -4201,7 +4201,7 @@ _021D955E: bl MOD17_021DA870 cmp r0, #0 bne _021D9576 - bl ErrorHandling + bl GF_AssertFail _021D9576: ldr r0, [r4, #0xc] add sp, #4 @@ -4691,7 +4691,7 @@ MOD17_021D9918: ; 0x021D9918 ldr r0, _021D99D4 ; =0x000006A8 mov r1, #0xf ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -4753,7 +4753,7 @@ MOD17_021D99E0: ; 0x021D99E0 add r4, r1, #0 ldr r0, [r5, r0] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021D9A5C ; =0x00000151 mov r0, #0 mov r1, #0x1a @@ -4813,12 +4813,12 @@ MOD17_021D9A68: ; 0x021D9A68 add r4, r1, #0 cmp r0, #0 beq _021D9A7E - bl ErrorHandling + bl GF_AssertFail _021D9A7E: ldr r0, _021D9B08 ; =0x000006A8 mov r1, #0xf ldr r0, [r5, r0] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021D9B0C ; =0x00000151 mov r0, #0 mov r1, #0x1a @@ -5061,7 +5061,7 @@ _021D9C2E: mov r4, #0x14 b _021D9C36 _021D9C32: - bl ErrorHandling + bl GF_AssertFail _021D9C36: add r0, r4, #0 pop {r4, pc} @@ -5167,7 +5167,7 @@ MOD17_021D9CE0: ; 0x021D9CE0 add r6, r2, #0 cmp r4, #0 bne _021D9CF0 - bl ErrorHandling + bl GF_AssertFail _021D9CF0: add r0, r5, #0 add r0, #0xa8 @@ -5252,7 +5252,7 @@ MOD17_021D9D70: ; 0x021D9D70 add r4, r0, #0 cmp r5, #0x15 blo _021D9D7E - bl ErrorHandling + bl GF_AssertFail _021D9D7E: lsl r0, r5, #3 ldr r0, [r4, r0] @@ -5266,7 +5266,7 @@ MOD17_021D9D84: ; 0x021D9D84 add r4, r0, #0 cmp r5, #0x15 blo _021D9D92 - bl ErrorHandling + bl GF_AssertFail _021D9D92: lsl r0, r5, #3 add r0, r4, r0 @@ -5762,7 +5762,7 @@ MOD17_021DA0E8: ; 0x021DA0E8 sub r0, r0, #1 str r0, [r4, #0x24] bpl _021DA0FE - bl ErrorHandling + bl GF_AssertFail _021DA0FE: pop {r4, pc} thumb_func_end MOD17_021DA0E8 @@ -6674,7 +6674,7 @@ _021DA73E: str r1, [sp, #0x44] b _021DA750 _021DA74C: - bl ErrorHandling + bl GF_AssertFail _021DA750: ldr r0, [sp, #0xc] ldr r1, [r5, #0x48] @@ -6687,12 +6687,12 @@ _021DA750: ldr r1, [r2, r1] str r1, [sp, #0x34] bne _021DA76A - bl ErrorHandling + bl GF_AssertFail _021DA76A: ldr r0, [sp, #0x34] cmp r0, #0 bne _021DA774 - bl ErrorHandling + bl GF_AssertFail _021DA774: ldr r2, [r5, #4] add r0, r6, #0 @@ -7122,7 +7122,7 @@ MOD17_021DAA6C: ; 0x021DAA6C push {r4, lr} add r4, r0, #0 bne _021DAA76 - bl ErrorHandling + bl GF_AssertFail _021DAA76: ldr r0, [r4] pop {r4, pc} @@ -7137,7 +7137,7 @@ MOD17_021DAA7C: ; 0x021DAA7C add r4, r1, #0 cmp r5, #0 bne _021DAA8C - bl ErrorHandling + bl GF_AssertFail _021DAA8C: mov r0, #0xc mul r0, r4 @@ -7499,7 +7499,7 @@ MOD17_021DACA4: ; 0x021DACA4 str r0, [r4, #0x28] cmp r0, #0 bne _021DAD04 - bl ErrorHandling + bl GF_AssertFail _021DAD04: ldr r3, [r4, #0x2c] mov r2, #0xc @@ -7689,7 +7689,7 @@ _021DAE40: add sp, #4 pop {r3, r4, r5, r6, pc} _021DAE74: - bl ErrorHandling + bl GF_AssertFail _021DAE78: ldr r0, [r4, #0x28] ldr r1, [r4, #0x2c] @@ -7932,7 +7932,7 @@ MOD17_021DAFF4: ; 0x021DAFF4 add r4, r0, #0 cmp r5, #0x64 blo _021DB002 - bl ErrorHandling + bl GF_AssertFail _021DB002: lsl r0, r5, #2 ldr r0, [r4, r0] @@ -8180,7 +8180,7 @@ MOD17_021DB1D0: ; 0x021DB1D0 ldr r0, [r0, #4] cmp r0, #1 beq _021DB1E6 - bl ErrorHandling + bl GF_AssertFail _021DB1E6: ldr r0, [r4, #0x10] mov r2, #0x1c @@ -8536,7 +8536,7 @@ MOD17_021DB4AC: ; 0x021DB4AC ldr r0, [r0, #4] cmp r0, #1 beq _021DB4C0 - bl ErrorHandling + bl GF_AssertFail _021DB4C0: ldr r0, [r4, #0x10] ldr r5, [r0] @@ -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,10 +8913,10 @@ 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 FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, [sp, #0x10] ldr r0, [r0, #0x14] bl FUN_02008A74 @@ -9277,7 +9277,7 @@ MOD17_021DB9F4: ; 0x021DB9F4 str r0, [r5] cmp r0, #0 bne _021DBA0E - bl ErrorHandling + bl GF_AssertFail _021DBA0E: ldr r0, [r5] mov r1, #0 @@ -9309,12 +9309,12 @@ MOD17_021DBA30: ; 0x021DBA30 add r7, r2, #0 cmp r0, #0 bne _021DBA42 - bl ErrorHandling + bl GF_AssertFail _021DBA42: ldr r0, [r5, #4] cmp r0, #0 bne _021DBA4C - bl ErrorHandling + bl GF_AssertFail _021DBA4C: ldr r2, [r5, #4] mov r4, #0 @@ -9332,7 +9332,7 @@ _021DBA56: _021DBA64: cmp r2, r4 bgt _021DBA6C - bl ErrorHandling + bl GF_AssertFail _021DBA6C: ldr r0, [r5] lsl r1, r4, #4 @@ -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] @@ -10332,18 +10332,18 @@ MOD17_021DC1A0: ; 0x021DC1A0 add r4, r1, #0 cmp r5, #0 bne _021DC1AE - bl ErrorHandling + bl GF_AssertFail _021DC1AE: cmp r4, #0 bne _021DC1B6 - bl ErrorHandling + bl GF_AssertFail _021DC1B6: ldr r0, [r4] bl FUN_0201FE94 str r0, [r5] cmp r0, #0 bne _021DC1C6 - bl ErrorHandling + bl GF_AssertFail _021DC1C6: ldr r0, [r4, #0xc] str r0, [r5, #4] @@ -10496,7 +10496,7 @@ MOD17_021DC2C0: ; 0x021DC2C0 add r7, r3, #0 cmp r5, #0 bne _021DC2D2 - bl ErrorHandling + bl GF_AssertFail _021DC2D2: str r7, [r5, #4] str r6, [r5, #8] @@ -10756,7 +10756,7 @@ MOD17_021DC4CC: ; 0x021DC4CC ldr r0, [r4, #0x68] cmp r0, #0 bne _021DC4DA - bl ErrorHandling + bl GF_AssertFail _021DC4DA: ldr r0, [r4, #0x68] bl FUN_02022144 @@ -10819,7 +10819,7 @@ MOD17_021DC538: ; 0x021DC538 add r7, r3, #0 cmp r5, #0 bne _021DC54A - bl ErrorHandling + bl GF_AssertFail _021DC54A: cmp r4, #4 bge _021DC55E @@ -10921,7 +10921,7 @@ _021DC5E6: bl MOD17_021DC264 pop {r4, r5, r6, pc} _021DC618: - bl ErrorHandling + bl GF_AssertFail _021DC61C: pop {r4, r5, r6, pc} nop @@ -11061,7 +11061,7 @@ MOD17_021DC698: ; 0x021DC698 bl FUN_0201D568 cmp r0, #0 bne _021DC736 - bl ErrorHandling + bl GF_AssertFail _021DC736: ldr r0, [r5, #0x18] add r1, sp, #0x80 @@ -11257,7 +11257,7 @@ MOD17_021DC880: ; 0x021DC880 bl NewMsgDataFromNarc add r6, r0, #0 bne _021DC898 - bl ErrorHandling + bl GF_AssertFail _021DC898: add r0, r6, #0 add r1, r4, #0 @@ -11265,9 +11265,9 @@ _021DC898: add r7, r0, #0 mov r0, #0xe mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows add r4, r0, #0 - bl FUN_0201901C + bl InitWindow mov r0, #0 ldr r2, [sp, #0x28] ldr r3, [sp, #0x2c] @@ -11436,7 +11436,7 @@ _021DC9CC: lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -11622,7 +11622,7 @@ MOD17_021DCB48: ; 0x021DCB48 add r7, r3, #0 tst r0, r1 bne _021DCB64 - bl ErrorHandling + bl GF_AssertFail _021DCB64: mov r0, #0 str r0, [sp] @@ -11653,7 +11653,7 @@ MOD17_021DCB80: ; 0x021DCB80 add r7, r3, #0 tst r0, r1 bne _021DCB9C - bl ErrorHandling + bl GF_AssertFail _021DCB9C: mov r0, #0 str r0, [sp] @@ -11789,9 +11789,9 @@ MOD17_021DCC68: ; 0x021DCC68 mov r0, #0xe mov r1, #1 add r4, r2, #0 - bl FUN_02018FF4 + bl AllocWindows str r0, [r5] - bl FUN_0201901C + bl InitWindow lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -11817,7 +11817,7 @@ MOD17_021DCC68: ; 0x021DCC68 bl FUN_02019064 ldr r0, [r5] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x34] cmp r0, #0 beq _021DCCCC @@ -11860,7 +11860,7 @@ MOD17_021DCCEC: ; 0x021DCCEC add r5, r0, #0 add r6, r2, #0 add r7, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x28] add r1, r4, #0 str r0, [sp] @@ -11896,7 +11896,7 @@ MOD17_021DCD34: ; 0x021DCD34 add r5, r0, #0 add r6, r2, #0 add r7, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x28] add r1, r4, #0 str r0, [sp] @@ -11936,7 +11936,7 @@ MOD17_021DCD80: ; 0x021DCD80 bl NewMsgDataFromNarc add r5, r0, #0 bne _021DCD98 - bl ErrorHandling + bl GF_AssertFail _021DCD98: add r0, r5, #0 add r1, r4, #0 @@ -11978,7 +11978,7 @@ MOD17_021DCDD4: ; 0x021DCDD4 str r3, [sp, #0x10] cmp r0, #0 beq _021DCDEC - bl ErrorHandling + bl GF_AssertFail _021DCDEC: mov r0, #0 add r1, r5, #0 @@ -11987,7 +11987,7 @@ _021DCDEC: bl NewMsgDataFromNarc add r5, r0, #0 bne _021DCE00 - bl ErrorHandling + bl GF_AssertFail _021DCE00: ldr r1, [sp, #0x10] add r0, r5, #0 @@ -12396,7 +12396,7 @@ _021DD0D0: bl MOD17_021DCC68 ldr r0, [r7, #0x18] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] mov r3, #4 @@ -12522,7 +12522,7 @@ _021DD21A: str r0, [sp, #4] cmp r0, #0xa ble _021DD22C - bl ErrorHandling + bl GF_AssertFail _021DD22C: ldr r0, [r5, #0x10] ldr r1, [sp, #4] @@ -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 @@ -13727,7 +13727,7 @@ _021DDAC6: add r1, r1, r5 add r0, r7, #0 add r1, r1, #4 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, [sp, #4] ldr r1, [r0] ldr r0, [r4] @@ -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 @@ -13758,7 +13758,7 @@ _021DDB1E: ldr r1, [r4, #8] add r0, r5, #0 add r1, r1, #4 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r0, [sp, #4] ldr r1, [r0] ldr r0, [r4, #8] @@ -13875,7 +13875,7 @@ MOD17_021DDC30: ; 0x021DDC30 bl OverlayManager_GetData add r5, r0, #0 bl FUN_020222AC - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera ldr r0, [r5, #0x10] bl MOD17_021DD518 mov r0, #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 @@ -14242,7 +14242,7 @@ MOD17_021DDF1C: ; 0x021DDF1C add r4, r0, #0 mov r0, #0xe mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows mov r1, #0x19 lsl r1, r1, #4 str r0, [r4, r1] @@ -14313,7 +14313,7 @@ MOD17_021DDFAC: ; 0x021DDFAC lsl r0, r0, #4 ldr r0, [r4, r0] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0xc] cmp r0, #0 bne _021DDFCA @@ -14344,7 +14344,7 @@ MOD17_021DDFDC: ; 0x021DDFDC str r0, [sp, #0x10] cmp r0, #0 bne _021DDFF8 - bl ErrorHandling + bl GF_AssertFail _021DDFF8: mov r0, #0xd bl ScrStrBufs_new @@ -14522,7 +14522,7 @@ MOD17_021DE0F4: ; 0x021DE0F4 str r0, [sp, #0x10] cmp r0, #0 bne _021DE1A0 - bl ErrorHandling + bl GF_AssertFail _021DE1A0: ldr r0, [sp, #0x10] mov r1, #0x2b diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index d0f6db33..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 @@ -2808,7 +2808,7 @@ _0223AD00: add r5, #0xc cmp r1, #8 blt _0223ACB6 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3116,7 +3116,7 @@ _0223AF18: cmp r4, #0x55 blo _0223AF04 _0223AF20: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, r5, r6, pc} .align 2, 0 @@ -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] @@ -5780,7 +5780,7 @@ MOD18_0223C37C: ; 0x0223C37C ldr r1, [r0] ldr r0, _0223C56C ; =0x000009EB strb r2, [r1, r0] - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7c @@ -6327,7 +6327,7 @@ MOD18_0223C7D4: ; 0x0223C7D4 ldr r0, [r1, r0] cmp r0, #0 beq _0223C7E6 - bl ErrorHandling + bl GF_AssertFail _0223C7E6: ldr r0, _0223C834 ; =0x02251380 ldr r1, [r0] @@ -6335,7 +6335,7 @@ _0223C7E6: ldr r0, [r1, r0] cmp r0, #0 beq _0223C7F6 - bl ErrorHandling + bl GF_AssertFail _0223C7F6: mov r1, #0x5e mov r0, #0xb @@ -7102,7 +7102,7 @@ MOD18_0223CD74: ; 0x0223CD74 add r4, r0, #0 cmp r4, #0x64 blt _0223CD9E - bl ErrorHandling + bl GF_AssertFail _0223CD9E: mov r5, #0x63 cmp r4, #0x63 @@ -7552,7 +7552,7 @@ _0223D106: mvn r0, r0 cmp r1, r0 bne _0223D112 - bl ErrorHandling + bl GF_AssertFail _0223D112: cmp r4, #0x63 bge _0223D132 @@ -7602,7 +7602,7 @@ MOD18_0223D14C: ; 0x0223D14C bl MOD18_0223CE14 add r5, r0, #0 bne _0223D178 - bl ErrorHandling + bl GF_AssertFail _0223D178: add r0, r4, #0 add r1, r5, #0 @@ -7830,7 +7830,7 @@ MOD18_0223D30C: ; 0x0223D30C ldr r0, [r1, r0] cmp r0, #0 beq _0223D31E - bl ErrorHandling + bl GF_AssertFail _0223D31E: ldr r0, _0223D364 ; =0x02251384 ldr r1, [r0] @@ -7839,7 +7839,7 @@ _0223D31E: ldr r0, [r1, r0] cmp r0, #0 beq _0223D330 - bl ErrorHandling + bl GF_AssertFail _0223D330: mov r0, #0xb mov r1, #4 @@ -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 @@ -10255,7 +10255,7 @@ _0223E5DE: add r2, #8 cmp r6, #0x14 blt _0223E5BC - bl ErrorHandling + bl GF_AssertFail _0223E5EA: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -10464,7 +10464,7 @@ _0223E746: ldr r0, [r1, r0] cmp r0, #0x64 ble _0223E764 - bl ErrorHandling + bl GF_AssertFail _0223E764: mov r0, #0 pop {r3, r4, r5, pc} @@ -12184,7 +12184,7 @@ MOD18_0223F428: ; 0x0223F428 bne _0223F49E cmp r4, #0x60 beq _0223F456 - bl ErrorHandling + bl GF_AssertFail _0223F456: mov r0, #0 add r4, r0, #0 @@ -12402,7 +12402,7 @@ MOD18_0223F5CC: ; 0x0223F5CC lsr r0, r0, #0x1c cmp r0, #8 blo _0223F5DE - bl ErrorHandling + bl GF_AssertFail _0223F5DE: ldrb r3, [r4, #7] lsl r0, r3, #0x19 @@ -12543,7 +12543,7 @@ _0223F714: add r1, r1, #6 cmp r3, #0xc0 blt _0223F706 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -14057,7 +14057,7 @@ MOD18_02240210: ; 0x02240210 ldr r0, [r1, r0] cmp r0, #0 beq _0224023E - bl ErrorHandling + bl GF_AssertFail _0224023E: ldr r0, _02240268 ; =0x022513A0 mov r2, #0x64 @@ -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 @@ -17178,7 +17178,7 @@ _02241A30: lsl r2, r2, #0xa asr r0, r0, #4 lsl r6, r0, #1 - ldr r0, _02241AAC ; =UNK_020FFA38 + ldr r0, _02241AAC ; =FX_SinCosTable_ lsl r1, r6, #1 ldrsh r0, [r0, r1] mov r3, #0 @@ -17194,7 +17194,7 @@ _02241A30: orr r4, r0 add r0, r6, #1 lsl r1, r0, #1 - ldr r0, _02241AAC ; =UNK_020FFA38 + ldr r0, _02241AAC ; =FX_SinCosTable_ mov r2, #0xa ldrsh r0, [r0, r1] lsl r2, r2, #0xa @@ -17233,7 +17233,7 @@ _02241AA8: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02241AAC: .word UNK_020FFA38 +_02241AAC: .word FX_SinCosTable_ _02241AB0: .word MOD18_022513A0 thumb_func_end MOD18_02241A04 @@ -17478,7 +17478,7 @@ _02241C70: ldr r2, [sp] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02241D34 ; =UNK_020FFA38 + ldr r0, _02241D34 ; =FX_SinCosTable_ asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -17504,7 +17504,7 @@ _02241C70: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _02241D34 ; =UNK_020FFA38 + ldr r0, _02241D34 ; =FX_SinCosTable_ ldrsh r0, [r0, r1] asr r1, r0, #0x1f bl _ll_mul @@ -17561,7 +17561,7 @@ _02241D24: .word MOD18_02241AB4 _02241D28: .word MOD18_022513A0 _02241D2C: .word 0x00000B3B _02241D30: .word 0x00000000 -_02241D34: .word UNK_020FFA38 +_02241D34: .word FX_SinCosTable_ thumb_func_end MOD18_02241AD0 thumb_func_start MOD18_02241D38 @@ -18343,7 +18343,7 @@ MOD18_02242320: ; 0x02242320 ldrh r0, [r2, r1] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _022423AC ; =UNK_020FFA38 + ldr r0, _022423AC ; =FX_SinCosTable_ ldrsh r1, [r0, r1] mov r0, #1 lsl r0, r0, #0xc @@ -18373,7 +18373,7 @@ _022423A4: pop {r4, r5, pc} .align 2, 0 _022423A8: .word MOD18_022513A0 -_022423AC: .word UNK_020FFA38 +_022423AC: .word FX_SinCosTable_ thumb_func_end MOD18_02242320 thumb_func_start MOD18_022423B0 @@ -18529,7 +18529,7 @@ _022424D4: ldrh r0, [r4, #0x1c] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02242594 ; =UNK_020FFA38 + ldr r0, _02242594 ; =FX_SinCosTable_ ldrsh r1, [r0, r1] ldr r0, [r5, #0x48] sub r0, r0, r1 @@ -18538,7 +18538,7 @@ _022424D4: ldr r0, [r5, #0x44] asr r1, r1, #4 lsl r2, r1, #2 - ldr r1, _02242594 ; =UNK_020FFA38 + ldr r1, _02242594 ; =FX_SinCosTable_ add r2, r1, r2 mov r1, #2 ldrsh r1, [r2, r1] @@ -18616,7 +18616,7 @@ _02242584: .word 0x00000000 _02242588: .word MOD18_022500C0 _0224258C: .word 0x00000626 _02242590: .word MOD18_022513A0 -_02242594: .word UNK_020FFA38 +_02242594: .word FX_SinCosTable_ _02242598: .word 0x0000FFFF thumb_func_end MOD18_022423B0 @@ -21387,7 +21387,7 @@ _02243B16: str r0, [sp, #0x24] add r0, sp, #0x1c add r1, sp, #0x18 - bl FUN_020BB408 + bl NNS_G3dWorldPosToScrPos ldr r0, [sp, #0x18] lsl r0, r0, #0xc str r0, [sp, #0x1c] @@ -22033,18 +22033,18 @@ MOD18_02244028: ; 0x02244028 ldr r1, [sp, #0x30] strb r1, [r0, #0x1e] ldr r0, [sp, #8] - bl FUN_02013690 + bl ListMenuCursorNew ldr r1, [sp, #0xc] str r0, [r1, #0x10] ldr r1, _022440C0 ; =0x0008090F - bl FUN_020136E0 + bl ListMenuCursorSetColor ldr r1, [sp, #8] ldr r0, [sp, #0xc] strb r1, [r0, #0x1d] ldr r1, [sp, #0xc] ldrh r0, [r5, #0x10] ldrb r1, [r1, #0x1d] - bl ListMenu_ctor + bl ListMenuItems_ctor add r7, r0, #0 ldrh r0, [r5, #0x10] mov r6, #0 @@ -22055,7 +22055,7 @@ _02244084: ldr r1, [r5] add r0, r7, #0 add r1, r1, r4 - bl ListMenu_CopyItem + bl ListMenuItems_CopyItem ldrh r0, [r5, #0x10] add r6, r6, #1 add r4, #8 @@ -22075,7 +22075,7 @@ _0224409E: ldr r2, [sp, #4] ldr r3, [sp, #8] add r0, r5, #0 - bl FUN_020010A8 + bl ListMenuInit ldr r1, [sp, #0xc] str r0, [r1, #0xc] add r0, r1, #0 @@ -22099,7 +22099,7 @@ MOD18_022440C4: ; 0x022440C4 lsr r6, r0, #0x10 ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_02001470 + bl ListMenuGetTemplateField lsl r0, r0, #0x10 lsr r1, r0, #0x10 ldrh r0, [r4, #0x18] @@ -22118,29 +22118,29 @@ _022440F0: bhi _0224413A ldr r0, [r4, #0xc] mov r1, #7 - bl FUN_02001470 + bl ListMenuGetTemplateField str r0, [sp] ldr r0, [r4, #0xc] mov r1, #9 - bl FUN_02001470 + bl ListMenuGetTemplateField lsl r0, r0, #0x18 lsr r7, r0, #0x18 ldr r0, [r4, #0xc] mov r1, #8 - bl FUN_02001470 + bl ListMenuGetTemplateField str r0, [sp, #4] sub r0, r6, r5 add r5, r7, #0 mul r5, r0 ldr r0, [r4, #0xc] mov r1, #0x12 - bl FUN_02001470 + bl ListMenuGetTemplateField ldr r3, [sp, #4] add r1, r0, #0 ldr r0, [r4, #0x10] ldr r2, [sp] add r3, r5, r3 - bl FUN_020136F8 + bl ListMenuUpdateCursorObj _0224413A: add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -22159,13 +22159,13 @@ MOD18_02244140: ; 0x02244140 beq _0224418A ldr r0, [sp, #4] mov r1, #2 - bl FUN_02001470 + bl ListMenuGetTemplateField add r7, r0, #0 add r1, sp, #0xc ldr r0, [sp, #4] add r1, #2 add r2, sp, #0xc - bl FUN_02001448 + bl ListMenuGetScrollAndRow ldrb r0, [r5, #0x1c] cmp r0, #0 bne _0224416E @@ -22216,7 +22216,7 @@ _022441BA: blx r3 ldrb r1, [r5, #0x1d] add r0, r7, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor mov r4, #0 add r6, r4, #0 str r0, [sp] @@ -22234,7 +22234,7 @@ _022441DE: lsl r1, r4, #3 ldr r0, [sp] add r1, r2, r1 - bl ListMenu_CopyItem + bl ListMenuItems_CopyItem _022441EA: add r0, sp, #0xc ldrh r1, [r0, #2] @@ -22250,7 +22250,7 @@ _022441EA: add r1, r2, r1 lsl r1, r1, #3 add r1, r3, r1 - bl ListMenu_CopyItem + bl ListMenuItems_CopyItem _0224420A: add r6, r6, #1 cmp r6, r7 @@ -22312,11 +22312,11 @@ _02244268: ldr r1, [sp] str r0, [r5, #8] ldr r0, [sp, #4] - bl FUN_02001658 + bl ListMenuGetItemStr mov r0, #0 strb r0, [r5, #0x1c] ldr r0, [sp, #4] - bl FUN_02001328 + bl RedrawListMenu mov r0, #0 add sp, #0x10 mvn r0, r0 @@ -22355,13 +22355,13 @@ _022442B2: pop {r3, r4, r5, r6, r7, pc} _022442CA: ldr r0, [sp, #4] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r1, r5, #0 ldr r0, [sp, #4] add r1, #0x20 ldrh r6, [r5, #0x20] - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId ldrh r0, [r5, #0x20] cmp r6, r0 beq _022442EA @@ -22397,12 +22397,12 @@ MOD18_02244318: ; 0x02244318 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r4] cmp r0, #0 beq _02244334 ldr r0, [r4, #0x10] - bl FUN_020136C0 + bl DestroyListMenuCursorObj ldr r0, [r4, #8] bl FreeToHeap _02244334: @@ -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 @@ -23187,7 +23187,7 @@ MOD18_0224486C: ; 0x0224486C bl FUN_020545B8 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x80 str r3, [sp] mov r2, #4 @@ -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 @@ -23388,7 +23388,7 @@ _02244AF8: ldr r0, [sp, #0xc] mov r2, #2 add r3, r1, #0 - bl FUN_0201A8C8 + bl ScrollWindow ldr r0, [sp, #0xc] bl CopyWindowToVram ldr r0, [r5] @@ -23521,7 +23521,7 @@ _02244BEC: _02244BFA: cmp r4, #2 blt _02244C02 - bl ErrorHandling + bl GF_AssertFail _02244C02: cmp r4, #0 bne _02244C14 @@ -23720,7 +23720,7 @@ MOD18_02244D40: ; 0x02244D40 add r5, r0, #0 cmp r4, #8 blt _02244D4E - bl ErrorHandling + bl GF_AssertFail _02244D4E: mov r0, #0xc add r5, #0x18 @@ -23978,7 +23978,7 @@ _02244EE0: bl FUN_0202595C cmp r0, #0x94 beq _02244EEC - bl ErrorHandling + bl GF_AssertFail _02244EEC: ldr r0, _02245000 ; =0x022513EC ldr r2, _02245004 ; =0x000013E8 @@ -24736,7 +24736,7 @@ MOD18_022454BC: ; 0x022454BC bl FUN_02031190 cmp r0, #0 beq _022454D4 - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} _022454D4: ldrb r0, [r4, #1] @@ -25463,7 +25463,7 @@ MOD18_02245A50: ; 0x02245A50 ldr r0, [r0] cmp r0, #2 beq _02245A9A - bl ErrorHandling + bl GF_AssertFail _02245A9A: mov r0, #2 str r0, [r4, #0x14] @@ -25548,21 +25548,21 @@ MOD18_02245B1C: ; 0x02245B1C add r5, r0, #0 ldr r1, [sp, #0x30] mov r0, #2 - bl ListMenu_ctor + bl ListMenuItems_ctor add r4, r0, #0 add r1, r5, #0 mov r2, #0x26 mov r3, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r4, #0 add r1, r5, #0 mov r2, #0x27 mov r3, #1 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, [sp, #0x30] mov r1, #1 str r4, [sp, #0x10] - bl FUN_02018FF4 + bl AllocWindows add r1, r0, #0 str r1, [sp, #0x14] mov r0, #0 @@ -26171,7 +26171,7 @@ _02246020: ldrb r5, [r6] cmp r5, #0x11 blt _02246034 - bl ErrorHandling + bl GF_AssertFail _02246034: ldr r0, _022460EC ; =0x022513EC mov r2, #0x96 @@ -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 @@ -29117,7 +29117,7 @@ _02247774: cmp r4, #0 bne _022477A6 _022477A2: - bl ErrorHandling + bl GF_AssertFail _022477A6: add r0, r7, #0 bl FUN_02059BF4 @@ -29532,7 +29532,7 @@ MOD18_02247AA8: ; 0x02247AA8 add r5, r0, #0 mov r0, #4 add r1, r0, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x1c] mov r3, #1 str r3, [sp] @@ -29569,7 +29569,7 @@ _02247AFA: ldr r2, [r4] ldr r3, [r4, #4] add r1, r7, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #4 @@ -29593,7 +29593,7 @@ _02247AFA: strh r1, [r5, #0x3a] add r0, sp, #0x14 add r2, r1, #0 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 @@ -29658,7 +29658,7 @@ MOD18_02247BB8: ; 0x02247BB8 add r5, r0, #0 mov r0, #4 add r1, r0, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x1c] mov r3, #1 str r3, [sp] @@ -29714,7 +29714,7 @@ _02247C2C: ldr r0, [r5, #0x1c] add r1, r6, #0 add r3, r2, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _02247C40 _02247C3E: sub r4, r4, #1 @@ -29745,7 +29745,7 @@ _02247C40: strh r1, [r5, #0x3a] add r2, r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 @@ -29766,7 +29766,7 @@ MOD18_02247C98: ; 0x02247C98 add r5, r1, #0 add r6, r0, #0 ldr r0, [r5, #0x20] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD18_02248FEC @@ -29831,7 +29831,7 @@ MOD18_02247D1C: ; 0x02247D1C add r5, r0, #0 mov r0, #4 add r1, r0, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x1c] mov r3, #1 str r3, [sp] @@ -29871,7 +29871,7 @@ _02247D6C: lsl r2, r2, #2 add r2, r4, r2 add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 cmp r4, #4 blt _02247D6C @@ -29898,7 +29898,7 @@ _02247D6C: strh r1, [r5, #0x3a] add r2, r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x20] add r5, #0xc add r0, r5, #0 @@ -29919,7 +29919,7 @@ MOD18_02247DD8: ; 0x02247DD8 add r5, r1, #0 add r6, r0, #0 ldr r0, [r5, #0x20] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD18_02248FEC @@ -30102,7 +30102,7 @@ MOD18_02247F5C: ; 0x02247F5C add r5, r1, #0 add r6, r0, #0 ldr r0, [r5, #0x20] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD18_02248FEC @@ -30159,7 +30159,7 @@ MOD18_02247FC0: ; 0x02247FC0 mov r1, #0 ldr r0, [r4, #0x20] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #0xc bl FUN_02019570 @@ -30167,7 +30167,7 @@ MOD18_02247FC0: ; 0x02247FC0 add r0, #0xc bl FUN_02019178 ldr r0, [r4, #0x1c] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #0 str r0, [r4, #0x1c] _02247FF8: @@ -31135,7 +31135,7 @@ MOD18_02248784: ; 0x02248784 mov r1, #0 ldr r0, [r4, #0x1c] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #8 bl FUN_02019570 @@ -31143,7 +31143,7 @@ MOD18_02248784: ; 0x02248784 add r0, #8 bl FUN_02019178 ldr r0, [r4, #0x18] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #0 str r0, [r4, #0x18] _022487BC: @@ -31202,7 +31202,7 @@ MOD18_02248820: ; 0x02248820 add r5, r0, #0 mov r0, #5 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x18] mov r3, #1 add r1, r5, #0 @@ -31242,7 +31242,7 @@ _02248870: lsl r2, r2, #2 add r2, r4, r2 add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 cmp r4, #4 blt _02248870 @@ -31250,7 +31250,7 @@ _02248870: add r1, r6, #0 mov r2, #0x30 mov r3, #0x33 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r6, #0 bl DestroyMsgData ldr r4, _022488EC ; =0x02250528 @@ -31278,7 +31278,7 @@ _02248870: strh r1, [r5, #0x36] add r2, r1, #0 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x1c] add r5, #8 add r0, r5, #0 @@ -31298,13 +31298,13 @@ MOD18_022488F0: ; 0x022488F0 add r5, r1, #0 add r7, r0, #0 ldr r0, [r5, #0x1c] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r1, r5, #0 ldr r0, [r5, #0x1c] add r1, #0x36 ldrh r6, [r5, #0x36] - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId ldrh r0, [r5, #0x36] cmp r6, r0 beq _02248916 @@ -31922,7 +31922,7 @@ MOD18_02248DF8: ; 0x02248DF8 add r6, r2, #0 cmp r0, #0 beq _02248E0C - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _02248E0C: mov r0, #0x21 @@ -32001,7 +32001,7 @@ MOD18_02248E84: ; 0x02248E84 beq _02248EAE cmp r5, #2 beq _02248EA4 - bl ErrorHandling + bl GF_AssertFail _02248EA4: ldr r0, _02248EB0 ; =0x022513F0 ldrb r1, [r4, #1] @@ -32029,13 +32029,13 @@ MOD18_02248EB4: ; 0x02248EB4 beq _02248EEA cmp r5, #2 beq _02248ED4 - bl ErrorHandling + bl GF_AssertFail _02248ED4: ldr r0, _02248EEC ; =0x022513F0 ldr r0, [r0, #4] cmp r0, #0 bne _02248EE0 - bl ErrorHandling + bl GF_AssertFail _02248EE0: ldr r0, _02248EEC ; =0x022513F0 ldrb r1, [r4, #1] @@ -32078,7 +32078,7 @@ MOD18_02248F00: ; 0x02248F00 ldr r0, [r0] cmp r0, #0 bne _02248F1E - bl ErrorHandling + bl GF_AssertFail _02248F1E: add r0, r4, #0 add r0, #0x34 @@ -32213,7 +32213,7 @@ MOD18_02248FEC: ; 0x02248FEC ldr r0, [r5, #0x20] add r1, #0x3a ldrh r4, [r5, #0x3a] - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId ldrh r0, [r5, #0x3a] cmp r4, r0 beq _02249008 @@ -32703,7 +32703,7 @@ MOD18_022493A4: ; 0x022493A4 ldrb r1, [r1, #5] cmp r1, r0 beq _022493B4 - bl ErrorHandling + bl GF_AssertFail _022493B4: ldr r0, _022493C4 ; =0x022513F8 ldr r1, [r0] @@ -32796,7 +32796,7 @@ MOD18_02249450: ; 0x02249450 add r4, r1, #0 cmp r5, #0xb blt _0224945E - bl ErrorHandling + bl GF_AssertFail _0224945E: cmp r5, #6 blt _02249464 @@ -32823,7 +32823,7 @@ MOD18_02249480: ; 0x02249480 add r4, r0, #0 cmp r4, #0x3c blt _0224948C - bl ErrorHandling + bl GF_AssertFail _0224948C: ldr r0, _0224949C ; =0x022513F8 add r1, r4, #0 @@ -32943,7 +32943,7 @@ MOD18_02249564: ; 0x02249564 bl MOD18_02249544 mov r0, #7 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r0, #1 str r0, [sp] @@ -32985,7 +32985,7 @@ _022495BA: ldr r0, [r5, #0x40] ldr r2, [r4, #4] add r1, r7, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r0, r7, #0 bl String_dtor b _022495EE @@ -32994,7 +32994,7 @@ _022495E2: ldr r1, [sp, #0x14] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData _022495EE: add r6, r6, #1 add r4, #8 @@ -33377,7 +33377,7 @@ _02249902: beq _02249916 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0 str r0, [r4, #0x48] b _02249936 @@ -33413,7 +33413,7 @@ _02249936: add r0, #0x10 bl FUN_02019178 ldr r0, [r4, #0x40] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r4, #0 bl MOD18_0224CBAC _02249968: @@ -33456,7 +33456,7 @@ _02249998: _022499A2: add r0, r6, #0 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x44] lsl r0, r7, #0x18 lsr r0, r0, #0x18 @@ -33498,7 +33498,7 @@ _022499FA: ldr r1, [sp, #0x14] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r7, r7, #1 add r4, #8 cmp r7, r6 @@ -33530,7 +33530,7 @@ _02249A0E: add r2, r1, #0 mov r3, #4 str r5, [sp, #0x3c] - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x50] add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} @@ -33552,14 +33552,14 @@ MOD18_02249A64: ; 0x02249A64 beq _02249A8C mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r1, r4, #0 add r1, #0x24 ldrb r1, [r1] ldr r0, [r4, #0x20] bl FUN_0201AC68 ldr r0, [r4, #0x44] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #0 str r0, [r4, #0x50] _02249A8C: @@ -33623,7 +33623,7 @@ MOD18_02249AF4: ; 0x02249AF4 push {r4, lr} add r4, r1, #0 mov r1, #0x13 - bl FUN_02001470 + bl ListMenuGetTemplateField mov r2, #0x81 add r1, r0, #0 lsl r2, r2, #2 @@ -33727,10 +33727,10 @@ MOD18_02249BA8: ; 0x02249BA8 bl MOD18_0223D678 ldr r1, _02249CB0 ; =0x0000023B mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank add r0, r6, #1 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -33767,7 +33767,7 @@ _02249C18: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 cmp r4, r6 blt _02249C18 @@ -33777,7 +33777,7 @@ _02249C30: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] sub r3, #0x24 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r3, _02249CBC ; =0x02250598 add r2, sp, #0x1c ldmia r3!, {r0, r1} @@ -33853,7 +33853,7 @@ MOD18_02249CC8: ; 0x02249CC8 ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -33862,7 +33862,7 @@ MOD18_02249CC8: ; 0x02249CC8 ldr r0, [r5, #0x4c] mov r1, #2 ldr r0, [r0, #0xc] - bl FUN_02001470 + bl ListMenuGetTemplateField add r1, sp, #0 add r2, r0, #0 ldrh r1, [r1, #2] @@ -33957,14 +33957,14 @@ MOD18_02249DB8: ; 0x02249DB8 push {r4, r5, r6, lr} add r5, r1, #0 ldr r0, [r5, #0x50] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0x93 add r4, r0, #0 lsl r1, r1, #2 ldrh r6, [r5, r1] ldr r0, [r5, #0x50] add r1, r5, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId mov r0, #0x93 lsl r0, r0, #2 ldrh r0, [r5, r0] @@ -34060,7 +34060,7 @@ MOD18_02249E98: ; 0x02249E98 ldrb r1, [r1, #5] cmp r1, r0 beq _02249EA8 - bl ErrorHandling + bl GF_AssertFail _02249EA8: ldr r0, _02249EB8 ; =0x022513F8 ldr r1, [r0] @@ -34077,7 +34077,7 @@ MOD18_02249EBC: ; 0x02249EBC push {r4, lr} add r4, r1, #0 mov r1, #0x13 - bl FUN_02001470 + bl ListMenuGetTemplateField mov r2, #0x81 add r1, r0, #0 lsl r2, r2, #2 @@ -34194,10 +34194,10 @@ MOD18_02249F8C: ; 0x02249F8C bl MOD18_0223D678 ldr r1, _0224A0D4 ; =0x00000239 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank add r0, r6, #1 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -34259,7 +34259,7 @@ _0224A002: ldr r0, [r5, #0x40] ldr r1, [r5, #0x68] add r2, r4, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r4, r4, #1 cmp r4, r6 blt _0224A002 @@ -34269,7 +34269,7 @@ _0224A058: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] sub r3, #0x3e - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r3, _0224A0E0 ; =0x02250598 add r2, sp, #0x20 ldmia r3!, {r0, r1} @@ -34343,7 +34343,7 @@ MOD18_0224A0EC: ; 0x0224A0EC ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -34352,7 +34352,7 @@ MOD18_0224A0EC: ; 0x0224A0EC ldr r0, [r5, #0x4c] mov r1, #2 ldr r0, [r0, #0xc] - bl FUN_02001470 + bl ListMenuGetTemplateField add r1, sp, #0 add r2, r0, #0 ldrh r1, [r1, #2] @@ -34434,14 +34434,14 @@ MOD18_0224A1C0: ; 0x0224A1C0 push {r4, r5, r6, lr} add r5, r1, #0 ldr r0, [r5, #0x50] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0x93 add r4, r0, #0 lsl r1, r1, #2 ldrh r6, [r5, r1] ldr r0, [r5, #0x50] add r1, r5, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId mov r0, #0x93 lsl r0, r0, #2 ldrh r0, [r5, r0] @@ -34542,7 +34542,7 @@ MOD18_0224A2B4: ; 0x0224A2B4 push {r4, lr} add r4, r1, #0 mov r1, #0x13 - bl FUN_02001470 + bl ListMenuGetTemplateField mov r2, #0x81 add r1, r0, #0 lsl r2, r2, #2 @@ -34643,10 +34643,10 @@ MOD18_0224A360: ; 0x0224A360 bl MOD18_0223D678 ldr r1, _0224A464 ; =0x00000239 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank add r0, r6, #1 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -34683,7 +34683,7 @@ _0224A3D0: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 cmp r4, r6 blt _0224A3D0 @@ -34693,7 +34693,7 @@ _0224A3E8: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] sub r3, #0x3e - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r3, _0224A470 ; =0x02250598 add r2, sp, #0x1c ldmia r3!, {r0, r1} @@ -34767,7 +34767,7 @@ MOD18_0224A47C: ; 0x0224A47C ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -34776,7 +34776,7 @@ MOD18_0224A47C: ; 0x0224A47C ldr r0, [r5, #0x4c] mov r1, #2 ldr r0, [r0, #0xc] - bl FUN_02001470 + bl ListMenuGetTemplateField add r1, sp, #0 add r2, r0, #0 ldrh r1, [r1, #2] @@ -34858,14 +34858,14 @@ MOD18_0224A550: ; 0x0224A550 push {r4, r5, r6, lr} add r5, r1, #0 ldr r0, [r5, #0x50] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0x93 add r4, r0, #0 lsl r1, r1, #2 ldrh r6, [r5, r1] ldr r0, [r5, #0x50] add r1, r5, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId mov r0, #0x93 lsl r0, r0, #2 ldrh r0, [r5, r0] @@ -35399,7 +35399,7 @@ MOD18_0224A9B4: ; 0x0224A9B4 push {r4, lr} add r4, r1, #0 mov r1, #0x13 - bl FUN_02001470 + bl ListMenuGetTemplateField mov r2, #0x81 add r1, r0, #0 lsl r2, r2, #2 @@ -35431,7 +35431,7 @@ MOD18_0224A9EC: ; 0x0224A9EC add r4, r1, #0 mov r1, #0x13 add r5, r0, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField ldr r0, [r0, #0xc] bl ScriptEnvironment_GetSav2Ptr bl FUN_02026CC4 @@ -35443,14 +35443,14 @@ MOD18_0224A9EC: ; 0x0224A9EC mov r1, #1 mov r2, #0xf mov r3, #2 - bl FUN_020013E8 + bl ListMenuOverrideSetColors pop {r3, r4, r5, pc} _0224AA1A: mov r1, #2 add r0, r5, #0 mov r2, #0xf add r3, r1, #0 - bl FUN_020013E8 + bl ListMenuOverrideSetColors pop {r3, r4, r5, pc} thumb_func_end MOD18_0224A9EC @@ -35581,10 +35581,10 @@ MOD18_0224AB08: ; 0x0224AB08 bl MOD18_0223D678 ldr r1, _0224AC0C ; =0x00000237 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank add r0, r6, #1 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -35621,7 +35621,7 @@ _0224AB78: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 cmp r4, r6 blt _0224AB78 @@ -35630,7 +35630,7 @@ _0224AB90: ldr r0, [r5, #0x40] ldr r1, [sp, #0x18] sub r3, r2, #2 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r3, _0224AC18 ; =0x02250598 add r2, sp, #0x1c ldmia r3!, {r0, r1} @@ -35706,7 +35706,7 @@ MOD18_0224AC24: ; 0x0224AC24 ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -35715,7 +35715,7 @@ MOD18_0224AC24: ; 0x0224AC24 ldr r0, [r5, #0x4c] mov r1, #2 ldr r0, [r0, #0xc] - bl FUN_02001470 + bl ListMenuGetTemplateField add r1, sp, #0 add r2, r0, #0 ldrh r1, [r1, #2] @@ -35800,14 +35800,14 @@ MOD18_0224AD04: ; 0x0224AD04 push {r4, r5, r6, lr} add r5, r1, #0 ldr r0, [r5, #0x50] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0x93 add r4, r0, #0 lsl r1, r1, #2 ldrh r6, [r5, r1] ldr r0, [r5, #0x50] add r1, r5, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId mov r0, #0x93 lsl r0, r0, #2 ldrh r0, [r5, r0] @@ -36444,7 +36444,7 @@ MOD18_0224B204: ; 0x0224B204 push {r4, lr} add r4, r1, #0 mov r1, #0x13 - bl FUN_02001470 + bl ListMenuGetTemplateField mov r0, #1 mvn r0, r0 cmp r4, r0 @@ -36464,7 +36464,7 @@ MOD18_0224B228: ; 0x0224B228 push {r4, lr} add r4, r1, #0 mov r1, #0x13 - bl FUN_02001470 + bl ListMenuGetTemplateField mov r0, #1 mvn r0, r0 cmp r4, r0 @@ -36486,13 +36486,13 @@ MOD18_0224B250: ; 0x0224B250 push {r3, r4, r5, lr} add r4, r1, #0 ldr r0, [r4, #0x48] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0 add r1, sp, #0 ldr r0, [r4, #0x48] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -36627,7 +36627,7 @@ _0224B374: bl MOD18_022498EC ldr r0, [sp, #0x18] mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r2, #3 str r2, [sp] @@ -36675,13 +36675,13 @@ _0224B3D4: add r1, r7, #0 add r2, r6, #5 mvn r3, r3 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _0224B3F4 _0224B3EA: add r1, r7, #0 add r2, r6, r4 add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData _0224B3F4: ldr r0, [sp, #0x18] add r4, r4, #1 @@ -36727,7 +36727,7 @@ _0224B42C: lsr r1, r1, #0x10 lsr r2, r2, #0x10 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x48] add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} @@ -36750,7 +36750,7 @@ MOD18_0224B464: ; 0x0224B464 bl MOD18_022498EC ldr r0, [sp, #0x1c] mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -36796,13 +36796,13 @@ _0224B4D0: add r1, r7, #0 add r2, r6, r4 mvn r3, r3 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _0224B4F0 _0224B4E6: add r1, r7, #0 add r2, r6, r4 add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData _0224B4F0: ldr r0, [sp, #0x1c] add r4, r4, #1 @@ -36848,7 +36848,7 @@ _0224B528: lsr r1, r1, #0x10 lsr r2, r2, #0x10 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x48] add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} @@ -36862,13 +36862,13 @@ MOD18_0224B560: ; 0x0224B560 push {r3, r4, r5, lr} add r5, r1, #0 ldr r0, [r5, #0x48] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r1, sp, #0 ldr r0, [r5, #0x48] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -36964,7 +36964,7 @@ MOD18_0224B614: ; 0x0224B614 ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -36973,7 +36973,7 @@ MOD18_0224B614: ; 0x0224B614 ldr r0, [r5, #0x4c] mov r1, #2 ldr r0, [r0, #0xc] - bl FUN_02001470 + bl ListMenuGetTemplateField add r1, sp, #0 add r2, r0, #0 ldrh r1, [r1, #2] @@ -37057,7 +37057,7 @@ MOD18_0224B6E0: ; 0x0224B6E0 ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -37066,7 +37066,7 @@ MOD18_0224B6E0: ; 0x0224B6E0 ldr r0, [r5, #0x4c] mov r1, #2 ldr r0, [r0, #0xc] - bl FUN_02001470 + bl ListMenuGetTemplateField add r1, sp, #0 add r2, r0, #0 ldrh r1, [r1, #2] @@ -37823,7 +37823,7 @@ MOD18_0224BD54: ; 0x0224BD54 mov r1, #0x91 lsl r1, r1, #2 mov r2, #1 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank ldr r0, _0224BDE4 ; =0x00000246 mov r1, #0 strb r1, [r4, r0] @@ -38067,7 +38067,7 @@ MOD18_0224BF84: ; 0x0224BF84 ldr r0, [r5, #0x48] ldrh r4, [r5, r1] add r1, r5, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId ldr r0, _0224BFA4 ; =0x0000024A ldrh r0, [r5, r0] cmp r4, r0 @@ -38462,7 +38462,7 @@ _0224C288: bl MOD18_022498EC add r0, r4, #0 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -38502,14 +38502,14 @@ _0224C288: ldr r0, [r5, #0x40] mov r2, #0xd mov r3, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 add r1, r0, #0 ldr r0, [r5, #0x40] mov r2, #0xe mov r3, #1 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 mov r2, #0xf @@ -38517,7 +38517,7 @@ _0224C288: add r3, r2, #0 ldr r0, [r5, #0x40] sub r3, #0x11 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _0224C396 _0224C31E: cmp r0, #0 @@ -38532,14 +38532,14 @@ _0224C31E: ldr r0, [r5, #0x40] mov r2, #0x10 mov r3, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 add r1, r0, #0 ldr r0, [r5, #0x40] mov r2, #0x11 mov r3, #1 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 mov r2, #0x12 @@ -38547,7 +38547,7 @@ _0224C31E: add r3, r2, #0 ldr r0, [r5, #0x40] sub r3, #0x14 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _0224C396 _0224C36C: bl MOD18_0223D658 @@ -38556,7 +38556,7 @@ _0224C36C: ldr r0, [r5, #0x40] mov r2, #0x1c mov r3, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData bl MOD18_0223D658 bl MOD18_0224DBB4 mov r2, #0x16 @@ -38564,7 +38564,7 @@ _0224C36C: add r3, r2, #0 ldr r0, [r5, #0x40] sub r3, #0x18 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData _0224C396: bl MOD18_0224DAD8 add r1, sp, #0x14 @@ -38606,7 +38606,7 @@ _0224C396: lsr r1, r1, #0x10 lsr r2, r2, #0x10 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x48] mov r0, #0x8b lsl r0, r0, #2 @@ -38632,17 +38632,17 @@ MOD18_0224C418: ; 0x0224C418 mov r1, #0x13 add r7, r0, #0 add r6, r2, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField add r4, r0, #0 cmp r6, #0 beq _0224C434 add r0, r7, #0 - bl FUN_02001B80 + bl ListMenuCopyToVram _0224C434: add r0, r4, #0 add r0, #0x20 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer bl MOD18_0223D658 bl MOD18_0224DBB4 ldr r1, _0224C504 ; =0x00000247 @@ -38746,7 +38746,7 @@ MOD18_0224C510: ; 0x0224C510 mov r1, #0x13 str r0, [sp, #0xc] str r2, [sp, #0x10] - bl FUN_02001470 + bl ListMenuGetTemplateField add r4, r0, #0 ldr r0, [r4, #0xc] bl ScriptEnvironment_GetSav2Ptr @@ -38756,12 +38756,12 @@ MOD18_0224C510: ; 0x0224C510 add r0, #0x20 mov r1, #0xf mov r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x10] cmp r0, #0 beq _0224C546 ldr r0, [sp, #0xc] - bl FUN_02001B80 + bl ListMenuCopyToVram _0224C546: mov r0, #1 mvn r0, r0 @@ -39086,7 +39086,7 @@ MOD18_0224C7D4: ; 0x0224C7D4 bl MOD18_022498EC mov r0, #6 mov r1, #4 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x40] mov r2, #3 add r1, r5, #0 @@ -39123,7 +39123,7 @@ MOD18_0224C7D4: ; 0x0224C7D4 bl MOD18_0223D678 ldr r1, _0224C938 ; =0x0000023B mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank b _0224C876 _0224C83C: cmp r0, #0 @@ -39137,7 +39137,7 @@ _0224C83C: bl MOD18_0223D678 ldr r1, _0224C93C ; =0x00000237 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank b _0224C876 _0224C85C: mov r0, #0 @@ -39149,7 +39149,7 @@ _0224C85C: bl MOD18_0223D678 ldr r1, _0224C940 ; =0x00000239 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank _0224C876: mov r7, #0x21 mov r4, #0 @@ -39160,7 +39160,7 @@ _0224C87C: ldr r0, [r5, #0x40] add r1, r6, #0 add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 cmp r4, #5 blt _0224C87C @@ -39168,7 +39168,7 @@ _0224C87C: ldr r0, [r5, #0x40] add r1, r6, #0 sub r3, r2, #2 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r6, #0 bl DestroyMsgData bl MOD18_0224DAD8 @@ -39228,7 +39228,7 @@ _0224C87C: lsr r1, r1, #0x10 lsr r2, r2, #0x10 mov r3, #4 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x48] add r5, #0x10 add r0, r5, #0 @@ -39394,7 +39394,7 @@ MOD18_0224CA58: ; 0x0224CA58 bl MOD18_0223D658 ldr r1, _0224CA90 ; =0x00000241 mov r2, #1 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank bl MOD18_0223D658 add r4, r0, #0 bl FUN_02031190 @@ -39490,7 +39490,7 @@ _0224CB1A: add r0, r4, #0 add r0, #0x20 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0x20 add r0, r4, #0 bl CopyWindowToVram @@ -39531,7 +39531,7 @@ MOD18_0224CB34: ; 0x0224CB34 add r0, r5, #0 add r0, #0x30 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x30 bl CopyWindowToVram @@ -39599,7 +39599,7 @@ _0224CBF0: add r5, r5, #6 cmp r3, #0x14 blt _0224CBD6 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -39680,13 +39680,13 @@ _0224CC7E: pop {r4, r5, r6, pc} _0224CC8E: ldr r0, [r4, #0x48] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0 add r1, sp, #4 ldr r0, [r4, #0x48] add r1, #2 add r2, sp, #4 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #4 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -39696,7 +39696,7 @@ _0224CC8E: ldr r0, [r4, #0x48] ldrh r6, [r4, r1] add r1, r4, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId ldr r0, _0224CF54 ; =0x0000024A ldrh r0, [r4, r0] cmp r6, r0 @@ -39771,13 +39771,13 @@ _0224CD32: pop {r4, r5, r6, pc} _0224CD48: ldr r0, [r4, #0x48] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0 add r1, sp, #4 ldr r0, [r4, #0x48] add r1, #2 add r2, sp, #4 - bl FUN_02001448 + bl ListMenuGetScrollAndRow mov r0, #0x92 lsl r0, r0, #2 ldrb r0, [r4, r0] @@ -39792,7 +39792,7 @@ _0224CD48: ldr r0, [r4, #0x48] ldrh r6, [r4, r1] add r1, r4, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId ldr r0, _0224CF54 ; =0x0000024A ldrh r0, [r4, r0] cmp r6, r0 @@ -39916,7 +39916,7 @@ _0224CE68: ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #4 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #4 ldrh r1, [r2] ldrh r2, [r2, #2] @@ -40138,7 +40138,7 @@ _0224D046: ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #4 - bl FUN_02001448 + bl ListMenuGetScrollAndRow mov r0, #0x92 lsl r0, r0, #2 ldrb r0, [r4, r0] @@ -40827,7 +40827,7 @@ MOD18_0224D5CC: ; 0x0224D5CC add r0, r4, #0 add r0, #8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x30] cmp r0, #0 beq _0224D644 @@ -41024,17 +41024,17 @@ MOD18_0224D79C: ; 0x0224D79C cmp r5, #0x20 ldr r4, [r0, r1] bge _0224D7B4 - bl ErrorHandling + bl GF_AssertFail _0224D7B4: cmp r5, #0x2d ble _0224D7BC - bl ErrorHandling + bl GF_AssertFail _0224D7BC: bl FUN_0204F7E4 bl MOD18_0223D658 ldr r1, _0224D80C ; =0x00000245 mov r2, #1 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank mov r0, #4 bl FUN_02025964 add r6, r0, #0 @@ -41332,7 +41332,7 @@ MOD18_0224DA00: ; 0x0224DA00 add r0, r5, #0 add r0, #8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 ldr r3, _0224DAA0 ; =0x022513FC str r6, [sp] @@ -41435,7 +41435,7 @@ _0224DB08: add r0, r4, #0 str r7, [r4, #0x18] add r0, #8 - bl FUN_0201901C + bl InitWindow ldr r1, [r4, #0x40] mov r0, #1 bic r1, r0 @@ -41468,8 +41468,9 @@ MOD18_0224DB5C: ; 0x0224DB5C pop {r4, pc} thumb_func_end MOD18_0224DB5C - thumb_func_start MOD18_0224DB80 -MOD18_0224DB80: ; 0x0224DB80 + thumb_func_start MOD18_LoadMsgBank +MOD18_LoadMsgBank: ; 0x0224DB80 + ; void MOD18_LoadMsgBank(struct MOD18Work * work, s32 bank, u32 async) push {r4, r5, r6, lr} add r5, r0, #0 ldr r0, [r5, #0x2c] @@ -41488,11 +41489,11 @@ MOD18_0224DB80: ; 0x0224DB80 str r0, [r5, #0x24] cmp r0, #0 bne _0224DBAC - bl ErrorHandling + bl GF_AssertFail _0224DBAC: pop {r4, r5, r6, pc} .align 2, 0 - thumb_func_end MOD18_0224DB80 + thumb_func_end MOD18_LoadMsgBank thumb_func_start MOD18_0224DBB0 MOD18_0224DBB0: ; 0x0224DBB0 @@ -41590,7 +41591,7 @@ _0224DC4C: add r0, r5, #0 add r0, #8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 ldr r2, _0224DCB0 ; =0x000001E2 add r0, #8 @@ -42286,7 +42287,7 @@ MOD18_0224E0CC: ; 0x0224E0CC add r5, r0, #0 mov r0, #4 add r1, r0, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x24] mov r2, #3 str r2, [sp] @@ -42345,7 +42346,7 @@ MOD18_0224E0CC: ; 0x0224E0CC add r0, r5, #0 add r0, #0x14 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r7, #0 mov r1, #0 bl NewString_ReadMsgData @@ -42369,7 +42370,7 @@ _0224E186: ldr r2, [r4] add r1, r7, #0 add r3, r6, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r4, r4, #4 cmp r6, #4 @@ -42402,7 +42403,7 @@ _0224E186: ldr r2, [r5, #0x34] ldrh r1, [r1] ldrh r2, [r2] - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x28] add r0, r5, #4 bl CopyWindowToVram @@ -42429,7 +42430,7 @@ MOD18_0224E210: ; 0x0224E210 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0x28] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD18_0224E73C @@ -42483,7 +42484,7 @@ MOD18_0224E26C: ; 0x0224E26C ldr r0, [r4, #0x28] ldr r1, [r4, #0x30] ldr r2, [r4, #0x34] - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #4 mov r1, #1 bl FUN_0200CCF8 @@ -42496,7 +42497,7 @@ MOD18_0224E26C: ; 0x0224E26C add r0, #0x14 bl FUN_02019178 ldr r0, [r4, #0x24] - bl ListMenu_dtor + bl ListMenuItems_dtor pop {r4, pc} .align 2, 0 thumb_func_end MOD18_0224E26C @@ -42512,13 +42513,13 @@ MOD18_0224E2B4: ; 0x0224E2B4 add r1, r2, #0 mov r2, #0xf mov r3, #2 - bl FUN_020013E8 + bl ListMenuOverrideSetColors pop {r3, pc} _0224E2CC: mov r1, #2 mov r2, #0xf add r3, r1, #0 - bl FUN_020013E8 + bl ListMenuOverrideSetColors pop {r3, pc} thumb_func_end MOD18_0224E2B4 @@ -42639,16 +42640,16 @@ _0224E384: ldr r0, [r0, #0xc] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow ldr r0, [r5, #0x2c] mov r1, #2 ldr r0, [r0, #0xc] - bl FUN_02001470 + bl ListMenuGetTemplateField add r7, r0, #0 ldr r0, [r5, #0x2c] mov r1, #3 ldr r0, [r0, #0xc] - bl FUN_02001470 + bl ListMenuGetTemplateField add r3, r0, #0 add r1, sp, #0 lsl r2, r7, #0x10 @@ -42692,11 +42693,11 @@ MOD18_0224E3F0: ; 0x0224E3F0 add r4, r1, #0 add r5, r0, #0 mov r1, #0x13 - bl FUN_02001470 + bl ListMenuGetTemplateField add r6, r0, #0 add r0, r5, #0 mov r1, #2 - bl FUN_02001470 + bl ListMenuGetTemplateField lsr r1, r4, #1 sub r0, r0, #1 cmp r1, r0 @@ -42741,7 +42742,7 @@ _0224E454: ldr r0, [sp, #0x20] mov r1, #4 add r0, r0, #1 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5, #0x28] mov r2, #3 str r2, [sp] @@ -42804,7 +42805,7 @@ _0224E454: add r0, r5, #0 add r0, #0x18 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x24] mov r1, #9 bl NewString_ReadMsgData @@ -42899,7 +42900,7 @@ _0224E5B4: ldr r1, [sp, #0x18] ldr r2, [sp, #0x14] add r3, r6, r3 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, [sp, #0x20] add r4, r4, #1 add r6, r6, #2 @@ -42911,13 +42912,13 @@ _0224E5CE: ldr r1, [sp, #0x18] ldr r2, _0224E694 ; =0x00000115 add r3, r3, #1 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, [sp, #0x18] bl DestroyMsgData bl MOD18_0223D678 ldr r1, _0224E68C ; =0x00000237 mov r2, #0 - bl MOD18_0224DB80 + bl MOD18_LoadMsgBank ldr r4, _0224E698 ; =0x022507D0 add r3, sp, #0x30 add r2, r3, #0 @@ -43025,7 +43026,7 @@ MOD18_0224E6A8: ; 0x0224E6A8 add r0, #0x18 bl FUN_02019178 ldr r0, [r4, #0x28] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, [r4, #4] bl FUN_0205EBEC pop {r4, pc} @@ -43078,7 +43079,7 @@ MOD18_0224E73C: ; 0x0224E73C add r1, r5, #0 ldr r0, [r5, #0x28] add r1, #0x40 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId add r5, #0x40 ldrh r0, [r5] cmp r4, r0 @@ -43100,7 +43101,7 @@ MOD18_0224E764: ; 0x0224E764 add r7, r2, #0 cmp r5, #0 bne _0224E776 - bl ErrorHandling + bl GF_AssertFail _0224E776: add r4, r7, #0 add r4, #0x3c @@ -43178,7 +43179,7 @@ MOD18_0224E7F4: ; 0x0224E7F4 ldr r0, [r0, #0x5c] cmp r0, #0 bne _0224E80A - bl ErrorHandling + bl GF_AssertFail _0224E80A: add r2, r5, r4 add r2, #0x60 @@ -43592,7 +43593,7 @@ _0224EB6C: str r0, [r4, #4] b _0224EDBA _0224EB82: - bl ErrorHandling + bl GF_AssertFail b _0224EDBA _0224EB88: ldr r0, _0224EDC4 ; =0x000004DC @@ -44132,14 +44133,14 @@ _0224EFD6: ldr r0, [r0, #0x64] cmp r0, #0x20 blt _0224EFEA - bl ErrorHandling + bl GF_AssertFail _0224EFEA: ldr r0, _0224F14C ; =0x000004FC ldr r0, [r4, r0] ldr r0, [r0, #0x68] cmp r0, #0x20 blt _0224EFF8 - bl ErrorHandling + bl GF_AssertFail _0224EFF8: ldr r0, _0224F14C ; =0x000004FC add r2, r4, #0 @@ -44210,7 +44211,7 @@ _0224F06E: ldrb r0, [r4, r0] cmp r0, #0 bne _0224F08A - bl ErrorHandling + bl GF_AssertFail _0224F08A: ldr r0, _0224F158 ; =0x00000522 ldrb r1, [r4, r0] @@ -44241,7 +44242,7 @@ _0224F09E: ldrb r0, [r4, r0] cmp r0, #0 bne _0224F0CE - bl ErrorHandling + bl GF_AssertFail _0224F0CE: ldr r0, _0224F160 ; =0x00000521 ldrb r1, [r4, r0] @@ -44317,7 +44318,7 @@ _0224F164: ldrb r0, [r4, r0] sub r5, r1, r0 bpl _0224F172 - bl ErrorHandling + bl GF_AssertFail _0224F172: cmp r5, #0 bne _0224F184 @@ -44679,14 +44680,14 @@ _0224F442: ldr r0, [r0, #0x64] cmp r0, #0x20 blt _0224F456 - bl ErrorHandling + bl GF_AssertFail _0224F456: ldr r0, _0224F51C ; =0x000004FC ldr r0, [r5, r0] ldr r0, [r0, #0x68] cmp r0, #0x20 blt _0224F464 - bl ErrorHandling + bl GF_AssertFail _0224F464: ldr r0, _0224F51C ; =0x000004FC add r2, r5, #0 @@ -45216,7 +45217,7 @@ _0224F880: add r4, #0x24 cmp r2, #0x20 blt _0224F858 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} thumb_func_end MOD18_0224F850 @@ -45229,7 +45230,7 @@ MOD18_0224F890: ; 0x0224F890 add r4, r2, #0 cmp r7, #0x20 blt _0224F8A0 - bl ErrorHandling + bl GF_AssertFail _0224F8A0: mov r0, #0x24 add r6, r7, #0 @@ -45237,7 +45238,7 @@ _0224F8A0: ldr r0, [r4, r6] cmp r0, #0 beq _0224F8B0 - bl ErrorHandling + bl GF_AssertFail _0224F8B0: mov r0, #1 str r0, [r4, r6] @@ -45262,11 +45263,11 @@ MOD18_0224F8CC: ; 0x0224F8CC add r4, r1, #0 cmp r5, #0x20 blt _0224F8DA - bl ErrorHandling + bl GF_AssertFail _0224F8DA: cmp r5, #0 bne _0224F8E2 - bl ErrorHandling + bl GF_AssertFail _0224F8E2: mov r0, #0x24 add r6, r5, #0 @@ -45274,7 +45275,7 @@ _0224F8E2: ldr r0, [r4, r6] cmp r0, #0 bne _0224F8F2 - bl ErrorHandling + bl GF_AssertFail _0224F8F2: mov r1, #0 add r0, r4, r6 @@ -45555,7 +45556,7 @@ MOD18_0224FAEC: ; 0x0224FAEC add r5, r0, #0 add r4, r1, #0 bne _0224FAF8 - bl ErrorHandling + bl GF_AssertFail _0224FAF8: ldr r0, [r5, #0x2c] add r1, r4, #0 @@ -45577,7 +45578,7 @@ MOD18_0224FB04: ; 0x0224FB04 ldr r0, [r0, #0x5c] cmp r0, #0 bne _0224FB1E - bl ErrorHandling + bl GF_AssertFail _0224FB1E: add r0, r5, #0 add r0, #0x60 @@ -45625,7 +45626,7 @@ MOD18_0224FB64: ; 0x0224FB64 ldr r0, [r0, #0x5c] cmp r0, #0 bne _0224FB7A - bl ErrorHandling + bl GF_AssertFail _0224FB7A: mov r0, #5 lsl r0, r0, #8 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 67f4c29a..a77f95fc 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -226,7 +226,7 @@ _022525B2: pop {r3, r4, r5, pc} _022525C0: beq _022525C6 - bl ErrorHandling + bl GF_AssertFail _022525C6: ldr r0, [r4, #0x34] mov r1, #0 @@ -629,7 +629,7 @@ LoadPoketchApp: ; 0x022528B0 cmp r4, #0x19 blo _022528C0 _022528BC: - bl ErrorHandling + bl GF_AssertFail _022528C0: mov r0, #0 ldr r1, [r5, #0x14] @@ -688,7 +688,7 @@ MOD20_02252918: ; 0x02252918 ldrb r0, [r4, #2] cmp r0, #0 beq _02252926 - bl ErrorHandling + bl GF_AssertFail _02252926: add r0, r4, #0 ldr r2, [r4, #0x4c] @@ -723,7 +723,7 @@ MOD20_0225294C: ; 0x0225294C ldrb r0, [r4, #2] cmp r0, #2 beq _0225295A - bl ErrorHandling + bl GF_AssertFail _0225295A: ldr r0, [r4, #0x24] ldr r1, [r4, #0x40] @@ -767,7 +767,7 @@ MOD20_0225298C: ; 0x0225298C ldrb r0, [r4, #2] cmp r0, #1 beq _0225299A - bl ErrorHandling + bl GF_AssertFail _0225299A: mov r0, #2 strb r0, [r4, #2] @@ -781,7 +781,7 @@ MOD20_022529A0: ; 0x022529A0 ldrb r0, [r4, #2] cmp r0, #3 beq _022529AE - bl ErrorHandling + bl GF_AssertFail _022529AE: mov r0, #0 strb r0, [r4, #2] @@ -1223,7 +1223,7 @@ MOD20_02252C5C: ; 0x02252C5C lsl r0, r0, #4 str r7, [r4, r0] ldr r0, [r4, r0] - bl FUN_020B0888 + bl NNS_G2dResetOamManagerBuffer mov r0, #0x15 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -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 @@ -2587,7 +2587,7 @@ MOD20_02253714: ; 0x02253714 ldr r0, _02253750 ; =0x12345678 cmp r1, r0 beq _02253726 - bl ErrorHandling + bl GF_AssertFail _02253726: ldr r6, [r5] mov r2, #0 @@ -2625,7 +2625,7 @@ MOD20_02253754: ; 0x02253754 ldr r0, _02253790 ; =0x12345678 cmp r1, r0 beq _02253766 - bl ErrorHandling + bl GF_AssertFail _02253766: ldr r3, [r5] mov r2, #0 @@ -2648,7 +2648,7 @@ _02253782: cmp r2, r3 blo _02253770 _0225378A: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 _02253790: .word 0x12345678 @@ -2781,7 +2781,7 @@ _02253866: add sp, #0xc pop {r4, r5, r6, r7, pc} _02253870: - bl ErrorHandling + bl GF_AssertFail b _02253880 _02253876: add r3, #0xc @@ -2790,7 +2790,7 @@ _02253876: cmp r2, r1 bne _022537FA _02253880: - bl ErrorHandling + bl GF_AssertFail _02253884: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -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] @@ -3062,7 +3062,7 @@ _02253A4E: bl NARC_ReadFromMember add r0, r7, #0 add r1, sp, #0x20 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, [sp, #0x20] add r1, r5, #0 ldr r0, [r0, #0x14] @@ -3239,7 +3239,7 @@ MOD20_02253BA4: ; 0x02253BA4 str r7, [r4] str r5, [r4, #0x18] add r0, r7, #0 - bl FUN_020B0830 + bl NNS_G2dGetOamManagerOamCapacity strh r0, [r4, #0x10] ldrh r1, [r4, #0x10] add r0, r5, #0 @@ -3279,23 +3279,23 @@ _02253C0E: cmp r1, #0 beq _02253C22 add r0, r5, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit _02253C22: ldr r1, [r4, #0xc] cmp r1, #0 beq _02253C2E add r0, r5, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit _02253C2E: ldr r1, [r4, #4] cmp r1, #0 beq _02253C3A add r0, r5, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit _02253C3A: add r0, r5, #0 add r1, r4, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit _02253C42: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -3354,7 +3354,7 @@ _02253C96: mov r1, #2 add r0, #8 lsl r1, r1, #0xc - bl FUN_020B1EC4 + bl NNS_G2dTickCellAnimation add r0, r4, #0 add r0, #0x86 ldrb r0, [r0] @@ -3391,7 +3391,7 @@ _02253CAE: ldr r2, [r4, #0x34] add r0, r5, #0 lsr r1, r1, #0x10 - bl FUN_020B1AF8 + bl NNS_G2dMakeCellToOams b _02253D86 _02253CEE: ldr r0, [r4, #0x6c] @@ -3404,7 +3404,7 @@ _02253CEE: add r0, #0x8c ldrh r2, [r6, #0x10] ldrh r0, [r0] - ldr r1, _02253E58 ; =UNK_020FFA38 + ldr r1, _02253E58 ; =FX_SinCosTable_ add r0, r2, r0 lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -3425,7 +3425,7 @@ _02253D20: beq _02253D3E asr r0, r0, #4 lsl r3, r0, #2 - ldr r1, _02253E58 ; =UNK_020FFA38 + ldr r1, _02253E58 ; =FX_SinCosTable_ ldr r0, [r4, #0x6c] add r2, r1, r3 ldrsh r1, [r1, r3] @@ -3452,7 +3452,7 @@ _02253D62: ldr r0, [sp, #0xc] ldr r1, [r4, #0x6c] ldr r0, [r0] - bl FUN_020B0BB0 + bl NNS_G2dEntryOamManagerAffine add r1, sp, #0x18 str r1, [sp] str r0, [sp, #4] @@ -3464,7 +3464,7 @@ _02253D62: ldr r3, [r4, #0x6c] add r0, r5, #0 lsr r1, r1, #0x10 - bl FUN_020B1AF8 + bl NNS_G2dMakeCellToOams _02253D86: ldr r1, [sp, #0x10] sub r1, r1, r0 @@ -3569,12 +3569,12 @@ _02253E38: lsl r2, r2, #0xd ldr r0, [r0] lsr r2, r2, #0x10 - bl FUN_020B0D58 + bl NNS_G2dEntryOamManagerOam _02253E52: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop -_02253E58: .word UNK_020FFA38 +_02253E58: .word FX_SinCosTable_ _02253E5C: .word 0xDFFFFFFF _02253E60: .word 0xFFFFF3FF _02253E64: .word 0xFFFF0FFF @@ -3607,12 +3607,12 @@ MOD20_02253E74: ; 0x02253E74 ldr r0, [r6, #0xc] str r0, [r4, #4] ldrh r1, [r5, #8] - bl FUN_020AFC04 + bl NNS_G2dGetAnimSequenceByIdx add r1, r0, #0 add r0, r4, #0 ldr r2, [r4] add r0, #8 - bl FUN_020B1F80 + bl NNS_G2dInitCellAnimation ldr r1, [r5] ldr r0, [r5, #4] str r1, [r4, #0x64] @@ -3686,12 +3686,12 @@ MOD20_02253F28: ; 0x02253F28 lsl r1, r1, #0x10 ldr r0, [r4, #4] lsr r1, r1, #0x10 - bl FUN_020AFC04 + bl NNS_G2dGetAnimSequenceByIdx add r1, r0, #0 add r0, r4, #0 ldr r2, [r4] add r0, #8 - bl FUN_020B1F80 + bl NNS_G2dInitCellAnimation pop {r4, pc} thumb_func_end MOD20_02253F28 @@ -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 @@ -3820,7 +3820,7 @@ MOD20_02253FBC: ; 0x02253FBC beq _0225400E add r1, r5, #0 add r1, #8 - bl FUN_020AFEB8 + bl NNS_G2dGetUnpackedCellBank cmp r0, #0 bne _02253FFC mov r0, #0 @@ -3829,7 +3829,7 @@ _02253FFC: ldr r0, [r5, #4] add r5, #0xc add r1, r5, #0 - bl thunk_FUN_020afda0 + bl NNS_G2dGetUnpackedMCAnimBank cmp r0, #0 bne _0225400E mov r0, #0 @@ -3848,7 +3848,7 @@ MOD20_02254014: ; 0x02254014 cmp r1, #0 beq _02254028 ldr r0, [r4, #0x10] - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4] _02254028: @@ -3856,7 +3856,7 @@ _02254028: cmp r1, #0 beq _02254038 ldr r0, [r4, #0x10] - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0 str r0, [r4, #4] _02254038: @@ -4035,7 +4035,7 @@ MOD20_02254130: ; 0x02254130 str r3, [sp, #4] ldr r5, [sp, #0x20] bne _02254144 - bl ErrorHandling + bl GF_AssertFail _02254144: add r0, r5, #0 mov r1, #0x18 @@ -4072,7 +4072,7 @@ _02254176: _02254188: add r0, r5, #0 add r1, r4, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit mov r4, #0 _02254192: add r0, r4, #0 @@ -4085,14 +4085,14 @@ MOD20_02254198: ; 0x02254198 push {r4, lr} add r4, r0, #0 bne _022541A2 - bl ErrorHandling + bl GF_AssertFail _022541A2: ldr r0, [r4, #8] ldr r1, [r4, #0x14] - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, [r4, #8] add r1, r4, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit pop {r4, pc} thumb_func_end MOD20_02254198 @@ -4481,11 +4481,11 @@ MOD20_02254420: ; 0x02254420 add r7, r3, #0 cmp r5, #0x1e blo _02254432 - bl ErrorHandling + bl GF_AssertFail _02254432: cmp r4, #0x21 blo _0225443A - bl ErrorHandling + bl GF_AssertFail _0225443A: cmp r5, #0x1e blo _02254440 @@ -4517,7 +4517,7 @@ MOD20_02254460: ; 0x02254460 add r6, r2, #0 cmp r5, #4 blo _02254470 - bl ErrorHandling + bl GF_AssertFail _02254470: ldr r0, _02254480 ; =MOD20_02254724 lsl r1, r5, #3 diff --git a/arm9/modules/21/src/mod21_02254854.c b/arm9/modules/21/src/mod21_02254854.c index a9a7599d..1c91afde 100644 --- a/arm9/modules/21/src/mod21_02254854.c +++ b/arm9/modules/21/src/mod21_02254854.c @@ -29,7 +29,7 @@ THUMB_FUNC BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(8, sizeof(UnkStruct02254854)); if (alloced != NULL) { - if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, void *))MOD21_02254930, alloced, (void *)1)) + if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, struct TextPrinter *))MOD21_02254930, (struct TextPrinter *)alloced, 1)) { *param0 = alloced; return TRUE; 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 2888f12d..cdf4b770 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -624,7 +624,7 @@ MOD24_02254CA0: ; 0x02254CA0 bl FUN_02016B90 cmp r0, #0 bne _02254CC0 - bl ErrorHandling + bl GF_AssertFail _02254CC0: add r0, r4, #0 add r0, #8 @@ -634,7 +634,7 @@ _02254CC0: bl FUN_02016B90 cmp r0, #0 bne _02254CD8 - bl ErrorHandling + bl GF_AssertFail _02254CD8: str r6, [r4] bl MOD20_02252D34 @@ -645,7 +645,7 @@ _02254CD8: bl FUN_02016B90 cmp r0, #0 bne _02254CF4 - bl ErrorHandling + bl GF_AssertFail _02254CF4: str r4, [r5] mov r0, #1 @@ -662,7 +662,7 @@ MOD24_02254D00: ; 0x02254D00 add r4, r0, #0 mov r0, #8 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r4, #0x70] add r1, r0, #0 beq _02254D3C @@ -681,7 +681,7 @@ MOD24_02254D00: ; 0x02254D00 bne _02254D38 ldr r0, [r4, #0x70] mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer _02254D38: mov r0, #1 pop {r4, pc} @@ -702,7 +702,7 @@ MOD24_02254D48: ; 0x02254D48 bl FUN_02016B90 cmp r0, #0 bne _02254D5C - bl ErrorHandling + bl GF_AssertFail _02254D5C: ldr r2, [r4, #0x70] cmp r2, #0 @@ -786,7 +786,7 @@ MOD24_02254DDC: ; 0x02254DDC bl FUN_02016B90 cmp r0, #0 bne _02254DF0 - bl ErrorHandling + bl GF_AssertFail _02254DF0: add r0, r4, #0 bl MOD20_022538A0 @@ -805,7 +805,7 @@ _02254DF0: bl FUN_02016B90 cmp r0, #0 bne _02254E1E - bl ErrorHandling + bl GF_AssertFail _02254E1E: mov r0, #0 str r0, [sp] @@ -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 @@ -838,7 +838,7 @@ _02254E1E: bl FUN_02016B90 cmp r0, #0 bne _02254E68 - bl ErrorHandling + bl GF_AssertFail _02254E68: add r0, r5, #0 bl MOD24_02254D00 @@ -848,7 +848,7 @@ _02254E68: bl FUN_02016B90 cmp r0, #0 bne _02254E82 - bl ErrorHandling + bl GF_AssertFail _02254E82: add r0, r5, #0 bl MOD24_02255078 @@ -856,7 +856,7 @@ _02254E82: bl FUN_02016B90 cmp r0, #0 bne _02254E96 - bl ErrorHandling + bl GF_AssertFail _02254E96: ldr r0, [r5, #4] mov r1, #7 @@ -880,7 +880,7 @@ _02254E96: bl FUN_02016B90 cmp r0, #0 bne _02254ECC - bl ErrorHandling + bl GF_AssertFail _02254ECC: add sp, #0x14 pop {r4, r5, pc} @@ -987,7 +987,7 @@ _02254F80: mov r1, #4 lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect asr r1, r5, #3 mov r2, #0x14 asr r0, r6, #3 @@ -1048,7 +1048,7 @@ _02254FF2: mov r1, #1 lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, [r7, #0x70] mov r2, #0x20 ldr r1, [r0, #0xc] @@ -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 9fa91fb4..25e4a4b6 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -389,7 +389,7 @@ MOD27_02254AF0: ; 0x02254AF0 add r7, r6, #0 _02254B36: add r0, r4, #0 - bl FUN_0201901C + bl InitWindow add r0, r5, #0 add r0, #0x9c str r7, [r0] @@ -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] @@ -608,7 +608,7 @@ MOD27_02254CC8: ; 0x02254CC8 add r4, #0x3c _02254CE8: add r0, r4, #0 - bl FUN_0201901C + bl InitWindow ldrh r0, [r5, #2] add r1, r4, #0 mov r2, #6 @@ -834,7 +834,7 @@ MOD27_02254EAC: ; 0x02254EAC mov r1, #4 add r3, r2, #0 add r5, r0, #0 - bl FUN_020196F4 + bl FillWindowPixelRect cmp r4, #0 beq _02254EE0 lsl r0, r4, #0x10 @@ -846,7 +846,7 @@ MOD27_02254EAC: ; 0x02254EAC add r0, r5, #0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect _02254EE0: add r0, r5, #0 bl FUN_02019548 @@ -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] @@ -1015,7 +1015,7 @@ _02254FFC: bl NARC_ReadFromMember ldr r0, [sp, #0x18] add r1, sp, #0x20 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, [sp, #0x20] mov r1, #2 ldr r0, [r0, #0x14] diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 618309d1..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 @@ -670,7 +670,7 @@ _02254D24: bl NARC_AllocAndReadWholeMember add r1, sp, #0x2c str r0, [sp, #0x20] - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, [sp, #0x2c] mov r1, #1 ldr r0, [r0, #0x14] @@ -744,7 +744,7 @@ _02254D24: bl MOD20_02253F9C b _02254DE0 _02254DDC: - bl ErrorHandling + bl GF_AssertFail _02254DE0: ldrh r0, [r4, #8] mov r1, #0x1c ; BASE_FLIP 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 fcd3cbc9..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 @@ -984,7 +984,7 @@ MOD36_02254F5C: ; 0x02254F5C bl FUN_02016B90 cmp r0, #0 bne _02254F70 - bl ErrorHandling + bl GF_AssertFail _02254F70: add r0, r5, #0 bl MOD20_022538A0 @@ -1003,7 +1003,7 @@ _02254F70: bl FUN_02016B90 cmp r0, #0 bne _02254F9E - bl ErrorHandling + bl GF_AssertFail _02254F9E: mov r0, #0 str r0, [sp] @@ -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 @@ -1037,7 +1037,7 @@ _02254F9E: bl FUN_02016B90 cmp r0, #0 bne _02254FEA - bl ErrorHandling + bl GF_AssertFail _02254FEA: add r0, r4, #0 lsr r1, r6, #5 @@ -1064,7 +1064,7 @@ _02254FEA: bl FUN_02016B90 cmp r0, #0 bne _02255028 - bl ErrorHandling + bl GF_AssertFail _02255028: add sp, #0x14 pop {r3, r4, r5, r6, pc} @@ -1108,7 +1108,7 @@ MOD36_0225503C: ; 0x0225503C add r0, r4, #0 add r0, #0x48 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer _02255082: add r0, r4, #0 add r0, #0x48 @@ -1205,7 +1205,7 @@ MOD36_0225510C: ; 0x0225510C mov r1, #1 lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r1, [r4, #0x54] lsl r0, r5, #5 add r0, r1, r0 @@ -1298,7 +1298,7 @@ MOD36_022551E0: ; 0x022551E0 add r0, r4, #0 add r0, #0x48 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0x48 add r0, r4, #0 bl FUN_02019548 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 e1d888d4..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 @@ -1046,7 +1046,7 @@ MOD38_0225500C: ; 0x0225500C add r0, r4, #0 mov r1, #4 add r6, r2, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r6, #0x12 bne _02255036 add r0, r5, #0 @@ -1106,7 +1106,7 @@ MOD38_02255084: ; 0x02255084 add r0, r4, #0 mov r1, #4 add r6, r2, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r2, r5, #0 add r0, #0xb8 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 89b23259..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 @@ -654,7 +654,7 @@ MOD43_02254CD0: ; 0x02254CD0 bl FUN_02019064 add r0, sp, #0x14 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -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 abb1ea34..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 @@ -1162,7 +1162,7 @@ MOD47_022550FC: ; 0x022550FC add r4, r0, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #0 @@ -1225,7 +1225,7 @@ MOD47_02255184: ; 0x02255184 add r4, r0, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #1 @@ -1265,7 +1265,7 @@ MOD47_022551D8: ; 0x022551D8 add r4, r0, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #2 @@ -1322,7 +1322,7 @@ MOD47_02255250: ; 0x02255250 add r4, r0, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x58] ldr r2, [r4, #0x5c] mov r1, #2 @@ -1386,7 +1386,7 @@ MOD47_022552D8: ; 0x022552D8 add r7, r1, #0 add r0, #0x20 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x58] ldr r2, [r5, #0x5c] mov r1, #5 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/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index bce289da..1de7ea96 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -421,7 +421,7 @@ MOD49_02254AD4: ; 0x02254AD4 bl FUN_02019064 add r0, sp, #0x1c mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, sp, #0x1c bl FUN_02019270 ldr r1, _02254BD4 ; =0x00000197 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 60bdd016..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} @@ -165,7 +165,7 @@ _02254960: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram ldr r0, [sp, #0x18] @@ -193,7 +193,7 @@ _02254960: add r0, r5, #0 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x10 bl CopyWindowToVram @@ -221,7 +221,7 @@ _02254960: add r0, r5, #0 add r0, #0x20 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x20 bl CopyWindowToVram @@ -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 @@ -792,20 +792,20 @@ MOD51_02254E48: ; 0x02254E48 add r7, r5, r0 add r0, r7, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x76 lsl r0, r0, #2 add r0, r5, r0 str r0, [sp, #0x1c] add r0, r0, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7a lsl r0, r0, #2 add r5, r5, r0 add r0, r5, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 str r0, [sp] mov r0, #0xff diff --git a/arm9/modules/52/include/module_52.h b/arm9/modules/52/include/module_52.h index 4c47a82d..d997f1a6 100644 --- a/arm9/modules/52/include/module_52.h +++ b/arm9/modules/52/include/module_52.h @@ -13,30 +13,24 @@ #include "unk_02024E64.h" #include "unk_020286F8.h" -const u8 MOD52_021D76F8[]; +extern const struct Unk21DBE18 MOD52_021D76E8; +extern const struct Unk21DBE18 MOD52_021D76D8; +extern const struct Unk21DBE18 MOD52_021D76C8; -THUMB_FUNC int MOD52_021D74E0(); -THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0); -THUMB_FUNC int MOD52_021D750C(); +BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2); +BOOL MOD52_021D74F8(struct UnkStruct_02006234 *param0, u32 *unused); +BOOL MOD52_021D750C(struct UnkStruct_02006234 *arg1, u32 *arg2); -THUMB_FUNC int MOD52_021D7528(); -THUMB_FUNC int MOD52_021D7540(struct UnkStruct_02006234 *param0); -THUMB_FUNC int MOD52_021D7560(); +BOOL MOD52_021D7528(struct UnkStruct_02006234 *arg1, u32 *arg2); +BOOL MOD52_021D7540(struct UnkStruct_02006234 *param0, u32 *unused); +BOOL MOD52_021D7560(struct UnkStruct_02006234 *arg1, u32 *arg2); -THUMB_FUNC int MOD52_021D757C(); -THUMB_FUNC int MOD52_021D7594(struct UnkStruct_02006234 *param0); -THUMB_FUNC int MOD52_021D75E8(); +BOOL MOD52_021D757C(struct UnkStruct_02006234 *arg1, u32 *arg2); +BOOL MOD52_021D7594(struct UnkStruct_02006234 *param0, u32 *unused); +BOOL MOD52_021D75E8(struct UnkStruct_02006234 *arg1, u32 *arg2); -THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid); -THUMB_FUNC void MOD52_021D7688(u32 param0, struct SaveBlock2 *sav2); -THUMB_FUNC void MOD52_021D769C(u32 param0, struct SaveBlock2 *sav2); - -struct MOD52_Struct -{ - int (*func1)(void); - int (*func2)(struct UnkStruct_02006234 *param0); - int (*func3)(void); - u32 terminator; -}; +void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_trainerid); +void MOD52_021D7688(u32 param0, struct SaveBlock2 *sav2); +void MOD52_021D769C(u32 param0, struct SaveBlock2 *sav2); #endif // POKEDIAMOND_MODULE_52_H
\ No newline at end of file diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c index 1f74c77f..41f2706a 100644 --- a/arm9/modules/52/src/module_52.c +++ b/arm9/modules/52/src/module_52.c @@ -1,28 +1,173 @@ #include "module_52.h" #include "heap.h" #include "unk_0205FA2C.h" +#include "unk_02015E30.h" extern struct Unk21DBE18 UNK_020FD144; extern struct Unk21DBE18 UNK_020F2B7C; extern struct Unk21DBE18 UNK_020F2B8C; -extern void FUN_02015E3C(struct IGT *igt); extern int FUN_02053678(u32 random, u32 gender, u32 param2); -extern void FUN_020250C4(void *sav_ptr, u32 heap_id, const u8 param2[], u32 param3); +extern void FUN_020250C4(void *sav_ptr, u32 heap_id, const u16 param2[], u32 param3); extern void FUN_020377E0(struct SaveBlock2 *sav2); extern void FUN_0205ECD4(struct ScriptState *script_state); -THUMB_FUNC int MOD52_021D74E0() +const struct Unk21DBE18 MOD52_021D76E8 = { + MOD52_021D74E0, + MOD52_021D74F8, + MOD52_021D750C, + 0xFFFFFFFF, +}; + +const struct Unk21DBE18 MOD52_021D76D8 = { + MOD52_021D7528, + MOD52_021D7540, + MOD52_021D7560, + 0xFFFFFFFF, +}; + +const struct Unk21DBE18 MOD52_021D76C8 = { + MOD52_021D757C, + MOD52_021D7594, + MOD52_021D75E8, + 0xFFFFFFFF, +}; + +const u16 MOD52_021D76F8[] = { + ITEM_ORAN_BERRY, 1, + ITEM_CHERI_BERRY, 1, + ITEM_CHESTO_BERRY, 1, + ITEM_PECHA_BERRY, 1, + ITEM_ORAN_BERRY, 1, + ITEM_PECHA_BERRY, 1, + ITEM_RAZZ_BERRY, 2, + ITEM_BLUK_BERRY, 2, + ITEM_CHERI_BERRY, 1, + ITEM_ORAN_BERRY, 2, + ITEM_SITRUS_BERRY, 1, + ITEM_WEPEAR_BERRY, 2, + ITEM_WEPEAR_BERRY, 2, + ITEM_KELPSY_BERRY, 1, + ITEM_CHERI_BERRY, 1, + ITEM_PECHA_BERRY, 1, + ITEM_ORAN_BERRY, 1, + ITEM_ORAN_BERRY, 1, + ITEM_RAWST_BERRY, 1, + ITEM_RAWST_BERRY, 1, + ITEM_RAZZ_BERRY, 1, + ITEM_RAZZ_BERRY, 1, + ITEM_CHERI_BERRY, 1, + ITEM_ORAN_BERRY, 1, + ITEM_ORAN_BERRY, 1, + ITEM_BLUK_BERRY, 1, + ITEM_NANAB_BERRY, 2, + ITEM_RAZZ_BERRY, 2, + ITEM_BLUK_BERRY, 2, + ITEM_PINAP_BERRY, 2, + ITEM_LEPPA_BERRY, 1, + ITEM_CHESTO_BERRY, 1, + ITEM_RAZZ_BERRY, 1, + ITEM_RAZZ_BERRY, 1, + ITEM_PERSIM_BERRY, 1, + ITEM_NANAB_BERRY, 1, + ITEM_NANAB_BERRY, 1, + ITEM_FIGY_BERRY, 1, + ITEM_ASPEAR_BERRY, 1, + ITEM_ASPEAR_BERRY, 1, + ITEM_RAZZ_BERRY, 1, + ITEM_PINAP_BERRY, 1, + ITEM_SITRUS_BERRY, 1, + ITEM_CHESTO_BERRY, 1, + ITEM_WIKI_BERRY, 1, + ITEM_AGUAV_BERRY, 1, + ITEM_PECHA_BERRY, 1, + ITEM_ASPEAR_BERRY, 1, + ITEM_IAPAPA_BERRY, 1, + ITEM_GREPA_BERRY, 1, + ITEM_SITRUS_BERRY, 1, + ITEM_ASPEAR_BERRY, 1, + ITEM_TAMATO_BERRY, 1, + ITEM_LUM_BERRY, 1, + ITEM_PECHA_BERRY, 1, + ITEM_PINAP_BERRY, 1, + ITEM_PINAP_BERRY, 1, + ITEM_PINAP_BERRY, 1, + ITEM_PERSIM_BERRY, 1, + ITEM_PERSIM_BERRY, 1, + ITEM_NANAB_BERRY, 1, + ITEM_NANAB_BERRY, 1, + ITEM_AGUAV_BERRY, 1, + ITEM_IAPAPA_BERRY, 1, + ITEM_RAWST_BERRY, 1, + ITEM_RAWST_BERRY, 1, + ITEM_CHERI_BERRY, 1, + ITEM_SITRUS_BERRY, 1, + ITEM_CHESTO_BERRY, 1, + ITEM_POMEG_BERRY, 1, + ITEM_PECHA_BERRY, 2, + ITEM_BLUK_BERRY, 2, + ITEM_WIKI_BERRY, 1, + ITEM_MAGO_BERRY, 1, + ITEM_RAWST_BERRY, 1, + ITEM_PERSIM_BERRY, 1, + ITEM_FIGY_BERRY, 1, + ITEM_PINAP_BERRY, 2, + ITEM_LEPPA_BERRY, 1, + ITEM_PECHA_BERRY, 1, + ITEM_MAGO_BERRY, 1, + ITEM_HONDEW_BERRY, 1, + ITEM_WIKI_BERRY, 2, + ITEM_MAGO_BERRY, 2, + ITEM_AGUAV_BERRY, 2, + ITEM_QUALOT_BERRY, 1, + ITEM_SITRUS_BERRY, 2, + ITEM_BLUK_BERRY, 3, + ITEM_NANAB_BERRY, 3, + ITEM_WEPEAR_BERRY, 3, + ITEM_POMEG_BERRY, 1, + ITEM_POMEG_BERRY, 1, + ITEM_HONDEW_BERRY, 2, + ITEM_HONDEW_BERRY, 2, + ITEM_KELPSY_BERRY, 1, + ITEM_KELPSY_BERRY, 1, + ITEM_TAMATO_BERRY, 1, + ITEM_TAMATO_BERRY, 1, + ITEM_QUALOT_BERRY, 1, + ITEM_QUALOT_BERRY, 1, + ITEM_POMEG_BERRY, 1, + ITEM_POMEG_BERRY, 1, + ITEM_HONDEW_BERRY, 1, + ITEM_HONDEW_BERRY, 1, + ITEM_TAMATO_BERRY, 1, + ITEM_TAMATO_BERRY, 1, + ITEM_GREPA_BERRY, 1, + ITEM_GREPA_BERRY, 1, + ITEM_QUALOT_BERRY, 1, + ITEM_QUALOT_BERRY, 1, + ITEM_LUM_BERRY, 1, + ITEM_LEPPA_BERRY, 1, + ITEM_QUALOT_BERRY, 2, + ITEM_GREPA_BERRY, 2, + ITEM_KELPSY_BERRY, 2, + ITEM_KELPSY_BERRY, 2, + ITEM_GREPA_BERRY, 1, + ITEM_GREPA_BERRY, 1, +}; + +THUMB_FUNC BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2) { +#pragma unused(arg1) +#pragma unused(arg2) FUN_0201681C(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; } -THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0) +THUMB_FUNC BOOL MOD52_021D74F8(struct UnkStruct_02006234 *param0, u32 *unused) { +#pragma unused(unused) struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(param0)[2]; // weird MOD52_021D769C(0x4d, sav2); @@ -30,24 +175,29 @@ THUMB_FUNC int MOD52_021D74F8(struct UnkStruct_02006234 *param0) return 1; } -THUMB_FUNC int MOD52_021D750C() +THUMB_FUNC BOOL MOD52_021D750C(struct UnkStruct_02006234 *arg1, u32 *arg2) { +#pragma unused(arg1) +#pragma unused(arg2) FUN_020168D0(0x4d); RegisterMainOverlay(0XFFFFFFFF, &UNK_020FD144); return 1; } -THUMB_FUNC int MOD52_021D7528() +THUMB_FUNC BOOL MOD52_021D7528(struct UnkStruct_02006234 *arg1, u32 *arg2) { +#pragma unused(arg1) +#pragma unused(arg2) FUN_0201681C(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; } -THUMB_FUNC int MOD52_021D7540(struct UnkStruct_02006234 *param0) +THUMB_FUNC BOOL MOD52_021D7540(struct UnkStruct_02006234 *param0, u32 *unused) { +#pragma unused(unused) struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(param0)[2]; // weird MOD52_021D7604(0x4d, sav2, 1); @@ -57,24 +207,29 @@ THUMB_FUNC int MOD52_021D7540(struct UnkStruct_02006234 *param0) return 1; } -THUMB_FUNC int MOD52_021D7560() +THUMB_FUNC BOOL MOD52_021D7560(struct UnkStruct_02006234 *arg1, u32 *arg2) { +#pragma unused(arg1) +#pragma unused(arg2) FUN_020168D0(0x4d); RegisterMainOverlay(0xFFFFFFFF, &UNK_020F2B7C); return 1; } -THUMB_FUNC int MOD52_021D757C() +THUMB_FUNC BOOL MOD52_021D757C(struct UnkStruct_02006234 *arg1, u32 *arg2) { +#pragma unused(arg1) +#pragma unused(arg2) FUN_0201681C(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; } -THUMB_FUNC int MOD52_021D7594(struct UnkStruct_02006234 *param0) +THUMB_FUNC BOOL MOD52_021D7594(struct UnkStruct_02006234 *param0, u32 *unused) { +#pragma unused(unused) struct SaveBlock2 *sav2 = (struct SaveBlock2 *)OverlayManager_GetField18(param0)[2]; // weird struct SavSysInfo *sav2_info = Sav2_SysInfo_get(sav2); @@ -93,8 +248,10 @@ THUMB_FUNC int MOD52_021D7594(struct UnkStruct_02006234 *param0) return 1; } -THUMB_FUNC int MOD52_021D75E8() +THUMB_FUNC BOOL MOD52_021D75E8(struct UnkStruct_02006234 *arg1, u32 *arg2) { +#pragma unused(arg1) +#pragma unused(arg2) FUN_020168D0(0x4d); RegisterMainOverlay(0XFFFFFFFF, &UNK_020F2B8C); @@ -124,7 +281,7 @@ THUMB_FUNC void MOD52_021D7604(u32 heap_id, struct SaveBlock2 *sav2, BOOL set_tr PlayerProfile_SetAvatar(player_data, (u8)avatar); - FUN_020250C4(FUN_02024ECC(sav2), heap_id, MOD52_021D76F8, 0x76); + FUN_020250C4(FUN_02024ECC(sav2), heap_id, MOD52_021D76F8, NELEMS(MOD52_021D76F8) / 2); } THUMB_FUNC void MOD52_021D7688(u32 unused, struct SaveBlock2 *sav2) @@ -149,499 +306,3 @@ THUMB_FUNC void MOD52_021D769C(u32 unused, struct SaveBlock2 *sav2) PlayerProfile_SetMoney(player_data, 3000); FUN_0205ECD4(SavArray_Flags_get(sav2)); } - -const struct MOD52_Struct MOD52_021D76C8 = { - MOD52_021D757C, - MOD52_021D7594, - MOD52_021D75E8, - 0xFFFFFFFF, -}; - -const struct MOD52_Struct MOD52_021D76D8 = { - MOD52_021D7528, - MOD52_021D7540, - MOD52_021D7560, - 0xFFFFFFFF, -}; - -const struct MOD52_Struct MOD52_021D76E8 = { - MOD52_021D74E0, - MOD52_021D74F8, - MOD52_021D750C, - 0xFFFFFFFF, -}; - -const u8 MOD52_021D76F8[] = { - 0x9B, - 0x00, - 0x01, - 0x00, - 0x95, - 0x00, - 0x01, - 0x00, - 0x96, - 0x00, - 0x01, - 0x00, - 0x97, - 0x00, - 0x01, - 0x00, - 0x9B, - 0x00, - 0x01, - 0x00, - 0x97, - 0x00, - 0x01, - 0x00, - 0xA4, - 0x00, - 0x02, - 0x00, - 0xA5, - 0x00, - 0x02, - 0x00, - 0x95, - 0x00, - 0x01, - 0x00, - 0x9B, - 0x00, - 0x02, - 0x00, - 0x9E, - 0x00, - 0x01, - 0x00, - 0xA7, - 0x00, - 0x02, - 0x00, - 0xA7, - 0x00, - 0x02, - 0x00, - 0xAA, - 0x00, - 0x01, - 0x00, - 0x95, - 0x00, - 0x01, - 0x00, - 0x97, - 0x00, - 0x01, - 0x00, - 0x9B, - 0x00, - 0x01, - 0x00, - 0x9B, - 0x00, - 0x01, - 0x00, - 0x98, - 0x00, - 0x01, - 0x00, - 0x98, - 0x00, - 0x01, - 0x00, - 0xA4, - 0x00, - 0x01, - 0x00, - 0xA4, - 0x00, - 0x01, - 0x00, - 0x95, - 0x00, - 0x01, - 0x00, - 0x9B, - 0x00, - 0x01, - 0x00, - 0x9B, - 0x00, - 0x01, - 0x00, - 0xA5, - 0x00, - 0x01, - 0x00, - 0xA6, - 0x00, - 0x02, - 0x00, - 0xA4, - 0x00, - 0x02, - 0x00, - 0xA5, - 0x00, - 0x02, - 0x00, - 0xA8, - 0x00, - 0x02, - 0x00, - 0x9A, - 0x00, - 0x01, - 0x00, - 0x96, - 0x00, - 0x01, - 0x00, - 0xA4, - 0x00, - 0x01, - 0x00, - 0xA4, - 0x00, - 0x01, - 0x00, - 0x9C, - 0x00, - 0x01, - 0x00, - 0xA6, - 0x00, - 0x01, - 0x00, - 0xA6, - 0x00, - 0x01, - 0x00, - 0x9F, - 0x00, - 0x01, - 0x00, - 0x99, - 0x00, - 0x01, - 0x00, - 0x99, - 0x00, - 0x01, - 0x00, - 0xA4, - 0x00, - 0x01, - 0x00, - 0xA8, - 0x00, - 0x01, - 0x00, - 0x9E, - 0x00, - 0x01, - 0x00, - 0x96, - 0x00, - 0x01, - 0x00, - 0xA0, - 0x00, - 0x01, - 0x00, - 0xA2, - 0x00, - 0x01, - 0x00, - 0x97, - 0x00, - 0x01, - 0x00, - 0x99, - 0x00, - 0x01, - 0x00, - 0xA3, - 0x00, - 0x01, - 0x00, - 0xAD, - 0x00, - 0x01, - 0x00, - 0x9E, - 0x00, - 0x01, - 0x00, - 0x99, - 0x00, - 0x01, - 0x00, - 0xAE, - 0x00, - 0x01, - 0x00, - 0x9D, - 0x00, - 0x01, - 0x00, - 0x97, - 0x00, - 0x01, - 0x00, - 0xA8, - 0x00, - 0x01, - 0x00, - 0xA8, - 0x00, - 0x01, - 0x00, - 0xA8, - 0x00, - 0x01, - 0x00, - 0x9C, - 0x00, - 0x01, - 0x00, - 0x9C, - 0x00, - 0x01, - 0x00, - 0xA6, - 0x00, - 0x01, - 0x00, - 0xA6, - 0x00, - 0x01, - 0x00, - 0xA2, - 0x00, - 0x01, - 0x00, - 0xA3, - 0x00, - 0x01, - 0x00, - 0x98, - 0x00, - 0x01, - 0x00, - 0x98, - 0x00, - 0x01, - 0x00, - 0x95, - 0x00, - 0x01, - 0x00, - 0x9E, - 0x00, - 0x01, - 0x00, - 0x96, - 0x00, - 0x01, - 0x00, - 0xA9, - 0x00, - 0x01, - 0x00, - 0x97, - 0x00, - 0x02, - 0x00, - 0xA5, - 0x00, - 0x02, - 0x00, - 0xA0, - 0x00, - 0x01, - 0x00, - 0xA1, - 0x00, - 0x01, - 0x00, - 0x98, - 0x00, - 0x01, - 0x00, - 0x9C, - 0x00, - 0x01, - 0x00, - 0x9F, - 0x00, - 0x01, - 0x00, - 0xA8, - 0x00, - 0x02, - 0x00, - 0x9A, - 0x00, - 0x01, - 0x00, - 0x97, - 0x00, - 0x01, - 0x00, - 0xA1, - 0x00, - 0x01, - 0x00, - 0xAC, - 0x00, - 0x01, - 0x00, - 0xA0, - 0x00, - 0x02, - 0x00, - 0xA1, - 0x00, - 0x02, - 0x00, - 0xA2, - 0x00, - 0x02, - 0x00, - 0xAB, - 0x00, - 0x01, - 0x00, - 0x9E, - 0x00, - 0x02, - 0x00, - 0xA5, - 0x00, - 0x03, - 0x00, - 0xA6, - 0x00, - 0x03, - 0x00, - 0xA7, - 0x00, - 0x03, - 0x00, - 0xA9, - 0x00, - 0x01, - 0x00, - 0xA9, - 0x00, - 0x01, - 0x00, - 0xAC, - 0x00, - 0x02, - 0x00, - 0xAC, - 0x00, - 0x02, - 0x00, - 0xAA, - 0x00, - 0x01, - 0x00, - 0xAA, - 0x00, - 0x01, - 0x00, - 0xAE, - 0x00, - 0x01, - 0x00, - 0xAE, - 0x00, - 0x01, - 0x00, - 0xAB, - 0x00, - 0x01, - 0x00, - 0xAB, - 0x00, - 0x01, - 0x00, - 0xA9, - 0x00, - 0x01, - 0x00, - 0xA9, - 0x00, - 0x01, - 0x00, - 0xAC, - 0x00, - 0x01, - 0x00, - 0xAC, - 0x00, - 0x01, - 0x00, - 0xAE, - 0x00, - 0x01, - 0x00, - 0xAE, - 0x00, - 0x01, - 0x00, - 0xAD, - 0x00, - 0x01, - 0x00, - 0xAD, - 0x00, - 0x01, - 0x00, - 0xAB, - 0x00, - 0x01, - 0x00, - 0xAB, - 0x00, - 0x01, - 0x00, - 0x9D, - 0x00, - 0x01, - 0x00, - 0x9A, - 0x00, - 0x01, - 0x00, - 0xAB, - 0x00, - 0x02, - 0x00, - 0xAD, - 0x00, - 0x02, - 0x00, - 0xAA, - 0x00, - 0x02, - 0x00, - 0xAA, - 0x00, - 0x02, - 0x00, - 0xAD, - 0x00, - 0x01, - 0x00, - 0xAD, - 0x00, - 0x01, - 0x00, -};
\ No newline at end of file diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index b4fd4d80..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 @@ -898,7 +898,7 @@ MOD53_021D7C84: ; 0x021D7C84 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r5, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -1325,7 +1325,7 @@ MOD53_021D7FDC: ; 0x021D7FDC lsl r0, r0, #2 add r0, r7, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 str r0, [sp] mov r0, #0x1e @@ -1346,7 +1346,7 @@ MOD53_021D7FDC: ; 0x021D7FDC lsl r0, r0, #2 add r0, r7, r0 mov r1, #2 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x15 str r0, [sp] mov r0, #6 @@ -1368,7 +1368,7 @@ MOD53_021D7FDC: ; 0x021D7FDC lsl r0, r0, #2 add r0, r7, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r7, #0x28] mov r0, #1 mov r2, #0 @@ -1415,7 +1415,7 @@ _021D80A8: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x14] add r6, #0x14 add r0, r0, #1 @@ -1981,7 +1981,7 @@ MOD53_021D852C: ; 0x021D852C bl MOD53_021D941C cmp r0, #0 bne _021D8568 - bl ErrorHandling + bl GF_AssertFail _021D8568: add r0, r5, #0 mov r1, #6 @@ -2372,7 +2372,7 @@ MOD53_021D8860: ; 0x021D8860 bl MOD53_021D941C cmp r0, #0 bne _021D889C - bl ErrorHandling + bl GF_AssertFail _021D889C: add r0, r5, #0 mov r1, #0xe @@ -2915,7 +2915,7 @@ _021D8C9C: mov r1, ip lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_02019658 + bl BlitBitmapRectToWindow add sp, #0x1c pop {r4, r5, r6, r7, pc} thumb_func_end MOD53_021D8C58 @@ -3429,7 +3429,7 @@ _021D906C: add r0, r4, #0 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add r6, r6, #1 add r4, #0x10 cmp r6, #5 @@ -3633,7 +3633,7 @@ MOD53_021D91C8: ; 0x021D91C8 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xb6 lsl r0, r0, #2 add r0, r5, r0 @@ -3870,7 +3870,7 @@ _021D9374: _021D93C0: cmp r0, #0 bne _021D93C8 - bl ErrorHandling + bl GF_AssertFail _021D93C8: mov r0, #1 pop {r3, r4, r5, pc} diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 904d1c7f..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 @@ -819,7 +819,7 @@ MOD54_021D7BBC: ; 0x021D7BBC push {r4, r5, r6, r7, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -1081,7 +1081,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -1103,7 +1103,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 lsl r0, r0, #2 add r0, r4, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] mov r0, #0x1a @@ -1148,7 +1148,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xa6 lsl r0, r0, #2 ldr r2, _021D7E94 ; =0x00010300 @@ -1176,7 +1176,7 @@ MOD54_021D7E98: ; 0x021D7E98 add r6, r0, #0 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #1 str r1, [sp] mov r0, #0x41 @@ -1848,7 +1848,7 @@ _021D83DE: strb r0, [r5, r1] b _021D83FC _021D83F8: - bl ErrorHandling + bl GF_AssertFail _021D83FC: mov r0, #0x32 mov r1, #0 @@ -2688,7 +2688,7 @@ _021D8A5A: str r4, [r5, r0] pop {r3, r4, r5, r6, pc} _021D8A64: - bl ErrorHandling + bl GF_AssertFail add sp, #4 pop {r3, r4, r5, r6, pc} _021D8A6C: @@ -2787,7 +2787,7 @@ MOD54_021D8AF8: ; 0x021D8AF8 _021D8B18: add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r7, [sp, #0x14] mov r0, #0 str r0, [sp, #0x20] @@ -3013,7 +3013,7 @@ MOD54_021D8C90: ; 0x021D8C90 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xba lsl r0, r0, #2 add r0, r5, r0 @@ -3131,7 +3131,7 @@ _021D8D90: ldr r0, [r6, r0] cmp r0, #0 bne _021D8D9E - bl ErrorHandling + bl GF_AssertFail _021D8D9E: mov r0, #0xd9 lsl r0, r0, #2 @@ -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] @@ -3583,7 +3583,7 @@ MOD54_021D90E0: ; 0x021D90E0 cmp r5, #5 ble _021D90F2 _021D90EE: - bl ErrorHandling + bl GF_AssertFail _021D90F2: add r2, r5, #1 cmp r2, #5 @@ -3786,7 +3786,7 @@ MOD54_021D9238: ; 0x021D9238 bl MOD54_021D91AC cmp r4, r0 beq _021D925E - bl ErrorHandling + bl GF_AssertFail _021D925E: mov r2, #0x63 lsl r2, r2, #2 @@ -3816,7 +3816,7 @@ MOD54_021D9274: ; 0x021D9274 bl MOD54_021D91B4 cmp r4, r0 beq _021D929A - bl ErrorHandling + bl GF_AssertFail _021D929A: add r6, #0xc add r0, r5, #0 @@ -3844,7 +3844,7 @@ MOD54_021D92AC: ; 0x021D92AC bl MOD54_021D91BC cmp r4, r0 beq _021D92D2 - bl ErrorHandling + bl GF_AssertFail _021D92D2: add r6, #0xcc add r0, r5, #0 @@ -4260,7 +4260,7 @@ _021D9580: add r7, r0, #0 cmp r6, r4 bhi _021D959C - bl ErrorHandling + bl GF_AssertFail _021D959C: ldr r1, [sp, #4] add r0, r7, #0 @@ -4317,7 +4317,7 @@ _021D95F8: str r0, [sp, #0x14] cmp r1, r0 bhi _021D960C - bl ErrorHandling + bl GF_AssertFail _021D960C: mov r6, #0 ldr r4, [sp, #4] diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 0d96ce13..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 @@ -865,7 +865,7 @@ MOD55_021D7C20: ; 0x021D7C20 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r5, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -1238,7 +1238,7 @@ _021D7F02: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r5, #0 add r2, #0xc0 ldr r0, [r5, #0x10] @@ -1305,7 +1305,7 @@ _021D7F86: bl FUN_02019064 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r6, #2 bne _021D7FF4 ldr r0, [r5, #8] @@ -2618,7 +2618,7 @@ _021D89AE: add r7, r0, #0 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] mov r0, #0xff @@ -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 @@ -2775,7 +2775,7 @@ _021D8AEE: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r5, #0 add r2, #0xc0 ldr r0, [r5, #0x10] @@ -2834,7 +2834,7 @@ _021D8B6C: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r5, #0 add r2, #0xd0 ldr r0, [r5, #0x10] @@ -2917,7 +2917,7 @@ _021D8C02: bl FUN_02019064 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl FUN_02019220 add r6, r6, #1 @@ -3213,7 +3213,7 @@ MOD55_021D8E6C: ; 0x021D8E6C stmia r2!, {r0, r1} add r0, r7, #0 mov r1, #0x34 - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r4, _021D8FD0 ; =0x021DA3D8 str r0, [r5, #0x14] mov r6, #0 @@ -3222,7 +3222,7 @@ _021D8EB6: ldr r1, [r5, #0x10] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #4 @@ -3241,7 +3241,7 @@ _021D8ECC: stmia r2!, {r0, r1} add r0, r7, #0 mov r1, #0x34 - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r4, _021D8FD8 ; =0x021DA438 str r0, [r5, #0x14] mov r6, #0 @@ -3250,7 +3250,7 @@ _021D8EEE: ldr r1, [r5, #0x10] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #4 @@ -3306,7 +3306,7 @@ _021D8F1A: add r0, sp, #0x1c add r2, r1, #0 mov r3, #0x34 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0xea lsl r1, r1, #2 str r0, [r5, r1] @@ -3374,7 +3374,7 @@ _021D9002: mov r0, #0xea lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput ldr r1, _021D90D0 ; =0x00000418 add r4, r0, #0 add r0, r1, #0 @@ -3382,7 +3382,7 @@ _021D9002: ldrh r7, [r5, r1] ldr r0, [r5, r0] add r1, r5, r1 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId ldr r0, _021D90D0 ; =0x00000418 ldrh r0, [r5, r0] cmp r7, r0 @@ -3458,9 +3458,9 @@ _021D9098: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r5, #0x14] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r6, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -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 @@ -3605,7 +3605,7 @@ _021D91D6: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #8] bl Sav2_PlayerData_GetProfileAddr add r2, r0, #0 @@ -3677,7 +3677,7 @@ _021D9278: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 mov r0, #0 eor r1, r4 @@ -3781,7 +3781,7 @@ _021D9338: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r1, r5, #0 add r1, #0xbc mov r0, #0 @@ -4013,7 +4013,7 @@ _021D9570: .word MOD55_021DA314 thumb_func_start MOD55_021D9574 MOD55_021D9574: ; 0x021D9574 push {r3, lr} - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack mov r0, #1 add r1, r0, #0 @@ -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 @@ -4164,7 +4164,7 @@ _021D969A: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x34 bl PlayerProfile_new str r0, [sp, #0x20] @@ -4243,7 +4243,7 @@ _021D974E: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0xc] ldr r2, [sp, #0x20] mov r1, #0 @@ -4382,7 +4382,7 @@ _021D987C: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r4, #0 add r2, #0xc4 ldr r0, [r4, #0x10] @@ -4807,7 +4807,7 @@ MOD55_021D9C50: ; 0x021D9C50 add r4, r1, #0 bl G3X_ResetMtxStack bl G3X_ResetMtxStack_2 - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera add r0, r5, #0 add r0, #0xdc ldr r0, [r0] @@ -4862,7 +4862,7 @@ MOD55_021D9CC4: ; 0x021D9CC4 add r4, r1, #0 bl G3X_ResetMtxStack bl G3X_ResetMtxStack_2 - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera add r0, r5, #0 add r0, #0xdc ldr r0, [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 @@ -5397,7 +5397,7 @@ _021DA0D0: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xce lsl r0, r0, #2 ldr r2, _021DA158 ; =0x000001E2 @@ -5478,7 +5478,7 @@ _021DA17C: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xce lsl r0, r0, #2 ldr r2, _021DA210 ; =0x000001E2 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index d1046c7b..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 @@ -1085,7 +1085,7 @@ MOD56_022126E0: ; 0x022126E0 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -1342,7 +1342,7 @@ _022128CE: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r2, #0x16 add r0, #0xcc @@ -1450,14 +1450,14 @@ _022129D8: beq _022129EA mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu _022129EA: add r0, r4, #0 add r0, #0xb0 ldr r0, [r0] cmp r0, #0 beq _02212A00 - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r4, #0 mov r1, #0 add r0, #0xb0 @@ -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] @@ -2479,7 +2479,7 @@ MOD56_02213194: ; 0x02213194 mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r6, #0 mov r1, #0 add r0, #0xb4 @@ -2487,7 +2487,7 @@ MOD56_02213194: ; 0x02213194 add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r6, #0 mov r1, #0 add r0, #0xb0 @@ -2786,7 +2786,7 @@ _0221344C: lsl r0, r0, #2 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -3021,7 +3021,7 @@ MOD56_02213624: ; 0x02213624 add r5, r1, #0 mov r1, #0x13 add r7, r2, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField add r4, r0, #0 ldr r6, _02213750 ; =0x00010200 cmp r5, #0x20 @@ -3462,7 +3462,7 @@ _02213944: ldr r0, [r0] ldr r1, [r5, r7] sub r2, r2, #1 - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r6, r6, #1 _0221395C: add r4, r4, #1 @@ -3476,7 +3476,7 @@ _0221395C: ldr r1, [r1] mov r2, #0x1b mov r3, #0x20 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r5, #0 add r0, #0xb0 add r5, #0xcc @@ -3485,7 +3485,7 @@ _0221395C: ldr r0, [r0] ldr r1, [r5] sub r3, #0x30 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r6, #0 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3498,7 +3498,7 @@ MOD56_02213990: ; 0x02213990 add r5, r0, #0 mov r0, #0x22 mov r1, #0x36 - bl ListMenu_ctor + bl ListMenuItems_ctor add r1, r5, #0 add r1, #0xb0 str r0, [r1] @@ -3567,7 +3567,7 @@ _022139D0: add r2, r1, #0 mov r3, #0x36 str r5, [sp, #0x30] - bl FUN_020010A8 + bl ListMenuInit add r5, #0xb4 str r0, [r5] add sp, #0x34 @@ -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 @@ -3675,7 +3675,7 @@ _02213AF0: mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 mov r1, #0 add r0, #0xb4 @@ -3683,7 +3683,7 @@ _02213AF0: add r0, r5, #0 add r0, #0xb0 ldr r0, [r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r5, #0 mov r1, #0 add r0, #0xb0 @@ -3712,7 +3712,7 @@ _02213B2C: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 mov r2, #0x16 add r0, #0xcc @@ -3808,13 +3808,13 @@ _02213C24: add r0, r5, #0 add r0, #0xb0 ldr r0, [r0] - bl ListMenu_DestroyMenuStrings + bl ListMenuItems_DestroyMenuStrings add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] mov r1, #2 add r2, r4, #2 - bl FUN_02001538 + bl ListMenuSetTemplateField cmp r4, #3 ble _02213C50 add r0, r5, #0 @@ -3822,7 +3822,7 @@ _02213C24: ldr r0, [r0] mov r1, #3 mov r2, #5 - bl FUN_02001538 + bl ListMenuSetTemplateField b _02213C5E _02213C50: add r0, r5, #0 @@ -3830,7 +3830,7 @@ _02213C50: ldr r0, [r0] mov r1, #3 add r2, r4, #2 - bl FUN_02001538 + bl ListMenuSetTemplateField _02213C5E: add r0, r5, #0 bl MOD56_02213938 @@ -3840,7 +3840,7 @@ _02213C5E: ldr r0, [r0] add r1, #2 add r2, sp, #0xc - bl FUN_02001448 + bl ListMenuGetScrollAndRow cmp r4, #3 blt _02213C84 add r0, sp, #0xc @@ -3860,11 +3860,11 @@ _02213C84: ldrh r2, [r3, #2] ldrh r3, [r3] ldr r0, [r0] - bl FUN_020013C8 + bl ListMenuTestInput add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] - bl FUN_02001328 + bl RedrawListMenu str r4, [r5, #8] _02213CA8: add r0, r5, #0 @@ -3873,7 +3873,7 @@ _02213CA8: ldr r0, [r0] add r1, #2 add r2, sp, #0xc - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, sp, #0xc ldr r1, [r5, #8] ldrh r3, [r0] @@ -3913,11 +3913,11 @@ _02213CF0: str r1, [sp, #8] add r0, #0xb4 ldr r0, [r0] - bl FUN_020013C8 + bl ListMenuTestInput add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] - bl FUN_02001328 + bl RedrawListMenu _02213D0C: add r1, sp, #0xc ldrh r1, [r1, #2] @@ -4099,7 +4099,7 @@ _02213E5C: mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 mov r1, #0 add r0, #0xb4 @@ -4107,7 +4107,7 @@ _02213E5C: add r0, r5, #0 add r0, #0xb0 ldr r0, [r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r5, #0 mov r1, #0 add r0, #0xb0 @@ -4139,7 +4139,7 @@ _02213ECE: add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 _02213EE8: mov r0, #1 @@ -5059,7 +5059,7 @@ MOD56_022145D4: ; 0x022145D4 stmia r2!, {r0, r1} mov r0, #4 mov r1, #0x36 - bl ListMenu_ctor + bl ListMenuItems_ctor add r1, r5, #0 add r1, #0xb8 ldr r4, _022146C4 ; =0x02216480 @@ -5074,7 +5074,7 @@ _02214602: ldr r1, [r1] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r4, #8 cmp r6, #4 @@ -5134,7 +5134,7 @@ _02214642: add r0, sp, #0x14 mov r1, #0 mov r3, #0x36 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0 add r1, #0xbc str r0, [r1] @@ -5180,7 +5180,7 @@ _022146EE: add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD56_02213BF4 @@ -5257,11 +5257,11 @@ _0221476E: ldr r0, [r0] mov r1, #0 add r2, r5, r2 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 add r0, #0xb8 ldr r0, [r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r5, #0 add r1, r4, #0 bl MOD56_02214808 @@ -5298,10 +5298,10 @@ _022147CE: ldr r0, [r0] mov r1, #0 add r2, r5, r2 - bl FUN_02001300 + bl DestroyListMenu add r5, #0xb8 ldr r0, [r5] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r6, #0 pop {r3, r4, r5, r6, r7, pc} nop @@ -5338,7 +5338,7 @@ _02214820: stmia r2!, {r0, r1} add r0, r7, #0 mov r1, #0x36 - bl ListMenu_ctor + bl ListMenuItems_ctor add r1, r5, #0 add r1, #0xb8 mov r6, #0 @@ -5354,7 +5354,7 @@ _0221484C: ldr r1, [r1] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r4, #8 cmp r6, r7 @@ -5425,7 +5425,7 @@ _0221488C: ldrh r2, [r2, r3] mov r1, #0 mov r3, #0x36 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0 add r1, #0xbc str r0, [r1] @@ -5463,7 +5463,7 @@ _0221493C: add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 add r0, r5, #0 bl MOD56_02213BF4 @@ -5521,10 +5521,10 @@ _02214994: lsl r3, r3, #1 mov r1, #0 add r2, r2, r3 - bl FUN_02001300 + bl DestroyListMenu add r5, #0xb8 ldr r0, [r5] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r6, #0 pop {r4, r5, r6, pc} nop @@ -5554,7 +5554,7 @@ MOD56_022149D8: ; 0x022149D8 add r0, #0xb4 ldr r0, [r0] add r1, sp, #0x28 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId add r0, sp, #0x28 ldrh r0, [r0] add r0, r5, r0 @@ -5585,7 +5585,7 @@ MOD56_022149D8: ; 0x022149D8 lsr r0, r0, #0x10 str r0, [sp, #0x1c] mov r0, #3 - bl ListMenu_ctor + bl ListMenuItems_ctor add r1, r5, #0 add r1, #0xb8 str r0, [r1] @@ -5630,7 +5630,7 @@ _02214A7E: ldr r1, [r1] ldr r3, [r4, #4] mov r2, #0x1a - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _02214ADC _02214A9E: ldrh r0, [r7, #0x16] @@ -5652,7 +5652,7 @@ _02214AB2: ldr r1, [r1] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _02214ADC _02214AC8: add r0, r5, #0 @@ -5663,7 +5663,7 @@ _02214AC8: ldr r1, [r1] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData _02214ADC: ldr r0, [sp, #0x24] add r4, #8 @@ -5717,7 +5717,7 @@ _02214ADC: add r0, sp, #0x2c add r2, r1, #0 mov r3, #0x36 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0 add r1, #0xbc str r0, [r1] @@ -5837,7 +5837,7 @@ _02214C1E: add r0, r4, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r5, r0, #0 add r0, r4, #0 bl MOD56_02213BF4 @@ -5878,7 +5878,7 @@ _02214C66: add r0, #0xb4 ldr r0, [r0] add r1, sp, #0xc - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId add r0, sp, #0xc ldrh r0, [r0] add r0, r4, r0 @@ -6074,10 +6074,10 @@ _02214DEC: mov r1, #0 ldr r0, [r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu add r4, #0xb8 ldr r0, [r4] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, [sp] add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -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] @@ -7019,12 +7019,12 @@ _02215532: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0xb4 ldr r0, [r0] add r1, sp, #0x14 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId add r0, sp, #0x14 ldrh r0, [r0] add r0, r5, r0 @@ -7564,12 +7564,12 @@ 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 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 mov r2, #0x16 add r0, #0xcc @@ -8272,7 +8272,7 @@ _02215F82: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xcf lsl r0, r0, #2 ldr r2, _02215FF0 ; =0x000001E2 @@ -8388,7 +8388,7 @@ _02216048: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xdb lsl r0, r0, #2 ldr r2, _022160E0 ; =0x000001D9 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 39e977cc..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,22 +1010,22 @@ 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] cmp r0, #0 bne _021D7D4C - bl ErrorHandling + bl GF_AssertFail _021D7D4C: ldr r1, _021D7ECC ; =0x000030B8 ldr r0, [r4, r1] add r1, r1, #4 add r1, r4, r1 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _021D7D60 - bl ErrorHandling + bl GF_AssertFail _021D7D60: add r0, r4, #0 add r0, #0xb4 @@ -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,22 +1064,22 @@ _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] cmp r0, #0 bne _021D7DBC - bl ErrorHandling + bl GF_AssertFail _021D7DBC: ldr r1, _021D7ECC ; =0x000030B8 ldr r0, [r4, r1] add r1, r1, #4 add r1, r4, r1 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _021D7DD0 - bl ErrorHandling + bl GF_AssertFail _021D7DD0: ldr r3, _021D7ED0 ; =0x000032FC mov r0, #0x19 @@ -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 @@ -2000,7 +2000,7 @@ MOD57_021D84AC: ; 0x021D84AC add r6, r0, #0 cmp r7, r6 bls _021D850C - bl ErrorHandling + bl GF_AssertFail _021D850C: cmp r7, r6 bhs _021D8578 @@ -2292,7 +2292,7 @@ _021D8732: mov r0, #4 pop {r3, pc} _021D873A: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -2689,7 +2689,7 @@ MOD57_021D89F0: ; 0x021D89F0 add r2, r1, #0 add r3, r1, #0 add r7, r0, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0x88 str r0, [sp] @@ -2699,7 +2699,7 @@ MOD57_021D89F0: ; 0x021D89F0 add r0, #0x10 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0x88 str r0, [sp] @@ -2709,7 +2709,7 @@ MOD57_021D89F0: ; 0x021D89F0 add r0, #0x20 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0x88 str r0, [sp] @@ -2719,7 +2719,7 @@ MOD57_021D89F0: ; 0x021D89F0 add r0, #0x30 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0x88 str r0, [sp] @@ -2729,7 +2729,7 @@ MOD57_021D89F0: ; 0x021D89F0 add r0, #0x40 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -2739,7 +2739,7 @@ MOD57_021D89F0: ; 0x021D89F0 add r0, #0x50 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -2749,7 +2749,7 @@ MOD57_021D89F0: ; 0x021D89F0 add r0, #0x60 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r2, _021D8CEC ; =0x0000022D mov r0, #0 mov r1, #0x1a @@ -3042,7 +3042,7 @@ MOD57_021D8CF8: ; 0x021D8CF8 add r0, #0x70 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -3052,7 +3052,7 @@ MOD57_021D8CF8: ; 0x021D8CF8 add r0, #0x80 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -3062,7 +3062,7 @@ MOD57_021D8CF8: ; 0x021D8CF8 add r0, #0x90 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -3072,7 +3072,7 @@ MOD57_021D8CF8: ; 0x021D8CF8 add r0, #0xa0 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r2, _021D8FAC ; =0x0000022D mov r0, #0 mov r1, #0x1a @@ -3442,7 +3442,7 @@ MOD57_021D905C: ; 0x021D905C ldr r0, [r5, #0x18] cmp r0, #0 bne _021D906E - bl ErrorHandling + bl GF_AssertFail _021D906E: ldr r0, [r5, #0x18] bl GetIGTHours @@ -3455,7 +3455,7 @@ _021D906E: add r0, #0x50 mov r2, #0xb8 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r2, _021D913C ; =0x0000022D mov r0, #0 mov r1, #0x1a @@ -3558,7 +3558,7 @@ _021D9164: mov r1, #0 mov r2, #0xcd add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add r0, r4, #0 bl CopyWindowToVram add sp, #0x10 @@ -3573,7 +3573,7 @@ MOD57_021D9184: ; 0x021D9184 sub sp, #0x3c add r7, r0, #0 bl MOD57_021D9578 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -3709,17 +3709,17 @@ _021D9290: beq _021D92CA ldr r1, [sp, #0x18] add r1, r1, r6 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData cmp r0, #0 bne _021D92CE mov r0, #0x1e lsl r0, r0, #4 ldr r0, [r5, r0] bl FreeToHeap - bl ErrorHandling + bl GF_AssertFail b _021D92CE _021D92CA: - bl ErrorHandling + bl GF_AssertFail _021D92CE: add r0, r4, #1 lsl r0, r0, #0x18 @@ -4011,11 +4011,11 @@ MOD57_021D951C: ; 0x021D951C add r6, r2, #0 cmp r4, #8 blo _021D952E - bl ErrorHandling + bl GF_AssertFail _021D952E: cmp r6, #3 bls _021D9536 - bl ErrorHandling + bl GF_AssertFail _021D9536: lsl r7, r4, #2 mov r0, #0x57 @@ -4024,7 +4024,7 @@ _021D9536: ldr r0, [r1, r0] bl FUN_02020354 mov r1, #1 - bl FUN_020B19C4 + bl NNS_G2dGetImagePaletteLocation str r0, [sp] lsl r0, r4, #5 str r0, [sp, #4] diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index 93c1c39d..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 @@ -715,7 +715,7 @@ MOD58_021DA044: ; 0x021DA044 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r5, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -1077,7 +1077,7 @@ MOD58_021DA30C: ; 0x021DA30C lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #9 str r0, [sp] mov r0, #0x18 @@ -1097,7 +1097,7 @@ MOD58_021DA30C: ; 0x021DA30C lsl r0, r0, #2 add r0, r5, r0 mov r1, #2 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x15 str r0, [sp] mov r0, #8 @@ -1118,7 +1118,7 @@ MOD58_021DA30C: ; 0x021DA30C lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _021DA4BC ; =0x000E0702 mov r2, #1 str r0, [sp] @@ -1189,7 +1189,7 @@ _021DA3C2: lsl r0, r0, #2 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r3, #0xe0 @@ -1234,7 +1234,7 @@ _021DA46A: bl FUN_02019064 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x14] add r7, #0x14 add r0, r0, #1 @@ -1646,7 +1646,7 @@ _021DA7A4: lsl r0, r0, #2 add r0, r5, r0 mov r1, #2 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xb1 lsl r0, r0, #2 add r0, r5, r0 @@ -1780,7 +1780,7 @@ _021DA888: mov r1, ip lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_02019658 + bl BlitBitmapRectToWindow add sp, #0x1c pop {r4, r5, r6, r7, pc} thumb_func_end MOD58_021DA844 @@ -2217,7 +2217,7 @@ MOD58_021DAB94: ; 0x021DAB94 lsl r0, r0, #2 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xb5 lsl r0, r0, #2 add r0, r5, r0 @@ -2306,7 +2306,7 @@ _021DAC62: lsl r0, r0, #0xa cmp r7, r0 blt _021DAC6E - bl ErrorHandling + bl GF_AssertFail _021DAC6E: mov r0, #6 add r6, r6, #1 diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index c86d2c94..5604bf3c 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -883,7 +883,7 @@ _021D7C5E: add r0, #0x1c mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add r0, r5, #0 ldr r2, _021D7D60 ; =0x000003E2 add r0, #0x1c @@ -1051,7 +1051,7 @@ _021D7DC4: bl FUN_02019150 ldr r1, [r5] add r0, r6, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor mov r7, #0 str r0, [r5, #0x44] cmp r6, #0 @@ -1061,7 +1061,7 @@ _021D7DDE: ldr r1, [r5, #0x4c] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r7, r7, #1 add r4, #8 cmp r7, r6 @@ -1096,7 +1096,7 @@ _021D7DF2: lsl r3, r3, #0x18 add r2, r1, #0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit str r0, [r5, #0x40] ldr r0, [sp, #0x10] ldr r2, _021D7EC4 ; =0x000003D9 @@ -1111,7 +1111,7 @@ _021D7DF2: b _021D7E96 _021D7E4C: ldr r0, [r5, #0x40] - bl FUN_02001204 + bl ListMenu_ProcessInput mov r1, #0 mvn r1, r1 str r0, [r5, #0x48] @@ -1133,9 +1133,9 @@ _021D7E66: mov r1, #0 ldr r0, [r5, #0x40] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, [r5, #0x44] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _021D7EC8 ; =0x000005DC bl FUN_020054C8 mov r0, #0 @@ -1234,7 +1234,7 @@ _021D7EFA: add r0, #0x1c add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add r1, r5, #0 str r1, [sp] ldr r0, _021D8048 ; =0x00010200 @@ -1273,7 +1273,7 @@ _021D7F7C: add r0, #0x1c add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add r1, r5, #0 str r1, [sp] ldr r0, _021D804C ; =0x000F0200 @@ -1367,7 +1367,7 @@ MOD59_021D8058: ; 0x021D8058 str r0, [sp, #0xc] ldr r2, [r5, #0x18] mov r0, #0x7d - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 ldr r3, [r5] mov r1, #0x20 @@ -1383,7 +1383,7 @@ MOD59_021D8058: ; 0x021D8058 ldr r2, [r5, #0x18] mov r0, #0x7d mov r3, #7 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData ldr r0, _021D80F8 ; =gGameVersion ldrb r0, [r0] cmp r0, #0xa @@ -1402,7 +1402,7 @@ _021D80AA: str r0, [sp, #4] mov r0, #0x7d add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0xa0 str r0, [sp] ldr r0, [r5] @@ -1411,7 +1411,7 @@ _021D80AA: mov r0, #0x7d mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal add r0, r5, #0 bl MOD59_021D80FC add r0, r5, #0 @@ -1460,7 +1460,7 @@ MOD59_021D80FC: ; 0x021D80FC ldr r2, [r3, #0x18] mov r0, #0x7d mov r3, #3 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData _021D8138: add sp, #0x24 pop {r4, r5, pc} @@ -1500,7 +1500,7 @@ _021D814C: ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] ldr r0, [r4] @@ -1514,7 +1514,7 @@ _021D814C: add r1, sp, #0x14 ldr r1, [r1, r2] mov r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1525,7 +1525,7 @@ _021D814C: ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 mov r1, #1 mov r2, #7 @@ -1550,7 +1550,7 @@ _021D81BE: ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #2 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0x20 str r0, [sp] ldr r0, [r4] @@ -1565,7 +1565,7 @@ _021D81BE: ldr r1, [r1, r2] mov r2, #0 add r3, #0x83 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1576,7 +1576,7 @@ _021D81BE: ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #2 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 mov r1, #2 mov r2, #8 @@ -1618,7 +1618,7 @@ MOD59_021D8234: ; 0x021D8234 ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #7 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 add r0, #0x8b ldrb r0, [r0] @@ -1813,7 +1813,7 @@ MOD59_021D83F8: ; 0x021D83F8 ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData add r0, r4, #0 mov r1, #6 mov r2, #9 @@ -1826,7 +1826,7 @@ MOD59_021D83F8: ; 0x021D83F8 mov r0, #0x7d mov r2, #4 mov r3, #0xe0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r3, [r4] mov r0, #6 mov r1, #0x20 @@ -1843,7 +1843,7 @@ MOD59_021D83F8: ; 0x021D83F8 ldr r2, [r4, #0x18] mov r0, #0x7d mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2007,7 +2007,7 @@ _021D8546: lsl r1, r1, #2 ldr r1, [r2, r1] ldr r2, [r4, #0x18] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x30 pop {r3, r4, r5, pc} _021D858E: @@ -2070,7 +2070,7 @@ _021D85C2: lsl r1, r1, #2 ldr r1, [r2, r1] ldr r2, [r4, #0x18] - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add sp, #0x30 pop {r3, r4, r5, pc} nop @@ -2167,7 +2167,7 @@ _021D8698: ldr r2, [r3, #0x18] mov r0, #0x7d mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData _021D86AE: add r0, r4, #0 add sp, #0x40 @@ -3374,7 +3374,7 @@ _021D90A2: str r0, [sp, #0xc] ldr r2, [r4, #0x18] mov r0, #0x7d - bl FUN_0200687C + bl GfGfxLoader_LoadCharData add r0, r4, #0 add r0, #0x94 ldr r0, [r0] diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index 6d2d6e6b..2925c404 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -289,7 +289,7 @@ _021D9A2C: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x88 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -299,7 +299,7 @@ _021D9A2C: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x88 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r5, _021D9BC4 ; =0x021DA064 add r3, sp, #0x2c ldmia r5!, {r0, r1} @@ -325,7 +325,7 @@ _021D9A2C: ldr r2, [r4, #4] mov r0, #0x88 mov r3, #1 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -336,7 +336,7 @@ _021D9A2C: ldr r2, [r4, #4] mov r0, #0x88 mov r3, #1 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData ldr r5, _021D9BC8 ; =0x021DA0B8 add r3, sp, #0x10 ldmia r5!, {r0, r1} @@ -361,7 +361,7 @@ _021D9A2C: str r0, [sp, #0xc] ldr r2, [r4, #4] mov r0, #0x88 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -372,7 +372,7 @@ _021D9A2C: ldr r2, [r4, #4] mov r0, #0x88 add r3, r1, #0 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r2, #0 str r2, [sp] ldr r0, [r4] @@ -380,7 +380,7 @@ _021D9A2C: str r0, [sp, #4] mov r0, #0x88 add r3, r2, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r2, [r4] mov r0, #0 mov r1, #0x20 @@ -536,7 +536,7 @@ _021D9C9A: add r0, #0x10 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add r0, r5, #0 add r1, r6, #0 add r2, r0, #0 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 418fa446..8c6d04fc 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -403,7 +403,7 @@ MOD60_021D77D4: ; 0x021D77D4 str r0, [r4, #0x10] _021D7804: bl FUN_0200BC30 - bl FUN_020AEEB8 + bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x14] bl FUN_0201AB60 ldr r3, _021D782C ; =0x027E0000 @@ -688,7 +688,7 @@ MOD60_021D7A40: ; 0x021D7A40 bl NARC_ReadWholeMember add r0, r6, #0 add r1, sp, #0x20 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r3, [sp, #0x20] mov r1, #0 str r1, [sp] @@ -719,7 +719,7 @@ MOD60_021D7A40: ; 0x021D7A40 bl NARC_ReadWholeMember add r0, r6, #0 add r1, sp, #0x1c - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r1, [sp, #0x1c] mov r0, #0 ldr r1, [r1, #0xc] @@ -748,7 +748,7 @@ MOD60_021D7A40: ; 0x021D7A40 add r1, r5, #0 ldr r0, [r5, #0x24] add r1, #0x28 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData add r0, r4, #0 bl NARC_dtor mov r3, #0 @@ -922,15 +922,15 @@ MOD60_021D7BA4: ; 0x021D7BA4 add r0, r4, #0 add r0, #0x2c mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x3c mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x4c mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x4c bl FUN_020192B8 @@ -980,7 +980,7 @@ _021D7CF0: bl FUN_02019570 add r0, r5, r4 add r1, r7, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 bl FUN_020192B8 add r0, r5, r4 @@ -1209,7 +1209,7 @@ MOD60_021D7EA4: ; 0x021D7EA4 mov r1, #0xff lsr r2, r2, #0x10 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, [sp, #0x14] cmp r0, #5 bne _021D7F26 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 3afc1e03..ed9e0e05 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -305,7 +305,7 @@ _021D7702: add r0, r5, #0 add r0, #0x94 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r5] mov r0, #0x4c bl String_ctor @@ -432,7 +432,7 @@ _021D77F2: add r0, r5, #0 add r0, #0x94 mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r5] mov r0, #0x4c bl String_ctor @@ -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 @@ -1484,7 +1484,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 _021D80BE: add r0, r5, #0 add r1, r6, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r4, #5 bge _021D80D0 add r0, r5, #0 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index d65fb117..26b7d486 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -550,7 +550,7 @@ MOD62_0222D9A0: ; 0x0222D9A0 ldr r1, [r2, r1] cmp r1, #1 bne _0222D9CC - bl ErrorHandling + bl GF_AssertFail add sp, #0x34 mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -690,7 +690,7 @@ _0222DADA: str r0, [r4] b _0222DAE6 _0222DAE2: - bl ErrorHandling + bl GF_AssertFail _0222DAE6: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -1152,7 +1152,7 @@ MOD62_0222DE00: ; 0x0222DE00 bl NewString_ReadMsgData str r0, [sp, #0x18] add r0, sp, #0x1c - bl FUN_0201901C + bl InitWindow mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1815,14 +1815,14 @@ _0222E35C: .word 0x04000580 thumb_func_start MOD62_0222E360 MOD62_0222E360: ; 0x0222E360 push {r3, r4, r5, lr} - ldr r3, _0222E398 ; =UNK_021064B8 + ldr r3, _0222E398 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0222E39C ; =UNK_021064C0 + ldr r3, _0222E39C ; =NNS_GfdDefaultFuncAllocPlttVram mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -1832,17 +1832,17 @@ MOD62_0222E360: ; 0x0222E360 add r5, r0, #0 cmp r4, #0 bne _0222E388 - bl ErrorHandling + bl GF_AssertFail _0222E388: cmp r5, #0 bne _0222E390 - bl ErrorHandling + bl GF_AssertFail _0222E390: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_0222E398: .word UNK_021064B8 -_0222E39C: .word UNK_021064C0 +_0222E398: .word NNS_GfdDefaultFuncAllocTexVram +_0222E39C: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_end MOD62_0222E360 thumb_func_start MOD62_0222E3A0 @@ -1853,7 +1853,7 @@ MOD62_0222E3A0: ; 0x0222E3A0 cmp r0, #0 ble _0222E3B6 bl FUN_020222AC - bl FUN_020B02C8 + bl NNS_G2dSetupSoftwareSpriteCamera _0222E3B6: bl FUN_02013388 mov r0, #1 @@ -1936,7 +1936,7 @@ _0222E442: add r0, r4, r0 asr r7, r0, #1 ldr r0, [sp, #0x18] - bl FUN_0201901C + bl InitWindow lsl r0, r5, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -1957,7 +1957,7 @@ _0222E442: bl FUN_02019064 add r0, r7, #0 mov r1, #0x35 - bl ListMenu_ctor + bl ListMenuItems_ctor mov r2, #0x67 ldr r1, [sp, #0x1c] lsl r2, r2, #2 @@ -1990,7 +1990,7 @@ _0222E49A: ldr r0, [r1, r0] ldr r2, [r2, #4] add r1, r4, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r0, r4, #0 bl String_dtor add r6, r6, #1 @@ -2454,7 +2454,7 @@ MOD62_0222E7E8: ; 0x0222E7E8 bl FUN_0200BBF0 cmp r0, #0 bne _0222E852 - bl ErrorHandling + bl GF_AssertFail _0222E852: ldr r0, [r4, #8] ldr r1, [r4, #0xc] @@ -2462,7 +2462,7 @@ _0222E852: bl FUN_0200BF60 cmp r0, #0 bne _0222E864 - bl ErrorHandling + bl GF_AssertFail _0222E864: add sp, #0x4c pop {r3, r4, r5, r6, pc} @@ -3251,7 +3251,7 @@ MOD62_0222EE78: ; 0x0222EE78 cmp r5, r1 bne _0222EE96 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl CopyWindowToVram add sp, #0xc @@ -3268,7 +3268,7 @@ _0222EE96: add r5, r0, #0 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -3298,7 +3298,7 @@ MOD62_0222EEE0: ; 0x0222EEE0 add r0, r5, #0 add r4, r2, #0 add r6, r3, #0 - bl FUN_0201901C + bl InitWindow ldr r0, [sp, #0x28] lsl r2, r4, #0x18 lsl r0, r0, #0x18 @@ -3331,7 +3331,7 @@ MOD62_0222EEE0: ; 0x0222EEE0 bl FUN_0200D0BC add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram add sp, #0x14 @@ -3347,7 +3347,7 @@ MOD62_0222EF44: ; 0x0222EF44 add r0, r5, #0 add r4, r2, #0 add r6, r3, #0 - bl FUN_0201901C + bl InitWindow ldr r0, [sp, #0x28] lsl r2, r4, #0x18 lsl r0, r0, #0x18 @@ -3377,7 +3377,7 @@ MOD62_0222EF44: ; 0x0222EF44 bl FUN_02019064 add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram add sp, #0x14 @@ -3552,14 +3552,14 @@ _0222F0E2: bne _0222F0FE add r0, r5, #0 mov r1, #0xee - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram b _0222F152 _0222F0FE: add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x64 mov r1, #0x35 bl String_ctor @@ -3621,7 +3621,7 @@ MOD62_0222F168: ; 0x0222F168 bne _0222F194 add r0, r5, r4 mov r1, #0xee - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 bl CopyWindowToVram add sp, #0x14 @@ -3629,7 +3629,7 @@ MOD62_0222F168: ; 0x0222F168 _0222F194: add r0, r5, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x64 mov r1, #0x35 bl String_ctor @@ -3693,7 +3693,7 @@ MOD62_0222F208: ; 0x0222F208 cmp r5, r1 bne _0222F226 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl CopyWindowToVram add sp, #0xc @@ -3710,7 +3710,7 @@ _0222F226: add r5, r0, #0 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -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 @@ -4612,7 +4612,7 @@ MOD62_0222F904: ; 0x0222F904 mov r0, #0x67 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r4, #0xfc add r0, r4, #0 bl FUN_02019178 @@ -5166,7 +5166,7 @@ _0222FD9A: bl FUN_0200C61C pop {r3, pc} _0222FDA2: - bl ErrorHandling + bl GF_AssertFail pop {r3, pc} thumb_func_end MOD62_0222FD70 @@ -5540,7 +5540,7 @@ _02230074: bl FUN_020054C8 pop {r4, r5, r6, pc} _022300A4: - bl ErrorHandling + bl GF_AssertFail _022300A8: pop {r4, r5, r6, pc} nop diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index a323b642..ea96bf3b 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -519,24 +519,24 @@ MOD63_021D78BC: ; 0x021D78BC bl FUN_0201B234 ldr r0, [r5, #0x60] mov r1, #0 - bl FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx add r4, r0, #0 add r0, r5, #0 ldr r2, [r5, #0x58] add r0, #0x68 add r1, r4, #0 - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r5, #0x64] ldr r0, [r5, #0x5c] - bl FUN_020BC0FC + bl NNS_G3dGetTex add r3, r0, #0 ldr r0, [r5, #0x64] ldr r2, [r5, #0x58] add r1, r4, #0 - bl FUN_020B8110 + bl NNS_G3dAnmObjInit ldr r1, [r5, #0x64] add r0, r5, #4 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r4, r5, #0 add r6, sp, #0xc mov r3, #0 @@ -579,7 +579,7 @@ MOD63_021D7970: ; 0x021D7970 add r4, r0, #0 ldr r1, [r4, #0x64] add r0, #0x68 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj ldr r0, [r4, #0x60] bl FreeToHeap ldr r0, [r4, #0x5c] @@ -1006,10 +1006,10 @@ _021D7C52: ldrsh r2, [r5, r2] ldrsh r3, [r5, r3] mov r0, #0 - bl FUN_020B8418 + bl NNS_G3dGlbLightVector ldr r1, _021D7D68 ; =0x00007FFF mov r0, #0 - bl FUN_020B8404 + bl NNS_G3dGlbLightColor ldr r3, _021D7D6C ; =0x0000010E mov r0, #1 add r2, r3, #2 @@ -1017,10 +1017,10 @@ _021D7C52: add r3, r3, #4 ldrsh r2, [r5, r2] ldrsh r3, [r5, r3] - bl FUN_020B8418 + bl NNS_G3dGlbLightVector ldr r1, _021D7D68 ; =0x00007FFF mov r0, #1 - bl FUN_020B8404 + bl NNS_G3dGlbLightColor ldr r2, _021D7D60 ; =0x04000060 ldr r0, _021D7D64 ; =0xFFFFCFFF ldrh r1, [r2] @@ -1770,7 +1770,7 @@ _021D8272: str r1, [r0] ldr r1, _021D835C ; =0x00007FFF mov r0, #1 - bl FUN_020B8404 + bl NNS_G3dGlbLightColor add r0, r5, #0 add r1, r4, #0 add r0, #0xa8 @@ -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 @@ -2064,7 +2064,7 @@ _021D844C: add r0, #0xac add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add r0, r7, #0 mov r1, #0 add r2, r4, #0 @@ -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} @@ -2260,7 +2260,7 @@ _021D86B2: lsl r1, r1, #0x10 mov r0, #1 lsr r1, r1, #0x10 - bl FUN_020B8404 + bl NNS_G3dGlbLightColor pop {r4, pc} .align 2, 0 _021D86DC: .word 0x00000116 diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index e501157b..6f6f8f75 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -417,14 +417,14 @@ MOD63_021D8BD8: ; 0x021D8BD8 add r3, r1, #0 bl FUN_02022318 str r0, [r4, #0x10] - ldr r3, _021D8C18 ; =UNK_021064B8 + ldr r3, _021D8C18 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _021D8C1C ; =UNK_021064C0 + ldr r3, _021D8C1C ; =NNS_GfdDefaultFuncAllocPlttVram mov r0, #0x80 ldr r3, [r3] mov r1, #0 @@ -434,8 +434,8 @@ MOD63_021D8BD8: ; 0x021D8BD8 pop {r4, pc} nop _021D8C14: .word MOD63_021D8C20 -_021D8C18: .word UNK_021064B8 -_021D8C1C: .word UNK_021064C0 +_021D8C18: .word NNS_GfdDefaultFuncAllocTexVram +_021D8C1C: .word NNS_GfdDefaultFuncAllocPlttVram thumb_func_end MOD63_021D8BD8 thumb_func_start MOD63_021D8C20 @@ -708,7 +708,7 @@ _021D8E36: mov r0, #1 pop {r3, r4, r5, pc} _021D8E42: - bl ErrorHandling + bl GF_AssertFail _021D8E46: ldr r0, [r5, #8] cmp r0, #0 @@ -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 @@ -1227,7 +1227,7 @@ _021D9286: ldr r0, [r4, #8] cmp r0, #0 bne _021D9296 - bl ErrorHandling + bl GF_AssertFail _021D9296: ldr r0, [r4, #0x28] bl FUN_0200CAB4 @@ -1565,11 +1565,11 @@ _021D950C: asr r1, r1, #0x10 asr r2, r2, #0x10 asr r3, r3, #0x10 - bl FUN_020B8418 + bl NNS_G3dGlbLightVector lsl r1, r4, #1 ldrh r1, [r7, r1] add r0, r4, #0 - bl FUN_020B8404 + bl NNS_G3dGlbLightColor add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -1578,11 +1578,11 @@ _021D950C: ldr r0, _021D9594 ; =0x00004210 ldr r1, _021D9598 ; =0x0000318A mov r2, #0 - bl FUN_020B83E0 + bl NNS_G3dGlbMaterialColorDiffAmb ldr r0, _021D959C ; =0x00004A52 ldr r1, _021D95A0 ; =0x000039CE mov r2, #0 - bl FUN_020B83BC + bl NNS_G3dGlbMaterialColorSpecEmi mov r0, #0x1f str r0, [sp] mov r0, #2 @@ -1592,7 +1592,7 @@ _021D950C: mov r0, #0xd mov r2, #2 add r3, r1, #0 - bl FUN_020B8390 + bl NNS_G3dGlbPolygonAttr ldr r0, _021D95A4 ; =MOD63_021D8CB0 add r1, r5, #0 bl Main_SetVBlankIntrCB @@ -1767,15 +1767,15 @@ _021D96C6: beq _021D96F4 ldr r1, [sp, #0x14] add r1, r1, r7 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData cmp r0, #0 bne _021D96F8 ldr r0, [r6, #0x2c] bl FreeToHeap - bl ErrorHandling + bl GF_AssertFail b _021D96F8 _021D96F4: - bl ErrorHandling + bl GF_AssertFail _021D96F8: add r0, r4, #1 lsl r0, r0, #0x18 @@ -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] @@ -1912,18 +1912,18 @@ MOD63_021D9810: ; 0x021D9810 mov r2, #0x4c bl AllocAndReadWholeNarcMemberByIdPair str r0, [r5, #0x3c] - bl FUN_020BC0FC + bl NNS_G3dGetTex str r0, [r5, #0x40] bl FUN_0201B3C4 cmp r0, #0 bne _021D9834 - bl ErrorHandling + bl GF_AssertFail _021D9834: ldr r0, [r5, #0x40] ldr r0, [r0, #0x14] cmp r0, #0 bne _021D9840 - bl ErrorHandling + bl GF_AssertFail _021D9840: ldr r2, [r5, #0x40] ldr r0, [r5, #0x3c] @@ -1960,54 +1960,54 @@ _021D9862: bl FUN_0201B3A8 cmp r0, #0 bne _021D9890 - bl ErrorHandling + bl GF_AssertFail _021D9890: add r0, r5, r6 add r0, #0x9c ldr r0, [r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrb r0, [r0, #9] cmp r0, #1 beq _021D98A4 - bl ErrorHandling + bl GF_AssertFail _021D98A4: add r0, r5, r6 add r0, #0x9c ldr r0, [r0] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet ldrh r1, [r0, #0xe] add r1, r0, r1 ldr r1, [r1, #0xc] add r4, r0, r1 bne _021D98BC - bl ErrorHandling + bl GF_AssertFail _021D98BC: ldr r0, [sp, #0x10] add r1, r4, #0 add r0, r0, r6 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit add r0, r4, #0 mov r1, #0 mov r2, #0x40 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag add r0, r4, #0 mov r1, #0 mov r2, #0x80 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag mov r2, #2 add r0, r4, #0 mov r1, #0 lsl r2, r2, #8 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag mov r2, #1 add r0, r4, #0 mov r1, #0 lsl r2, r2, #0xa - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag add r0, r4, #0 mov r1, #0 mov r2, #0xf - bl FUN_020BC02C + bl NNSi_G3dModifyPolygonAttrMask add r0, r7, #1 lsl r0, r0, #0x18 lsr r7, r0, #0x18 @@ -3038,15 +3038,15 @@ MOD63_021DA158: ; 0x021DA158 beq _021DA18E add r1, r4, #0 add r1, #0x14 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData cmp r0, #0 bne _021DA192 ldr r0, [r4, #0x14] bl FreeToHeap - bl ErrorHandling + bl GF_AssertFail b _021DA192 _021DA18E: - bl ErrorHandling + bl GF_AssertFail _021DA192: add r0, r5, #0 bl NARC_dtor @@ -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/63/asm/mod63_021DA640.s b/arm9/modules/63/asm/mod63_021DA640.s index 6095d832..5bcdfbd2 100644 --- a/arm9/modules/63/asm/mod63_021DA640.s +++ b/arm9/modules/63/asm/mod63_021DA640.s @@ -108,7 +108,7 @@ MOD63_021DA6E8: ; 0x021DA6E8 orr r0, r1 str r0, [r2] bl MOD63_021DA640 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -876,7 +876,7 @@ MOD63_021DAD18: ; 0x021DAD18 add r6, r2, #0 bl FUN_02020354 mov r1, #1 - bl FUN_020B19C4 + bl NNS_G2dGetImagePaletteLocation add r7, r0, #0 cmp r6, #0 bne _021DAD44 diff --git a/arm9/modules/63/asm/mod63_021DAE5C.s b/arm9/modules/63/asm/mod63_021DAE5C.s index 52b453e2..efa1a033 100644 --- a/arm9/modules/63/asm/mod63_021DAE5C.s +++ b/arm9/modules/63/asm/mod63_021DAE5C.s @@ -165,7 +165,7 @@ MOD63_021DAF80: ; 0x021DAF80 add r4, r1, #0 cmp r4, r0 blt _021DAF90 - bl ErrorHandling + bl GF_AssertFail _021DAF90: mov r0, #0xc ldr r1, [r5, #4] @@ -239,7 +239,7 @@ MOD63_021DAFEC: ; 0x021DAFEC orr r0, r1 str r0, [r3] bl MOD63_021DAE5C - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -603,7 +603,7 @@ _021DB2E6: lsr r4, r1, #0x18 cmp r4, #0xa blo _021DB2CE - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r4, pc} thumb_func_end MOD63_021DB2C8 diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index 6f9e7036..84461fe1 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -5,8 +5,8 @@ #include "mod63_021DB450.h" //todo resolve to static code -extern u32 (*UNK_021064B8)(u32 param0, u32 param1, u32 param2); -extern u32 (*UNK_021064C0)(u32 param0, u32 param1, u32 param2); +extern u32 (*NNS_GfdDefaultFuncAllocTexVram)(u32 param0, u32 param1, u32 param2); +extern u32 (*NNS_GfdDefaultFuncAllocPlttVram)(u32 param0, u32 param1, u32 param2); extern void FUN_0201327C(u32 param0); extern void FUN_020132BC(u32 param0); @@ -29,7 +29,7 @@ extern void FUN_020072E8(struct UnkStruct63_021DB450 *); extern void FUN_020081C4(struct UnkStruct63_021DB450 *); extern void FUN_020222AC(void); -extern void FUN_020B02C8(void); +extern void NNS_G2dSetupSoftwareSpriteCamera(void); extern u32 FUN_02006ED4(struct UnkStruct63_021DB450 *); extern void FUN_020222B4(u32, u32); @@ -50,7 +50,7 @@ const struct UnkStruct63_021DBEF0 MOD63_021DBEF0[3]; THUMB_FUNC u32 MOD63_021DB450(u32 param0, u32 param1) { - u32 res0 = (UNK_021064B8)(param0, param1, 0); + u32 res0 = (NNS_GfdDefaultFuncAllocTexVram)(param0, param1, 0); FUN_0201327C(res0); GF_ASSERT(res0); return (u32)((u16)res0 * 8); @@ -58,7 +58,7 @@ THUMB_FUNC u32 MOD63_021DB450(u32 param0, u32 param1) THUMB_FUNC u32 MOD63_021DB474(u32 param0, u32 param1) { - u32 res0 = (UNK_021064C0)(param0, param1, 1); + u32 res0 = (NNS_GfdDefaultFuncAllocPlttVram)(param0, param1, 1); GF_ASSERT(res0); FUN_020132BC(res0); return (u32)((u16)res0 * 8); @@ -114,7 +114,7 @@ THUMB_FUNC void MOD63_021DB5A8(UnkStruct63_021DB450 *param0) return; } FUN_020222AC(); - FUN_020B02C8(); + NNS_G2dSetupSoftwareSpriteCamera(); (void)FUN_02006ED4(param0->field_00); MOD63_021DB934(); FUN_020222B4(1, 0); diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 0ade6b6c..7a70bf1f 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -19,7 +19,7 @@ MOD64_021D74E0: ; 0x021D74E0 bl OverlayManager_CreateAndGetData add r5, r0, #0 bne _021D7504 - bl ErrorHandling + bl GF_AssertFail _021D7504: ldr r2, _021D7630 ; =0x000006B4 add r0, r5, #0 @@ -54,7 +54,7 @@ _021D7504: bl FUN_0201CC24 cmp r0, #1 beq _021D755E - bl ErrorHandling + bl GF_AssertFail _021D755E: add r0, r5, #0 mov r1, #0x2f @@ -254,7 +254,7 @@ MOD64_021D76F4: ; 0x021D76F4 bl FUN_0201CD04 cmp r0, #1 beq _021D7726 - bl ErrorHandling + bl GF_AssertFail _021D7726: mov r0, #0x65 lsl r0, r0, #4 @@ -416,7 +416,7 @@ MOD64_021D785C: ; 0x021D785C push {r4, r5, lr} sub sp, #0x24 add r4, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -456,7 +456,7 @@ MOD64_021D78B4: ; 0x021D78B4 push {r3, r4, lr} sub sp, #4 add r4, r0, #0 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _021D7940 ; =0x04000060 ldr r1, _021D7944 ; =0xFFFFCFFD @@ -511,11 +511,11 @@ _021D7900: str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager add sp, #4 pop {r3, r4, pc} .align 2, 0 @@ -533,8 +533,8 @@ _021D7960: .word 0xBFFF0000 thumb_func_start MOD64_021D7964 MOD64_021D7964: ; 0x021D7964 push {r3, lr} - bl FUN_020AEAF4 - bl FUN_020AEC60 + bl NNS_GfdResetFrmTexVramState + bl NNS_GfdResetFrmPlttVramState pop {r3, pc} thumb_func_end MOD64_021D7964 @@ -653,14 +653,14 @@ MOD64_021D7A54: ; 0x021D7A54 add r5, r0, #0 add r0, r4, #0 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows add r1, r5, #0 add r1, #0x98 str r0, [r1] add r0, r5, #0 add r0, #0x98 ldr r0, [r0] - bl FUN_0201901C + bl InitWindow mov r0, #0x13 str r0, [sp] mov r0, #0x17 @@ -683,7 +683,7 @@ MOD64_021D7A54: ; 0x021D7A54 add r0, #0x98 ldr r0, [r0] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _021D7AE8 ; =0x000006A8 mov r1, #1 ldr r0, [r5, r0] @@ -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 @@ -741,13 +741,13 @@ MOD64_021D7B04: ; 0x021D7B04 mov r1, #2 lsl r1, r1, #8 str r0, [r5, r1] - ldr r3, _021D7BA4 ; =UNK_021064B8 + ldr r3, _021D7BA4 ; =NNS_GfdDefaultFuncAllocTexVram lsl r0, r1, #6 mov r1, #0 ldr r3, [r3] add r2, r1, #0 blx r3 - ldr r3, _021D7BA8 ; =UNK_021064C0 + ldr r3, _021D7BA8 ; =NNS_GfdDefaultFuncAllocPlttVram add r4, r0, #0 ldr r3, [r3] mov r0, #0x80 @@ -808,8 +808,8 @@ _021D7B8E: blt _021D7B8E pop {r3, r4, r5, r6, r7, pc} nop -_021D7BA4: .word UNK_021064B8 -_021D7BA8: .word UNK_021064C0 +_021D7BA4: .word NNS_GfdDefaultFuncAllocTexVram +_021D7BA8: .word NNS_GfdDefaultFuncAllocPlttVram _021D7BAC: .word 0x7FFF0000 _021D7BB0: .word 0xFFFF0000 thumb_func_end MOD64_021D7B04 @@ -1057,9 +1057,9 @@ MOD64_021D7D7C: ; 0x021D7D7C add r4, r0, #0 str r2, [sp] mov r0, #0x52 - bl UncompressFromNarc + bl GfGfxLoader_LoadFromNarc str r0, [r4, #0x54] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet str r0, [r4, #0x58] ldrh r1, [r0, #0xe] add r1, r0, r1 @@ -1067,7 +1067,7 @@ MOD64_021D7D7C: ; 0x021D7D7C add r0, r0, r1 str r0, [r4, #0x5c] ldr r0, [r4, #0x54] - bl FUN_020BC0FC + bl NNS_G3dGetTex str r0, [r4, #0x60] bl FUN_0201B3C4 ldr r0, [r4, #0x54] @@ -1075,7 +1075,7 @@ MOD64_021D7D7C: ; 0x021D7D7C bl FUN_0201B3A8 ldr r1, [r4, #0x5c] add r0, r4, #0 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit add sp, #4 pop {r3, r4, pc} thumb_func_end MOD64_021D7D7C @@ -1091,23 +1091,23 @@ 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 FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx str r0, [r4, #0x68] ldr r1, [r4, #0x68] ldr r2, [r4, #0x5c] add r0, r5, #0 - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r4, #0x6c] ldr r1, [r4, #0x68] ldr r2, [r4, #0x5c] ldr r3, [r4, #0x60] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit ldr r1, [r4, #0x6c] add r0, r4, #0 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -1128,7 +1128,7 @@ _021D7E14: beq _021D7E28 ldr r1, [r5, #0x6c] add r0, r4, #0 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj ldr r0, [r5, #0x64] bl FreeToHeap _021D7E28: @@ -1149,7 +1149,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x90 ldrh r0, [r0] - ldr r3, _021D7ECC ; =UNK_020FFA38 + ldr r3, _021D7ECC ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1166,7 +1166,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x92 ldrh r0, [r0] - ldr r3, _021D7ECC ; =UNK_020FFA38 + ldr r3, _021D7ECC ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1183,7 +1183,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x94 ldrh r0, [r0] - ldr r3, _021D7ECC ; =UNK_020FFA38 + ldr r3, _021D7ECC ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1211,7 +1211,7 @@ _021D7EC8: add sp, #0x48 pop {r4, pc} .align 2, 0 -_021D7ECC: .word UNK_020FFA38 +_021D7ECC: .word FX_SinCosTable_ thumb_func_end MOD64_021D7E34 thumb_func_start MOD64_021D7ED0 @@ -1442,18 +1442,18 @@ MOD64_021D8058: ; 0x021D8058 ldr r2, _021D809C ; =0xFFFFF000 add r1, r0, #0 add r3, r0, #0 - bl FUN_020B8418 + bl NNS_G3dGlbLightVector ldr r1, _021D80A0 ; =0x00007FFF mov r0, #0 - bl FUN_020B8404 + bl NNS_G3dGlbLightColor ldr r0, _021D80A0 ; =0x00007FFF mov r2, #0 add r1, r0, #0 - bl FUN_020B83E0 + bl NNS_G3dGlbMaterialColorDiffAmb ldr r0, _021D80A0 ; =0x00007FFF mov r2, #0 add r1, r0, #0 - bl FUN_020B83BC + bl NNS_G3dGlbMaterialColorSpecEmi mov r0, #0x26 lsl r0, r0, #4 mov r4, #0 @@ -1634,9 +1634,9 @@ MOD64_021D81D8: ; 0x021D81D8 mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 - bl FUN_020BB394 - bl FUN_020B02C8 + bl NNS_G3dGeBufferOP_N + bl NNS_G3dGeFlushBuffer + bl NNS_G2dSetupSoftwareSpriteCamera mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -1648,11 +1648,11 @@ MOD64_021D81D8: ; 0x021D81D8 mov r0, #0x12 add r1, sp, #4 str r2, [sp, #4] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N bl FUN_0201EBA4 add r0, r4, #0 bl MOD64_021D8058 @@ -1660,7 +1660,7 @@ MOD64_021D81D8: ; 0x021D81D8 mov r0, #0x12 add r1, sp, #0 str r2, [sp] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N mov r0, #0 add r1, r0, #0 bl FUN_020222B4 @@ -2310,7 +2310,7 @@ MOD64_021D86DC: ; 0x021D86DC bl NewMsgDataFromNarc add r4, r0, #0 bne _021D86F8 - bl ErrorHandling + bl GF_AssertFail _021D86F8: add r0, r4, #0 add r1, r6, #0 @@ -2318,7 +2318,7 @@ _021D86F8: add r6, r0, #0 add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x2c] str r3, [sp] @@ -2358,7 +2358,7 @@ MOD64_021D8744: ; 0x021D8744 str r3, [sp, #0x10] cmp r0, #0 beq _021D875C - bl ErrorHandling + bl GF_AssertFail _021D875C: mov r0, #0 mov r1, #0x1a @@ -2367,7 +2367,7 @@ _021D875C: bl NewMsgDataFromNarc add r6, r0, #0 bne _021D8770 - bl ErrorHandling + bl GF_AssertFail _021D8770: ldr r1, [sp, #0x10] add r0, r6, #0 @@ -2375,7 +2375,7 @@ _021D8770: str r0, [r4] add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 ldr r0, [sp, #0x2c] str r3, [sp] @@ -2510,7 +2510,7 @@ MOD64_021D8864: ; 0x021D8864 add r6, r2, #0 cmp r0, #0 beq _021D8876 - bl ErrorHandling + bl GF_AssertFail _021D8876: ldr r1, _021D88B8 ; =0xFFFFEAAB ldr r2, _021D88BC ; =0xFFFFDC72 @@ -2795,7 +2795,7 @@ MOD64_021D8A90: ; 0x021D8A90 lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _021D8ADC ; =UNK_020FFA38 + ldr r0, _021D8ADC ; =FX_SinCosTable_ ldr r2, [r4, #4] ldrsh r0, [r0, r1] asr r3, r2, #0x1f @@ -2818,7 +2818,7 @@ MOD64_021D8A90: ; 0x021D8A90 pop {r4, pc} nop _021D8AD8: .word 0x0000FFFF -_021D8ADC: .word UNK_020FFA38 +_021D8ADC: .word FX_SinCosTable_ thumb_func_end MOD64_021D8A90 thumb_func_start MOD64_021D8AE0 @@ -2828,7 +2828,7 @@ MOD64_021D8AE0: ; 0x021D8AE0 ldr r0, [r4, #0x28] cmp r0, #0 beq _021D8AEE - bl ErrorHandling + bl GF_AssertFail _021D8AEE: add r0, r4, #0 mov r1, #2 @@ -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] @@ -3016,7 +3016,7 @@ MOD64_021D8C3C: ; 0x021D8C3C str r3, [sp] cmp r0, #0 beq _021D8C50 - bl ErrorHandling + bl GF_AssertFail _021D8C50: ldr r4, [sp, #0x24] add r0, r5, #0 @@ -3057,7 +3057,7 @@ MOD64_021D8C94: ; 0x021D8C94 ldr r0, [r4, #0x54] cmp r0, #0 beq _021D8CA2 - bl ErrorHandling + bl GF_AssertFail _021D8CA2: mov r0, #1 mvn r0, r0 @@ -3240,7 +3240,7 @@ MOD64_021D8DDC: ; 0x021D8DDC str r3, [sp] cmp r0, #0 beq _021D8DF0 - bl ErrorHandling + bl GF_AssertFail _021D8DF0: ldr r4, [sp, #0x28] ldr r2, [sp] @@ -3281,7 +3281,7 @@ MOD64_021D8E34: ; 0x021D8E34 ldr r0, [r4, #0x3c] cmp r0, #0 beq _021D8E42 - bl ErrorHandling + bl GF_AssertFail _021D8E42: mov r0, #1 mvn r0, r0 @@ -3386,21 +3386,21 @@ 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 _021D8F16: ldr r0, [sp, #0x18] mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows add r1, r5, #0 add r1, #0x9c str r0, [r1] add r0, r5, #0 add r0, #0x9c ldr r0, [r0] - bl FUN_0201901C + bl InitWindow cmp r4, #0 beq _021D8F3C cmp r4, #1 @@ -3501,7 +3501,7 @@ MOD64_021D8FD0: ; 0x021D8FD0 bl NewMsgDataFromNarc add r4, r0, #0 bne _021D8FEC - bl ErrorHandling + bl GF_AssertFail _021D8FEC: add r0, r4, #0 add r1, r6, #0 @@ -3511,7 +3511,7 @@ _021D8FEC: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -3567,7 +3567,7 @@ _021D905C: ldr r0, _021D9070 ; =0x00000189 pop {r3, pc} _021D9060: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 229a9214..e9e1ed78 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -335,7 +335,7 @@ _021D7762: add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 b _021D7796 _021D7784: @@ -425,7 +425,7 @@ MOD65_021D7818: ; 0x021D7818 add r5, r0, #0 add r0, #0xc8 ldr r0, [r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 ldr r0, _021D78A4 ; =gMain ldr r1, [r0, #0x48] @@ -998,7 +998,7 @@ _021D7C68: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r4, #8 add r5, #0x10 @@ -1404,7 +1404,7 @@ _021D7FCA: add r0, r5, r0 mov r1, #0xff add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r0, #1 bl FUN_02002B60 mov r0, #0 @@ -1542,7 +1542,7 @@ MOD65_021D80C8: ; 0x021D80C8 strb r0, [r5, #0x1c] ldrb r0, [r5, #0x1c] ldr r1, [r5] - bl ListMenu_ctor + bl ListMenuItems_ctor add r1, r5, #0 add r1, #0xcc str r0, [r1] @@ -1585,7 +1585,7 @@ _021D80EE: ldrb r2, [r6, #5] ldr r0, [r0] ldr r1, [r5, #0x34] - bl ListMenu_AddItem + bl ListMenuItems_AddItem cmp r4, #0xff bne _021D80EE _021D8142: @@ -1594,7 +1594,7 @@ _021D8142: ldr r0, [r0] ldr r1, [r5, #0x38] mov r2, #0xff - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r1, r5, #0 ldr r0, _021D8210 ; =0x021DA2E0 add r1, #0x84 @@ -1684,7 +1684,7 @@ _021D81C0: ldrh r2, [r2] add r0, #0x84 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit add r1, r5, #0 add r1, #0xc4 str r0, [r1] @@ -1711,7 +1711,7 @@ MOD65_021D8214: ; 0x021D8214 add r0, #0xe8 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect cmp r4, #0 beq _021D823E add r0, r5, #0 @@ -1725,11 +1725,11 @@ _021D823E: ldr r0, [r0] add r1, #0x80 add r2, #0x82 - bl FUN_02001300 + bl DestroyListMenu add r0, r5, #0 add r0, #0xcc ldr r0, [r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r5, #0 add r0, #0x80 ldrh r1, [r0] @@ -1792,7 +1792,7 @@ _021D82A2: mov r1, #1 mov r2, #2 mov r3, #0 - bl FUN_0201A8C8 + bl ScrollWindow b _021D8392 _021D82D2: mov r0, #0x1e @@ -1812,7 +1812,7 @@ _021D82D2: mov r1, #0 mov r2, #4 add r3, r1, #0 - bl FUN_0201A8C8 + bl ScrollWindow mov r0, #1 strh r0, [r4, #0x14] b _021D8392 @@ -1834,7 +1834,7 @@ _021D8302: mov r1, #1 mov r2, #2 mov r3, #0 - bl FUN_0201A8C8 + bl ScrollWindow mov r0, #0 strh r0, [r4, #0x14] b _021D8392 @@ -1856,7 +1856,7 @@ _021D8330: mov r1, #0 mov r2, #2 add r3, r1, #0 - bl FUN_0201A8C8 + bl ScrollWindow mov r0, #1 strh r0, [r4, #0x14] b _021D8392 @@ -1881,7 +1881,7 @@ _021D835E: mov r1, #0 mov r2, #2 add r3, r1, #0 - bl FUN_0201A8C8 + bl ScrollWindow mov r0, #0 strh r0, [r4, #0x14] _021D8392: @@ -1953,7 +1953,7 @@ _021D83D2: mov r1, #0 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldrb r1, [r4, #0x1b] cmp r1, #5 bne _021D8434 @@ -2057,11 +2057,11 @@ _021D84E0: .word 0x00000001 thumb_func_start MOD65_021D84E4 MOD65_021D84E4: ; 0x021D84E4 - ldr r3, _021D84EC ; =FUN_02001470 + ldr r3, _021D84EC ; =ListMenuGetTemplateField mov r1, #0x13 bx r3 nop -_021D84EC: .word FUN_02001470 +_021D84EC: .word ListMenuGetTemplateField thumb_func_end MOD65_021D84E4 thumb_func_start MOD65_021D84F0 @@ -2072,7 +2072,7 @@ MOD65_021D84F0: ; 0x021D84F0 mov r1, #0x13 add r7, r0, #0 add r6, r2, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField add r4, r0, #0 cmp r6, #0 bne _021D850C @@ -2083,7 +2083,7 @@ _021D850C: add r0, r7, #0 add r1, #2 add r2, sp, #0x10 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r2, sp, #0x10 ldrh r2, [r2] mov r0, #7 @@ -2140,7 +2140,7 @@ _021D8578: add r0, #0xf8 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect cmp r5, #0xff bne _021D85B4 add r0, r4, #0 @@ -2223,7 +2223,7 @@ MOD65_021D8634: ; 0x021D8634 add r5, r0, #0 ldr r1, [r5] mov r0, #3 - bl ListMenu_ctor + bl ListMenuItems_ctor add r1, r5, #0 add r1, #0xd0 str r0, [r1] @@ -2235,7 +2235,7 @@ _021D8648: ldr r1, [r5, #0x2c] add r2, r4, #1 add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -2276,7 +2276,7 @@ _021D8648: add r0, #0xa4 add r2, r1, #0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit add r5, #0xc8 str r0, [r5] pop {r3, r4, r5, pc} @@ -2304,11 +2304,11 @@ MOD65_021D86BC: ; 0x021D86BC ldr r0, [r0] add r1, sp, #0 add r2, #2 - bl FUN_02001300 + bl DestroyListMenu add r0, r4, #0 add r0, #0xd0 ldr r0, [r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r4, #0 mov r1, #0 add r0, #0xc8 @@ -3269,7 +3269,7 @@ MOD65_021D8E68: ; 0x021D8E68 add r0, r4, #0 add r0, #0x6c mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x10] mov r1, #1 ldrb r0, [r0, #0xb] @@ -3842,7 +3842,7 @@ MOD65_021D92C4: ; 0x021D92C4 add r0, r4, #0 add r0, #0x6c mov r1, #0xff - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x20] bl StringSetEmpty mov r0, #1 @@ -5301,7 +5301,7 @@ MOD65_021D9E98: ; 0x021D9E98 mov r2, #0x1c add r5, r0, #0 bl MI_CpuFill8 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_Init bl G3X_InitMtxStack ldr r0, _021D9F34 ; =0x04000060 @@ -5388,8 +5388,8 @@ MOD65_021D9F50: ; 0x021D9F50 mov r0, #2 str r0, [r2] str r3, [r1] - bl FUN_020B849C - bl FUN_020B02C8 + bl NNS_G3dGlbFlushP + bl NNS_G2dSetupSoftwareSpriteCamera ldr r0, [r4, #4] bl FUN_02006ED4 ldr r0, _021D9F88 ; =0x04000540 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index e0b21bf2..c902cd22 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -138,7 +138,7 @@ MOD66_021D75C8: ; 0x021D75C8 beq _021D75DE blx r1 _021D75DE: - bl FUN_020AEEB8 + bl NNS_GfdDoVramTransfer add r0, r4, #0 bl MOD66_021D9220 ldr r0, [r4, #0x28] @@ -1350,7 +1350,7 @@ _021D7F44: bl FUN_0200D6F8 add r0, r7, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] mov r0, #0xff @@ -1720,7 +1720,7 @@ MOD66_021D820C: ; 0x021D820C bl StringSetEmpty add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, #0xa0 ldr r0, [r6] cmp r0, #0 @@ -1801,7 +1801,7 @@ MOD66_021D82B8: ; 0x021D82B8 bne _021D82DC add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 bl CopyWindowToVram add r0, r6, #0 @@ -1811,7 +1811,7 @@ MOD66_021D82B8: ; 0x021D82B8 _021D82DC: add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r1, [r4, #8] ldr r0, _021D8378 ; =0x0000FFFF cmp r1, r0 @@ -2044,7 +2044,7 @@ MOD66_021D8494: ; 0x021D8494 cmp r5, #0 beq _021D84C6 add r0, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl FUN_02019570 ldrb r1, [r4, #0x15] @@ -2104,7 +2104,7 @@ MOD66_021D84C8: ; 0x021D84C8 sub r4, r1, r0 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -2212,23 +2212,23 @@ MOD66_021D8554: ; 0x021D8554 add r0, r4, #0 add r0, #0x28 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x38 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x48 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x58 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x68 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x28 bl CopyWindowToVram @@ -4094,7 +4094,7 @@ MOD66_021D94A4: ; 0x021D94A4 bl FS_OpenFile cmp r0, #0 bne _021D94C8 - bl ErrorHandling + bl GF_AssertFail add sp, #0x4c mov r0, #0 pop {r4, r5, r6, r7, pc} @@ -4105,7 +4105,7 @@ _021D94C8: bl FS_ReadFile cmp r0, #0 bge _021D94DA - bl ErrorHandling + bl GF_AssertFail _021D94DA: add r0, r4, #0 mov r1, #8 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 4982fa30..60bd02b5 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -327,7 +327,7 @@ MOD67_021D777C: ; 0x021D777C bl FUN_020178A0 mov r0, #0x2a add r1, r4, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit pop {r4, pc} .align 2, 0 thumb_func_end MOD67_021D777C @@ -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 @@ -1122,10 +1122,10 @@ _021D7DAC: _021D7DB4: add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r1, r6, #0 add r2, r4, #0 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 5c2c1740..b2170444 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -320,7 +320,7 @@ MOD68_021D7774: ; 0x021D7774 bl FUN_020178A0 mov r0, #0x24 add r1, r4, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit pop {r4, pc} .align 2, 0 thumb_func_end MOD68_021D7774 @@ -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 @@ -527,7 +527,7 @@ MOD68_021D7904: ; 0x021D7904 bl FUN_02002E14 add r7, r0, #0 add r0, r5, r4 - bl FUN_0201AB0C + bl GetWindowWidth add r3, r0, #0 mov r1, #0 lsl r3, r3, #3 @@ -555,7 +555,7 @@ MOD68_021D7958: ; 0x021D7958 add r4, r0, #0 add r0, r4, #4 mov r1, #4 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 ldr r3, _021D7974 ; =0x00010204 add r0, r4, #0 @@ -572,7 +572,7 @@ MOD68_021D7978: ; 0x021D7978 add r4, r0, #0 add r0, #0x24 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D7994 ; =0x000F0200 add r0, r4, #0 mov r1, #2 @@ -589,7 +589,7 @@ MOD68_021D7998: ; 0x021D7998 add r4, r0, #0 add r0, #0x34 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D79B4 ; =0x000F0200 add r0, r4, #0 mov r1, #3 @@ -606,7 +606,7 @@ MOD68_021D79B8: ; 0x021D79B8 add r4, r0, #0 add r0, #0x44 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D79D4 ; =0x000F0200 add r0, r4, #0 mov r1, #4 @@ -623,7 +623,7 @@ MOD68_021D79D8: ; 0x021D79D8 add r4, r0, #0 add r0, #0x54 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D79F4 ; =0x000F0200 add r0, r4, #0 mov r1, #5 @@ -640,7 +640,7 @@ MOD68_021D79F8: ; 0x021D79F8 add r4, r0, #0 add r0, #0x64 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r3, _021D7A14 ; =0x000F0200 add r0, r4, #0 mov r1, #6 @@ -660,7 +660,7 @@ MOD68_021D7A18: ; 0x021D7A18 add r4, #0x14 add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #5 str r0, [sp] add r0, r5, #0 @@ -752,7 +752,7 @@ MOD68_021D7AE4: ; 0x021D7AE4 add r5, #0xb4 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7e lsl r0, r0, #2 ldr r0, [r4, r0] @@ -790,7 +790,7 @@ MOD68_021D7B34: ; 0x021D7B34 add r5, #0x94 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0xc4 ldr r0, [r4] mov r1, #0xa @@ -826,7 +826,7 @@ MOD68_021D7B80: ; 0x021D7B80 add r5, #0xa4 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r4, r0] @@ -871,7 +871,7 @@ MOD68_021D7BDC: ; 0x021D7BDC add r5, #0x74 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, #0xc4 ldr r0, [r4] mov r1, #8 @@ -907,7 +907,7 @@ MOD68_021D7C28: ; 0x021D7C28 add r6, #0x84 add r0, r6, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r5, r0] @@ -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 33fafb4f..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] @@ -686,7 +686,7 @@ MOD69_0222DB2C: ; 0x0222DB2C mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N ldr r0, _0222DB98 ; =0x00001B38 ldr r0, [r4, r0] bl MOD69_0222F11C @@ -694,11 +694,11 @@ MOD69_0222DB2C: ; 0x0222DB2C mov r0, #0x12 add r1, sp, #4 str r2, [sp, #4] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N ldr r0, _0222DB9C ; =0x00001B3C ldr r0, [r4, r0] bl MOD69_0222F63C @@ -706,7 +706,7 @@ MOD69_0222DB2C: ; 0x0222DB2C mov r0, #0x12 add r1, sp, #0 str r2, [sp] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N ldr r0, _0222DBA0 ; =0x04000540 mov r1, #1 str r1, [r0] @@ -793,7 +793,7 @@ MOD69_0222DBAC: ; 0x0222DBAC add r0, r4, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 bl FUN_02019548 @@ -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 @@ -921,7 +921,7 @@ MOD69_0222DD54: ; 0x0222DD54 push {r3, r4, lr} sub sp, #4 add r4, r0, #0 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _0222DDE4 ; =0x04000060 ldr r2, _0222DDE8 ; =0xFFFFCFFD @@ -957,11 +957,11 @@ MOD69_0222DD54: ; 0x0222DD54 str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -1071,7 +1071,7 @@ MOD69_0222DE98: ; 0x0222DE98 push {r3, r4, lr} sub sp, #0x1c add r4, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -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] @@ -1193,19 +1193,19 @@ _0222DF72: str r0, [sp, #0x34] _0222DF98: add r0, sp, #0x5c - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, sp, #0x48 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy ldr r0, [sp, #0x44] add r1, r7, #0 mov r2, #1 add r3, sp, #0x5c - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping ldr r0, [sp, #0x40] add r1, r6, #0 mov r2, #1 add r3, sp, #0x48 - bl FUN_020B1240 + bl NNS_G2dLoadPalette ldr r0, [sp, #0x20] add r0, r0, #1 str r0, [sp, #0x94] @@ -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] @@ -1333,20 +1333,20 @@ _0222DF98: b _0222DF98 _0222E0D4: add r0, sp, #0x5c - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, sp, #0x48 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r1, #0x96 ldr r0, [sp, #0x44] lsl r1, r1, #8 mov r2, #1 add r3, sp, #0x5c - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping ldr r0, [sp, #0x40] mov r1, #0xc0 mov r2, #1 add r3, sp, #0x48 - bl FUN_020B1240 + bl NNS_G2dLoadPalette ldr r0, [sp, #0x14] ldr r0, [r0, #0xc] ldr r0, [r0] @@ -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 @@ -2169,7 +2169,7 @@ _0222E77E: str r0, [r3] add r0, r4, #0 add r0, #0x48 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0x19 add r0, r4, #0 lsl r3, r3, #8 @@ -2179,7 +2179,7 @@ _0222E77E: add r0, #0x48 mov r1, #1 add r2, r2, r3 - bl FUN_020B1A1C + bl NNS_G2dSetImageLocation ldr r0, _0222E7BC ; =MOD69_0222E7C0 add r1, r4, #0 mov r2, #0 @@ -2608,7 +2608,7 @@ _0222EAEA: _0222EB16: ldr r0, [r4, #0x10] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x10] bl FUN_02019548 ldr r0, [r4, #0x28] @@ -3795,10 +3795,10 @@ _0222F408: mov r1, #1 bl G3B_LightVector ldrh r0, [r4, #0x28] - ldr r3, _0222F62C ; =UNK_020FFA38 + ldr r3, _0222F62C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =UNK_020FFA38 + ldr r0, _0222F62C ; =FX_SinCosTable_ add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3810,10 +3810,10 @@ _0222F408: add r1, r5, #0 bl MTX_Concat44 ldrh r0, [r4, #0x2a] - ldr r3, _0222F62C ; =UNK_020FFA38 + ldr r3, _0222F62C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =UNK_020FFA38 + ldr r0, _0222F62C ; =FX_SinCosTable_ add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3825,10 +3825,10 @@ _0222F408: add r1, r5, #0 bl MTX_Concat44 ldrh r0, [r4, #0x2c] - ldr r3, _0222F62C ; =UNK_020FFA38 + ldr r3, _0222F62C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =UNK_020FFA38 + ldr r0, _0222F62C ; =FX_SinCosTable_ add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3935,7 +3935,7 @@ _0222F5E2: lsl r0, r0, #0xa cmp r1, r0 blo _0222F608 - bl ErrorHandling + bl GF_AssertFail _0222F608: mov r0, #1 str r0, [r7, #4] @@ -3950,7 +3950,7 @@ _0222F61C: .word 0x0000019A _0222F620: .word 0x00002D6B _0222F624: .word 0x00000FFF _0222F628: .word 0xFFFFF001 -_0222F62C: .word UNK_020FFA38 +_0222F62C: .word FX_SinCosTable_ _0222F630: .word 0x00007FFF _0222F634: .word 0x00008D1C _0222F638: .word 0x0000151C diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index a0966fec..9db294af 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -407,7 +407,7 @@ MOD70_021D77CC: ; 0x021D77CC mov r0, #0x3d bl FUN_02016B94 str r0, [r4, #0x10] - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -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 @@ -1022,11 +1022,11 @@ MOD70_021D7CC0: ; 0x021D7CC0 add r4, r0, #0 add r0, #0x14 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x24 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 bl FUN_02019548 @@ -1102,7 +1102,7 @@ MOD70_021D7CE8: ; 0x021D7CE8 bl StringExpandPlaceholders add r0, r6, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r2, #0xff @@ -1136,7 +1136,7 @@ MOD70_021D7D98: ; 0x021D7D98 add r0, #0x24 mov r1, #0xf str r0, [sp, #0xc] - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x1c] cmp r0, #0 beq _021D7DC8 @@ -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] @@ -1462,19 +1462,19 @@ MOD70_021D7FF8: ; 0x021D7FF8 add r7, r4, #0 _021D8050: add r0, sp, #0x2c - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, sp, #0x18 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy ldr r0, [sp, #0x14] add r1, r4, #0 mov r2, #1 add r3, sp, #0x2c - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping ldr r0, [sp, #0x10] add r1, r7, #0 mov r2, #1 add r3, sp, #0x18 - bl FUN_020B1240 + bl NNS_G2dLoadPalette ldr r0, [r6] lsl r0, r0, #0xc str r0, [sp, #0x58] @@ -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 ac2559a6..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] @@ -964,7 +964,7 @@ _0222DDD8: lsr r5, r0, #0x10 cmp r5, #0x3c blo _0222DDF8 - bl ErrorHandling + bl GF_AssertFail _0222DDF8: bl FUN_02031190 mov r1, #0x1f @@ -1161,7 +1161,7 @@ _0222DF74: b _0222E0E8 _0222DF80: ldr r0, [r4, #4] - bl FUN_02029EF8 + bl Sav2_Chatot_get bl MOD71_0222F528 ldr r0, [r4, #0x4c] add r0, r0, #1 @@ -1750,7 +1750,7 @@ MOD71_0222E438: ; 0x0222E438 lsl r1, r1, #2 ldr r1, [r4, r1] mov r0, #0x1a - bl FUN_02016A8C + bl FreeToHeapExplicit mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -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,11 +2220,11 @@ 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 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData cmp r0, #0 beq _0222E8D0 ldr r0, [sp, #0x1c] @@ -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 @@ -2449,7 +2449,7 @@ MOD71_0222EA68: ; 0x0222EA68 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r5, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7f @@ -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 @@ -2700,7 +2700,7 @@ MOD71_0222EC5C: ; 0x0222EC5C bl GetMonData add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x20] ldr r2, [sp, #8] str r0, [sp] @@ -2910,7 +2910,7 @@ _0222EE14: str r0, [sp, #0x30] add r0, r6, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x61 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2985,7 +2985,7 @@ _0222EEA6: lsr r7, r0, #0x10 add r0, r6, r4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x14 mov r1, #0x1a bl String_ctor @@ -3446,7 +3446,7 @@ MOD71_0222F264: ; 0x0222F264 cmp r0, r1 bne _0222F2AE ldr r0, [r4, #4] - bl FUN_02029EF8 + bl Sav2_Chatot_get mov r1, #0 mov r2, #0x64 add r3, r1, #0 @@ -3551,7 +3551,7 @@ MOD71_0222F350: ; 0x0222F350 add r4, r2, #0 cmp r5, #0xd blt _0222F362 - bl ErrorHandling + bl GF_AssertFail _0222F362: ldr r1, _0222F3C8 ; =0x02231220 lsl r0, r5, #3 @@ -4313,7 +4313,7 @@ MOD71_0222F954: ; 0x0222F954 mov r0, #0xda lsl r0, r0, #6 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #1 mvn r0, r0 @@ -4383,10 +4383,10 @@ _0222F9E4: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _0222FA34 ; =0x0000367C ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #0 pop {r4, r5, r6, pc} .align 2, 0 @@ -4412,7 +4412,7 @@ MOD71_0222FA38: ; 0x0222FA38 str r0, [sp] add r0, r0, #1 mov r1, #0x1a - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _0222FAD0 ; =0x0000367C str r0, [r5, r1] mov r0, #0x64 @@ -4438,7 +4438,7 @@ _0222FA60: add r1, r6, #0 ldr r0, [r5, r0] add r2, r4, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem _0222FA8A: add r4, r4, #1 cmp r4, #0x20 @@ -4450,7 +4450,7 @@ _0222FA8A: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0xd - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r6, #0 bl String_dtor ldr r2, _0222FAD0 ; =0x0000367C @@ -4909,7 +4909,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 bl MOD71_02230F40 mov r0, #3 mov r1, #0x1a - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _0222FED8 ; =0x0000065C mov r2, #0x11 str r0, [r4, r1] @@ -4918,7 +4918,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 lsl r1, r1, #2 ldr r1, [r4, r1] mov r3, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _0222FED8 ; =0x0000065C mov r1, #0x61 lsl r1, r1, #2 @@ -4926,7 +4926,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 ldr r1, [r4, r1] mov r2, #0x12 mov r3, #1 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _0222FED8 ; =0x0000065C mov r1, #0x61 lsl r1, r1, #2 @@ -4934,7 +4934,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 ldr r1, [r4, r1] mov r2, #0x13 mov r3, #2 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _0222FED8 ; =0x0000065C ldr r1, [r4, r0] str r1, [sp, #0x10] @@ -5024,7 +5024,7 @@ _0222FF10: bl FUN_02001C5C ldr r0, _0223000C ; =0x0000065C ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r1, _02230010 ; =MOD71_0222F538 ldr r0, _02230014 ; =0x00002214 add sp, #0x10 @@ -5063,7 +5063,7 @@ _0222FF64: bl FUN_02001C5C ldr r0, _0223000C ; =0x0000065C ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r1, _0223001C ; =MOD71_02230020 ldr r0, _02230014 ; =0x00002214 str r1, [r4, r0] @@ -5100,7 +5100,7 @@ _0222FFB4: bl FUN_02001C5C ldr r0, _0223000C ; =0x0000065C ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r1, _02230010 ; =MOD71_0222F538 ldr r0, _02230014 ; =0x00002214 str r1, [r4, r0] @@ -6155,7 +6155,7 @@ MOD71_02230810: ; 0x02230810 bl MOD71_02230F40 mov r0, #2 mov r1, #0x1a - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _02230900 ; =0x0000065C mov r2, #0x11 str r0, [r4, r1] @@ -6164,7 +6164,7 @@ MOD71_02230810: ; 0x02230810 lsl r1, r1, #2 ldr r1, [r4, r1] mov r3, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _02230900 ; =0x0000065C mov r1, #0x61 lsl r1, r1, #2 @@ -6172,7 +6172,7 @@ MOD71_02230810: ; 0x02230810 ldr r1, [r4, r1] mov r2, #0x13 mov r3, #1 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _02230900 ; =0x0000065C ldr r1, [r4, r0] sub r0, #0x94 @@ -6259,7 +6259,7 @@ _0223092E: bl FUN_02001C5C ldr r0, _022309E4 ; =0x0000065C ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add sp, #0x10 mov r0, #3 pop {r4, pc} @@ -6295,7 +6295,7 @@ _02230982: bl FUN_02001C5C ldr r0, _022309E4 ; =0x0000065C ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r1, _022309DC ; =MOD71_0222F538 ldr r0, _022309E0 ; =0x00002214 str r1, [r4, r0] @@ -6379,8 +6379,8 @@ _02230A40: cmp r0, #0 bne _02230A98 ldr r0, [r5, #0x10] - bl FUN_02029EF8 - bl FUN_02029F08 + bl Sav2_Chatot_get + bl Chatot_invalidate _02230A98: ldr r0, [r5, #0x10] add r1, r4, #0 @@ -6627,7 +6627,7 @@ MOD71_02230C48: ; 0x02230C48 bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #1 add r1, r5, #0 str r2, [sp] @@ -6646,7 +6646,7 @@ MOD71_02230C48: ; 0x02230C48 add r0, r5, #0 add r0, #0x10 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x15 str r0, [sp] mov r0, #5 @@ -6666,7 +6666,7 @@ MOD71_02230C48: ; 0x02230C48 add r0, r5, #0 add r0, #0x60 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 bl Options_GetFrame lsl r0, r0, #0x18 @@ -6706,7 +6706,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #4 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0xe @@ -6728,7 +6728,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #4 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -6750,7 +6750,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #4 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x11 str r0, [sp] mov r0, #0xb @@ -6771,7 +6771,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #6 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0xb @@ -6792,7 +6792,7 @@ MOD71_02230C48: ; 0x02230C48 lsl r0, r0, #4 add r0, r5, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r4, _02230E80 ; =0x022313F4 mov r7, #0 mov r6, #0x33 @@ -6824,7 +6824,7 @@ _02230DE2: ldr r0, [sp, #0x18] mov r1, #0 add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r6, #0x10 add r4, r4, #4 @@ -6861,7 +6861,7 @@ _02230E2C: bl FUN_02019064 add r0, r5, r7 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, #0xa cmp r6, #8 @@ -6995,7 +6995,7 @@ _02230F6A: _02230F76: add r0, r5, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] ldr r0, _02230FAC ; =0x0001020F @@ -7127,7 +7127,7 @@ MOD71_02231018: ; 0x02231018 mov r3, #0x1a str r5, [sp, #0x14] str r4, [sp, #0x20] - bl FUN_020010A8 + bl ListMenuInit add sp, #0x34 pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index d5105d7e..7d9850cc 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -661,7 +661,7 @@ MOD73_021D79E8: ; 0x021D79E8 bl MOD73_021D90D0 cmp r0, #0 bne _021D7A3C - bl ErrorHandling + bl GF_AssertFail _021D7A3C: ldr r0, [r4, #0xc] pop {r4, pc} @@ -869,7 +869,7 @@ _021D7BC6: bl MOD73_021D90D0 cmp r0, #0 bne _021D7C0C - bl ErrorHandling + bl GF_AssertFail _021D7C0C: add r0, r6, #0 bl FreeToHeap @@ -902,14 +902,14 @@ _021D7C1A: bl MOD73_021D90D0 cmp r0, #0 bne _021D7C54 - bl ErrorHandling + bl GF_AssertFail _021D7C54: ldr r0, [r4, #0xc] add sp, #0xc add r0, r0, #1 pop {r3, r4, r5, r6, pc} _021D7C5C: - bl ErrorHandling + bl GF_AssertFail _021D7C60: ldr r0, [r4, #0xc] add sp, #0xc @@ -1204,7 +1204,7 @@ _021D7EA8: bl MOD73_021D90D0 cmp r0, #0 bne _021D7ECE - bl ErrorHandling + bl GF_AssertFail _021D7ECE: ldr r0, [r4, #0xc] add sp, #0xc @@ -1255,14 +1255,14 @@ _021D7F0C: bl MOD73_021D90D0 cmp r0, #0 bne _021D7F32 - bl ErrorHandling + bl GF_AssertFail _021D7F32: ldr r0, [r4, #0xc] add sp, #0xc add r0, r0, #1 pop {r3, r4, r5, r6, pc} _021D7F3A: - bl ErrorHandling + bl GF_AssertFail _021D7F3E: ldr r0, [r4, #0xc] add sp, #0xc @@ -2019,7 +2019,7 @@ MOD73_021D856C: ; 0x021D856C ldr r0, [r4, r0] cmp r0, #0 bne _021D857C - bl ErrorHandling + bl GF_AssertFail _021D857C: ldr r0, _021D858C ; =0x0000152C ldr r0, [r4, r0] @@ -2366,9 +2366,9 @@ MOD73_021D8858: ; 0x021D8858 mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 - bl FUN_020BB394 - bl FUN_020B02C8 + bl NNS_G3dGeBufferOP_N + bl NNS_G3dGeFlushBuffer + bl NNS_G2dSetupSoftwareSpriteCamera mov r0, #0xaf lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2380,7 +2380,7 @@ _021D8882: mov r0, #0x12 add r1, sp, #0 str r2, [sp] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N mov r0, #0 add r1, r0, #0 bl FUN_020222B4 @@ -2595,7 +2595,7 @@ MOD73_021D8A18: ; 0x021D8A18 push {r4, r5, lr} sub sp, #0x24 add r4, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -2754,7 +2754,7 @@ _021D8B3A: MOD73_021D8B4C: ; 0x021D8B4C push {r3, r4, lr} sub sp, #4 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _021D8BB8 ; =0x04000060 ldr r2, _021D8BBC ; =0xFFFFCFFD @@ -2793,11 +2793,11 @@ MOD73_021D8B4C: ; 0x021D8B4C str r0, [r2] str r1, [r2, #0x40] mov r1, #1 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #2 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager add sp, #4 pop {r3, r4, pc} nop @@ -2812,8 +2812,8 @@ _021D8BCC: .word 0xBFFF0000 thumb_func_start MOD73_021D8BD0 MOD73_021D8BD0: ; 0x021D8BD0 push {r3, lr} - bl FUN_020AEAF4 - bl FUN_020AEC60 + bl NNS_GfdResetFrmTexVramState + bl NNS_GfdResetFrmPlttVramState pop {r3, pc} thumb_func_end MOD73_021D8BD0 @@ -3622,7 +3622,7 @@ _021D91F2: _021D91FA: cmp r4, #0 bne _021D9202 - bl ErrorHandling + bl GF_AssertFail _021D9202: mov r0, #0x1a lsl r0, r0, #4 @@ -3636,11 +3636,11 @@ _021D9202: blx r0 cmp r0, r5 beq _021D921E - bl ErrorHandling + bl GF_AssertFail _021D921E: cmp r5, #0x26 blt _021D9226 - bl ErrorHandling + bl GF_AssertFail _021D9226: sub r7, #0x16 str r7, [r4, #4] @@ -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] @@ -3865,7 +3865,7 @@ MOD73_021D9340: ; 0x021D9340 bl FUN_02009B78 cmp r0, #0 bne _021D93D0 - bl ErrorHandling + bl GF_AssertFail _021D93D0: ldr r0, [r4] bl FUN_02009474 @@ -3873,7 +3873,7 @@ _021D93D0: bl FUN_02009D68 cmp r0, #0 bne _021D93E4 - bl ErrorHandling + bl GF_AssertFail _021D93E4: ldr r0, [r4, #4] bl FUN_02009474 @@ -3969,7 +3969,7 @@ MOD73_021D942C: ; 0x021D942C bl FUN_02009B78 cmp r0, #0 bne _021D94AA - bl ErrorHandling + bl GF_AssertFail _021D94AA: ldr r0, [r4] bl FUN_02009474 @@ -4072,7 +4072,7 @@ MOD73_021D9540: ; 0x021D9540 bl FUN_0201FF84 add r4, r0, #0 bne _021D956E - bl ErrorHandling + bl GF_AssertFail _021D956E: add r0, r4, #0 add sp, #0x20 @@ -4274,7 +4274,7 @@ MOD73_021D96C8: ; 0x021D96C8 ldr r0, [r4] cmp r0, #0 beq _021D96D6 - bl ErrorHandling + bl GF_AssertFail _021D96D6: mov r2, #0x1f add r0, r4, #0 @@ -4389,7 +4389,7 @@ MOD73_021D97A4: ; 0x021D97A4 str r1, [sp] cmp r0, #1 beq _021D97B4 - bl ErrorHandling + bl GF_AssertFail _021D97B4: mov r0, #0x42 lsl r0, r0, #2 @@ -4430,7 +4430,7 @@ MOD73_021D97F0: ; 0x021D97F0 ldr r0, [r0, #4] cmp r0, #0 beq _021D9800 - bl ErrorHandling + bl GF_AssertFail _021D9800: mov r0, #0 str r0, [sp, #0xc] @@ -4668,7 +4668,7 @@ _021D99BE: str r1, [r4, r0] b _021D99E4 _021D99E0: - bl ErrorHandling + bl GF_AssertFail _021D99E4: ldr r0, [sp] add r4, r4, #4 @@ -4735,7 +4735,7 @@ MOD73_021D9A4C: ; 0x021D9A4C ldr r0, [r4, #0x30] cmp r0, #0 beq _021D9A5A - bl ErrorHandling + bl GF_AssertFail _021D9A5A: add r0, r4, #0 mov r1, #0 @@ -4754,7 +4754,7 @@ MOD73_021D9A68: ; 0x021D9A68 add r6, r2, #0 cmp r0, #0 beq _021D9A7A - bl ErrorHandling + bl GF_AssertFail _021D9A7A: add r0, r5, #0 add r1, r6, #0 @@ -4776,7 +4776,7 @@ MOD73_021D9A94: ; 0x021D9A94 ldr r0, [r4, #0x30] cmp r0, #1 beq _021D9AA2 - bl ErrorHandling + bl GF_AssertFail _021D9AA2: add r0, r4, #0 bl MOD73_021D9C7C @@ -4805,7 +4805,7 @@ MOD73_021D9AC8: ; 0x021D9AC8 add r4, r0, #0 ldr r0, [r4, #8] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4, #0x18] mov r2, #0 ldr r0, [r4, #8] @@ -4947,11 +4947,11 @@ MOD73_021D9BE0: ; 0x021D9BE0 add r5, r0, #0 add r0, r4, #0 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r5, #8] add r0, r4, #0 mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r5, #0xc] mov r0, #0x13 str r0, [sp] @@ -4984,10 +4984,10 @@ MOD73_021D9BE0: ; 0x021D9BE0 bl FUN_02019064 ldr r0, [r5, #8] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0xc] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r5, #0x10] mov r1, #4 lsl r0, r0, #0x18 @@ -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 @@ -5172,7 +5172,7 @@ MOD73_021D9DA0: ; 0x021D9DA0 ldr r0, [r4] cmp r0, #0 beq _021D9DAE - bl ErrorHandling + bl GF_AssertFail _021D9DAE: mov r0, #0 strb r0, [r4] @@ -5229,7 +5229,7 @@ MOD73_021D9E08: ; 0x021D9E08 ldr r0, [r4] cmp r0, #1 beq _021D9E16 - bl ErrorHandling + bl GF_AssertFail _021D9E16: ldr r0, [r4, #8] bl FUN_0201FFC8 @@ -5309,7 +5309,7 @@ MOD73_021D9E8C: ; 0x021D9E8C ldr r0, [r4, #0x74] cmp r0, #0 beq _021D9E9A - bl ErrorHandling + bl GF_AssertFail _021D9E9A: add r0, r4, #0 mov r1, #0 @@ -5329,7 +5329,7 @@ MOD73_021D9EA8: ; 0x021D9EA8 str r1, [sp, #0xc] cmp r0, #0 beq _021D9EBC - bl ErrorHandling + bl GF_AssertFail _021D9EBC: ldr r4, _021D9F5C ; =0x021DBDE4 ldr r5, [sp, #8] @@ -5425,7 +5425,7 @@ MOD73_021D9F74: ; 0x021D9F74 ldr r0, [r6, #0x74] cmp r0, #1 beq _021D9F82 - bl ErrorHandling + bl GF_AssertFail _021D9F82: mov r4, #0 add r5, r6, #0 @@ -5468,7 +5468,7 @@ MOD73_021D9FC0: ; 0x021D9FC0 add r6, r2, #0 cmp r4, #8 blo _021D9FD0 - bl ErrorHandling + bl GF_AssertFail _021D9FD0: lsl r0, r4, #2 add r0, r5, r0 @@ -5525,7 +5525,7 @@ MOD73_021DA01C: ; 0x021DA01C add r6, r2, #0 cmp r4, #8 blo _021DA02C - bl ErrorHandling + bl GF_AssertFail _021DA02C: lsl r0, r4, #2 add r0, r5, r0 @@ -5616,7 +5616,7 @@ _021DA0B2: str r0, [r5, #0x6c] pop {r3, r4, r5, r6, r7, pc} _021DA0CE: - bl ErrorHandling + bl GF_AssertFail _021DA0D2: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -5649,7 +5649,7 @@ MOD73_021DA0FC: ; 0x021DA0FC ldr r0, [r4] cmp r0, #0 beq _021DA10A - bl ErrorHandling + bl GF_AssertFail _021DA10A: add r0, r4, #0 mov r1, #0 @@ -5826,7 +5826,7 @@ MOD73_021DA234: ; 0x021DA234 ldr r0, [r4, #0x28] cmp r0, #0 beq _021DA242 - bl ErrorHandling + bl GF_AssertFail _021DA242: add r0, r4, #0 bl MOD73_021DA4AC @@ -5846,7 +5846,7 @@ MOD73_021DA254: ; 0x021DA254 add r6, r2, #0 cmp r0, #0 beq _021DA266 - bl ErrorHandling + bl GF_AssertFail _021DA266: add r0, r5, #0 add r1, r6, #0 @@ -5874,7 +5874,7 @@ MOD73_021DA290: ; 0x021DA290 ldr r0, [r4, #0x28] cmp r0, #1 beq _021DA29E - bl ErrorHandling + bl GF_AssertFail _021DA29E: add r0, r4, #0 bl MOD73_021DA354 @@ -5924,7 +5924,7 @@ MOD73_021DA2AC: ; 0x021DA2AC _021DA2FA: ldr r0, [sp, #0x14] mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r4, #8] ldrh r0, [r5, #2] mov r2, #2 @@ -5953,7 +5953,7 @@ _021DA2FA: bl FUN_02019064 ldr r0, [r4, #8] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, r4, #4 add r5, #0xc @@ -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] @@ -6088,7 +6088,7 @@ MOD73_021DA434: ; 0x021DA434 add r4, r1, #0 cmp r0, #0 beq _021DA446 - bl ErrorHandling + bl GF_AssertFail _021DA446: mov r2, #1 ldr r0, _021DA494 ; =MOD73_021DA408 @@ -6099,7 +6099,7 @@ _021DA446: mov r1, #0 str r1, [r5, #0x30] ldr r0, [r5, #8] - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] ldr r0, _021DA498 ; =0x0001020F @@ -6173,7 +6173,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 bl FUN_02018744 ldr r0, [r4, #0xc] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] ldr r0, _021DA54C ; =0x0001020F @@ -6192,7 +6192,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 bl FUN_0200CCA4 ldr r0, [r4, #0x10] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] ldr r0, _021DA54C ; =0x0001020F @@ -6494,7 +6494,7 @@ MOD73_021DA770: ; 0x021DA770 ldr r0, [r4, #0x14] add r6, r1, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r6, #6 bhi _021DA7EC add r0, r6, r6 @@ -6597,7 +6597,7 @@ MOD73_021DA82C: ; 0x021DA82C ldr r0, [r4] cmp r0, #0 beq _021DA83A - bl ErrorHandling + bl GF_AssertFail _021DA83A: ldr r2, _021DA848 ; =0x00000414 add r0, r4, #0 @@ -6709,7 +6709,7 @@ MOD73_021DA8BC: ; 0x021DA8BC str r0, [sp, #0x60] cmp r0, #0 bne _021DA900 - bl ErrorHandling + bl GF_AssertFail _021DA900: ldr r0, [sp, #0x60] bl MOD73_021DAB30 @@ -6738,7 +6738,7 @@ _021DA906: str r0, [sp, #0x6c] asr r0, r0, #0x1f lsl r3, r2, #1 - ldr r1, _021DAAA0 ; =UNK_020FFA38 + ldr r1, _021DAAA0 ; =FX_SinCosTable_ str r0, [sp, #0x70] ldr r0, [sp, #0xa8] ldrsh r6, [r1, r3] @@ -6904,7 +6904,7 @@ _021DA906: pop {r3, r4, r5, r6, r7, pc} nop _021DAA9C: .word MOD73_021DBE7C -_021DAAA0: .word UNK_020FFA38 +_021DAAA0: .word FX_SinCosTable_ _021DAAA4: .word 0x0000019A thumb_func_end MOD73_021DA8BC @@ -7001,7 +7001,7 @@ MOD73_021DAB30: ; 0x021DAB30 ldr r0, [r4, #0x78] cmp r0, #0 bne _021DAB3E - bl ErrorHandling + bl GF_AssertFail _021DAB3E: ldr r0, [r4, #0x78] bl FUN_0201FFC8 @@ -7130,7 +7130,7 @@ _021DABFC: lsl r4, r0, #1 add r0, r4, #1 lsl r1, r0, #1 - ldr r0, _021DAC98 ; =UNK_020FFA38 + ldr r0, _021DAC98 ; =FX_SinCosTable_ add r2, r6, #0 ldrsh r0, [r0, r1] add r3, r7, #0 @@ -7146,7 +7146,7 @@ _021DABFC: lsr r0, r0, #0xc orr r0, r1 str r0, [sp] - ldr r0, _021DAC98 ; =UNK_020FFA38 + ldr r0, _021DAC98 ; =FX_SinCosTable_ lsl r1, r4, #1 ldrsh r0, [r0, r1] add r2, r6, #0 @@ -7177,7 +7177,7 @@ _021DAC94: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_021DAC98: .word UNK_020FFA38 +_021DAC98: .word FX_SinCosTable_ thumb_func_end MOD73_021DABD0 thumb_func_start MOD73_021DAC9C @@ -7236,7 +7236,7 @@ MOD73_021DAC9C: ; 0x021DAC9C str r0, [r5, #0x78] cmp r0, #0 bne _021DAD14 - bl ErrorHandling + bl GF_AssertFail _021DAD14: ldr r0, [r5, #0xc] cmp r0, #0 @@ -7307,7 +7307,7 @@ MOD73_021DAD84: ; 0x021DAD84 ldr r0, [r4, #0x7c] cmp r0, #0 beq _021DAD92 - bl ErrorHandling + bl GF_AssertFail _021DAD92: add r0, r4, #0 mov r1, #0 @@ -7327,7 +7327,7 @@ MOD73_021DADA0: ; 0x021DADA0 str r2, [sp, #0x18] cmp r0, #0 beq _021DADB4 - bl ErrorHandling + bl GF_AssertFail _021DADB4: str r7, [r6] mov r0, #2 @@ -7391,7 +7391,7 @@ MOD73_021DAE24: ; 0x021DAE24 ldr r0, [r6, #0x7c] cmp r0, #1 beq _021DAE32 - bl ErrorHandling + bl GF_AssertFail _021DAE32: mov r4, #0 add r5, r6, #0 @@ -7444,7 +7444,7 @@ MOD73_021DAE7C: ; 0x021DAE7C add r4, r0, #0 cmp r5, #4 blt _021DAE8A - bl ErrorHandling + bl GF_AssertFail _021DAE8A: cmp r5, #2 beq _021DAE92 @@ -7472,7 +7472,7 @@ MOD73_021DAEAC: ; 0x021DAEAC add r4, r0, #0 cmp r5, #4 blt _021DAEBA - bl ErrorHandling + bl GF_AssertFail _021DAEBA: lsl r0, r5, #4 mov r1, #0 @@ -7491,7 +7491,7 @@ MOD73_021DAECC: ; 0x021DAECC add r4, r0, #0 cmp r5, #4 blt _021DAEDA - bl ErrorHandling + bl GF_AssertFail _021DAEDA: lsl r0, r5, #4 add r0, r4, r0 @@ -7609,7 +7609,7 @@ MOD73_021DAF88: ; 0x021DAF88 ldr r0, [r4] cmp r0, #0 beq _021DAF96 - bl ErrorHandling + bl GF_AssertFail _021DAF96: ldr r2, _021DAFA4 ; =0x0000090C add r0, r4, #0 @@ -7706,7 +7706,7 @@ MOD73_021DB020: ; 0x021DB020 asr r0, r0, #4 lsl r1, r0, #1 add r0, r1, #1 - ldr r7, _021DB124 ; =UNK_020FFA38 + ldr r7, _021DB124 ; =FX_SinCosTable_ lsl r0, r0, #1 ldrsh r3, [r7, r0] asr r6, r3, #0x1f @@ -7819,7 +7819,7 @@ _021DB112: add sp, #0x1c pop {r4, r5, r6, r7, pc} nop -_021DB124: .word UNK_020FFA38 +_021DB124: .word FX_SinCosTable_ _021DB128: .word 0x00000000 thumb_func_end MOD73_021DB020 @@ -8442,7 +8442,7 @@ MOD73_021DB56C: ; 0x021DB56C add r4, r0, #0 cmp r5, #3 blt _021DB57A - bl ErrorHandling + bl GF_AssertFail _021DB57A: str r5, [r4] mov r0, #0 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 1fce128e..651527c1 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -341,7 +341,7 @@ MOD74_021D7784: ; 0x021D7784 push {r4, lr} add r4, r0, #0 bl MOD74_021D82E8 - bl FUN_020AEEB8 + bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x10] bl FUN_0201AB60 ldr r3, _021D77A4 ; =0x027E0000 @@ -771,7 +771,7 @@ _021D7A9A: bl FUN_02019150 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r4, #8 add r5, #0x10 @@ -790,7 +790,7 @@ _021D7AC0: bl FUN_02019150 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r4, #8 add r5, #0x10 @@ -1343,7 +1343,7 @@ MOD74_021D7F44: ; 0x021D7F44 mov r1, #0 add r5, r2, #0 add r4, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r4, #8 blo _021D7F8C mov r0, #2 @@ -1637,7 +1637,7 @@ MOD74_021D818C: ; 0x021D818C add r0, r4, #0 add r0, #0x8c mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #4 str r0, [sp] mov r1, #0 @@ -1664,7 +1664,7 @@ MOD74_021D81E0: ; 0x021D81E0 add r4, r0, #0 add r0, #0x8c mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x8c bl FUN_02019570 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 1a9861c9..3500c458 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -759,7 +759,7 @@ MOD75_021E71BC: ; 0x021E71BC bl FUN_020178A0 mov r0, #6 add r1, r4, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit pop {r4, pc} .align 2, 0 thumb_func_end MOD75_021E71BC @@ -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 @@ -1233,7 +1233,7 @@ MOD75_021E7580: ; 0x021E7580 ldrb r0, [r0, r1] mov r1, #6 add r0, r0, #3 - bl ListMenu_ctor + bl ListMenuItems_ctor mov r1, #0x16 lsl r1, r1, #4 str r0, [r5, r1] @@ -1243,7 +1243,7 @@ MOD75_021E7580: ; 0x021E7580 add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x23 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldrb r3, [r4, #8] cmp r3, #3 bne _021E764A @@ -1280,7 +1280,7 @@ _021E75CE: ldr r0, [r5, r0] ldr r1, [r7, r1] add r2, r6, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem ldr r0, [sp] ldrb r1, [r4, #8] add r0, r0, #4 @@ -1300,7 +1300,7 @@ _021E761A: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x22 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData mov r1, #0x16 lsl r1, r1, #4 ldr r0, [r5, r1] @@ -1309,7 +1309,7 @@ _021E761A: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x23 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r6, #3 add sp, #8 strb r0, [r4, #9] @@ -1348,7 +1348,7 @@ _021E7658: ldr r0, [r5, r0] ldr r1, [r7, r1] add r2, r6, #0 - bl ListMenu_AddItem + bl ListMenuItems_AddItem ldr r0, [sp, #4] ldrb r3, [r4, #8] add r0, r0, #4 @@ -1377,7 +1377,7 @@ _021E76A4: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x22 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _021E76E0 _021E76CC: mov r1, #0x16 @@ -1388,7 +1388,7 @@ _021E76CC: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x2b - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData _021E76E0: mov r1, #0x16 lsl r1, r1, #4 @@ -1398,7 +1398,7 @@ _021E76E0: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x23 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r6, #3 add sp, #8 strb r0, [r4, #9] @@ -1412,7 +1412,7 @@ _021E76FC: add r3, r2, #0 ldr r1, [r5, r1] sub r3, #0x23 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r6, #2 strb r0, [r4, #9] add sp, #8 @@ -1606,7 +1606,7 @@ _021E784E: add r1, r3, #0 add r0, sp, #0 mov r3, #6 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0x57 lsl r1, r1, #2 str r0, [r4, r1] @@ -1624,7 +1624,7 @@ MOD75_021E7870: ; 0x021E7870 add r7, r1, #0 mov r1, #0x13 add r4, r2, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField add r5, r0, #0 cmp r4, #1 beq _021E78F8 @@ -1693,7 +1693,7 @@ _021E78F8: add r0, r5, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #1 mvn r1, r1 cmp r7, r1 @@ -1751,7 +1751,7 @@ MOD75_021E797C: ; 0x021E797C mov r1, #0x13 str r0, [sp] add r7, r2, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField add r4, r0, #0 add r0, #0xc4 ldr r0, [r0] @@ -1773,14 +1773,14 @@ MOD75_021E797C: ; 0x021E797C mov r1, #8 mov r2, #0 mov r3, #9 - bl FUN_020013E8 + bl ListMenuOverrideSetColors b _021E79C6 _021E79BA: ldr r0, [sp] mov r1, #1 mov r2, #0 mov r3, #2 - bl FUN_020013E8 + bl ListMenuOverrideSetColors _021E79C6: ldrb r0, [r6, #8] cmp r0, #7 @@ -1911,11 +1911,11 @@ MOD75_021E7AA4: ; 0x021E7AA4 add r3, #8 add r1, r1, r2 add r2, r3, r2 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #0x57 mov r1, #0 lsl r0, r0, #2 @@ -1959,7 +1959,7 @@ _021E7B12: add r0, r4, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 bl FUN_02019570 @@ -2019,7 +2019,7 @@ MOD75_021E7B7C: ; 0x021E7B7C ldr r0, [r5, r0] add r1, r4, #6 add r2, r4, #4 - bl FUN_02001448 + bl ListMenuGetScrollAndRow ldr r0, _021E7CD8 ; =gMain ldr r1, [r0, #0x48] mov r0, #4 @@ -2038,7 +2038,7 @@ _021E7BC0: mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 mov r0, #0x57 lsl r0, r0, #2 @@ -2046,7 +2046,7 @@ _021E7BC0: ldr r0, [r5, r0] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, sp, #0 ldrh r2, [r0] ldrh r0, [r4, #4] @@ -2085,7 +2085,7 @@ _021E7BFC: lsl r1, r1, #0x10 ldr r0, [r5, r0] lsr r1, r1, #0x10 - bl FUN_02001464 + bl ListMenuGetValueByArrayId add r6, r0, #0 mov r0, #0x49 mov r1, #1 @@ -2102,7 +2102,7 @@ _021E7C38: mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_0200145C + bl ListMenuGetUnk33 cmp r0, #1 bne _021E7C5E add r0, r5, #0 @@ -2396,11 +2396,11 @@ MOD75_021E7E60: ; 0x021E7E60 bl MOD75_021E7AA4 add r0, r4, #4 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #4 bl FUN_02019220 add r0, r4, #0 @@ -2830,11 +2830,11 @@ _021E81D2: add r3, #8 add r1, r1, r2 add r2, r3, r2 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor _021E8206: add r0, r5, #0 add r0, #0xc4 @@ -3643,7 +3643,7 @@ MOD75_021E8808: ; 0x021E8808 add r1, r2, r1 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_02001464 + bl ListMenuGetValueByArrayId mov r1, #1 mvn r1, r1 cmp r0, r1 @@ -3701,7 +3701,7 @@ MOD75_021E8864: ; 0x021E8864 lsl r0, r0, #2 ldrb r1, [r4, r1] ldr r0, [r4, r0] - bl FUN_02001464 + bl ListMenuGetValueByArrayId ldr r1, _021E88B8 ; =0x0000047C str r0, [r4, r1] add r0, r4, #0 @@ -3709,7 +3709,7 @@ MOD75_021E8864: ; 0x021E8864 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02001328 + bl RedrawListMenu add r0, r4, #0 bl MOD75_021E8AAC pop {r4, pc} @@ -3744,7 +3744,7 @@ _021E88D0: ldr r0, [r5, r0] add r1, r4, #6 add r2, r4, #4 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, r5, #0 bl MOD75_021E87B8 cmp r0, #1 @@ -3776,7 +3776,7 @@ _021E892E: mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 mov r0, #0x57 lsl r0, r0, #2 @@ -3784,7 +3784,7 @@ _021E892E: ldr r0, [r5, r0] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow add r0, sp, #0 ldrh r2, [r0] ldrh r0, [r4, #4] @@ -3816,7 +3816,7 @@ _021E896A: mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_0200145C + bl ListMenuGetUnk33 cmp r0, #1 bne _021E899A add r0, r5, #0 @@ -3900,7 +3900,7 @@ MOD75_021E89F0: ; 0x021E89F0 mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r4, #0 bl MOD75_021E7580 _021E8A3C: @@ -3928,7 +3928,7 @@ MOD75_021E8A48: ; 0x021E8A48 ldr r0, [r5, r0] add r1, r4, #6 add r2, r4, #4 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x57 mov r1, #0 lsl r0, r0, #2 @@ -4455,7 +4455,7 @@ MOD75_021E8E1C: ; 0x021E8E1C add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021E8EA8 ; =0x000003D9 add r0, #0x64 @@ -4567,7 +4567,7 @@ _021E8F3A: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021E8FB8 ; =0x000003D9 add r0, #0x64 @@ -4686,7 +4686,7 @@ _021E9046: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021E91A8 ; =0x000003D9 add r0, #0x64 @@ -4726,7 +4726,7 @@ _021E908E: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x46 mov r1, #0xfe lsl r0, r0, #2 @@ -5022,11 +5022,11 @@ MOD75_021E92BC: ; 0x021E92BC add r3, #8 add r1, r1, r2 add r2, r3, r2 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r4, #0 bl MOD75_021E7580 add r0, r4, #0 @@ -5102,7 +5102,7 @@ MOD75_021E9394: ; 0x021E9394 _021E93AA: add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021E942C ; =0x000003D9 add r0, #0x64 @@ -5473,7 +5473,7 @@ _021E967A: add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl MOD75_021EB660 ldr r1, _021E9718 ; =0x00000426 @@ -5608,7 +5608,7 @@ MOD75_021E97A8: ; 0x021E97A8 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02001328 + bl RedrawListMenu add r0, r4, #0 bl MOD75_021EB344 add r0, r4, #0 @@ -5633,7 +5633,7 @@ MOD75_021E97E4: ; 0x021E97E4 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02001328 + bl RedrawListMenu add r0, r4, #0 bl MOD75_021EB344 add r0, r4, #0 @@ -5711,7 +5711,7 @@ _021E9872: add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 ldr r2, _021E9928 ; =0x000003D9 add r0, #0x64 @@ -5864,7 +5864,7 @@ _021E99C6: add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 ldr r2, _021E9B3C ; =0x000003D9 add r0, #0x64 @@ -6100,7 +6100,7 @@ _021E9BAC: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6195,7 +6195,7 @@ _021E9C80: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6405,7 +6405,7 @@ _021E9E2A: add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl MOD75_021EB660 ldr r1, _021E9EDC ; =0x00000426 @@ -6654,7 +6654,7 @@ _021EA016: add r0, r4, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 ldr r2, _021EA0C4 ; =0x000003D9 add r0, #0x64 @@ -7055,7 +7055,7 @@ MOD75_021EA328: ; 0x021EA328 ldrh r3, [r3] ldr r0, [r4, r0] mov r1, #0 - bl FUN_02001354 + bl ListMenuTestInputInternal add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] @@ -7207,7 +7207,7 @@ MOD75_021EA444: ; 0x021EA444 ldrh r3, [r3] ldr r0, [r4, r0] mov r1, #0 - bl FUN_02001354 + bl ListMenuTestInputInternal add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] @@ -7755,7 +7755,7 @@ MOD75_021EA8BC: ; 0x021EA8BC add r4, r0, #0 add r0, #0x24 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r2, r4, #0 add r2, #0xc4 ldr r6, [r2] @@ -7834,7 +7834,7 @@ MOD75_021EA950: ; 0x021EA950 bl NARC_AllocAndReadWholeMember add r1, r5, #0 add r4, r0, #0 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData add r0, r4, #0 pop {r3, r4, r5, pc} thumb_func_end MOD75_021EA950 @@ -7898,13 +7898,13 @@ _021EA9A8: ldr r1, [r1, #0x14] add r0, #0x54 mov r3, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow add r5, #0x54 add r0, r5, #0 bl FUN_02019220 mov r0, #6 add r1, r7, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -7922,7 +7922,7 @@ MOD75_021EA9F8: ; 0x021EA9F8 add r0, r5, #0 add r0, #0x54 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _021EAAA0 ; =0x00000424 mov r4, #0 ldrb r0, [r5, r0] @@ -7979,7 +7979,7 @@ _021EAA4C: add r0, r6, #0 ldr r1, [r1, #0x14] mov r3, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -7993,7 +7993,7 @@ _021EAA8C: bl FUN_02019220 ldr r1, [sp, #0x18] mov r0, #6 - bl FUN_02016A8C + bl FreeToHeapExplicit add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -8587,7 +8587,7 @@ MOD75_021EAF54: ; 0x021EAF54 bl NARC_AllocAndReadWholeMember add r1, r5, #0 add r4, r0, #0 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData add r0, r4, #0 pop {r3, r4, r5, pc} thumb_func_end MOD75_021EAF54 @@ -8617,10 +8617,10 @@ MOD75_021EAF70: ; 0x021EAF70 add r0, r5, #4 ldr r1, [r1, #0x14] mov r2, #0x28 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r0, #6 add r1, r6, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit add sp, #0x1c pop {r3, r4, r5, r6, pc} thumb_func_end MOD75_021EAF70 @@ -8646,7 +8646,7 @@ MOD75_021EAFB0: ; 0x021EAFB0 add r0, r5, #4 add r2, r1, #0 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 str r4, [sp] mov r0, #0xff @@ -8692,10 +8692,10 @@ MOD75_021EB004: ; 0x021EB004 add r0, r5, #4 ldr r1, [r1, #0x14] add r3, r2, #0 - bl FUN_02019658 + bl BlitBitmapRectToWindow mov r0, #6 add r1, r6, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit add sp, #0x1c pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -8881,7 +8881,7 @@ _021EB180: _021EB1B0: add r0, r7, #0 mov r1, #6 - bl ListMenu_ctor + bl ListMenuItems_ctor mov r1, #0x55 lsl r1, r1, #2 mov r4, #0 @@ -8901,7 +8901,7 @@ _021EB1C4: lsl r1, r1, #2 ldr r0, [r5, r0] ldr r1, [r3, r1] - bl ListMenu_AddItem + bl ListMenuItems_AddItem add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -8971,7 +8971,7 @@ _021EB22E: add r0, r5, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r1, r5, #0 add r1, #0xc4 ldr r1, [r1] @@ -9001,7 +9001,7 @@ _021EB298: bl FUN_0200D0BC add r0, r4, r6 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9112,14 +9112,14 @@ _021EB37A: mov r0, #0x55 lsl r0, r0, #2 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor add r0, r5, #0 add r0, #0xb4 bl FUN_02019178 add r0, r5, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r1, r5, #0 add r1, #0xc4 ldr r1, [r1] @@ -9144,7 +9144,7 @@ MOD75_021EB3D8: ; 0x021EB3D8 add r5, r0, #0 add r0, #0x14 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9214,7 +9214,7 @@ MOD75_021EB454: ; 0x021EB454 add r0, r5, #0 add r0, #0x34 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9280,7 +9280,7 @@ MOD75_021EB504: ; 0x021EB504 add r4, #0x94 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9365,7 +9365,7 @@ MOD75_021EB5B0: ; 0x021EB5B0 add r0, r5, #0 add r0, #0x64 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9543,7 +9543,7 @@ MOD75_021EB708: ; 0x021EB708 _021EB722: add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9654,7 +9654,7 @@ MOD75_021EB808: ; 0x021EB808 bne _021EB854 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021EB8E4 ; =0x000003F7 add r0, r4, #0 mov r1, #1 @@ -9686,7 +9686,7 @@ _021EB854: mov r1, #0xf mov r2, #0 str r3, [sp, #4] - bl FUN_020196F4 + bl FillWindowPixelRect _021EB866: mov r0, #0x45 lsl r0, r0, #2 @@ -9755,7 +9755,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 add r4, #0xa4 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r2, _021EB9B0 ; =0x000003F7 add r0, r4, #0 mov r1, #1 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 13ddf00c..fc6dc5bd 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -382,7 +382,7 @@ MOD76_021D77E4: ; 0x021D77E4 bl FUN_020178A0 mov r0, #0x43 add r1, r4, #0 - bl FUN_02016A8C + bl FreeToHeapExplicit pop {r4, pc} .align 2, 0 thumb_func_end MOD76_021D77E4 @@ -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 @@ -467,7 +467,7 @@ _021D78A8: bl FUN_02019150 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -478,7 +478,7 @@ _021D78A8: add r0, r7, #0 add r0, #0xc8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, #0xc8 add r0, r7, #0 mov r1, #0 @@ -596,11 +596,11 @@ _021D799C: ldr r0, [r5, r0] add r1, #2 add r2, sp, #0 - bl FUN_02001448 + bl ListMenuGetScrollAndRow mov r0, #0x41 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 ldr r2, [r5] mov r0, #0x41 @@ -609,7 +609,7 @@ _021D799C: ldr r0, [r5, r0] add r1, #0x12 add r2, #0x10 - bl FUN_02001448 + bl ListMenuGetScrollAndRow ldr r2, [r5] add r1, sp, #0 ldrh r1, [r1, #2] @@ -1021,7 +1021,7 @@ _021D7CE8: add r1, #8 lsl r0, r4, #4 add r0, r1, r0 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #0x1b lsr r0, r0, #0x18 sub r0, r0, r6 @@ -1041,7 +1041,7 @@ _021D7D12: add r1, #8 lsl r0, r4, #4 add r0, r1, r0 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #0x1b lsr r0, r0, #0x18 sub r1, r0, r6 @@ -1257,7 +1257,7 @@ MOD76_021D7ECC: ; 0x021D7ECC strb r1, [r5, r0] ldrb r0, [r5, r0] mov r1, #0x43 - bl ListMenu_ctor + bl ListMenuItems_ctor mov r1, #0x42 lsl r1, r1, #2 str r0, [r5, r1] @@ -1287,7 +1287,7 @@ _021D7F0E: ldr r0, [r5, r0] add r1, r7, #0 add r3, r2, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _021D7F42 _021D7F2A: mov r0, #0x42 @@ -1299,7 +1299,7 @@ _021D7F2A: ldr r0, [r5, r0] ldr r1, [r1] sub r3, #0x22 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _021D7F50 _021D7F42: mov r0, #0x61 @@ -1340,7 +1340,7 @@ _021D7F50: ldrh r1, [r3, #0x12] ldrh r2, [r3, #0x10] mov r3, #0x43 - bl FUN_020010A8 + bl ListMenuInit mov r1, #0x41 lsl r1, r1, #2 str r0, [r5, r1] @@ -1365,11 +1365,11 @@ MOD76_021D7FAC: ; 0x021D7FAC ldr r0, [r4, r0] add r1, #0x12 add r2, #0x10 - bl FUN_02001300 + bl DestroyListMenu mov r0, #0x42 lsl r0, r0, #2 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor pop {r4, pc} .align 2, 0 thumb_func_end MOD76_021D7FAC @@ -1380,7 +1380,7 @@ MOD76_021D7FD0: ; 0x021D7FD0 add r5, r1, #0 mov r1, #0x13 add r6, r2, #0 - bl FUN_02001470 + bl ListMenuGetTemplateField add r4, r0, #0 cmp r6, #1 beq _021D7FE8 @@ -1418,19 +1418,19 @@ MOD76_021D800C: ; 0x021D800C add r4, r1, #0 add r0, #0xa8 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x78 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x88 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x98 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x4b lsl r0, r0, #2 ldr r0, [r5, r0] @@ -1601,7 +1601,7 @@ MOD76_021D81AC: ; 0x021D81AC add r4, r1, #0 add r0, #0xb8 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #1 mvn r1, r1 cmp r4, r1 @@ -2043,7 +2043,7 @@ MOD76_021D853C: ; 0x021D853C add r5, r1, #0 add r0, #0xc8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 add r1, r5, #0 bl MOD76_021D8354 @@ -2105,7 +2105,7 @@ _021D85BE: b _021D85D6 _021D85C6: ldr r0, _021D85E0 ; =0x00000483 - bl PlayBGM + bl PlaySound b _021D85D6 _021D85CE: ldr r0, _021D85DC ; =0x000005E6 @@ -2169,7 +2169,7 @@ MOD76_021D862C: ; 0x021D862C add r4, r0, #0 add r0, #0xc8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #0 bl MOD76_021D8354 @@ -2217,7 +2217,7 @@ MOD76_021D8688: ; 0x021D8688 add r4, r0, #0 add r0, #0xc8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #0 bl MOD76_021D8354 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index a5eaa94b..6affcb88 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -242,7 +242,7 @@ _021D76D6: _021D76FA: ldr r0, _021D7988 ; =0x0000C054 ldr r0, [r4, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 sub r0, r7, #1 cmp r6, r0 @@ -358,7 +358,7 @@ _021D77A2: _021D77DE: ldr r0, _021D7988 ; =0x0000C054 ldr r0, [r4, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 sub r0, r7, #1 cmp r6, r0 @@ -438,7 +438,7 @@ _021D7838: _021D7886: ldr r0, _021D7988 ; =0x0000C054 ldr r0, [r4, r0] - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 sub r0, r7, #1 cmp r6, r0 @@ -601,7 +601,7 @@ _021D79D0: add r0, r4, r0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _021D7B7C ; =0x0000C034 ldr r2, _021D7B80 ; =0x000001D9 add r0, r4, r0 @@ -656,7 +656,7 @@ _021D7A4E: add r0, r4, r0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _021D7B84 ; =0x0000C314 ldr r1, [r4, r0] cmp r1, #0 @@ -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 @@ -1432,7 +1432,7 @@ MOD77_021D7FAC: ; 0x021D7FAC add r0, r5, r0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _021D8224 ; =0x0000C014 ldr r2, _021D8214 ; =0x000001E2 add r0, r5, r0 @@ -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] @@ -1565,7 +1565,7 @@ MOD77_021D7FAC: ; 0x021D7FAC add r0, r5, r0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _021D8244 ; =0x0000C060 mov r1, #0xc ldr r0, [r5, r0] @@ -1671,7 +1671,7 @@ _021D82B0: mov r1, #0xf add r2, r4, #0 add r3, r4, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r0, #1 ldr r1, [r5] lsl r0, r0, #0xa @@ -1767,7 +1767,7 @@ MOD77_021D8370: ; 0x021D8370 bl FUN_02019150 ldrh r0, [r6, #0x10] ldr r1, [r5] - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _021D8404 ; =0x0000C058 mov r7, #0 str r0, [r5, r1] @@ -1782,7 +1782,7 @@ _021D8398: ldr r1, [r5, r1] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldrh r0, [r6, #0x10] add r7, r7, #1 add r4, #8 @@ -1812,7 +1812,7 @@ _021D83B2: lsl r3, r3, #0x18 add r2, r1, #0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit ldr r1, _021D8410 ; =0x0000C054 ldr r2, _021D8414 ; =0x000001D9 str r0, [r5, r1] @@ -1853,7 +1853,7 @@ MOD77_021D8418: ; 0x021D8418 str r0, [sp, #8] ldr r1, [r5] add r0, r6, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _021D84C8 ; =0x0000C058 mov r4, #0 str r0, [r5, r1] @@ -1865,7 +1865,7 @@ _021D844E: ldr r0, [r5, r0] ldr r1, [sp, #8] add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 cmp r4, r6 blo _021D844E @@ -1902,7 +1902,7 @@ _021D8462: lsl r3, r3, #0x18 add r2, r1, #0 lsr r3, r3, #0x18 - bl FUN_020010A8 + bl ListMenuInit ldr r1, _021D84D0 ; =0x0000C054 ldr r2, _021D84D4 ; =0x000001D9 str r0, [r5, r1] @@ -1937,10 +1937,10 @@ MOD77_021D84D8: ; 0x021D84D8 mov r1, #0 ldr r0, [r4, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _021D850C ; =0x0000C058 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor pop {r4, pc} .align 2, 0 _021D8504: .word 0x0000C024 @@ -1978,7 +1978,7 @@ MOD77_021D8510: ; 0x021D8510 add r0, r5, r0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _021D85CC ; =0x0000C044 ldr r2, _021D85D0 ; =0x000001D9 add r0, r5, r0 @@ -2067,7 +2067,7 @@ MOD77_021D85E0: ; 0x021D85E0 add r0, r5, r0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _021D8690 ; =0x0000C044 ldr r2, _021D8694 ; =0x000001D9 add r0, r5, r0 @@ -2159,7 +2159,7 @@ MOD77_021D86B4: ; 0x021D86B4 add r0, r5, r0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, _021D8810 ; =0x0000C060 mov r1, #0xe ldr r0, [r5, r0] @@ -2245,7 +2245,7 @@ _021D8748: add r0, r5, r0 mov r1, #0xf add r3, r2, #0 - bl FUN_020196F4 + bl FillWindowPixelRect ldr r0, [r5] add r2, r7, #0 str r0, [sp] @@ -2554,7 +2554,7 @@ MOD77_021D89F4: ; 0x021D89F4 asr r1, r1, #0x10 asr r2, r2, #0x10 asr r3, r3, #0x10 - bl FUN_020B8418 + bl NNS_G3dGlbLightVector pop {r4, pc} nop _021D8A28: .word 0x0000C2DC @@ -2567,7 +2567,7 @@ MOD77_021D8A30: ; 0x021D8A30 sub sp, #0x24 add r4, r1, #0 ldr r1, [r4, #4] - ldr r3, _021D8AA4 ; =UNK_020FFA38 + ldr r3, _021D8AA4 ; =FX_SinCosTable_ lsl r1, r1, #0x10 lsr r1, r1, #0x10 asr r1, r1, #4 @@ -2580,7 +2580,7 @@ MOD77_021D8A30: ; 0x021D8A30 add r5, r0, #0 bl MTX_RotY33_ ldr r0, [r4] - ldr r3, _021D8AA4 ; =UNK_020FFA38 + ldr r3, _021D8AA4 ; =FX_SinCosTable_ lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2597,7 +2597,7 @@ MOD77_021D8A30: ; 0x021D8A30 add r2, r5, #0 bl MTX_Concat33 ldr r0, [r4, #8] - ldr r3, _021D8AA4 ; =UNK_020FFA38 + ldr r3, _021D8AA4 ; =FX_SinCosTable_ lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2616,7 +2616,7 @@ MOD77_021D8A30: ; 0x021D8A30 add sp, #0x24 pop {r4, r5, pc} nop -_021D8AA4: .word UNK_020FFA38 +_021D8AA4: .word FX_SinCosTable_ thumb_func_end MOD77_021D8A30 thumb_func_start MOD77_021D8AA8 @@ -2625,7 +2625,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 sub sp, #0x24 add r4, r1, #0 ldr r1, [r4] - ldr r3, _021D8B1C ; =UNK_020FFA38 + ldr r3, _021D8B1C ; =FX_SinCosTable_ lsl r1, r1, #0x10 lsr r1, r1, #0x10 asr r1, r1, #4 @@ -2638,7 +2638,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add r5, r0, #0 bl MTX_RotY33_ ldr r0, [r4, #4] - ldr r3, _021D8B1C ; =UNK_020FFA38 + ldr r3, _021D8B1C ; =FX_SinCosTable_ neg r0, r0 lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -2656,7 +2656,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add r2, r5, #0 bl MTX_Concat33 ldr r0, [r4, #8] - ldr r3, _021D8B1C ; =UNK_020FFA38 + ldr r3, _021D8B1C ; =FX_SinCosTable_ lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2675,7 +2675,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add sp, #0x24 pop {r4, r5, pc} .align 2, 0 -_021D8B1C: .word UNK_020FFA38 +_021D8B1C: .word FX_SinCosTable_ thumb_func_end MOD77_021D8AA8 thumb_func_start MOD77_021D8B20 diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 5d9f4625..7fc7439a 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -66,13 +66,13 @@ _021D7558: ldrsh r2, [r3, r7] ldrsh r3, [r3, r6] add r0, r4, #0 - bl FUN_020B8418 + bl NNS_G3dGlbLightVector ldr r2, [r5, #4] lsl r1, r4, #1 add r1, r2, r1 ldrh r1, [r1, #0x18] add r0, r4, #0 - bl FUN_020B8404 + bl NNS_G3dGlbLightColor add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -82,12 +82,12 @@ _021D7558: ldrh r0, [r2, #0x20] ldrh r1, [r2, #0x22] ldr r2, [r2, #0x28] - bl FUN_020B83E0 + bl NNS_G3dGlbMaterialColorDiffAmb ldr r2, [r5, #4] ldrh r0, [r2, #0x24] ldrh r1, [r2, #0x26] ldr r2, [r2, #0x2c] - bl FUN_020B83BC + bl NNS_G3dGlbMaterialColorSpecEmi ldr r3, [r5, #4] ldr r0, [r3, #0x40] str r0, [sp] @@ -97,7 +97,7 @@ _021D7558: ldr r1, [r3, #0x34] ldr r2, [r3, #0x38] ldr r3, [r3, #0x3c] - bl FUN_020B8390 + bl NNS_G3dGlbPolygonAttr mov r0, #0 mov r1, #0x48 bl FUN_02079A70 @@ -243,7 +243,7 @@ _021D76C8: add r1, #0x80 ldr r1, [r1] add r0, r7, #0 - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj ldr r0, [r5, #0x60] bl FreeToHeap add r0, r4, #1 @@ -358,26 +358,26 @@ MOD78_021D778C: ; 0x021D778C add r2, #0x5c bl FUN_0201B234 ldr r0, [r5, #0x5c] - bl FUN_020BC0FC + bl NNS_G3dGetTex str r0, [sp, #4] ldr r0, [r5, #0x58] mov r1, #0 mov r2, #0x40 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag ldr r0, [r5, #0x58] mov r1, #0 mov r2, #0x80 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag mov r2, #2 ldr r0, [r5, #0x58] mov r1, #0 lsl r2, r2, #8 - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag mov r2, #1 ldr r0, [r5, #0x58] mov r1, #0 lsl r2, r2, #0xa - bl FUN_020BC094 + bl NNSi_G3dModifyMatFlag add r0, r5, #0 str r0, [sp, #8] add r0, #0x70 @@ -402,12 +402,12 @@ _021D780E: bl NARC_AllocAndReadWholeMember str r0, [r4, #0x60] mov r1, #0 - bl FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx add r7, r0, #0 ldr r0, [sp, #8] ldr r2, [r5, #0x58] add r1, r7, #0 - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj add r1, r4, #0 add r1, #0x80 str r0, [r1] @@ -417,11 +417,11 @@ _021D780E: ldr r2, [r5, #0x58] ldr r3, [sp, #4] add r1, r7, #0 - bl FUN_020B8110 + bl NNS_G3dAnmObjInit add r4, #0x80 ldr r1, [r4] add r0, r5, #4 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r0, r6, #1 lsl r0, r0, #0x18 lsr r6, r0, #0x18 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index f0b34ee0..83e02d71 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1473,7 +1473,7 @@ _0222DFE4: mov r1, #2 lsl r1, r1, #0x10 mov r2, #0 - bl tempName_NNS_FndCreateExpHeapEx + bl NNS_FndCreateExpHeapEx str r0, [r4, #0x4c] mov r0, #1 str r0, [r5] @@ -1830,7 +1830,7 @@ MOD80_0222E3CC: ; 0x0222E3CC push {r4, r5, r6, r7, lr} sub sp, #0x1c add r5, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -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 @@ -2269,7 +2269,7 @@ MOD80_0222E750: ; 0x0222E750 add r1, r5, #0 ldr r0, [r0] add r2, r4, #0 - bl tempName_NNS_FndAllocFromExpHeapEx + bl NNS_FndAllocFromExpHeapEx add r4, r0, #0 add r0, r6, #0 bl OS_RestoreInterrupts @@ -2289,7 +2289,7 @@ MOD80_0222E778: ; 0x0222E778 ldr r0, _0222E798 ; =0x02237E24 add r1, r5, #0 ldr r0, [r0] - bl FUN_020ADDF0 + bl NNS_FndFreeToExpHeap add r0, r4, #0 bl OS_RestoreInterrupts _0222E794: @@ -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 @@ -2951,7 +2951,7 @@ MOD80_0222EC98: ; 0x0222EC98 ldr r0, _0222ED88 ; =0x00000EB8 mov r1, #0 add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #2 str r0, [sp] mov r3, #0 @@ -2992,7 +2992,7 @@ _0222ECF2: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [sp, #0x14] add r6, #0x1e add r0, r0, #1 @@ -3019,7 +3019,7 @@ _0222ECF2: ldr r0, _0222ED94 ; =0x00000E98 mov r1, #0xf add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -3039,7 +3039,7 @@ _0222ECF2: ldr r0, _0222ED98 ; =0x00000FB8 mov r1, #0xf add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3678,7 +3678,7 @@ MOD80_0222F250: ; 0x0222F250 ldr r0, _0222F2A0 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0222F2A0 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -3720,7 +3720,7 @@ MOD80_0222F2A8: ; 0x0222F2A8 ldr r0, _0222F2F8 ; =0x00000FB8 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0222F2F8 ; =0x00000FB8 mov r1, #0 add r0, r5, r0 @@ -3761,7 +3761,7 @@ MOD80_0222F300: ; 0x0222F300 add r6, r0, #0 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -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 @@ -4250,7 +4250,7 @@ MOD80_0222F6EC: ; 0x0222F6EC ldr r0, [sp, #0x14] add r0, r0, r1 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xf str r0, [sp] mov r0, #0xa @@ -4303,7 +4303,7 @@ _0222F754: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4, #8] ldr r0, [r4, #0xc] add r7, r7, #1 @@ -4573,7 +4573,7 @@ MOD80_0222F96C: ; 0x0222F96C bic r3, r1 mov r1, #0x3e strb r3, [r2, #0xb] - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _0222F9FC ; =0x00000FC8 mov r2, #0x36 str r0, [r4, r1] @@ -4581,14 +4581,14 @@ MOD80_0222F96C: ; 0x0222F96C ldr r1, _0222FA00 ; =0x00000B34 mov r3, #1 ldr r1, [r4, r1] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _0222F9FC ; =0x00000FC8 ldr r1, _0222FA00 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x37 mov r3, #2 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _0222F9FC ; =0x00000FC8 mov r2, #0x1f ldr r1, [r4, r0] @@ -4647,7 +4647,7 @@ _0222FA26: bl FUN_02001C5C ldr r0, _0222FADC ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _0222FAE0 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -4702,7 +4702,7 @@ _0222FAA4: bl FUN_02001C5C ldr r0, _0222FADC ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _0222FAE0 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -4805,7 +4805,7 @@ MOD80_0222FB3C: ; 0x0222FB3C ldr r0, _0222FBB8 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _0222FBB8 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -4912,7 +4912,7 @@ MOD80_0222FBC0: ; 0x0222FBC0 _0222FC64: add r0, r5, #0 add r1, r7, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #1 add r5, #0x10 cmp r4, #5 @@ -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 @@ -5506,7 +5506,7 @@ MOD80_02230128: ; 0x02230128 ldr r0, [sp, #0x14] add r0, r0, r1 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xf str r0, [sp] mov r0, #0xa @@ -5559,7 +5559,7 @@ _02230190: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, [r4, #8] ldr r0, [r4, #0xc] add r7, r7, #1 @@ -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] @@ -5983,7 +5983,7 @@ MOD80_022304F8: ; 0x022304F8 ldr r0, _02230548 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02230548 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -6061,7 +6061,7 @@ MOD80_022305A8: ; 0x022305A8 add r5, r0, #0 add r7, r2, #0 add r4, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 str r0, [sp] ldr r0, _02230610 ; =0x000F0200 @@ -6113,7 +6113,7 @@ MOD80_02230614: ; 0x02230614 mov r1, #0 add r6, r0, #0 add r4, r2, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer cmp r5, #0 beq _0223063A mov r2, #0 @@ -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 @@ -6516,7 +6516,7 @@ MOD80_02230944: ; 0x02230944 ldr r0, [sp, #0x14] add r0, r0, r1 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 mov r3, #0xb5 ldr r0, _02230A70 ; =0x000F0D00 @@ -6551,7 +6551,7 @@ MOD80_02230944: ; 0x02230944 ldr r0, [sp, #0x14] add r0, r0, r1 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r1, _02230A78 ; =0x00000F08 ldr r0, [sp, #0x14] ldr r4, _02230A7C ; =0x0223719C @@ -6582,7 +6582,7 @@ _022309D2: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r7, r7, #1 add r6, #0x16 add r4, r4, #4 @@ -6624,7 +6624,7 @@ _02230A20: ldr r0, [sp, #0x18] mov r1, #0 add r0, r0, r7 - bl FUN_02019620 + bl FillWindowPixelBuffer add r5, r5, #1 add r6, #0x10 add r4, r4, #4 @@ -7524,7 +7524,7 @@ MOD80_0223113C: ; 0x0223113C ldr r0, _022311BC ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #5 str r0, [sp] mov r0, #0xa @@ -7543,7 +7543,7 @@ MOD80_0223113C: ; 0x0223113C ldr r0, _022311C4 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -7626,10 +7626,10 @@ _02231240: add r1, r2, #6 ldr r0, [r4, r0] add r2, r2, #4 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _022312B8 ; =0x00000FC8 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _022312BC ; =0x000005DC bl FUN_020054C8 mov r0, #6 @@ -7643,10 +7643,10 @@ _02231266: add r1, r2, #6 ldr r0, [r4, r0] add r2, r2, #4 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _022312B8 ; =0x00000FC8 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _022312C0 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -7747,10 +7747,10 @@ _02231342: ldr r0, [r4, r0] add r1, #0xa add r2, #8 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231468 ; =0x00000FC8 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _0223146C ; =0x00000EE8 mov r1, #0 add r0, r4, r0 @@ -7780,10 +7780,10 @@ _0223138C: ldr r0, [r4, r0] add r1, #0xa add r2, #8 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231468 ; =0x00000FC8 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02231474 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -7807,7 +7807,7 @@ _0223138C: ldr r0, _0223147C ; =0x00000F18 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] ldr r0, _02231480 ; =0x00010200 @@ -7847,7 +7847,7 @@ _0223138C: ldr r0, _02231488 ; =0x00000F38 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] mov r0, #2 @@ -7913,7 +7913,7 @@ MOD80_02231490: ; 0x02231490 ldr r0, _022314E8 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -7980,10 +7980,10 @@ _0223154A: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _022315F4 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _022315F8 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -8005,10 +8005,10 @@ _0223158E: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _022315F4 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _022315F8 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -8025,7 +8025,7 @@ _0223158E: mov r1, #0 add r0, r5, r0 str r1, [r5, #0x2c] - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] mov r0, #2 @@ -8089,7 +8089,7 @@ MOD80_02231614: ; 0x02231614 ldr r0, _0223166C ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -8153,10 +8153,10 @@ _022316D0: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231770 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02231774 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -8178,10 +8178,10 @@ _0223170C: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231770 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02231774 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -8199,7 +8199,7 @@ _0223170C: mov r1, #0 add r0, r5, r0 str r1, [r5, #0x2c] - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp] ldr r0, _02231788 ; =0x00010200 @@ -8377,7 +8377,7 @@ MOD80_0223187C: ; 0x0223187C ldr r0, _022318CC ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _022318CC ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -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 @@ -9121,7 +9121,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FDC ; =0x00000EB8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 mov r1, #0xb5 ldr r0, _02231FE0 ; =0x000F0E00 @@ -9150,7 +9150,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FE4 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02231FE4 ; =0x00000EC8 add r0, r4, r0 bl CopyWindowToVram @@ -9172,7 +9172,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FE8 ; =0x00000E98 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -9192,7 +9192,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FF0 ; =0x00000FB8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x15 str r0, [sp] mov r0, #6 @@ -9212,7 +9212,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, _02231FF8 ; =0x00000EE8 mov r1, #6 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #1 ldr r0, _02231FFC ; =0x00010306 str r3, [sp] @@ -9823,7 +9823,7 @@ MOD80_02232470: ; 0x02232470 bic r3, r1 mov r1, #0x3e strb r3, [r2, #0xb] - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _02232510 ; =0x00000FC8 mov r2, #0x5e str r0, [r4, r1] @@ -9831,21 +9831,21 @@ MOD80_02232470: ; 0x02232470 ldr r1, _02232514 ; =0x00000B34 mov r3, #1 ldr r1, [r4, r1] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _02232510 ; =0x00000FC8 ldr r1, _02232514 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x5f mov r3, #2 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _02232510 ; =0x00000FC8 ldr r1, _02232514 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x60 mov r3, #3 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _02232510 ; =0x00000FC8 mov r2, #0x1f ldr r1, [r4, r0] @@ -9912,7 +9912,7 @@ _02232546: bl FUN_02001C5C ldr r0, _02232660 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -9932,7 +9932,7 @@ _02232574: bl FUN_02001C5C ldr r0, _02232660 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10016,7 +10016,7 @@ _0223262E: bl FUN_02001C5C ldr r0, _02232660 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02232664 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10063,7 +10063,7 @@ MOD80_02232670: ; 0x02232670 bic r3, r1 mov r1, #0x3e strb r3, [r2, #0xb] - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _02232710 ; =0x00000FC8 mov r2, #0x54 str r0, [r4, r1] @@ -10071,21 +10071,21 @@ MOD80_02232670: ; 0x02232670 ldr r1, _02232714 ; =0x00000B34 mov r3, #1 ldr r1, [r4, r1] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _02232710 ; =0x00000FC8 ldr r1, _02232714 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x55 mov r3, #2 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _02232710 ; =0x00000FC8 ldr r1, _02232714 ; =0x00000B34 ldr r0, [r4, r0] ldr r1, [r4, r1] mov r2, #0x56 mov r3, #3 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData ldr r0, _02232710 ; =0x00000FC8 mov r2, #0x1f ldr r1, [r4, r0] @@ -10152,7 +10152,7 @@ _02232746: bl FUN_02001C5C ldr r0, _0223283C ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10172,7 +10172,7 @@ _02232774: bl FUN_02001C5C ldr r0, _0223283C ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10239,7 +10239,7 @@ _0223280A: bl FUN_02001C5C ldr r0, _0223283C ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02232840 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -10679,7 +10679,7 @@ _02232B62: add r4, r5, r0 add r0, r4, #0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r4, #0 mov r1, #0 mov r2, #1 @@ -10717,7 +10717,7 @@ MOD80_02232BAC: ; 0x02232BAC add r4, r0, #0 beq _02232BCE add r1, r5, #0 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _02232BCE add r0, r4, #0 @@ -11146,7 +11146,7 @@ _02232F22: ldr r0, _02232F9C ; =0x00000EC8 mov r1, #0 add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] ldr r0, _02232FA0 ; =0x00010200 @@ -11657,7 +11657,7 @@ MOD80_022332EC: ; 0x022332EC ldr r0, _02233350 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02233350 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -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 @@ -11908,7 +11908,7 @@ MOD80_02233500: ; 0x02233500 ldr r0, _022335CC ; =0x00000EB8 mov r1, #0 add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #0 mov r1, #0xb5 ldr r0, _022335D0 ; =0x000F0E00 @@ -11938,7 +11938,7 @@ MOD80_02233500: ; 0x02233500 ldr r0, _022335D4 ; =0x00000E98 mov r1, #0 add r0, r7, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0 str r0, [sp, #0x14] ldr r0, _022335D8 ; =0x00000F08 @@ -11968,7 +11968,7 @@ _0223357E: bl FUN_02019064 add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 bl CopyWindowToVram ldr r0, [sp, #0x14] @@ -12158,7 +12158,7 @@ _02233714: ldr r0, _02233778 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #5 str r0, [sp] mov r0, #0xa @@ -12177,7 +12177,7 @@ _02233714: ldr r0, _02233780 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 str r0, [r4, #0x2c] add sp, #0x14 @@ -12260,10 +12260,10 @@ _022337FA: add r1, r2, #6 ldr r0, [r4, r0] add r2, r2, #4 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _0223387C ; =0x00000FC8 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r0, #5 str r0, [r4, #0x2c] ldr r0, _02233880 ; =0x000005DC @@ -12277,10 +12277,10 @@ _02233820: add r1, r2, #6 ldr r0, [r4, r0] add r2, r2, #4 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _0223387C ; =0x00000FC8 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02233884 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12415,10 +12415,10 @@ _02233932: ldr r0, [r4, r0] add r1, #0xa add r2, #8 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233A50 ; =0x00000FC8 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02233A54 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 @@ -12454,10 +12454,10 @@ _0223398C: ldr r0, [r4, r0] add r1, #0xa add r2, #8 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233A50 ; =0x00000FC8 ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02233A58 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12577,7 +12577,7 @@ MOD80_02233A6C: ; 0x02233A6C ldr r0, _02233AC4 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -12644,10 +12644,10 @@ _02233B26: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233BD0 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02233BD4 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -12669,10 +12669,10 @@ _02233B6A: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233BD0 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02233BD4 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -12752,7 +12752,7 @@ MOD80_02233BE8: ; 0x02233BE8 ldr r0, _02233C40 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #3 add sp, #0x14 pop {r3, r4, pc} @@ -12816,10 +12816,10 @@ _02233CA4: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233D70 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02233D74 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -12856,10 +12856,10 @@ _02233CFA: mov r1, #0 ldr r0, [r5, r0] add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02233D70 ; =0x00000FC8 ldr r0, [r5, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor ldr r0, _02233D74 ; =0x00000ED8 mov r1, #0 add r0, r5, r0 @@ -13235,7 +13235,7 @@ MOD80_02233FB4: ; 0x02233FB4 _02233FE0: add r0, r5, #0 add r1, r7, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #1 add r5, #0x10 cmp r4, #3 @@ -13307,7 +13307,7 @@ MOD80_02234048: ; 0x02234048 _02234074: add r0, r5, #0 add r1, r7, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #1 add r5, #0x10 cmp r4, #3 @@ -13416,7 +13416,7 @@ _0223415A: _0223415E: add r0, r5, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r4, r4, #1 add r5, #0x10 cmp r4, #3 @@ -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 @@ -13680,7 +13680,7 @@ MOD80_02234370: ; 0x02234370 mov r1, #0x3e str r2, [sp] add r6, r3, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r5] mov r4, #0 _02234388: @@ -13689,7 +13689,7 @@ _02234388: add r1, r6, #0 add r2, #0x68 add r3, r4, #1 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 cmp r4, #9 blt _02234388 @@ -13718,7 +13718,7 @@ _02234388: ldrh r1, [r2, #6] ldrh r2, [r2, #4] mov r3, #0x3e - bl FUN_020010A8 + bl ListMenuInit add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -13791,7 +13791,7 @@ _0223444A: _02234456: add r0, r6, #1 mov r1, #0x3e - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, [sp] str r0, [r1] mov r0, #0 @@ -13816,7 +13816,7 @@ _02234472: ldr r1, [sp, #4] ldr r0, [r0] add r3, r2, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData b _022344B6 _02234494: ldrh r1, [r5] @@ -13833,7 +13833,7 @@ _02234494: ldr r1, [sp, #4] ldr r0, [r0] add r3, r2, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData _022344B6: ldr r0, [sp, #0x10] add r5, r5, #2 @@ -13848,7 +13848,7 @@ _022344C2: ldr r0, [r0] ldr r1, [sp, #8] sub r3, #0x77 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r0, r6, #1 add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -13867,7 +13867,7 @@ MOD80_022344DC: ; 0x022344DC mov r1, #0xf str r2, [sp, #0x10] str r3, [sp, #0x14] - bl FUN_02019620 + bl FillWindowPixelBuffer ldrh r1, [r5, #6] ldrh r0, [r5, #4] ldr r2, [sp, #0x14] @@ -13912,7 +13912,7 @@ MOD80_022344DC: ; 0x022344DC ldrh r2, [r3, r2] add r0, sp, #0x18 mov r3, #0x3e - bl FUN_020010A8 + bl ListMenuInit add sp, #0x38 pop {r3, r4, r5, r6, r7, pc} nop @@ -13929,7 +13929,7 @@ MOD80_02234560: ; 0x02234560 mov r0, #4 mov r1, #0x3e add r7, r2, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r5, _022345C8 ; =0x02237B64 str r0, [r6] mov r4, #0 @@ -13938,7 +13938,7 @@ _02234578: ldr r2, [r5] ldr r3, [r5, #4] add r1, r7, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 add r5, #8 cmp r4, #4 @@ -13968,7 +13968,7 @@ _02234578: add r0, sp, #4 add r2, r1, #0 mov r3, #0x3e - bl FUN_020010A8 + bl ListMenuInit add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -13985,7 +13985,7 @@ MOD80_022345D0: ; 0x022345D0 mov r0, #0xd mov r1, #0x3e add r7, r2, #0 - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r5, _02234638 ; =0x02237494 str r0, [r6] mov r4, #0 @@ -13994,7 +13994,7 @@ _022345E8: ldr r2, [r5] add r1, r7, #0 add r3, r4, #0 - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r4, r4, #1 add r5, #8 cmp r4, #0xd @@ -14024,7 +14024,7 @@ _022345E8: add r0, sp, #4 add r2, r1, #0 mov r3, #0x3e - bl FUN_020010A8 + bl ListMenuInit add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -14039,7 +14039,7 @@ MOD80_02234640: ; 0x02234640 add r4, r0, #0 cmp r5, #0xc blt _0223464E - bl ErrorHandling + bl GF_AssertFail _0223464E: ldr r0, _02234660 ; =0x02237498 lsl r1, r5, #3 @@ -14089,11 +14089,11 @@ MOD80_02234698: ; 0x02234698 sub sp, #4 add r5, r0, #0 add r4, r1, #0 - bl FUN_02001204 + bl ListMenu_ProcessInput add r6, r0, #0 add r0, r5, #0 add r1, sp, #0 - bl FUN_0200143C + bl ListMenuGetCurrentItemArrayId add r0, sp, #0 ldrh r1, [r4] ldrh r0, [r0] @@ -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 @@ -14449,7 +14449,7 @@ MOD80_02234958: ; 0x02234958 ldr r0, _02234990 ; =0x00000E98 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r3, r4, pc} nop @@ -14600,7 +14600,7 @@ _02234A8A: str r0, [r4, #0x2c] b _02234AA8 _02234AA4: - bl ErrorHandling + bl GF_AssertFail _02234AA8: add r0, r4, #0 bl MOD80_0222E8BC @@ -15866,7 +15866,7 @@ MOD80_022353B4: ; 0x022353B4 lsr r5, r0, #0x10 cmp r5, #0x3c blo _022353E0 - bl ErrorHandling + bl GF_AssertFail _022353E0: ldr r0, _022353F0 ; =0x00000FDC add r1, r5, #2 @@ -16126,8 +16126,8 @@ _02235590: bne _022355DC ldr r0, [r5] ldr r0, [r0, #0x20] - bl FUN_02029EF8 - bl FUN_02029F08 + bl Sav2_Chatot_get + bl Chatot_invalidate _022355DC: cmp r6, #0 beq _022355EA @@ -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] @@ -17695,7 +17695,7 @@ _02236208: add r0, #0xd4 pop {r3, pc} _02236210: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} thumb_func_end MOD80_022361E8 @@ -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 @@ -18128,7 +18128,7 @@ MOD80_02236580: ; 0x02236580 ldr r0, _02236628 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] mov r0, #0x18 @@ -18149,7 +18149,7 @@ MOD80_02236580: ; 0x02236580 ldr r0, _0223662C ; =0x00000EB8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #1 mov r1, #0xb5 ldr r0, _02236630 ; =0x000F0E00 @@ -18180,7 +18180,7 @@ MOD80_02236580: ; 0x02236580 ldr r0, _02236634 ; =0x00000E98 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r3, r4, pc} nop @@ -19051,7 +19051,7 @@ MOD80_02236C70: ; 0x02236C70 ldr r0, _02236CD8 ; =0x00000E98 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02236CD8 ; =0x00000E98 mov r1, #0 add r0, r5, r0 @@ -19206,7 +19206,7 @@ MOD80_02236D8C: ; 0x02236D8C ldr r0, _02236DFC ; =0x00000EC8 mov r1, #0xf add r0, r5, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02236DFC ; =0x00000EC8 mov r1, #1 add r0, r5, r0 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 94767f70..c8b46eb9 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -106,7 +106,7 @@ _02237F0A: lsl r1, r1, #2 str r0, [r4, r1] _02237F22: - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #1 str r0, [sp] mov r0, #0x7f @@ -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} @@ -1388,7 +1388,7 @@ MOD81_02238898: ; 0x02238898 ldr r0, [r0] cmp r0, #0x20 blt _022388A8 - bl ErrorHandling + bl GF_AssertFail _022388A8: ldr r0, _022388B8 ; =0x0223D3C0 ldr r2, [r0] @@ -1479,7 +1479,7 @@ MOD81_02238940: ; 0x02238940 add r5, r0, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N bl FUN_0201EBA4 ldr r0, [r5, #0x1c] mov r6, #0 @@ -1504,7 +1504,7 @@ _02238976: mov r0, #0x12 add r1, sp, #0 str r2, [sp] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -1520,7 +1520,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x80 ldrh r0, [r0] - ldr r3, _02238A34 ; =UNK_020FFA38 + ldr r3, _02238A34 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1537,7 +1537,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x82 ldrh r0, [r0] - ldr r3, _02238A34 ; =UNK_020FFA38 + ldr r3, _02238A34 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1554,7 +1554,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x84 ldrh r0, [r0] - ldr r3, _02238A34 ; =UNK_020FFA38 + ldr r3, _02238A34 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1579,7 +1579,7 @@ MOD81_02238988: ; 0x02238988 add r2, r0, #0 add r3, r0, #0 str r0, [sp, #4] - bl FUN_020B8390 + bl NNS_G3dGlbPolygonAttr _02238A20: add r1, r4, #0 add r0, r4, #4 @@ -1591,7 +1591,7 @@ _02238A20: add sp, #0x50 pop {r4, pc} .align 2, 0 -_02238A34: .word UNK_020FFA38 +_02238A34: .word FX_SinCosTable_ thumb_func_end MOD81_02238988 thumb_func_start MOD81_02238A38 @@ -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 @@ -1668,7 +1668,7 @@ MOD81_02238A84: ; 0x02238A84 ldr r0, [r4, r6] cmp r0, #0 beq _02238B02 - bl FUN_020BC13C + bl NNS_G3dGetMdlSet str r0, [r5, #0x58] ldrh r1, [r0, #0xe] add r1, r0, r1 @@ -1676,7 +1676,7 @@ MOD81_02238A84: ; 0x02238A84 add r0, r0, r1 str r0, [r5, #0x5c] ldr r0, [r5] - bl FUN_020BC0FC + bl NNS_G3dGetTex str r0, [r5, #0x60] bl FUN_0201B3C4 ldr r0, [r5] @@ -1684,7 +1684,7 @@ MOD81_02238A84: ; 0x02238A84 bl FUN_0201B3A8 ldr r1, [r5, #0x5c] add r0, r5, #4 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit ldr r0, [sp, #0x20] mov r1, #0x1f str r0, [r5, #0x68] @@ -1777,13 +1777,13 @@ MOD81_02238B5C: ; 0x02238B5C mov r2, #0x1f mov r1, #0 lsl r2, r2, #0x10 - bl FUN_020BC02C + bl NNSi_G3dModifyPolygonAttrMask pop {r3, pc} _02238B76: mov r2, #0x1f mov r1, #1 lsl r2, r2, #0x10 - bl FUN_020BC02C + bl NNSi_G3dModifyPolygonAttrMask pop {r3, pc} .align 2, 0 thumb_func_end MOD81_02238B5C @@ -1806,7 +1806,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x80 ldrh r0, [r0] - ldr r3, _02238C3C ; =UNK_020FFA38 + ldr r3, _02238C3C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1823,7 +1823,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x82 ldrh r0, [r0] - ldr r3, _02238C3C ; =UNK_020FFA38 + ldr r3, _02238C3C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1840,7 +1840,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x84 ldrh r0, [r0] - ldr r3, _02238C3C ; =UNK_020FFA38 + ldr r3, _02238C3C ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1857,7 +1857,7 @@ MOD81_02238B8C: ; 0x02238B8C mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N bl FUN_0201EBA4 add r1, r4, #0 ldr r0, [r4, #0x5c] @@ -1871,12 +1871,12 @@ MOD81_02238B8C: ; 0x02238B8C mov r0, #0x12 add r1, sp, #0 str r2, [sp] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N add r0, r4, #0 add sp, #0x4c pop {r3, r4, pc} .align 2, 0 -_02238C3C: .word UNK_020FFA38 +_02238C3C: .word FX_SinCosTable_ thumb_func_end MOD81_02238B8C thumb_func_start MOD81_02238C40 @@ -2123,9 +2123,9 @@ MOD81_02238DFC: ; 0x02238DFC mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 - bl FUN_020BB394 - bl FUN_020B02C8 + bl NNS_G3dGeBufferOP_N + bl NNS_G3dGeFlushBuffer + bl NNS_G2dSetupSoftwareSpriteCamera ldr r0, [r4, #0xc] bl FUN_020081C4 ldr r0, [r4, #0xc] @@ -2134,7 +2134,7 @@ MOD81_02238DFC: ; 0x02238DFC str r2, [sp] mov r0, #0x12 add r1, sp, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N ldr r0, [r4, #0x5c] bl MOD81_02238940 mov r0, #0 @@ -2229,7 +2229,7 @@ MOD81_02238E44: ; 0x02238E44 add r0, r4, #0 add r0, #0x44 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x20 str r3, [sp] mov r0, #0x3a @@ -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 @@ -2527,7 +2527,7 @@ _0223918A: add r0, r4, #0 add r0, #0x44 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] mov r0, #0xff @@ -2694,7 +2694,7 @@ MOD81_022392D8: ; 0x022392D8 push {r3, r4, r5, r6, lr} sub sp, #4 add r5, r0, #0 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _02239380 ; =0x04000060 ldr r2, _02239384 ; =0xFFFFCFFD @@ -2730,19 +2730,19 @@ MOD81_022392D8: ; 0x022392D8 str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 - ldr r3, _02239394 ; =UNK_021064B8 + bl NNS_GfdInitFrmPlttVramManager + ldr r3, _02239394 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #1 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _02239398 ; =UNK_021064C0 + ldr r3, _02239398 ; =NNS_GfdDefaultFuncAllocPlttVram add r4, r0, #0 ldr r3, [r3] mov r0, #0x80 @@ -2774,8 +2774,8 @@ _02239384: .word 0xFFFFCFFD _02239388: .word 0x0000CFFB _0223938C: .word 0x04000540 _02239390: .word 0xBFFF0000 -_02239394: .word UNK_021064B8 -_02239398: .word UNK_021064C0 +_02239394: .word NNS_GfdDefaultFuncAllocTexVram +_02239398: .word NNS_GfdDefaultFuncAllocPlttVram _0223939C: .word 0x7FFF0000 _022393A0: .word 0xFFFF0000 thumb_func_end MOD81_022392D8 @@ -2829,9 +2829,9 @@ MOD81_022393F4: ; 0x022393F4 mov r3, #8 bl MOD81_0223874C add r0, sp, #0x5c - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy add r0, sp, #0x38 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r2, #1 @@ -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 @@ -3962,7 +3962,7 @@ MOD81_02239CDC: ; 0x02239CDC push {r4, lr} sub sp, #0x10 add r4, r0, #0 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _02239DBC ; =0x04000060 ldr r1, _02239DC0 ; =0xFFFFCFFD @@ -4006,11 +4006,11 @@ MOD81_02239CDC: ; 0x02239CDC str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -4099,9 +4099,9 @@ MOD81_02239E00: ; 0x02239E00 mov r3, #0xc bl MOD81_0223874C add r0, sp, #0x60 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy add r0, sp, #0x3c - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r2, #1 @@ -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] @@ -5879,7 +5879,7 @@ MOD81_0223ABD8: ; 0x0223ABD8 push {r3, r4, lr} sub sp, #0x24 add r4, r0, #0 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _0223ACAC ; =0x04000060 ldr r1, _0223ACB0 ; =0xFFFFCFFD @@ -5923,11 +5923,11 @@ MOD81_0223ABD8: ; 0x0223ABD8 str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -6006,9 +6006,9 @@ MOD81_0223ACE8: ; 0x0223ACE8 mov r3, #8 bl MOD81_0223874C add r0, sp, #0x5c - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy add r0, sp, #0x38 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r2, #1 @@ -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 @@ -7391,7 +7391,7 @@ MOD81_0223B7E8: ; 0x0223B7E8 push {r3, r4, lr} sub sp, #0x24 add r4, r0, #0 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _0223B8C8 ; =0x04000060 ldr r1, _0223B8CC ; =0xFFFFCFFD @@ -7435,11 +7435,11 @@ MOD81_0223B7E8: ; 0x0223B7E8 str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -7525,9 +7525,9 @@ MOD81_0223B908: ; 0x0223B908 mov r3, #8 bl MOD81_0223874C add r0, sp, #0x5c - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy add r0, sp, #0x38 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r2, #1 @@ -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 @@ -8643,7 +8643,7 @@ MOD81_0223C1DC: ; 0x0223C1DC push {r4, lr} sub sp, #0x10 add r4, r0, #0 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _0223C2C0 ; =0x04000060 ldr r1, _0223C2C4 ; =0xFFFFCFFD @@ -8687,11 +8687,11 @@ MOD81_0223C1DC: ; 0x0223C1DC str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -9177,9 +9177,9 @@ MOD81_0223C60C: ; 0x0223C60C mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 - bl FUN_020BB394 - bl FUN_020B02C8 + bl NNS_G3dGeBufferOP_N + bl NNS_G3dGeFlushBuffer + bl NNS_G2dSetupSoftwareSpriteCamera ldr r0, [r4, #0x10] bl FUN_020081C4 ldr r0, [r4, #0x10] @@ -9188,7 +9188,7 @@ MOD81_0223C60C: ; 0x0223C60C str r2, [sp] mov r0, #0x12 add r1, sp, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N ldr r0, [r4, #0x60] cmp r0, #0 beq _0223C64A @@ -9281,7 +9281,7 @@ MOD81_0223C658: ; 0x0223C658 add r0, r4, #0 add r0, #0x48 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0x20 str r3, [sp] mov r0, #0x3a @@ -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 @@ -9611,7 +9611,7 @@ _0223C982: add r0, #0x48 bl CopyWindowToVram ldr r0, _0223CA90 ; =0x00000484 - bl PlayBGM + bl PlaySound mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -9640,7 +9640,7 @@ _0223C9D0: add r0, r4, #0 add r0, #0x48 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9746,7 +9746,7 @@ MOD81_0223CAC4: ; 0x0223CAC4 push {r3, r4, r5, r6, lr} sub sp, #4 add r5, r0, #0 - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _0223CB6C ; =0x04000060 ldr r2, _0223CB70 ; =0xFFFFCFFD @@ -9782,19 +9782,19 @@ MOD81_0223CAC4: ; 0x0223CAC4 str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 - ldr r3, _0223CB80 ; =UNK_021064B8 + bl NNS_GfdInitFrmPlttVramManager + ldr r3, _0223CB80 ; =NNS_GfdDefaultFuncAllocTexVram mov r0, #1 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0223CB84 ; =UNK_021064C0 + ldr r3, _0223CB84 ; =NNS_GfdDefaultFuncAllocPlttVram add r4, r0, #0 ldr r3, [r3] mov r0, #0x80 @@ -9826,8 +9826,8 @@ _0223CB70: .word 0xFFFFCFFD _0223CB74: .word 0x0000CFFB _0223CB78: .word 0x04000540 _0223CB7C: .word 0xBFFF0000 -_0223CB80: .word UNK_021064B8 -_0223CB84: .word UNK_021064C0 +_0223CB80: .word NNS_GfdDefaultFuncAllocTexVram +_0223CB84: .word NNS_GfdDefaultFuncAllocPlttVram _0223CB88: .word 0x7FFF0000 _0223CB8C: .word 0xFFFF0000 thumb_func_end MOD81_0223CAC4 @@ -9881,9 +9881,9 @@ MOD81_0223CBE0: ; 0x0223CBE0 mov r3, #8 bl MOD81_0223874C add r0, sp, #0x5c - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy add r0, sp, #0x38 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r3, #0 str r3, [sp] mov r2, #1 @@ -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 b9d0df31..f1a3e494 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -715,7 +715,7 @@ _0222DA48: mov r1, #2 lsl r1, r1, #0x10 mov r2, #0 - bl tempName_NNS_FndCreateExpHeapEx + bl NNS_FndCreateExpHeapEx str r0, [r4, #0x28] mov r0, #1 str r0, [r5] @@ -984,7 +984,7 @@ MOD82_0222DD54: ; 0x0222DD54 push {r4, r5, r6, r7, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -1256,7 +1256,7 @@ MOD82_0222DF74: ; 0x0222DF74 add r1, r5, #0 ldr r0, [r0, #4] add r2, r4, #0 - bl tempName_NNS_FndAllocFromExpHeapEx + bl NNS_FndAllocFromExpHeapEx add r4, r0, #0 add r0, r6, #0 bl OS_RestoreInterrupts @@ -1276,7 +1276,7 @@ MOD82_0222DF9C: ; 0x0222DF9C ldr r0, _0222DFBC ; =0x0222FC0C add r1, r5, #0 ldr r0, [r0, #4] - bl FUN_020ADDF0 + bl NNS_FndFreeToExpHeap add r0, r4, #0 bl OS_RestoreInterrupts _0222DFB8: @@ -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 @@ -1744,7 +1744,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #6 add r0, r4, r0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xe str r0, [sp] mov r0, #4 @@ -1766,7 +1766,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #4 add r0, r4, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0xe str r0, [sp] mov r0, #4 @@ -1788,7 +1788,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #4 add r0, r4, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r2, #1 mov r1, #0xdb lsl r1, r1, #4 @@ -1810,7 +1810,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #4 add r0, r4, r0 mov r1, #6 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #1 ldr r0, _0222E46C ; =0x00010406 str r3, [sp] @@ -1842,7 +1842,7 @@ MOD82_0222E35C: ; 0x0222E35C lsl r0, r0, #6 add r0, r4, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer add sp, #0x14 pop {r3, r4, pc} nop @@ -4037,7 +4037,7 @@ MOD82_0222F4D8: ; 0x0222F4D8 lsl r0, r0, #6 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x36 lsl r0, r0, #6 add r0, r5, r0 @@ -4132,7 +4132,7 @@ MOD82_0222F59C: ; 0x0222F59C lsl r0, r0, #6 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x36 lsl r0, r0, #6 add r0, r5, r0 @@ -4258,7 +4258,7 @@ MOD82_0222F694: ; 0x0222F694 add r5, r0, #0 add r6, r2, #0 add r7, r3, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #1 str r0, [sp] add r0, r4, #0 @@ -4375,7 +4375,7 @@ MOD82_0222F740: ; 0x0222F740 lsl r0, r0, #6 add r0, r5, r0 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer mov r0, #0x37 lsl r0, r0, #6 add r0, r5, r0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 7e36aa68..09c161b4 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -434,10 +434,10 @@ _0222D8B2: bl FUN_0201AB18 add r7, r0, #0 ldr r0, [sp, #0x1c] - bl FUN_0201AB0C + bl GetWindowWidth add r5, r0, #0 ldr r0, [sp, #0x1c] - bl FUN_0201AB10 + bl GetWindowHeight str r5, [sp] str r0, [sp, #4] mov r0, #0 @@ -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 @@ -901,14 +901,14 @@ MOD83_0222DCA0: ; 0x0222DCA0 add r5, r0, #0 mov r0, #0 mov r1, #2 - bl FUN_02002E4C + bl GetFontAttribute add r2, r0, #0 mov r0, #0 add r1, r5, #0 bl FUN_02002E14 add r4, r0, #0 add r0, r6, #0 - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 add r4, #0x20 sub r3, r0, r4 @@ -1601,10 +1601,10 @@ _0222E206: bl FUN_0201AB18 str r0, [sp, #0x14] add r0, r5, #0 - bl FUN_0201AB0C + bl GetWindowWidth add r7, r0, #0 add r0, r5, #0 - bl FUN_0201AB10 + bl GetWindowHeight str r7, [sp] str r0, [sp, #4] mov r0, #0 @@ -1628,10 +1628,10 @@ _0222E256: bl FUN_0201AB18 str r0, [sp, #0x1c] add r0, r5, #0 - bl FUN_0201AB0C + bl GetWindowWidth add r7, r0, #0 add r0, r5, #0 - bl FUN_0201AB10 + bl GetWindowHeight str r7, [sp] str r0, [sp, #4] mov r0, #1 @@ -1707,7 +1707,7 @@ MOD83_0222E2E4: ; 0x0222E2E4 add r1, #0x5c lsl r0, r0, #4 add r0, r1, r0 - bl FUN_0201AB10 + bl GetWindowHeight add r0, r0, #2 lsl r3, r0, #3 mov r0, #0x42 @@ -1769,7 +1769,7 @@ _0222E362: sub r0, r0, #1 lsl r4, r0, #3 add r0, r5, #0 - bl FUN_0201AB10 + bl GetWindowHeight cmp r7, r4 ble _0222E384 mov r0, #1 @@ -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 @@ -2926,7 +2926,7 @@ MOD83_0222EC78: ; 0x0222EC78 add r1, #0xf8 str r0, [r1] mov r1, #1 - bl FUN_02002E4C + bl GetFontAttribute add r2, r0, #0 add r0, r5, #0 add r0, #0xf0 @@ -4538,7 +4538,7 @@ MOD83_0222F9DC: ; 0x0222F9DC ldr r1, _0222F9F4 ; =MOD83_0223B884 mov r0, #0xf ldr r1, [r1] - bl FUN_02016A8C + bl FreeToHeapExplicit ldr r0, _0222F9F4 ; =MOD83_0223B884 mov r1, #0 str r1, [r0] @@ -4609,14 +4609,14 @@ MOD83_0222FA4C: ; 0x0222FA4C ldr r0, [r7, #0x7c] cmp r0, #0 beq _0222FA62 - bl ListMenu_dtor + bl ListMenuItems_dtor _0222FA62: ldr r0, [r7, #0x78] cmp r0, #0 beq _0222FA70 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu _0222FA70: add r0, r7, #0 add 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 @@ -5812,11 +5812,11 @@ MOD83_022303B0: ; 0x022303B0 ldr r0, [r4, #0x7c] cmp r0, #0 beq _022303CC - bl ListMenu_dtor + bl ListMenuItems_dtor _022303CC: add r0, r7, #0 mov r1, #0x56 - bl ListMenu_ctor + bl ListMenuItems_ctor str r0, [r4, #0x7c] ldr r2, _0223045C ; =0x00000172 mov r0, #0 @@ -5832,7 +5832,7 @@ _022303EA: ldr r1, [r4, #0x10] ldr r2, [r5] ldr r3, [r5, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r5, #8 cmp r6, r7 @@ -5863,13 +5863,13 @@ _022303FE: beq _02230436 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu _02230436: mov r1, #0 add r0, sp, #8 add r2, r1, #0 mov r3, #0x56 - bl FUN_020010A8 + bl ListMenuInit str r0, [r4, #0x78] mov r0, #0 ldr r2, [sp, #0x40] @@ -5990,10 +5990,10 @@ MOD83_0223050C: ; 0x0223050C str r0, [r4, #0xc] mov r0, #1 mov r1, #6 - bl FUN_02002E4C + bl GetFontAttribute add r1, r0, #0 add r0, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r6, [r4, #0x14] cmp r6, #0 bne _02230554 @@ -6056,10 +6056,10 @@ MOD83_022305A4: ; 0x022305A4 bl CopyU16ArrayToStringN mov r0, #0 mov r1, #6 - bl FUN_02002E4C + bl GetFontAttribute add r1, r0, #0 add r0, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -6092,7 +6092,7 @@ MOD83_02230604: ; 0x02230604 add r6, r2, #0 bl OverlayManager_GetData ldr r0, [r0, #0x78] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #1 mvn r0, r0 @@ -8142,7 +8142,7 @@ MOD83_022316F0: ; 0x022316F0 str r3, [sp] cmp r0, #0 beq _02231708 - bl ListMenu_dtor + bl ListMenuItems_dtor _02231708: ldr r0, _02231798 ; =0x00002B68 ldr r0, [r5, r0] @@ -8150,11 +8150,11 @@ _02231708: beq _02231718 mov r1, #0 add r2, r1, #0 - bl FUN_02001300 + bl DestroyListMenu _02231718: add r0, r7, #0 mov r1, #0x57 - bl ListMenu_ctor + bl ListMenuItems_ctor ldr r1, _02231794 ; =0x00002B6C ldr r2, _0223179C ; =0x00000172 str r0, [r5, r1] @@ -8174,7 +8174,7 @@ _0223173A: ldr r1, [r5, r1] ldr r2, [r4] ldr r3, [r4, #4] - bl ListMenu_ItemFromMsgData + bl ListMenuItems_AppendFromMsgData add r6, r6, #1 add r4, #8 cmp r6, r7 @@ -8205,7 +8205,7 @@ _02231752: str r0, [sp, #0x10] add r0, r2, #0 add r2, r1, #0 - bl FUN_020010A8 + bl ListMenuInit ldr r1, _02231798 ; =0x00002B68 str r0, [r5, r1] add sp, #0x24 @@ -8235,10 +8235,10 @@ MOD83_022317A8: ; 0x022317A8 add r6, r0, #0 mov r0, #1 mov r1, #6 - bl FUN_02002E4C + bl GetFontAttribute add r1, r0, #0 add r0, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r6, #0 add r1, r4, #0 add r2, r7, #0 @@ -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 @@ -8503,14 +8503,14 @@ MOD83_02231A00: ; 0x02231A00 add r4, r0, #0 ldr r0, _02231A40 ; =0x00002B6C ldr r0, [r4, r0] - bl ListMenu_dtor + bl ListMenuItems_dtor mov r1, #0 ldr r0, _02231A40 ; =0x00002B6C add r2, r1, #0 str r1, [r4, r0] sub r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02001300 + bl DestroyListMenu ldr r0, _02231A44 ; =0x00002B68 mov r1, #0 str r1, [r4, r0] @@ -9122,10 +9122,10 @@ _02231EBE: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_02002E4C + bl GetFontAttribute add r1, r0, #0 add r0, r6, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x18] ldr r3, [r4, #0x24] str r0, [sp, #0x28] @@ -9249,7 +9249,7 @@ _02231FD2: add r0, r6, #0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x20] cmp r0, #0 beq _02231FFE @@ -9382,10 +9382,10 @@ 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 FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData ldr r0, _02232114 ; =0x0000299C ldr r2, [sp, #4] lsl r1, r4, #0x18 @@ -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 @@ -9529,7 +9529,7 @@ MOD83_02232208: ; 0x02232208 bl OverlayManager_GetData ldr r1, _02232270 ; =0x00002B68 ldr r0, [r0, r1] - bl FUN_02001204 + bl ListMenu_ProcessInput add r4, r0, #0 mov r0, #1 mvn r0, r0 @@ -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 @@ -10694,7 +10694,7 @@ _02232B94: ldr r0, _02232D1C ; =0x00002AA8 mov r1, #0 add r0, r4, r0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _02232D1C ; =0x00002AA8 add r0, r4, r0 bl CopyWindowToVram @@ -11088,7 +11088,7 @@ _02232E7E: mov r5, #0 ldr r0, [sp, #0x10] add r1, r5, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, #0 str r0, [sp, #0x14] cmp r6, #0 @@ -11230,7 +11230,7 @@ MOD83_02232FE4: ; 0x02232FE4 str r0, [r5, r1] add r0, r4, #0 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r3, #1 str r3, [sp] ldr r0, _0223307C ; =0x000029A0 @@ -15511,7 +15511,7 @@ _02234F7A: ldr r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02019620 + bl FillWindowPixelBuffer _02234F8C: mov r0, #0 ldr r1, [r5, #0x34] @@ -15684,7 +15684,7 @@ MOD83_022350EC: ; 0x022350EC push {r4, r5, r6, r7, lr} sub sp, #0x14 add r6, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -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 @@ -15971,7 +15971,7 @@ MOD83_022352FC: ; 0x022352FC bl ReadWholeNarcMemberByIdPair add r0, r4, #0 add r1, r7, #0 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData cmp r0, #0 bne _02235330 add r0, r4, #0 @@ -15994,7 +15994,7 @@ MOD83_02235334: ; 0x02235334 bl NARC_ReadWholeMember add r0, r4, #0 add r1, r5, #0 - bl FUN_020B0030 + bl NNS_G2dGetUnpackedBGCharacterData pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD83_02235334 @@ -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 @@ -18576,7 +18576,7 @@ MOD83_02236804: ; 0x02236804 bl CTRDG_IsPulledOut cmp r0, #1 beq _02236822 - ldr r0, _02236B3C ; =gBacklightTop + 4 + ldr r0, _02236B3C ; =UNK_02016FA4 ldr r0, [r0] cmp r0, #0 beq _02236828 @@ -18966,7 +18966,7 @@ _02236B2E: str r0, [r5] b _02236D90 .align 2, 0 -_02236B3C: .word gBacklightTop + 4 +_02236B3C: .word UNK_02016FA4 _02236B40: .word 0x000004A8 _02236B44: .word 0x000004AC _02236B48: .word 0x0000E880 @@ -23084,7 +23084,7 @@ MOD83_0223894C: ; 0x0223894C add r1, #0x48 ldrb r1, [r1] ldr r0, [r5, #0x10] - bl FUN_02019620 + bl FillWindowPixelBuffer _02238976: mov r0, #0 ldr r1, [r5, #0x4c] @@ -23133,14 +23133,14 @@ _022389D0: mov r1, #2 lsl r0, r0, #0x18 lsr r0, r0, #0x18 - bl FUN_02002E4C + bl GetFontAttribute add r2, r0, #0 ldr r0, [r5, #0x40] add r1, r4, #0 bl FUN_02002E14 add r7, r0, #0 ldr r0, [r5, #0x10] - bl FUN_0201AB0C + bl GetWindowWidth lsl r0, r0, #3 sub r3, r0, r7 ldr r0, [r5, #0x24] @@ -23333,7 +23333,7 @@ MOD83_02238B4C: ; 0x02238B4C push {r4, r5, r6, r7, lr} sub sp, #0x14 ldr r6, _02238BB4 ; =MOD83_0223BC30 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x7e @@ -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,17 +24213,17 @@ 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 FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData ldr r2, [sp, #0x14] mov r3, #6 add r0, r5, #0 diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index 53dfe036..a5838988 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -55,7 +55,7 @@ _021D7516: str r0, [r4, #0x18] mov r0, #0 str r0, [r4, #0x1c] - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -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 @@ -727,7 +727,7 @@ MOD84_021D7AB8: ; 0x021D7AB8 thumb_func_start MOD84_021D7AC8 MOD84_021D7AC8: ; 0x021D7AC8 push {r3, lr} - bl FUN_020BB7F4 + bl NNS_G3dInit bl G3X_InitMtxStack ldr r0, _021D7B3C ; =0x04000060 ldr r2, _021D7B40 ; =0xFFFFCFFD @@ -761,11 +761,11 @@ MOD84_021D7AC8: ; 0x021D7AC8 str r0, [r1, #0x40] mov r0, #1 add r1, r0, #0 - bl FUN_020AEB70 + bl NNS_GfdInitFrmTexVramManager mov r0, #1 lsl r0, r0, #0xe mov r1, #1 - bl FUN_020AEDF4 + bl NNS_GfdInitFrmPlttVramManager mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -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 @@ -899,7 +899,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 add r0, #0x98 strh r1, [r0] ldr r0, [r4] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet str r0, [r4, #0x5c] ldrh r1, [r0, #0xe] add r1, r0, r1 @@ -907,7 +907,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 add r0, r0, r1 str r0, [r4, #0x60] ldr r0, [r4] - bl FUN_020BC0FC + bl NNS_G3dGetTex str r0, [r4, #0x64] bl FUN_0201B3C4 ldr r0, [r4] @@ -916,7 +916,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 add r0, r4, #0 ldr r1, [r4, #0x60] add r0, #8 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit mov r2, #0 str r2, [sp] add r0, sp, #8 @@ -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 @@ -937,22 +937,22 @@ MOD84_021D7BC8: ; 0x021D7BC8 bl FUN_02016B20 ldr r0, [r4, #4] mov r1, #0 - bl FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx add r5, r0, #0 add r0, r4, #0 ldr r2, [r4, #0x60] add r0, #0x6c add r1, r5, #0 - bl FUN_020BB8D0 + bl NNS_G3dAllocAnmObj str r0, [r4, #0x68] ldr r2, [r4, #0x60] ldr r3, [r4, #0x64] add r1, r5, #0 - bl FUN_020B8110 + bl NNS_G3dAnmObjInit add r0, r4, #0 ldr r1, [r4, #0x68] add r0, #8 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r0, r4, #0 mov r1, #0 add r0, #0x9c @@ -981,7 +981,7 @@ MOD84_021D7CD4: ; 0x021D7CD4 add r0, r4, #0 ldr r1, [r4, #0x68] add r0, #0x6c - bl thunk_FUN_020ae84c + bl NNS_G3dFreeAnmObj ldr r0, [r4, #4] bl FreeToHeap _021D7CF0: @@ -1002,7 +1002,7 @@ MOD84_021D7CFC: ; 0x021D7CFC mov r1, #0 mov r0, #0x11 add r2, r1, #0 - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N bl FUN_0201EBA4 add r4, #0x38 add r0, sp, #0x28 @@ -1010,7 +1010,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x94 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =UNK_020FFA38 + ldr r3, _021D7DF0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1027,7 +1027,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x96 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =UNK_020FFA38 + ldr r3, _021D7DF0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1044,7 +1044,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x98 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =UNK_020FFA38 + ldr r3, _021D7DF0 ; =FX_SinCosTable_ asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1098,14 +1098,14 @@ _021D7DBA: mov r0, #0x12 add r1, sp, #0 str r2, [sp] - bl FUN_020BB1C0 + bl NNS_G3dGeBufferOP_N mov r0, #0 mov r1, #1 bl FUN_020222B4 add sp, #0x4c pop {r3, r4, pc} nop -_021D7DF0: .word UNK_020FFA38 +_021D7DF0: .word FX_SinCosTable_ thumb_func_end MOD84_021D7CFC thumb_func_start MOD84_021D7DF4 @@ -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 @@ -1168,7 +1168,7 @@ _021D7E08: add r0, #0x98 strh r1, [r0] ldr r0, [r4] - bl FUN_020BC13C + bl NNS_G3dGetMdlSet str r0, [r4, #0x5c] ldrh r1, [r0, #0xe] add r1, r0, r1 @@ -1176,7 +1176,7 @@ _021D7E08: add r0, r0, r1 str r0, [r4, #0x60] ldr r0, [r4] - bl FUN_020BC0FC + bl NNS_G3dGetTex str r0, [r4, #0x64] bl FUN_0201B3C4 ldr r0, [r4] @@ -1185,22 +1185,22 @@ _021D7E08: add r0, r4, #0 ldr r1, [r4, #0x60] add r0, #8 - bl FUN_020B80B4 + bl NNS_G3dRenderObjInit _021D7E9A: ldr r0, [r4, #4] cmp r0, #0 beq _021D7ED0 mov r1, #0 - bl FUN_020BC4C8 + bl NNS_G3dGetAnmByIdx add r1, r0, #0 ldr r0, [r4, #0x68] ldr r2, [r4, #0x60] ldr r3, [r4, #0x64] - bl FUN_020B8110 + bl NNS_G3dAnmObjInit add r0, r4, #0 ldr r1, [r4, #0x68] add r0, #8 - bl FUN_020B7EFC + bl NNS_G3dRenderObjAddAnmObj add r0, r4, #0 mov r1, #0 add r0, #0x9c @@ -1227,27 +1227,27 @@ MOD84_021D7EDC: ; 0x021D7EDC mov r0, #0x82 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r0, #0x8b lsl r0, r0, #2 add r0, r5, r0 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r0, #0x25 lsl r0, r0, #4 add r0, r5, r0 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r0, #0x9d lsl r0, r0, #2 add r0, r5, r0 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r0, #0xa2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r0, #0xa7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy ldr r0, [r5, #0x18] ldr r0, [r0] cmp r0, #1 @@ -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 66e7a196..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 @@ -559,7 +559,7 @@ MOD84_021D84F8: ; 0x021D84F8 str r0, [r4, #0x30] mov r0, #0x4b mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r4, #0x24] mov r3, #0 lsl r2, r5, #0x18 @@ -577,14 +577,14 @@ MOD84_021D84F8: ; 0x021D84F8 bl FUN_02019064 ldr r0, [r4, #0x24] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, [r4, #0x24] bl FUN_02019270 ldr r0, [r4, #0x24] bl CopyWindowToVram mov r0, #0x4b mov r1, #1 - bl FUN_02018FF4 + bl AllocWindows str r0, [r4, #0x28] mov r3, #0 lsl r2, r5, #0x18 @@ -712,7 +712,7 @@ _021D864C: ble _021D86D0 ldr r0, [r5, #0x28] mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer mov r1, #0 str r1, [sp] mov r0, #0xff @@ -750,7 +750,7 @@ _021D864C: ldr r0, [r5, #0x24] ldr r1, [r1, #0xc] lsr r3, r3, #0x10 - bl FUN_02019658 + bl BlitBitmapRectToWindow _021D86D0: mov r1, #1 str r1, [r5, #0x18] @@ -786,7 +786,7 @@ _021D86E0: ldr r0, [r5, #0x24] add r2, r1, #0 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect b _021D8754 _021D8718: add r1, r3, #0 @@ -803,7 +803,7 @@ _021D8718: ldr r0, [r5, #0x24] add r2, r1, #0 lsr r3, r3, #0x10 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #0 mov r0, #1 lsl r0, r0, #8 @@ -816,7 +816,7 @@ _021D8718: ldr r0, [r5, #0x24] add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect _021D8754: mov r0, #1 str r0, [r5, #0x18] @@ -880,7 +880,7 @@ MOD84_021D87B0: ; 0x021D87B0 beq _021D87CE ldr r0, [r5, #0x24] mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r4, _021D8814 ; =0x0001020F b _021D87D0 _021D87CE: @@ -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 @@ -1836,10 +1836,10 @@ _021D8ECE: _021D8EF2: add r0, r4, #0 add r0, #0x10 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, r4, #0 add r0, #0x34 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r2, #0 str r2, [sp] mov 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 @@ -1922,12 +1922,12 @@ _021D8F86: lsr r7, r5, #1 _021D8FA6: add r0, r4, #0 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy ldr r0, [sp, #0x20] add r1, r5, #0 mov r2, #1 add r3, r4, #0 - bl FUN_020B1768 + bl NNS_G2dLoadImage1DMapping add r6, r6, #1 add r4, #0x24 add r5, r5, r7 @@ -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] @@ -3164,7 +3164,7 @@ _021D995A: str r0, [r4, #0x48] add r0, r4, #0 add r0, #0x10 - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy mov r2, #0 str r2, [sp] mov r0, #1 @@ -3178,10 +3178,10 @@ _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 FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r0, #0x4b str r0, [sp] add r0, r4, #0 @@ -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] @@ -4259,10 +4259,10 @@ _021DA1E2: str r0, [r4, #0x54] add r0, r4, #0 add r0, #0x1c - bl FUN_020B1A24 + bl NNS_G2dInitImageProxy add r0, r4, #0 add r0, #0x40 - bl FUN_020B19DC + bl NNS_G2dInitImagePaletteProxy mov r2, #0 str r2, [sp] mov r0, #1 @@ -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/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index adb49508..221d2f9d 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -570,7 +570,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, _021D7B1C ; =0x00000448 add r5, r0, #0 add r1, r4, r1 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r1, _021D7B1C ; =0x00000448 mov r2, #0x1a ldr r1, [r4, r1] @@ -588,7 +588,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, _021D7B20 ; =0x00000444 add r5, r0, #0 add r1, r4, r1 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, _021D7B20 ; =0x00000444 mov r1, #0 ldr r3, [r4, r0] @@ -609,7 +609,7 @@ MOD85_021D797C: ; 0x021D797C lsl r1, r1, #6 add r1, r4, r1 add r5, r0, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData mov r0, #0x11 lsl r0, r0, #6 ldr r3, [r4, r0] @@ -633,7 +633,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, _021D7B20 ; =0x00000444 add r5, r0, #0 add r1, r4, r1 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, _021D7B20 ; =0x00000444 mov r1, #0 ldr r3, [r4, r0] @@ -654,7 +654,7 @@ MOD85_021D797C: ; 0x021D797C lsl r1, r1, #6 add r1, r4, r1 add r5, r0, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData mov r0, #0x11 lsl r0, r0, #6 ldr r3, [r4, r0] @@ -678,7 +678,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, _021D7B1C ; =0x00000448 add r5, r0, #0 add r1, r4, r1 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r1, _021D7B1C ; =0x00000448 mov r2, #0x1a ldr r1, [r4, r1] @@ -696,7 +696,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, _021D7B20 ; =0x00000444 add r5, r0, #0 add r1, r4, r1 - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, _021D7B20 ; =0x00000444 mov r1, #0 ldr r3, [r4, r0] @@ -717,7 +717,7 @@ MOD85_021D797C: ; 0x021D797C lsl r1, r1, #6 add r1, r4, r1 add r5, r0, #0 - bl FUN_020B0180 + bl NNS_G2dGetUnpackedScreenData mov r0, #0x11 lsl r0, r0, #6 ldr r3, [r4, r0] @@ -847,7 +847,7 @@ MOD85_021D7BEC: ; 0x021D7BEC add r0, r4, #0 add r0, #8 mov r1, #0xf - bl FUN_02019620 + bl FillWindowPixelBuffer ldr r0, _021D7C40 ; =0x00000408 ldr r2, [r4, #0x18] ldr r0, [r5, r0] @@ -884,7 +884,7 @@ MOD85_021D7C44: ; 0x021D7C44 add r0, r5, r4 add r0, #8 mov r1, #0 - bl FUN_02019620 + bl FillWindowPixelBuffer add r0, r5, r4 add r0, #8 bl FUN_02019220 @@ -933,7 +933,7 @@ MOD85_021D7CB0: ; 0x021D7CB0 push {r3, r4, lr} sub sp, #0x1c add r4, r0, #0 - bl FUN_020B0FC0 + bl NNS_G2dInitOamManagerModule mov r0, #0 str r0, [sp] mov r1, #0x80 @@ -1477,7 +1477,7 @@ MOD85_021D80F8: ; 0x021D80F8 bl AllocFromHeap add r4, r0, #0 bne _021D810C - bl ErrorHandling + bl GF_AssertFail _021D810C: add r0, r4, #0 mov r1, #0 @@ -1535,7 +1535,7 @@ _021D8168: add r5, r0, #0 cmp r5, #0 bne _021D8172 - bl ErrorHandling + bl GF_AssertFail _021D8172: ldr r0, _021D8184 ; =0x00000438 add r1, r6, #0 @@ -2477,7 +2477,7 @@ MOD85_021D885C: ; 0x021D885C ldr r0, [r4, #0x50] cmp r0, #6 blt _021D886A - bl ErrorHandling + bl GF_AssertFail _021D886A: mov r0, #0x19 str r0, [r4] @@ -2493,7 +2493,7 @@ MOD85_021D8874: ; 0x021D8874 ldr r0, [r4, #0x50] cmp r0, #6 blt _021D8882 - bl ErrorHandling + bl GF_AssertFail _021D8882: mov r0, #0x1c str r0, [r4] @@ -3175,7 +3175,7 @@ MOD85_021D8D88: ; 0x021D8D88 str r0, [r4, #0x10] cmp r0, #1 bge _021D8D9A - bl ErrorHandling + bl GF_AssertFail _021D8D9A: add r0, r4, #0 mov r1, #0 @@ -3715,7 +3715,7 @@ MOD85_021D91A4: ; 0x021D91A4 sub r0, r0, #1 str r0, [r4, #0x10] beq _021D91B4 - bl ErrorHandling + bl GF_AssertFail _021D91B4: ldr r0, [r4, #0x2c] cmp r0, #1 @@ -4226,7 +4226,7 @@ _021D950C: bl MOD85_021D95B4 pop {r3, pc} _021D9512: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, pc} .align 2, 0 @@ -5579,7 +5579,7 @@ _021D9F0C: add r5, r5, #1 cmp r5, #0x15 ble _021D9EFC - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _021D9F18: cmp r1, #0 @@ -5604,7 +5604,7 @@ _021D9F3A: add r5, r5, #1 cmp r5, #0x15 ble _021D9F28 - bl ErrorHandling + bl GF_AssertFail pop {r4, r5, r6, pc} _021D9F46: mov r5, #1 @@ -5621,7 +5621,7 @@ _021D9F5A: add r5, r5, #1 cmp r5, #0x15 ble _021D9F48 - bl ErrorHandling + bl GF_AssertFail b _021D9F84 _021D9F66: mov r5, #1 @@ -5638,9 +5638,9 @@ _021D9F7A: add r5, r5, #1 cmp r5, #0x15 ble _021D9F68 - bl ErrorHandling + bl GF_AssertFail _021D9F84: - bl ErrorHandling + bl GF_AssertFail _021D9F88: pop {r4, r5, r6, pc} .align 2, 0 @@ -5678,7 +5678,7 @@ _021D9FC0: add r5, r5, #1 cmp r5, #0x15 blt _021D9FAE - bl ErrorHandling + bl GF_AssertFail _021D9FCA: ldr r0, [r6, #0x10] cmp r0, #0 @@ -5703,7 +5703,7 @@ _021D9FEE: add r5, r5, #1 cmp r5, #0x15 blt _021D9FDC - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021D9FFA: mov r5, #0 @@ -5720,7 +5720,7 @@ _021DA00E: add r5, r5, #1 cmp r5, #0x15 ble _021D9FFC - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, r6, r7, pc} _021DA01A: mov r5, #0 @@ -5737,9 +5737,9 @@ _021DA02E: add r5, r5, #1 cmp r5, #0x15 ble _021DA01C - bl ErrorHandling + bl GF_AssertFail _021DA038: - bl ErrorHandling + bl GF_AssertFail _021DA03C: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6044,7 +6044,7 @@ _021DA238: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021DA240: - bl ErrorHandling + bl GF_AssertFail mov r0, #0 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -7075,7 +7075,7 @@ _021DA9EE: ldr r0, _021DAA20 ; =0x021DFCC4 ldr r0, [r0, r1] str r0, [r5, #0x18] - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -7158,7 +7158,7 @@ _021DAAA4: mov r1, #1 lsl r0, r0, #2 str r1, [r6, r0] - bl ErrorHandling + bl GF_AssertFail add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -7254,7 +7254,7 @@ _021DAB52: str r1, [r4, r0] pop {r3, r4, r5, pc} _021DAB6A: - bl ErrorHandling + bl GF_AssertFail mov r0, #2 ldr r1, [r4, #0x74] lsl r0, r0, #8 @@ -7470,7 +7470,7 @@ _021DACF8: add r2, #0x10 cmp r1, #9 blt _021DACC8 - bl ErrorHandling + bl GF_AssertFail mov r0, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -7686,7 +7686,7 @@ MOD85_021DAE70: ; 0x021DAE70 ldr r6, [r7, #0x48] cmp r6, #0 bne _021DAE80 - bl ErrorHandling + bl GF_AssertFail _021DAE80: mov r4, #0 _021DAE82: @@ -7713,7 +7713,7 @@ _021DAE9C: str r0, [r5, #0x18] b _021DAEB4 _021DAEB0: - bl ErrorHandling + bl GF_AssertFail _021DAEB4: add r4, r4, #1 lsr r6, r6, #1 @@ -8587,7 +8587,7 @@ MOD85_021DB494: ; 0x021DB494 bl MOD85_021D8144 add r1, sp, #0 add r6, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData ldr r0, [sp] mov r1, #1 add r2, r4, #4 @@ -8627,7 +8627,7 @@ MOD85_021DB494: ; 0x021DB494 bl MOD85_021D8144 add r1, sp, #0 add r6, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData add r2, r4, #0 ldr r0, [sp] mov r1, #0 @@ -8641,7 +8641,7 @@ MOD85_021DB494: ; 0x021DB494 bl MOD85_021D8144 add r1, sp, #0 add r6, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData add r2, r4, #0 ldr r0, [sp] mov r1, #0 @@ -8655,7 +8655,7 @@ MOD85_021DB494: ; 0x021DB494 bl MOD85_021D8144 add r1, sp, #0 add r6, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData add r2, r4, #0 ldr r0, [sp] mov r1, #0 @@ -8669,7 +8669,7 @@ MOD85_021DB494: ; 0x021DB494 bl MOD85_021D8144 add r1, sp, #0 add r6, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData mov r2, #0x51 lsl r2, r2, #2 ldr r0, [sp] @@ -8684,7 +8684,7 @@ MOD85_021DB494: ; 0x021DB494 bl MOD85_021D8144 add r1, sp, #0 add r6, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData mov r2, #0x59 lsl r2, r2, #2 ldr r0, [sp] @@ -8705,7 +8705,7 @@ MOD85_021DB494: ; 0x021DB494 bl MOD85_021D8144 add r1, sp, #0 add r5, r0, #0 - bl FUN_020B0138 + bl NNS_G2dGetUnpackedPaletteData mov r2, #0x69 lsl r2, r2, #2 ldr r0, [sp] @@ -9228,7 +9228,7 @@ MOD85_021DB95C: ; 0x021DB95C ldr r0, [r4, r0] cmp r0, #0 beq _021DB97A - bl ErrorHandling + bl GF_AssertFail _021DB97A: str r4, [sp] mov r0, #0x8f @@ -10066,7 +10066,7 @@ MOD85_021DBF48: ; 0x021DBF48 beq _021DBF6A cmp r4, #2 beq _021DBF62 - bl ErrorHandling + bl GF_AssertFail _021DBF62: ldr r1, [r5] mov r0, #1 @@ -10106,7 +10106,7 @@ _021DBF92: add r0, r2, #0 pop {r3, pc} _021DBF9C: - bl ErrorHandling + bl GF_AssertFail mov r0, #4 pop {r3, pc} thumb_func_end MOD85_021DBF70 @@ -10142,7 +10142,7 @@ _021DBFBE: _021DBFCC: cmp r4, #3 blt _021DBFD4 - bl ErrorHandling + bl GF_AssertFail _021DBFD4: lsl r0, r4, #2 add r0, r5, r0 @@ -10297,7 +10297,7 @@ MOD85_021DC0D8: ; 0x021DC0D8 ldr r5, [r0, #0x48] cmp r4, #6 bne _021DC0E6 - bl ErrorHandling + bl GF_AssertFail _021DC0E6: ldr r3, _021DC104 ; =0x021DFCAC lsl r2, r4, #2 @@ -11585,7 +11585,7 @@ MOD85_021DCA68: ; 0x021DCA68 ldr r4, [r6, #0x38] cmp r5, #5 blt _021DCA78 - bl ErrorHandling + bl GF_AssertFail _021DCA78: mov r1, #2 mov r2, #0x45 @@ -11630,7 +11630,7 @@ _021DCA78: bl FUN_0200CA60 cmp r0, #0 bne _021DCADC - bl ErrorHandling + bl GF_AssertFail _021DCADC: ldr r0, _021DCAFC ; =MOD85_021DCB44 ldr r2, _021DCAF8 ; =0x00000101 @@ -11638,7 +11638,7 @@ _021DCADC: bl FUN_0200CA98 cmp r0, #0 bne _021DCAEE - bl ErrorHandling + bl GF_AssertFail _021DCAEE: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -12012,7 +12012,7 @@ MOD85_021DCD50: ; 0x021DCD50 bl FUN_0200CA60 cmp r0, #0 bne _021DCDB8 - bl ErrorHandling + bl GF_AssertFail _021DCDB8: ldr r0, _021DCDD4 ; =MOD85_021DCD28 ldr r2, _021DCDD0 ; =0x00000101 @@ -12020,7 +12020,7 @@ _021DCDB8: bl FUN_0200CA98 cmp r0, #0 bne _021DCDCA - bl ErrorHandling + bl GF_AssertFail _021DCDCA: pop {r3, r4, r5, pc} .align 2, 0 @@ -12126,7 +12126,7 @@ MOD85_021DCE2C: ; 0x021DCE2C bl FUN_0200CA60 cmp r0, #0 bne _021DCE9C - bl ErrorHandling + bl GF_AssertFail _021DCE9C: ldr r0, _021DCEBC ; =MOD85_021DCE04 ldr r2, _021DCEB8 ; =0x00000101 @@ -12134,7 +12134,7 @@ _021DCE9C: bl FUN_0200CA98 cmp r0, #0 bne _021DCEAE - bl ErrorHandling + bl GF_AssertFail _021DCEAE: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -12967,7 +12967,7 @@ MOD85_021DD4C4: ; 0x021DD4C4 bl FUN_0200CA60 cmp r0, #0 bne _021DD52C - bl ErrorHandling + bl GF_AssertFail _021DD52C: ldr r0, _021DD548 ; =MOD85_021DD498 ldr r2, _021DD544 ; =0x00000101 @@ -12975,7 +12975,7 @@ _021DD52C: bl FUN_0200CA98 cmp r0, #0 bne _021DD53E - bl ErrorHandling + bl GF_AssertFail _021DD53E: pop {r3, r4, r5, pc} .align 2, 0 @@ -14780,7 +14780,7 @@ _021DE2BC: ldr r0, [r4, #0x1c] cmp r0, #5 blt _021DE2C6 - bl ErrorHandling + bl GF_AssertFail _021DE2C6: add r0, r4, #0 bl MOD85_021DE4F0 @@ -15154,7 +15154,7 @@ _021DE572: bl FUN_0200CA60 cmp r0, #0 bne _021DE584 - bl ErrorHandling + bl GF_AssertFail _021DE584: ldr r0, _021DE5A0 ; =MOD85_021DE4C8 ldr r2, _021DE59C ; =0x00000101 @@ -15162,7 +15162,7 @@ _021DE584: bl FUN_0200CA98 cmp r0, #0 bne _021DE596 - bl ErrorHandling + bl GF_AssertFail _021DE596: pop {r3, r4, r5, pc} .align 2, 0 @@ -15188,7 +15188,7 @@ MOD85_021DE5A4: ; 0x021DE5A4 bl AllocFromHeap add r4, r0, #0 bne _021DE5C8 - bl ErrorHandling + bl GF_AssertFail _021DE5C8: ldr r0, [sp] add r1, r4, #0 @@ -15558,7 +15558,7 @@ _021DE898: cmp r1, r5 blo _021DE85E _021DE8A0: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD85_021DE840 @@ -15589,7 +15589,7 @@ _021DE8CC: cmp r4, r2 blo _021DE8BA _021DE8D4: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD85_021DE8A8 @@ -15620,7 +15620,7 @@ _021DE900: cmp r4, r2 blo _021DE8EE _021DE908: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD85_021DE8DC @@ -15679,7 +15679,7 @@ _021DE96C: cmp r1, r5 blo _021DE92E _021DE974: - bl ErrorHandling + bl GF_AssertFail add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD85_021DE910 @@ -15710,7 +15710,7 @@ _021DE9A0: cmp r4, r2 blo _021DE98E _021DE9A8: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD85_021DE97C @@ -15741,7 +15741,7 @@ _021DE9D4: cmp r4, r2 blo _021DE9C2 _021DE9DC: - bl ErrorHandling + bl GF_AssertFail pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD85_021DE9B0 @@ -15798,7 +15798,7 @@ _021DEA3C: cmp r1, r5 blo _021DEA02 _021DEA44: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD85_021DE9E4 @@ -15855,7 +15855,7 @@ _021DEAA4: cmp r1, r5 blo _021DEA6A _021DEAAC: - bl ErrorHandling + bl GF_AssertFail add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD85_021DEA4C @@ -16112,7 +16112,7 @@ _021DEC6C: str r0, [r4, #4] cmp r0, #0 bne _021DEC9A - bl ErrorHandling + bl GF_AssertFail _021DEC9A: add sp, #0x70 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 08651acb..2bd7d12a 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -504,7 +504,7 @@ MOD86_021D78D4: ; 0x021D78D4 add r0, #0x14 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect mov r1, #4 add r0, sp, #8 strb r1, [r0] @@ -523,7 +523,7 @@ MOD86_021D78D4: ; 0x021D78D4 add r0, r4, #0 add r2, r1, #0 add r3, r1, #0 - bl FUN_020196F4 + bl FillWindowPixelRect add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -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 |