diff options
Diffstat (limited to 'arm9/modules')
108 files changed, 5083 insertions, 5228 deletions
diff --git a/arm9/modules/04/asm/arm_04.s b/arm9/modules/04/asm/arm_04.s index 49201028..259f9f52 100644 --- a/arm9/modules/04/asm/arm_04.s +++ b/arm9/modules/04/asm/arm_04.s @@ -161,7 +161,7 @@ _021D8F40: ldr r0, _021D91BC ; =UNK04_02210468 mov r2, #0 ldr r1, [r0] - ldr r0, _021D91C4 ; =UNK_021D74A8 + ldr r0, _021D91C4 ; =errno str r2, [sp] str r2, [r0] add r0, r1, #0x1000 @@ -169,7 +169,7 @@ _021D8F40: ldr r1, _021D91C8 ; =UNK04_0220BF3C bl MOD04_021DA388 bl atol - ldr r1, _021D91C4 ; =UNK_021D74A8 + ldr r1, _021D91C4 ; =errno ldr r1, [r1] cmp r1, #0x22 bne _021D8F9C @@ -220,7 +220,7 @@ _021D9014: add r1, sp, #0 add r0, r2, r0 mov r2, #0xa - bl strtold2 + bl strtol ldr r2, _021D91BC ; =UNK04_02210468 ldr r1, _021D91D4 ; =0x0000100C ldr r5, [r2] @@ -324,7 +324,7 @@ _021D91B0: .align 2, 0 _021D91BC: .word UNK04_02210468 _021D91C0: .word UNK04_0220BF34 -_021D91C4: .word UNK_021D74A8 +_021D91C4: .word errno _021D91C8: .word UNK04_0220BF3C _021D91CC: .word 0x00004E85 _021D91D0: .word 0x000059D8 @@ -3164,7 +3164,7 @@ _021DB970: bl MOD04_021DA388 bl atol mov sl, r0 - ldr r0, _021DC690 ; =UNK_021D74A8 + ldr r0, _021DC690 ; =errno ldr r0, [r0] cmp r0, #0x22 bne _021DB9A0 @@ -3653,7 +3653,7 @@ _021DC080: bl MOD04_021DA388 bl atol mov sl, r0 - ldr r0, _021DC690 ; =UNK_021D74A8 + ldr r0, _021DC690 ; =errno ldr r0, [r0] cmp r0, #0x22 bne _021DC0BC @@ -3705,7 +3705,7 @@ _021DC118: _021DC14C: add r0, sp, #0x64 bl atol - ldr r1, _021DC690 ; =UNK_021D74A8 + ldr r1, _021DC690 ; =errno ldr r1, [r1] cmp r1, #0x22 bne _021DC17C @@ -3873,7 +3873,7 @@ _021DC3B4: strb r2, [r1, r0] mov r0, r1 bl atol - ldr r1, _021DC690 ; =UNK_021D74A8 + ldr r1, _021DC690 ; =errno ldr r1, [r1] cmp r1, #0x22 bne _021DC3F0 @@ -4067,7 +4067,7 @@ _021DC680: .word UNK04_0220C36C _021DC684: .word OSi_ThreadInfo _021DC688: .word 0x00001B34 _021DC68C: .word UNK04_0220C418 -_021DC690: .word UNK_021D74A8 +_021DC690: .word errno _021DC694: .word 0x0000012E _021DC698: .word UNK04_0221048C _021DC69C: .word UNK04_0220BEB4 @@ -4408,7 +4408,7 @@ MOD04_021DCA84: ; 0x021DCA84 mov r1, r6 bl strcpy mov r2, #0 - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno add r0, sp, #0x28 strb r2, [sp, #0x23] strb r2, [sp, #0x27] @@ -4418,7 +4418,7 @@ MOD04_021DCA84: ; 0x021DCA84 strb r2, [sp, #0x35] str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp] ldr r1, [r1] cmp r1, #0x22 @@ -4445,12 +4445,12 @@ _021DCBC4: ldr r0, [sp, #4] cmp r0, #0xc bhi _021DCCA8 - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno mov r2, #0 add r0, sp, #0x21 str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp, #8] ldr r0, [r1] cmp r0, #0x22 @@ -4459,7 +4459,7 @@ _021DCBC4: add r0, sp, #0x2d str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp, #0x10] ldr r0, [r1] cmp r0, #0x22 @@ -4468,7 +4468,7 @@ _021DCBC4: add r0, sp, #0x30 str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp, #0x14] ldr r0, [r1] cmp r0, #0x22 @@ -4477,7 +4477,7 @@ _021DCBC4: add r0, sp, #0x33 str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp, #0x18] ldr r0, [r1] cmp r0, #0x22 @@ -4505,7 +4505,7 @@ _021DCCA8: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _021DCCB4: .word UNK04_0220C580 -_021DCCB8: .word UNK_021D74A8 +_021DCCB8: .word errno _021DCCBC: .word UNK04_0220C550 _021DCCC0: .word UNK04_022104FC _021DCCC4: .word UNK04_022104F8 @@ -4550,7 +4550,7 @@ _021DCD20: ldmia sp!, {r4, pc} _021DCD4C: bl atol - ldr r1, _021DCEE4 ; =UNK_021D74A8 + ldr r1, _021DCEE4 ; =errno mov r2, r0 ldr r0, [r1] cmp r0, #0x22 @@ -4588,7 +4588,7 @@ _021DCDA0: _021DCDD4: add r0, sp, #0 bl atol - ldr r1, _021DCEE4 ; =UNK_021D74A8 + ldr r1, _021DCEE4 ; =errno mov r2, r0 ldr r0, [r1] cmp r0, #0x22 @@ -4659,7 +4659,7 @@ _021DCED4: .word UNK04_02210504 _021DCED8: .word 0xFFFF9DF3 _021DCEDC: .word UNK04_0220C5A0 _021DCEE0: .word UNK04_0220C5A8 -_021DCEE4: .word UNK_021D74A8 +_021DCEE4: .word errno _021DCEE8: .word 0xFFFF9E58 _021DCEEC: .word UNK04_0220C5B4 _021DCEF0: .word 0xFFFFA240 @@ -27563,7 +27563,7 @@ MOD04_021F01C4: ; 0x021F01C4 mov r2, r0 cmp r3, #0 beq _021F01FC - ldr r1, _021F0204 ; =UNK_0210420C + ldr r1, _021F0204 ; =__lower_mapC _021F01D8: cmp r3, #0 blt _021F01EC @@ -27579,7 +27579,7 @@ _021F01FC: mov r0, r2 bx lr .align 2, 0 -_021F0204: .word UNK_0210420C +_021F0204: .word __lower_mapC arm_func_end MOD04_021F01C4 arm_func_start MOD04_021F0208 @@ -33471,7 +33471,7 @@ _021F5418: blt _021F5434 cmp r1, #0x80 bge _021F5434 - ldr r0, _021F5844 ; =UNK_0210428C + ldr r0, _021F5844 ; =__upper_mapC ldrb r1, [r0, r1] _021F5434: mov r0, r1, lsl #0x18 @@ -33758,7 +33758,7 @@ _021F5834: .word UNK04_0220E2B8 _021F5838: .word UNK04_0220E2C4 _021F583C: .word UNK04_0220E2D0 _021F5840: .word UNK04_0220E2E8 -_021F5844: .word UNK_0210428C +_021F5844: .word __upper_mapC _021F5848: .word UNK04_0220E2F8 _021F584C: .word UNK04_0220E2FC _021F5850: .word UNK04_0220E300 @@ -45849,7 +45849,7 @@ _021FFDB8: add r3, r4, #1 cmp r0, #0 beq _021FFE10 - ldr r1, _021FFEA8 ; =UNK_0210430C + ldr r1, _021FFEA8 ; =__msl_digit mov r2, #0 _021FFDD0: cmp r0, #0 @@ -45915,7 +45915,7 @@ _021FFE84: .align 2, 0 _021FFEA0: .word UNK04_0220EFD8 _021FFEA4: .word UNK04_0220EFF8 -_021FFEA8: .word UNK_0210430C +_021FFEA8: .word __msl_digit _021FFEAC: .word 0x0000FFFF arm_func_end MOD04_021FFD28 @@ -49986,7 +49986,7 @@ MOD04_022034F4: ; 0x022034F4 mov ip, #0 cmp lr, #0 beq _02203538 - ldr r3, _0220354C ; =UNK_0210420C + ldr r3, _0220354C ; =__lower_mapC ldr r2, _02203550 ; =0x9CCF9319 _02203514: cmp lr, #0 @@ -50006,7 +50006,7 @@ _02203538: add sp, sp, #4 ldmfd sp!, {pc} .align 2, 0 -_0220354C: .word UNK_0210420C +_0220354C: .word __lower_mapC _02203550: .word 0x9CCF9319 arm_func_end MOD04_022034F4 @@ -50366,7 +50366,7 @@ _022039A8: mov r1, #0 b _022039C0 _022039B0: - ldr r1, _022039DC ; =UNK_0210430C + ldr r1, _022039DC ; =__msl_digit mov r2, r2, lsl #1 ldrh r1, [r1, r2] and r1, r1, #8 @@ -50381,7 +50381,7 @@ _022039D0: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _022039D8: .word UNK04_0220F7E0 -_022039DC: .word UNK_0210430C +_022039DC: .word __msl_digit arm_func_end MOD04_0220394C arm_func_start MOD04_022039E0 @@ -53297,7 +53297,7 @@ MOD04_02206124: ; 0x02206124 mov ip, #0 cmp lr, #0 beq _02206168 - ldr r3, _0220617C ; =UNK_0210420C + ldr r3, _0220617C ; =__lower_mapC ldr r2, _02206180 ; =0x9CCF9319 _02206144: cmp lr, #0 @@ -53317,7 +53317,7 @@ _02206168: add sp, sp, #4 ldmfd sp!, {pc} .align 2, 0 -_0220617C: .word UNK_0210420C +_0220617C: .word __lower_mapC _02206180: .word 0x9CCF9319 arm_func_end MOD04_02206124 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 730bfc00..9cea7a32 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -8,7 +8,7 @@ MOD05_021D74E0: ; 0x021D74E0 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_02009F80 ldr r0, [r4, #0x34] @@ -69,7 +69,7 @@ _021D7564: mov r0, #3 ldr r2, [r2, #4] mov r1, #4 - bl FUN_0201681C + bl CreateHeap ldr r0, [r4, #4] cmp r0, #0 beq _021D757A @@ -101,7 +101,7 @@ _021D757A: bl MOD05_021D7B38 bl GX_SwapDisplay mov r0, #4 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #8] bl MOD05_021D7A30 mov r0, #0 @@ -361,7 +361,7 @@ _021D7806: mov r0, #0 str r0, [r4, #4] mov r0, #4 - bl FUN_020168D0 + bl DestroyHeap ldr r0, [r4, #0x70] ldr r0, [r0] lsl r0, r0, #8 @@ -617,7 +617,7 @@ MOD05_021D7A30: ; 0x021D7A30 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7B04 ; =UNK05_021F6468 add r3, sp, #0x3c ldmia r5!, {r0, r1} @@ -632,15 +632,15 @@ MOD05_021D7A30: ; 0x021D7A30 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7B08 ; =UNK05_021F644C add r3, sp, #0x20 ldmia r5!, {r0, r1} @@ -655,15 +655,15 @@ MOD05_021D7A30: ; 0x021D7A30 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7B0C ; =UNK05_021F6484 add r3, sp, #4 ldmia r5!, {r0, r1} @@ -678,15 +678,15 @@ MOD05_021D7A30: ; 0x021D7A30 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 add r1, sp, #0 strh r0, [r1] @@ -713,13 +713,13 @@ MOD05_021D7B10: ; 0x021D7B10 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index e228ee0a..bda94277 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -575,7 +575,7 @@ _021D856A: cmp r0, #1 bne _021D858E ldr r0, _021D8598 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl FUN_02035080 add sp, #8 @@ -770,7 +770,7 @@ _021D8710: lsr r0, r0, #0x1f beq _021D8726 ldr r0, _021D8730 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl FUN_0203515C mov r0, #1 @@ -881,7 +881,7 @@ _021D87F4: lsr r0, r0, #0x1f beq _021D8816 ldr r0, _021D881C ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl FUN_02035118 mov r0, #4 @@ -1027,7 +1027,7 @@ _021D892C: lsr r0, r0, #0x1f beq _021D8946 ldr r0, _021D8950 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl FUN_02035080 add sp, #4 diff --git a/arm9/modules/05/asm/mod05_021D9320.s b/arm9/modules/05/asm/mod05_021D9320.s index ec304548..419b92fd 100644 --- a/arm9/modules/05/asm/mod05_021D9320.s +++ b/arm9/modules/05/asm/mod05_021D9320.s @@ -53,7 +53,7 @@ _021D9374: str r0, [sp, #0x20] ldr r1, [r6] add r0, r4, #0 - bl FUN_020161A4 + bl AllocAndReadFile ldr r1, [sp, #0x20] str r0, [sp, #0x24] add r2, r4, #0 @@ -161,7 +161,7 @@ _021D944A: ldr r1, [sp, #0x10] add r0, r4, #0 ldr r1, [r1, #0x18] - bl FUN_020161A4 + bl AllocAndReadFile mov r3, #0x4e lsl r3, r3, #2 ldr r1, [r5, r3] diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s index ee169f98..442bfb26 100644 --- a/arm9/modules/05/asm/mod05_021D9A48.s +++ b/arm9/modules/05/asm/mod05_021D9A48.s @@ -199,7 +199,7 @@ _021D9B98: mov r1, #4 add r0, r7, #0 add r2, r1, #0 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator mov r0, #0x6e mov r1, #4 bl NARC_ctor @@ -1564,7 +1564,7 @@ _021DA526: beq _021DA542 lsl r0, r4, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021DA542: add r0, r5, #0 mov r1, #0 diff --git a/arm9/modules/05/asm/mod05_021DA5B8.s b/arm9/modules/05/asm/mod05_021DA5B8.s index b4648ab3..eb8560b0 100644 --- a/arm9/modules/05/asm/mod05_021DA5B8.s +++ b/arm9/modules/05/asm/mod05_021DA5B8.s @@ -1489,7 +1489,7 @@ _021DB164: str r0, [r5, #8] strb r0, [r5, #4] ldr r0, _021DB1C8 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -1552,7 +1552,7 @@ _021DB1F0: str r0, [r4, #8] strb r0, [r4, #4] ldr r0, _021DB24C ; =0x00000603 - bl FUN_020054C8 + bl PlaySE mov r1, #0 str r1, [sp] mov r0, #6 diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s index eaee32f8..bba92897 100644 --- a/arm9/modules/05/asm/mod05_021DB44C.s +++ b/arm9/modules/05/asm/mod05_021DB44C.s @@ -255,7 +255,7 @@ MOD05_021DB61C: ; 0x021DB61C str r1, [sp] mov r0, #4 add r1, r2, #0 - bl FUN_020161A4 + bl AllocAndReadFile mov r1, #0 str r0, [sp, #0x14] str r1, [sp, #8] diff --git a/arm9/modules/05/asm/mod05_021DBEF4.s b/arm9/modules/05/asm/mod05_021DBEF4.s index f65de9d8..ae93e2a3 100644 --- a/arm9/modules/05/asm/mod05_021DBEF4.s +++ b/arm9/modules/05/asm/mod05_021DBEF4.s @@ -120,7 +120,7 @@ _021DBFA8: add r7, #0x10 mov r0, #4 add r1, sp, #0xc - bl FUN_020161A4 + bl AllocAndReadFile str r0, [r7, r5] add r0, r6, #0 str r0, [sp, #8] @@ -128,7 +128,7 @@ _021DBFA8: str r0, [sp, #8] ldr r0, [r7, r5] mov r1, #4 - bl FUN_02016324 + bl OpenFileCached ldr r1, [sp, #8] str r0, [r1, r5] add r0, r1, #0 diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index 7b1e767f..0e77cb4b 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -1903,7 +1903,7 @@ MOD05_021DCECC: ; 0x021DCECC ldr r1, [r1, #0xc] mov r2, #0x20 mov r3, #0xc0 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r0, [sp] bl FreeToHeap mov r0, #0 @@ -1945,7 +1945,7 @@ MOD05_021DCF14: ; 0x021DCF14 ldr r0, [r0, #8] ldr r3, [r3, #0x10] mov r1, #2 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #8] bl FreeToHeap mov r0, #0 @@ -1997,7 +1997,7 @@ _021DCFA0: ldr r0, [r0, #8] mov r1, #2 add r2, #0xc - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram mov r0, #0x41 lsl r0, r0, #2 ldr r3, [sp, #0x18] @@ -2007,7 +2007,7 @@ _021DCFA0: ldr r3, [r3, #8] mov r1, #2 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData mov r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -2019,13 +2019,13 @@ _021DCFA0: ldr r0, [r0, #8] mov r1, #2 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette mov r0, #0x41 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #2 ldr r0, [r0, #8] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [sp, #0x14] bl FreeToHeap mov r0, #0 @@ -8960,13 +8960,13 @@ _021E060E: mov r0, #0x24 str r0, [r4, #8] ldr r0, _021E06F4 ; =0x0000063D - bl FUN_020054C8 + bl PlaySE b _021E06CC _021E0644: mov r0, #0xc8 str r0, [r4, #8] ldr r0, _021E06F8 ; =0x0000063C - bl FUN_020054C8 + bl PlaySE b _021E06CC _021E0650: ldr r0, [r4, #0x14] @@ -10156,7 +10156,7 @@ _021E0FB6: lsr r0, r0, #0x10 add r1, r1, #4 strh r0, [r5, r1] - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _021E0FCC: .word 0x00000F5C diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index 0e1a6b44..f3c8709a 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -118,7 +118,7 @@ _021E1442: _021E1456: mov r0, #0x62 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #8] mov r1, #0 bl FUN_0205F42C diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 22b26c5d..20fc2752 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -274,7 +274,7 @@ _021E1CA8: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -531,7 +531,7 @@ MOD05_021E1ECC: ; 0x021E1ECC push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, _021E1F30 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] @@ -545,7 +545,7 @@ MOD05_021E1ECC: ; 0x021E1ECC add r0, r6, #0 add r0, #0xa8 ldr r0, [r0] - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _021E1EFC: @@ -685,7 +685,7 @@ _021E1FC8: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized b _021E2032 _021E2002: add r1, r4, #0 @@ -710,7 +710,7 @@ _021E2002: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized _021E2032: mov r0, #0 str r0, [sp] @@ -1061,7 +1061,7 @@ _021E22B8: cmp r6, r0 beq _021E22EE ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021E22EE: ldr r0, _021E2360 ; =gMain mov r1, #0x40 @@ -1098,7 +1098,7 @@ _021E2320: cmp r0, #1 bne _021E235A ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xa0 ldr r1, _021E2364 ; =0x0000FFFE @@ -1109,7 +1109,7 @@ _021E2320: pop {r4, r5, r6, pc} _021E2346: ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xa0 ldr r0, [r0] @@ -1128,7 +1128,7 @@ MOD05_021E2368: ; 0x021E2368 push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, _021E23CC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x6d lsl r0, r0, #2 mov r1, #0 @@ -1142,7 +1142,7 @@ MOD05_021E2368: ; 0x021E2368 bl FUN_0200CCF8 add r0, r6, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _021E2398: @@ -1291,7 +1291,7 @@ _021E2496: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -1411,7 +1411,7 @@ MOD05_021E25A4: ; 0x021E25A4 add r0, r6, #0 add r0, #0xa8 ldr r0, [r0] - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _021E25D0: @@ -1626,7 +1626,7 @@ _021E270A: ldr r0, [r0, #8] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -1733,7 +1733,7 @@ MOD05_021E27E8: ; 0x021E27E8 add r1, r4, #0 mov r2, #3 add r3, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -1791,7 +1791,7 @@ MOD05_021E288C: ; 0x021E288C bl FUN_0200CCF8 add r0, r4, #0 mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor pop {r4, pc} thumb_func_start MOD05_021E28A0 @@ -1865,7 +1865,7 @@ MOD05_021E28A0: ; 0x021E28A0 ldr r0, [sp, #0xc] bl DestroyMsgData add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -1893,7 +1893,7 @@ MOD05_021E2950: ; 0x021E2950 add r1, r4, #0 mov r2, #3 add r3, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -1925,7 +1925,7 @@ MOD05_021E29B4: ; 0x021E29B4 bl FUN_0200CCF8 add r0, r4, #0 mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor pop {r4, pc} thumb_func_start MOD05_021E29C8 @@ -1992,7 +1992,7 @@ MOD05_021E29C8: ; 0x021E29C8 add r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -2022,7 +2022,7 @@ MOD05_021E2A70: ; 0x021E2A70 add r1, r4, #0 mov r2, #3 add r3, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -2112,7 +2112,7 @@ MOD05_021E2AD4: ; 0x021E2AD4 add r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index a81ba2f1..9a7c0b1f 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -36,7 +36,7 @@ MOD05_021E2EA4: ; 0x021E2EA4 add r1, #0x20 str r0, [sp, #0x10] ldr r0, [r4, #0x1c] - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] ldr r2, _021E2EE0 ; =0x000003CF @@ -61,7 +61,7 @@ MOD05_021E2EE4: ; 0x021E2EE4 add r0, #0x38 mov r1, #4 add r7, r3, #0 - bl FUN_0201AB28 + bl LoadCharacterDataFromFile str r0, [r5, #0x34] add r3, r0, #0 str r4, [sp] @@ -69,11 +69,11 @@ MOD05_021E2EE4: ; 0x021E2EE4 ldr r0, [r5, #0x1c] ldr r3, [r3, #0x10] add r1, r6, #0 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r2, _021E2F30 ; =UNK05_021FD62C add r0, sp, #4 mov r1, #4 - bl FUN_0201AB44 + bl LoadPaletteDataFromFile ldr r0, [r0, #0xc] mov r1, #1 add r2, r7, #0 @@ -367,7 +367,7 @@ _021E314E: ldr r0, [r4, #0x1c] ldr r3, [r4, #0xc] add r2, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0xc] cmp r0, #0 bne _021E31D0 @@ -401,7 +401,7 @@ _021E318E: ldr r0, [r4, #0x1c] ldr r3, [r4, #0xc] add r2, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0xc] cmp r0, #0x26 bne _021E31D0 @@ -498,7 +498,7 @@ MOD05_021E3248: ; 0x021E3248 bl DestroyMsgData add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x40] bl String_dtor ldr r0, [r4, #0x38] @@ -522,7 +522,7 @@ MOD05_021E3270: ; 0x021E3270 ldr r0, [r4, #0x1c] add r2, r1, #0 mov r3, #0x26 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x26 str r0, [r4, #0xc] ldr r0, _021E32EC ; =MOD05_021E3124 @@ -584,12 +584,12 @@ MOD05_021E32F0: ; 0x021E32F0 _021E32FE: add r0, r4, #0 add r0, #0x20 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r1, #3 ldr r0, [r4, #0x1c] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, [r4, #0x1c] add r0, r4, #0 bl MOD05_021E3114 diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s index 42f9037e..9bd14da2 100644 --- a/arm9/modules/05/asm/mod05_021E3444.s +++ b/arm9/modules/05/asm/mod05_021E3444.s @@ -1055,7 +1055,7 @@ MOD05_021E3C14: ; 0x021E3C14 ldmia r6!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -1071,20 +1071,20 @@ MOD05_021E3C14: ; 0x021E3C14 mov r1, #1 str r0, [r2] add r0, r4, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -1100,20 +1100,20 @@ MOD05_021E3C14: ; 0x021E3C14 mov r1, #2 str r0, [r2] add r0, r4, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 add r2, sp, #0x1c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -1129,20 +1129,20 @@ MOD05_021E3C14: ; 0x021E3C14 str r0, [r2] add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 add r2, sp, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #8 mov r1, #0 bl GX_EngineAToggleLayers @@ -1214,7 +1214,7 @@ MOD05_021E3D70: ; 0x021E3D70 lsl r1, r1, #0x18 ldr r3, [r3, #0x20] lsr r1, r1, #0x18 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams add r0, r4, #0 bl FUN_0200CAB4 add sp, #0xc diff --git a/arm9/modules/05/asm/mod05_021E4AE4.s b/arm9/modules/05/asm/mod05_021E4AE4.s index 98146a9c..09f66fe5 100644 --- a/arm9/modules/05/asm/mod05_021E4AE4.s +++ b/arm9/modules/05/asm/mod05_021E4AE4.s @@ -1093,7 +1093,7 @@ MOD05_021E5294: ; 0x021E5294 add r1, r0, #0 add r0, r4, #0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator pop {r4, pc} .section .rodata diff --git a/arm9/modules/05/asm/mod05_021E5AB4.s b/arm9/modules/05/asm/mod05_021E5AB4.s index 3b0d6a5f..eebf0d96 100644 --- a/arm9/modules/05/asm/mod05_021E5AB4.s +++ b/arm9/modules/05/asm/mod05_021E5AB4.s @@ -99,7 +99,7 @@ MOD05_021E5B30: ; 0x021E5B30 mov r3, #0 bl MOD05_021E4DC4 ldr r0, _021E5B7C ; =0x00000609 - bl FUN_020054C8 + bl PlaySE add sp, #0x1c pop {r4, r5, pc} nop diff --git a/arm9/modules/05/asm/mod05_021E5FD8.s b/arm9/modules/05/asm/mod05_021E5FD8.s index f341dfd8..6064c13b 100644 --- a/arm9/modules/05/asm/mod05_021E5FD8.s +++ b/arm9/modules/05/asm/mod05_021E5FD8.s @@ -92,7 +92,7 @@ _021E6088: mov r1, #0 bl FUN_02055450 ldr r0, _021E6098 ; =0x00000618 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} .balign 4, 0 _021E6098: .word 0x00000618 @@ -474,7 +474,7 @@ _021E636C: add r0, r6, #0 bl FUN_0205ADDC ldr r0, _021E63D0 ; =0x00000627 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1011,7 +1011,7 @@ MOD05_021E67C0: ; 0x021E67C0 b _021E68C6 _021E67E4: ldr r0, _021E68CC ; =0x00000651 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1029,7 +1029,7 @@ _021E6804: cmp r0, #5 blt _021E6824 ldr r0, _021E68D0 ; =0x00000652 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0xc] mov r1, #1 bl FUN_0205574C @@ -1177,7 +1177,7 @@ _021E6938: add r0, r4, #0 bl FUN_02057654 ldr r0, _021E6950 ; =0x0000065B - bl FUN_020054C8 + bl PlaySE mov r0, #0 pop {r4, pc} nop @@ -1352,7 +1352,7 @@ MOD05_021E6A58: ; 0x021E6A58 bl MOD06_0224F0BC str r0, [r5, #0x2c] ldr r0, _021E6AA8 ; =0x00000627 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -1631,7 +1631,7 @@ MOD05_021E6CA0: ; 0x021E6CA0 cmp r0, #1 bne _021E6CBA ldr r0, _021E6CC0 ; =0x0000064D - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1862,7 +1862,7 @@ MOD05_021E6E6C: ; 0x021E6E6C cmp r0, #1 bne _021E6E86 ldr r0, _021E6E8C ; =0x0000064D - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] diff --git a/arm9/modules/05/asm/mod05_021E7504.s b/arm9/modules/05/asm/mod05_021E7504.s index d7f960b2..dc029b32 100644 --- a/arm9/modules/05/asm/mod05_021E7504.s +++ b/arm9/modules/05/asm/mod05_021E7504.s @@ -65,7 +65,7 @@ _021E7564: mov r0, #1 str r0, [r5, #8] ldr r0, _021E760C ; =0x0000064F - bl FUN_020054C8 + bl PlaySE _021E756E: ldr r0, [r5, #0xc] lsr r2, r0, #0x1f @@ -192,7 +192,7 @@ _021E763C: add r0, r4, #0 bl MOD05_021F1D8C ldr r0, _021E774C ; =0x0000064F - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r5, #8] _021E7694: diff --git a/arm9/modules/05/asm/mod05_021E779C.s b/arm9/modules/05/asm/mod05_021E779C.s index 7c09387c..012dbb1d 100644 --- a/arm9/modules/05/asm/mod05_021E779C.s +++ b/arm9/modules/05/asm/mod05_021E779C.s @@ -340,7 +340,7 @@ MOD05_021E79A8: ; 0x021E79A8 cmp r0, #1 bne _021E79FC ldr r0, _021E7A04 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E79FC: mov r0, #1 add sp, #0xc @@ -523,7 +523,7 @@ MOD05_021E7B08: ; 0x021E7B08 cmp r0, #1 bne _021E7B6C ldr r0, _021E7B74 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E7B6C: mov r0, #1 add sp, #0xc diff --git a/arm9/modules/05/asm/mod05_021E80F8.s b/arm9/modules/05/asm/mod05_021E80F8.s index 82fd7a02..3d6303b2 100644 --- a/arm9/modules/05/asm/mod05_021E80F8.s +++ b/arm9/modules/05/asm/mod05_021E80F8.s @@ -26,7 +26,7 @@ MOD05_021E8110: ; 0x021E8110 lsl r1, r1, #0x18 lsr r1, r1, #0x1f beq _021E8120 - bl FUN_02019178 + bl RemoveWindow _021E8120: add r0, r4, #0 bl FreeToHeap @@ -147,7 +147,7 @@ MOD05_021E81D0: ; 0x021E81D0 ldr r0, [r4, #8] add r2, r1, #0 sub r3, #0x33 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, [r4, #0x60] ldrb r0, [r1, #0x13] lsl r0, r0, #0x18 @@ -179,7 +179,7 @@ MOD05_021E820C: ; 0x021E820C lsl r1, r1, #0x18 lsr r1, r1, #0x1f beq _021E825A - bl FUN_02019178 + bl RemoveWindow mov r0, #0x12 str r0, [sp] mov r0, #0x20 @@ -192,15 +192,15 @@ MOD05_021E820C: ; 0x021E820C ldr r0, [r4, #8] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4, #8] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r1, #3 ldr r0, [r4, #8] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r2, [r4, #0x60] mov r0, #0x80 ldrb r1, [r2, #0x13] @@ -217,7 +217,7 @@ MOD05_021E8260: ; 0x021E8260 add r4, r0, #0 ldr r0, [r4, #8] mov r1, #3 - bl FUN_02017B54 + bl Bg_GetYpos cmp r0, #0 bne _021E8274 mov r0, #1 @@ -235,13 +235,13 @@ _021E8280: ldr r0, [r4, #8] add r2, r1, #0 sub r3, #0x33 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021E828E: ldr r0, [r4, #8] mov r1, #3 mov r2, #4 mov r3, #0x10 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 pop {r4, pc} .balign 4, 0 @@ -253,7 +253,7 @@ MOD05_021E82A0: ; 0x021E82A0 add r4, r0, #0 ldr r0, [r4, #8] mov r1, #3 - bl FUN_02017B54 + bl Bg_GetYpos mov r1, #0x2f mvn r1, r1 cmp r0, r1 @@ -270,15 +270,15 @@ MOD05_021E82A0: ; 0x021E82A0 ldr r0, [r4, #8] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4, #8] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r1, #3 ldr r0, [r4, #8] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0x10 mov r0, #1 pop {r4, pc} @@ -291,13 +291,13 @@ _021E82F2: ldr r0, [r4, #8] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021E82FE: ldr r0, [r4, #8] mov r1, #3 mov r2, #5 mov r3, #0x10 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 add sp, #0x10 pop {r4, pc} diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s index 5bf27853..6c9c422b 100644 --- a/arm9/modules/05/asm/mod05_021E8310.s +++ b/arm9/modules/05/asm/mod05_021E8310.s @@ -264,7 +264,7 @@ MOD05_021E84F4: ; 0x021E84F4 ldrb r2, [r4, #8] ldr r0, [r4, #0xc] ldr r1, [r4, #0x10] - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] ldr r0, [r4, #4] @@ -301,7 +301,7 @@ MOD05_021E856C: ; 0x021E856C mov r1, #0 bl FUN_0200CCF8 ldr r0, [r4, #0x10] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] bl FreeToHeap pop {r4, pc} diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 006e8bb1..0157aedb 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -2753,7 +2753,7 @@ _021E9C02: ldr r0, [r0, #0x10] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x28 strh r1, [r0] @@ -2761,7 +2761,7 @@ _021E9C02: add r1, sp, #0x28 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2770,7 +2770,7 @@ _021E9C02: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] ldr r0, [r0] add r1, r0, #1 @@ -3160,26 +3160,26 @@ _021E9FA4: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [sp, #0x1c] mov r1, #3 ldr r0, [r0, #0x10] ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, [sp, #0x1c] mov r0, #4 ldr r1, [r1, #0xc] @@ -3275,7 +3275,7 @@ _021EA0B0: mov r0, #0x83 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] ldr r0, [r0] cmp r0, #7 @@ -3725,7 +3725,7 @@ _021EA430: ldr r0, [r0, #0x10] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x28 strh r1, [r0] @@ -3733,7 +3733,7 @@ _021EA430: add r1, sp, #0x28 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -3742,7 +3742,7 @@ _021EA430: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 bl MOD05_021E4394 mov r1, #0x81 @@ -4030,7 +4030,7 @@ _021EA6FA: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x83 lsl r0, r0, #2 add r0, r4, r0 @@ -4093,26 +4093,26 @@ _021EA76C: mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [sp, #0x18] mov r1, #3 ldr r0, [r0, #0x10] ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, [sp, #0x18] mov r0, #4 ldr r1, [r1, #0xc] @@ -5393,7 +5393,7 @@ _021EB18E: ldr r1, [r4] ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0 add r0, sp, #0x14 strh r1, [r0] @@ -5401,12 +5401,12 @@ _021EB18E: add r1, sp, #0x14 mov r2, #2 mov r3, #0x1e - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r0, [r4] mov r1, #0 bl FillWindowPixelBuffer ldr r0, [r4] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -5535,7 +5535,7 @@ _021EB344: str r0, [r5] _021EB36C: ldr r0, [r4] - bl FUN_02019220 + bl ScheduleWindowCopyToVram b _021EB3F2 _021EB374: mov r0, #0 @@ -5566,21 +5566,21 @@ _021EB394: add r0, #8 bl MOD05_021E3E44 ldr r0, [r4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r5, #0x10] mov r1, #3 ldr r0, [r0, #8] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021EB410 ; =0x0400004D mov r1, #0 strb r1, [r0] @@ -13882,7 +13882,7 @@ MOD05_021EF4F8: ; 0x021EF4F8 MOD05_021EF514: ; 0x021EF514 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_020162FC + bl ClearFileCache bl NNS_GfdResetLnkTexVramState bl NNS_GfdResetLnkPlttVramState mov r4, #0 @@ -15215,7 +15215,7 @@ MOD05_021EFEDC: ; 0x021EFEDC ldr r0, [r0, #8] mov r2, #3 mov r3, #0x13 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _021EFFBC ; =0x000003D9 add r0, #0x20 @@ -15311,7 +15311,7 @@ MOD05_021EFFC8: ; 0x021EFFC8 pop {r3, r4, r5, r6, r7, pc} _021EFFE6: ldr r0, _021F007C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -15328,7 +15328,7 @@ _021EFFE6: b _021F0056 _021F000E: ldr r0, _021F007C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x90 str r4, [r0] @@ -15362,7 +15362,7 @@ _021F0056: bl FUN_0200CCF8 add r0, r5, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow mov r1, #0 ldr r0, [r5, #4] add r2, r1, #0 @@ -15565,12 +15565,12 @@ MOD05_021F01EC: ; 0x021F01EC add r4, r0, #0 add r0, #0x10 add r5, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021F0204 add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow _021F0204: ldr r0, [r4, #0x3c] ldr r2, [r4, #8] @@ -15648,12 +15648,12 @@ MOD05_021F0290: ; 0x021F0290 bl String_dtor add r0, r4, #0 add r0, #0x10 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021F02C0 add r4, #0x10 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021F02C0: pop {r4, pc} .balign 4, 0 @@ -15695,7 +15695,7 @@ MOD05_021F0304: ; 0x021F0304 cmp r2, #0 bne _021F0310 ldr r0, _021F0314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021F0310: pop {r3, pc} nop @@ -24673,7 +24673,7 @@ _021F4732: str r0, [r4, #8] mov r0, #0x61 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} .balign 4, 0 _021F47A4: .word MOD05_021F48CC @@ -24929,7 +24929,7 @@ MOD05_021F4968: ; 0x021F4968 sub r1, r1, r0 bx r3 nop -_021F4974: .word FUN_02016B44 +_021F4974: .word ReallocFromHeap thumb_func_start MOD05_021F4978 MOD05_021F4978: ; 0x021F4978 @@ -26506,12 +26506,12 @@ MOD05_021F5518: ; 0x021F5518 bl G2x_SetBlendAlpha_ mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers ldr r0, _021F5560 ; =0x00000648 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} .balign 4, 0 @@ -26629,7 +26629,7 @@ MOD05_021F5608: ; 0x021F5608 add r1, sp, #4 add r2, r0, #0 mov r3, #0xc2 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #4 mov r1, #0x20 bl AllocFromHeap @@ -26643,13 +26643,13 @@ MOD05_021F5608: ; 0x021F5608 mov r1, #2 add r2, r4, #0 mov r3, #0x20 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r4, #0 bl FreeToHeap ldr r2, _021F565C ; =0x00006001 add r0, r5, #0 mov r1, #2 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add sp, #8 pop {r3, r4, r5, pc} nop @@ -26694,21 +26694,21 @@ _021F5696: thumb_func_start MOD05_021F569C MOD05_021F569C: ; 0x021F569C - ldr r3, _021F56A4 ; =FUN_02017FE4 + ldr r3, _021F56A4 ; =BG_SetMaskColor mov r0, #2 mov r1, #0 bx r3 .balign 4, 0 -_021F56A4: .word FUN_02017FE4 +_021F56A4: .word BG_SetMaskColor thumb_func_start MOD05_021F56A8 MOD05_021F56A8: ; 0x021F56A8 - ldr r3, _021F56B0 ; =FUN_02017FE4 + ldr r3, _021F56B0 ; =BG_SetMaskColor mov r0, #2 ldr r1, _021F56B4 ; =0x00007FFF bx r3 .balign 4, 0 -_021F56B0: .word FUN_02017FE4 +_021F56B0: .word BG_SetMaskColor _021F56B4: .word 0x00007FFF thumb_func_start MOD05_021F56B8 @@ -26733,17 +26733,17 @@ MOD05_021F56B8: ; 0x021F56B8 mov r0, #2 add r1, sp, #4 add r2, r0, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r1, #2 str r1, [sp] ldr r0, [r4, #8] add r2, r1, #0 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange ldr r0, [r4, #8] ldr r2, _021F5718 ; =0x00006002 mov r1, #2 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -26777,17 +26777,17 @@ MOD05_021F571C: ; 0x021F571C strh r2, [r1] add r1, sp, #4 mov r2, #2 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r2, #2 str r2, [sp] ldr r0, [r4, #8] mov r1, #3 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange ldr r0, [r4, #8] ldr r2, _021F577C ; =0x00006002 mov r1, #3 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit mov r0, #8 mov r1, #1 bl GX_EngineAToggleLayers @@ -26928,7 +26928,7 @@ _021F5856: mov r0, #2 mov r1, #0 strh r0, [r4, #8] - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #1 bl GX_EngineAToggleLayers @@ -27007,7 +27007,7 @@ _021F58EE: strh r1, [r0] mov r0, #2 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #8 strh r0, [r4, #8] b _021F5980 @@ -27084,7 +27084,7 @@ MOD05_021F5990: ; 0x021F5990 str r0, [sp] add r7, r1, #0 str r3, [sp, #4] - bl FUN_0201681C + bl CreateHeap cmp r0, #1 beq _021F59B2 bl GF_AssertFail @@ -27142,7 +27142,7 @@ _021F5A0E: add r0, r6, #0 bl FreeToHeap add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap pop {r4, r5, r6, pc} .balign 4, 0 @@ -27686,7 +27686,7 @@ MOD05_021F5DF8: ; 0x021F5DF8 bne _021F5E0E mov r0, #0x65 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE _021F5E0E: ldr r0, [r4, #0x10] cmp r0, #0x22 @@ -28181,7 +28181,7 @@ MOD05_021F617C: ; 0x021F617C bl FUN_0200D0E0 add r4, #0x38 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 pop {r4, pc} _021F61AA: diff --git a/arm9/modules/05/src/mod05_021E72FC.c b/arm9/modules/05/src/mod05_021E72FC.c index 73fddb7e..686dfdf9 100644 --- a/arm9/modules/05/src/mod05_021E72FC.c +++ b/arm9/modules/05/src/mod05_021E72FC.c @@ -3,7 +3,7 @@ #include "heap.h" -extern void FUN_020054C8(u32 param0); +extern void PlaySE(u32 param0); extern void FUN_020463CC(u32 param0, void *func, UnkStruct021E7358 *param2); extern u32 FUN_020553A0(u32 param0); extern u32 FUN_02058720(u32 param0); @@ -57,7 +57,7 @@ THUMB_FUNC void MOD05_021E7358(u32 param0, u32 param1, u32 param2) res->Unk0C = param0; res->Unk10 = param1; res->Unk00 = param2; - FUN_020054C8(1624); + PlaySE(1624); FUN_020463CC(param0, MOD05_021E73B4, res); } diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index d258860d..0701bc8c 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -90,11 +90,11 @@ MOD06_02239728: ; 0x02239728 MOD06_0223972C: ; 0x0223972C push {r4, lr} add r4, r0, #0 - bl GX_GetBankForBGExtPltt_2 + bl GX_GetBankForBG str r0, [r4] bl GX_GetBankForBGExtPltt str r0, [r4, #4] - bl GX_GetBankForSubBGExtPltt_2 + bl GX_GetBankForSubBG str r0, [r4, #8] bl GX_GetBankForSubBGExtPltt str r0, [r4, #0xc] @@ -106,7 +106,7 @@ MOD06_0223972C: ; 0x0223972C str r0, [r4, #0x18] bl GX_GetBankForSubOBJExtPltt str r0, [r4, #0x1c] - bl FUN_020C5D8C + bl GX_GetBankForTex str r0, [r4, #0x20] bl GX_GetBankForTexPltt str r0, [r4, #0x24] @@ -145,7 +145,7 @@ MOD06_02239790: ; 0x02239790 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -163,15 +163,15 @@ MOD06_02239790: ; 0x02239790 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x2c pop {r4, r5, pc} nop @@ -477,7 +477,7 @@ _02239A1E: add r0, r0, #1 str r0, [r4, #0xc] ldr r0, _02239AA8 ; =0x0000065C - bl FUN_020054C8 + bl PlaySE b _02239AA4 _02239A36: ldr r0, [r4] @@ -1907,7 +1907,7 @@ MOD06_0223A460: ; 0x0223A460 ldr r0, [sp, #0x28] str r0, [r5, #0x48] ldr r0, _0223A4DC ; =0x000006D5 - bl FUN_020054C8 + bl PlaySE add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -2183,7 +2183,7 @@ _0223A69A: bl FUN_0200CA98 str r0, [r5, #0x20] ldr r0, _0223A6D8 ; =0x000006D4 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} nop _0223A6D0: .word 0x0400006C @@ -2285,7 +2285,7 @@ MOD06_0223A75C: ; 0x0223A75C add r0, r4, r0 mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 pop {r3, r4, r5, pc} @@ -2964,7 +2964,7 @@ MOD06_0223AC78: ; 0x0223AC78 add r0, r4, r0 add r1, r5, #0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator mov r2, #0x4f lsl r2, r2, #2 add r0, r4, #0 @@ -3517,7 +3517,7 @@ _0223B0B2: cmp r0, #0 bge _0223B162 ldr r0, _0223B164 ; =0x000006D2 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x48 add r0, #0xf0 @@ -3540,7 +3540,7 @@ _0223B0E0: cmp r0, #0 bge _0223B162 ldr r0, _0223B168 ; =0x000006D3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x4b lsl r1, r1, #2 @@ -3564,7 +3564,7 @@ _0223B110: cmp r0, #0 bge _0223B162 ldr r0, _0223B16C ; =0x000006D6 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x84 add r0, #0xf0 @@ -3587,7 +3587,7 @@ _0223B13E: cmp r0, #0 bge _0223B162 ldr r0, _0223B170 ; =0x000006D7 - bl FUN_020054C8 + bl PlaySE mov r0, #4 add r4, #0xf4 str r0, [r4] @@ -4020,7 +4020,7 @@ MOD06_0223B458: ; 0x0223B458 add r0, #0xc4 add r1, r7, #0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r6, #0 add r0, #0x78 mov r1, #0x62 @@ -4587,7 +4587,7 @@ MOD06_0223B828: ; 0x0223B828 add r0, #0xdc add r1, r7, #0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r6, #0 add r0, #0x78 mov r1, #0x62 @@ -4684,7 +4684,7 @@ MOD06_0223B8EC: ; 0x0223B8EC mov r1, #1 bl MOD06_0223A408 ldr r0, _0223B920 ; =0x000006D8 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r3, r4, pc} .align 2, 0 @@ -5151,13 +5151,13 @@ _0223BCDA: str r0, [sp, #0x10] _0223BCDE: mov r0, #4 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _0223BCEC bl GF_AssertFail _0223BCEC: mov r0, #0xb - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _0223BCFA bl GF_AssertFail @@ -5864,13 +5864,13 @@ _0223C2DC: str r0, [sp, #0x10] _0223C2E4: mov r0, #4 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _0223C2F2 bl GF_AssertFail _0223C2F2: mov r0, #0xb - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _0223C300 bl GF_AssertFail @@ -8472,7 +8472,7 @@ MOD06_0223D63C: ; 0x0223D63C ldr r0, [r5] add r1, #8 add r2, r4, #0 - bl FUN_02019064 + bl AddWindowParameterized b _0223D710 _0223D6B8: mov r4, #2 @@ -8514,7 +8514,7 @@ _0223D6B8: ldr r0, [r5] add r1, #8 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized _0223D710: add r0, r5, #0 add r0, #0x84 @@ -8609,7 +8609,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 bl FUN_0200CCF8 add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x80 ldr r0, [r0] @@ -8621,7 +8621,7 @@ MOD06_0223D7B8: ; 0x0223D7B8 bl ListMenuItems_dtor add r4, #8 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_start MOD06_0223D7EC @@ -8649,7 +8649,7 @@ _0223D804: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x88 ldr r0, [r0] @@ -8780,7 +8780,7 @@ MOD06_0223D918: ; 0x0223D918 ldr r0, [r4] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0 bl MOD06_0223D7B8 add r0, r4, #0 @@ -8825,13 +8825,13 @@ _0223D984: ldr r0, [r5] ldr r2, _0223D9BC ; =0x0224F350 add r1, r4, #0 - bl FUN_02019150 + bl AddWindow b _0223D9A6 _0223D99C: ldr r0, [r5] add r1, r4, #0 add r2, r7, #0 - bl FUN_02019150 + bl AddWindow _0223D9A6: add r6, r6, #1 add r4, #0x10 @@ -8855,9 +8855,9 @@ MOD06_0223D9C0: ; 0x0223D9C0 add r5, #8 _0223D9D0: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #6 @@ -8955,37 +8955,37 @@ MOD06_0223DA8C: ; 0x0223DA8C str r0, [r4, r1] ldr r0, [r4] mov r1, #0 - bl FUN_02018884 + bl GetBgPriority mov r1, #0x8d lsl r1, r1, #2 strb r0, [r4, r1] ldr r0, [r4] mov r1, #1 - bl FUN_02018884 + bl GetBgPriority ldr r1, _0223DB10 ; =0x00000235 strb r0, [r4, r1] ldr r0, [r4] mov r1, #2 - bl FUN_02018884 + bl GetBgPriority ldr r1, _0223DB14 ; =0x00000236 strb r0, [r4, r1] ldr r0, [r4] mov r1, #3 - bl FUN_02018884 + bl GetBgPriority ldr r1, _0223DB18 ; =0x00000237 strb r0, [r4, r1] mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 mov r1, #1 bl GX_EngineAToggleLayers @@ -9012,19 +9012,19 @@ MOD06_0223DB1C: ; 0x0223DB1C lsl r1, r1, #2 ldrb r1, [r4, r1] mov r0, #0 - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB58 ; =0x00000235 mov r0, #1 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB5C ; =0x00000236 mov r0, #2 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _0223DB60 ; =0x00000237 mov r0, #3 ldrb r1, [r4, r1] - bl FUN_020178BC + bl SetBgPriority mov r0, #0x8e lsl r0, r0, #2 ldr r0, [r4, r0] @@ -9241,7 +9241,7 @@ MOD06_0223DCF0: ; 0x0223DCF0 cmp r6, #1 beq _0223DD0C ldr r0, _0223DE28 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE _0223DD0C: add r0, r4, #0 add r0, #0x18 @@ -9323,7 +9323,7 @@ _0223DDB2: _0223DDBA: add r0, r4, #0 add r0, #0x18 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r1, sp, #0x14 ldr r0, [sp, #0x10] add r1, #2 @@ -9546,7 +9546,7 @@ _0223DF30: bl String_dtor add r5, #0x28 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -9604,9 +9604,9 @@ _0223E006: bl MOD06_0223DB1C ldr r0, [r5] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _0223E188 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xc pop {r3, r4, r5, pc} _0223E034: @@ -9640,7 +9640,7 @@ _0223E034: bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x18 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 add r0, #0x58 mov r1, #0 @@ -9702,7 +9702,7 @@ _0223E0FC: cmp r2, #1 bne _0223E112 ldr r0, _0223E188 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD06_0223E384 pop {r3, r4, r5, pc} @@ -9753,7 +9753,7 @@ _0223E124: mov r1, #1 bl MOD06_0223EBF8 ldr r0, _0223E188 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #5 pop {r3, r4, r5, pc} _0223E182: @@ -9881,7 +9881,7 @@ _0223E214: bl String_dtor add r5, #0x48 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -9900,7 +9900,7 @@ MOD06_0223E29C: ; 0x0223E29C cmp r0, #0 beq _0223E2C4 ldr r0, _0223E378 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #1 bl MOD06_0223E4E8 @@ -9936,7 +9936,7 @@ _0223E2C4: mov r1, #0xf bl FillWindowPixelBuffer ldr r0, _0223E380 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD06_0223E384 pop {r4, pc} @@ -9975,9 +9975,9 @@ _0223E314: bl MOD06_0223ECC8 add r4, #0x18 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0223E380 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #4 pop {r4, pc} _0223E374: @@ -10268,7 +10268,7 @@ _0223E50A: bl String_dtor add r5, #0x38 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -10443,7 +10443,7 @@ _0223E704: lsl r1, r1, #2 strb r0, [r5, r1] ldr r0, _0223E798 ; =0x00000644 - bl FUN_020054C8 + bl PlaySE mov r0, #9 pop {r3, r4, r5, pc} _0223E74A: @@ -10471,7 +10471,7 @@ _0223E74A: bl MOD06_0223ECC8 add r5, #0x18 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r3, r4, r5, pc} _0223E78C: @@ -10684,7 +10684,7 @@ _0223E902: bl MOD06_0223ECC8 add r5, #0x18 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r3, r4, r5, pc} _0223E944: @@ -10736,7 +10736,7 @@ _0223E966: bl MOD06_0223ECC8 add r4, #0x18 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #4 pop {r4, pc} _0223E9B2: @@ -10917,7 +10917,7 @@ MOD06_0223EB04: ; 0x0223EB04 _0223EB1A: add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl MOD06_0223D63C mov r0, #1 @@ -11285,7 +11285,7 @@ _0223EE16: ldr r0, _0223EE70 ; =0x02252420 ldr r0, [r0] add r0, #0x40 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223EE34 ldr r0, _0223EE70 ; =0x02252420 @@ -11333,7 +11333,7 @@ MOD06_0223EE74: ; 0x0223EE74 ldr r0, _0223EF10 ; =0x02252420 ldr r0, [r0] add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223EEB8 ldr r0, _0223EF10 ; =0x02252420 @@ -11358,7 +11358,7 @@ MOD06_0223EE74: ; 0x0223EE74 ldr r0, [r1, #0x68] add r1, #0x20 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized _0223EEB8: ldr r0, _0223EF10 ; =0x02252420 ldr r2, _0223EF14 ; =0x000003D9 @@ -11570,7 +11570,7 @@ _0223F060: cmp r1, #0 beq _0223F07A add r0, #0x40 - bl FUN_02019178 + bl RemoveWindow _0223F07A: ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] @@ -11606,7 +11606,7 @@ MOD06_0223F0A8: ; 0x0223F0A8 cmp r2, #0 bne _0223F0BE ldr r0, _0223F0C4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0223F0BE: pop {r3, pc} .align 2, 0 @@ -11820,7 +11820,7 @@ MOD06_0223F270: ; 0x0223F270 ldr r0, _0223F330 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223F2AA ldr r0, _0223F330 ; =0x02252420 @@ -11840,7 +11840,7 @@ MOD06_0223F270: ; 0x0223F270 add r1, #0x30 ldr r0, [r0, #8] mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0223F2AA: ldr r0, _0223F330 ; =0x02252420 ldr r2, _0223F334 ; =0x000003D9 @@ -12088,7 +12088,7 @@ _0223F4A4: pop {r3, r4, r5, pc} _0223F4BA: ldr r0, _0223F51C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0223F518 ; =0x02252420 mov r1, #1 ldr r0, [r0] @@ -12101,7 +12101,7 @@ _0223F4BA: pop {r3, r4, r5, pc} _0223F4D8: ldr r0, _0223F51C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 ldr r0, [r4, #0x5c] add r1, #0x8e @@ -12578,7 +12578,7 @@ MOD06_0223F8C8: ; 0x0223F8C8 ldr r0, _0223F950 ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0223F910 ldr r0, _0223F950 ; =0x02252420 @@ -12598,7 +12598,7 @@ MOD06_0223F8C8: ; 0x0223F8C8 add r1, #0x30 ldr r0, [r0, #8] mov r3, #0x16 - bl FUN_02019064 + bl AddWindowParameterized _0223F910: ldr r0, _0223F950 ; =0x02252420 ldr r2, _0223F954 ; =0x000003D9 @@ -13005,7 +13005,7 @@ _0223FC32: add r1, #0x95 strb r0, [r1] ldr r0, _0223FCF4 ; =0x0000060D - bl FUN_020054C8 + bl PlaySE ldr r0, [sp, #4] ldr r1, [sp, #4] add r0, #0x95 @@ -13856,10 +13856,10 @@ MOD06_02240364: ; 0x02240364 bl DestroyListMenu add r0, r4, #0 add r0, #0x20 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x97 ldrb r0, [r0] @@ -13873,11 +13873,11 @@ MOD06_02240364: ; 0x02240364 ldr r0, _022403DC ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _022403DC ; =0x02252420 ldr r0, [r0] add r0, #0x30 - bl FUN_02019178 + bl RemoveWindow mov r0, #0 add r4, #0x97 strb r0, [r4] @@ -14468,7 +14468,7 @@ MOD06_02240864: ; 0x02240864 add r5, r0, #0 add r0, #0x54 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0224089E add r0, r5, #0 @@ -14524,11 +14524,11 @@ MOD06_022408D4: ; 0x022408D4 bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x54 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _022408EC: add r4, #0x54 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 @@ -14572,7 +14572,7 @@ MOD06_02240924: ; 0x02240924 add r6, r6, #1 _02240940: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _022409D2 add r0, r6, #2 @@ -14594,7 +14594,7 @@ _02240940: add r1, r4, #0 ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02240A20 ; =0x000003D9 add r0, #0x34 @@ -14695,10 +14695,10 @@ MOD06_02240A28: ; 0x02240A28 add r1, #0x38 ldrb r1, [r1] ldr r0, [r4, #0x34] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r0, #0x34 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #8] bl ListMenuItems_dtor mov r0, #0 @@ -14731,7 +14731,7 @@ MOD06_02240A64: ; 0x02240A64 cmp r6, r0 beq _02240A9C ldr r0, _02240B00 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02240A9C: mov r0, #1 mvn r0, r0 @@ -14748,7 +14748,7 @@ _02240AB0: pop {r4, r5, r6, pc} _02240AB4: ldr r0, _02240B00 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x10] mov r1, #0 add r0, #0xac @@ -14759,7 +14759,7 @@ _02240AB4: pop {r4, r5, r6, pc} _02240ACC: ldr r0, _02240B00 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x10] mov r1, #0 add r0, #0xac @@ -14771,7 +14771,7 @@ _02240ACC: pop {r4, r5, r6, pc} _02240AE6: ldr r0, _02240B00 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x10] add r1, r4, #0 ldr r0, [r0, #0xc] @@ -14810,7 +14810,7 @@ MOD06_02240B04: ; 0x02240B04 ldr r0, [r0, #8] mov r2, #3 mov r3, #0x16 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02240BB0 ; =0x000003D9 add r0, #0x44 @@ -14893,7 +14893,7 @@ MOD06_02240BB8: ; 0x02240BB8 cmp r6, r0 beq _02240BF0 ldr r0, _02240C54 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02240BF0: mov r0, #1 mvn r0, r0 @@ -14906,13 +14906,13 @@ _02240BF0: pop {r4, r5, r6, pc} _02240C02: ldr r0, _02240C54 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r4, #0 mvn r4, r4 b _02240C1A _02240C0E: ldr r0, _02240C54 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD06_02240A28 _02240C1A: @@ -14930,10 +14930,10 @@ _02240C1A: add r1, #0x48 ldrb r1, [r1] ldr r0, [r5, #0x44] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0x44 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #0xc] bl ListMenuItems_dtor mov r0, #0 @@ -14984,7 +14984,7 @@ MOD06_02240C58: ; 0x02240C58 ldr r0, [r0, #0x10] mov r3, #4 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x24] ldr r2, _02240F00 ; =0x000003D9 mov r1, #1 @@ -15286,10 +15286,10 @@ MOD06_02240F1C: ; 0x02240F1C add r1, #0x28 ldrb r1, [r1] ldr r0, [r4, #0x24] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r4, #0x24 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 @@ -15320,7 +15320,7 @@ _02240F6A: pop {r4, pc} _02240F70: ldr r0, _02240FE8 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r1, #0x78 ldrh r1, [r1] @@ -15345,7 +15345,7 @@ _02240F70: b _02240FE2 _02240FAA: ldr r0, _02240FE8 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r1, #0x78 ldrh r1, [r1] @@ -16402,7 +16402,7 @@ _022417F4: add r0, r4, #0 bl MOD05_021DA0E0 ldr r0, _02241868 ; =0x0000065A - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _02241868: .word 0x0000065A @@ -16559,7 +16559,7 @@ _022419A2: mov r1, #0 bl FUN_02055560 ldr r0, _02241A38 ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -16610,7 +16610,7 @@ _02241A02: mov r1, #1 bl FUN_0205557C ldr r0, _02241A40 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -16658,7 +16658,7 @@ _02241A72: mov r1, #0 bl FUN_02055560 ldr r0, _02241B04 ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -16706,7 +16706,7 @@ _02241ACE: mov r1, #1 bl FUN_0205557C ldr r0, _02241B0C ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17168,7 +17168,7 @@ _02241E8A: mov r1, #0 bl FUN_02055560 ldr r0, _02241F70 ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17258,7 +17258,7 @@ _02241F48: mov r1, #1 bl FUN_0205557C ldr r0, _02241F78 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17317,7 +17317,7 @@ _02241FBA: mov r1, #0x49 bl FUN_0205ADDC ldr r0, _022420C4 ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17417,7 +17417,7 @@ _02242092: add r0, r6, #0 bl FUN_0205AE50 ldr r0, _022420C8 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17477,7 +17477,7 @@ _02242112: mov r1, #0x49 bl FUN_0205ADDC ldr r0, _0224221C ; =0x00000611 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -17580,7 +17580,7 @@ _022421E4: add r0, r5, #0 bl FUN_0205AE50 ldr r0, _02242220 ; =0x0000061A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -18283,7 +18283,7 @@ _02242776: ; jump table .short _0224282E - _02242776 - 2 ; case 3 _0224277E: ldr r0, _02242840 ; =0x00000616 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x24] cmp r0, #4 bne _02242794 @@ -18725,7 +18725,7 @@ _02242ACE: str r0, [r6] strb r0, [r4, #0x13] ldr r0, _02242AE4 ; =0x0000063F - bl FUN_020054C8 + bl PlaySE ldr r0, [r7, #0x10] ldr r1, _02242AE8 ; =MOD06_02242AEC ldr r2, [sp] @@ -18878,7 +18878,7 @@ MOD06_02242BE0: ; 0x02242BE0 bl FUN_02046528 add r7, r0, #0 ldr r0, _02242C70 ; =0x0000067C - bl FUN_020054C8 + bl PlaySE mov r1, #0x11 mov r0, #4 lsl r1, r1, #4 @@ -19005,7 +19005,7 @@ MOD06_02242CDC: ; 0x02242CDC add r1, r4, #4 mov r2, #3 add r3, r6, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #4 @@ -19426,14 +19426,14 @@ MOD06_02243024: ; 0x02243024 push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, _0224307C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 add r0, #0x14 mov r1, #0 bl FUN_0200D0E0 add r0, r6, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 add r0, #0x88 mov r1, #0 @@ -19444,7 +19444,7 @@ MOD06_02243024: ; 0x02243024 mov r1, #0 bl FUN_0200CCF8 add r0, r6, #4 - bl FUN_02019178 + bl RemoveWindow mov r4, #0 add r5, r6, #0 _02243060: @@ -20061,7 +20061,7 @@ MOD06_022434D0: ; 0x022434D0 mov r0, #3 mov r1, #0x3b lsl r2, r2, #0xe - bl FUN_02016828 + bl CreateHeapAtEnd ldr r1, _02243684 ; =0x000008CC mov r0, #0x3b bl AllocFromHeap @@ -20275,7 +20275,7 @@ _022436A6: add r0, r4, #0 bl FreeToHeap add r0, r5, #0 - bl FUN_020168D0 + bl DestroyHeap _022436BE: pop {r3, r4, r5, pc} .align 2, 0 @@ -24074,7 +24074,7 @@ _022453F0: cmp r0, #4 bne _022453FC ldr r0, _02245474 ; =0x000006DB - bl FUN_020054C8 + bl PlaySE _022453FC: ldrb r0, [r4, #5] add r0, r0, #1 @@ -24179,7 +24179,7 @@ MOD06_02245478: ; 0x02245478 cmp r2, #0 bne _022454CC ldr r0, _02245540 ; =0x000006DA - bl FUN_020054C8 + bl PlaySE _022454CC: ldrb r0, [r5, #6] add r0, r0, #1 @@ -24220,7 +24220,7 @@ _022454D8: cmp r2, #0 bne _0224551C ldr r0, _02245540 ; =0x000006DA - bl FUN_020054C8 + bl PlaySE _0224551C: ldrb r0, [r5, #6] add r0, r0, #1 @@ -24294,7 +24294,7 @@ _02245578: cmp r0, #0 bne _022455B4 ldr r0, _0224564C ; =0x000006D9 - bl FUN_020054C8 + bl PlaySE _022455B4: ldrb r0, [r4, #6] add r0, r0, #1 @@ -24312,7 +24312,7 @@ _022455BC: cmp r0, #6 bne _022455D8 ldr r0, _02245650 ; =0x000006DA - bl FUN_020054C8 + bl PlaySE _022455D8: ldrb r0, [r4, #6] sub r0, r0, #1 @@ -24341,7 +24341,7 @@ _022455E0: cmp r0, #0 bne _02245616 ldr r0, _0224564C ; =0x000006D9 - bl FUN_020054C8 + bl PlaySE _02245616: ldrb r0, [r4, #6] add r0, r0, #1 @@ -24359,7 +24359,7 @@ _0224561E: cmp r0, #6 bne _0224563A ldr r0, _02245650 ; =0x000006DA - bl FUN_020054C8 + bl PlaySE _0224563A: ldrb r0, [r4, #6] sub r0, r0, #1 @@ -27300,7 +27300,7 @@ MOD06_02246C08: ; 0x02246C08 pop {r4, pc} _02246C18: ldr r0, _02246C34 ; =0x00000649 - bl FUN_020054C8 + bl PlaySE mov r0, #2 lsl r0, r0, #0xa str r0, [r4, #0x54] @@ -27719,12 +27719,12 @@ MOD06_02246F0C: ; 0x02246F0C ldr r0, [r5, #0x60] mov r1, #0 ldr r0, [r0, #8] - bl FUN_02018884 + bl GetBgPriority strh r0, [r5, #0x24] ldr r0, [r5, #0x60] mov r1, #3 ldr r0, [r0, #8] - bl FUN_02018884 + bl GetBgPriority strh r0, [r5, #0x26] ldr r2, _02246FB4 ; =0x0400000A mov r1, #3 @@ -28496,7 +28496,7 @@ MOD06_02247544: ; 0x02247544 ldr r1, [r1, #0xc] mov r2, #0x20 lsl r3, r0, #7 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r4, #0 bl FreeToHeap pop {r3, r4, r5, pc} @@ -28521,7 +28521,7 @@ MOD06_0224756C: ; 0x0224756C ldr r3, [r3, #0x10] add r0, r5, #0 mov r1, #3 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r6, #0 bl FreeToHeap add sp, #4 @@ -28539,12 +28539,12 @@ MOD06_022475A4: ; 0x022475A4 mov r1, #3 add r3, r2, #0 add r5, r0, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r5, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r6, #0 add r1, r7, #0 mov r2, #4 @@ -28558,7 +28558,7 @@ MOD06_022475A4: ; 0x022475A4 ldr r3, [r3, #8] mov r1, #3 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData mov r0, #0x20 str r0, [sp] str r0, [sp, #4] @@ -28568,10 +28568,10 @@ MOD06_022475A4: ; 0x022475A4 add r0, r5, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r5, #0 mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl FreeToHeap add sp, #0xc @@ -28579,11 +28579,11 @@ MOD06_022475A4: ; 0x022475A4 thumb_func_start MOD06_02247610 MOD06_02247610: ; 0x02247610 - ldr r3, _02247618 ; =FUN_02018744 + ldr r3, _02247618 ; =BgClearTilemapBufferAndCommit mov r1, #3 bx r3 nop -_02247618: .word FUN_02018744 +_02247618: .word BgClearTilemapBufferAndCommit thumb_func_start MOD06_0224761C MOD06_0224761C: ; 0x0224761C @@ -38707,7 +38707,7 @@ _0224C3C2: add r0, r0, r1 str r0, [sp, #0x34] ldr r0, _0224C518 ; =0x000005FE - bl FUN_020054C8 + bl PlaySE add r0, sp, #0x20 str r0, [sp] ldr r0, [r5, #0x4c] @@ -38956,7 +38956,7 @@ _0224C604: mov r1, #1 bl MOD05_021DA4EC ldr r0, _0224C670 ; =0x00000612 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #2] add r0, r0, #1 strb r0, [r4, #2] @@ -38971,7 +38971,7 @@ _0224C61C: mov r1, #0 bl FUN_020054F0 ldr r0, _0224C674 ; =0x000005F1 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x4c] ldr r1, [r5, #0x50] mov r2, #1 @@ -39151,15 +39151,15 @@ MOD06_0224C75C: ; 0x0224C75C b _0224C7AA _0224C794: ldr r0, _0224C7B8 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE b _0224C7AA _0224C79C: ldr r0, _0224C7B8 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE b _0224C7AA _0224C7A4: ldr r0, _0224C7BC ; =0x0000064E - bl FUN_020054C8 + bl PlaySE _0224C7AA: mov r0, #0 pop {r4, pc} @@ -40876,7 +40876,7 @@ MOD06_0224D46C: ; 0x0224D46C add r0, r5, #0 add r1, r4, #0 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r3, #0xb @@ -41093,9 +41093,9 @@ MOD06_0224D6A4: ; 0x0224D6A4 mov r1, #1 bl FUN_0200CCF8 add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] bl DestroyMsgData ldr r0, [r4, #0x14] @@ -41381,7 +41381,7 @@ _0224D8DC: ldr r0, [r4, #0x14] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x61 lsl r0, r0, #2 add r0, r4, r0 @@ -41403,7 +41403,7 @@ _0224D8DC: mov r0, #5 str r0, [r4, #4] ldr r0, _0224DB64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0224DB9A _0224D942: mov r1, #1 @@ -41431,7 +41431,7 @@ _0224D94C: mov r0, #0xc str r0, [r4, #4] ldr r0, _0224DB64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0224DB9A _0224D97E: mov r0, #0xb9 @@ -41746,7 +41746,7 @@ MOD06_0224DBCC: ; 0x0224DBCC bl FUN_02002ED0 ldr r0, [r4, #0x14] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #8 pop {r4, pc} .align 2, 0 @@ -41756,7 +41756,7 @@ MOD06_0224DC28: ; 0x0224DC28 push {r3, lr} ldr r0, [r0, #0x14] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #1 bl FUN_02054590 @@ -41810,7 +41810,7 @@ MOD06_0224DC5C: ; 0x0224DC5C add r0, r4, #0 mov r2, #3 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #4] mov r1, #0xf bl FillWindowPixelBuffer @@ -41834,12 +41834,12 @@ MOD06_0224DCB4: ; 0x0224DCB4 cmp r0, #0 beq _0224DCD6 ldr r0, [r4, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #0 str r0, [r4] _0224DCD6: @@ -42055,7 +42055,7 @@ MOD06_0224DE60: ; 0x0224DE60 add r0, r4, #0 mov r2, #3 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x14] bl ScrStrBufs_new str r0, [r6, #8] @@ -42106,12 +42106,12 @@ _0224DEE6: ldr r0, [r6, #8] bl ScrStrBufs_delete ldr r0, [r6, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r6, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r6, #4] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #0 str r0, [r6] _0224DF18: @@ -42230,7 +42230,7 @@ _0224DFC0: add r0, r4, #0 mov r2, #3 mov r3, #0x11 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x14] bl ScrStrBufs_new mov r1, #0x49 @@ -42447,12 +42447,12 @@ _0224E1C0: add r2, r1, #0 bl DestroyListMenu ldr r0, [r6, #4] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r6, #4] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r6, #4] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #1 str r0, [r6] _0224E1E2: @@ -42487,7 +42487,7 @@ MOD06_0224E1E4: ; 0x0224E1E4 ldr r2, [r5, r2] blx r2 ldr r0, _0224E248 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD06_0224E39C b _0224E242 @@ -42780,10 +42780,10 @@ _0224E448: ldr r0, [r5, #4] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #4] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} @@ -43590,7 +43590,7 @@ MOD06_0224EA64: ; 0x0224EA64 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r1, #3 @@ -43603,7 +43603,7 @@ MOD06_0224EA64: ; 0x0224EA64 add r1, r4, #0 bl MOD06_0224E8C4 ldr r0, _0224EAA8 ; =0x0000064B - bl FUN_020054C8 + bl PlaySE mov r0, #0 add r4, #0xec str r0, [r4] @@ -43704,7 +43704,7 @@ MOD06_0224EB30: ; 0x0224EB30 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r2, #4 @@ -43717,7 +43717,7 @@ MOD06_0224EB30: ; 0x0224EB30 add r1, r4, #0 bl MOD06_0224E8C4 ldr r0, _0224EB74 ; =0x0000064A - bl FUN_020054C8 + bl PlaySE mov r0, #0 add r4, #0xec str r0, [r4] @@ -43738,7 +43738,7 @@ MOD06_0224EB78: ; 0x0224EB78 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r2, #4 @@ -43752,7 +43752,7 @@ MOD06_0224EB78: ; 0x0224EB78 add r2, r4, #0 bl MOD06_0224E858 ldr r0, _0224EBC0 ; =0x0000064A - bl FUN_020054C8 + bl PlaySE mov r0, #0 add r4, #0xec str r0, [r4] @@ -43878,7 +43878,7 @@ MOD06_0224EC5C: ; 0x0224EC5C add r0, r0, r1 mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator ldr r5, [sp, #8] mov r1, #0x6e add r4, sp, #0x10 @@ -43912,7 +43912,7 @@ _0224ECA8: add r0, #0xdc bl MOD05_021F54CC ldr r0, _0224ECF0 ; =0x0000064D - bl FUN_020054C8 + bl PlaySE mov r1, #0x72 ldr r0, [sp, #8] mov r2, #0 @@ -44074,7 +44074,7 @@ _0224EDF0: mov r1, #1 bl MOD05_021F54CC ldr r0, _0224EE14 ; =0x00000627 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -44299,7 +44299,7 @@ MOD06_0224EF98: ; 0x0224EF98 mov r1, #4 add r0, r5, r0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r5, #0 mov r1, #0x8d mov r2, #8 @@ -46245,4 +46245,3 @@ MOD6_02252420: ; 0x02252420 .global MOD6_02252424 MOD6_02252424: ; 0x02252424 .space 0x1C - diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index 80472fdf..234e29fe 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -146,7 +146,7 @@ MOD07_02211F34: ; 0x02211F34 bl MOD07_02211F14 ldr r0, [r4] ldr r0, [r0, #0x24] - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0xc] ldr r0, [r4] ldr r0, [r0, #0x24] @@ -423,7 +423,7 @@ MOD07_022121AC: ; 0x022121AC add r4, r0, #0 ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0x18 bgt _02212248 ldr r1, _02212370 ; =0x00000B82 @@ -437,13 +437,13 @@ MOD07_022121AC: ; 0x022121AC ldr r0, [r4, #0xc] mov r1, #3 mov r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r2, #0 add r3, r2, #0 ldr r0, [r4, #0xc] mov r1, #2 sub r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #0 add r0, r4, #0 add r2, r1, #0 @@ -492,13 +492,13 @@ _02212248: ldr r3, [r4, r3] mov r1, #3 mov r2, #2 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r3, _02212374 ; =0x00000B74 ldr r0, [r4, #0xc] ldr r3, [r4, r3] mov r1, #2 mov r2, #1 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r3, _02212370 ; =0x00000B82 mov r1, #0 ldrb r0, [r4, r3] @@ -655,11 +655,11 @@ _02212394: cmp r0, #1 bne _022123AE ldr r0, _02212578 ; =0x00000715 - bl FUN_020054C8 + bl PlaySE b _022123B4 _022123AE: ldr r0, _0221257C ; =0x00000852 - bl FUN_020054C8 + bl PlaySE _022123B4: ldr r0, _02212574 ; =0x00000B82 ldrb r1, [r5, r0] @@ -669,23 +669,23 @@ _022123B4: mov r1, #3 mov r2, #0 mov r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r2, #0 add r3, r2, #0 ldr r0, [r5, #0xc] mov r1, #2 sub r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #3 ldr r0, [r5, #0xc] add r2, r1, #0 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0xc] mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #0 add r0, r5, #0 add r2, r1, #0 @@ -798,23 +798,23 @@ _022124CC: mov r1, #3 mov r2, #0 add r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r3, r6, #0 ldr r0, [r5, #0xc] mov r1, #2 mov r2, #0 sub r3, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #3 ldr r0, [r5, #0xc] add r2, r1, #0 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0xc] mov r1, #2 mov r2, #3 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r5, #0 mov r1, #0 add r2, r6, #0 @@ -915,18 +915,18 @@ _022125D0: cmp r0, #0 bne _022125DE ldr r0, _022126B0 ; =0x00000719 - bl FUN_020054C8 + bl PlaySE _022125DE: ldr r0, [r4, #0xc] mov r1, #3 mov r2, #1 mov r3, #0x10 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #2 ldr r0, [r4, #0xc] add r2, r1, #0 mov r3, #0x10 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r2, _022126A4 ; =0x00000B82 mov r1, #0 ldrb r0, [r4, r2] @@ -1086,7 +1086,7 @@ MOD07_02212720: ; 0x02212720 ldr r3, _02212818 ; =0x02214960 add r2, r1, #0 ldrb r3, [r3, r5] - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r3, _02212814 ; =0x00000B82 ldr r0, [r4, #0xc] ldrb r3, [r4, r3] @@ -1095,7 +1095,7 @@ MOD07_02212720: ; 0x02212720 lsl r5, r3, #1 ldr r3, _02212818 ; =0x02214960 ldrb r3, [r3, r5] - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r2, _02212814 ; =0x00000B82 mov r1, #0 ldrb r2, [r4, r2] @@ -1173,7 +1173,7 @@ MOD07_02212720: ; 0x02212720 cmp r0, #0 bne _022127FA ldr r0, _02212820 ; =0x00000853 - bl FUN_020054C8 + bl PlaySE _022127FA: ldr r0, _02212814 ; =0x00000B82 ldrb r1, [r4, r0] @@ -1206,7 +1206,7 @@ MOD07_02212824: ; 0x02212824 ldr r3, _0221294C ; =0x02214960 mov r2, #1 ldrb r3, [r3, r5] - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r3, _02212948 ; =0x00000B82 ldr r0, [r4, #0xc] ldrb r3, [r4, r3] @@ -1215,7 +1215,7 @@ MOD07_02212824: ; 0x02212824 lsl r5, r3, #1 ldr r3, _0221294C ; =0x02214960 ldrb r3, [r3, r5] - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r2, _02212948 ; =0x00000B82 mov r1, #0 ldrb r2, [r4, r2] @@ -1317,7 +1317,7 @@ MOD07_02212824: ; 0x02212824 cmp r0, #0 bne _0221292E ldr r0, _02212954 ; =0x00000853 - bl FUN_020054C8 + bl PlaySE _0221292E: ldr r0, _02212948 ; =0x00000B82 ldrb r1, [r4, r0] @@ -1429,7 +1429,7 @@ MOD07_022129FC: ; 0x022129FC push {r4, lr} add r4, r0, #0 ldr r0, _02212A34 ; =0x0000071A - bl FUN_020054C8 + bl PlaySE mov r0, #0x72 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1459,7 +1459,7 @@ MOD07_02212A3C: ; 0x02212A3C push {r4, lr} add r4, r0, #0 ldr r0, _02212A5C ; =0x0000071A - bl FUN_020054C8 + bl PlaySE mov r0, #0x72 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1535,7 +1535,7 @@ _02212AC6: bl FUN_02003210 _02212ADA: ldr r0, _02212AEC ; =0x0000071B - bl FUN_020054C8 + bl PlaySE ldr r0, _02212AF0 ; =0x00000B81 mov r1, #0x40 strb r1, [r4, r0] @@ -1555,7 +1555,7 @@ MOD07_02212AF4: ; 0x02212AF4 cmp r0, #0 bne _02212B06 ldr r0, _02212B44 ; =0x00000719 - bl FUN_020054C8 + bl PlaySE _02212B06: ldr r1, _02212B40 ; =0x00000B82 ldrb r0, [r4, r1] @@ -1868,7 +1868,7 @@ MOD07_02212D68: ; 0x02212D68 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r0, [r4, #8] bl FUN_0200372C bl FUN_0201C30C @@ -1897,7 +1897,7 @@ MOD07_02212D98: ; 0x02212D98 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02212E58 ; =0x02214A2C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -1912,16 +1912,16 @@ MOD07_02212D98: ; 0x02212D98 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #3 add r3, r1, #0 ldr r0, [r4, #0xc] mov r2, #0 add r3, #0xfd - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r5, _02212E5C ; =0x02214A48 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -1936,16 +1936,16 @@ MOD07_02212D98: ; 0x02212D98 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0xff ldr r0, [r4, #0xc] mov r1, #2 mov r2, #0 mvn r3, r3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r5, _02212E60 ; =0x02214A64 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -1960,10 +1960,10 @@ MOD07_02212D98: ; 0x02212D98 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -1984,13 +1984,13 @@ MOD07_02212E64: ; 0x02212E64 bl GX_EngineAToggleLayers ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] bl FreeToHeap pop {r4, pc} @@ -2063,7 +2063,7 @@ MOD07_02212E90: ; 0x02212E90 bl FUN_02003108 ldr r1, _02212F28 ; =0x000018C6 mov r0, #1 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2452,7 +2452,7 @@ MOD07_02213220: ; 0x02213220 add r1, r5, #0 mov r2, #8 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -2508,7 +2508,7 @@ MOD07_02213220: ; 0x02213220 mov r1, #0 bl FUN_02011A60 add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3203,7 +3203,7 @@ MOD07_02213858: ; 0x02213858 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _022138EC ; =0x02214A9C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -3218,10 +3218,10 @@ MOD07_02213858: ; 0x02213858 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022138F0 ; =0x02214A10 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -3236,10 +3236,10 @@ MOD07_02213858: ; 0x02213858 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022138F4 ; =0x02214A80 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -3254,7 +3254,7 @@ MOD07_02213858: ; 0x02213858 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add sp, #0x64 pop {r4, r5, pc} nop @@ -3272,13 +3272,13 @@ MOD07_022138F8: ; 0x022138F8 bl GX_EngineAToggleLayers ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] bl FreeToHeap pop {r4, pc} @@ -3327,7 +3327,7 @@ MOD07_02213924: ; 0x02213924 mov r3, #0 lsl r2, r2, #0x10 lsr r2, r2, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, [sp, #0x10] ldr r0, _022139B4 ; =0x000004E4 ldr r1, [r1, #0xc] @@ -3401,7 +3401,7 @@ _022139EE: ldrb r3, [r6, #1] ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r0, #0x86 lsl r0, r0, #2 ldrh r0, [r7, r0] @@ -3419,7 +3419,7 @@ _022139EE: ldrb r3, [r6, #1] ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_020186B4 + bl BgTilemapRectChangePalette cmp r4, #3 bhs _02213A46 ldr r0, [r5] @@ -3443,7 +3443,7 @@ _02213A54: add r1, r5, r1 mov r2, #0x20 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _02213A7A _02213A68: ldr r1, _02213A9C ; =0x000004E4 @@ -3453,7 +3453,7 @@ _02213A68: add r1, r5, r1 mov r2, #0x20 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData _02213A7A: add r4, r4, #1 add r7, #0x18 @@ -3462,7 +3462,7 @@ _02213A7A: blo _022139C8 ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -3478,7 +3478,7 @@ MOD07_02213AA0: ; 0x02213AA0 ldr r0, [r4, #0xc] str r1, [sp] add r1, r2, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer add r6, r0, #0 ldr r0, [r4] add r0, #0x29 @@ -3527,10 +3527,10 @@ MOD07_02213AEC: ; 0x02213AEC bl MOD07_02213AA0 ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} .align 2, 0 _02213B18: .word 0x00000544 @@ -3565,7 +3565,7 @@ MOD07_02213B20: ; 0x02213B20 ldr r0, [r5, #0xc] mov r1, #1 lsr r2, r2, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, _02213BE8 ; =0x00000844 lsl r2, r6, #0x18 str r4, [sp] @@ -3582,7 +3582,7 @@ MOD07_02213B20: ; 0x02213B20 ldr r0, [r5, #0xc] mov r1, #2 lsr r2, r2, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect b _02213BCE _02213B80: ldr r2, _02213BE4 ; =0x00000544 @@ -3603,7 +3603,7 @@ _02213B80: ldr r0, [r5, #0xc] mov r1, #1 add r3, r2, #0 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r1, _02213BE8 ; =0x00000844 mov r2, #0 str r4, [sp] @@ -3621,14 +3621,14 @@ _02213B80: ldr r0, [r5, #0xc] mov r1, #2 add r3, r2, #0 - bl FUN_02018170 + bl CopyToBgTilemapRect _02213BCE: ldr r0, [r5, #0xc] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r3, r4, r5, r6, pc} nop @@ -4445,7 +4445,7 @@ _02214258: ldr r0, [r7, #0xc] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -4463,7 +4463,7 @@ MOD07_02214274: ; 0x02214274 add r5, #0x10 _0221427C: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0x18 @@ -4817,7 +4817,7 @@ _02214558: add r1, r5, r1 mov r2, #4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _0221459E _02214570: ldrb r3, [r4, #9] @@ -4829,7 +4829,7 @@ _02214570: add r1, r5, r1 mov r2, #4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData b _0221459E _02214588: ldrb r3, [r4, #9] @@ -4841,7 +4841,7 @@ _02214588: add r1, r5, r1 mov r2, #4 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData _0221459E: ldr r0, [sp, #8] ldrh r1, [r7, r6] @@ -4941,16 +4941,16 @@ MOD07_02214600: ; 0x02214600 add r1, r6, #0 bl MOD07_02214510 add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, r4 add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, r4 add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, r4 add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index a02c3f48..4a0a6d1c 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -616,7 +616,7 @@ _022122C6: add r0, #0xc4 ldr r0, [r0] mov r1, #0 - bl FUN_02018884 + bl GetBgPriority mov r1, #0x1a lsl r1, r1, #4 strb r0, [r4, r1] @@ -624,21 +624,21 @@ _022122C6: add r0, #0xc4 ldr r0, [r0] mov r1, #1 - bl FUN_02018884 + bl GetBgPriority ldr r1, _02212374 ; =0x000001A1 strb r0, [r4, r1] add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] mov r1, #2 - bl FUN_02018884 + bl GetBgPriority ldr r1, _02212378 ; =0x000001A2 strb r0, [r4, r1] add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] mov r1, #3 - bl FUN_02018884 + bl GetBgPriority ldr r1, _0221237C ; =0x000001A3 mov r3, #0 strb r0, [r4, r1] @@ -1139,7 +1139,7 @@ _02212638: sub r0, r0, #1 strb r0, [r5, #0x18] ldrh r0, [r5, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r5, #0x1a] ldr r1, _02212660 ; =0x0000FFFF ldr r2, [r5, #0x14] @@ -1165,7 +1165,7 @@ MOD08_02212664: ; 0x02212664 cmp r2, #0 bne _02212686 ldrh r0, [r4, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #0x1a] ldr r1, _02212688 ; =0x0000FFFF ldr r2, [r4, #0x14] @@ -1816,7 +1816,7 @@ _02212AE8: lsr r0, r0, #0x18 lsl r1, r1, #0xe mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 bl MOD08_02212490 add r4, r0, #0 @@ -1827,10 +1827,10 @@ _02212AE8: lsl r1, r1, #0x18 add r0, r4, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer b _02212B40 _02212B3C: bl MOD12_02233560 @@ -1839,47 +1839,47 @@ _02212B40: lsl r1, r1, #4 ldrb r1, [r5, r1] mov r0, #0 - bl FUN_020178BC + bl SetBgPriority ldr r1, _02212BB8 ; =0x000001A1 mov r0, #1 ldrb r1, [r5, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _02212BBC ; =0x000001A2 mov r0, #2 ldrb r1, [r5, r1] - bl FUN_020178BC + bl SetBgPriority ldr r1, _02212BC0 ; =0x000001A3 mov r0, #3 ldrb r1, [r5, r1] - bl FUN_020178BC + bl SetBgPriority add r0, r5, #0 add r0, #0xc4 mov r2, #0 ldr r0, [r0] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 add r0, #0xc4 mov r2, #0 ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 add r0, #0xc4 mov r1, #3 ldr r0, [r0] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 str r0, [r5, #0x10] pop {r3, r4, r5, r6, r7, pc} @@ -3052,13 +3052,13 @@ _02213410: mov r1, #2 mov r2, #0 neg r3, r6 - bl FUN_020179E0 + bl BgSetPosTextAndCommit sub r4, #0x28 ldr r0, [r5] mov r1, #2 mov r2, #3 neg r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _02213452: pop {r4, r5, r6, pc} @@ -3156,14 +3156,14 @@ _022134FE: mov r7, #0xc8 _02213500: mov r0, #2 - bl FUN_020187B0 + bl BgGetCharPtr mov r2, #0x19 mov r1, #0 lsl r2, r2, #8 bl MI_CpuFill8 mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0 str r0, [sp] add r0, r5, #0 @@ -3173,7 +3173,7 @@ _02213500: ldr r2, [sp, #0x18] mov r1, #2 lsl r3, r3, #6 - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3262,7 +3262,7 @@ _022135AC: mov r1, #2 mov r2, #0 neg r3, r7 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 add r0, #0xc4 sub r4, #0x28 @@ -3270,17 +3270,17 @@ _022135AC: mov r1, #2 mov r2, #3 neg r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer add r0, r5, #0 bl MOD08_02215574 add r1, r0, #0 lsl r1, r1, #0x18 mov r0, #2 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -3296,7 +3296,7 @@ MOD08_02213630: ; 0x02213630 add r0, r0, #4 str r0, [r4, #0x18] mov r0, #2 - bl FUN_020187B0 + bl BgGetCharPtr mov r2, #0x19 mov r1, #0 lsl r2, r2, #8 @@ -4166,7 +4166,7 @@ MOD08_02213C94: ; 0x02213C94 lsl r1, r4, #0x18 ldr r0, [r0] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 mov r6, #2 bl MOD08_02212004 @@ -4364,14 +4364,14 @@ _02213E50: lsl r1, r4, #0x18 mov r0, #3 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority lsl r1, r4, #0x18 mov r0, #2 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer ldrb r0, [r5, #5] add r0, r0, #1 strb r0, [r5, #5] @@ -4383,7 +4383,7 @@ _02213E8E: ldr r0, [r0] mov r2, #2 add r3, r1, #0 - bl FUN_020170F4 + bl SetBgControlParam ldr r0, [r5, #0x48] bl MOD08_02212004 cmp r0, #1 @@ -4394,7 +4394,7 @@ _02213E8E: ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020170F4 + bl SetBgControlParam _02213EB8: ldr r1, [r5, #0x48] ldr r3, [r5, #0x10] @@ -4491,7 +4491,7 @@ _02213F56: ; jump table _02213F60: mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer ldrb r0, [r4, #5] add r0, r0, #1 strb r0, [r4, #5] @@ -4506,11 +4506,11 @@ _02213F6E: lsl r1, r5, #0x18 mov r0, #3 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority lsl r1, r5, #0x18 mov r0, #2 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldrb r0, [r4, #0xa] mov r1, #4 mov r2, #8 @@ -4591,21 +4591,21 @@ _0221401E: ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x48] mov r1, #3 add r0, #0xc4 ldr r0, [r0] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x48] mov r1, #3 add r0, #0xc4 ldr r0, [r0] mov r2, #2 mov r3, #4 - bl FUN_020170F4 + bl SetBgControlParam ldr r0, [r4, #0x48] bl MOD08_02212004 cmp r0, #0 @@ -4616,7 +4616,7 @@ _0221401E: ldr r0, [r0] mov r2, #0 mov r3, #1 - bl FUN_020170F4 + bl SetBgControlParam ldr r0, [r4, #0x48] mov r1, #3 bl MOD08_02215638 @@ -4800,7 +4800,7 @@ _022141BE: ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020170F4 + bl SetBgControlParam ldr r1, [r4, #0x48] ldr r3, [r4, #0x10] add r0, r4, #0 @@ -4981,7 +4981,7 @@ _02214324: _02214338: mov r0, #3 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x48] bl MOD08_02212004 cmp r0, #0 @@ -4992,7 +4992,7 @@ _02214338: ldr r0, [r0] mov r2, #0 mov r3, #1 - bl FUN_020170F4 + bl SetBgControlParam ldr r0, [r4, #0x48] mov r1, #3 bl MOD08_02215638 @@ -5060,7 +5060,7 @@ _022143BE: bl GfGfxLoader_LoadScrnData mov r0, #3 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer ldrb r0, [r4, #5] add r0, r0, #1 strb r0, [r4, #5] @@ -5071,14 +5071,14 @@ _022143F0: ldr r0, [r0] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x48] mov r1, #3 add r0, #0xc4 ldr r0, [r0] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrb r0, [r4, #0xd] ldr r2, [r4, #0x48] cmp r0, #0 @@ -5208,7 +5208,7 @@ _022144DA: ldr r0, [r4] lsr r1, r1, #0x18 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _02214508: mov r0, #0xa ldrsh r0, [r4, r0] @@ -5221,7 +5221,7 @@ _02214508: ldr r0, [r4] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _02214522: pop {r3, r4, r5, pc} @@ -5546,11 +5546,11 @@ MOD08_0221477C: ; 0x0221477C lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority lsl r0, r4, #0x18 lsr r0, r0, #0x18 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer add r0, r5, #0 bl MOD08_02212004 cmp r0, #1 @@ -5562,7 +5562,7 @@ MOD08_0221477C: ; 0x0221477C lsr r1, r1, #0x18 mov r2, #2 mov r3, #4 - bl FUN_020170F4 + bl SetBgControlParam b _022147E4 _022147C0: add r0, r5, #0 @@ -5572,7 +5572,7 @@ _022147C0: lsr r1, r1, #0x18 mov r2, #0 mov r3, #1 - bl FUN_020170F4 + bl SetBgControlParam add r0, r5, #0 add r0, #0xc4 lsl r1, r4, #0x18 @@ -5580,14 +5580,14 @@ _022147C0: lsr r1, r1, #0x18 mov r2, #2 mov r3, #4 - bl FUN_020170F4 + bl SetBgControlParam _022147E4: add r0, r5, #0 add r0, #0xc4 lsl r1, r4, #0x18 ldr r0, [r0] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 bl MOD08_02212004 cmp r0, #1 @@ -5646,7 +5646,7 @@ MOD08_02214850: ; 0x02214850 lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add r0, r5, #0 bl MOD08_02212004 cmp r0, #1 @@ -5658,7 +5658,7 @@ MOD08_02214850: ; 0x02214850 lsr r1, r1, #0x18 mov r2, #2 mov r3, #3 - bl FUN_020170F4 + bl SetBgControlParam b _022148AC _02214888: add r0, r5, #0 @@ -5668,7 +5668,7 @@ _02214888: ldr r0, [r0] lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020170F4 + bl SetBgControlParam add r0, r5, #0 add r0, #0xc4 lsl r1, r4, #0x18 @@ -5676,13 +5676,13 @@ _02214888: lsr r1, r1, #0x18 mov r2, #2 mov r3, #3 - bl FUN_020170F4 + bl SetBgControlParam _022148AC: add r5, #0xc4 lsl r1, r4, #0x18 ldr r0, [r5] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} .align 2, 0 @@ -6040,7 +6040,7 @@ MOD08_02214B38: ; 0x02214B38 thumb_func_start MOD08_02214B3C MOD08_02214B3C: ; 0x02214B3C ldr r1, [r0, #0x18] - ldr r3, _02214B50 ; =FUN_020054C8 + ldr r3, _02214B50 ; =PlaySE add r1, r1, #4 str r1, [r0, #0x18] ldr r2, [r1] @@ -6050,7 +6050,7 @@ MOD08_02214B3C: ; 0x02214B3C lsr r0, r0, #0x10 bx r3 .align 2, 0 -_02214B50: .word FUN_020054C8 +_02214B50: .word PlaySE thumb_func_start MOD08_02214B54 MOD08_02214B54: ; 0x02214B54 @@ -6087,7 +6087,7 @@ MOD08_02214B70: ; 0x02214B70 bl MOD08_02215354 add r5, r0, #0 add r0, r4, #0 - bl FUN_020054C8 + bl PlaySE ldr r1, _02214BA4 ; =0x0000FFFF add r0, r4, #0 add r2, r5, #0 @@ -6174,7 +6174,7 @@ MOD08_02214BC4: ; 0x02214BC4 bl MOD08_0221540C str r0, [r4, #0x10] ldrh r0, [r4, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #0x1a] ldr r1, _02214C60 ; =0x0000FFFF ldr r2, [r4, #8] @@ -6232,7 +6232,7 @@ MOD08_02214C64: ; 0x02214C64 add r0, r0, #4 str r0, [r5, #0x18] ldrh r0, [r4, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #0x1a] ldr r1, _02214CD8 ; =0x0000FFFF ldr r2, [r4, #8] @@ -6308,7 +6308,7 @@ MOD08_02214CDC: ; 0x02214CDC bl MOD08_02215354 str r0, [r4, #0x10] ldrh r0, [r4, #0x1a] - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #0x1a] ldr r1, _02214D7C ; =0x0000FFFF ldr r2, [r4, #8] @@ -7555,7 +7555,7 @@ MOD08_02215638: ; 0x02215638 ldr r0, [r0] lsr r1, r1, #0x18 lsl r3, r3, #0x10 - bl FUN_02017E14 + bl BG_LoadCharTilesData pop {r3, pc} .align 2, 0 @@ -15184,7 +15184,7 @@ _02218F32: ldr r0, [r5, #0x18] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, r4, r5, r6, r7, pc} _02218F4E: ldr r0, [r5, #8] @@ -15287,7 +15287,7 @@ _02219008: bl G2x_SetBlendAlpha_ mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer ldrb r0, [r4, #0x1c] add r0, r0, #1 strb r0, [r4, #0x1c] @@ -15377,7 +15377,7 @@ _022190A4: _022190B2: mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x20] add r1, r5, #0 bl MOD08_02212438 @@ -15453,13 +15453,13 @@ _02219136: ldr r0, [r4, #0x30] mov r1, #2 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, r4, r5, pc} .align 2, 0 _02219154: .word 0x04000050 @@ -15565,7 +15565,7 @@ _02219228: strh r0, [r4, #0x18] mov r0, #2 str r1, [r4, #4] - bl FUN_0201797C + bl ToggleBgLayer add r0, r5, #0 mov r1, #0 bl MOD08_02212498 @@ -15605,7 +15605,7 @@ _02219228: bl FUN_020030E8 ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 mov r6, #2 bl MOD08_02212004 @@ -15645,13 +15645,13 @@ _022192BC: ldr r0, [r4, #0x30] mov r1, #2 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x20] ldr r1, _02219310 ; =MOD08_02218FE8 add r2, r4, #0 @@ -15690,7 +15690,7 @@ _02219334: bl G2x_SetBlendAlpha_ mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer ldrb r0, [r4, #0x1c] add r0, r0, #1 strb r0, [r4, #0x1c] @@ -15778,7 +15778,7 @@ _022193CC: _022193DA: mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x20] add r1, r5, #0 bl MOD08_02212438 @@ -15854,13 +15854,13 @@ _0221945E: ldr r0, [r4, #0x30] mov r1, #2 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, r4, r5, pc} .align 2, 0 _0221947C: .word 0x04000050 @@ -15969,7 +15969,7 @@ _02219550: strh r0, [r4, #0x18] mov r0, #2 str r1, [r4, #4] - bl FUN_0201797C + bl ToggleBgLayer add r0, r5, #0 mov r1, #0 bl MOD08_02212498 @@ -16009,7 +16009,7 @@ _02219550: bl FUN_020030E8 ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 mov r6, #2 bl MOD08_02212004 @@ -16049,13 +16049,13 @@ _022195EA: ldr r0, [r4, #0x30] mov r1, #2 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] ldr r0, [r4, #0x30] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x20] ldr r1, _0221963C ; =MOD08_02219314 add r2, r4, #0 @@ -20509,7 +20509,7 @@ _0221BA38: ldr r0, [r4, #0x28] lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0221BA50: ldr r0, [r4, #0x24] cmp r0, #0 @@ -20520,7 +20520,7 @@ _0221BA50: lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0221BA66: ldrb r0, [r4, #1] add sp, #4 @@ -20540,7 +20540,7 @@ _0221BA70: ldr r0, [r4, #0x28] lsr r1, r1, #0x18 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0221BA8C: mov r3, #0xd6 ldrsh r0, [r4, r3] @@ -20554,7 +20554,7 @@ _0221BA8C: ldr r0, [r4, #0x28] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #4 pop {r3, r4, pc} _0221BAAC: @@ -26110,7 +26110,7 @@ _0221E84C: ldr r0, [r4, #8] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0xc pop {r4, r5, r6, r7, pc} _0221E866: @@ -26622,13 +26622,13 @@ _0221EC7A: ldr r0, [r5, #0x14] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x4e mov r1, #3 ldrsh r3, [r5, r3] ldr r0, [r5, #0x14] add r2, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, r4, r5, r6, r7, pc} _0221ECA0: ldr r0, [r5, #4] @@ -29589,7 +29589,7 @@ MOD08_0222042C: ; 0x0222042C bl MOD08_0221477C mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #8] ldr r1, _022204C8 ; =MOD08_02220304 add r2, r4, #0 @@ -31969,7 +31969,7 @@ _022218B0: lsl r1, r1, #0x18 mov r0, #2 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority _022218C4: ldr r0, [r4, #0x1c] mov r1, #0 @@ -33520,7 +33520,7 @@ _0222255E: mov r1, #2 mov r2, #0 neg r3, r3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4] bl MOD08_02212490 mov r3, #0x12 @@ -33528,7 +33528,7 @@ _0222255E: mov r1, #2 mov r2, #3 neg r3, r3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] @@ -33578,14 +33578,14 @@ _022225CE: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] mov r1, #1 bl MOD08_02215588 @@ -33598,7 +33598,7 @@ _022225CE: lsr r0, r0, #0x18 lsl r1, r1, #0xe mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4] bl MOD08_02212490 add r5, r0, #0 @@ -33609,7 +33609,7 @@ _022225CE: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] add r1, r6, #0 bl MOD08_02212438 @@ -33762,7 +33762,7 @@ _022226FC: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 @@ -33770,7 +33770,7 @@ _022226FC: lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority _022227AE: ldr r0, [sp, #0x14] add r1, r4, #0 @@ -34338,14 +34338,14 @@ _02222C3E: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4, #0x10] mov r1, #6 mov r2, #0 @@ -34362,7 +34362,7 @@ _02222C3E: lsr r0, r0, #0x18 lsl r1, r1, #0xe mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4] bl MOD08_02212490 add r5, r0, #0 @@ -34373,7 +34373,7 @@ _02222C3E: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] add r1, r6, #0 bl MOD08_02212438 @@ -34466,7 +34466,7 @@ _02222D6A: lsl r0, r0, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 @@ -34474,7 +34474,7 @@ _02222D6A: lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4, #0x48] mov r1, #0 bl FUN_0200C644 @@ -40527,14 +40527,14 @@ _02225E68: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] mov r1, #1 bl MOD08_02215588 @@ -40547,7 +40547,7 @@ _02225E68: lsr r0, r0, #0x18 lsl r1, r1, #0xe mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4] bl MOD08_02212490 add r5, r0, #0 @@ -40558,7 +40558,7 @@ _02225E68: lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 bl FreeToHeap ldr r0, [r4] @@ -40647,7 +40647,7 @@ MOD08_02225EFC: ; 0x02225EFC lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] bl MOD08_02215574 add r1, r0, #0 @@ -40655,7 +40655,7 @@ MOD08_02225EFC: ; 0x02225EFC lsl r1, r1, #0x18 mov r0, #0 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority _02225FD0: ldr r0, [r4] ldr r1, _02225FDC ; =MOD08_02225E14 @@ -42728,7 +42728,7 @@ MOD08_02227068: ; 0x02227068 lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -42760,7 +42760,7 @@ MOD08_02227068: ; 0x02227068 lsl r1, r4, #0x18 ldr r0, [r5, #0x2c] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -42860,7 +42860,7 @@ _02227180: bne _022271B2 ldr r0, [r4, #0x2c] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x34] mov r1, #0 bl FUN_0200C644 @@ -42899,12 +42899,12 @@ _022271C0: ldr r0, [r4, #0x2c] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x2c] mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -42934,13 +42934,13 @@ _0222720E: ldrsh r3, [r4, r3] ldr r0, [r4, #0x2c] mov r1, #2 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x12 ldrsh r3, [r4, r3] ldr r0, [r4, #0x2c] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x34] bl FUN_0200C5A8 ldr r0, [r4, #0x38] diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index 003e2dc8..07d0fa04 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -425,7 +425,7 @@ _022121B6: cmp r0, #1 beq _0221220E ldr r0, _02212214 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -433,7 +433,7 @@ _022121B6: pop {r4, pc} _022121E2: ldr r0, _02212214 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, [r4] add r0, r4, #0 ldrb r1, [r1, #0x11] @@ -642,7 +642,7 @@ _02212384: ; jump table .short _022123F6 - _02212384 - 2 ; case 3 _0221238C: ldr r0, _02212414 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #7 bl MOD09_022181C8 @@ -664,7 +664,7 @@ _022123B2: cmp r0, #1 beq _0221240E ldr r0, _02212414 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #8 bl MOD09_022181C8 @@ -679,7 +679,7 @@ _022123D4: cmp r0, #1 beq _0221240E ldr r0, _02212414 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xa bl MOD09_022181C8 @@ -690,7 +690,7 @@ _022123D4: pop {r4, pc} _022123F6: ldr r0, _02212414 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -736,7 +736,7 @@ _0221243C: ldr r1, [r4] strb r0, [r1, #0x11] ldr r0, _022124D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xc bl MOD09_022181C8 @@ -756,7 +756,7 @@ _0221246A: ldr r1, [r4] strb r0, [r1, #0x11] ldr r0, _022124D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xd bl MOD09_022181C8 @@ -767,7 +767,7 @@ _0221246A: pop {r4, pc} _02212496: ldr r0, _022124D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xb bl MOD09_022181C8 @@ -778,7 +778,7 @@ _02212496: pop {r4, pc} _022124AE: ldr r0, _022124D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -833,7 +833,7 @@ _02212506: cmp r0, #0 beq _022125CE ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r1, #0xe lsl r1, r1, #0x18 @@ -860,7 +860,7 @@ _0221253E: ldr r1, [r4] strb r0, [r1, #0x11] ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xc bl MOD09_022181C8 @@ -880,7 +880,7 @@ _0221256C: ldr r1, [r4] strb r0, [r1, #0x11] ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xd bl MOD09_022181C8 @@ -891,7 +891,7 @@ _0221256C: pop {r3, r4, r5, pc} _02212598: ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #9 bl MOD09_022181C8 @@ -902,7 +902,7 @@ _02212598: pop {r3, r4, r5, pc} _022125B0: ldr r0, _022125D4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -960,7 +960,7 @@ _02212604: beq _0221264A _02212622: ldr r0, _02212650 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, #0x34 strb r5, [r0] @@ -968,7 +968,7 @@ _02212622: pop {r3, r4, r5, pc} _02212632: ldr r0, _02212650 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -1034,7 +1034,7 @@ _022126A6: ldr r0, _0221273C ; =0x0000208D strb r1, [r4, r0] ldr r0, _02212740 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r5, #0x17 lsl r1, r5, #0x18 add r0, r4, #0 @@ -1067,7 +1067,7 @@ _022126D0: add r0, #0x16 strb r5, [r4, r0] ldr r0, _02212740 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x12 bl MOD09_022181C8 @@ -1082,7 +1082,7 @@ _02212710: add r0, #0x34 strb r1, [r0] ldr r0, _02212740 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -1136,7 +1136,7 @@ _0221277C: b _0221284A _0221278A: ldr r0, _02212858 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _0221285C ; =0x00002077 ldrb r0, [r5, r0] lsl r0, r0, #0x1c @@ -1187,7 +1187,7 @@ _022127E6: lsr r0, r0, #0x1c beq _0221284A ldr r0, _02212858 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0x12 bl MOD09_022181C8 @@ -1216,7 +1216,7 @@ _022127E6: pop {r3, r4, r5, pc} _0221282C: ldr r0, _02212858 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #6 bl MOD09_022181C8 @@ -1294,7 +1294,7 @@ _022128B6: add r0, #0x34 strb r5, [r0] ldr r0, _0221295C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r1, #0x13 lsl r1, r1, #0x18 @@ -1342,7 +1342,7 @@ _0221290E: pop {r3, r4, r5, r6, pc} _02212934: ldr r0, _0221295C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD09_022181C8 @@ -1694,7 +1694,7 @@ _02212BAA: strb r2, [r4, r0] _02212BC6: ldr r0, _02212C88 ; =0x000005EC - bl FUN_020054C8 + bl PlaySE b _02212C78 _02212BCE: ldrb r1, [r5, #0x11] @@ -1854,7 +1854,7 @@ _02212CF4: add r0, r5, #0 bl MOD09_02216378 ldr r0, _02212DB0 ; =0x000005EC - bl FUN_020054C8 + bl PlaySE ldr r0, _02212DAC ; =0x0000207C mov r1, #1 strb r1, [r5, r0] @@ -2027,7 +2027,7 @@ MOD09_02212E4C: ; 0x02212E4C stmia r3!, {r0, r1} add r0, r2, #0 mov r1, #1 - bl FUN_02016BF4 + bl SetScreenModeAndDisable ldr r5, _02212F4C ; =0x0221AF48 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -2044,7 +2044,7 @@ MOD09_02212E4C: ; 0x02212E4C lsl r0, r0, #2 ldr r0, [r4, r0] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02212F50 ; =0x0221AF80 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -2061,7 +2061,7 @@ MOD09_02212E4C: ; 0x02212E4C lsl r0, r0, #2 ldr r0, [r4, r0] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02212F54 ; =0x0221AF9C add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -2078,12 +2078,12 @@ MOD09_02212E4C: ; 0x02212E4C lsl r0, r0, #2 ldr r0, [r4, r0] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02212F58 ; =0x0221AF64 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -2100,34 +2100,34 @@ MOD09_02212E4C: ; 0x02212E4C lsl r0, r0, #2 ldr r0, [r4, r0] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r3, [r4] mov r0, #5 ldr r3, [r3, #0xc] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #4 ldr r3, [r3, #0xc] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x80 pop {r3, r4, r5, pc} .align 2, 0 @@ -2146,16 +2146,16 @@ MOD09_02212F5C: ; 0x02212F5C bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 @@ -3156,7 +3156,7 @@ _02213778: lsl r0, r0, #2 ldr r0, [r6, r0] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _0221378E: pop {r3, r4, r5, r6, r7, pc} @@ -3181,7 +3181,7 @@ MOD09_02213790: ; 0x02213790 mov r1, #7 add r2, r5, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -3208,7 +3208,7 @@ MOD09_022137C0: ; 0x022137C0 mov r1, #7 add r2, r4, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0xe str r0, [sp] mov r0, #1 @@ -3226,7 +3226,7 @@ MOD09_022137C0: ; 0x022137C0 mov r1, #7 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0xf str r0, [sp] mov r0, #1 @@ -3244,7 +3244,7 @@ MOD09_022137C0: ; 0x022137C0 mov r1, #7 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0xf str r0, [sp] mov r0, #1 @@ -3261,7 +3261,7 @@ MOD09_022137C0: ; 0x022137C0 mov r1, #7 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -3338,7 +3338,7 @@ _022138E2: lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _022138EE: pop {r3, r4, r5, r6, r7, pc} @@ -3353,13 +3353,13 @@ MOD09_022138F0: ; 0x022138F0 ldr r0, [r5, r0] mov r1, #4 mov r2, #0 - bl FUN_0201878C + bl BgFillTilemapBufferAndSchedule mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #5 mov r2, #0 - bl FUN_0201878C + bl BgFillTilemapBufferAndSchedule add r0, r5, #0 add r1, r4, #0 bl MOD09_02216D80 @@ -3425,14 +3425,14 @@ _02213976: lsr r1, r1, #0x18 add r2, #0xc mov r3, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect mov r0, #0x79 lsl r0, r0, #2 add r1, r4, #6 lsl r1, r1, #0x18 ldr r0, [r5, r0] lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r7, #0 bl FreeToHeap add r4, r4, #1 @@ -3758,15 +3758,15 @@ MOD09_02213C34: ; 0x02213C34 ldr r0, _02213C68 ; =0x00002070 ldr r0, [r4, r0] add r0, #0xa0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r0, _02213C68 ; =0x00002070 ldr r0, [r4, r0] add r0, #0x60 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r0, _02213C68 ; =0x00002070 ldr r0, [r4, r0] add r0, #0x70 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer pop {r4, pc} nop _02213C64: .word 0x00002020 @@ -3781,7 +3781,7 @@ MOD09_02213C6C: ; 0x02213C6C lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, pc} .align 2, 0 @@ -3825,7 +3825,7 @@ _02213CC4: ldr r0, [r7, r0] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -3941,7 +3941,7 @@ _02213D90: lsl r2, r5, #3 ldr r0, [r4, r0] add r2, r6, r2 - bl FUN_02019150 + bl AddWindow add r0, r5, #1 lsl r0, r0, #0x18 lsr r5, r0, #0x18 @@ -3974,7 +3974,7 @@ MOD09_02213DE0: ; 0x02213DE0 bx r3 nop _02213DF0: .word 0x00002070 -_02213DF4: .word FUN_020191A4 +_02213DF4: .word WindowArray_dtor thumb_func_start MOD09_02213DF8 MOD09_02213DF8: ; 0x02213DF8 @@ -3984,13 +3984,13 @@ MOD09_02213DF8: ; 0x02213DF8 ldr r0, [r5, r1] add r1, r1, #4 ldrb r1, [r5, r1] - bl FUN_020191A4 + bl WindowArray_dtor ldr r0, _02213E24 ; =0x00002050 mov r4, #0 add r5, r5, r0 _02213E0E: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #2 @@ -4235,7 +4235,7 @@ _02214002: bl String_dtor _02214008: add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop @@ -4280,7 +4280,7 @@ MOD09_02214038: ; 0x02214038 ldr r0, _0221407C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -4340,7 +4340,7 @@ MOD09_02214080: ; 0x02214080 ldr r0, _022140F8 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -4388,7 +4388,7 @@ _02214144: ldr r0, [sp, #8] lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _02214156: @@ -4451,7 +4451,7 @@ _0221415E: ldr r0, _022141D4 ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -4508,7 +4508,7 @@ MOD09_022141D8: ; 0x022141D8 ldr r0, _0221425C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -4579,7 +4579,7 @@ _022142BA: ldr r0, _022142F8 ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -4655,7 +4655,7 @@ _02214362: add r0, r7, #0 bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -4695,7 +4695,7 @@ MOD09_022143A0: ; 0x022143A0 ldr r0, _022143F4 ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -4740,7 +4740,7 @@ MOD09_022143F8: ; 0x022143F8 bl String_dtor ldr r0, _02214450 ; =0x00002050 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -4786,7 +4786,7 @@ MOD09_0221445C: ; 0x0221445C add r0, r7, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -4975,21 +4975,21 @@ _022145F4: mov r0, #0x13 lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214684 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r7 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214684 ; =0x00002070 ldr r1, [r5, r0] mov r0, #5 lsl r0, r0, #6 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214684 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5094,11 +5094,11 @@ MOD09_02214694: ; 0x02214694 ldr r0, _02214780 ; =0x00002070 ldr r0, [r5, r0] add r0, #0xe0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214780 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -5203,11 +5203,11 @@ MOD09_02214790: ; 0x02214790 ldr r0, _0221487C ; =0x00002070 ldr r0, [r5, r0] add r0, #0xf0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0221487C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -5315,11 +5315,11 @@ MOD09_0221488C: ; 0x0221488C mov r0, #1 lsl r0, r0, #8 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0221497C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5427,11 +5427,11 @@ MOD09_0221498C: ; 0x0221498C mov r0, #0x11 lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214A7C ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5539,11 +5539,11 @@ MOD09_02214A8C: ; 0x02214A8C mov r0, #0x12 lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214B7C ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5716,11 +5716,11 @@ MOD09_02214B8C: ; 0x02214B8C ldr r0, _02214D14 ; =0x00002070 ldr r0, [r5, r0] add r0, #0xd0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02214D14 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -5777,7 +5777,7 @@ MOD09_02214D24: ; 0x02214D24 ldr r0, _02214D9C ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -5812,7 +5812,7 @@ MOD09_02214DA0: ; 0x02214DA0 add r0, r6, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -5914,7 +5914,7 @@ _02214E42: bl String_dtor _02214EB8: add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -5948,7 +5948,7 @@ MOD09_02214ED0: ; 0x02214ED0 add r0, r6, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -6050,7 +6050,7 @@ _02214F72: bl String_dtor _02214FE8: add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -6093,7 +6093,7 @@ MOD09_02215000: ; 0x02215000 add r0, r7, #0 bl DestroyMsgData add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6140,7 +6140,7 @@ MOD09_02215060: ; 0x02215060 ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -6186,7 +6186,7 @@ MOD09_022150C8: ; 0x022150C8 add r0, r7, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6247,7 +6247,7 @@ _0221516C: add r0, r6, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -6378,7 +6378,7 @@ MOD09_022151A8: ; 0x022151A8 ldr r0, [sp, #0x2c] bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6434,7 +6434,7 @@ _02215306: add r0, r6, #0 bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6481,7 +6481,7 @@ _02215368: add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -6625,7 +6625,7 @@ MOD09_022153B0: ; 0x022153B0 add r0, r7, #0 bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6717,7 +6717,7 @@ MOD09_022154FC: ; 0x022154FC ldr r0, [sp, #0x14] bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -6930,11 +6930,11 @@ _0221576A: ldr r0, _02215780 ; =0x00002070 ldr r0, [r4, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215780 ; =0x00002070 ldr r0, [r4, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} .align 2, 0 _02215780: .word 0x00002070 @@ -7094,7 +7094,7 @@ _022158C0: bl String_dtor _022158C6: ldr r0, [sp, #0x18] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -7224,22 +7224,22 @@ _022159C8: ldr r1, [r5, r0] ldr r0, [sp, #0x18] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215A20 ; =0x00002070 ldr r1, [r5, r0] ldr r0, [sp, #0x14] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215A20 ; =0x00002070 ldr r1, [r5, r0] ldr r0, [sp, #0x10] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215A20 ; =0x00002070 ldr r1, [r5, r0] ldr r0, [sp, #0xc] add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, _02215A1C ; =0x00002075 mov r0, #1 ldrb r2, [r5, r1] @@ -7753,23 +7753,23 @@ _02215E4C: ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02215EC4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x50 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -8066,19 +8066,19 @@ _02216156: ldr r0, _02216184 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02216184 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x20 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02216184 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x30 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _02216184 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -8184,7 +8184,7 @@ MOD09_022161B0: ; 0x022161B0 ldr r0, _02216304 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [r5] add r0, r1, #0 add r0, #0x34 @@ -8288,7 +8288,7 @@ MOD09_0221633C: ; 0x0221633C sub sp, #0xc add r4, r0, #0 mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint ldr r0, [r4] ldr r0, [r0, #8] bl MOD11_02230E54 @@ -11750,12 +11750,12 @@ MOD09_02217F88: ; 0x02217F88 lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #6 - bl FUN_02018148 + bl LoadRectToBgTilemapRect mov r0, #0x79 lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp, #0x18] bl FreeToHeap add sp, #0x1c @@ -11824,7 +11824,7 @@ _0221803C: ldrb r1, [r6, r1] lsl r1, r1, #4 add r0, r0, r1 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r3, r4, r5, r6, r7, pc} _02218070: mov r4, #0 @@ -11845,7 +11845,7 @@ _02218072: ldrb r0, [r6, r4] lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -12988,7 +12988,7 @@ _022189AA: ; jump table .short _02218A06 - _022189AA - 2 ; case 5 _022189B6: ldr r0, _02218A2C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE lsl r0, r5, #0x18 lsr r1, r0, #0x18 ldr r0, _02218A30 ; =0x0000114D @@ -13007,7 +13007,7 @@ _022189D6: cmp r0, #0 beq _02218A24 ldr r0, _02218A2C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] ldrb r1, [r0, #0x1f] ldr r0, _02218A30 ; =0x0000114D @@ -13025,7 +13025,7 @@ _022189D6: pop {r3, r4, r5, pc} _02218A06: ldr r0, _02218A2C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] mov r2, #0 strh r2, [r0, #0x1c] @@ -13094,7 +13094,7 @@ _02218A84: cmp r0, #0 beq _02218B30 ldr r0, _02218B38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218B3C ; =0x0000114D ldr r2, [r4] ldrb r1, [r4, r0] @@ -13121,7 +13121,7 @@ _02218ABA: cmp r0, #0 beq _02218B30 ldr r0, _02218B38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218B40 ; =0x0000114B mov r1, #7 strb r1, [r4, r0] @@ -13143,7 +13143,7 @@ _02218AE8: cmp r0, #0 beq _02218B30 ldr r0, _02218B38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218B40 ; =0x0000114B mov r1, #7 strb r1, [r4, r0] @@ -13158,7 +13158,7 @@ _02218AE8: pop {r3, r4, r5, pc} _02218B16: ldr r0, _02218B38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218B40 ; =0x0000114B mov r1, #4 strb r1, [r4, r0] @@ -13268,7 +13268,7 @@ _02218BEA: b _02218C44 _02218BF4: ldr r0, _02218C4C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, _02218C50 ; =0x0000114D ldr r2, [r5] ldrb r1, [r5, r1] @@ -13292,7 +13292,7 @@ _02218BF4: pop {r3, r4, r5, pc} _02218C2A: ldr r0, _02218C4C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _02218C54 ; =0x0000114B mov r1, #5 strb r1, [r5, r0] @@ -13744,7 +13744,7 @@ _02218FC2: cmp r0, #1 bne _02218FFA ldr r0, _022190C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _022190C4 ; =0x0000114D mov r1, #2 strb r1, [r4, r0] @@ -13784,7 +13784,7 @@ _02219014: cmp r0, #1 bne _02219054 ldr r0, _022190C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _022190C4 ; =0x0000114D ldr r3, [r4] ldrb r1, [r4, r0] @@ -13828,7 +13828,7 @@ _0221906E: cmp r0, #1 bne _022190AE ldr r0, _022190C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, _022190C4 ; =0x0000114D ldr r2, [r4] ldrb r1, [r4, r1] @@ -13878,7 +13878,7 @@ MOD09_022190CC: ; 0x022190CC stmia r3!, {r0, r1} add r0, r2, #0 mov r1, #1 - bl FUN_02016BF4 + bl SetScreenModeAndDisable ldr r5, _0221918C ; =0x0221BBCC add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -13893,7 +13893,7 @@ MOD09_022190CC: ; 0x022190CC str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02219190 ; =0x0221BBB0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -13908,10 +13908,10 @@ MOD09_022190CC: ; 0x022190CC str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02219194 ; =0x0221BB94 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -13926,28 +13926,28 @@ MOD09_022190CC: ; 0x022190CC str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r3, [r4] mov r0, #5 ldr r3, [r3, #0xc] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #4 ldr r3, [r3, #0xc] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #4] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x64 pop {r4, r5, pc} .align 2, 0 @@ -13965,13 +13965,13 @@ MOD09_02219198: ; 0x02219198 bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 @@ -14141,12 +14141,12 @@ _02219316: ldr r0, [r4, #4] mov r1, #6 add r3, r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #4] mov r1, #6 mov r2, #3 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} _02219330: mov r1, #6 @@ -14154,25 +14154,25 @@ _02219330: ldr r0, [r4, #4] mov r2, #0 add r3, #0xfa - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #4] mov r1, #6 mov r2, #3 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} _0221934C: mov r2, #0 ldr r0, [r4, #4] mov r1, #6 add r3, r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r2, #3 add r3, r2, #0 ldr r0, [r4, #4] mov r1, #6 add r3, #0xfd - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, pc} thumb_func_start MOD09_02219368 @@ -14196,7 +14196,7 @@ MOD09_02219368: ; 0x02219368 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r4, #4] - bl FUN_020186B4 + bl BgTilemapRectChangePalette mov r0, #0x1c str r0, [sp] mov r0, #8 @@ -14211,7 +14211,7 @@ MOD09_02219368: ; 0x02219368 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r4, #4] - bl FUN_020186B4 + bl BgTilemapRectChangePalette _022193B2: add sp, #0xc pop {r3, r4, pc} @@ -14230,11 +14230,11 @@ MOD09_022193BC: ; 0x022193BC ldr r0, [r5, #4] mov r1, #4 mov r2, #0 - bl FUN_0201878C + bl BgFillTilemapBufferAndSchedule ldr r0, [r5, #4] mov r1, #5 mov r2, #0 - bl FUN_0201878C + bl BgFillTilemapBufferAndSchedule add r0, r5, #0 bl MOD09_02219510 add r0, r5, #0 @@ -14311,7 +14311,7 @@ MOD09_02219474: ; 0x02219474 ldr r0, [r4, #4] ldr r2, _02219490 ; =0x0221BC2C add r1, #0x1c - bl FUN_02019150 + bl AddWindow ldr r1, _02219494 ; =0x0000114C add r0, r4, #0 ldrb r1, [r4, r1] @@ -14370,7 +14370,7 @@ _022194E2: lsl r2, r4, #3 ldr r0, [r5, #4] add r2, r6, r2 - bl FUN_02019150 + bl AddWindow add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -14395,7 +14395,7 @@ MOD09_02219510: ; 0x02219510 ldrb r1, [r1] bx r3 .align 2, 0 -_0221951C: .word FUN_020191A4 +_0221951C: .word WindowArray_dtor thumb_func_start MOD09_02219520 MOD09_02219520: ; 0x02219520 @@ -14405,10 +14405,10 @@ MOD09_02219520: ; 0x02219520 add r1, #0x30 ldrb r1, [r1] ldr r0, [r4, #0x2c] - bl FUN_020191A4 + bl WindowArray_dtor add r4, #0x1c add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 @@ -14469,7 +14469,7 @@ MOD09_02219560: ; 0x02219560 ldr r0, [sp, #0x10] bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -14570,7 +14570,7 @@ _022195C4: bl String_dtor ldr r0, [r5, #0x2c] add r0, #0x40 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _0221968A: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -14646,7 +14646,7 @@ MOD09_02219694: ; 0x02219694 bl String_dtor _02219726: add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -14716,7 +14716,7 @@ MOD09_02219738: ; 0x02219738 bl String_dtor _022197BA: add r0, r4, r7 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -14795,7 +14795,7 @@ MOD09_0221983C: ; 0x0221983C ldr r0, [r4, #4] mov r1, #5 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r5, #0 _0221985E: add r0, r4, #0 @@ -14945,7 +14945,7 @@ MOD09_02219884: ; 0x02219884 mov r0, #0x19 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -15104,7 +15104,7 @@ MOD09_02219A8C: ; 0x02219A8C add r0, r7, #0 bl String_dtor add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -15151,7 +15151,7 @@ MOD09_02219AFC: ; 0x02219AFC add r0, r7, #0 bl String_dtor add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -15243,7 +15243,7 @@ MOD09_02219C08: ; 0x02219C08 sub sp, #0xc add r4, r0, #0 mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint ldr r0, [r4] ldr r0, [r0] bl MOD11_02230E54 @@ -16848,10 +16848,10 @@ MOD09_0221A884: ; 0x0221A884 str r7, [sp, #8] ldr r0, [r5, #4] mov r1, #6 - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [r5, #4] mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp, #0x18] bl FreeToHeap add sp, #0x1c @@ -16918,7 +16918,7 @@ _0221A93C: ldr r1, [r6, #0x2c] lsl r0, r0, #4 add r0, r1, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 @@ -17391,7 +17391,7 @@ _0221ACA8: ldr r0, [r0] bl MOD11_0225D5DC ldr r0, _0221ACE0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0221ACD4: mov r0, #0 add sp, #4 @@ -17624,7 +17624,7 @@ _0221AE70: ldr r0, [r5] bl MOD11_0225D5DC ldr r0, _0221AEC0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0221AE8A: mov r0, #0 add sp, #0x14 @@ -17644,7 +17644,7 @@ _0221AEA2: tst r1, r0 beq _0221AEB6 ldr r0, _0221AEC4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 add sp, #0x14 mvn r0, r0 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 2a6bb196..23f0a76c 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -42,7 +42,7 @@ _0222D600: mov r0, #3 mov r1, #5 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, [r5] mov r0, #4 tst r0, r1 @@ -175,7 +175,7 @@ _0222D704: b _0222D7EA _0222D714: mov r0, #5 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xd str r0, [r4] b _0222D7EA @@ -187,7 +187,7 @@ _0222D720: ldr r0, _0222D7F0 ; =SDK_OVERLAY_MODULE_07_ID bl UnloadOverlayByID mov r0, #5 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x3e bl FUN_02031588 mov r0, #0xc @@ -210,7 +210,7 @@ _0222D752: mov r0, #3 mov r1, #0x49 lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r0, [r5, #4] ldr r1, [sp, #0x24] bl GetPartyMonByIndex @@ -266,7 +266,7 @@ _0222D7C2: add r0, r5, #0 bl FUN_0206C92C mov r0, #0x49 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xd str r0, [r4] b _0222D7EA @@ -325,7 +325,7 @@ MOD11_0222D840: ; 0x0222D840 ldr r0, [r4, r0] bl MOD11_02258658 ldr r0, [r4, #8] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] bl MOD11_0222E4E8 add r0, r4, #0 @@ -424,7 +424,7 @@ MOD11_0222D944: ; 0x0222D944 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02019178 + bl RemoveWindow mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -433,13 +433,13 @@ MOD11_0222D944: ; 0x0222D944 bl GX_EngineAToggleLayers ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD11_02231410 pop {r4, pc} @@ -471,26 +471,26 @@ _0222D99A: ldr r0, [r5, #4] add r2, sp, #0x14 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5, #4] mov r1, #2 add r2, sp, #0x30 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5, #4] mov r1, #3 add r2, sp, #0x4c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _0222DB40 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -630,7 +630,7 @@ _0222D99A: str r0, [sp, #0x10] ldr r0, [r5, #4] ldr r1, [r5, #8] - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #8] mov r1, #0xff bl FillWindowPixelBuffer @@ -742,7 +742,7 @@ MOD11_0222DB50: ; 0x0222DB50 mov r3, #5 bl FUN_02003008 mov r0, #5 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] mov r0, #5 mov r1, #3 @@ -792,7 +792,7 @@ _0222DC42: ldr r1, [r4, #8] mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r4, #8] mov r1, #0xff bl FillWindowPixelBuffer @@ -1348,14 +1348,14 @@ _0222E194: bl MOD11_0222D840 _0222E1AC: mov r0, #0 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C mov r0, #0 bl FUN_02002BB8 ldr r0, [r4, #8] mov r1, #3 - bl FUN_020191A4 + bl WindowArray_dtor ldr r0, [r4, #4] bl FreeToHeap mov r0, #0x87 @@ -1467,7 +1467,7 @@ _0222E282: ldmia r6!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r1, _0222E458 ; =0x000023FB mov r0, #1 ldrb r2, [r5, r1] @@ -1489,26 +1489,26 @@ _0222E2F0: add r0, r4, #0 add r2, sp, #0x48 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x64 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x80 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _0222E460 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -1712,13 +1712,13 @@ MOD11_0222E4E8: ; 0x0222E4E8 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD11_022584AC pop {r4, pc} @@ -3157,7 +3157,7 @@ _0222F088: ldr r0, [r4, #0x28] bl FUN_0200372C ldr r0, [r4, #4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222F0CC ; =0x027E0000 ldr r1, _0222F0D0 ; =0x00003FF8 mov r0, #1 @@ -3183,7 +3183,7 @@ MOD11_0222F0D4: ; 0x0222F0D4 bl FUN_0200372C bl FUN_0201C30C ldr r0, [r4, #4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222F0F8 ; =0x027E0000 ldr r1, _0222F0FC ; =0x00003FF8 mov r0, #1 @@ -3302,7 +3302,7 @@ _0222F1D0: cmp r0, #0 bne _0222F1F6 ldr r0, _0222F250 ; =0x00000704 - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 mov r1, #1 bl MOD11_02231484 @@ -3338,7 +3338,7 @@ _0222F214: sub r1, r4, #1 bne _0222F244 ldr r0, _0222F250 ; =0x00000704 - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 mov r1, #4 bl MOD11_022314B0 @@ -3366,7 +3366,7 @@ MOD11_0222F254: ; 0x0222F254 ldr r0, [r4, #4] ldr r3, [r4, r3] mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, _0222F280 ; =0x00002434 ldr r0, [r4, r0] cmp r0, #0 diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 451daa87..9b184cfc 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -41,7 +41,7 @@ MOD11_0222F29C: ; 0x0222F29C add r3, r1, #0 bl FUN_02003914 mov r0, #5 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #4] mov r0, #5 mov r1, #1 @@ -98,7 +98,7 @@ _0222F30E: ldmia r6!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r6, _0222F4D0 ; =MOD11_0225DA04 add r3, sp, #0x14 ldmia r6!, {r0, r1} @@ -113,10 +113,10 @@ _0222F30E: str r0, [r3] ldr r0, [r5, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x13 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -183,7 +183,7 @@ _0222F30E: ldr r1, [r5, #8] mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #8] mov r1, #0xff bl FillWindowPixelBuffer @@ -810,13 +810,13 @@ MOD11_0222F93C: ; 0x0222F93C bl FUN_02002FEC ldr r0, [r4, #8] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap add r0, r4, #0 @@ -1478,7 +1478,7 @@ _0222FEA6: mov r0, #3 bl FUN_02002B7C mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #1 bl FUN_02002BB8 pop {r3, pc} @@ -4128,7 +4128,7 @@ _022311D0: ldr r2, [r4, r2] mov r1, #3 lsl r3, r3, #5 - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r0, #0x5f lsl r0, r0, #2 add r0, r4, r0 @@ -6262,7 +6262,7 @@ _0223223C: b _02232252 _02232244: ldr r0, _0223225C ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE b _02232252 _0223224C: ldr r0, _02232260 ; =0x00000483 @@ -23819,10 +23819,10 @@ _0223AC50: strh r1, [r0] mov r0, #1 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] mov r1, #2 bl MOD11_02231564 @@ -23859,7 +23859,7 @@ _0223AC50: add r1, r5, #0 mov r2, #2 mov r3, #0x11 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0xff bl FillWindowPixelBuffer @@ -24041,7 +24041,7 @@ _0223AE3C: beq _0223AEDC _0223AE4E: ldr r0, _0223AF70 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x28] add sp, #0xd4 add r0, r0, #1 @@ -24055,7 +24055,7 @@ _0223AE5E: mov r1, #0 bl FUN_0200CCF8 add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow ldr r1, _0223AF50 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -24064,10 +24064,10 @@ _0223AE5E: orr r2, r0 strh r2, [r1] mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] mov r1, #0 bl MOD11_02231564 @@ -24931,7 +24931,7 @@ _0223B57C: mov r0, #1 str r0, [r4, #0x28] ldr r0, _0223B7F8 ; =0x0000070A - bl FUN_020054C8 + bl PlaySE ldr r2, [r4] ldr r0, _0223B7FC ; =0x0000241E ldrh r1, [r2, r0] @@ -24962,7 +24962,7 @@ _0223B5A4: mov r0, #1 str r0, [r4, #0x28] ldr r0, _0223B7F8 ; =0x0000070A - bl FUN_020054C8 + bl PlaySE ldr r2, [r4] ldr r0, _0223B7FC ; =0x0000241E ldrh r1, [r2, r0] @@ -25410,7 +25410,7 @@ _0223B9AA: cmp r0, #0 beq _0223B9BC ldr r0, _0223BBE4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xe str r0, [r4, #0x28] _0223B9BC: @@ -28107,7 +28107,7 @@ _0223CF5C: add r1, sp, #0x68 mov r2, #0xc mov r3, #4 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -28167,7 +28167,7 @@ _0223CF5C: ldr r0, [r5, #0x14] bl FUN_02011AC0 add r0, sp, #0x68 - bl FUN_02019178 + bl RemoveWindow add sp, #0x78 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -62296,7 +62296,7 @@ MOD11_0224D518: ; 0x0224D518 mov r1, #0xff bl FillWindowPixelBuffer add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r1, #0x65 lsl r1, r1, #2 ldrb r1, [r4, r1] @@ -63233,7 +63233,7 @@ _0224DCAE: mov r1, #3 mov r2, #2 mov r3, #0x84 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0224DCBE: ldr r0, _0224DCE0 ; =MOD11_02250060 add r1, r4, #0 @@ -67678,7 +67678,7 @@ _02250086: mov r1, #3 mov r2, #1 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x20] add r0, r0, #1 str r0, [r4, #0x20] @@ -68574,7 +68574,7 @@ _0225073C: cmp r0, #3 beq _022507E2 ldr r0, _022508A0 ; =0x0000070A - bl FUN_020054C8 + bl PlaySE _022507E2: cmp r5, #4 bne _0225088A @@ -69325,7 +69325,7 @@ _02250DD0: mov r0, #0xa strb r0, [r4, #0xb] ldr r0, _02250E9C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #6 add sp, #0x4c strb r0, [r4, #0xa] @@ -69707,7 +69707,7 @@ _02251114: cmp r0, r1 beq _022511B6 ldr r0, _022511C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x20 ldrb r0, [r0] @@ -69990,7 +69990,7 @@ _02251366: cmp r0, r1 beq _02251418 ldr r0, _0225141C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xf] add sp, #0x2c add r0, r0, #1 @@ -71659,7 +71659,7 @@ _022520D2: mov r1, #0xff bl FillWindowPixelBuffer add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4] bl MOD11_02230094 bl MOD11_0225C76C @@ -72355,7 +72355,7 @@ _0225267E: cmp r0, r1 beq _0225270A ldr r0, _02252710 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #3 add sp, #0x2c strb r0, [r4, #0xe] @@ -72853,7 +72853,7 @@ _02252A86: add r0, #0x4e strb r1, [r0] ldr r0, _02252B2C ; =0x0000070B - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x40] add r0, r4, #0 bl MOD11_022571B8 @@ -73522,7 +73522,7 @@ _02252FCE: add r1, #0xb bl MOD11_0225805C ldr r0, _02253004 ; =0x0000070C - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xa] add r0, r0, #1 strb r0, [r4, #0xa] @@ -73694,7 +73694,7 @@ _02253104: ldr r0, [r4, #8] bl MOD08_0222A1DC ldr r0, _022533E0 ; =0x0000084F - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x14] add sp, #0x18 add r0, r0, #1 @@ -73738,7 +73738,7 @@ _0225318C: bne _0225319A mov r0, #0x85 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE _0225319A: ldrb r0, [r4, #0x15] cmp r0, #0x1c @@ -82482,7 +82482,7 @@ MOD11_022574F0: ; 0x022574F0 add r1, sp, #0x24 mov r2, #8 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -82570,7 +82570,7 @@ MOD11_022574F0: ; 0x022574F0 ldrh r2, [r3, r2] bl MIi_CpuCopy16 add r0, sp, #0x24 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0x18] bl String_dtor ldr r0, [sp, #0x1c] @@ -83055,7 +83055,7 @@ _02257A26: add r1, sp, #0x18 mov r2, #0xd mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -83116,7 +83116,7 @@ _02257A26: mov r2, #0xe0 bl MIi_CpuCopy16 add r0, sp, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r7, #0 bl String_dtor add sp, #0x28 @@ -83181,7 +83181,7 @@ _02257B1E: add r1, sp, #0x24 mov r2, #0xd mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r1, #0 str r1, [sp] mov r0, #0xff @@ -83241,7 +83241,7 @@ _02257B1E: mov r2, #0xe0 bl MIi_CpuCopy16 add r0, sp, #0x24 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 bl String_dtor ldr r0, [sp, #0x18] @@ -84398,27 +84398,27 @@ _0225845A: lsr r1, r1, #0x18 add r2, r6, #0 add r3, r7, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r1, r4, #4 lsl r1, r1, #0x18 ldr r2, _022584A8 ; =0x000002FF add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add r1, r4, #4 lsl r1, r1, #0x18 mov r2, #0 add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 add r6, #0x1c cmp r4, #4 @@ -84439,12 +84439,12 @@ _022584B4: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r1, r6, #0 - bl FUN_0201797C + bl ToggleBgLayer add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #4 blo _022584B4 @@ -84905,12 +84905,12 @@ _022588AE: ldr r2, [r2, #0x3c] lsr r1, r1, #0x18 lsl r3, r3, #0xa - bl FUN_02017DFC + bl BG_LoadScreenTilemapData add r1, r4, #4 lsl r1, r1, #0x18 ldr r0, [sp, #0x28] lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _022588D0: add r4, r4, #1 add r6, r6, #2 @@ -85968,7 +85968,7 @@ _0225910E: mov r1, #6 mov r2, #0 asr r3, r6, #8 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 bl MOD11_0225902C cmp r4, #1 @@ -85976,13 +85976,13 @@ _0225910E: ldr r2, _02259160 ; =0x000002FF add r0, r7, #0 mov r1, #7 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r2, _02259164 ; =0x04001000 ldr r0, _02259168 ; =0xFFFF1FFF ldr r1, [r2] @@ -86080,7 +86080,7 @@ MOD11_0225916C: ; 0x0225916C bl _s32_div_f strh r0, [r4, #0xe] ldr r0, _0225925C ; =0x0000070E - bl FUN_020054C8 + bl PlaySE ldr r0, _02259260 ; =MOD11_0225B438 ldr r2, _02259264 ; =0x000004BA add r1, r4, #0 @@ -86408,10 +86408,10 @@ MOD11_022594DC: ; 0x022594DC add r4, r0, #0 mov r1, #4 mov r3, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0 mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x4e lsl r0, r0, #4 ldr r0, [r5, r0] @@ -86463,7 +86463,7 @@ MOD11_02259554: ; 0x02259554 mov r1, #4 mov r3, #0 add r4, r0, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x10 str r0, [sp] mov r0, #0xa @@ -86476,10 +86476,10 @@ MOD11_02259554: ; 0x02259554 add r0, r4, #0 mov r1, #4 mov r3, #0x16 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0 mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #0x4e lsl r0, r0, #4 ldr r0, [r5, r0] @@ -87845,10 +87845,10 @@ _0225A116: ldr r2, _0225A15C ; =0x000002FF add r6, r0, #0 mov r1, #5 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add r0, r6, #0 mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r1, r5, #0 bl MOD11_0225ADD0 @@ -88290,7 +88290,7 @@ _0225A49C: add r1, sp, #0x3c lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -88374,7 +88374,7 @@ _0225A50A: cmp r4, #0 bne _0225A570 add r0, sp, #0x3c - bl FUN_02019178 + bl RemoveWindow _0225A570: str r7, [r5] add r3, sp, #0x30 @@ -88427,7 +88427,7 @@ MOD11_0225A5C0: ; 0x0225A5C0 ldr r0, [r7] bl MOD11_0222FF68 mov r1, #5 - bl FUN_0201886C + bl GetBgTilemapBuffer add r4, r0, #0 add r0, r7, #0 add r1, sp, #4 @@ -88591,7 +88591,7 @@ _0225A6E4: cmp r0, #0 beq _0225A6FE add r0, r7, #0 - bl FUN_02019178 + bl RemoveWindow _0225A6FE: add r0, r4, #0 add r0, #0xec @@ -88599,7 +88599,7 @@ _0225A6FE: cmp r0, #0 beq _0225A70E add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow _0225A70E: mov r0, #0x4f lsl r0, r0, #2 @@ -88607,7 +88607,7 @@ _0225A70E: cmp r0, #0 beq _0225A71E add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _0225A71E: ldr r0, [sp, #4] add r4, #0x14 @@ -88911,7 +88911,7 @@ MOD11_0225A968: ; 0x0225A968 cmp r0, #0 beq _0225A994 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _0225A994: add r0, r4, #0 bl InitWindow @@ -88925,7 +88925,7 @@ _0225A994: lsl r2, r2, #0x18 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -89218,7 +89218,7 @@ MOD11_0225ABA4: ; 0x0225ABA4 bl FUN_02003054 add r0, r6, #0 mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, _0225AC58 ; =MOD11_0225F71C lsl r1, r4, #2 ldrb r2, [r0, r1] @@ -89244,10 +89244,10 @@ MOD11_0225ABA4: ; 0x0225ABA4 ldrb r3, [r3, #2] ldr r2, _0225AC5C ; =0x000002FF add r0, r6, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r6, #0 mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -89269,13 +89269,13 @@ _0225AC68: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r1, r4, #0 - bl FUN_0201797C + bl ToggleBgLayer b _0225AC84 _0225AC7A: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r1, r6, #0 - bl FUN_0201797C + bl ToggleBgLayer _0225AC84: add r5, r5, #1 cmp r5, #4 @@ -89482,7 +89482,7 @@ MOD11_0225ADD8: ; 0x0225ADD8 bl MOD11_0222FF68 mov r1, #4 str r0, [sp, #4] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 lsl r0, r7, #2 add r0, r5, r0 @@ -89528,7 +89528,7 @@ _0225AE36: _0225AE40: ldr r0, [sp, #4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -90373,22 +90373,22 @@ _0225B4D6: add r0, r4, #0 mov r1, #4 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0 add r0, r4, #0 mov r1, #5 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #5 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5] mov r1, #1 ldr r0, [r0] @@ -90427,7 +90427,7 @@ _0225B55A: add r0, r6, #0 mov r1, #4 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r4, [r5, r3] mov r3, #0xff @@ -90435,7 +90435,7 @@ _0225B55A: mov r1, #5 mov r2, #0 sub r3, r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #8 ldrsh r0, [r5, r0] mov r1, #0x64 @@ -90453,13 +90453,13 @@ _0225B590: add r0, r6, #0 mov r1, #4 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r5, r3] add r0, r6, #0 mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #8 ldrsh r0, [r5, r0] mov r1, #0x64 @@ -90471,12 +90471,12 @@ _0225B5B6: mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r6, #0 mov r1, #5 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0xa ldrsh r0, [r5, r0] mov r1, #0x64 @@ -90556,24 +90556,24 @@ MOD11_0225B644: ; 0x0225B644 mov r1, #4 add r3, r2, #0 add r5, r0, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x10 ldrsh r3, [r4, r3] add r0, r5, #0 mov r1, #4 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0 add r0, r5, #0 mov r1, #5 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x10 ldrsh r3, [r4, r3] add r0, r5, #0 mov r1, #5 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, r5, r6, pc} _0225B68E: cmp r0, #0xc0 @@ -90591,7 +90591,7 @@ _0225B68E: mov r1, #4 mov r2, #0 sub r3, r3, r6 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r4, [r4, r3] mov r3, #0xff @@ -90599,31 +90599,31 @@ _0225B68E: mov r1, #5 mov r2, #0 sub r3, r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _0225B6E0 _0225B6C6: mov r3, #0xc ldrsh r3, [r4, r3] mov r1, #4 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0xc ldrsh r3, [r4, r3] add r0, r5, #0 mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0225B6E0: add r0, r5, #0 mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 mov r1, #5 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0225B6F8: pop {r4, r5, r6, pc} nop @@ -90650,14 +90650,14 @@ _0225B716: lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer b _0225B736 _0225B72A: add r0, r4, #4 lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer _0225B736: add r4, r4, #1 add r5, r5, #2 @@ -90671,7 +90671,7 @@ _0225B740: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add r4, r4, #1 add r6, r6, #2 cmp r4, #4 @@ -90888,7 +90888,7 @@ _0225B8EC: cmp r0, #0 bne _0225B8F6 ldr r0, _0225B920 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0225B8F6: mov r1, #1 ldr r0, _0225B924 ; =0x000006F4 @@ -91032,7 +91032,7 @@ _0225B9EC: mov r0, #1 strb r0, [r4, #1] ldr r0, _0225BAFC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r5, #0x20 b _0225BA34 _0225BA1E: @@ -91044,7 +91044,7 @@ _0225BA1E: mov r0, #1 strb r0, [r4, #1] ldr r0, _0225BAFC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r5, #0x10 _0225BA34: cmp r5, #0x20 @@ -92834,7 +92834,7 @@ _0225C738: beq _0225C754 _0225C74C: ldr r0, _0225C768 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0225C75E _0225C754: mov r0, #0xf0 @@ -93398,7 +93398,7 @@ _0225CB80: bl FUN_0200CA44 str r0, [r5, #4] ldr r0, _0225CBB8 ; =0x00000711 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} nop _0225CBA8: .word MOD11_0225FE48 @@ -93863,7 +93863,7 @@ _0225CF22: bgt _0225CF50 str r0, [r4, #0x1c] ldrh r0, [r4, #0x2a] - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x2c ldrb r0, [r0] diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index effb333a..5cb61425 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -40,7 +40,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 mov r0, #3 mov r1, #0x15 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222D868 ; =0x00001658 add r0, r5, #0 mov r2, #0x15 @@ -95,14 +95,14 @@ MOD12_0222D5C0: ; 0x0222D5C0 mov r3, #0x15 bl FUN_02003008 mov r0, #0x15 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x30] mov r0, #0x40 mov r1, #0x15 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #0x23 add r1, r4, #0 lsl r2, r2, #4 @@ -445,7 +445,7 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl MOD12_0222E0FC add r0, r4, #0 add r0, #0x34 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -454,13 +454,13 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] bl MOD12_022319FC ldr r0, _0222DAD8 ; =0x0000081C @@ -521,7 +521,7 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r0, #0x15 - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 bl FUN_02033ED0 ldr r0, _0222DADC ; =SDK_OVERLAY_MODULE_08_ID @@ -546,7 +546,7 @@ MOD12_0222DAE4: ; 0x0222DAE4 ldr r0, [r4, #0x5c] bl FUN_0200372C ldr r0, [r4, #0x30] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222DB10 ; =0x027E0000 ldr r1, _0222DB14 ; =0x00003FF8 mov r0, #1 @@ -632,7 +632,7 @@ _0222DB60: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0222DC78 ; =MOD12_02244A50 add r3, sp, #0x38 mov r2, #0xa @@ -647,56 +647,56 @@ _0222DBC0: add r0, r4, #0 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r4, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _0222DC7C ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -737,7 +737,7 @@ MOD12_0222DC80: ; 0x0222DC80 add r1, #0x34 mov r2, #1 mov r3, #0xb - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {pc} @@ -1069,10 +1069,10 @@ MOD12_0222DF30: ; 0x0222DF30 bl GfGfxLoader_LoadScrnData mov r0, #1 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority add r0, r5, #0 bl MOD12_022335B0 cmp r4, #1 @@ -1087,16 +1087,16 @@ _0222DF9A: lsl r1, r0, #0xd mov r2, #0 mov r3, #0x15 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r5, #0x30] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority _0222DFBE: add sp, #0x10 pop {r3, r4, r5, pc} @@ -3175,7 +3175,7 @@ MOD12_0222EF04: ; 0x0222EF04 mov r0, #3 mov r1, #0x16 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222F168 ; =0x00000F68 add r0, r4, #0 mov r2, #0x16 @@ -3230,14 +3230,14 @@ MOD12_0222EF04: ; 0x0222EF04 mov r3, #0x16 bl FUN_02003008 mov r0, #0x16 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #0x30] mov r0, #0x40 mov r1, #0x16 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, [r5, #0x30] bl MOD12_0222F548 bl FUN_0201CC08 @@ -3378,7 +3378,7 @@ MOD12_0222EF04: ; 0x0222EF04 add r1, r5, #0 bl Main_SetVBlankIntrCB ldr r0, _0222F198 ; =0x00000605 - bl FUN_020054C8 + bl PlaySE mov r0, #1 add sp, #0xc pop {r4, r5, pc} @@ -3470,7 +3470,7 @@ _0222F1CA: mov r3, #6 bl FUN_02003210 ldr r0, _0222F308 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r5] b _0222F2FA @@ -3601,7 +3601,7 @@ MOD12_0222F324: ; 0x0222F324 bl MOD12_0222F98C add r0, r4, #0 add r0, #0x34 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -3610,19 +3610,19 @@ MOD12_0222F324: ; 0x0222F324 bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x30] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x28] ldr r1, [r4, #0x2c] bl FUN_0200C398 @@ -3686,7 +3686,7 @@ _0222F3AE: bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r0, #0x16 - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 bl FUN_02033ED0 ldr r0, _0222F450 ; =SDK_OVERLAY_MODULE_08_ID @@ -3759,7 +3759,7 @@ _0222F4BA: ldr r0, [r6, #0x50] bl FUN_0200372C ldr r0, [r6, #0x30] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222F4EC ; =0x027E0000 ldr r1, _0222F4F0 ; =0x00003FF8 mov r0, #1 @@ -3861,7 +3861,7 @@ _0222F558: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0222F6A8 ; =MOD12_02244B70 add r3, sp, #0x54 mov r2, #0xa @@ -3876,56 +3876,56 @@ _0222F5B8: add r0, r4, #0 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x8c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r4, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _0222F6AC ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -3949,20 +3949,20 @@ _0222F5B8: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #4 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0xa8 pop {r3, r4, r5, pc} .align 2, 0 @@ -3991,7 +3991,7 @@ MOD12_0222F6B4: ; 0x0222F6B4 add r1, #0x34 mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {pc} .align 2, 0 @@ -4200,7 +4200,7 @@ MOD12_0222F834: ; 0x0222F834 bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x30] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -5015,7 +5015,7 @@ MOD12_0222FE4C: ; 0x0222FE4C mov r0, #3 mov r1, #0x17 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _022300EC ; =0x00001BF4 add r0, r4, #0 mov r2, #0x17 @@ -5092,14 +5092,14 @@ MOD12_0222FE4C: ; 0x0222FE4C mov r1, #1 bl MOD12_0223EC7C mov r0, #0x17 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #0x74] mov r0, #0x40 mov r1, #0x17 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r1, r5, #0 ldr r0, [r5] add r1, #0x14 @@ -5240,7 +5240,7 @@ MOD12_0222FE4C: ; 0x0222FE4C sub r2, #0x3f bl G2x_SetBlendBrightness_ ldr r0, _02230120 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldr r0, _02230124 ; =MOD12_022303C0 add r1, r5, #0 bl Main_SetVBlankIntrCB @@ -5435,7 +5435,7 @@ _02230254: add r5, #0x78 _02230296: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r5, #0x10 cmp r6, #2 @@ -5448,13 +5448,13 @@ _02230296: bl GX_EngineAToggleLayers ldr r0, [r4, #0x74] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x74] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x74] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x74] bl MOD12_0223B474 ldr r0, _022303B0 ; =0x00001130 @@ -5530,7 +5530,7 @@ _02230296: bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r0, #0x17 - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 bl FUN_02033ED0 ldr r0, _022303B8 ; =SDK_OVERLAY_MODULE_08_ID @@ -5642,7 +5642,7 @@ _02230464: ldr r0, [r0] bl FUN_0200372C ldr r0, [r4, #0x74] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _022304A8 ; =0x027E0000 ldr r1, _022304AC ; =0x00003FF8 mov r0, #1 @@ -5807,7 +5807,7 @@ _02230584: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0223069C ; =MOD12_02244C94 add r3, sp, #0x38 mov r2, #0xa @@ -5822,56 +5822,56 @@ _022305E4: add r0, r4, #0 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r4, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _022306A0 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -5912,7 +5912,7 @@ MOD12_022306A4: ; 0x022306A4 add r1, #0x78 mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb str r0, [sp] mov r0, #0x1b @@ -5927,7 +5927,7 @@ MOD12_022306A4: ; 0x022306A4 add r4, #0x88 add r1, r4, #0 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} @@ -7577,7 +7577,7 @@ _022313B0: add r1, sp, #0x34 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -7648,7 +7648,7 @@ _02231454: sub r2, #8 bl FUN_020118C4 add r0, sp, #0x34 - bl FUN_02019178 + bl RemoveWindow str r6, [r5] add r3, sp, #0x28 ldmia r3!, {r0, r1} @@ -8288,7 +8288,7 @@ MOD12_0223190C: ; 0x0223190C mov r3, #0x3f bl FUN_0200A208 ldr r0, _02231978 ; =0x000005F8 - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r4, #8] ldrb r0, [r4, #0x11] @@ -8354,27 +8354,27 @@ _022319AE: lsr r1, r1, #0x18 add r2, r6, #0 add r3, r7, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #0 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add r1, r4, #4 lsl r1, r1, #0x18 mov r2, #0 add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 add r6, #0x1c cmp r4, #4 @@ -8394,12 +8394,12 @@ _02231A04: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r1, r6, #0 - bl FUN_0201797C + bl ToggleBgLayer add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #4 blo _02231A04 @@ -8590,7 +8590,7 @@ _02231B90: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add r4, r4, #1 add r5, r5, #2 cmp r4, #4 @@ -8632,12 +8632,12 @@ _02231BDE: ldr r2, [r2, #0x20] lsr r1, r1, #0x18 lsl r3, r3, #0xa - bl FUN_02017DFC + bl BG_LoadScreenTilemapData add r1, r5, #4 lsl r1, r1, #0x18 ldr r0, [sp, #0xc] lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _02231C00: add r5, r5, #1 add r6, r6, #2 @@ -9550,7 +9550,7 @@ _022322FE: add r1, sp, #0x3c lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9633,7 +9633,7 @@ _0223236C: cmp r4, #0 bne _022323D0 add r0, sp, #0x3c - bl FUN_02019178 + bl RemoveWindow _022323D0: str r7, [r5] add r3, sp, #0x30 @@ -9846,7 +9846,7 @@ MOD12_02232538: ; 0x02232538 mov r1, #4 add r4, r2, #0 str r0, [sp, #4] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 lsl r0, r7, #2 add r0, r5, r0 @@ -9892,7 +9892,7 @@ _02232594: _0223259E: ldr r0, [sp, #4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -10680,7 +10680,7 @@ _02232B9A: cmp r0, #0 beq _02232BAA ldr r0, [sp] - bl FUN_02019178 + bl RemoveWindow _02232BAA: mov r0, #2 lsl r0, r0, #8 @@ -10688,7 +10688,7 @@ _02232BAA: cmp r0, #0 beq _02232BBA add r0, r7, #0 - bl FUN_02019178 + bl RemoveWindow _02232BBA: mov r0, #0x25 lsl r0, r0, #4 @@ -10696,7 +10696,7 @@ _02232BBA: cmp r0, #0 beq _02232BCA add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow _02232BCA: ldr r0, [sp] add r4, #0x14 @@ -10720,7 +10720,7 @@ _02232BEC: cmp r0, #0 beq _02232BF8 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _02232BF8: add r6, r6, #1 add r5, #0x14 @@ -10925,7 +10925,7 @@ MOD12_02232D7C: ; 0x02232D7C cmp r0, #0 beq _02232DA8 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _02232DA8: add r0, r4, #0 bl InitWindow @@ -10939,7 +10939,7 @@ _02232DA8: add r1, r4, #0 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -11020,7 +11020,7 @@ _02232E54: cmp r0, #0 bne _02232E5E ldr r0, _02232E88 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02232E5E: mov r1, #1 mov r0, #0xc7 @@ -11707,7 +11707,7 @@ _02233338: beq _02233354 _0223334C: ldr r0, _02233368 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0223335E _02233354: mov r0, #0xf0 @@ -11738,7 +11738,7 @@ MOD12_0223336C: ; 0x0223336C ldr r2, [r2, #0x14] mov r1, #4 lsl r3, r3, #0xc - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r0, #0xb6 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -11774,14 +11774,14 @@ _022333C0: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r1, r7, #0 - bl FUN_0201797C + bl ToggleBgLayer b _022333E0 _022333D4: add r0, r4, #4 lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer _022333E0: add r4, r4, #1 add r5, r5, #2 @@ -11991,7 +11991,7 @@ MOD12_0223356C: ; 0x0223356C add r5, r1, #0 mov r1, #2 add r4, r2, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r1, #0xc0 mul r1, r5 lsl r1, r1, #1 @@ -12042,7 +12042,7 @@ _022335CC: blt _022335BC ldr r0, [r5, #0x30] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3, r4, r5, r6, r7, pc} nop _022335DC: .word MOD12_022451D0 @@ -12862,19 +12862,19 @@ _02233C36: ; jump table .short _02233C56 - _02233C36 - 2 ; case 3 _02233C3E: ldr r0, _02233C68 ; =0x000006E1 - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _02233C46: ldr r0, _02233C6C ; =0x000006DF - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _02233C4E: ldr r0, _02233C70 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _02233C56: ldr r0, _02233C70 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _02233C5C: pop {r4, r5, r6, pc} nop @@ -13533,7 +13533,7 @@ _02234170: cmp r4, r0 bgt _022340EE ldr r0, _02234194 ; =0x000006E1 - bl FUN_020054C8 + bl PlaySE ldr r2, [sp, #8] ldr r0, _02234194 ; =0x000006E1 sub r2, r2, #1 @@ -14070,7 +14070,7 @@ _022345AC: bl FUN_0200C644 mov r0, #0x6e lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl FreeToHeap add r0, r5, #0 @@ -15298,7 +15298,7 @@ _02234F42: _02234F96: ldr r0, [r5, #0x30] mov r1, #1 - bl FUN_02017B48 + bl Bg_GetXpos add r0, r6, #0 bl String_dtor add sp, #0x10 @@ -15804,7 +15804,7 @@ _02235354: pop {r3, r4, r5, pc} _02235362: ldr r0, _02235468 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldr r0, _02235468 ; =0x000006E5 ldr r1, [r4, #4] bl FUN_0200488C @@ -16320,7 +16320,7 @@ _02235778: mov r1, #0 bl FUN_0200C644 ldr r0, _022357AC ; =0x000005E1 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #4] bl MOD12_02233638 ldr r1, [r5, #0xc] @@ -16509,7 +16509,7 @@ _022358CE: lsl r0, r0, #8 str r0, [r5, #0x20] ldr r0, _02235A84 ; =0x000007F9 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r5, #0xe] add r0, r0, #1 strb r0, [r5, #0xe] @@ -16649,7 +16649,7 @@ _022359F6: str r0, [r5, #0x18] _02235A16: ldr r0, _02235A90 ; =0x000006EA - bl FUN_020054C8 + bl PlaySE ldrb r0, [r5, #0xe] add sp, #8 add r0, r0, #1 @@ -16689,7 +16689,7 @@ _02235A5E: mov r1, #0 bl FUN_0200C644 ldr r0, _02235A94 ; =0x000005E1 - bl FUN_020054C8 + bl PlaySE ldr r1, [r5, #8] ldrb r0, [r1] sub r0, r0, #1 @@ -17436,7 +17436,7 @@ _02235F98: bl MOD12_02234FB0 _02235FAA: ldr r0, _0223603C ; =0x000006F9 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xc] add sp, #8 add r0, r0, #1 @@ -17665,7 +17665,7 @@ _02236162: cmp r2, r0 bne _02236176 ldr r0, _02236204 ; =0x000006F8 - bl FUN_020054C8 + bl PlaySE _02236176: ldrb r0, [r4, #0x14] add r0, r0, #1 @@ -18972,7 +18972,7 @@ _02236B70: cmp r0, #0 bne _02236BA0 ldr r0, _02236CEC ; =0x000006F6 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xe] add r0, r0, #1 strb r0, [r4, #0xe] @@ -19013,7 +19013,7 @@ _02236BD0: bl GetMonData strh r0, [r4, #0x10] ldr r0, _02236CF0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xc] add sp, #0xc add r0, r0, #1 @@ -19077,7 +19077,7 @@ _02236C52: beq _02236CE4 strh r0, [r4, #0x12] ldr r0, _02236CF0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0xc] add sp, #0xc add r0, r0, #1 @@ -19591,7 +19591,7 @@ _0223700E: add r6, r6, #1 bl MOD12_02234628 ldr r0, _022370F8 ; =0x000006DF - bl FUN_020054C8 + bl PlaySE _02237036: add r5, r5, #1 cmp r5, #3 @@ -19664,7 +19664,7 @@ _022370A6: lsr r2, r2, #0x1e bl MOD12_02235200 ldr r0, _02237100 ; =0x000006E2 - bl FUN_020054C8 + bl PlaySE _022370BC: add r5, r5, #1 cmp r5, #4 @@ -20194,7 +20194,7 @@ _02237484: add r0, #0xc bl MOD12_02234628 ldr r0, _02237650 ; =0x000006DF - bl FUN_020054C8 + bl PlaySE _022374A6: ldrb r0, [r4, #0xc] add sp, #8 @@ -20754,27 +20754,27 @@ _022378B4: mov r0, #0x6f lsl r0, r0, #4 mov r6, #4 - bl FUN_020054C8 + bl PlaySE b _022378F0 _022378C6: cmp r0, #1 bne _022378D4 ldr r0, _02237A94 ; =0x000006EF mov r6, #5 - bl FUN_020054C8 + bl PlaySE b _022378F0 _022378D4: cmp r0, #2 bne _022378E2 ldr r0, _02237A98 ; =0x000006EE mov r6, #6 - bl FUN_020054C8 + bl PlaySE b _022378F0 _022378E2: mov r0, #3 strb r0, [r4, #0xc] ldr r0, _02237A9C ; =0x000006DF - bl FUN_020054C8 + bl PlaySE add sp, #8 pop {r3, r4, r5, r6, r7, pc} _022378F0: @@ -25300,7 +25300,7 @@ _0223993C: add r1, r4, #0 bl FUN_0200CA44 ldr r0, _0223997C ; =0x000006E1 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} nop _0223996C: .word MOD12_02245F14 @@ -25931,7 +25931,7 @@ _02239E14: mov r1, #2 bl FUN_02003A64 ldr r0, _02239E94 ; =0x000006EC - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -26255,7 +26255,7 @@ _0223A0D4: b _0223A248 _0223A0D6: ldr r0, _0223A264 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE mov r0, #0xf strb r0, [r5, #0x11] ldrb r0, [r5, #0x10] @@ -26269,7 +26269,7 @@ _0223A0E6: mov r0, #0 strb r0, [r5, #0x11] ldr r0, _0223A264 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r5, #0x10] add sp, #8 add r0, r0, #1 @@ -26691,7 +26691,7 @@ _0223A418: ldr r0, [r0] mov r1, #2 ldr r0, [r0, #0x30] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 str r0, [sp, #8] @@ -26791,7 +26791,7 @@ _0223A4D2: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -26921,7 +26921,7 @@ _0223A5CC: ldr r0, [r0] mov r1, #2 ldr r0, [r0, #0x30] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 str r0, [sp, #8] @@ -27041,7 +27041,7 @@ _0223A6AE: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -27517,7 +27517,7 @@ _0223AA5C: cmp r0, #1 bne _0223AAA2 ldr r0, _0223AABC ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r5, #0x10] add sp, #0x10 add r0, r0, #1 @@ -28094,7 +28094,7 @@ _0223AED6: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r2, r4, #0 ldrb r1, [r4, #0x17] ldr r0, [r4] @@ -28140,7 +28140,7 @@ _0223AF34: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -28471,7 +28471,7 @@ _0223B1C6: cmp r0, #1 bne _0223B1DE ldr r0, _0223B350 ; =0x000006ED - bl FUN_020054C8 + bl PlaySE ldr r0, [sp] mov r1, #0 strb r1, [r0, #0x15] @@ -28480,7 +28480,7 @@ _0223B1DE: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 str r0, [sp, #8] @@ -28580,7 +28580,7 @@ _0223B294: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] mov r1, #0xc ldrb r0, [r0, #0x12] @@ -28711,7 +28711,7 @@ MOD12_0223B37C: ; 0x0223B37C ldr r0, [sp] str r6, [r4, #0xc] ldrh r0, [r0, #0x10] - bl FUN_020054C8 + bl PlaySE ldr r0, _0223B3C0 ; =MOD12_0223B3C8 ldr r2, _0223B3C4 ; =0x00007530 add r1, r4, #0 @@ -28778,27 +28778,27 @@ _0223B426: lsr r1, r1, #0x18 add r2, r6, #0 add r3, r7, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #0 - bl FUN_02018768 + bl BgFillTilemapBufferAndCommit add r1, r4, #4 lsl r1, r1, #0x18 mov r2, #0 add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 add r6, #0x1c cmp r4, #4 @@ -28818,12 +28818,12 @@ _0223B47C: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r1, r6, #0 - bl FUN_0201797C + bl ToggleBgLayer add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #4 blo _0223B47C @@ -29192,7 +29192,7 @@ _0223B794: lsl r1, r1, #0x18 lsr r0, r0, #0x18 lsr r1, r1, #0x18 - bl FUN_020178BC + bl SetBgPriority add r4, r4, #1 add r5, r5, #2 cmp r4, #4 @@ -29256,12 +29256,12 @@ _0223B80A: ldr r2, [r2] lsr r1, r1, #0x18 lsl r3, r3, #0xa - bl FUN_02017DFC + bl BG_LoadScreenTilemapData add r1, r5, #4 lsl r1, r1, #0x18 ldr r0, [sp, #0xc] lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _0223B82E: add r5, r5, #1 add r4, r4, #2 @@ -29760,7 +29760,7 @@ _0223BBEC: strh r0, [r4, #0x1a] lsl r0, r7, #0x18 lsr r0, r0, #0x18 - bl FUN_020187B0 + bl BgGetCharPtr str r0, [r4, #4] add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -29914,7 +29914,7 @@ _0223BD1C: add r1, sp, #0x38 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -29982,7 +29982,7 @@ _0223BD74: add r2, #0xf8 bl FUN_020118C4 add r0, sp, #0x38 - bl FUN_02019178 + bl RemoveWindow str r6, [r5] add r3, sp, #0x2c ldmia r3!, {r0, r1} @@ -30475,14 +30475,14 @@ _0223C162: lsl r0, r0, #0x18 lsr r0, r0, #0x18 add r1, r7, #0 - bl FUN_0201797C + bl ToggleBgLayer b _0223C182 _0223C176: add r0, r4, #4 lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer _0223C182: add r4, r4, #1 add r5, r5, #2 @@ -30517,7 +30517,7 @@ MOD12_0223C19C: ; 0x0223C19C ldr r2, [r2] mov r1, #4 lsl r3, r3, #0xc - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, _0223C1D8 ; =0x0000FFFF add r4, #0x94 strh r0, [r4] @@ -30738,7 +30738,7 @@ _0223C338: ldr r0, [sp] mov r1, #3 ldr r0, [r0, #0x60] - bl FUN_0201886C + bl GetBgTilemapBuffer add r2, r0, #0 mov r1, #0 cmp r4, #0 @@ -30851,7 +30851,7 @@ _0223C410: ldr r0, [sp] mov r1, #3 ldr r0, [r0, #0x60] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -32903,11 +32903,11 @@ _0223D3F2: cmp r0, #1 bne _0223D404 ldr r0, _0223D4C4 ; =0x000006F5 - bl FUN_020054C8 + bl PlaySE b _0223D40A _0223D404: ldr r0, _0223D4C8 ; =0x000006F4 - bl FUN_020054C8 + bl PlaySE _0223D40A: ldr r0, _0223D4CC ; =0x00000ACC ldrb r0, [r5, r0] @@ -32944,7 +32944,7 @@ _0223D438: bne _0223D454 mov r0, #0x6f lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D454: @@ -32952,17 +32952,17 @@ _0223D454: cmp r0, r1 bne _0223D464 ldr r0, _0223D4D4 ; =0x000006EF - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D464: ldr r0, _0223D4D8 ; =0x000006EE - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D46E: ldr r0, _0223D4DC ; =0x000006F1 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D478: @@ -32972,12 +32972,12 @@ _0223D478: cmp r0, #1 bne _0223D48C ldr r0, _0223D4E0 ; =0x000006F2 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r4, r5, r6, r7, pc} _0223D48C: ldr r0, _0223D4E4 ; =0x000005F6 - bl FUN_020054C8 + bl PlaySE _0223D492: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -35079,7 +35079,7 @@ _0223E49A: bl FUN_0200D0BC ldr r0, [r5, #0x74] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0x98 ldr r1, _0223E520 ; =MOD12_02246224 @@ -35138,7 +35138,7 @@ MOD12_0223E528: ; 0x0223E528 bl FUN_0200D0E0 ldr r0, [r4, #0x74] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, _0223E544 ; =0x00001BF1 mov r1, #0 strb r1, [r4, r0] @@ -35629,7 +35629,7 @@ _0223E8D2: lsl r0, r0, #8 strh r0, [r4, #8] ldr r0, _0223E8E8 ; =0x000006F8 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _0223E8E8: .word 0x000006F8 @@ -36006,7 +36006,7 @@ _0223EBAC: lsl r2, r2, #2 bl FUN_0200CA44 ldr r0, _0223EC24 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE add sp, #0xc pop {r3, r4, pc} .align 2, 0 @@ -36105,7 +36105,7 @@ _0223ECB4: cmp r4, #4 blt _0223EC9E ldr r0, _0223ECCC ; =0x000006EC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _0223ECC4: .word 0x00007FFF @@ -36487,7 +36487,7 @@ _0223EF78: ldr r0, [r0] mov r1, #2 ldr r0, [r0, #0x74] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 str r0, [sp, #8] @@ -36587,7 +36587,7 @@ _0223F032: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x74] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -36724,7 +36724,7 @@ _0223F140: ldr r0, [r0] mov r1, #2 ldr r0, [r0, #0x74] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 str r0, [sp, #8] @@ -36844,7 +36844,7 @@ _0223F222: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x74] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -36982,7 +36982,7 @@ _0223F328: add r0, #0x14 bl MOD12_0223CC9C ldr r0, _0223F3AC ; =0x000006EC - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -38606,7 +38606,7 @@ _0223FF86: bl MOD12_0223E488 _0223FF8C: ldr r0, _02240040 ; =0x000006F7 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add sp, #0x18 add r0, r0, #1 @@ -39313,7 +39313,7 @@ _02240522: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x74] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r2, r4, #0 ldrb r1, [r4, #0x1a] ldr r0, [r4] @@ -39359,7 +39359,7 @@ _02240580: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x74] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -39582,7 +39582,7 @@ _02240734: ldr r0, _0224076C ; =0x0000046F bl FUN_0200521C ldr r0, _02240770 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x50 ldrb r0, [r0] @@ -41102,7 +41102,7 @@ MOD12_02241210: ; 0x02241210 mov r0, #3 mov r1, #0x18 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0x4a add r0, r4, #0 lsl r1, r1, #6 @@ -41175,14 +41175,14 @@ MOD12_02241210: ; 0x02241210 mov r3, #0x18 bl FUN_02003008 mov r0, #0x18 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #0x30] mov r0, #0x40 mov r1, #0x18 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, [r5, #0x30] bl MOD12_02241864 bl FUN_0201CC08 @@ -41300,7 +41300,7 @@ MOD12_02241210: ; 0x02241210 bl FUN_0200CA60 str r0, [r5, #8] ldr r0, _0224148C ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE mov r0, #1 add sp, #0xc pop {r4, r5, pc} @@ -41472,7 +41472,7 @@ MOD12_022415A8: ; 0x022415A8 add r5, #0x34 _022415D4: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r5, #0x10 cmp r6, #9 @@ -41485,19 +41485,19 @@ _022415D4: bl GX_EngineAToggleLayers ldr r0, [r4, #0x30] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x30] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x30] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x28] ldr r1, [r4, #0x2c] bl FUN_0200C398 @@ -41577,7 +41577,7 @@ _022415D4: bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r0, #0x18 - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 mov r1, #5 mov r2, #2 @@ -41665,7 +41665,7 @@ MOD12_02241754: ; 0x02241754 ldr r0, [r0] bl FUN_0200372C ldr r0, [r4, #0x30] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _022417D4 ; =0x027E0000 ldr r1, _022417D8 ; =0x00003FF8 mov r0, #1 @@ -41694,14 +41694,14 @@ MOD12_022417DC: ; 0x022417DC bgt _022417FC mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority pop {r3, pc} _022417FC: cmp r0, #0x90 bge _02241808 mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority _02241808: pop {r3, pc} nop @@ -41717,7 +41717,7 @@ MOD12_02241814: ; 0x02241814 bne _02241826 mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority _02241826: pop {r3, pc} .align 2, 0 @@ -41797,7 +41797,7 @@ _02241874: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _022419C4 ; =MOD12_022465C0 add r3, sp, #0x54 mov r2, #0xa @@ -41812,56 +41812,56 @@ _022418D4: add r0, r4, #0 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #3 add r2, sp, #0x8c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 add r0, r4, #0 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _022419C8 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -41885,20 +41885,20 @@ _022418D4: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 add r0, r4, #0 mov r1, #4 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #4 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0xa8 pop {r3, r4, r5, pc} .align 2, 0 @@ -41928,7 +41928,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x34 mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r2, #1 add r1, r4, #0 str r2, [sp] @@ -41943,7 +41943,7 @@ MOD12_022419D0: ; 0x022419D0 ldr r0, [r4, #0x30] add r1, #0x44 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #5 str r0, [sp] mov r0, #8 @@ -41959,7 +41959,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x54 mov r2, #1 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #9 str r0, [sp] mov r0, #8 @@ -41975,7 +41975,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x64 mov r2, #1 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0xd str r1, [sp] mov r0, #8 @@ -41990,7 +41990,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x74 mov r2, #1 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r2, #1 add r1, r4, #0 str r2, [sp] @@ -42005,7 +42005,7 @@ MOD12_022419D0: ; 0x022419D0 ldr r0, [r4, #0x30] add r1, #0x84 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #5 str r0, [sp] mov r0, #8 @@ -42021,7 +42021,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0x94 mov r2, #1 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #9 str r0, [sp] mov r0, #8 @@ -42037,7 +42037,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, #0xa4 mov r2, #1 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #0xd str r1, [sp] mov r0, #8 @@ -42052,7 +42052,7 @@ MOD12_022419D0: ; 0x022419D0 add r1, r4, #0 mov r2, #1 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} .align 2, 0 @@ -43645,7 +43645,7 @@ MOD12_022426BC: ; 0x022426BC bl GfGfxLoader_LoadScrnData ldr r0, [r5, #0x30] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -43702,7 +43702,7 @@ MOD12_022426BC: ; 0x022426BC bl FUN_020030E8 ldr r0, [r5, #0x30] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -43815,7 +43815,7 @@ MOD12_02242804: ; 0x02242804 bl GfGfxLoader_LoadScrnData ldr r0, [r6, #0x30] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -44728,7 +44728,7 @@ MOD12_02242FD0: ; 0x02242FD0 mov r1, #1 bl FUN_0200C644 ldr r0, _02242FF4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _02242FF4: .word 0x000005DD @@ -46285,7 +46285,7 @@ _02243B98: ldr r0, [r0] mov r1, #2 ldr r0, [r0, #0x30] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 str r0, [sp, #8] @@ -46385,7 +46385,7 @@ _02243C52: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -46515,7 +46515,7 @@ _02243D4C: ldr r0, [r0] mov r1, #2 ldr r0, [r0, #0x30] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 str r0, [sp, #8] @@ -46635,7 +46635,7 @@ _02243E2E: mov r1, #2 ldr r0, [r0] ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [sp] ldrb r0, [r0, #0x12] add r1, r0, #1 @@ -46799,7 +46799,7 @@ _02243F56: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _02243F7A: ldrb r1, [r4, #0x1a] add r2, r4, #0 @@ -46846,7 +46846,7 @@ _02243FBA: ldr r0, [r4] mov r1, #1 ldr r0, [r0, #0x30] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -47304,7 +47304,7 @@ _02244348: ldr r0, _02244430 ; =0x0000049E bl FUN_0200521C ldr r0, _02244434 ; =0x000006E5 - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add sp, #0xc add r0, r0, #1 @@ -47535,7 +47535,7 @@ _02244510: ; jump table .short _022445E8 - _02244510 - 2 ; case 5 _0224451C: ldr r0, _02244604 ; =0x000006FA - bl FUN_020054C8 + bl PlaySE ldrb r0, [r4, #0x10] add r0, r0, #1 strb r0, [r4, #0x10] @@ -47563,7 +47563,7 @@ _0224454A: cmp r1, #0 ble _02244558 ldr r0, _02244608 ; =0x000006FB - bl FUN_020054C8 + bl PlaySE b _02244560 _02244558: add r2, r2, #1 @@ -47629,7 +47629,7 @@ _022445C2: cmp r1, #0 ble _022445D0 ldr r0, _0224460C ; =0x000006F9 - bl FUN_020054C8 + bl PlaySE b _022445D8 _022445D0: add r3, r3, #1 diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s index 5aee0b46..36288367 100644 --- a/arm9/modules/13/asm/module_13_arm2.s +++ b/arm9/modules/13/asm/module_13_arm2.s @@ -35163,10 +35163,10 @@ _0223BEA4: .word 0x05000400 MOD13_0223BEA8: ; 0x0223BEA8 stmdb sp!, {lr} sub sp, sp, #4 - bl disableBankForX_ - bl GX_DisableBankForOBJExtPltt_2 - bl GX_DisableBankForSubBGExtPltt - bl GX_DisableBankForSubOBJExtPltt_2 + bl GX_DisableBankForBG + bl GX_DisableBankForOBJ + bl GX_DisableBankForSubBG + bl GX_DisableBankForSubOBJ bl MOD13_0223BE1C ldr r0, _0223BFB8 ; =0x022431D8 ldr r0, [r0] @@ -35246,10 +35246,10 @@ _0223BFE0: .word 0x0400101C MOD13_0223BFE4: ; 0x0223BFE4 stmdb sp!, {lr} sub sp, sp, #4 - bl disableBankForX_ + bl GX_DisableBankForBG ldr r1, _0223C09C ; =0x022431D8 str r0, [r1] - bl GX_DisableBankForOBJExtPltt_2 + bl GX_DisableBankForOBJ ldr r1, _0223C09C ; =0x022431D8 str r0, [r1, #4] bl GX_DisableBankForBGExtPltt @@ -35258,7 +35258,7 @@ MOD13_0223BFE4: ; 0x0223BFE4 bl GX_DisableBankForOBJExtPltt ldr r1, _0223C09C ; =0x022431D8 str r0, [r1, #0xc] - bl GX_DisableBankForTexPltt_2 + bl GX_DisableBankForTex ldr r1, _0223C09C ; =0x022431D8 str r0, [r1, #0x10] bl GX_DisableBankForTexPltt @@ -35267,13 +35267,13 @@ MOD13_0223BFE4: ; 0x0223BFE4 bl GX_DisableBankForClearImage ldr r1, _0223C09C ; =0x022431D8 str r0, [r1, #0x18] - bl GX_DisableBankForSubBGExtPltt + bl GX_DisableBankForSubBG ldr r1, _0223C09C ; =0x022431D8 str r0, [r1, #0x1c] - bl GX_DisableBankForSubOBJExtPltt_2 + bl GX_DisableBankForSubOBJ ldr r1, _0223C09C ; =0x022431D8 str r0, [r1, #0x20] - bl FUN_020C5E04 + bl GX_DisableBankForSubBGExtPltt ldr r1, _0223C09C ; =0x022431D8 str r0, [r1, #0x24] bl GX_DisableBankForSubOBJExtPltt diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index bdfed5b1..e1acb188 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -11,12 +11,12 @@ StoragePC_Overlay_Init: ; 0x021D74E0 mov r0, #3 mov r1, #9 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r2, #0xf mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r1, #0x87 add r0, r5, #0 lsl r1, r1, #2 @@ -132,9 +132,9 @@ _021D75DE: add r0, r4, #0 bl MOD14_021DB398 mov r0, #9 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xa - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -459,7 +459,7 @@ _021D7846: b _021D792E _021D785A: ldr r0, _021D7990 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D792E _021D7862: mov r0, #0x61 @@ -482,7 +482,7 @@ _021D7876: cmp r0, #1 bne _021D78BC ldr r0, _021D7994 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -503,7 +503,7 @@ _021D7876: b _021D7930 _021D78BC: ldr r0, _021D7990 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D792E _021D78C4: add r0, r4, #0 @@ -515,7 +515,7 @@ _021D78C4: cmp r0, #1 bne _021D790A ldr r0, _021D7994 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -536,11 +536,11 @@ _021D78C4: b _021D7930 _021D790A: ldr r0, _021D7990 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D792E _021D7912: ldr r0, _021D7994 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -774,7 +774,7 @@ _021D7ADC: b _021D7BC4 _021D7AF0: ldr r0, _021D7D14 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7BC4 _021D7AF8: mov r0, #0x61 @@ -797,7 +797,7 @@ _021D7B0C: cmp r0, #1 bne _021D7B52 ldr r0, _021D7D18 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -818,7 +818,7 @@ _021D7B0C: b _021D7BC6 _021D7B52: ldr r0, _021D7D14 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7BC4 _021D7B5A: add r0, r4, #0 @@ -830,7 +830,7 @@ _021D7B5A: cmp r0, #1 bne _021D7BA0 ldr r0, _021D7D18 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -851,11 +851,11 @@ _021D7B5A: b _021D7BC6 _021D7BA0: ldr r0, _021D7D14 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7BC4 _021D7BA8: ldr r0, _021D7D18 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -913,7 +913,7 @@ _021D7C08: cmp r0, #0 beq _021D7C42 ldr r0, _021D7D14 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r1, [sp] add r0, r4, #0 bl MOD14_021DBA44 @@ -1137,7 +1137,7 @@ _021D7DEA: b _021D7EE8 _021D7DFE: ldr r0, _021D7F04 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7EE8 _021D7E06: mov r0, #0x61 @@ -1160,7 +1160,7 @@ _021D7E1A: cmp r0, #1 bne _021D7E5E ldr r0, _021D7F08 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1180,7 +1180,7 @@ _021D7E1A: b _021D7EE8 _021D7E5E: ldr r0, _021D7F04 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7EE8 _021D7E66: add r0, r4, #0 @@ -1192,7 +1192,7 @@ _021D7E66: cmp r0, #1 bne _021D7EAA ldr r0, _021D7F08 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1212,11 +1212,11 @@ _021D7E66: b _021D7EE8 _021D7EAA: ldr r0, _021D7F04 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D7EE8 _021D7EB2: ldr r0, _021D7F08 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -1365,7 +1365,7 @@ _021D7FDC: b _021D80F2 _021D7FF0: ldr r0, _021D8110 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D80F2 _021D7FF8: mov r0, #0x61 @@ -1388,7 +1388,7 @@ _021D800C: cmp r0, #1 bne _021D8050 ldr r0, _021D8114 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1408,7 +1408,7 @@ _021D800C: b _021D80F2 _021D8050: ldr r0, _021D8110 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D80F2 _021D8058: add r0, r4, #0 @@ -1420,7 +1420,7 @@ _021D8058: cmp r0, #1 bne _021D809C ldr r0, _021D8114 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1440,11 +1440,11 @@ _021D8058: b _021D80F2 _021D809C: ldr r0, _021D8110 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D80F2 _021D80A4: ldr r0, _021D8114 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -1533,7 +1533,7 @@ _021D813E: b _021D83C4 _021D8166: ldr r0, _021D83CC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x12 bl MOD14_021DBA44 @@ -1635,7 +1635,7 @@ _021D822C: b _021D83C4 _021D8240: ldr r0, _021D83CC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D83C4 _021D8248: mov r0, #0x61 @@ -1658,7 +1658,7 @@ _021D825C: cmp r0, #1 bne _021D82A0 ldr r0, _021D83E0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1678,7 +1678,7 @@ _021D825C: b _021D83C4 _021D82A0: ldr r0, _021D83CC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D83C4 _021D82A8: add r0, r4, #0 @@ -1690,7 +1690,7 @@ _021D82A8: cmp r0, #1 bne _021D82EC ldr r0, _021D83E0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC170 ldr r1, [r4, #8] @@ -1710,11 +1710,11 @@ _021D82A8: b _021D83C4 _021D82EC: ldr r0, _021D83CC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _021D83C4 _021D82F4: ldr r0, _021D83E0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021DC180 mov r0, #0x45 @@ -2038,7 +2038,7 @@ _021D8590: cmp r0, #1 beq _021D85BA ldr r0, _021D86AC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x11 bl MOD14_021DBA44 @@ -2068,7 +2068,7 @@ _021D85CC: cmp r0, #0 beq _021D86A6 ldr r0, _021D86B0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xb bl MOD14_021DBA44 @@ -2112,7 +2112,7 @@ _021D862A: pop {r3, r4, r5, pc} _021D8638: ldr r0, _021D86B0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2199,7 +2199,7 @@ _021D86E2: cmp r0, #1 beq _021D870A ldr r0, _021D87F0 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x11 bl MOD14_021DBA44 @@ -2226,7 +2226,7 @@ _021D870A: pop {r3, r4, r5, pc} _021D8728: ldr r0, _021D87F8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xc bl MOD14_021DBA44 @@ -2375,7 +2375,7 @@ _021D8828: pop {r3, r4, r5, pc} _021D8864: ldr r0, _021D8A38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2427,7 +2427,7 @@ _021D88C0: pop {r3, r4, r5, pc} _021D88CC: ldr r0, _021D8A38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2572,7 +2572,7 @@ _021D89CA: mov r1, #6 bl MOD14_021DCB2C ldr r0, _021D8A38 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #5 str r0, [r5] pop {r3, r4, r5, pc} @@ -2676,7 +2676,7 @@ _021D8AD8: cmp r0, #0 beq _021D8B08 ldr r0, _021D8D58 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x22 bl MOD14_021DBA44 @@ -2703,7 +2703,7 @@ _021D8B08: pop {r3, r4, r5, pc} _021D8B24: ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2755,7 +2755,7 @@ _021D8B80: pop {r3, r4, r5, pc} _021D8B8C: ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2766,7 +2766,7 @@ _021D8B8C: pop {r3, r4, r5, pc} _021D8BA4: ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #3 str r0, [r5] pop {r3, r4, r5, pc} @@ -2810,7 +2810,7 @@ _021D8BD4: mov r1, #0x14 bl MOD14_021DCB2C ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #5 str r0, [r5] pop {r3, r4, r5, pc} @@ -2827,7 +2827,7 @@ _021D8C12: cmp r0, #0 beq _021D8C42 ldr r0, _021D8D58 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x18 bl MOD14_021DBA44 @@ -2856,7 +2856,7 @@ _021D8C42: mov r1, #0x13 bl MOD14_021DCB2C ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #5 str r0, [r5] pop {r3, r4, r5, pc} @@ -2872,7 +2872,7 @@ _021D8C7C: cmp r0, #0 beq _021D8CAC ldr r0, _021D8D58 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x18 bl MOD14_021DBA44 @@ -2899,7 +2899,7 @@ _021D8CAC: mov r1, #0x15 bl MOD14_021DCB2C ldr r0, _021D8D5C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #5 str r0, [r5] pop {r3, r4, r5, pc} @@ -3006,7 +3006,7 @@ _021D8D9A: cmp r0, #0 ldr r0, _021D8EB4 ; =0x000005DD beq _021D8DC8 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD14_021E6220 mov r1, #0x6e @@ -3016,7 +3016,7 @@ _021D8D9A: str r0, [r5] pop {r3, r4, r5, pc} _021D8DC8: - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3610,7 +3610,7 @@ _021D9254: mov r1, #0x2c bl MOD14_021DCB2C ldr r0, _021D945C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r5] pop {r3, r4, r5, pc} @@ -3640,7 +3640,7 @@ _021D9284: cmp r2, r0 bne _021D9342 ldr r0, _021D9464 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D92B6: add r0, r4, #0 @@ -3687,7 +3687,7 @@ _021D9306: mov r1, #0x2f bl MOD14_021DCB2C ldr r0, _021D9468 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE mov r0, #2 str r0, [r5] pop {r3, r4, r5, pc} @@ -3729,7 +3729,7 @@ _021D935A: cmp r2, r0 bne _021D9454 ldr r0, _021D9464 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D9372: mov r0, #0x45 @@ -3798,20 +3798,20 @@ _021D93E2: mov r1, #0xa bl MOD14_021DCB2C ldr r0, _021D946C ; =0x000005EA - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r5] pop {r3, r4, r5, pc} _021D9416: ldr r0, _021D9464 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D941E: mov r0, #2 tst r0, r1 beq _021D9454 ldr r0, _021D9464 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D942C: mov r0, #0x45 @@ -3911,7 +3911,7 @@ _021D94DC: cmp r0, #0 bne _021D950E ldr r0, _021D95A8 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r1, r4, #0 bl MOD14_021DBA5C @@ -3925,7 +3925,7 @@ _021D94DC: pop {r3, r4, r5, pc} _021D950E: ldr r0, _021D95AC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD14_021DBA44 @@ -3939,7 +3939,7 @@ _021D950E: pop {r3, r4, r5, pc} _021D952E: ldr r0, _021D95A8 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r1, r4, #0 bl MOD14_021DBA5C @@ -4020,7 +4020,7 @@ _021D95CA: mov r1, #0xa bl MOD14_021DCB2C ldr r0, _021D9664 ; =0x000005EA - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD14_021DC3CC cmp r0, #1 @@ -4138,7 +4138,7 @@ _021D96C6: cmp r0, #0 beq _021D96F0 ldr r0, _021D9764 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r1, [sp] add r0, r5, #0 bl MOD14_021DBA44 @@ -4155,7 +4155,7 @@ _021D96F0: add r1, r5, #0 bl MOD14_021DBD34 ldr r0, _021D9768 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -4260,7 +4260,7 @@ _021D979C: pop {r3, r4, r5, pc} _021D97D2: ldr r0, _021D992C ; =0x000005EB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r1, r4, #0 bl MOD14_021DBA5C @@ -4450,7 +4450,7 @@ _021D995A: cmp r0, #1 bne _021D9998 ldr r0, _021D9B78 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #6 bl MOD14_021DBA44 @@ -4474,7 +4474,7 @@ _021D9998: cmp r0, #0 beq _021D99D0 ldr r0, _021D9B78 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r1, [sp] add r0, r4, #0 bl MOD14_021DBA44 @@ -4582,7 +4582,7 @@ _021D9A62: pop {r3, r4, r5, pc} _021D9A92: ldr r0, _021D9B78 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xd bl MOD14_021DBA44 @@ -4875,7 +4875,7 @@ _021D9CC4: pop {r3, r4, r5, pc} _021D9CF0: ldr r0, _021D9F78 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r1, [sp] add r0, r4, #0 bl MOD14_021DBA44 @@ -5546,7 +5546,7 @@ _021DA1FE: ldr r0, [r4, r0] bl MOD14_021DCA38 mov r0, #0xa - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -5592,7 +5592,7 @@ _021DA256: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r2, #0x12 lsl r2, r2, #4 ldr r0, [r4, r2] @@ -5658,7 +5658,7 @@ _021DA2F2: ldr r0, [r5, r0] bl MOD14_021DCA38 mov r0, #0xa - bl FUN_020168D0 + bl DestroyHeap add r0, r5, #0 bl MOD14_021D83E4 mov r1, #0x4b @@ -5693,7 +5693,7 @@ _021DA334: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 bl MOD14_021DC3F4 cmp r0, #1 @@ -5803,7 +5803,7 @@ _021DA41E: ldr r0, [r4, r0] bl MOD14_021DCA38 mov r0, #0xa - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -5889,7 +5889,7 @@ _021DA4F4: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r0, #0x45 lsl r0, r0, #2 add r0, r4, r0 @@ -5969,7 +5969,7 @@ _021DA58E: tst r0, r1 beq _021DA5D6 ldr r0, _021DA5EC ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6029,7 +6029,7 @@ _021DA614: cmp r0, #0 beq _021DA648 ldr r0, _021DA7B8 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x18 bl MOD14_021DBA44 @@ -6193,7 +6193,7 @@ _021DA76C: tst r0, r1 beq _021DA7B2 ldr r0, _021DA7C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6251,7 +6251,7 @@ _021DA7EA: cmp r0, #0 beq _021DA81E ldr r0, _021DA9C4 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x18 bl MOD14_021DBA44 @@ -6441,7 +6441,7 @@ _021DA978: tst r0, r1 beq _021DA9BE ldr r0, _021DA9CC ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6725,7 +6725,7 @@ _021DABB6: tst r1, r0 beq _021DABC6 ldr r0, _021DABE4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, r4, r5, pc} _021DABC6: @@ -6733,7 +6733,7 @@ _021DABC6: tst r0, r1 beq _021DABDC ldr r0, _021DABE4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0 mvn r0, r0 strb r0, [r4, #5] @@ -6842,7 +6842,7 @@ _021DAC98: ; jump table .short _021DAF4A - _021DAC98 - 2 ; case 5 _021DACA4: ldr r0, _021DAF60 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #1 bl MOD14_021DC350 @@ -6904,7 +6904,7 @@ _021DAD04: pop {r3, r4, r5, r6, r7, pc} _021DAD2C: ldr r0, _021DAF68 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} _021DAD34: ldr r0, _021DAF6C ; =gMain @@ -6913,7 +6913,7 @@ _021DAD34: tst r0, r1 beq _021DAD6C ldr r0, _021DAF70 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 bl MOD14_021DC350 @@ -7052,7 +7052,7 @@ _021DAE4A: mov r1, #0x29 bl MOD14_021DCB2C ldr r0, _021DAF74 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #2 str r0, [r5] pop {r3, r4, r5, r6, r7, pc} @@ -7202,7 +7202,7 @@ _021DAF92: ; jump table .short _021DB19C - _021DAF92 - 2 ; case 3 _021DAF9A: ldr r0, _021DB1B4 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #2 bl MOD14_021DC350 @@ -7268,7 +7268,7 @@ _021DB01E: tst r0, r1 beq _021DB046 ldr r0, _021DB1C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 bl MOD14_021DC350 @@ -7285,7 +7285,7 @@ _021DB046: cmp r0, #0 beq _021DB072 ldr r0, _021DB1C0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -7371,7 +7371,7 @@ _021DB0DE: mov r1, #0x29 bl MOD14_021DCB2C ldr r0, _021DB1C4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #2 add sp, #8 str r0, [r6] @@ -10480,7 +10480,7 @@ MOD14_021DC76C: ; 0x021DC76C lsl r0, r0, #4 str r5, [r4, r0] mov r0, #0xa - bl FUN_02016B94 + bl BgConfig_Alloc mov r1, #0x57 lsl r1, r1, #2 str r0, [r4, r1] @@ -10829,22 +10829,22 @@ MOD14_021DCA38: ; 0x021DCA38 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x56 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -11076,7 +11076,7 @@ MOD14_021DCCA0: ; 0x021DCCA0 pop {r3, r4, pc} _021DCCB4: ldr r0, _021DCCFC ; =0x0000060D - bl FUN_020054C8 + bl PlaySE mov r0, #0xa str r0, [sp] ldr r0, _021DCD00 ; =0x04000050 @@ -11262,7 +11262,7 @@ _021DCDF0: add r2, r7, #0 bl MOD14_021DE2E8 ldr r0, _021DCE64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldrh r0, [r4, #6] add r0, r0, #1 strh r0, [r4, #6] @@ -11306,7 +11306,7 @@ MOD14_021DCE68: ; 0x021DCE68 pop {r3, r4, r5, pc} _021DCE7A: ldr r0, _021DCEB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _021DCEBC ; =0x00005DC0 add r0, r4, r0 bl MOD14_021DF484 @@ -12074,7 +12074,7 @@ MOD14_021DD460: ; 0x021DD460 lsl r0, r0, #4 ldr r5, [r4, r0] ldr r0, _021DD488 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD48C ; =0x000065F4 add r5, #0x74 add r0, r4, r0 @@ -12096,7 +12096,7 @@ MOD14_021DD490: ; 0x021DD490 lsl r0, r0, #4 ldr r5, [r4, r0] ldr r0, _021DD4B8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD4BC ; =0x000065F4 add r5, #0x74 add r0, r4, r0 @@ -12154,7 +12154,7 @@ MOD14_021DD4FC: ; 0x021DD4FC pop {r3, r4, r5, pc} _021DD50E: ldr r0, _021DD52C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD530 ; =0x0000662C add r0, r4, r0 bl MOD14_021E1FC0 @@ -12259,7 +12259,7 @@ _021DD5CA: ; jump table .short _021DD64C - _021DD5CA - 2 ; case 3 _021DD5D2: ldr r0, _021DD660 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD664 ; =0x00005DC0 add r0, r5, r0 bl MOD14_021DFBB8 @@ -12344,7 +12344,7 @@ MOD14_021DD66C: ; 0x021DD66C pop {r3, r4, r5, pc} _021DD67E: ldr r0, _021DD6B0 ; =0x00000633 - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD6B4 ; =0x00005DC0 add r0, r4, r0 bl MOD14_021DFF1C @@ -12407,7 +12407,7 @@ _021DD6EA: strh r0, [r4, #6] _021DD6FC: ldr r0, _021DD734 ; =0x00000634 - bl FUN_020054C8 + bl PlaySE ldr r0, _021DD738 ; =0x0000B22C add r0, r5, r0 bl MOD14_021E2BB0 @@ -12800,7 +12800,7 @@ MOD14_021DD9E4: ; 0x021DD9E4 pop {r3, r4, pc} _021DD9F8: ldr r0, _021DDA34 ; =0x0000060E - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -12846,28 +12846,28 @@ MOD14_021DDA38: ; 0x021DDA38 add r2, r0, #0 bl GX_SetGraphicsMode ldr r0, _021DDB28 ; =MOD14_021E627C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB2C ; =MOD14_021E6350 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB30 ; =MOD14_021E6334 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB34 ; =MOD14_021E62FC mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 bl MOD14_021DC3C4 cmp r0, #4 @@ -12878,28 +12878,28 @@ MOD14_021DDA38: ; 0x021DDA38 ldr r2, _021DDB38 ; =MOD14_021E6318 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB3C ; =MOD14_021E62E0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB40 ; =MOD14_021E62C4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB44 ; =MOD14_021E62A8 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate b _021DDB1A _021DDADA: mov r0, #0x57 @@ -12908,28 +12908,28 @@ _021DDADA: ldr r2, _021DDB38 ; =MOD14_021E6318 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB48 ; =MOD14_021E6388 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB4C ; =MOD14_021E628C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] ldr r2, _021DDB44 ; =MOD14_021E62A8 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate _021DDB1A: bl MOD14_021DDC78 pop {r3, r4, r5, pc} @@ -12978,12 +12978,12 @@ MOD14_021DDB50: ; 0x021DDB50 ldr r0, [r5, r0] mov r1, #1 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r5, r0] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -13584,7 +13584,7 @@ MOD14_021DE014: ; 0x021DE014 ldr r0, _021DE060 ; =0x00005984 mov r1, #3 ldr r0, [r4, r0] - bl FUN_02017B48 + bl Bg_GetXpos ldr r1, _021DE064 ; =0x0000585C str r0, [r4, #0xc] ldr r1, [r4, r1] @@ -13597,7 +13597,7 @@ MOD14_021DE014: ; 0x021DE014 ldr r0, _021DE060 ; =0x00005984 str r3, [r4, #0xc] ldr r0, [r4, r0] - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0 str r3, [sp] mov r0, #0x40 @@ -13610,7 +13610,7 @@ MOD14_021DE014: ; 0x021DE014 mov r1, #3 ldr r0, [r4, r0] mov r2, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -13862,7 +13862,7 @@ _021DE250: ldr r0, [r6, r0] ldr r3, [r3, #0x10] mov r1, #3 - bl FUN_02017E14 + bl BG_LoadCharTilesData _021DE262: ldr r0, [sp, #0x10] bl FreeToHeap @@ -13899,7 +13899,7 @@ MOD14_021DE278: ; 0x021DE278 ldr r0, _021DE2E4 ; =0x00005984 mov r1, #3 ldr r0, [r5, r0] - bl FUN_0201886C + bl GetBgTilemapBuffer add r7, r0, #0 beq _021DE2C2 ldr r1, [sp, #0x20] @@ -13920,7 +13920,7 @@ _021DE2C2: mov r1, #3 add r2, r7, #0 lsl r3, r3, #0xc - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram _021DE2DC: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -13937,7 +13937,7 @@ MOD14_021DE2E8: ; 0x021DE2E8 ldr r0, [r5, r0] mov r1, #3 add r6, r2, #0 - bl FUN_02017B48 + bl Bg_GetXpos lsl r0, r0, #0x17 lsr r1, r0, #0xb mov r0, #0xb8 @@ -14105,7 +14105,7 @@ MOD14_021DE3E4: ; 0x021DE3E4 ldr r3, [r5, #0xc] ldr r0, [r5, r0] mov r1, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5, #4] sub r0, r0, #1 str r0, [r5, #4] @@ -14116,7 +14116,7 @@ _021DE45C: ldr r0, [r5, r0] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r1, _021DE480 ; =0x00000618 add r0, r5, #0 add r5, #0xa8 @@ -19503,7 +19503,7 @@ MOD14_021E0E44: ; 0x021E0E44 _021E0E58: ldr r0, [r5, #4] add r0, r0, r4 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r4, #0x10 cmp r6, #4 @@ -19646,18 +19646,18 @@ _021E0F5E: ldr r0, [r5, #8] add r1, r1, r4 add r2, r6, #0 - bl FUN_02019150 + bl AddWindow cmp r7, #3 ldr r0, [r5, #4] beq _021E0F78 add r0, r0, r4 - bl FUN_02019270 + bl PutWindowTilemap b _021E0F82 _021E0F78: add r0, r0, r4 mov r1, #0xc mov r2, #2 - bl FUN_0201928C + bl PutWindowTilemapRectAnchoredTopLeft _021E0F82: add r7, r7, #1 add r6, #8 @@ -19666,7 +19666,7 @@ _021E0F82: blt _021E0F5E ldr r0, [r5, #8] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _021E0F94: add r0, r5, #0 bl MOD14_021E0FA8 @@ -19931,7 +19931,7 @@ _021E1190: bl MOD14_021E12B8 ldr r0, [r5, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0 strh r0, [r4, #4] mov r0, #2 @@ -19968,7 +19968,7 @@ _021E11CE: bl ScrollWindow ldr r0, [r5, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldrh r0, [r4, #6] cmp r0, #0x10 blo _021E1220 @@ -20254,16 +20254,16 @@ MOD14_021E13F0: ; 0x021E13F0 bl MOD14_021E153C _021E1430: ldr r0, [r4, #4] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x20 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode _021E144E: pop {r4, pc} @@ -20309,16 +20309,16 @@ _021E14A0: bl MOD14_021E16A0 _021E14A8: ldr r0, [r4, #4] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x20 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD14_021E1114 _021E14CC: @@ -20358,16 +20358,16 @@ _021E150E: mov r1, #0 bl MOD14_021E16A0 ldr r0, [r4, #4] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x20 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #4] add r0, #0x30 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD14_021E1140 _021E153A: @@ -20555,7 +20555,7 @@ MOD14_021E16A0: ; 0x021E16A0 add r4, r1, #0 ldr r0, [r0, #8] mov r1, #2 - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 add r2, r0, #0 mov r0, #1 @@ -20595,7 +20595,7 @@ _021E16DC: ldr r0, [r0, #8] mov r1, #2 mov r3, #0xc - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -20711,7 +20711,7 @@ MOD14_021E17C4: ; 0x021E17C4 _021E17D2: ldr r0, [r5, #0x18] add r0, r0, r4 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r4, #0x10 cmp r6, #2 @@ -20763,7 +20763,7 @@ _021E1832: ldr r0, [r6] add r1, r1, r5 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r7, r7, #1 add r4, #8 add r5, #0x10 @@ -20815,7 +20815,7 @@ MOD14_021E189C: ; 0x021E189C add r5, r0, #0 ldr r0, [r5, #0x18] add r4, r1, #0 - bl FUN_02019270 + bl PutWindowTilemap ldr r3, [r5, #0x18] ldrb r0, [r3, #7] str r0, [sp] @@ -20847,10 +20847,10 @@ MOD14_021E189C: ; 0x021E189C mov r1, #1 bl AddTextPrinterParameterized ldr r0, [r5, #0x18] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r5] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #1 strh r0, [r5, #0x1c] add sp, #0xc @@ -20866,7 +20866,7 @@ MOD14_021E1908: ; 0x021E1908 add r6, r2, #0 ldr r4, [sp, #0x18] ldr r5, [sp, #0x1c] - bl FUN_0201886C + bl GetBgTilemapBuffer sub r1, r7, #1 sub r2, r6, #2 lsl r1, r1, #5 @@ -21039,10 +21039,10 @@ _021E1A5C: ldrb r1, [r1] bl MOD14_021E1AD8 ldr r0, [sp, #0x14] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r5] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #1 strh r0, [r5, #0x1e] add sp, #0x18 @@ -21100,7 +21100,7 @@ MOD14_021E1AD8: ; 0x021E1AD8 add r5, r1, #0 ldr r0, [r0] mov r1, #1 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r2, #8 sub r2, r2, r5 mov ip, r2 @@ -21175,7 +21175,7 @@ _021E1B5A: _021E1B6E: ldr r0, [r4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, pc} thumb_func_start MOD14_021E1B78 @@ -21194,7 +21194,7 @@ MOD14_021E1B78: ; 0x021E1B78 _021E1B90: ldr r0, [r4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, pc} .align 2, 0 @@ -21230,7 +21230,7 @@ MOD14_021E1B9C: ; 0x021E1B9C add r2, r5, r2 bl FUN_02002218 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #8 pop {r4, r5, r6, pc} @@ -21254,7 +21254,7 @@ _021E1BF0: cmp r5, #6 blt _021E1BF0 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -21267,7 +21267,7 @@ MOD14_021E1C10: ; 0x021E1C10 add r6, r2, #0 ldr r5, [sp, #0x18] ldr r4, [sp, #0x1c] - bl FUN_0201886C + bl GetBgTilemapBuffer sub r1, r7, #1 sub r2, r6, #1 lsl r1, r1, #5 @@ -21339,7 +21339,7 @@ MOD14_021E1CA0: ; 0x021E1CA0 push {r3, r4, r5, r6, r7, lr} add r4, r1, #0 ldrb r1, [r4, #4] - bl FUN_0201886C + bl GetBgTilemapBuffer ldrb r1, [r4, #5] mov r5, #0 sub r2, r1, #1 @@ -21383,7 +21383,7 @@ MOD14_021E1CEC: ; 0x021E1CEC push {r3, r4, r5, r6, r7, lr} add r4, r1, #0 ldrb r1, [r4, #4] - bl FUN_0201886C + bl GetBgTilemapBuffer ldrb r1, [r4, #5] mov r5, #0 sub r2, r1, #2 @@ -21643,7 +21643,7 @@ _021E1F04: ldr r0, [r7, #4] add r1, r1, r5 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -21703,7 +21703,7 @@ _021E1F6E: _021E1F78: ldr r0, [r5, #0x10] add r0, r0, r4 - bl FUN_02019178 + bl RemoveWindow add r6, r6, #1 add r4, #0x10 cmp r6, #3 @@ -21795,7 +21795,7 @@ MOD14_021E1FF8: ; 0x021E1FF8 mov r1, #9 mov r2, #0xa mov r3, #0xe - bl FUN_02018F4C + bl FillBitmapRect8Bit mov r4, #0 mov r0, #0xc str r4, [sp, #0x20] @@ -21872,7 +21872,7 @@ _021E20AA: lsl r1, r6, #0x10 ldr r0, [sp, #0x2c] lsr r1, r1, #0x10 - bl FUN_02018F4C + bl FillBitmapRect8Bit _021E20C8: ldr r1, [sp, #0x1c] add r0, r5, #0 @@ -22275,7 +22275,7 @@ MOD14_021E2394: ; 0x021E2394 sub r3, r3, r5 bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -22290,7 +22290,7 @@ MOD14_021E23F8: ; 0x021E23F8 add r0, r4, #0 bl FillWindowPixelBuffer add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} thumb_func_start MOD14_021E240C @@ -22333,7 +22333,7 @@ _021E2450: cmp r6, #7 blt _021E242C ldr r0, [sp, #0xc] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -22347,7 +22347,7 @@ MOD14_021E2464: ; 0x021E2464 add r0, r4, #0 bl FillWindowPixelBuffer add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} .align 2, 0 @@ -22454,7 +22454,7 @@ _021E250C: mov r1, #1 add r2, #0xc mov r3, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldrb r6, [r4, #5] mov r0, #0x20 mov r3, #0xa @@ -22473,7 +22473,7 @@ _021E250C: str r3, [sp, #0x18] ldr r0, [r5, #4] mov r1, #1 - bl FUN_02018170 + bl CopyToBgTilemapRect b _021E2582 _021E2562: mov r0, #5 @@ -22487,14 +22487,14 @@ _021E2562: mov r1, #1 add r2, #0xc mov r3, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldrb r0, [r4, #4] add r0, r0, #1 strb r0, [r4, #4] _021E2582: ldr r0, [r5, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #7 add sp, #0x1c strb r0, [r4, #5] @@ -22538,17 +22538,17 @@ _021E25C2: cmp r0, #0 bne _021E260E ldr r0, [r5, #0x10] - bl FUN_02019270 + bl PutWindowTilemap ldr r0, [r5, #0x10] add r0, #0x10 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 bl MOD14_021E2394 add r0, r5, #0 bl MOD14_021E240C ldr r0, [r5, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrb r0, [r4, #4] add sp, #0x1c add r0, r0, #1 @@ -22601,7 +22601,7 @@ _021E264A: ldr r0, [r4, #4] mov r1, #1 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldrb r0, [r5, #5] add r0, r0, #1 strb r0, [r5, #5] @@ -22625,7 +22625,7 @@ _021E264A: mov r1, #1 add r2, #0xc mov r3, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldrb r1, [r5, #5] mov r2, #5 mov r0, #0x20 @@ -22648,7 +22648,7 @@ _021E264A: str r3, [sp, #0x18] ldr r0, [r4, #4] mov r1, #1 - bl FUN_02018170 + bl CopyToBgTilemapRect b _021E26D0 _021E26CA: ldrb r0, [r5, #4] @@ -22657,7 +22657,7 @@ _021E26CA: _021E26D0: ldr r0, [r4, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x1c pop {r4, r5, pc} _021E26DC: @@ -22682,7 +22682,7 @@ MOD14_021E26E4: ; 0x021E26E4 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x18 str r0, [sp] mov r0, #0x20 @@ -22694,7 +22694,7 @@ MOD14_021E26E4: ; 0x021E26E4 mov r1, #1 add r2, #0xc mov r3, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [r5, #0x10] mov r1, #4 add r0, #0x20 @@ -22803,7 +22803,7 @@ _021E27DC: ldr r0, [r4, #4] mov r1, #1 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0xe ldr r2, [r4, #8] lsl r1, r1, #0x10 @@ -22817,7 +22817,7 @@ _021E280A: mov r1, #1 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0xe ldr r2, [r4, #0xc] lsl r1, r1, #0x10 @@ -22882,7 +22882,7 @@ MOD14_021E2884: ; 0x021E2884 mov r1, #1 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 bl MOD14_021E2A28 mov r0, #1 @@ -22918,7 +22918,7 @@ MOD14_021E28B4: ; 0x021E28B4 ldr r0, [r4, #4] mov r1, #1 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0xe ldr r2, [r4, #8] lsl r1, r1, #0x10 @@ -22933,7 +22933,7 @@ _021E28EC: mov r1, #1 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0xe ldr r2, [r4, #0xc] lsl r1, r1, #0x10 @@ -22950,10 +22950,10 @@ _021E28EC: ldr r0, [r4, #4] mov r1, #1 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _021E293C ; =MOD14_021E28AC ldr r2, [r4] add r0, r4, #0 @@ -23194,7 +23194,7 @@ MOD14_021E2AE8: ; 0x021E2AE8 bl MOD14_021E32F8 ldr r0, [r4, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, pc} thumb_func_start MOD14_021E2B10 @@ -23266,7 +23266,7 @@ _021E2B72: bl MOD14_021E31A4 ldr r0, [r5, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 add r1, r4, #0 bl MOD14_021E3290 @@ -23368,7 +23368,7 @@ _021E2C0A: mov r1, #2 mov r2, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect _021E2C46: add r1, r5, #0 add r1, #0x2b @@ -23377,7 +23377,7 @@ _021E2C46: bl MOD14_021E31A4 ldr r0, [r5, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 add r1, r4, #0 bl MOD14_021E3290 @@ -24121,7 +24121,7 @@ _021E31CC: mov r1, #2 add r2, r4, r2 lsr r3, r3, #0x18 - bl FUN_02018148 + bl LoadRectToBgTilemapRect _021E31F0: add sp, #0xc pop {r3, r4, pc} @@ -24509,7 +24509,7 @@ MOD14_021E34C0: ; 0x021E34C0 add r6, r0, #0 beq _021E3558 add r0, #0x88 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 add r0, #0x98 ldr r0, [r0] @@ -24644,7 +24644,7 @@ MOD14_021E355C: ; 0x021E355C ldr r0, [r4, #8] mov r1, #4 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -24655,10 +24655,10 @@ MOD14_021E355C: ; 0x021E355C ldr r0, [r4, #8] mov r1, #4 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4, #8] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r3, [r4, #0x10] ldr r0, [r4, #8] lsl r5, r3, #2 @@ -24666,7 +24666,7 @@ MOD14_021E355C: ; 0x021E355C mov r1, #5 ldr r3, [r3, r5] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0 add r1, r4, #0 str r3, [sp] @@ -24680,7 +24680,7 @@ MOD14_021E355C: ; 0x021E355C ldr r0, [r4, #8] add r1, #0x88 mov r2, #4 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x88 mov r1, #0 @@ -24961,7 +24961,7 @@ _021E3852: str r6, [r5, #0x10] ldr r0, [r5, #8] mov r1, #5 - bl FUN_02017B48 + bl Bg_GetXpos lsl r0, r0, #0xc ldr r1, _021E3898 ; =MOD14_021E6674 lsl r2, r6, #2 @@ -25042,7 +25042,7 @@ _021E38DE: ldr r0, [r5, #8] mov r1, #5 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrh r0, [r4, #0xc] sub r0, r0, #1 strh r0, [r4, #0xc] @@ -25052,7 +25052,7 @@ _021E3900: ldr r3, [r4, #0x18] mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x10 str r0, [sp] ldr r0, _021E3978 ; =0x04001050 @@ -25072,7 +25072,7 @@ _021E3924: mov r1, #6 ldr r3, [r3, r5] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 strh r0, [r4, #0xe] ldr r0, [r4, #4] @@ -25176,7 +25176,7 @@ _021E39CE: mov r1, #6 ldr r3, [r3, r5] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -25193,7 +25193,7 @@ _021E3A0C: ldr r0, [r5, #8] mov r1, #5 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrh r0, [r4, #0xc] sub r0, r0, #1 strh r0, [r4, #0xc] @@ -25203,7 +25203,7 @@ _021E3A2E: ldr r3, [r4, #0x18] mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x10 str r0, [sp] ldr r0, _021E3AA4 ; =0x04001050 @@ -25223,7 +25223,7 @@ _021E3A52: mov r1, #6 ldr r3, [r3, r5] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 strh r0, [r4, #0xe] ldr r0, [r4, #4] @@ -25309,7 +25309,7 @@ _021E3ADA: ldr r0, [r0, #8] mov r1, #6 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -25326,7 +25326,7 @@ _021E3B12: mov r1, #5 mov r2, #0 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrh r0, [r4, #0xc] sub r0, r0, #1 strh r0, [r4, #0xc] @@ -25336,7 +25336,7 @@ _021E3B34: ldr r3, [r4, #0x18] mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -27001,12 +27001,12 @@ _021E4762: thumb_func_start MOD14_021E4764 MOD14_021E4764: ; 0x021E4764 - ldr r3, _021E476C ; =FUN_0201797C + ldr r3, _021E476C ; =ToggleBgLayer mov r0, #4 mov r1, #0 bx r3 .align 2, 0 -_021E476C: .word FUN_0201797C +_021E476C: .word ToggleBgLayer thumb_func_start MOD14_021E4770 MOD14_021E4770: ; 0x021E4770 @@ -27020,7 +27020,7 @@ MOD14_021E4770: ; 0x021E4770 bl G2x_SetBlendAlpha_ mov r0, #4 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer pop {r3, pc} .align 2, 0 _021E478C: .word 0x04001050 @@ -27090,7 +27090,7 @@ _021E4800: blo _021E47AE add r0, r6, #0 add r0, #0x88 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r6, #0 bl MOD14_021E4770 add sp, #0x14 @@ -28336,7 +28336,7 @@ MOD14_021E5128: ; 0x021E5128 mov r1, #0x20 mov r2, #0 mov r3, #0xa - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -28347,7 +28347,7 @@ MOD14_021E5128: ; 0x021E5128 ldr r0, [r4, #0xc] mov r1, #4 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0 bl MOD14_021E539C add r0, r4, #0 @@ -28359,7 +28359,7 @@ MOD14_021E5128: ; 0x021E5128 str r0, [r4, r1] ldr r0, [r4, #0xc] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD14_021E5A08 _021E5210: @@ -28469,7 +28469,7 @@ MOD14_021E52C0: ; 0x021E52C0 bl MOD14_021E5504 ldr r0, [r4, #0xc] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _021E52DE: pop {r4, pc} @@ -28502,7 +28502,7 @@ _021E530A: bl MOD14_021E549C ldr r0, [r4, #0xc] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0xdf lsl r0, r0, #2 ldr r1, [r4, r0] @@ -28550,7 +28550,7 @@ _021E534A: ldr r0, [r5, #0xc] mov r1, #2 add r3, r2, #0 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r0, #6 str r0, [sp] mov r0, #0x20 @@ -28565,10 +28565,10 @@ _021E534A: str r0, [sp, #0x18] ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x1c pop {r4, r5, pc} @@ -28587,35 +28587,35 @@ MOD14_021E539C: ; 0x021E539C _021E53B2: mov r0, #5 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer pop {r3, pc} _021E53CC: mov r0, #6 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer pop {r3, pc} _021E53E6: mov r0, #7 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer pop {r3, pc} thumb_func_start MOD14_021E5400 @@ -28640,9 +28640,9 @@ _021E541E: ldr r0, [r7, #0xc] add r1, r4, #0 add r2, r6, #0 - bl FUN_02019150 + bl AddWindow add r0, r4, #0 - bl FUN_02019270 + bl PutWindowTilemap add r5, r5, #1 add r6, #8 add r4, #0x10 @@ -28663,7 +28663,7 @@ _021E541E: add r4, #0x78 _021E5458: add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r5, r5, #1 add r4, #0x10 cmp r5, #3 @@ -28688,7 +28688,7 @@ _021E547E: cmp r0, #0 beq _021E548E add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021E548E: add r6, r6, #1 add r5, #0x10 @@ -28792,9 +28792,9 @@ _021E554C: add r1, r5, r4 ldr r0, [r0, #0xc] add r2, r7, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, r4 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, r4 mov r1, #0 bl FillWindowPixelBuffer @@ -28823,9 +28823,9 @@ _021E5588: cmp r0, #0 beq _021E55A4 add r0, r5, #0 - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x84 str r7, [r0] @@ -28978,9 +28978,9 @@ _021E56B4: add r1, r5, r4 ldr r0, [r0, #0xc] add r2, r7, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, r4 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, r4 mov r1, #0 bl FillWindowPixelBuffer @@ -29009,9 +29009,9 @@ _021E56F0: cmp r0, #0 beq _021E570C add r0, r5, #0 - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x84 str r7, [r0] @@ -29102,7 +29102,7 @@ _021E5786: bl AddTextPrinterParameterized2 _021E57B8: add r0, r7, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -29118,7 +29118,7 @@ MOD14_021E57CC: ; 0x021E57CC mov r1, #0 bl FillWindowPixelBuffer add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} .align 2, 0 @@ -29259,7 +29259,7 @@ _021E58C8: blt _021E58C8 _021E58FA: add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -29386,7 +29386,7 @@ _021E59C6: blt _021E59C6 _021E59F8: add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop @@ -29782,7 +29782,7 @@ MOD14_021E5CFC: ; 0x021E5CFC bl AddTextPrinterParameterized2 _021E5D56: add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -30355,7 +30355,7 @@ _021E61D8: tst r0, r1 beq _021E61EA ldr r0, _021E620C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0 mvn r0, r0 pop {r3, r4, r5, pc} @@ -30364,7 +30364,7 @@ _021E61EA: tst r1, r0 beq _021E6202 ldr r0, _021E620C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x20 ldrb r0, [r0] @@ -30719,4 +30719,3 @@ MOD14_021E6B94: ; 0x021E6B94 .global MOD14_021E6B98 MOD14_021E6B98: ; 0x021E6B98 .space 0x4 - diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 97282c02..173d4fd6 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -23,12 +23,12 @@ _021D74F2: mov r0, #3 mov r1, #0x22 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r2, #0xa mov r0, #3 mov r1, #0x23 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 bl MOD15_021D7628 ldr r0, [r0, #0x14] @@ -170,9 +170,9 @@ MOD15_021D7608: ; 0x021D7608 add r1, r4, #0 bl MOD15_021D7774 mov r0, #0x22 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x23 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -419,7 +419,7 @@ _021D77F6: tst r1, r0 beq _021D7818 ldr r0, _021D7880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x4c @@ -435,7 +435,7 @@ _021D7818: tst r1, r0 beq _021D782E ldr r0, _021D7880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D7884 ; =MOD15_021D851C add r0, r5, #0 bl MOD15_021D83AC @@ -445,7 +445,7 @@ _021D782E: tst r0, r1 beq _021D7876 ldr r0, _021D7880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x50 @@ -528,7 +528,7 @@ _021D78D6: tst r1, r0 beq _021D78F8 ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x4c @@ -549,7 +549,7 @@ _021D78F8: cmp r0, #0 beq _021D79A6 ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x4e @@ -568,7 +568,7 @@ _021D7920: cmp r0, #0 bne _021D79A6 ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #1 add r0, #0x4e @@ -582,7 +582,7 @@ _021D7948: tst r1, r0 beq _021D795E ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D79B4 ; =MOD15_021D851C add r0, r5, #0 bl MOD15_021D83AC @@ -592,7 +592,7 @@ _021D795E: tst r0, r1 beq _021D79A6 ldr r0, _021D79B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x50 @@ -703,7 +703,7 @@ _021D7A3C: b _021D7BAE _021D7A3E: ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x4e ldrh r0, [r0] @@ -720,7 +720,7 @@ _021D7A5C: tst r0, r1 beq _021D7AAC ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x64 ldrb r2, [r0] @@ -770,7 +770,7 @@ _021D7AAC: bne _021D7AE2 _021D7AC6: ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x4c @@ -787,7 +787,7 @@ _021D7AE2: tst r3, r0 beq _021D7B12 ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x4e @@ -808,7 +808,7 @@ _021D7B12: tst r0, r3 beq _021D7B40 ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x4e @@ -829,7 +829,7 @@ _021D7B40: tst r0, r1 beq _021D7B56 ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D7BBC ; =MOD15_021D851C add r0, r4, #0 bl MOD15_021D83AC @@ -838,7 +838,7 @@ _021D7B56: cmp r2, #0 beq _021D7BAE ldr r0, _021D7BB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x50 @@ -944,7 +944,7 @@ _021D7C28: tst r1, r0 beq _021D7C4E ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0x4c ldrh r1, [r0] @@ -962,7 +962,7 @@ _021D7C4E: tst r1, r0 beq _021D7C6C ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x4c @@ -976,7 +976,7 @@ _021D7C6C: tst r1, r0 beq _021D7C86 ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #5 bl MOD15_021D8900 @@ -988,7 +988,7 @@ _021D7C86: tst r1, r0 beq _021D7CA6 ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r4, #0x4c ldrh r0, [r4] cmp r0, #0 @@ -1005,7 +1005,7 @@ _021D7CA6: tst r0, r1 beq _021D7CE8 ldr r0, _021D7CF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #2 str r0, [r5] b _021D7CE8 @@ -1089,7 +1089,7 @@ _021D7D44: beq _021D7D78 _021D7D4C: ldr r0, _021D7E34 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x65 ldrb r1, [r0] @@ -1113,7 +1113,7 @@ _021D7D78: tst r1, r0 beq _021D7D96 ldr r0, _021D7E38 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x14] mov r1, #7 bl MOD15_021D8900 @@ -1132,7 +1132,7 @@ _021D7D96: cmp r0, #0xfe bne _021D7DBE ldr r0, _021D7E38 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x14] mov r1, #7 bl MOD15_021D8900 @@ -1147,7 +1147,7 @@ _021D7DBE: cmp r0, #0 beq _021D7DEA ldr r0, _021D7E38 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x54 add r1, r5, #0 @@ -1162,7 +1162,7 @@ _021D7DBE: b _021D7E30 _021D7DEA: ldr r0, _021D7E44 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE b _021D7E30 _021D7DF2: add r0, r5, #0 @@ -1170,7 +1170,7 @@ _021D7DF2: cmp r0, #0 beq _021D7E30 ldr r0, _021D7E38 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x14] mov r1, #0xe bl MOD15_021D8900 @@ -1533,7 +1533,7 @@ _021D8084: beq _021D80BC _021D808C: ldr r0, _021D81B8 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 add r0, #0x50 @@ -1583,7 +1583,7 @@ _021D80E2: b _021D812E _021D80F0: ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0xf bl MOD15_021D8900 @@ -1591,7 +1591,7 @@ _021D80F0: pop {r3, r4, r5, pc} _021D8102: ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x10 bl MOD15_021D8900 @@ -1601,7 +1601,7 @@ _021D8102: pop {r3, r4, r5, pc} _021D8118: ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x10 bl MOD15_021D8900 @@ -1615,7 +1615,7 @@ _021D812E: tst r0, r1 beq _021D814E ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #9 bl MOD15_021D8900 @@ -1629,7 +1629,7 @@ _021D814E: tst r0, r1 beq _021D81B4 ldr r0, _021D81C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD15_021D8310 ldr r0, _021D81C4 ; =MOD15_021D779C @@ -2080,14 +2080,14 @@ _021D8488: ; jump table .short _021D84A2 - _021D8488 - 2 ; case 4 _021D8492: ldr r0, _021D8514 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x15 bl MOD15_021D8900 pop {r3, r4, r5, pc} _021D84A2: ldr r0, _021D8514 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x16 bl MOD15_021D8900 @@ -2096,7 +2096,7 @@ _021D84A2: pop {r3, r4, r5, pc} _021D84B6: ldr r0, _021D8514 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] cmp r0, #2 bne _021D84CA @@ -2193,14 +2193,14 @@ _021D8574: ; jump table .short _021D858E - _021D8574 - 2 ; case 4 _021D857E: ldr r0, _021D85C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x15 bl MOD15_021D8900 pop {r3, r4, r5, pc} _021D858E: ldr r0, _021D85C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x14] mov r1, #0x16 bl MOD15_021D8900 @@ -2209,7 +2209,7 @@ _021D858E: pop {r3, r4, r5, pc} _021D85A2: ldr r0, _021D85C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D85CC ; =MOD15_021D8378 add r0, r4, #0 bl MOD15_021D7794 @@ -2368,7 +2368,7 @@ MOD15_021D8698: ; 0x021D8698 pop {r3, r4, r5, pc} _021D86AA: ldr r0, _021D86E0 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x65 ldrb r1, [r0] @@ -2611,7 +2611,7 @@ MOD15_021D87F8: ; 0x021D87F8 bl FUN_02008C9C str r0, [r4, #0x24] mov r0, #0x23 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x20] ldr r0, _021D8880 ; =MOD15_021D88D8 add r1, r4, #0 @@ -3076,19 +3076,19 @@ _021D8BF4: blt _021D8BD8 ldr r0, [r7, #0x20] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7, #0x20] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7, #0x20] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7, #0x20] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7, #0x20] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r6, #0 bl MOD15_021D8998 _021D8C2A: @@ -3112,32 +3112,32 @@ MOD15_021D8C30: ; 0x021D8C30 ldr r0, _021D8C98 ; =0x021DB964 bl GX_SetBanks ldr r0, _021D8C9C ; =0x021DB8C8 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0 ldr r0, [r4, #0x20] ldr r2, _021D8CA0 ; =0x021DB910 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x20] ldr r2, _021D8CA4 ; =0x021DB8D8 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x20] ldr r2, _021D8CA8 ; =0x021DB948 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x20] ldr r2, _021D8CAC ; =0x021DB8F4 mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x20] ldr r2, _021D8CB0 ; =0x021DB92C mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate pop {r4, pc} nop _021D8C94: .word 0x04000304 @@ -4388,13 +4388,13 @@ _021D966A: _021D9674: add r0, r4, #0 add r0, #0xc - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x1c - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x2c - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -4446,7 +4446,7 @@ MOD15_021D9694: ; 0x021D9694 add r0, r6, #0 add r1, #0xc mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x15 str r0, [sp] mov r0, #0x1b @@ -4464,7 +4464,7 @@ MOD15_021D9694: ; 0x021D9694 add r0, r6, #0 add r1, #0x1c mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xf str r0, [sp] mov r0, #8 @@ -4483,7 +4483,7 @@ MOD15_021D9694: ; 0x021D9694 add r1, #0x2c mov r2, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0xc2 str r0, [sp] @@ -4532,10 +4532,10 @@ MOD15_021D9694: ; 0x021D9694 bl FUN_0200D06C add r0, r5, #0 add r0, #0xc - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 add r0, #0x1c - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 bl MOD15_021D9868 add r0, r5, #0 @@ -4547,7 +4547,7 @@ MOD15_021D9694: ; 0x021D9694 bl MOD15_021D98C0 add r0, r6, #0 mov r1, #0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x14 pop {r3, r4, r5, r6, pc} @@ -4815,7 +4815,7 @@ _021D99FA: _021D9A02: add r4, #0xc add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} thumb_func_start MOD15_021D9A0C @@ -5306,7 +5306,7 @@ _021D9D8C: _021D9DB0: add r4, #0x1c add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -5552,7 +5552,7 @@ MOD15_021D9F88: ; 0x021D9F88 bl FUN_0200CCF8 add r4, #0x2c add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram pop {r4, pc} .align 2, 0 @@ -5630,7 +5630,7 @@ MOD15_021D9FD4: ; 0x021D9FD4 bl MOD15_021DA0B8 add r0, r4, #0 mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -5645,9 +5645,9 @@ MOD15_021DA044: ; 0x021DA044 add r4, r2, #0 add r1, sp, #0x10 add r2, r5, #0 - bl FUN_02019150 + bl AddWindow add r0, sp, #0x10 - bl FUN_02019270 + bl PutWindowTilemap add r0, sp, #0x10 mov r1, #0xe bl FillWindowPixelBuffer @@ -5676,11 +5676,11 @@ MOD15_021DA044: ; 0x021DA044 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, sp, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl String_dtor add r0, sp, #0x10 - bl FUN_02019178 + bl RemoveWindow add sp, #0x20 pop {r3, r4, r5, pc} nop @@ -5794,7 +5794,7 @@ MOD15_021DA164: ; 0x021DA164 mov r1, #3 add r2, r1, #0 mov r3, #0x40 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} thumb_func_start MOD15_021DA178 @@ -5805,7 +5805,7 @@ MOD15_021DA178: ; 0x021DA178 mov r1, #3 add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} thumb_func_start MOD15_021DA18C @@ -5892,12 +5892,12 @@ MOD15_021DA1D0: ; 0x021DA1D0 add r0, r4, #0 mov r1, #1 sub r3, r2, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #1 mov r2, #3 mov r3, #2 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 bl MOD15_021DA54C mov r1, #2 @@ -5936,7 +5936,7 @@ MOD15_021DA1D0: ; 0x021DA1D0 str r0, [r3] add r0, r4, #0 mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -6018,7 +6018,7 @@ _021DA31A: add r1, sp, #0x28 mov r2, #1 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, sp, #0x28 mov r1, #0xf bl FillWindowPixelBuffer @@ -6042,13 +6042,13 @@ _021DA31A: add r2, r5, #0 bl AddTextPrinterParameterized2 add r0, sp, #0x28 - bl FUN_02019270 + bl PutWindowTilemap add r0, sp, #0x28 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r5, #0 bl String_dtor add r0, sp, #0x28 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r6, #0x12 add r7, #0xa @@ -6095,7 +6095,7 @@ _021DA3CC: add r0, r4, #0 mov r2, #1 mov r3, #0x22 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #4 mov r1, #0x23 bl String_ctor @@ -6143,13 +6143,13 @@ _021DA430: blo _021DA40C _021DA452: add r0, sp, #0x20 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, sp, #0x20 - bl FUN_02019270 + bl PutWindowTilemap add r0, r4, #0 bl String_dtor add r0, sp, #0x20 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0x14] add r0, #0xc8 str r0, [sp, #0x14] @@ -6212,7 +6212,7 @@ _021DA4C2: ldr r0, [sp, #0x14] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r6, #0 mov r1, #0xf bl FillWindowPixelBuffer @@ -6230,11 +6230,11 @@ _021DA4C2: mov r1, #0 bl AddTextPrinterParameterized2 add r0, r6, #0 - bl FUN_02019270 + bl PutWindowTilemap add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow add r7, r7, #1 add r5, #0x10 add r4, r4, #4 @@ -6495,7 +6495,7 @@ MOD15_021DA710: ; 0x021DA710 mov r1, #1 mov r2, #3 mov r3, #2 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} thumb_func_start MOD15_021DA720 @@ -6545,7 +6545,7 @@ MOD15_021DA760: ; 0x021DA760 beq _021DA778 mov r0, #1 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 pop {r3, pc} _021DA778: @@ -6566,7 +6566,7 @@ MOD15_021DA77C: ; 0x021DA77C bl G2x_SetBlendAlpha_ mov r0, #1 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x7c str r0, [sp] mov r0, #0xc @@ -6607,7 +6607,7 @@ _021DA7DA: ldr r0, [r4, #0xc] mov r1, #1 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} .align 2, 0 @@ -6684,7 +6684,7 @@ MOD15_021DA828: ; 0x021DA828 add r1, #0x10 mov r2, #2 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized mov r3, #0 str r3, [sp] mov r1, #0xc @@ -6698,7 +6698,7 @@ MOD15_021DA828: ; 0x021DA828 ldr r0, [r4, #0xc] add r1, #0x20 mov r2, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [r4, #0x30] str r0, [r4, #0x34] @@ -6734,10 +6734,10 @@ _021DA8C6: _021DA8D0: add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -6754,7 +6754,7 @@ MOD15_021DA8E8: ; 0x021DA8E8 mov r1, #0x20 mov r2, #0 mov r3, #0x23 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -6765,25 +6765,25 @@ MOD15_021DA8E8: ; 0x021DA8E8 add r0, r4, #0 mov r1, #2 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r5, #0 add r0, #0x10 mov r1, #0 bl FillWindowPixelBuffer add r0, r5, #0 add r0, #0x10 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD15_021DA950 mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -6885,7 +6885,7 @@ _021DAA12: _021DAA18: add r6, #0x10 add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6903,7 +6903,7 @@ MOD15_021DAA24: ; 0x021DAA24 bl G2x_SetBlendAlpha_ mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer ldr r1, _021DAAC0 ; =0x04000048 ldr r0, _021DAAC4 ; =0xFFFFC0FF ldrh r2, [r1] @@ -7027,7 +7027,7 @@ MOD15_021DAB18: ; 0x021DAB18 beq _021DAB74 mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, _021DAB78 ; =0x0400004A ldrh r2, [r0] mov r0, #0x3f @@ -7210,7 +7210,7 @@ _021DAC84: str r0, [r1] add r0, r7, #0 add r0, #0x10 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [sp, #8] mov r2, #2 str r0, [sp] @@ -7337,7 +7337,7 @@ MOD15_021DAD78: ; 0x021DAD78 ldr r0, [r0, #0xc] mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} .align 2, 0 @@ -7531,7 +7531,7 @@ MOD15_021DAEB4: ; 0x021DAEB4 ldr r0, [r4, #0xc] mov r1, #4 add r3, r2, #0 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r2, #0xb mov r0, #0xa5 lsl r0, r0, #2 @@ -7549,7 +7549,7 @@ MOD15_021DAEB4: ; 0x021DAEB4 mov r1, #4 mov r2, #3 mov r3, #0xe - bl FUN_02018170 + bl CopyToBgTilemapRect b _021DAF92 _021DAF4A: mov r2, #0xb @@ -7568,7 +7568,7 @@ _021DAF4A: ldr r0, [r4, #0xc] mov r1, #4 add r3, r2, #0 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r2, #0xb ldr r0, _021DAFA8 ; =0x00000462 str r2, [sp] @@ -7585,13 +7585,13 @@ _021DAF4A: mov r1, #4 mov r2, #3 mov r3, #0xe - bl FUN_02018170 + bl CopyToBgTilemapRect _021DAF92: add r0, r4, #0 bl MOD15_021DB154 ldr r0, [r4, #0xc] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x1c pop {r3, r4, pc} .align 2, 0 @@ -7732,7 +7732,7 @@ MOD15_021DAFF8: ; 0x021DAFF8 ldr r0, [r5, #0xc] ldr r3, [r3, #0x10] mov r1, #4 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #8] bl FreeToHeap _021DB0D4: @@ -8105,7 +8105,7 @@ _021DB390: lsl r3, r3, #0x18 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r3, [r4] mov r2, #0xb add r0, r3, #0 @@ -8131,11 +8131,11 @@ _021DB390: lsl r3, r3, #0x18 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, [r4] mov r1, #4 ldr r0, [r0, #0xc] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrh r0, [r4, #0xa] add sp, #0x1c add r0, r0, #1 @@ -8176,11 +8176,11 @@ _021DB416: lsl r3, r3, #0x18 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, [r4] mov r1, #4 ldr r0, [r0, #0xc] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 strh r0, [r4, #8] ldrh r0, [r4, #0xa] @@ -8223,11 +8223,11 @@ _021DB476: lsl r3, r3, #0x18 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, [r4] mov r1, #4 ldr r0, [r0, #0xc] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r4, #4] add sp, #0x1c add r0, r0, #1 @@ -8322,14 +8322,14 @@ MOD15_021DB564: ; 0x021DB564 bne _021DB57E add r0, r1, #0 add r1, r2, #0 - bl FUN_02017B48 + bl Bg_GetXpos str r0, [r4, #0xc] mov r0, #0 b _021DB58A _021DB57E: add r0, r1, #0 add r1, r2, #0 - bl FUN_02017B54 + bl Bg_GetYpos str r0, [r4, #0xc] mov r0, #3 _021DB58A: @@ -8416,7 +8416,7 @@ MOD15_021DB604: ; 0x021DB604 lsr r1, r1, #0x18 lsr r2, r2, #0x18 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldrh r0, [r4, #0x18] sub r0, r0, #1 strh r0, [r4, #0x18] @@ -8430,7 +8430,7 @@ _021DB632: ldr r3, [r4, #0x10] lsr r1, r1, #0x18 lsr r2, r2, #0x18 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} thumb_func_start MOD15_021DB648 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index e9eedca1..480aa929 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -16,7 +16,7 @@ MOD16_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x25 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #4 mov r2, #0x25 @@ -168,7 +168,7 @@ _021D7630: add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x25 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 mov r1, #0x7f bl FUN_020051EC @@ -1065,7 +1065,7 @@ MOD16_021D7CC8: ; 0x021D7CC8 lsl r1, r1, #0x18 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r1, [r5, #0x14] ldr r6, [r5, #0x1c] add r0, r1, #0 @@ -1106,7 +1106,7 @@ MOD16_021D7CC8: ; 0x021D7CC8 lsl r1, r1, #0x18 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_02018170 + bl CopyToBgTilemapRect _021D7D4C: mov r0, #0x20 sub r3, r0, r4 @@ -1130,13 +1130,13 @@ _021D7D4C: ldr r0, [r5] lsr r1, r1, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect _021D7D7C: ldr r1, [r5, #8] ldr r0, [r5] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x1c] add sp, #0x1c add r0, r0, #1 @@ -2153,7 +2153,7 @@ MOD16_021D8534: ; 0x021D8534 lsl r1, r1, #2 str r0, [r5, r1] add r0, r4, #0 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5] mov r1, #1 mov r0, #0 @@ -2162,7 +2162,7 @@ MOD16_021D8534: ; 0x021D8534 str r1, [sp, #0x18] str r1, [sp, #0x1c] add r0, sp, #0x10 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r5] add r1, r4, #0 bl MOD16_021D8DC0 @@ -2330,7 +2330,7 @@ MOD16_021D86DC: ; 0x021D86DC push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates mov r0, #0x55 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3198,7 +3198,7 @@ _021D8CDC: ldr r2, [r2, #0x14] lsr r1, r1, #0x18 add r3, r4, #0 - bl FUN_02017E14 + bl BG_LoadCharTilesData _021D8CF0: add r0, r7, #0 bl FreeToHeap @@ -3335,15 +3335,15 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D8F18 ; =0x021FF4F4 add r3, sp, #0x70 ldmia r6!, {r0, r1} @@ -3358,18 +3358,18 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -3387,15 +3387,15 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D8F20 ; =0x021FF4BC add r3, sp, #0x38 ldmia r6!, {r0, r1} @@ -3410,15 +3410,15 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #5 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D8F24 ; =0x021FF4A0 add r3, sp, #0x1c ldmia r6!, {r0, r1} @@ -3433,15 +3433,15 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #6 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D8F28 ; =0x021FF52C add r3, sp, #0 ldmia r6!, {r0, r1} @@ -3456,15 +3456,15 @@ MOD16_021D8DC0: ; 0x021D8DC0 str r0, [r3] add r0, r5, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #7 mov r1, #0x40 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0xa8 pop {r4, r5, r6, pc} .align 2, 0 @@ -3481,22 +3481,22 @@ MOD16_021D8F2C: ; 0x021D8F2C push {r4, lr} add r4, r0, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD16_021D8F2C @@ -3515,7 +3515,7 @@ MOD16_021D8F60: ; 0x021D8F60 ldr r0, [r4] add r1, r4, #4 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #4 mov r1, #0 bl FillWindowPixelBuffer @@ -3531,7 +3531,7 @@ MOD16_021D8F90: ; 0x021D8F90 add r0, r0, #4 bx r3 nop -_021D8F98: .word FUN_02019178 +_021D8F98: .word RemoveWindow thumb_func_end MOD16_021D8F90 thumb_func_start MOD16_021D8F9C @@ -8445,7 +8445,7 @@ MOD16_021DB388: ; 0x021DB388 add r1, r7, #0 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner add r0, r7, #0 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -8457,7 +8457,7 @@ MOD16_021DB3BC: ; 0x021DB3BC mov r1, #1 bx r3 nop -_021DB3C4: .word FUN_020191A4 +_021DB3C4: .word WindowArray_dtor thumb_func_end MOD16_021DB3BC thumb_func_start MOD16_021DB3C8 @@ -11072,7 +11072,7 @@ MOD16_021DC598: ; 0x021DC598 beq _021DC5B4 bl MOD16_021DD9C8 ldr r0, _021DC618 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, r5, r6, pc} _021DC5B4: @@ -11082,7 +11082,7 @@ _021DC5B4: add r1, r4, #0 bl MOD16_021DDAB4 ldr r0, _021DC618 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, r5, r6, pc} _021DC5CA: @@ -11101,7 +11101,7 @@ _021DC5CA: add r1, r5, #0 bl MOD16_021DD9E0 ldr r0, _021DC618 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, r5, r6, pc} _021DC5F6: @@ -11429,7 +11429,7 @@ MOD16_021DC860: ; 0x021DC860 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r5] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -11454,12 +11454,12 @@ MOD16_021DC860: ; 0x021DC860 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r5] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021DC860 @@ -11607,7 +11607,7 @@ MOD16_021DC958: ; 0x021DC958 bl DestroyMsgData ldr r0, [r5] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -11669,7 +11669,7 @@ MOD16_021DCA2C: ; 0x021DCA2C bl DestroyMsgData ldr r0, [r5] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -13026,7 +13026,7 @@ MOD16_021DD530: ; 0x021DD530 add r5, r2, #0 str r1, [sp, #0x18] add r4, r3, #0 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x10] cmp r0, #0 bne _021DD576 @@ -13043,7 +13043,7 @@ MOD16_021DD530: ; 0x021DD530 str r4, [sp, #0x1c] mov r7, #0xe mov r5, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021DD594 _021DD568: mov r0, #3 @@ -13130,7 +13130,7 @@ _021DD5FE: mov r1, #1 ldr r0, [r0] mov r2, #3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _021DD60A: add r0, r6, #0 pop {r4, r5, r6, pc} @@ -13150,7 +13150,7 @@ MOD16_021DD610: ; 0x021DD610 ldr r0, [r0] mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021DD62A: mov r2, #1 lsl r2, r2, #0x1a @@ -13354,7 +13354,7 @@ _021DD77E: ldr r0, [r5] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit _021DD7B0: add r0, r5, #0 add r1, r4, #0 @@ -13509,7 +13509,7 @@ _021DD8A8: ldr r0, [r5] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit b _021DD8F6 _021DD8E0: add r0, r7, #0 @@ -13688,7 +13688,7 @@ MOD16_021DD9F8: ; 0x021DD9F8 mov r1, #2 str r1, [r0, #0x20] ldr r0, _021DDA28 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021DDA24: @@ -13731,7 +13731,7 @@ _021DDA54: add r1, r4, #0 bl MOD16_021D9CEC ldr r0, _021DDAB0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -13832,7 +13832,7 @@ MOD16_021DDB0C: ; 0x021DDB0C mov r0, #1 str r0, [r4, #0x20] ldr r0, _021DDB54 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021DDB3C: mov r0, #0 @@ -13873,7 +13873,7 @@ MOD16_021DDB58: ; 0x021DDB58 mov r0, #1 str r0, [r4, #0x20] ldr r0, _021DDC28 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021DDB8C: add r0, r4, #0 @@ -13898,7 +13898,7 @@ _021DDB9A: mov r0, #1 str r0, [r4, #0x20] ldr r0, _021DDC28 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021DDBC2: add r0, r4, #0 @@ -14753,7 +14753,7 @@ MOD16_021DE1E0: ; 0x021DE1E0 bl MOD16_021DE594 mov r0, #7 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD16_021DE1E0 @@ -14774,7 +14774,7 @@ MOD16_021DE228: ; 0x021DE228 bl MOD16_021DE808 mov r0, #7 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority pop {r4, r5, r6, pc} thumb_func_end MOD16_021DE228 @@ -14854,12 +14854,12 @@ _021DE2AC: lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r6, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap add r0, r6, #0 mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -15438,23 +15438,23 @@ MOD16_021DE788: ; 0x021DE788 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r4, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap add r0, r4, #0 mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r2, #0 add r3, r2, #0 add r0, r4, #0 mov r1, #7 sub r3, #0x78 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #7 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -15469,10 +15469,10 @@ MOD16_021DE808: ; 0x021DE808 mov r0, #7 mov r1, #0x40 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r4, pc} thumb_func_end MOD16_021DE808 @@ -15502,7 +15502,7 @@ _021DE84C: lsl r1, r1, #6 str r1, [r0, #0xc] ldr r0, _021DE89C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE b _021DE860 _021DE85C: mov r0, #0 @@ -15606,19 +15606,19 @@ MOD16_021DE8D0: ; 0x021DE8D0 mov r1, #7 add r2, r6, #0 lsr r3, r3, #0x10 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #9 mov r3, #0x80 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #0xc mov r3, #0x68 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldrh r0, [r5, #0x28] strh r0, [r5, #0x2a] pop {r4, r5, r6, pc} @@ -15658,19 +15658,19 @@ _021DE95E: mov r1, #7 mov r2, #0 lsr r3, r3, #0x10 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #9 mov r3, #0x80 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #0xc mov r3, #0x68 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldr r0, [r7, #0x1c] ldr r0, [r0, #0xc] cmp r0, #0 @@ -16364,7 +16364,7 @@ _021DEDF2: mov r0, #0x20 str r0, [r4, #0x34] ldr r0, _021DEEA0 ; =0x000005FF - bl FUN_020054C8 + bl PlaySE b _021DEE9A _021DEE10: ldr r0, [r4, #0x34] @@ -16645,11 +16645,11 @@ MOD16_021DEFF8: ; 0x021DEFF8 ldr r0, [r0] add r4, r2, #0 ldr r6, [sp, #0x18] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r5] mov r1, #0 add r0, r0, #4 @@ -16657,7 +16657,7 @@ MOD16_021DEFF8: ; 0x021DEFF8 ldr r0, [r5] mov r1, #7 add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum add r0, r5, #0 bl MOD16_021DF17C add r0, r5, #0 @@ -16710,10 +16710,10 @@ MOD16_021DEFF8: ; 0x021DEFF8 bl MOD16_021DF7C8 mov r0, #1 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end MOD16_021DEFF8 @@ -16733,7 +16733,7 @@ MOD16_021DF0BC: ; 0x021DF0BC ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] mov r1, #0 add r0, r0, #4 @@ -16741,13 +16741,13 @@ MOD16_021DF0BC: ; 0x021DF0BC ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD16_021DF0BC @@ -17304,7 +17304,7 @@ MOD16_021DF514: ; 0x021DF514 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [sp, #0x10] bl FreeToHeap cmp r7, #3 @@ -17361,13 +17361,13 @@ _021DF584: str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD16_021DF514 @@ -17855,7 +17855,7 @@ _021DF92E: bl FillWindowPixelBuffer ldr r0, [r4] add r0, r0, #4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021DF94C: ldr r2, [r6, #0x34] mov r1, #4 @@ -17903,10 +17903,10 @@ MOD16_021DF970: ; 0x021DF970 bl String_dtor mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -17921,10 +17921,10 @@ MOD16_021DF9C0: ; 0x021DF9C0 add r4, r1, #0 add r1, r0, #0 add r6, r2, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r5] mov r1, #0 add r0, r0, #4 @@ -18761,13 +18761,13 @@ MOD16_021DFFE0: ; 0x021DFFE0 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -24474,7 +24474,7 @@ _021E28EA: mov r1, #0 bl MOD16_021DEC40 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2982 _021E28FA: ldr r0, [r4, #8] @@ -24485,7 +24485,7 @@ _021E28FA: mov r1, #0 bl MOD16_021DEBA4 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2982 _021E2914: ldr r0, [r4, #8] @@ -24496,7 +24496,7 @@ _021E2914: mov r1, #1 bl MOD16_021DEBA4 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2982 _021E292E: ldr r0, [r4, #8] @@ -24507,7 +24507,7 @@ _021E292E: mov r1, #2 bl MOD16_021DEBA4 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 add r0, #0x88 @@ -24522,7 +24522,7 @@ _021E2950: mov r1, #3 bl MOD16_021DEBA4 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2982 _021E296A: add r0, r5, #0 @@ -24534,7 +24534,7 @@ _021E296A: mov r1, #1 bl MOD16_021DEC40 ldr r0, _021E298C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E2982: ldr r0, _021E2990 ; =0x0000FFFF add r5, #0x80 @@ -24593,7 +24593,7 @@ _021E29D2: cmp r4, r0 beq _021E29EE ldr r0, _021E29F8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r6, #8] add r1, r4, #0 bl MOD16_021DEBC0 @@ -24671,7 +24671,7 @@ _021E2A56: cmp r4, r0 beq _021E2A72 ldr r0, _021E2A7C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r6, #8] add r1, r4, #0 bl MOD16_021DEBDC @@ -24747,7 +24747,7 @@ _021E2ADE: mov r0, #1 str r0, [r5, #0x20] ldr r0, _021E2B00 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E2AE8: cmp r4, #0x64 beq _021E2AF6 @@ -24823,7 +24823,7 @@ _021E2B5C: mov r0, #0 str r0, [r5, #0x20] ldr r0, _021E2B7C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E2B66: cmp r4, #0x64 beq _021E2B74 @@ -24884,7 +24884,7 @@ MOD16_021E2B84: ; 0x021E2B84 add r0, r2, r1 str r0, [r5] ldr r0, _021E2C24 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E2BE4: mov r1, #0 @@ -24896,7 +24896,7 @@ _021E2BE4: mov r2, #0 bl MOD16_021DEBF8 ldr r0, _021E2C24 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021E2C1A _021E2C00: mov r1, #1 @@ -24908,7 +24908,7 @@ _021E2C00: mov r2, #1 bl MOD16_021DEBF8 ldr r0, _021E2C24 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E2C1A: mov r0, #0 add r5, #0x88 @@ -25003,7 +25003,7 @@ _021E2C9C: cmp r4, r0 beq _021E2CB8 ldr r0, _021E2CC0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r6, #8] add r1, r4, #0 bl MOD16_021DEC24 @@ -25958,7 +25958,7 @@ MOD16_021E3348: ; 0x021E3348 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r7, #0 bl FreeToHeap ldr r1, [r6] @@ -25989,7 +25989,7 @@ MOD16_021E3348: ; 0x021E3348 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r7, #0 bl FreeToHeap _021E33E6: @@ -26021,7 +26021,7 @@ _021E33E6: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r7, #0 bl FreeToHeap _021E342A: @@ -26053,7 +26053,7 @@ _021E342A: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r7, #0 bl FreeToHeap _021E346E: @@ -26085,14 +26085,14 @@ _021E346E: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap _021E34B2: ldr r0, [r5] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -26968,7 +26968,7 @@ MOD16_021E3B70: ; 0x021E3B70 ldr r0, [r4] mov r1, #8 add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum add sp, #4 pop {r3, r4, r5, r6, pc} nop @@ -26989,7 +26989,7 @@ MOD16_021E3BC8: ; 0x021E3BC8 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021E3C10 ; =0x000007F4 ldr r0, [r5, r0] bl FreeToHeap @@ -27008,7 +27008,7 @@ MOD16_021E3BC8: ; 0x021E3BC8 str r1, [r5, r0] ldr r0, [r4] add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum pop {r3, r4, r5, pc} .align 2, 0 _021E3C10: .word 0x000007F4 @@ -28428,13 +28428,13 @@ MOD16_021E4634: ; 0x021E4634 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -28792,7 +28792,7 @@ MOD16_021E4938: ; 0x021E4938 cmp r1, #0 bne _021E495C ldr r0, _021E4960 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r4, #0x20] ldr r0, _021E4964 ; =gMain + 0x40 @@ -29605,7 +29605,7 @@ MOD16_021E4EE4: ; 0x021E4EE4 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD16_021E4EE4 @@ -29649,7 +29649,7 @@ MOD16_021E4F1C: ; 0x021E4F1C str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -29674,7 +29674,7 @@ MOD16_021E4F1C: ; 0x021E4F1C str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -29700,7 +29700,7 @@ MOD16_021E4F1C: ; 0x021E4F1C str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -29726,13 +29726,13 @@ MOD16_021E4F1C: ; 0x021E4F1C str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -31637,7 +31637,7 @@ _021E5E30: mov r0, #1 str r0, [r5, #4] ldr r0, _021E5ED0 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -31837,13 +31837,13 @@ MOD16_021E5FA4: ; 0x021E5FA4 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -34314,7 +34314,7 @@ MOD16_021E71A8: ; 0x021E71A8 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} thumb_func_end MOD16_021E71A8 @@ -34357,7 +34357,7 @@ MOD16_021E71D0: ; 0x021E71D0 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -34382,7 +34382,7 @@ MOD16_021E71D0: ; 0x021E71D0 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -34408,7 +34408,7 @@ MOD16_021E71D0: ; 0x021E71D0 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -34434,13 +34434,13 @@ MOD16_021E71D0: ; 0x021E71D0 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -36326,7 +36326,7 @@ _021E80FA: mov r3, #0 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E8112: ldr r1, [r4, #0x38] @@ -36355,7 +36355,7 @@ _021E8132: mov r3, #1 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E814A: ldr r1, [r4, #0x38] @@ -36381,7 +36381,7 @@ _021E8168: mov r3, #2 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E8180: ldr r1, [r4, #0x38] @@ -36407,7 +36407,7 @@ _021E819E: mov r3, #3 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E81B6: ldr r1, [r4, #0x38] @@ -36433,7 +36433,7 @@ _021E81D4: mov r3, #4 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021E81EC: ldr r1, [r4, #0x38] @@ -36459,7 +36459,7 @@ _021E820A: mov r3, #5 bl MOD16_021E89D4 ldr r0, _021E8224 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE _021E8220: pop {r3, r4, r5, pc} nop @@ -36577,7 +36577,7 @@ MOD16_021E82B8: ; 0x021E82B8 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -36603,7 +36603,7 @@ MOD16_021E82B8: ; 0x021E82B8 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -36629,13 +36629,13 @@ MOD16_021E82B8: ; 0x021E82B8 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -37558,7 +37558,7 @@ _021E8A9A: add r1, r4, #0 bl MOD16_021E8B7C ldr r0, _021E8AB8 ; =0x0000068B - bl FUN_020054C8 + bl PlaySE _021E8AB6: pop {r3, r4, r5, pc} .align 2, 0 @@ -38663,7 +38663,7 @@ MOD16_021E92D0: ; 0x021E92D0 ldr r0, [r5] mov r1, #2 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD16_021E92D0 @@ -38728,13 +38728,13 @@ _021E932E: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #2 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021E92F8 @@ -39650,7 +39650,7 @@ _021E9A12: add r0, r4, #0 bl MOD16_021E9014 ldr r0, _021E9AF8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A20: ldr r2, [r4, #8] @@ -39663,7 +39663,7 @@ _021E9A20: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A3E: ldr r2, [r4, #8] @@ -39676,7 +39676,7 @@ _021E9A3E: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A5C: ldr r2, [r4, #8] @@ -39689,7 +39689,7 @@ _021E9A5C: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A7A: ldr r2, [r4, #8] @@ -39704,7 +39704,7 @@ _021E9A7A: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9A9C: ldr r0, [r5, #0x10] @@ -39714,7 +39714,7 @@ _021E9A9C: cmp r0, #2 beq _021E9AAE ldr r0, _021E9AF8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E9AAE: mov r0, #1 str r0, [r5, #0x10] @@ -39732,7 +39732,7 @@ _021E9AB4: add r1, r6, #0 bl MOD16_021EA08C ldr r0, _021E9AFC ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9AD6: ldr r0, [r5, #0x10] @@ -39746,7 +39746,7 @@ _021E9AD6: cmp r0, #2 beq _021E9AF2 ldr r0, _021E9AF8 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E9AF2: mov r0, #0 str r0, [r5, #0x10] @@ -39800,7 +39800,7 @@ MOD16_021E9B3C: ; 0x021E9B3C ldr r0, [r4] mov r1, #5 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r3, r4, r5, pc} thumb_func_end MOD16_021E9B3C @@ -39868,13 +39868,13 @@ _021E9B9E: str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #5 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021E9B60 @@ -40205,7 +40205,7 @@ MOD16_021E9E34: ; 0x021E9E34 mov r0, #1 str r0, [r5, #0x2c] ldr r0, _021E9E60 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E9E58: pop {r3, r4, r5, pc} nop @@ -40390,7 +40390,7 @@ _021E9FAC: mov r0, #2 str r0, [r4, #0xc] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9FC6: ldr r2, [r5, #8] @@ -40402,7 +40402,7 @@ _021E9FC6: mov r0, #2 str r0, [r4, #0x10] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9FE0: ldr r2, [r5, #8] @@ -40414,7 +40414,7 @@ _021E9FE0: mov r0, #2 str r0, [r4, #0x14] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021E9FFA: ldr r2, [r5, #8] @@ -40428,14 +40428,14 @@ _021E9FFA: mov r0, #2 str r0, [r4, #0x18] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021EA018: ldr r0, [r5, #8] cmp r0, #2 beq _021EA066 ldr r0, _021EA070 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021EA026: ldr r2, [r5, #8] @@ -40449,14 +40449,14 @@ _021EA026: mov r0, #2 str r0, [r4, #0x1c] ldr r0, _021EA06C ; =0x0000068B - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021EA044: ldr r0, [r5, #8] cmp r0, #2 beq _021EA066 ldr r0, _021EA070 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _021EA052: add r0, r5, #0 @@ -40466,7 +40466,7 @@ _021EA052: mov r0, #2 str r0, [r4, #0x20] ldr r0, _021EA070 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021EA066: pop {r4, r5, r6, pc} .align 2, 0 @@ -41560,13 +41560,13 @@ MOD16_021EA7F0: ; 0x021EA7F0 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -41582,7 +41582,7 @@ MOD16_021EA858: ; 0x021EA858 ldr r0, [r0] mov r1, #1 add r3, r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r1, #0 mov r0, #1 lsl r0, r0, #8 @@ -41597,11 +41597,11 @@ MOD16_021EA858: ; 0x021EA858 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] mov r1, #0 add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum add sp, #8 pop {r4, pc} thumb_func_end MOD16_021EA858 @@ -42135,10 +42135,10 @@ _021EAC8A: ldr r3, [r5, r3] mov r1, #1 mov r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4] add r0, r0, #4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xcb ldr r1, [r6, #4] lsl r0, r0, #2 @@ -42156,7 +42156,7 @@ MOD16_021EACB0: ; 0x021EACB0 ldr r0, [r4] mov r1, #9 add r0, r0, #4 - bl FUN_0201AB24 + bl SetWindowPaletteNum mov r0, #0xca mov r2, #0x97 lsl r0, r0, #2 @@ -43255,7 +43255,7 @@ _021EB4DC: eor r1, r2 bl MOD16_021EC060 ldr r0, _021EB4F4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021EB4F0: pop {r3, r4, r5, r6, r7, pc} nop @@ -43352,7 +43352,7 @@ _021EB57A: ldrh r0, [r1, #0x1c] str r0, [r4, #0x38] ldr r0, _021EB640 ; =0x000005F7 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _021EB5A2: mov r0, #0xb @@ -43364,7 +43364,7 @@ _021EB5A2: ldrh r0, [r1, #0x1c] str r0, [r4, #0x38] ldr r0, _021EB640 ; =0x000005F7 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _021EB5BA: ldr r0, [r4, #0x4c] @@ -43594,13 +43594,13 @@ MOD16_021EB724: ; 0x021EB724 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap ldr r0, [r5] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5] mov r1, #0 str r1, [sp] @@ -43634,30 +43634,30 @@ MOD16_021EB724: ; 0x021EB724 str r0, [sp, #8] ldr r0, [r5] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #7 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5] mov r2, #0 add r3, r2, #0 ldr r0, [r0] mov r1, #7 sub r3, #0x30 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5] mov r2, #3 add r3, r2, #0 ldr r0, [r0] mov r1, #7 sub r3, #0x13 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #7 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021EB724 @@ -43669,14 +43669,14 @@ MOD16_021EB80C: ; 0x021EB80C ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4] mov r1, #7 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #7 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EB80C @@ -44241,7 +44241,7 @@ MOD16_021EBC98: ; 0x021EBC98 cmp r1, r0 beq _021EBCBE ldr r0, _021EBCC0 ; =0x000005F7 - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x5c] asr r0, r1, #1 lsr r0, r0, #0x1e @@ -44379,19 +44379,19 @@ _021EBD70: mov r1, #7 mov r2, #0 lsr r3, r3, #0x10 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #9 mov r3, #0x83 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos ldr r0, [r4] mov r1, #7 ldr r0, [r0] mov r2, #0xc mov r3, #0x63 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos str r6, [r5, #0x48] pop {r4, r5, r6, pc} thumb_func_end MOD16_021EBD58 @@ -45517,7 +45517,7 @@ MOD16_021EC574: ; 0x021EC574 ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 bl MOD16_021ECA2C pop {r3, r4, r5, pc} @@ -45562,13 +45562,13 @@ MOD16_021EC5A8: ; 0x021EC5A8 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -46884,7 +46884,7 @@ _021ED006: cmp r0, #0 beq _021ED03C ldr r0, _021ED040 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r4, #4] ldr r2, [r4] @@ -46898,7 +46898,7 @@ _021ED022: cmp r0, #1 beq _021ED03C ldr r0, _021ED040 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r4, #4] ldr r2, [r4] @@ -47021,13 +47021,13 @@ MOD16_021ED0D0: ; 0x021ED0D0 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -47524,7 +47524,7 @@ _021ED4EC: str r1, [r0, #0x14] _021ED4FA: ldr r0, _021ED508 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021ED500: pop {r3, pc} nop @@ -48269,7 +48269,7 @@ MOD16_021EDA3C: ; 0x021EDA3C ldr r0, [r4] mov r1, #1 ldr r0, [r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0xc] mov r1, #0 bl FUN_02013EB0 @@ -48319,13 +48319,13 @@ MOD16_021EDA7C: ; 0x021EDA7C str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -50510,13 +50510,13 @@ MOD16_021EEB50: ; 0x021EEB50 str r0, [sp, #8] ldr r0, [r4] ldr r0, [r0] - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -51352,20 +51352,20 @@ MOD16_021EF218: ; 0x021EF218 mov r1, #1 str r0, [r2] add r0, r5, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 mov r1, #1 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r3, _021EF2F4 ; =0x021FF770 add r2, sp, #0x1c ldmia r3!, {r0, r1} @@ -51378,29 +51378,29 @@ MOD16_021EF218: ; 0x021EF218 mov r1, #2 str r0, [r2] add r0, r5, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 mov r1, #2 add r2, sp, #0x1c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers add r0, r5, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r3, _021EF2F8 ; =0x021FF7A8 add r2, sp, #0 ldmia r3!, {r0, r1} @@ -51413,20 +51413,20 @@ MOD16_021EF218: ; 0x021EF218 mov r1, #3 str r0, [r2] add r0, r5, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 mov r1, #3 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x54 pop {r4, r5, pc} .align 2, 0 @@ -51440,13 +51440,13 @@ MOD16_021EF2FC: ; 0x021EF2FC push {r4, lr} add r4, r0, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD16_021EF2FC @@ -51470,7 +51470,7 @@ MOD16_021EF318: ; 0x021EF318 add r1, r4, #0 mov r2, #1 str r3, [sp, #0x10] - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -51486,12 +51486,12 @@ MOD16_021EF318: ; 0x021EF318 MOD16_021EF358: ; 0x021EF358 push {r4, lr} add r4, r0, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor pop {r4, pc} thumb_func_end MOD16_021EF358 @@ -52092,7 +52092,7 @@ MOD16_021EF790: ; 0x021EF790 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r5, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -52116,7 +52116,7 @@ MOD16_021EF790: ; 0x021EF790 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r5, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -52141,7 +52141,7 @@ MOD16_021EF790: ; 0x021EF790 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r5, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r6, #0 bl FreeToHeap str r4, [sp] @@ -52166,12 +52166,12 @@ MOD16_021EF790: ; 0x021EF790 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r5, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap add r0, r5, #0 mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD16_021EF790 @@ -52214,12 +52214,12 @@ MOD16_021EF8A8: ; 0x021EF8A8 lsr r0, r0, #0x18 str r0, [sp, #8] add r0, r4, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 bl FreeToHeap add r0, r4, #0 mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 955741b3..7e32e1c9 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -464,7 +464,7 @@ MOD17_021D77D4: ; 0x021D77D4 add r0, r4, #0 bl MOD17_021D80CC mov r0, #0xe - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x38] add r0, r4, #0 bl MOD17_021D7F34 @@ -860,7 +860,7 @@ MOD17_021D7AE4: ; 0x021D7AE4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x38] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r0, [r4, #0x20] bl FUN_020081C4 bl FUN_02009F80 @@ -973,20 +973,20 @@ MOD17_021D7B94: ; 0x021D7B94 mov r1, #2 str r0, [r2] ldr r0, [r5, #0x38] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0x38] mov r1, #2 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r5, #0x38] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x1c pop {r4, r5, pc} nop @@ -1016,12 +1016,12 @@ MOD17_021D7BE4: ; 0x021D7BE4 thumb_func_start MOD17_021D7C10 MOD17_021D7C10: ; 0x021D7C10 - ldr r3, _021D7C18 ; =FUN_020178A0 + ldr r3, _021D7C18 ; =FreeBgTilemapBuffer ldr r0, [r0, #0x38] mov r1, #2 bx r3 .align 2, 0 -_021D7C18: .word FUN_020178A0 +_021D7C18: .word FreeBgTilemapBuffer thumb_func_end MOD17_021D7C10 thumb_func_start MOD17_021D7C1C @@ -1112,7 +1112,7 @@ MOD17_021D7CC0: ; 0x021D7CC0 add r4, r0, #0 bl MOD17_021D80CC mov r0, #0xe - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x38] add r0, r4, #0 bl MOD17_021D7F34 @@ -1136,7 +1136,7 @@ MOD17_021D7CD8: ; 0x021D7CD8 MOD17_021D7CF0: ; 0x021D7CF0 push {r3, lr} ldr r0, [r0, #0x38] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_02009F80 pop {r3, pc} .align 2, 0 @@ -1244,7 +1244,7 @@ MOD17_021D7DB0: ; 0x021D7DB0 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -1466,15 +1466,15 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D8048 ; =0x021DE2BC add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -1489,15 +1489,15 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D804C ; =0x021DE2F4 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -1512,15 +1512,15 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D8050 ; =0x021DE284 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -1535,15 +1535,15 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D8054 ; =0x021DE310 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -1558,15 +1558,15 @@ MOD17_021D7F34: ; 0x021D7F34 str r0, [r3] ldr r0, [r4, #0x38] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #5 mov r1, #0x20 mov r2, #0 mov r3, #0xe - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #0x38] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x8c pop {r4, r5, pc} nop @@ -1583,19 +1583,19 @@ MOD17_021D8058: ; 0x021D8058 add r4, r0, #0 ldr r0, [r4, #0x38] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x38] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x38] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x38] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD17_021D8058 @@ -2042,12 +2042,12 @@ MOD17_021D83E4: ; 0x021D83E4 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D84D8 ; =0x000006D8 add r0, r4, #0 mov r2, #0xd @@ -2472,7 +2472,7 @@ _021D8780: ldr r0, _021D8810 ; =0x000006A8 mov r1, #1 ldr r0, [r4, r0] - bl FUN_020191A4 + bl WindowArray_dtor add r0, r4, #0 bl MOD17_021D92AC ldr r0, _021D8814 ; =0x0000048C @@ -2511,9 +2511,9 @@ _021D87F0: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0xd - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xe - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} nop @@ -2532,12 +2532,12 @@ MOD17_021D8818: ; 0x021D8818 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D897C ; =0x000006D8 add r0, r5, #0 mov r2, #0xd @@ -2878,7 +2878,7 @@ _021D8B04: _021D8B0A: bl MOD17_021D9800 ldr r0, _021D8C7C ; =0x00000643 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2947,7 +2947,7 @@ _021D8B86: str r0, [r4] mov r0, #0x1a lsl r0, r0, #6 - bl FUN_020054C8 + bl PlaySE _021D8B9E: ldr r0, _021D8C90 ; =0x0000048C add r0, r5, r0 @@ -2970,7 +2970,7 @@ _021D8BBC: str r0, [r4] mov r0, #0x1a lsl r0, r0, #6 - bl FUN_020054C8 + bl PlaySE _021D8BD4: add r0, r5, #0 bl MOD17_021D9BE8 @@ -3009,7 +3009,7 @@ _021D8C04: add r3, r6, #0 bl FUN_0200E1D0 ldr r0, _021D8C94 ; =0x00000684 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3080,7 +3080,7 @@ MOD17_021D8C9C: ; 0x021D8C9C ldr r0, _021D8D58 ; =0x000006A8 mov r1, #1 ldr r0, [r4, r0] - bl FUN_020191A4 + bl WindowArray_dtor add r0, r4, #0 bl MOD17_021D92AC ldr r0, _021D8D5C ; =0x0000048C @@ -3119,9 +3119,9 @@ _021D8D30: add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0xd - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xe - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 bl FUN_02033ED0 mov r0, #1 @@ -3428,7 +3428,7 @@ MOD17_021D8F64: ; 0x021D8F64 ldr r0, [r4, #0x38] add r2, r1, #0 sub r3, #0x13 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 @@ -3993,7 +3993,7 @@ _021D93C4: ldr r0, [r0, #0x38] mov r2, #3 mov r3, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4] bl MOD17_021D9848 ldr r0, [r4, #0xc] @@ -4125,7 +4125,7 @@ _021D94B2: ldr r0, [r0, #0x38] mov r1, #1 sub r3, #0x2b - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4, #0xc] add sp, #4 add r0, r0, #1 @@ -4424,25 +4424,25 @@ _021D9728: ldr r0, [r0, #0x38] add r2, r1, #0 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5] mov r1, #1 ldr r0, [r0, #0x38] mov r2, #2 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5] mov r1, #2 ldr r0, [r0, #0x38] mov r2, #5 add r3, r6, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5] mov r1, #1 ldr r0, [r0, #0x38] mov r2, #5 add r3, r6, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _021D9766: ldr r0, [r5, #8] add r0, r0, #1 @@ -4462,17 +4462,17 @@ MOD17_021D9778: ; 0x021D9778 add r4, r0, #0 ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 ldr r0, [r4, #0x38] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 ldr r0, [r4, #0x38] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 mov r1, #0 bl MOD17_021D9B74 @@ -4524,7 +4524,7 @@ MOD17_021D9800: ; 0x021D9800 bl MOD17_021D9BCC ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 bl MOD17_021D8F64 mov r0, #0 @@ -4555,17 +4555,17 @@ MOD17_021D9848: ; 0x021D9848 add r4, r0, #0 ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #0 ldr r0, [r4, #0x38] mov r1, #3 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 ldr r0, [r4, #0x38] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x38] mov r1, #0x19 str r0, [sp] @@ -4624,7 +4624,7 @@ MOD17_021D98D0: ; 0x021D98D0 bl MOD17_021D9B6C ldr r0, [r4, #0x38] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r4, pc} .align 2, 0 _021D98EC: .word 0x000006A4 @@ -4687,7 +4687,7 @@ MOD17_021D9918: ; 0x021D9918 str r0, [sp, #0x10] ldr r0, [r5, #0x38] ldr r1, [r5, r1] - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _021D99D4 ; =0x000006A8 mov r1, #0xf ldr r0, [r5, r0] @@ -4903,10 +4903,10 @@ MOD17_021D9B30: ; 0x021D9B30 add r4, r0, #0 ldr r0, _021D9B48 ; =0x000006A8 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _021D9B48 ; =0x000006A8 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} nop _021D9B48: .word 0x000006A8 @@ -8146,7 +8146,7 @@ _021DB192: _021DB19A: lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD17_021DB680 _021DB1A8: @@ -8257,7 +8257,7 @@ _021DB220: ldrsh r0, [r4, r0] str r0, [sp, #8] ldr r0, _021DB394 ; =0x00000683 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0xc] ldr r2, _021DB398 ; =0x00000151 mov r1, #0x1a @@ -8283,7 +8283,7 @@ _021DB2AC: mov r0, #0 str r0, [r4, #0x30] ldr r0, _021DB39C ; =0x000005EA - bl FUN_020054C8 + bl PlaySE b _021DB388 _021DB2C2: ldr r0, [r4, #0x10] @@ -8340,7 +8340,7 @@ _021DB32C: str r0, [sp, #8] _021DB338: ldr r0, _021DB394 ; =0x00000683 - bl FUN_020054C8 + bl PlaySE b _021DB350 _021DB340: ldr r0, [r4, #0x10] @@ -8348,7 +8348,7 @@ _021DB340: add r2, sp, #8 bl MOD17_021DBBB8 ldr r0, _021DB3A0 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE _021DB350: add r0, r4, #0 add r0, #0x20 @@ -8431,7 +8431,7 @@ MOD17_021DB3D4: ; 0x021DB3D4 mov r0, #0 str r0, [r4, #0x30] ldr r0, _021DB400 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD17_021DB534 _021DB3FE: @@ -9758,7 +9758,7 @@ MOD17_021DBD4C: ; 0x021DBD4C ldr r0, [r4] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #0 mov r2, #0x2c @@ -9919,11 +9919,11 @@ _021DBE62: str r0, [r4, #0x40] ldr r0, [r6] ldr r1, [r6, #0x1c] - bl FUN_02017B48 + bl Bg_GetXpos str r0, [r4, #0x44] ldr r0, [r6] ldr r1, [r6, #0x1c] - bl FUN_02017B54 + bl Bg_GetYpos str r0, [r4, #0x48] mov r0, #0x80 str r0, [r5, #0x28] @@ -10076,7 +10076,7 @@ MOD17_021DBF94: ; 0x021DBF94 lsl r1, r1, #0x18 lsr r1, r1, #0x18 mov r2, #2 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r1, [r4] ldr r3, [r4, #0x40] ldr r0, [r1] @@ -10084,7 +10084,7 @@ MOD17_021DBF94: ; 0x021DBF94 mov r2, #5 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r3, r4, r5, pc} _021DBFC8: ldr r0, [r1] @@ -10093,7 +10093,7 @@ _021DBFC8: lsl r1, r1, #0x18 lsr r1, r1, #0x18 mov r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r1, [r4] ldr r3, [r4, #0x48] ldr r0, [r1] @@ -10101,7 +10101,7 @@ _021DBFC8: mov r2, #3 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r4] add r1, r4, #4 bl MOD17_021DBD04 @@ -10150,7 +10150,7 @@ MOD17_021DC004: ; 0x021DC004 lsr r1, r1, #0x18 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -10171,11 +10171,11 @@ MOD17_021DC004: ; 0x021DC004 lsr r1, r1, #0x18 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020186B4 + bl BgTilemapRectChangePalette lsl r1, r5, #0x18 add r0, r7, #0 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r4, r5, r6, r7, pc} thumb_func_end MOD17_021DC004 @@ -10278,7 +10278,7 @@ MOD17_021DC11C: ; 0x021DC11C ldr r0, [r4] ldr r3, [r3, #0x10] lsr r1, r1, #0x18 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0 bl FUN_0200CAB4 ldr r0, [r4, #8] @@ -10466,7 +10466,7 @@ _021DC28C: add r0, r5, #0 bl MOD17_021DC2F8 ldr r0, _021DC2BC ; =0x0000067D - bl FUN_020054C8 + bl PlaySE b _021DC2B0 _021DC29E: cmp r6, #2 @@ -11241,7 +11241,7 @@ MOD17_021DC870: ; 0x021DC870 bne _021DC87E lsl r0, r1, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021DC87E: pop {r3, pc} thumb_func_end MOD17_021DC870 @@ -11279,7 +11279,7 @@ _021DC898: add r1, r4, #0 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -11308,7 +11308,7 @@ MOD17_021DC8F8: ; 0x021DC8F8 mov r1, #1 bx r3 nop -_021DC900: .word FUN_020191A4 +_021DC900: .word WindowArray_dtor thumb_func_end MOD17_021DC8F8 thumb_func_start MOD17_021DC904 @@ -11814,7 +11814,7 @@ MOD17_021DCC68: ; 0x021DCC68 str r0, [sp, #0x10] ldr r1, [r5] add r0, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5] mov r1, #0xf bl FillWindowPixelBuffer @@ -11848,7 +11848,7 @@ MOD17_021DCCE0: ; 0x021DCCE0 mov r1, #1 bx r3 nop -_021DCCE8: .word FUN_020191A4 +_021DCCE8: .word WindowArray_dtor thumb_func_end MOD17_021DCCE0 thumb_func_start MOD17_021DCCEC @@ -12495,7 +12495,7 @@ MOD17_021DD1DC: ; 0x021DD1DC add r1, #0x30 bl MOD17_021DD2E0 ldr r0, _021DD200 ; =0x00000683 - bl FUN_020054C8 + bl PlaySE _021DD1FC: pop {r3, pc} nop @@ -13038,13 +13038,13 @@ MOD17_021DD5A0: ; 0x021DD5A0 mov r1, #2 mov r2, #0 sub r3, r3, r4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x10 ldr r0, [r5, #0x38] mov r1, #2 mov r2, #3 sub r3, r3, r6 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021DD5E8: mov r0, #0x23 lsl r0, r0, #4 @@ -13780,12 +13780,12 @@ MOD17_021DDB58: ; 0x021DDB58 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap mov r1, #0x65 add r0, r5, #0 lsl r1, r1, #2 @@ -13990,9 +13990,9 @@ MOD17_021DDCF4: ; 0x021DDCF4 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0xd - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xe - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -14066,7 +14066,7 @@ _021DDD96: lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r5, #0x4c] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r1, [sp, #0x10] mov r2, #0 ldrh r0, [r1] @@ -14083,12 +14083,12 @@ _021DDD96: lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r5, #0x4c] - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r6, #0 bl FreeToHeap ldr r0, [r5, #0x4c] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r3, r4, r5, r6, pc} thumb_func_end MOD17_021DDD54 @@ -14260,25 +14260,25 @@ MOD17_021DDF1C: ; 0x021DDF1C ldr r1, [r4, r1] mov r2, #3 mov r3, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 mov r1, #0xa0 mov r2, #0xe bl FUN_02002ED0 mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r1, #3 ldr r0, [r4, #0x4c] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add sp, #0x14 pop {r3, r4, pc} .align 2, 0 @@ -14291,16 +14291,16 @@ MOD17_021DDF84: ; 0x021DDF84 mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02019178 + bl RemoveWindow mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r4, r0] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor pop {r4, pc} .align 2, 0 thumb_func_end MOD17_021DDF84 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 9b2fdf67..074ed1e0 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1476,7 +1476,7 @@ _0223A194: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0223A2AC ; =0x02250010 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -1491,15 +1491,15 @@ _0223A194: str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223A2B0 ; =0x0225002C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -1514,15 +1514,15 @@ _0223A194: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223A2B4 ; =0x02250048 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -1537,15 +1537,15 @@ _0223A194: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223A2B8 ; =0x02250064 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -1560,25 +1560,25 @@ _0223A194: str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x1d - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0xa8 pop {r3, r4, r5, pc} nop @@ -1627,7 +1627,7 @@ _0223A2EE: mov r1, #2 bl FUN_02020130 ldr r0, _0223A3C8 ; =0x000006A4 - bl FUN_020054C8 + bl PlaySE b _0223A33C _0223A30A: cmp r4, #0 @@ -1640,7 +1640,7 @@ _0223A30A: mov r1, #3 bl FUN_02020130 ldr r0, _0223A3CC ; =0x000006A2 - bl FUN_020054C8 + bl PlaySE b _0223A33C _0223A326: ldr r0, _0223A3C4 ; =0x02251380 @@ -1651,7 +1651,7 @@ _0223A326: mov r1, #4 bl FUN_02020130 ldr r0, _0223A3D0 ; =0x000006A3 - bl FUN_020054C8 + bl PlaySE _0223A33C: ldr r0, _0223A3C4 ; =0x02251380 ldr r1, [r0] @@ -1747,9 +1747,9 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r0, #3 mov r1, #0x1d lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r0, #0x1d - bl FUN_02016B94 + bl BgConfig_Alloc add r4, r0, #0 ldr r0, _0223A4CC ; =0x02251380 add r1, r4, #0 @@ -1764,13 +1764,13 @@ MOD18_0223A3D4: ; 0x0223A3D4 bl MOD18_0223A188 add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] mov r0, #0x1d @@ -1843,7 +1843,7 @@ MOD18_0223A4D8: ; 0x0223A4D8 mov r1, #1 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _0223A55C ; =0x02251380 ldr r0, [r0] ldr r0, [r0, #4] @@ -1868,16 +1868,16 @@ MOD18_0223A4D8: ; 0x0223A4D8 bl MOD18_0223B6A4 mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority bl MOD18_0223C37C bl MOD18_0223C570 ldr r0, _0223A55C ; =0x02251380 @@ -1898,22 +1898,22 @@ MOD18_0223A560: ; 0x0223A560 mov r1, #0 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223A648 ; =0x02251380 mov r1, #1 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223A648 ; =0x02251380 mov r1, #2 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223A648 ; =0x02251380 mov r1, #3 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223A648 ; =0x02251380 ldr r1, [r0] mov r0, #0x57 @@ -1984,7 +1984,7 @@ _0223A5F8: ldr r0, [r0] str r1, [r0, #4] mov r0, #0x1d - bl FUN_020168D0 + bl DestroyHeap bl MOD18_0223D638 ldr r1, _0223A648 ; =0x02251380 ldr r1, [r1] @@ -2150,7 +2150,7 @@ _0223A780: mov r0, #0 str r0, [r4, #8] ldr r0, _0223AB00 ; =0x00000621 - bl FUN_020054C8 + bl PlaySE mov r0, #8 add sp, #0xc str r0, [r4] @@ -2301,7 +2301,7 @@ _0223A8A2: lsl r1, r1, #4 str r0, [r2, r1] ldr r0, _0223AB10 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE mov r0, #0x3c str r0, [r4, #0x4c] mov r0, #0xf @@ -2586,7 +2586,7 @@ _0223AB28: mov r3, #0 bl FUN_0200E1D0 ldr r0, _0223AC18 ; =0x000006A1 - bl FUN_020054C8 + bl PlaySE mov r0, #0x18 add sp, #0xc str r0, [r4] @@ -3460,7 +3460,7 @@ MOD18_0223B1A8: ; 0x0223B1A8 mov r1, #1 str r2, [sp, #0x14] str r3, [sp, #0x18] - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r1, [r5, r6] str r0, [sp, #0x34] ldr r0, [sp, #0x38] @@ -3612,7 +3612,7 @@ _0223B2E6: cmp r0, #1 bne _0223B3DA ldr r0, _0223B440 ; =0x000006A7 - bl FUN_020054C8 + bl PlaySE mov r0, #0 mov r4, #0 str r4, [sp, #0x18] @@ -4109,7 +4109,7 @@ MOD18_0223B6A4: ; 0x0223B6A4 sub sp, #0xc mov r1, #2 str r0, [sp] - bl FUN_0201886C + bl GetBgTilemapBuffer str r0, [sp, #8] mov r2, #0 mov r0, #4 @@ -4167,7 +4167,7 @@ _0223B6C0: blt _0223B6BA ldr r0, [sp] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -4536,7 +4536,7 @@ MOD18_0223B9BC: ; 0x0223B9BC ldr r3, [r3] sub r2, r2, #2 strb r1, [r3, r2] - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r1, _0223B9E8 ; =0x02250874 mov r2, #0x30 mov r3, #0x36 @@ -4593,7 +4593,7 @@ _0223BA26: _0223BA36: add r0, r5, #0 mov r1, #1 - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r1, _0223BB40 ; =0x02251380 add r6, r0, #0 ldr r2, [r1] @@ -4617,7 +4617,7 @@ _0223BA52: mov r3, #0x36 bl MOD18_0223B948 ldr r0, _0223BB50 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0223BA82 _0223BA74: cmp r4, #3 @@ -4670,7 +4670,7 @@ _0223BAC4: mov r3, #0x36 bl MOD18_0223B948 ldr r0, _0223BB50 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0223BAF4 _0223BAE6: cmp r4, #3 @@ -4712,7 +4712,7 @@ _0223BAF4: _0223BB34: add r0, r5, #0 mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _0223BB3C: add sp, #0xc pop {r3, r4, r5, r6, pc} @@ -4757,7 +4757,7 @@ MOD18_0223BB7C: ; 0x0223BB7C ldr r1, _0223BC48 ; =0x000009E7 ldrb r4, [r2, r1] mov r1, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer add r5, r0, #0 asr r0, r4, #1 lsr r0, r0, #0x1e @@ -4842,7 +4842,7 @@ _0223BBD8: _0223BC38: ldr r0, [sp] mov r1, #0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -5554,7 +5554,7 @@ _0223C1B4: add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit lsl r1, r4, #0x18 ldr r6, [r7] ldr r3, _0223C1EC ; =0x000009EA @@ -5562,7 +5562,7 @@ _0223C1B4: ldrsb r3, [r6, r3] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 cmp r4, #3 blt _0223C1B4 @@ -5670,7 +5670,7 @@ _0223C29A: str r0, [r5, #0x14] bne _0223C2AC ldr r0, _0223C350 ; =0x000006A5 - bl FUN_020054C8 + bl PlaySE _0223C2AC: ldr r0, _0223C338 ; =0x02251380 ldr r2, _0223C340 ; =gMain + 0x40 @@ -6173,7 +6173,7 @@ MOD18_0223C6CC: ; 0x0223C6CC add r4, r0, #0 bl MOD18_0223C188 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_02009F80 pop {r4, pc} @@ -6308,7 +6308,7 @@ MOD18_0223C7B0: ; 0x0223C7B0 cmp r1, #0x53 bls _0223C7CE add r0, #0x43 - bl FUN_020054C8 + bl PlaySE ldr r0, _0223C7D0 ; =0x000005DE mov r1, #0 strh r1, [r4, r0] @@ -7254,7 +7254,7 @@ MOD18_0223CE68: ; 0x0223CE68 ldr r0, _0223CF24 ; =0x000004CC strb r2, [r1, r0] ldr r0, _0223CF28 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE ldrb r1, [r4, #4] ldrb r0, [r4, #5] mov r5, #0x63 @@ -7504,7 +7504,7 @@ _0223D07E: ldr r0, [sp] bl MOD18_02249E98 ldr r0, _0223D0E4 ; =0x00000631 - bl FUN_020054C8 + bl PlaySE ldr r0, _0223D0DC ; =0x02251384 ldr r1, [r0] ldr r0, _0223D0E0 ; =0x000004C8 @@ -7812,7 +7812,7 @@ MOD18_0223D2EC: ; 0x0223D2EC cmp r0, #0x64 bls _0223D306 ldr r0, _0223D308 ; =0x00000621 - bl FUN_020054C8 + bl PlaySE mov r0, #0 strh r0, [r4, #2] _0223D306: @@ -12090,7 +12090,7 @@ MOD18_0223F360: ; 0x0223F360 mov r2, #1 bl MOD18_0224DCB8 ldr r0, _0223F400 ; =0x00000623 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _0223F3A4: cmp r0, #4 @@ -12474,7 +12474,7 @@ _0223F662: strh r1, [r3, r0] _0223F674: ldr r0, _0223F6F4 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE bl MOD18_0223D638 add r5, r0, #0 ldrb r0, [r4, #7] @@ -12821,7 +12821,7 @@ _0223F926: bl FUN_02026CB4 add r6, r0, #0 ldr r0, _0223FA64 ; =0x00000622 - bl FUN_020054C8 + bl PlaySE ldr r1, _0223FA60 ; =0x022513A0 add r0, r4, #0 ldr r2, [r1, #4] @@ -13338,7 +13338,7 @@ _0223FD12: mov r0, #0x10 bl FUN_0204F774 ldr r0, _0223FD50 ; =0x00000609 - bl FUN_020054C8 + bl PlaySE ldr r0, _0223FD44 ; =0x022513A0 mov r2, #0 ldr r1, [r0, #4] @@ -13997,7 +13997,7 @@ _02240190: ldr r2, [r4, #0x18] bl FUN_0204E214 ldr r0, _0224020C ; =0x0000065F - bl FUN_020054C8 + bl PlaySE mov r0, #5 add sp, #8 str r0, [r4] @@ -14341,7 +14341,7 @@ _02240442: cmp r0, #0 bne _02240456 ldr r0, _0224045C ; =0x00000629 - bl FUN_020054C8 + bl PlaySE _02240456: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -14378,7 +14378,7 @@ _02240480: ldr r0, [r0, #4] ldr r0, [r0, #0x40] ldr r0, [r0, #8] - bl FUN_0201886C + bl GetBgTilemapBuffer mov r3, #0 mov r1, #2 add r2, r3, #0 @@ -14390,7 +14390,7 @@ _022404A4: blt _022404A4 mov r0, #2 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #0 bl GX_EngineAToggleLayers @@ -14430,7 +14430,7 @@ MOD18_022404F4: ; 0x022404F4 mov r1, #2 add r6, r2, #0 mov r4, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer add r5, r0, #0 bne _02240512 add sp, #8 @@ -14450,7 +14450,7 @@ _02240512: bl MOD18_02240388 ldr r0, [sp, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _02240532: ldrh r0, [r7] mov r2, #0 @@ -14764,16 +14764,16 @@ _0224072E: _02240774: mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r4] add sp, #0x1c add r0, r0, #1 @@ -14804,7 +14804,7 @@ _0224079E: mov r0, #0 str r0, [r4, #0x1c] ldr r0, _02240890 ; =0x00000661 - bl FUN_020054C8 + bl PlaySE add sp, #0x1c pop {r3, r4, pc} _022407DE: @@ -15289,7 +15289,7 @@ MOD18_02240B90: ; 0x02240B90 cmp r0, #0xa0 bls _02240BAE ldr r0, _02240BB4 ; =0x00000621 - bl FUN_020054C8 + bl PlaySE ldr r0, _02240BB0 ; =0x000001E2 mov r1, #0 strh r1, [r4, r0] @@ -15879,7 +15879,7 @@ MOD18_02241008: ; 0x02241008 mov r0, #0xe str r0, [r1] ldr r0, _02241034 ; =0x0000060B - bl FUN_020054C8 + bl PlaySE _0224102C: pop {r4, pc} nop @@ -16069,7 +16069,7 @@ _0224118C: cmp r0, r5 beq _022411A6 ldr r0, _02241284 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE _022411A6: str r5, [r4, #0x18] mov r0, #0 @@ -17996,7 +17996,7 @@ _0224205A: str r1, [r4, r0] mov r0, #0x66 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE add sp, #0x10 pop {r4, pc} _0224209A: @@ -18485,7 +18485,7 @@ _0224240A: cmp r1, r0 ble _022424B6 ldr r0, _0224258C ; =0x00000626 - bl FUN_020054C8 + bl PlaySE ldr r0, _02242590 ; =0x022513A0 lsl r4, r5, #2 ldr r0, [r0, #4] @@ -19226,7 +19226,7 @@ _02242A20: add r1, #0x11 strb r0, [r4, r1] ldr r0, _02242D6C ; =0x0000065E - bl FUN_020054C8 + bl PlaySE b _02242E6C _02242A68: sub r1, r0, #1 @@ -19282,7 +19282,7 @@ _02242A98: add r0, r1, #5 strb r2, [r4, r0] ldr r0, _02242D70 ; =0x0000065D - bl FUN_020054C8 + bl PlaySE ldr r0, _02242D68 ; =0x022513A0 ldr r1, [r0, #4] ldr r0, _02242D74 ; =0x00000B3B @@ -19373,7 +19373,7 @@ _02242B22: lsl r0, r0, #2 str r1, [r4, r0] ldr r0, _02242D7C ; =0x00000627 - bl FUN_020054C8 + bl PlaySE mov r0, #0x46 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -19525,7 +19525,7 @@ _02242CAA: b _02242DD2 _02242CB4: ldr r0, _02242D80 ; =0x0000062A - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x11 add r0, #0xf8 @@ -20480,7 +20480,7 @@ _0224343A: add r0, r0, #1 str r0, [r5, #0x24] ldr r0, _02243538 ; =0x00000628 - bl FUN_020054C8 + bl PlaySE b _0224345C _02243454: add r0, r5, #0 @@ -21627,7 +21627,7 @@ _02243D2C: bl GXx_SetMasterBrightness_ bl FUN_0204F7E4 ldr r0, _02243E0C ; =0x00000621 - bl FUN_020054C8 + bl PlaySE ldr r1, _02243E10 ; =0x022513A0 mov r0, #0x20 ldr r1, [r1, #4] @@ -22188,7 +22188,7 @@ _0224418A: b _022442CA _0224418C: ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, sp, #0xc ldrh r1, [r0, #2] ldrh r0, [r0] @@ -22328,7 +22328,7 @@ _0224428C: tst r0, r1 beq _022442CA ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, sp, #0xc ldrh r3, [r0, #2] ldrh r1, [r0] @@ -22366,7 +22366,7 @@ _022442CA: cmp r6, r0 beq _022442EA ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022442EA: mov r0, #1 mvn r0, r0 @@ -22378,11 +22378,11 @@ _022442EA: b _02244302 _022442FA: ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02244308 _02244302: ldr r0, _02244314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02244308: add r0, r4, #0 add sp, #0x10 @@ -22606,7 +22606,7 @@ _022444AC: bl GX_EngineBToggleLayers mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r0, [r4] add sp, #0x60 add r0, r0, #1 @@ -22711,10 +22711,10 @@ _02244588: mov r0, #0x39 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [sp, #0x2c] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [sp, #0x2c] bl MOD18_02244858 mov r0, #0xeb @@ -23066,10 +23066,10 @@ MOD18_02244858: ; 0x02244858 push {r4, lr} add r4, r0, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD18_02244858 @@ -23098,7 +23098,7 @@ MOD18_0224486C: ; 0x0224486C str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineBToggleLayers @@ -23116,7 +23116,7 @@ MOD18_0224486C: ; 0x0224486C str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineBToggleLayers @@ -23134,13 +23134,13 @@ MOD18_0224486C: ; 0x0224486C str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 mov r1, #0 bl GX_EngineBToggleLayers add r0, r5, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x40 mov r1, #0 str r0, [sp] @@ -23180,7 +23180,7 @@ MOD18_0224486C: ; 0x0224486C mov r1, #0x20 mov r2, #0 mov r3, #4 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 add r1, r4, #0 mov r2, #7 @@ -25585,7 +25585,7 @@ MOD18_02245B1C: ; 0x02245B1C strb r0, [r3, #0xb] add r0, r6, #0 add r2, r7, #0 - bl FUN_02019150 + bl AddWindow ldr r0, [sp, #0x14] ldr r2, [sp, #8] ldr r3, [sp, #0xc] @@ -26866,7 +26866,7 @@ _02246580: ldr r0, [r5, #0x68] bl MOD18_0224484C ldr r0, _02246850 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0xc] add r0, r0, #1 str r0, [r4, #0xc] @@ -27078,7 +27078,7 @@ _0224672E: add r3, r2, #0 bl MOD18_0224DCB8 ldr r0, _02246860 ; =0x00000604 - bl FUN_020054C8 + bl PlaySE mov r0, #0xc str r0, [r4, #0xc] b _02246848 @@ -27260,7 +27260,7 @@ _022468CC: mov r1, #0x21 bl MOD18_0224DDE8 ldr r0, _02246AD0 ; =0x0000061E - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x38] bl FUN_020553A0 add r1, r7, #0 @@ -28575,7 +28575,7 @@ _0224735C: add r3, r2, #0 bl MOD18_0224DCB8 ldr r0, _0224740C ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE mov r0, #1 add sp, #0xc str r0, [r4] @@ -29508,7 +29508,7 @@ MOD18_02247A34: ; 0x02247A34 add r0, #0x28 strb r1, [r0] ldr r0, _02247A9C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 bl MOD18_022479E4 @@ -29549,7 +29549,7 @@ MOD18_02247AA8: ; 0x02247AA8 add r1, #0xc ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02247B54 ; =0x000003D9 add r0, #0xc @@ -29675,7 +29675,7 @@ MOD18_02247BB8: ; 0x02247BB8 add r1, #0xc ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02247C8C ; =0x000003D9 add r0, #0xc @@ -29797,7 +29797,7 @@ _02247CDA: pop {r3, r4, r5, r6, pc} _02247CE0: ldr r0, _02247D18 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, sp, #0 strb r4, [r0] ldrh r1, [r5, #0x30] @@ -29848,7 +29848,7 @@ MOD18_02247D1C: ; 0x02247D1C add r1, #0xc ldr r0, [r0, #8] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02247DCC ; =0x000003D9 add r0, #0xc @@ -29949,7 +29949,7 @@ _02247E18: pop {r3, r4, r5, r6, pc} _02247E1E: ldr r0, _02247E9C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 add r1, r5, #0 bl MOD18_02247FC0 @@ -30036,7 +30036,7 @@ MOD18_02247EA0: ; 0x02247EA0 ldrb r0, [r4] bl MOD18_022493A4 ldr r0, _02247EF4 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _02247EF4: .word 0x000005E3 @@ -30123,7 +30123,7 @@ _02247F7C: pop {r4, r5, r6, pc} _02247F8E: ldr r0, _02247FBC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_0224865C add r0, r6, #0 @@ -30132,7 +30132,7 @@ _02247F8E: b _02247FB6 _02247FA4: ldr r0, _02247FBC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 blx r4 add r0, r6, #0 @@ -30162,10 +30162,10 @@ MOD18_02247FC0: ; 0x02247FC0 bl DestroyListMenu add r0, r4, #0 add r0, #0xc - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0xc - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x1c] bl ListMenuItems_dtor mov r0, #0 @@ -31045,7 +31045,7 @@ MOD18_022486B8: ; 0x022486B8 bl FUN_02026CB4 bl FUN_02026B90 ldr r0, _0224873C ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x16 bl MOD18_022479BC @@ -31138,10 +31138,10 @@ MOD18_02248784: ; 0x02248784 bl DestroyListMenu add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x18] bl ListMenuItems_dtor mov r0, #0 @@ -31219,7 +31219,7 @@ MOD18_02248820: ; 0x02248820 ldr r0, [r5, #4] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _022488E4 ; =0x000003D9 add r0, #8 @@ -31309,7 +31309,7 @@ MOD18_022488F0: ; 0x022488F0 cmp r6, r0 beq _02248916 ldr r0, _022489C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02248916: bl FUN_020311F0 cmp r0, #0 @@ -31330,7 +31330,7 @@ _02248934: mov r4, #0x33 _02248936: ldr r0, _022489C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r7, #0 add r1, r5, #0 bl MOD18_02248784 @@ -32218,7 +32218,7 @@ MOD18_02248FEC: ; 0x02248FEC cmp r4, r0 beq _02249008 ldr r0, _0224900C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02249008: pop {r3, r4, r5, pc} nop @@ -32867,7 +32867,7 @@ MOD18_022494C8: ; 0x022494C8 add r5, r0, #0 ldr r0, _02249534 ; =0x000005FD add r6, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #2 bl MOD18_0223E56C mov r1, #0x25 @@ -32961,7 +32961,7 @@ MOD18_02249564: ; 0x02249564 ldr r0, [r0, #8] mov r2, #3 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02249678 ; =0x000003D9 add r0, #0x10 @@ -33051,7 +33051,7 @@ _022495EE: str r0, [r5, #0x48] add r0, r5, #0 add r0, #0x10 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r1, sp, #0x18 mov r2, #7 @@ -33399,7 +33399,7 @@ _02249916: _02249936: add r0, r4, #0 add r0, #0x10 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02249968 add r0, r4, #0 @@ -33408,10 +33408,10 @@ _02249936: bl FUN_0200CCF8 ldrb r1, [r4, #0x14] ldr r0, [r4, #0x10] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x40] bl ListMenuItems_dtor add r0, r4, #0 @@ -33480,7 +33480,7 @@ _022499A2: add r1, #0x20 mov r2, #3 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02249A5C ; =0x000003D9 add r0, #0x20 @@ -33557,7 +33557,7 @@ MOD18_02249A64: ; 0x02249A64 add r1, #0x24 ldrb r1, [r1] ldr r0, [r4, #0x20] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x44] bl ListMenuItems_dtor mov r0, #0 @@ -33565,7 +33565,7 @@ MOD18_02249A64: ; 0x02249A64 _02249A8C: add r0, r4, #0 add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02249AAA add r0, r4, #0 @@ -33574,7 +33574,7 @@ _02249A8C: bl FUN_0200CCF8 add r4, #0x20 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _02249AAA: pop {r4, pc} thumb_func_end MOD18_02249A64 @@ -33746,7 +33746,7 @@ MOD18_02249BA8: ; 0x02249BA8 ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _02249CB8 ; =0x000003D9 add r0, #0x10 @@ -33971,7 +33971,7 @@ MOD18_02249DB8: ; 0x02249DB8 cmp r6, r0 beq _02249DE2 ldr r0, _02249E80 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02249DE2: mov r0, #1 mvn r0, r0 @@ -33984,7 +33984,7 @@ _02249DE2: pop {r4, r5, r6, pc} _02249DF4: ldr r0, _02249E80 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249A64 add r0, r5, #0 @@ -34007,7 +34007,7 @@ _02249E0E: lsr r0, r0, #0x18 bl MOD18_0223EF60 ldr r0, _02249E8C ; =0x00000631 - bl FUN_020054C8 + bl PlaySE ldr r0, _02249E84 ; =0x00000246 mov r1, #3 strb r1, [r5, r0] @@ -34016,7 +34016,7 @@ _02249E3A: cmp r4, #2 bne _02249E7C ldr r0, _02249E80 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02249E88 ; =0x022513F8 ldr r0, [r0] ldrb r0, [r0, #5] @@ -34213,7 +34213,7 @@ MOD18_02249F8C: ; 0x02249F8C ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224A0DC ; =0x000003D9 add r0, #0x10 @@ -34448,7 +34448,7 @@ MOD18_0224A1C0: ; 0x0224A1C0 cmp r6, r0 beq _0224A1EA ldr r0, _0224A2A0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224A1EA: mov r0, #1 mvn r0, r0 @@ -34461,7 +34461,7 @@ _0224A1EA: pop {r4, r5, r6, pc} _0224A1FC: ldr r0, _0224A2A0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249A64 add r0, r5, #0 @@ -34501,7 +34501,7 @@ _0224A25A: cmp r4, #2 bne _0224A28C ldr r0, _0224A2A0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224A2A8 ; =0x022513F8 ldr r0, [r0] ldrb r0, [r0, #5] @@ -34662,7 +34662,7 @@ MOD18_0224A360: ; 0x0224A360 ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224A46C ; =0x000003D9 add r0, #0x10 @@ -34872,7 +34872,7 @@ MOD18_0224A550: ; 0x0224A550 cmp r6, r0 beq _0224A57A ldr r0, _0224A694 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224A57A: mov r0, #1 mvn r0, r0 @@ -34885,7 +34885,7 @@ _0224A57A: pop {r4, r5, r6, pc} _0224A58C: ldr r0, _0224A694 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249A64 add r0, r5, #0 @@ -34909,7 +34909,7 @@ _0224A5A6: bl Sav2_Bag_get add r6, r0, #0 ldr r0, _0224A694 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE lsl r1, r4, #0x10 add r0, r6, #0 lsr r1, r1, #0x10 @@ -34967,7 +34967,7 @@ _0224A64A: cmp r4, #2 bne _0224A67E ldr r0, _0224A694 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224A69C ; =0x022513F8 ldr r1, [r0] ldr r0, [r1] @@ -35600,7 +35600,7 @@ MOD18_0224AB08: ; 0x0224AB08 ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224AC14 ; =0x000003D9 add r0, #0x10 @@ -35745,7 +35745,7 @@ _0224AC78: pop {r3, r4, r5, pc} _0224AC8A: ldr r0, _0224ACF8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249AAC b _0224ACF2 @@ -35814,7 +35814,7 @@ MOD18_0224AD04: ; 0x0224AD04 cmp r6, r0 beq _0224AD2E ldr r0, _0224ADA8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224AD2E: mov r0, #1 mvn r0, r0 @@ -35827,7 +35827,7 @@ _0224AD2E: pop {r4, r5, r6, pc} _0224AD40: ldr r0, _0224ADA8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD18_02249A64 add r0, r5, #0 @@ -35842,7 +35842,7 @@ _0224AD5A: cmp r4, #2 bne _0224AD94 ldr r0, _0224ADA8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224ADB0 ; =0x022513F8 ldr r1, [r0] ldr r0, [r1] @@ -36347,7 +36347,7 @@ MOD18_0224B128: ; 0x0224B128 cmp r1, r0 bne _0224B15C ldr r0, _0224B184 ; =0x0000060C - bl FUN_020054C8 + bl PlaySE bl FUN_0204F7E4 add r0, r4, #0 bl MOD18_0224BD54 @@ -36528,7 +36528,7 @@ _0224B29E: pop {r3, r4, r5, pc} _0224B2AA: ldr r0, _0224B344 ; =0x0000060E - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #2 strb r1, [r4, r0] @@ -36570,28 +36570,28 @@ _0224B2F2: b _0224B33E _0224B308: ldr r0, _0224B34C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #8 strb r1, [r4, r0] b _0224B33E _0224B316: ldr r0, _0224B34C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #6 strb r1, [r4, r0] b _0224B33E _0224B324: ldr r0, _0224B34C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #0x11 strb r1, [r4, r0] b _0224B33E _0224B332: ldr r0, _0224B34C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B348 ; =0x00000246 mov r1, #0x14 strb r1, [r4, r0] @@ -36646,7 +36646,7 @@ _0224B374: ldr r0, [r5, #0xc] mov r3, #0x11 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224B460 ; =0x000003D9 add r0, #0x10 @@ -36769,7 +36769,7 @@ MOD18_0224B464: ; 0x0224B464 str r0, [sp, #0x10] ldr r0, [r5, #0xc] ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224B55C ; =0x000003D9 add r0, #0x10 @@ -36898,7 +36898,7 @@ _0224B5A6: pop {r3, r4, r5, pc} _0224B5B0: ldr r0, _0224B60C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224B610 ; =0x00000246 mov r1, #0 strb r1, [r5, r0] @@ -37247,7 +37247,7 @@ _0224B874: ; jump table .short _0224B946 - _0224B874 - 2 ; case 5 _0224B880: ldr r0, _0224B978 ; =0x0000060D - bl FUN_020054C8 + bl PlaySE mov r1, #0 mov r0, #6 str r0, [sp] @@ -37297,7 +37297,7 @@ _0224B8D8: b _0224B970 _0224B8EE: ldr r0, _0224B97C ; =0x0000060E - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -38073,7 +38073,7 @@ MOD18_0224BF84: ; 0x0224BF84 cmp r4, r0 beq _0224BFA2 ldr r0, _0224BFA8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224BFA2: pop {r3, r4, r5, pc} .align 2, 0 @@ -38480,7 +38480,7 @@ _0224C288: ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224C414 ; =0x000003D9 add r0, #0x10 @@ -39102,7 +39102,7 @@ MOD18_0224C7D4: ; 0x0224C7D4 ldr r0, [r5, #0xc] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224C934 ; =0x000003D9 add r0, #0x10 @@ -39250,7 +39250,7 @@ MOD18_0224C94C: ; 0x0224C94C push {r4, lr} add r4, r0, #0 add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0224C96C add r0, r4, #0 @@ -39259,7 +39259,7 @@ MOD18_0224C94C: ; 0x0224C94C bl FUN_0200CCF8 add r0, r4, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow _0224C96C: add r0, r4, #0 bl MOD18_022498EC @@ -39462,7 +39462,7 @@ MOD18_0224CADC: ; 0x0224CADC sub sp, #0x14 add r4, r0, #0 add r0, #0x20 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0224CB1A mov r0, #0xc @@ -39479,7 +39479,7 @@ MOD18_0224CADC: ; 0x0224CADC ldr r0, [r0, #8] add r1, #0x20 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 ldr r2, _0224CB30 ; =0x000003D9 add r0, #0x20 @@ -39521,7 +39521,7 @@ MOD18_0224CB34: ; 0x0224CB34 ldr r0, [r0, #8] add r1, #0x30 mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224CBA8 ; =0x000003D9 add r0, #0x30 @@ -39560,7 +39560,7 @@ MOD18_0224CBAC: ; 0x0224CBAC push {r4, lr} add r4, r0, #0 add r0, #0x30 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0224CBCC add r0, r4, #0 @@ -39569,7 +39569,7 @@ MOD18_0224CBAC: ; 0x0224CBAC bl FUN_0200CCF8 add r4, #0x30 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _0224CBCC: pop {r4, pc} .align 2, 0 @@ -39702,7 +39702,7 @@ _0224CC8E: cmp r6, r0 beq _0224CCC8 ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224CCC8: mov r0, #1 mvn r0, r0 @@ -39717,7 +39717,7 @@ _0224CCD8: b _0224CCF2 _0224CCDA: ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 bl MOD18_0224C94C @@ -39746,14 +39746,14 @@ _0224CD0C: cmp r5, #0 ldr r0, _0224CF58 ; =0x000005DC bne _0224CD24 - bl FUN_020054C8 + bl PlaySE ldr r0, _0224CF50 ; =0x00000246 mov r1, #4 add sp, #8 strb r1, [r4, r0] pop {r4, r5, r6, pc} _0224CD24: - bl FUN_020054C8 + bl PlaySE ldr r0, _0224CF50 ; =0x00000246 mov r1, #0xb add sp, #8 @@ -39798,7 +39798,7 @@ _0224CD48: cmp r6, r0 beq _0224CD8C ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224CD8C: mov r0, #1 mvn r0, r0 @@ -39823,7 +39823,7 @@ _0224CDA6: b _0224CDCE _0224CDB6: ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #1 bl MOD18_0224C94C @@ -39834,7 +39834,7 @@ _0224CDB6: pop {r4, r5, r6, pc} _0224CDCE: ldr r0, _0224CF58 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224CF50 ; =0x00000246 mov r1, #0x12 strb r1, [r4, r0] @@ -40051,7 +40051,7 @@ _0224CF92: mov r0, #6 bl MOD18_0224CA58 ldr r0, _0224D1D4 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE ldr r0, _0224D1D8 ; =0x00000246 mov r1, #9 add sp, #8 @@ -40273,7 +40273,7 @@ _0224D14E: mov r0, #7 bl MOD18_0224CA58 ldr r0, _0224D1D4 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE ldr r0, _0224D1D8 ; =0x00000246 mov r1, #9 add sp, #8 @@ -40374,7 +40374,7 @@ MOD18_0224D1F8: ; 0x0224D1F8 mov r1, #0 strb r1, [r6, r0] ldr r0, _0224D2E0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0224D2E4 ; =MOD18_0224CC04 ldr r2, _0224D2E8 ; =0x00002710 add r1, r6, #0 @@ -40739,10 +40739,10 @@ MOD18_0224D56C: ; 0x0224D56C bl FUN_0200CCF8 add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow ldr r1, [r4] cmp r1, #0 beq _0224D596 @@ -40811,7 +40811,7 @@ MOD18_0224D5CC: ; 0x0224D5CC add r1, #8 mov r2, #3 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 ldr r2, _0224D684 ; =0x000003D9 add r0, #8 @@ -40847,9 +40847,9 @@ _0224D64A: bl MOD18_0224D364 add r0, r4, #0 add r0, #8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _0224D690 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE ldr r0, _0224D694 ; =MOD18_0224D5B4 add r1, r4, #0 mov r2, #0xa @@ -41315,7 +41315,7 @@ MOD18_0224DA00: ; 0x0224DA00 add r1, #8 mov r2, #3 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224DA9C ; =0x000003D9 add r0, #8 @@ -41343,10 +41343,10 @@ MOD18_0224DA00: ; 0x0224DA00 add r1, r4, #0 bl MOD18_0224D814 ldr r0, _0224DAA4 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 bl DestroyMsgData add r0, r5, #0 @@ -41367,10 +41367,10 @@ MOD18_0224DAA8: ; 0x0224DAA8 bl FUN_0200CCF8 add r0, r4, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow ldr r1, [r4] cmp r1, #0 beq _0224DACE @@ -41568,7 +41568,7 @@ MOD18_0224DC08: ; 0x0224DC08 bl MOD18_0223D688 add r0, r5, #0 add r0, #8 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0224DC4C mov r0, #0x13 @@ -41586,7 +41586,7 @@ MOD18_0224DC08: ; 0x0224DC08 add r1, #8 mov r2, #3 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized _0224DC4C: add r0, r5, #0 add r0, #8 @@ -41732,10 +41732,10 @@ _0224DD4C: bl FUN_0200D0E0 add r0, r5, #0 add r0, #8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow b _0224DD76 _0224DD6C: add r0, r5, #0 @@ -42303,7 +42303,7 @@ MOD18_0224E0CC: ; 0x0224E0CC ldr r0, [r5] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r3, #1 add r1, r5, #0 str r3, [sp] @@ -42319,7 +42319,7 @@ MOD18_0224E0CC: ; 0x0224E0CC ldr r0, [r5] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized ldr r2, _0224E1FC ; =0x000003D9 add r0, r5, #4 mov r1, #1 @@ -42449,23 +42449,23 @@ _0224E22A: pop {r3, r4, r5, pc} _0224E23A: ldr r0, _0224E268 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE str r4, [r5, #0x3c] mov r0, #2 add r5, #0x38 strb r0, [r5] ldr r0, _0224E268 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _0224E250: ldr r0, _0224E268 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE str r4, [r5, #0x3c] mov r0, #2 add r5, #0x38 strb r0, [r5] ldr r0, _0224E268 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _0224E268: .word 0x000005DC @@ -42490,12 +42490,12 @@ MOD18_0224E26C: ; 0x0224E26C bl FUN_0200CCF8 ldrb r1, [r4, #8] ldr r0, [r4, #4] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #4 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x24] bl ListMenuItems_dtor pop {r4, pc} @@ -42673,7 +42673,7 @@ _0224E3CC: add r5, #0x42 strb r0, [r5] ldr r0, _0224E3EC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} _0224E3DC: str r4, [r5, #0x44] @@ -42681,7 +42681,7 @@ _0224E3DC: add r5, #0x42 strb r0, [r5] ldr r0, _0224E3EC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _0224E3EC: .word 0x000005DC @@ -42761,7 +42761,7 @@ _0224E454: ldr r0, [r5] mov r3, #0x13 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized mov r3, #1 add r1, r5, #0 str r3, [sp] @@ -42777,7 +42777,7 @@ _0224E454: ldr r0, [r5] mov r2, #3 ldr r0, [r0, #8] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 ldr r2, _0224E688 ; =0x000003D9 add r0, #8 @@ -43018,13 +43018,13 @@ MOD18_0224E6A8: ; 0x0224E6A8 bl FUN_0200CCF8 ldrb r1, [r4, #0xc] ldr r0, [r4, #8] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r4, #0 add r0, #8 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x28] bl ListMenuItems_dtor ldr r0, [r4, #4] @@ -43085,7 +43085,7 @@ MOD18_0224E73C: ; 0x0224E73C cmp r4, r0 beq _0224E75C ldr r0, _0224E760 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0224E75C: pop {r3, r4, r5, pc} nop @@ -43226,7 +43226,7 @@ _0224E848: ; jump table _0224E858: mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD18_0224E01C ldr r3, _0224E940 ; =0x00000504 add r1, r6, #0 @@ -43775,7 +43775,7 @@ _0224ECB6: add r2, r7, #0 bl FUN_02025EDC ldr r0, _0224EDD0 ; =0x000005FE - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x50] bl MOD18_02247138 mov r0, #0xb @@ -43797,7 +43797,7 @@ _0224ECB6: b _0224EDBA _0224ED26: ldr r0, _0224EDD8 ; =0x00000602 - bl FUN_020054C8 + bl PlaySE mov r0, #0xc bl MOD18_02247118 str r0, [r4, #8] @@ -43973,7 +43973,7 @@ _0224EE52: beq _0224EEB4 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 sub r6, r6, r0 @@ -43990,7 +43990,7 @@ _0224EEB4: beq _0224EED6 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 add r6, r6, r0 @@ -44007,7 +44007,7 @@ _0224EED6: beq _0224EEF8 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 sub r5, r5, r0 @@ -44024,7 +44024,7 @@ _0224EEF8: beq _0224EF1A add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 add r5, r5, r0 @@ -44203,7 +44203,7 @@ _0224F04E: _0224F06E: mov r0, #0x19 lsl r0, r0, #6 - bl FUN_020054C8 + bl PlaySE mov r0, #0xe bl MOD18_02247118 str r0, [r4, #8] @@ -44231,7 +44231,7 @@ _0224F09E: bl FUN_02026CC4 add r5, r0, #0 ldr r0, _0224F15C ; =0x000005EB - bl FUN_020054C8 + bl PlaySE ldr r1, [sp, #4] add r0, r5, #0 bl FUN_02025F30 @@ -44520,7 +44520,7 @@ _0224F2BE: beq _0224F320 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 sub r6, r6, r0 @@ -44537,7 +44537,7 @@ _0224F320: beq _0224F342 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 add r6, r6, r0 @@ -44554,7 +44554,7 @@ _0224F342: beq _0224F364 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 sub r4, r4, r0 @@ -44571,7 +44571,7 @@ _0224F364: beq _0224F386 add r1, #0xe9 add r0, r1, #0 - bl FUN_020054C8 + bl PlaySE mov r0, #1 lsl r0, r0, #0x10 add r4, r4, r0 @@ -44729,7 +44729,7 @@ _0224F4A2: add r1, #0x5c bl MOD18_0224F8CC ldr r0, _0224F524 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE ldr r0, _0224F51C ; =0x000004FC ldr r0, [r5, r0] bl MOD18_0224FBF8 @@ -44977,7 +44977,7 @@ _0224F692: add r2, #0x5c bl MOD18_0224F890 ldr r0, _0224F764 ; =0x000005FE - bl FUN_020054C8 + bl PlaySE ldr r2, _0224F768 ; =0x000004FC ldr r0, [r4, #0x3c] ldr r1, [r4, #0x40] @@ -44996,7 +44996,7 @@ _0224F692: b _0224F750 _0224F6E0: ldr r0, _0224F76C ; =0x00000602 - bl FUN_020054C8 + bl PlaySE mov r0, #0xc bl MOD18_02247118 str r0, [r4, #8] @@ -47317,4 +47317,3 @@ MOD18_022513F8: ; 0x022513F8 .global MOD18_022513FC MOD18_022513FC: ; 0x022513FC .space 0x4 - diff --git a/arm9/modules/19/asm/module_19.s b/arm9/modules/19/asm/module_19.s deleted file mode 100644 index 8f3a28ce..00000000 --- a/arm9/modules/19/asm/module_19.s +++ /dev/null @@ -1,111 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - .section .text - .balign 4, 0 - - thumb_func_start MOD19_02252440 -MOD19_02252440: ; 0x02252440 - push {r4, lr} - sub sp, #0x10 - add r4, r0, #0 - mov r0, #3 - mov r1, #8 - lsl r2, r0, #0xf - bl FUN_0201681C - mov r0, #0 - bl GXS_SetGraphicsMode - mov r0, #0x80 - bl GX_SetBankForSubBG - mov r0, #1 - lsl r0, r0, #8 - bl GX_SetBankForSubOBJ - ldr r2, _022524E0 ; =0x04001000 - ldr r0, _022524E4 ; =0xFFCFFFEF - ldr r1, [r2] - mov r3, #0 - and r1, r0 - mov r0, #0x10 - orr r0, r1 - str r0, [r2] - ldr r2, _022524E8 ; =0x02252508 - add r0, r4, #0 - mov r1, #4 - bl FUN_02016C18 - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - mov r0, #1 - str r0, [sp, #8] - mov r0, #8 - str r0, [sp, #0xc] - mov r0, #0xc - mov r1, #0xa - add r2, r4, #0 - mov r3, #4 - bl GfGfxLoader_LoadCharData - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - mov r0, #1 - str r0, [sp, #8] - mov r0, #8 - str r0, [sp, #0xc] - mov r0, #0xc - mov r1, #0xb - add r2, r4, #0 - mov r3, #4 - bl GfGfxLoader_LoadScrnData - mov r0, #0x20 - str r0, [sp] - mov r0, #8 - str r0, [sp, #4] - mov r0, #0xc - add r1, r0, #0 - mov r2, #4 - mov r3, #0 - bl GfGfxLoader_GXLoadPal - ldr r2, _022524E0 ; =0x04001000 - ldr r0, _022524EC ; =0xFFFF1FFF - ldr r1, [r2] - and r0, r1 - str r0, [r2] - ldr r1, [r2] - ldr r0, _022524F0 ; =0xFFFFE0FF - and r1, r0 - lsr r0, r2, #0x12 - orr r0, r1 - str r0, [r2] - add sp, #0x10 - pop {r4, pc} - .align 2, 0 -_022524E0: .word 0x04001000 -_022524E4: .word 0xFFCFFFEF -_022524E8: .word MOD19_02252508 -_022524EC: .word 0xFFFF1FFF -_022524F0: .word 0xFFFFE0FF - thumb_func_end MOD19_02252440 - - thumb_func_start MOD19_022524F4 -MOD19_022524F4: ; 0x022524F4 - push {r3, lr} - mov r1, #4 - bl FUN_020178A0 - mov r0, #8 - bl FUN_020168D0 - pop {r3, pc} - thumb_func_end MOD19_022524F4 - - thumb_func_start MOD19_02252504 -MOD19_02252504: ; 0x02252504 - mov r0, #1 - bx lr - thumb_func_end MOD19_02252504 - - .rodata - .global MOD19_02252508 -MOD19_02252508: ; 0x02252508 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .data - .bss diff --git a/arm9/modules/19/src/module_19.c b/arm9/modules/19/src/module_19.c new file mode 100644 index 00000000..1fc6197e --- /dev/null +++ b/arm9/modules/19/src/module_19.c @@ -0,0 +1,47 @@ +#include "global.h"
+#include "heap.h"
+#include "gx.h"
+#include "gf_gfx_loader.h"
+#include "bg_window.h"
+#include "graphic/poketch.naix"
+
+const struct BgTemplate MOD19_02252508 = {
+ .x = 0,
+ .y = 0,
+ .bufferSize = 0x800,
+ .baseTile = 0x000,
+ .size = GF_BG_SCR_SIZE_256x256,
+ .colorMode = GF_BG_CLR_4BPP,
+ .screenBase = 12,
+ .charBase = 0,
+ .priority = 0,
+ .areaOver = 0,
+ .mosaic = 0
+};
+
+THUMB_FUNC void MOD19_02252440(struct BgConfig * bgConfig)
+{
+ CreateHeap(3, 8, 0x18000);
+ GXS_SetGraphicsMode(GX_BGMODE_0);
+ GX_SetBankForSubBG(0x80);
+ GX_SetBankForSubOBJ(0x100);
+ GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
+ InitBgFromTemplate(bgConfig, GF_BG_LYR_SUB_0, &MOD19_02252508, GF_BG_TYPE_TEXT);
+ GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8);
+ GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8);
+ GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_BG_LYR_SUB_0, 0x00, 0x20, 8);
+ GXS_SetVisibleWnd(GX_WNDMASK_NONE);
+ GXS_SetVisiblePlane(GX_PLANEMASK_BG0);
+}
+
+THUMB_FUNC void MOD19_022524F4(struct BgConfig * bgConfig)
+{
+ FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0);
+ DestroyHeap(8);
+}
+
+THUMB_FUNC BOOL MOD19_02252504(struct BgConfig * bgConfig)
+{
+#pragma unused(bgConfig)
+ return TRUE;
+}
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index a77f95fc..c957045f 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -21,11 +21,11 @@ MOD20_02252448: ; 0x02252448 mov r1, #7 lsl r2, r0, #0xe add r7, r3, #0 - bl FUN_0201681C + bl CreateHeap mov r0, #3 mov r1, #8 lsl r2, r0, #0xe - bl FUN_0201681C + bl CreateHeap mov r0, #7 mov r1, #0x60 bl AllocFromHeap @@ -238,9 +238,9 @@ _022525C6: add r0, r5, #0 bl FUN_0200CAB4 mov r0, #7 - bl FUN_020168D0 + bl DestroyHeap mov r0, #8 - bl FUN_020168D0 + bl DestroyHeap pop {r3, r4, r5, pc} .align 2, 0 _022525EC: .word MOD20_022544CC @@ -889,7 +889,7 @@ _02252A50: cmp r7, #1 bne _02252AEA ldr r0, _02252AEC ; =0x0000066E - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, r6, r7, pc} _02252A6A: mov r4, #0 @@ -1017,7 +1017,7 @@ MOD20_02252B28: ; 0x02252B28 bne _02252B46 lsl r0, r4, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _02252B46: pop {r4, pc} thumb_func_end MOD20_02252B28 @@ -1243,7 +1243,7 @@ MOD20_02252C5C: ; 0x02252C5C _02252CA6: mov r0, #7 str r6, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc mov r1, #6 lsl r1, r1, #6 str r0, [r4, r1] @@ -1570,14 +1570,14 @@ MOD20_02252ED0: ; 0x02252ED0 ldr r2, _02252FE0 ; =MOD20_022545B4 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] ldr r2, _02252FE4 ; =MOD20_022545D0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0x40 str r0, [sp] mov r0, #0 @@ -1634,12 +1634,12 @@ MOD20_02252ED0: ; 0x02252ED0 ldr r0, [r4, r0] mov r1, #5 mov r2, #0xd8 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02252FD8 ; =0x04001000 ldr r1, _02252FE8 ; =0xFFFFE0FF ldr r2, [r0] @@ -1738,7 +1738,7 @@ _02253048: mov r1, #5 mov r2, #0x40 mov r3, #2 - bl FUN_02018540 + bl FillBgTilemapRect cmp r7, #0 beq _022530DA sub r0, r6, #1 @@ -1759,7 +1759,7 @@ _02253048: mov r1, #5 lsr r2, r2, #0x10 mov r3, #2 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x14] mov r2, #0xd8 add r0, r6, r0 @@ -1779,13 +1779,13 @@ _02253048: mov r1, #5 lsr r2, r2, #0x10 mov r3, #2 - bl FUN_02018540 + bl FillBgTilemapRect _022530DA: mov r0, #6 lsl r0, r0, #6 ldr r0, [r5, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrh r0, [r4, #2] cmp r0, #0x28 bne _022530FC @@ -1870,7 +1870,7 @@ _02253158: ldr r0, [r5, r0] mov r1, #5 mov r2, #0xd8 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x14] lsl r1, r7, #0x18 lsl r0, r0, #0x18 @@ -1887,7 +1887,7 @@ _02253158: mov r1, #5 mov r2, #0xd8 mov r3, #2 - bl FUN_02018540 + bl FillBgTilemapRect cmp r6, #0 beq _02253202 mov r0, #0 @@ -1907,7 +1907,7 @@ _02253158: mov r1, #5 lsr r2, r2, #0x10 mov r3, #2 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x14] add r6, #0xd4 sub r0, r0, #1 @@ -1926,13 +1926,13 @@ _02253158: mov r1, #5 lsr r2, r2, #0x10 mov r3, #2 - bl FUN_02018540 + bl FillBgTilemapRect _02253202: mov r0, #6 lsl r0, r0, #6 ldr r0, [r5, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldrh r0, [r4, #2] cmp r0, #0x28 bne _02253224 @@ -1978,12 +1978,12 @@ MOD20_02253228: ; 0x02253228 ldr r0, [r4, r0] mov r1, #5 lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r6, #0 add r0, #0xa9 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_022538B0 add sp, #0x10 @@ -2026,12 +2026,12 @@ MOD20_0225328C: ; 0x0225328C ldr r0, [r4, r0] mov r1, #5 lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r6, #0 add r0, #0xa5 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_022538B0 add sp, #0x10 @@ -2063,14 +2063,14 @@ MOD20_022532F0: ; 0x022532F0 ldr r0, [r4, r0] add r2, #0x84 mov r3, #0x1b - bl FUN_02018148 + bl LoadRectToBgTilemapRect mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02253334 ; =0x00000671 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD20_02252EBC add sp, #0xc @@ -2098,12 +2098,12 @@ MOD20_02253338: ; 0x02253338 ldr r0, [r4, r0] add r2, #0x2c mov r3, #0x1b - bl FUN_02018148 + bl LoadRectToBgTilemapRect mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_02252EBC add sp, #0xc @@ -2130,14 +2130,14 @@ MOD20_02253378: ; 0x02253378 ldr r0, [r4, r0] add r2, #0xdc mov r3, #0x1b - bl FUN_02018148 + bl LoadRectToBgTilemapRect mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _022533BC ; =0x0000066F - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD20_02252EBC add sp, #0xc @@ -2451,7 +2451,7 @@ _02253600: lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _0225361C: mov r3, #2 str r3, [sp] @@ -2468,12 +2468,12 @@ _0225361C: ldr r0, [r4, r0] mov r1, #5 lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram cmp r5, #3 bne _02253658 add r0, r6, #0 @@ -2510,17 +2510,17 @@ MOD20_02253668: ; 0x02253668 ldr r0, [r4, r0] mov r1, #5 mov r2, #0x40 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r1, #0 ldr r0, _022536C4 ; =0x04001050 add r2, r1, #0 @@ -2546,12 +2546,12 @@ MOD20_022536C8: ; 0x022536C8 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #6 lsl r0, r0, #6 ldr r0, [r4, r0] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD20_02252EBC pop {r3, r4, r5, pc} @@ -3118,7 +3118,7 @@ MOD20_02253AA4: ; 0x02253AA4 add r2, sp, #0xc mov r3, #9 add r6, r0, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect mov r1, #4 add r0, sp, #0xc strh r1, [r0] @@ -3137,7 +3137,7 @@ MOD20_02253AA4: ; 0x02253AA4 add r0, r6, #0 lsr r1, r1, #0x18 add r2, sp, #0xc - bl FUN_02018148 + bl LoadRectToBgTilemapRect mov r1, #6 add r0, sp, #0xc strh r1, [r0] @@ -3157,7 +3157,7 @@ MOD20_02253AA4: ; 0x02253AA4 lsr r1, r1, #0x18 add r2, sp, #0xc mov r3, #0xd - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 mov r1, #0xa bl _u32_div_f @@ -3189,7 +3189,7 @@ MOD20_02253AA4: ; 0x02253AA4 lsr r1, r1, #0x18 add r2, sp, #0xc mov r3, #0xf - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #4 lsr r1, r0, #2 lsl r0, r0, #0x1e @@ -3215,7 +3215,7 @@ MOD20_02253AA4: ; 0x02253AA4 lsr r1, r1, #0x18 add r2, sp, #0xc mov r3, #0x11 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add sp, #0x14 pop {r3, r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/21/src/mod21_02254A6C.c b/arm9/modules/21/src/mod21_02254A6C.c index 040ebdaa..45b11873 100644 --- a/arm9/modules/21/src/mod21_02254A6C.c +++ b/arm9/modules/21/src/mod21_02254A6C.c @@ -25,14 +25,14 @@ extern BOOL MOD20_02253888(void *param0, void *param1); u8 const MOD21_02254D90[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 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 InitBgFromTemplate(u32 param0, u32 param1, void *param2, u32 param3); 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); +extern void BgCommitTilemapBufferToVram(u32 param0, u32 param1); +extern void FreeBgTilemapBuffer(u32 param0, u32 param1); -extern void FUN_02018170(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 *param6, u8 param7, u32 param8, u32 param9, u32 param10); +extern void CopyToBgTilemapRect(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 *param6, u8 param7, u32 param8, u32 param9, u32 param10); extern void MOD11_02252DB4(u32 param0, u32 param1); @@ -104,12 +104,12 @@ 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); + InitBgFromTemplate(strct->Unk04, 6, MOD21_02254D90, 0); 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); + BgCommitTilemapBufferToVram(strct->Unk04, 6); u32 r3 = reg_GXS_DB_DISPCNT; u32 r2 = reg_GXS_DB_DISPCNT; vu32 tmp = r3; //unused? wtf @@ -128,7 +128,7 @@ THUMB_FUNC BOOL MOD21_02254BF4(u32 param0, void *param1) #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); MOD21_02254C5C(strct); - FUN_02017CD0(strct->Unk04, 6); + BgCommitTilemapBufferToVram(strct->Unk04, 6); return MOD21_02254B4C(param1); } @@ -151,7 +151,7 @@ THUMB_FUNC BOOL MOD21_02254C40(u32 param0, void *param1) { #pragma unused (param0) UnkStruct02254A6C *strct = MOD20_022538A0(param1); - FUN_020178A0(strct->Unk04, 6); + FreeBgTilemapBuffer(strct->Unk04, 6); return MOD21_02254B4C(param1); } @@ -168,8 +168,8 @@ THUMB_FUNC void MOD21_02254C5C(UnkStruct02254A6C *param0) while (reg_CP_DIVCNT & (regaddr >> 0xb)) { } u32 divRemRes = reg_CP_DIVREM_RESULT_L; - FUN_02018170(param0->Unk04, 6, 3, 7, 4, 9, param0->Unk30, (u8)(divResult << 2), 0, 40, 9); - FUN_02018170(param0->Unk04, 6, 8, 7, 4, 9, param0->Unk30, (u8)(divRemRes << 2), 0, 40, 9); + CopyToBgTilemapRect(param0->Unk04, 6, 3, 7, 4, 9, param0->Unk30, (u8)(divResult << 2), 0, 40, 9); + CopyToBgTilemapRect(param0->Unk04, 6, 8, 7, 4, 9, param0->Unk30, (u8)(divRemRes << 2), 0, 40, 9); tmp = param0->Unk00->Unk04; reg_CP_DIVCNT = 0; @@ -182,6 +182,6 @@ THUMB_FUNC void MOD21_02254C5C(UnkStruct02254A6C *param0) while (reg_CP_DIVCNT & (regaddr >> 0xb)) { } divRemRes = reg_CP_DIVREM_RESULT_L; - FUN_02018170(param0->Unk04, 6, 15, 7, 4, 9, param0->Unk30, (u8)(divResult << 2), 0, 40, 9); - FUN_02018170(param0->Unk04, 6, 20, 7, 4, 9, param0->Unk30, (u8)(divRemRes << 2), 0, 40, 9); + CopyToBgTilemapRect(param0->Unk04, 6, 15, 7, 4, 9, param0->Unk30, (u8)(divResult << 2), 0, 40, 9); + CopyToBgTilemapRect(param0->Unk04, 6, 20, 7, 4, 9, param0->Unk30, (u8)(divRemRes << 2), 0, 40, 9); } diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s index bf11e9db..507feb01 100644 --- a/arm9/modules/22/asm/module_22.s +++ b/arm9/modules/22/asm/module_22.s @@ -875,7 +875,7 @@ MOD22_02254E8C: ; 0x02254E8C bl MOD20_02252D24 str r0, [r4, #0x5c] mov r0, #8 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] cmp r0, #0 bne _02254EBA @@ -1152,7 +1152,7 @@ MOD22_02255098: ; 0x02255098 ldr r2, _0225515C ; =MOD22_02255654 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1182,7 +1182,7 @@ MOD22_02255098: ; 0x02255098 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r7, #0 bl MOD20_022538A0 add r4, r0, #0 @@ -1356,7 +1356,7 @@ MOD22_02255230: ; 0x02255230 bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD22_02255084 pop {r3, r4, r5, pc} @@ -1384,7 +1384,7 @@ MOD22_02255268: ; 0x02255268 bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _022552A8 ; =0x00000669 bl MOD20_02252B28 add r0, r5, #0 @@ -1428,7 +1428,7 @@ _022552DC: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_022538B0 pop {r4, r5, r6, pc} @@ -1488,7 +1488,7 @@ _02255358: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _0225537A: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1549,7 +1549,7 @@ _022553D8: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _022553FA: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1597,7 +1597,7 @@ _0225543A: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02255498 ; =0x00000666 bl MOD20_02252B28 add r0, r6, #0 @@ -1623,7 +1623,7 @@ _02255468: bl MOD22_02255544 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _02255496: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1668,7 +1668,7 @@ _022554D6: bl MOD22_02255544 ldr r0, [r6, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD20_022538B0 mov r0, #0 @@ -1722,7 +1722,7 @@ MOD22_02255544: ; 0x02255544 push {r3, r4, r5, r6, r7, lr} add r4, r1, #0 mov r1, #6 - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r1, _022555A0 ; =0x00000252 mov r7, #1 add r1, r0, r1 @@ -1797,7 +1797,7 @@ _022555CC: bl MOD20_02254014 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0x84 ldr r0, [r0] diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s index 9f052087..15af3d3a 100644 --- a/arm9/modules/23/asm/module_23.s +++ b/arm9/modules/23/asm/module_23.s @@ -1153,7 +1153,7 @@ MOD23_02255088: ; 0x02255088 ldr r2, _02255118 ; =MOD23_02255D1C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1185,7 +1185,7 @@ MOD23_02255088: ; 0x02255088 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _0225511C ; =0x04001000 ldr r0, _02255120 ; =0xFFFFE0FF ldr r3, [r1] @@ -1216,7 +1216,7 @@ MOD23_02255124: ; 0x02255124 add r6, r0, #0 ldr r0, [r6, #4] mov r1, #6 - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r0, #0 ldr r3, _022551A0 ; =MOD23_02255FB8 @@ -1310,10 +1310,10 @@ MOD23_022551A4: ; 0x022551A4 ldrb r3, [r5, r3] str r0, [sp, #8] ldr r0, [r4, #4] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 add sp, #0xc @@ -1356,10 +1356,10 @@ MOD23_02255210: ; 0x02255210 ldrb r3, [r5, r3] str r0, [sp, #8] ldr r0, [r4, #4] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 add sp, #0xc @@ -1391,7 +1391,7 @@ MOD23_02255270: ; 0x02255270 bl MOD23_0225548C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1419,7 +1419,7 @@ MOD23_022552A8: ; 0x022552A8 bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1446,7 +1446,7 @@ MOD23_022552E8: ; 0x022552E8 bl MOD23_0225548C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1474,7 +1474,7 @@ MOD23_02255320: ; 0x02255320 bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1504,7 +1504,7 @@ MOD23_02255360: ; 0x02255360 bl MOD23_02255410 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r6, #0 bl MOD23_02255074 pop {r4, r5, r6, pc} @@ -1538,7 +1538,7 @@ _022553B2: bl MOD23_0225544C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD23_02255074 pop {r3, r4, r5, pc} @@ -1558,7 +1558,7 @@ MOD23_022553E4: ; 0x022553E4 bl MOD23_02255410 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD23_02255074 pop {r3, r4, r5, pc} @@ -1572,7 +1572,7 @@ MOD23_02255410: ; 0x02255410 add r5, r1, #0 mov r1, #6 add r4, r0, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer ldrh r1, [r5, #2] cmp r1, #0x11 bne _0225542E @@ -1602,7 +1602,7 @@ MOD23_0225544C: ; 0x0225544C push {lr} sub sp, #0xc mov r1, #6 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r1, #0x29 str r1, [sp] mov r1, #0x28 @@ -1625,7 +1625,7 @@ MOD23_02255470: ; 0x02255470 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD23_02255074 pop {r4, pc} @@ -1638,7 +1638,7 @@ MOD23_0225548C: ; 0x0225548C sub sp, #0x14 add r6, r1, #0 mov r1, #6 - bl FUN_0201886C + bl GetBgTilemapBuffer add r7, r0, #0 ldrh r0, [r6] mov r1, #0 diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index cdf4b770..65182148 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -621,7 +621,7 @@ MOD24_02254CA0: ; 0x02254CA0 add r4, r0, #0 beq _02254CFA mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CC0 bl GF_AssertFail @@ -631,7 +631,7 @@ _02254CC0: mov r1, #0x10 bl MOD20_022536F4 mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CD8 bl GF_AssertFail @@ -642,7 +642,7 @@ _02254CD8: bl MOD20_02252D24 str r0, [r4, #0x50] mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CF4 bl GF_AssertFail @@ -668,7 +668,7 @@ MOD24_02254D00: ; 0x02254D00 beq _02254D3C ldr r0, [r4, #4] ldr r2, _02254D40 ; =MOD24_0225510C - bl FUN_02019150 + bl AddWindow mov r2, #0xbe ldr r1, [r4] ldr r0, _02254D44 ; =0x000016E8 @@ -699,7 +699,7 @@ MOD24_02254D48: ; 0x02254D48 add r4, r0, #0 beq _02254D84 mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254D5C bl GF_AssertFail @@ -715,7 +715,7 @@ _02254D5C: lsl r2, r2, #6 bl FUN_02089444 ldr r0, [r4, #0x70] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x70] bl FreeToHeap _02254D7E: @@ -783,7 +783,7 @@ MOD24_02254DDC: ; 0x02254DDC sub sp, #0x14 mov r0, #8 add r4, r1, #0 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254DF0 bl GF_AssertFail @@ -795,14 +795,14 @@ _02254DF0: ldr r2, _02254ED0 ; =MOD24_02255114 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _02254ED4 ; =MOD24_02255130 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E1E bl GF_AssertFail @@ -835,7 +835,7 @@ _02254E1E: add r1, r0, #0 bl MOD20_02252D7C mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E68 bl GF_AssertFail @@ -845,7 +845,7 @@ _02254E68: ldr r0, [r5, #0x70] bl CopyWindowToVram mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E82 bl GF_AssertFail @@ -853,14 +853,14 @@ _02254E82: add r0, r5, #0 bl MOD24_02255078 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E96 bl GF_AssertFail _02254E96: ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254ED8 ; =0x04001000 ldr r0, _02254EDC ; =0xFFFFE0FF ldr r3, [r1] @@ -877,7 +877,7 @@ _02254E96: add r0, r4, #0 bl MOD24_02254DC8 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254ECC bl GF_AssertFail @@ -932,7 +932,7 @@ MOD24_02254F28: ; 0x02254F28 add r0, r4, #0 bl MOD20_022538A0 ldr r0, [r0, #0x70] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD24_02254DC8 pop {r4, pc} @@ -1072,7 +1072,7 @@ MOD24_02255038: ; 0x02255038 add r0, r4, #0 bl MOD20_022538A0 ldr r0, [r0, #0x70] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD24_02254DC8 pop {r4, pc} @@ -1088,10 +1088,10 @@ MOD24_02255050: ; 0x02255050 bl MOD24_022550D4 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD24_02254DC8 pop {r3, r4, r5, pc} diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index 5e70bbbe..69efec33 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -428,7 +428,7 @@ MOD25_02254B34: ; 0x02254B34 ldr r2, _02254BBC ; =MOD25_02254D08 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -460,7 +460,7 @@ MOD25_02254B34: ; 0x02254B34 bl MOD25_02254C30 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BC0 ; =0x04001000 ldr r0, _02254BC4 ; =0xFFFFE0FF ldr r3, [r1] @@ -494,7 +494,7 @@ MOD25_02254BC8: ; 0x02254BC8 bl MOD25_02254C30 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD25_02254B20 pop {r3, r4, r5, pc} @@ -532,7 +532,7 @@ MOD25_02254C14: ; 0x02254C14 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD25_02254B20 pop {r4, pc} diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s index 6d8828a0..251ea218 100644 --- a/arm9/modules/26/asm/module_26.s +++ b/arm9/modules/26/asm/module_26.s @@ -590,7 +590,7 @@ MOD26_02254C60: ; 0x02254C60 ldr r2, _02254CB8 ; =MOD26_02254FD4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] bl MOD26_02254CC4 ldr r0, [r5, #4] @@ -601,7 +601,7 @@ MOD26_02254C60: ; 0x02254C60 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254CBC ; =0x04001000 ldr r0, _02254CC0 ; =0xFFFFE0FF ldr r3, [r1] @@ -702,7 +702,7 @@ _02254CEC: ldr r2, [sp, #0x1c] mov r1, #6 lsl r3, r3, #8 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [sp, #0x1c] bl FreeToHeap _02254D68: @@ -722,7 +722,7 @@ MOD26_02254D6C: ; 0x02254D6C bl MOD26_02254DAC ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD26_02254C4C pop {r3, r4, r5, pc} @@ -736,7 +736,7 @@ MOD26_02254D90: ; 0x02254D90 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD26_02254C4C pop {r4, pc} @@ -748,7 +748,7 @@ MOD26_02254DAC: ; 0x02254DAC push {r3, r4, r5, r6, r7, lr} add r4, r1, #0 mov r1, #6 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r5, #0 ldr r1, _02254DE0 ; =MOD26_02254FD0 add r0, #0x84 diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 25e4a4b6..c2c6c837 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -516,7 +516,7 @@ MOD27_02254C08: ; 0x02254C08 ldr r2, _02254CBC ; =MOD27_02255378 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -540,7 +540,7 @@ MOD27_02254C08: ; 0x02254C08 ldr r0, [r4, #4] mov r1, #6 mov r2, #5 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -551,7 +551,7 @@ MOD27_02254C08: ; 0x02254C08 bl MOD27_02254CC8 ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0xf mov r1, #1 bl MOD20_0225396C @@ -631,9 +631,9 @@ _02254CE8: lsl r3, r3, #0x18 ldr r0, [r0, #4] lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 - bl FUN_02019270 + bl PutWindowTilemap ldr r1, [sp, #0x14] add r0, r4, #0 bl MOD27_02254D60 @@ -686,7 +686,7 @@ MOD27_02254D60: ; 0x02254D60 sub r3, r3, #1 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldrb r0, [r5, #6] mov r1, #6 mov r2, #2 @@ -702,7 +702,7 @@ MOD27_02254D60: ; 0x02254D60 str r0, [sp, #0xc] ldrb r3, [r5, #5] ldr r0, [r4, #4] - bl FUN_02018540 + bl FillBgTilemapRect ldrb r0, [r5, #6] ldr r2, _02254E98 ; =0x00000401 mov r1, #6 @@ -721,7 +721,7 @@ MOD27_02254D60: ; 0x02254D60 add r3, r6, r3 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldrb r0, [r5, #6] mov r1, #6 add r2, r1, #0 @@ -737,7 +737,7 @@ MOD27_02254D60: ; 0x02254D60 sub r3, r3, #1 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldrb r0, [r5, #6] ldr r2, _02254E9C ; =0x00000406 mov r1, #6 @@ -754,7 +754,7 @@ MOD27_02254D60: ; 0x02254D60 add r3, r6, r3 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldrb r1, [r5, #6] ldrb r0, [r5, #8] ldr r2, _02254EA0 ; =0x00000801 @@ -773,7 +773,7 @@ MOD27_02254D60: ; 0x02254D60 sub r3, r3, #1 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldrb r1, [r5, #6] ldrb r0, [r5, #8] ldr r2, _02254EA4 ; =0x00000802 @@ -790,7 +790,7 @@ MOD27_02254D60: ; 0x02254D60 str r0, [sp, #0xc] ldrb r3, [r5, #5] ldr r0, [r4, #4] - bl FUN_02018540 + bl FillBgTilemapRect ldrb r1, [r5, #6] ldrb r0, [r5, #8] ldr r2, _02254EA8 ; =0x00000C01 @@ -810,7 +810,7 @@ MOD27_02254D60: ; 0x02254D60 add r3, r4, r3 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -849,7 +849,7 @@ MOD27_02254EAC: ; 0x02254EAC bl FillWindowPixelRect _02254EE0: add r0, r5, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #8 pop {r3, r4, r5, pc} .align 2, 0 @@ -1361,7 +1361,7 @@ _02255288: add r4, #0x3c _0225529C: add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #0x38] add r6, r6, #1 add r4, #0x10 @@ -1382,7 +1382,7 @@ MOD27_022552B4: ; 0x022552B4 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD27_02254BF4 pop {r4, pc} @@ -1412,7 +1412,7 @@ MOD27_022552D0: ; 0x022552D0 ldr r0, [r5, #4] mov r1, #6 mov r2, #5 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r5, #0 add r1, r4, #0 bl MOD27_02254F18 @@ -1425,7 +1425,7 @@ MOD27_022552D0: ; 0x022552D0 bl MOD27_02254CC8 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02255338 ; =0x00000669 bl MOD20_02252B28 add r0, r6, #0 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 04176ba5..ee242492 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -547,7 +547,7 @@ MOD28_02254C18: ; 0x02254C18 ldr r2, _02254CA8 ; =MOD28_02255ED8 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -570,13 +570,13 @@ MOD28_02254C18: ; 0x02254C18 ldr r0, [r5, #4] mov r1, #6 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, [r5] add r0, r5, #0 bl MOD28_02254CB4 @@ -915,7 +915,7 @@ MOD28_02254F18: ; 0x02254F18 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD28_02254C04 pop {r4, pc} diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index 9fb45a65..061b078c 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -672,7 +672,7 @@ MOD29_02254D10: ; 0x02254D10 ldr r2, _02254DE8 ; =MOD29_022550E0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -737,7 +737,7 @@ MOD29_02254D10: ; 0x02254D10 bl GXS_LoadOBJPltt ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254DEC ; =0x04001000 ldr r0, _02254DF0 ; =0xFFFFE0FF ldr r3, [r1] @@ -771,7 +771,7 @@ MOD29_02254DF4: ; 0x02254DF4 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD29_02254CFC pop {r4, pc} diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s index 5daf123f..69e08586 100644 --- a/arm9/modules/30/asm/module_30.s +++ b/arm9/modules/30/asm/module_30.s @@ -536,7 +536,7 @@ MOD30_02254C18: ; 0x02254C18 ldr r2, _02254C9C ; =MOD30_02254DD0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -566,7 +566,7 @@ MOD30_02254C18: ; 0x02254C18 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254CA0 ; =0x04001000 ldr r0, _02254CA4 ; =0xFFFFE0FF ldr r3, [r1] @@ -598,7 +598,7 @@ MOD30_02254CA8: ; 0x02254CA8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD30_02254C04 pop {r4, pc} diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s index 5e45ce23..e565a1cf 100644 --- a/arm9/modules/31/asm/module_31.s +++ b/arm9/modules/31/asm/module_31.s @@ -526,7 +526,7 @@ MOD31_02254C0C: ; 0x02254C0C ldr r2, _02254C90 ; =MOD31_02254DC8 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -556,7 +556,7 @@ MOD31_02254C0C: ; 0x02254C0C bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254C94 ; =0x04001000 ldr r0, _02254C98 ; =0xFFFFE0FF ldr r3, [r1] @@ -588,7 +588,7 @@ MOD31_02254C9C: ; 0x02254C9C bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD31_02254BF8 pop {r4, pc} diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s index c928dd1a..b78a206b 100644 --- a/arm9/modules/32/asm/module_32.s +++ b/arm9/modules/32/asm/module_32.s @@ -453,7 +453,7 @@ MOD32_02254B58: ; 0x02254B58 ldr r2, _02254BDC ; =MOD32_02254C78 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -483,7 +483,7 @@ MOD32_02254B58: ; 0x02254B58 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BE0 ; =0x04001000 ldr r0, _02254BE4 ; =0xFFFFE0FF ldr r3, [r1] @@ -517,7 +517,7 @@ MOD32_02254BE8: ; 0x02254BE8 bl MOD32_02254AF0 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD32_02254B44 pop {r3, r4, r5, pc} diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s index 55ccf203..a0c3782f 100644 --- a/arm9/modules/33/asm/module_33.s +++ b/arm9/modules/33/asm/module_33.s @@ -303,7 +303,7 @@ MOD33_02254A38: ; 0x02254A38 ldr r2, _02254ACC ; =MOD33_02254B00 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -324,7 +324,7 @@ MOD33_02254A38: ; 0x02254A38 ldr r0, [r5, #4] mov r1, #6 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x20 str r0, [sp] mov r0, #8 @@ -340,7 +340,7 @@ MOD33_02254A38: ; 0x02254A38 bl MOD20_02253AA4 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254AD0 ; =0x04001000 ldr r0, _02254AD4 ; =0xFFFFE0FF ldr r3, [r1] @@ -372,7 +372,7 @@ MOD33_02254AD8: ; 0x02254AD8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD33_02254A24 pop {r4, pc} diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s index ddc4f587..02906b7f 100644 --- a/arm9/modules/34/asm/module_34.s +++ b/arm9/modules/34/asm/module_34.s @@ -395,7 +395,7 @@ MOD34_02254AE8: ; 0x02254AE8 ldr r2, _02254B8C ; =MOD34_02254CA0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -437,7 +437,7 @@ _02254B4A: blt _02254B4A ldr r0, [r6, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _02254B90 ; =0x04001000 ldr r1, _02254B94 ; =0xFFFFE0FF ldr r2, [r0] @@ -470,7 +470,7 @@ MOD34_02254B98: ; 0x02254B98 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD34_02254AD4 pop {r4, pc} @@ -496,7 +496,7 @@ MOD34_02254BB4: ; 0x02254BB4 bl MOD34_02254C1C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD34_02254AD4 pop {r3, r4, r5, pc} @@ -521,7 +521,7 @@ MOD34_02254BE8: ; 0x02254BE8 bl MOD34_02254C1C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl MOD34_02254AD4 pop {r3, r4, r5, pc} @@ -535,7 +535,7 @@ MOD34_02254C1C: ; 0x02254C1C mov r1, #6 add r4, r2, #0 add r6, r3, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r1, _02254C6C ; =MOD34_02254C94 lsl r2, r5, #1 ldrh r1, [r1, r2] diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index f73ad3ff..84225174 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -597,7 +597,7 @@ MOD35_02254C98: ; 0x02254C98 ldr r2, _02254D24 ; =MOD35_022550C4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -627,7 +627,7 @@ MOD35_02254C98: ; 0x02254C98 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254D28 ; =0x0400104C mov r0, #0 strb r0, [r1] @@ -688,7 +688,7 @@ _02254D5A: strb r1, [r0, #1] ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD35_02254C84 _02254D7C: diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index 0149e180..617d957c 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -981,7 +981,7 @@ MOD36_02254F5C: ; 0x02254F5C sub sp, #0x14 mov r0, #8 add r5, r1, #0 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254F70 bl GF_AssertFail @@ -993,14 +993,14 @@ _02254F70: ldr r2, _0225502C ; =MOD36_02255408 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _02255030 ; =MOD36_02255424 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254F9E bl GF_AssertFail @@ -1034,7 +1034,7 @@ _02254F9E: add r1, r0, #0 bl MOD20_02252D7C mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254FEA bl GF_AssertFail @@ -1044,7 +1044,7 @@ _02254FEA: bl MOD36_0225503C ldr r0, [r4, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02255034 ; =0x04001000 ldr r0, _02255038 ; =0xFFFFE0FF ldr r3, [r1] @@ -1061,7 +1061,7 @@ _02254FEA: add r0, r5, #0 bl MOD36_02254F48 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02255028 bl GF_AssertFail @@ -1096,7 +1096,7 @@ MOD36_0225503C: ; 0x0225503C add r1, r4, #0 ldr r0, [r4, #4] add r1, #0x48 - bl FUN_02019150 + bl AddWindow ldr r0, [r4] mov r2, #0xbe ldr r0, [r0, #8] @@ -1112,10 +1112,10 @@ MOD36_0225503C: ; 0x0225503C _02255082: add r0, r4, #0 add r0, #0x48 - bl FUN_02019270 + bl PutWindowTilemap add r4, #0x48 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #8 pop {r3, r4, r5, pc} nop @@ -1151,13 +1151,13 @@ _022550C4: bl FUN_02089444 add r0, r4, #0 add r0, #0x48 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD36_02254F48 pop {r3, r4, r5, pc} @@ -1171,7 +1171,7 @@ MOD36_022550F4: ; 0x022550F4 add r0, r4, #0 bl MOD20_022538A0 add r0, #0x48 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD36_02254F48 pop {r4, pc} @@ -1228,7 +1228,7 @@ MOD36_02255164: ; 0x02255164 add r0, r4, #0 bl MOD20_022538A0 add r0, #0x48 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl MOD36_02254F48 pop {r4, pc} @@ -1301,7 +1301,7 @@ MOD36_022551E0: ; 0x022551E0 bl FillWindowPixelBuffer add r4, #0x48 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r5, #0 bl MOD36_02254F48 pop {r3, r4, r5, pc} diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s index c2f1439a..313343b5 100644 --- a/arm9/modules/37/asm/module_37.s +++ b/arm9/modules/37/asm/module_37.s @@ -459,7 +459,7 @@ MOD37_02254B70: ; 0x02254B70 ldr r2, _02254BF4 ; =MOD37_02254D44 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -489,7 +489,7 @@ MOD37_02254B70: ; 0x02254B70 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BF8 ; =0x04001000 ldr r0, _02254BFC ; =0xFFFFE0FF ldr r3, [r1] @@ -540,7 +540,7 @@ _02254C26: beq _02254C40 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD37_02254B5C _02254C40: diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index ee5980ec..bf495f60 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -741,7 +741,7 @@ MOD38_02254D84: ; 0x02254D84 ldr r2, _02254E1C ; =MOD38_0225529C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -776,7 +776,7 @@ MOD38_02254D84: ; 0x02254D84 bl MOD38_02254E28 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254E20 ; =0x04001000 ldr r0, _02254E24 ; =0xFFFFE0FF ldr r3, [r1] @@ -822,7 +822,7 @@ MOD38_02254E28: ; 0x02254E28 ldr r0, [r5, #4] add r1, #0x74 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #4 str r0, [sp] mov r2, #6 @@ -840,7 +840,7 @@ MOD38_02254E28: ; 0x02254E28 ldr r0, [r5, #4] add r1, #0x84 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #8 str r0, [sp] mov r2, #6 @@ -858,7 +858,7 @@ MOD38_02254E28: ; 0x02254E28 ldr r0, [r5, #4] add r1, #0x94 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x16 @@ -876,19 +876,19 @@ MOD38_02254E28: ; 0x02254E28 add r1, #0xa4 mov r2, #6 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x74 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 add r0, #0x84 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 add r0, #0x94 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 add r0, #0xa4 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 add r1, r6, #0 bl MOD38_02254FCC @@ -902,16 +902,16 @@ MOD38_02254EF4: ; 0x02254EF4 push {r4, lr} add r4, r0, #0 add r0, #0x74 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x84 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x94 - bl FUN_02019178 + bl RemoveWindow add r4, #0xa4 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_end MOD38_02254EF4 @@ -925,7 +925,7 @@ MOD38_02254F18: ; 0x02254F18 bl MOD38_02254EF4 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD38_02254D70 pop {r3, r4, r5, pc} @@ -1090,7 +1090,7 @@ _02255048: lsr r3, r3, #1 bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 @@ -1128,7 +1128,7 @@ MOD38_02255084: ; 0x02255084 add r3, r1, #0 bl AddTextPrinterParameterized2 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index da3f83f4..2fdb4637 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -788,7 +788,7 @@ MOD39_02254DF4: ; 0x02254DF4 ldr r2, _02254E7C ; =MOD39_02255330 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -818,7 +818,7 @@ MOD39_02254DF4: ; 0x02254DF4 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254E80 ; =0x04001000 ldr r0, _02254E84 ; =0xFFFFE0FF ldr r3, [r1] @@ -870,7 +870,7 @@ _02254EB0: beq _02254ECA ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD39_02254DE0 _02254ECA: diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index 13c9a94f..62231a53 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -1038,7 +1038,7 @@ MOD40_02254FE8: ; 0x02254FE8 ldr r2, _0225506C ; =MOD40_02255340 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1068,7 +1068,7 @@ MOD40_02254FE8: ; 0x02254FE8 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02255070 ; =0x04001000 ldr r0, _02255074 ; =0xFFFFE0FF ldr r3, [r1] @@ -1120,7 +1120,7 @@ _022550A2: beq _022550BC ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD40_02254FD4 _022550BC: diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s index 4d1afb06..939ea649 100644 --- a/arm9/modules/41/asm/module_41.s +++ b/arm9/modules/41/asm/module_41.s @@ -1561,7 +1561,7 @@ MOD41_022553F4: ; 0x022553F4 ldr r2, _022554CC ; =MOD41_022557DC mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1591,7 +1591,7 @@ MOD41_022553F4: ; 0x022553F4 bl MOD20_02252D7C ldr r0, [r4, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _022554D0 ; =0x04001000 ldr r0, _022554D4 ; =0xFFFFE0FF ldr r3, [r1] @@ -1686,7 +1686,7 @@ _02255508: beq _02255522 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD41_022553E0 _02255522: diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index 03136570..9e502906 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -953,7 +953,7 @@ MOD42_02254F3C: ; 0x02254F3C ldr r2, _02254FC0 ; =MOD42_022550DC mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -983,7 +983,7 @@ MOD42_02254F3C: ; 0x02254F3C bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254FC4 ; =0x04001000 ldr r0, _02254FC8 ; =0xFFFFE0FF ldr r3, [r1] @@ -1015,7 +1015,7 @@ MOD42_02254FCC: ; 0x02254FCC bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD42_02254F28 pop {r4, pc} diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index ce3da4bb..59f7e81d 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -561,7 +561,7 @@ MOD43_02254C28: ; 0x02254C28 ldr r0, [r5, #4] ldr r2, _02254CC4 ; =MOD43_022551A0 mov r1, #6 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -595,7 +595,7 @@ MOD43_02254C28: ; 0x02254C28 bl MOD43_02254CD0 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254CC8 ; =0x04001000 ldr r0, _02254CCC ; =0xFFFFE0FF ldr r3, [r1] @@ -651,7 +651,7 @@ MOD43_02254CD0: ; 0x02254CD0 add r1, sp, #0x14 mov r2, #6 mov r3, #0x12 - bl FUN_02019064 + bl AddWindowParameterized add r0, sp, #0x14 mov r1, #4 bl FillWindowPixelBuffer @@ -667,11 +667,11 @@ MOD43_02254CD0: ; 0x02254CD0 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, sp, #0x14 - bl FUN_02019270 + bl PutWindowTilemap add r0, sp, #0x14 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, sp, #0x14 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 bl String_dtor _02254D44: @@ -717,7 +717,7 @@ _02254D78: strb r1, [r0, #1] ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD43_02254C14 _02254DA0: diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s index 19726565..b8f5aa0b 100644 --- a/arm9/modules/44/asm/module_44.s +++ b/arm9/modules/44/asm/module_44.s @@ -456,7 +456,7 @@ MOD44_02254B64: ; 0x02254B64 ldr r2, _02254BEC ; =MOD44_02254C70 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -486,7 +486,7 @@ MOD44_02254B64: ; 0x02254B64 bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254BF0 ; =0x04001000 ldr r0, _02254BF4 ; =0xFFFFE0FF ldr r3, [r1] @@ -518,7 +518,7 @@ MOD44_02254BF8: ; 0x02254BF8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD44_02254B50 pop {r4, pc} diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index 95cf3fbc..4f710dc6 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -637,12 +637,12 @@ MOD45_02254CCC: ; 0x02254CCC ldr r2, _02254D60 ; =MOD45_022550FC mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _02254D64 ; =MOD45_022550E0 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 add r1, r4, #0 bl MOD45_02254DDC @@ -666,10 +666,10 @@ MOD45_02254CCC: ; 0x02254CCC bl MOD20_02252D7C ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254D68 ; =0x04001000 ldr r0, _02254D6C ; =0xFFFFE0FF ldr r3, [r1] @@ -703,10 +703,10 @@ MOD45_02254D70: ; 0x02254D70 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD45_02254CB8 pop {r3, r4, r5, pc} @@ -742,7 +742,7 @@ _02254DBC: bl MOD45_02254E28 ldr r0, [r5, #4] mov r1, #7 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD45_02254CB8 pop {r3, r4, r5, pc} @@ -825,7 +825,7 @@ MOD45_02254E28: ; 0x02254E28 mov r1, #7 add r2, r6, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -846,7 +846,7 @@ MOD45_02254E74: ; 0x02254E74 ldr r0, [r7, #4] mov r1, #6 mov r2, #0x82 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r7, #4] ldr r1, [r6] bl MOD45_02254EBC @@ -902,7 +902,7 @@ _02254ED6: mov r1, #6 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r5, r5, #1 cmp r5, #4 blt _02254ED6 @@ -975,7 +975,7 @@ _02254F46: mov r1, #6 add r2, r7, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r5, #1 lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -992,7 +992,7 @@ _02254F46: mov r1, #6 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect _02254FAE: mov r0, #0x14 add r3, r6, #0 @@ -1016,7 +1016,7 @@ _02254FAE: mov r1, #6 add r2, r6, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r5, #1 lsl r0, r0, #0x18 lsr r0, r0, #0x18 @@ -1034,7 +1034,7 @@ _02254FAE: mov r1, #6 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s index 66418468..aecfd51d 100644 --- a/arm9/modules/46/asm/module_46.s +++ b/arm9/modules/46/asm/module_46.s @@ -303,7 +303,7 @@ MOD46_02254A38: ; 0x02254A38 ldr r2, _02254ACC ; =MOD46_02254B00 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -324,7 +324,7 @@ MOD46_02254A38: ; 0x02254A38 ldr r0, [r5, #4] mov r1, #6 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x20 str r0, [sp] mov r0, #8 @@ -340,7 +340,7 @@ MOD46_02254A38: ; 0x02254A38 bl MOD20_02253AA4 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254AD0 ; =0x04001000 ldr r0, _02254AD4 ; =0xFFFFE0FF ldr r3, [r1] @@ -372,7 +372,7 @@ MOD46_02254AD8: ; 0x02254AD8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD46_02254A24 pop {r4, pc} diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index 3cd1bb32..48bd9b4a 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -877,7 +877,7 @@ MOD47_02254E74: ; 0x02254E74 ldr r2, _02254F28 ; =MOD47_022553F4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -921,15 +921,15 @@ MOD47_02254E74: ; 0x02254E74 ldr r0, [r5, #4] add r1, #0x20 mov r2, #6 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x20 - bl FUN_02019270 + bl PutWindowTilemap add r0, r5, #0 bl MOD47_022550FC ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254F2C ; =0x04001000 ldr r0, _02254F30 ; =0xFFFFE0FF ldr r3, [r1] @@ -961,10 +961,10 @@ MOD47_02254F34: ; 0x02254F34 bl MOD20_022538A0 add r4, r0, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD47_02254E60 pop {r3, r4, r5, pc} @@ -1211,7 +1211,7 @@ MOD47_022550FC: ; 0x022550FC bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} nop @@ -1251,7 +1251,7 @@ MOD47_02255184: ; 0x02255184 bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} nop @@ -1308,7 +1308,7 @@ MOD47_022551D8: ; 0x022551D8 bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -1371,7 +1371,7 @@ MOD47_02255250: ; 0x02255250 bl AddTextPrinterParameterized2 add r4, #0x20 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} nop @@ -1464,7 +1464,7 @@ _0225532C: blt _0225532C add r5, #0x20 add r0, r5, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index 8dfd4e0a..1aff0df2 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -426,7 +426,7 @@ MOD48_02254B30: ; 0x02254B30 ldr r2, _02254BBC ; =MOD48_02254F78 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -490,7 +490,7 @@ MOD48_02254BC8: ; 0x02254BC8 bl MOD48_02254EC0 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD48_02254B1C pop {r3, r4, r5, pc} diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index 1de7ea96..68c7625e 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -384,14 +384,14 @@ MOD49_02254AD4: ; 0x02254AD4 ldr r2, _02254BD0 ; =MOD49_02254D20 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] ldr r0, [r5, #4] mov r1, #6 mov r2, #4 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -402,7 +402,7 @@ MOD49_02254AD4: ; 0x02254AD4 ldr r0, [r5, #4] mov r1, #6 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C @@ -418,12 +418,12 @@ MOD49_02254AD4: ; 0x02254AD4 ldr r0, [r5, #4] add r1, sp, #0x1c mov r2, #6 - bl FUN_02019064 + bl AddWindowParameterized add r0, sp, #0x1c mov r1, #4 bl FillWindowPixelBuffer add r0, sp, #0x1c - bl FUN_02019270 + bl PutWindowTilemap ldr r1, _02254BD4 ; =0x00000197 mov r0, #0x1a mov r2, #0 @@ -450,15 +450,15 @@ MOD49_02254AD4: ; 0x02254AD4 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, sp, #0x1c - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 bl String_dtor _02254B94: add r0, sp, #0x1c - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, [sp, #0x14] add r0, r5, #0 bl MOD49_02254C04 @@ -497,7 +497,7 @@ MOD49_02254BE4: ; 0x02254BE4 bl MOD49_02254CB8 ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r5, #0 bl MOD49_02254AC0 pop {r3, r4, r5, pc} diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s index 5d80d9b6..fc52f7fa 100644 --- a/arm9/modules/50/asm/module_50.s +++ b/arm9/modules/50/asm/module_50.s @@ -221,7 +221,7 @@ MOD50_022549AC: ; 0x022549AC bl MOD20_022536F4 mov r0, #8 str r6, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] cmp r0, #0 beq _022549DA @@ -312,7 +312,7 @@ MOD50_02254A48: ; 0x02254A48 ldr r2, _02254ADC ; =MOD50_02254B10 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -333,7 +333,7 @@ MOD50_02254A48: ; 0x02254A48 ldr r0, [r5, #4] mov r1, #6 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x20 str r0, [sp] mov r0, #8 @@ -350,7 +350,7 @@ MOD50_02254A48: ; 0x02254A48 bl MOD20_02253AA4 ldr r0, [r5, #4] mov r1, #6 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _02254AE0 ; =0x04001000 ldr r0, _02254AE4 ; =0xFFFFE0FF ldr r3, [r1] @@ -382,7 +382,7 @@ MOD50_02254AE8: ; 0x02254AE8 bl MOD20_022538A0 ldr r0, [r0, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD50_02254A34 pop {r4, pc} diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 4642f8c1..3406537b 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -162,7 +162,7 @@ _02254960: add r1, r5, #0 lsr r2, r2, #0x18 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -189,7 +189,7 @@ _02254960: add r1, #0x10 lsr r2, r2, #0x18 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x10 mov r1, #0 @@ -217,7 +217,7 @@ _02254960: add r1, #0x20 lsr r2, r2, #0x18 mov r3, #0xc - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x20 mov r1, #0 @@ -256,12 +256,12 @@ MOD51_02254A40: ; 0x02254A40 _02254A46: add r0, r5, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0x20 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x38 cmp r4, #3 @@ -370,16 +370,16 @@ MOD51_02254B30: ; 0x02254B30 push {r4, lr} add r4, r0, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD51_02254B30 @@ -403,10 +403,10 @@ MOD51_02254B54: ; 0x02254B54 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #1 mov r1, #0 bl GX_EngineBToggleLayers @@ -424,10 +424,10 @@ MOD51_02254B54: ; 0x02254B54 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #0 bl GX_EngineBToggleLayers @@ -445,10 +445,10 @@ MOD51_02254B54: ; 0x02254B54 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #4 mov r1, #0 bl GX_EngineBToggleLayers @@ -466,7 +466,7 @@ MOD51_02254B54: ; 0x02254B54 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #8 mov r1, #0 bl GX_EngineBToggleLayers @@ -786,7 +786,7 @@ MOD51_02254E48: ; 0x02254E48 mov r1, #7 add r2, r7, #0 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r0, #0x72 lsl r0, r0, #2 add r7, r5, r0 @@ -832,10 +832,10 @@ MOD51_02254E48: ; 0x02254E48 mov r1, #1 bl AddTextPrinterParameterized2 add r0, r7, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x1c] add r0, r0, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r2, [r6, #8] cmp r2, #0 beq _02254F22 @@ -852,7 +852,7 @@ MOD51_02254E48: ; 0x02254E48 bl AddTextPrinterParameterized2 _02254F22: add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -927,13 +927,13 @@ _02254F88: _02254FB0: ldr r0, [r5, #0x14] mov r1, #7 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r1, #6 lsl r1, r1, #8 bl DC_FlushRange ldr r0, [r5, #0x14] mov r1, #7 - bl FUN_0201886C + bl GetBgTilemapBuffer add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -941,7 +941,7 @@ _02254FB0: ldr r0, [r5, #0x14] mov r1, #7 lsl r3, r3, #8 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram mov r0, #0xa1 mov r1, #0 lsl r0, r0, #2 @@ -1088,7 +1088,7 @@ _022550D4: cmp r0, #0 beq _022551CA ldr r0, _022551DC ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE mov r0, #0x9e lsl r0, r0, #2 ldrh r1, [r5, r0] @@ -1112,7 +1112,7 @@ _02255100: cmp r1, r0 bge _022551CA ldr r0, _022551DC ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE mov r0, #0x9e lsl r0, r0, #2 ldrh r1, [r5, r0] @@ -1163,7 +1163,7 @@ _02255160: cmp r0, r1 bne _0225519C ldr r0, _022551DC ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE mov r1, #0x18 ldr r2, [r5, #4] mul r1, r4 @@ -1188,7 +1188,7 @@ _022551A4: cmp r1, r0 bne _022551CA ldr r0, _022551DC ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE ldr r1, [r5, #4] ldr r0, _022551E0 ; =0x000004BF mov r2, #1 @@ -1322,7 +1322,7 @@ MOD51_02255294: ; 0x02255294 sub r1, r1, #1 strh r1, [r4, r0] ldr r0, _022552F8 ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _022552C6: lsr r0, r1, #1 @@ -1343,7 +1343,7 @@ _022552C6: add r1, r2, #1 strh r1, [r4, r0] ldr r0, _022552F8 ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE _022552F0: pop {r4, pc} nop @@ -1487,7 +1487,7 @@ _022553BE: ldr r0, [sp, #0x1c] mov r1, #7 mov r2, #0 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r3, [sp, #0x24] add r1, r4, #4 lsl r6, r3, #2 @@ -1497,7 +1497,7 @@ _022553BE: ldr r3, [r3, r6] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [sp, #0x40] add r4, r4, #1 add r5, #0x38 @@ -1507,13 +1507,13 @@ _022553BE: _02255422: ldr r0, [sp, #0x1c] mov r1, #7 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r1, #6 lsl r1, r1, #8 bl DC_FlushRange ldr r0, [sp, #0x1c] mov r1, #7 - bl FUN_0201886C + bl GetBgTilemapBuffer add r2, r0, #0 mov r0, #0 str r0, [sp] @@ -1521,7 +1521,7 @@ _02255422: ldr r0, [sp, #0x1c] mov r1, #7 lsl r3, r3, #8 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1946,4 +1946,3 @@ MOD51_022557C4: ; 0x022557C4 .global MOD51_02255800 MOD51_02255800: ; 0x02255800 .space 0x4 - diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c index 41f2706a..08da79f4 100644 --- a/arm9/modules/52/src/module_52.c +++ b/arm9/modules/52/src/module_52.c @@ -159,7 +159,7 @@ THUMB_FUNC BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_0201681C(3, 0x4d, 2 << 16); + CreateHeap(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; @@ -179,7 +179,7 @@ THUMB_FUNC BOOL MOD52_021D750C(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_020168D0(0x4d); + DestroyHeap(0x4d); RegisterMainOverlay(0XFFFFFFFF, &UNK_020FD144); return 1; @@ -189,7 +189,7 @@ THUMB_FUNC BOOL MOD52_021D7528(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_0201681C(3, 0x4d, 2 << 16); + CreateHeap(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; @@ -211,7 +211,7 @@ THUMB_FUNC BOOL MOD52_021D7560(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_020168D0(0x4d); + DestroyHeap(0x4d); RegisterMainOverlay(0xFFFFFFFF, &UNK_020F2B7C); return 1; @@ -221,7 +221,7 @@ THUMB_FUNC BOOL MOD52_021D757C(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_0201681C(3, 0x4d, 2 << 16); + CreateHeap(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; @@ -252,7 +252,7 @@ THUMB_FUNC BOOL MOD52_021D75E8(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_020168D0(0x4d); + DestroyHeap(0x4d); RegisterMainOverlay(0XFFFFFFFF, &UNK_020F2B8C); return 1; diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index d070f979..0bff7b6e 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -37,7 +37,7 @@ _021D74F6: mov r0, #3 mov r1, #0x27 lsl r2, r2, #6 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7640 ; =0x0000940C add r0, r6, #0 mov r2, #0x27 @@ -47,7 +47,7 @@ _021D74F6: add r4, r0, #0 bl memset mov r0, #0x27 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] mov r0, #0x27 bl ScrStrBufs_new @@ -60,7 +60,7 @@ _021D74F6: str r0, [r4, #0x10] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD53_021D78D0 ldr r0, [r4] bl MOD53_021D78F0 @@ -417,7 +417,7 @@ _021D786E: add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x27 - bl FUN_020168D0 + bl DestroyHeap mov r0, #2 bl FUN_02032B6C mov r0, #1 @@ -436,7 +436,7 @@ MOD53_021D78A8: ; 0x021D78A8 bl FUN_0201C30C bl FUN_02009F80 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D78C8 ; =0x027E0000 ldr r1, _021D78CC ; =0x00003FF8 mov r0, #1 @@ -482,7 +482,7 @@ MOD53_021D78F0: ; 0x021D78F0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D79E4 ; =0x021D9518 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -497,10 +497,10 @@ MOD53_021D78F0: ; 0x021D78F0 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D79E8 ; =0x021D9550 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -515,10 +515,10 @@ MOD53_021D78F0: ; 0x021D78F0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D79EC ; =0x021D956C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -533,7 +533,7 @@ MOD53_021D78F0: ; 0x021D78F0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D79F0 ; =0x021D9588 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -548,10 +548,10 @@ MOD53_021D78F0: ; 0x021D78F0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D79F4 ; =0x021D9534 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -566,17 +566,17 @@ MOD53_021D78F0: ; 0x021D78F0 add r0, r4, #0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4, r5, pc} nop @@ -732,22 +732,22 @@ MOD53_021D7B24: ; 0x021D7B24 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -1320,7 +1320,7 @@ MOD53_021D7FDC: ; 0x021D7FDC add r1, r7, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb6 lsl r0, r0, #2 add r0, r7, r0 @@ -1341,7 +1341,7 @@ MOD53_021D7FDC: ; 0x021D7FDC ldr r0, [r7] add r1, r7, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb2 lsl r0, r0, #2 add r0, r7, r0 @@ -1363,7 +1363,7 @@ MOD53_021D7FDC: ; 0x021D7FDC add r1, r7, r1 mov r2, #1 mov r3, #0x19 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xba lsl r0, r0, #2 add r0, r7, r0 @@ -1412,7 +1412,7 @@ _021D80A8: add r1, r5, #0 mov r2, #4 mov r3, #5 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -1449,7 +1449,7 @@ MOD53_021D8104: ; 0x021D8104 add r5, r6, r0 _021D8110: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #5 @@ -1457,15 +1457,15 @@ _021D8110: mov r0, #0xba lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb2 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb6 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD53_021D8104 @@ -1577,7 +1577,7 @@ _021D8200: ldr r1, [sp, #8] bl MOD53_021D83DC ldr r0, _021D83B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D821A: mov r1, #0xc1 @@ -1597,7 +1597,7 @@ _021D821A: cmp r1, r0 beq _021D8246 ldr r0, _021D83B8 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D8246: bl FUN_02030F20 @@ -1621,7 +1621,7 @@ _021D8246: mov r0, #1 str r0, [sp, #4] ldr r0, _021D83B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D8280: ldr r1, _021D83C0 ; =0x0000438B @@ -1630,7 +1630,7 @@ _021D8280: cmp r0, #2 bne _021D8292 ldr r0, _021D83B8 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D8292: mov r1, #1 @@ -1649,7 +1649,7 @@ _021D8292: mov r0, #1 str r0, [sp, #4] ldr r0, _021D83B4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _021D8316 _021D82BE: ldr r0, [sp, #8] @@ -1695,7 +1695,7 @@ _021D82EE: ldr r0, [sp] strb r1, [r0, r2] ldr r0, _021D83C8 ; =0x000005E5 - bl FUN_020054C8 + bl PlaySE _021D8316: ldr r0, _021D83CC ; =0x021D94F0 bl FUN_02020968 @@ -1904,7 +1904,7 @@ _021D84BE: mov r1, #2 bl MOD53_021D93E0 ldr r0, _021D84E4 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE mov r1, #0x1e add r2, r1, #0 ldr r0, _021D84E8 ; =0x04000050 @@ -2019,7 +2019,7 @@ MOD53_021D857C: ; 0x021D857C cmp r0, #0 beq _021D85B4 ldr r0, _021D86CC ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D85B4: add sp, #4 add r0, r4, #0 @@ -2616,7 +2616,7 @@ _021D8A6E: mov r1, #0x16 bl MOD53_021D93E0 ldr r0, _021D8AA8 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE bl FUN_02031190 cmp r0, #0 bne _021D8A96 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 25c18523..8795cd7f 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -38,7 +38,7 @@ _021D74F6: mov r0, #3 mov r1, #0x33 lsl r2, r2, #0xc - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7638 ; =0x00004A60 add r0, r6, #0 mov r2, #0x33 @@ -48,7 +48,7 @@ _021D74F6: add r4, r0, #0 bl memset mov r0, #0x33 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] add r0, r6, #0 bl OverlayManager_GetField18 @@ -67,7 +67,7 @@ _021D74F6: str r0, [r4, #0x28] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD54_021D7874 ldr r0, [r4] bl MOD54_021D7894 @@ -333,7 +333,7 @@ _021D776C: add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x33 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -402,7 +402,7 @@ MOD54_021D784C: ; 0x021D784C bl FUN_0201C30C bl FUN_02009F80 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D786C ; =0x027E0000 ldr r1, _021D7870 ; =0x00003FF8 mov r0, #1 @@ -448,7 +448,7 @@ MOD54_021D7894: ; 0x021D7894 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7988 ; =0x021D9720 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -463,10 +463,10 @@ MOD54_021D7894: ; 0x021D7894 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D798C ; =0x021D973C add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -481,10 +481,10 @@ MOD54_021D7894: ; 0x021D7894 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7990 ; =0x021D96CC add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -499,7 +499,7 @@ MOD54_021D7894: ; 0x021D7894 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7994 ; =0x021D96E8 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -514,10 +514,10 @@ MOD54_021D7894: ; 0x021D7894 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7998 ; =0x021D9704 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -532,17 +532,17 @@ MOD54_021D7894: ; 0x021D7894 add r0, r4, #0 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x33 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x33 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4, r5, pc} nop @@ -660,19 +660,19 @@ MOD54_021D7A6C: ; 0x021D7A6C push {r4, lr} add r4, r0, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -1076,7 +1076,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 add r1, r4, r1 mov r2, #5 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xbe lsl r0, r0, #2 add r0, r4, r0 @@ -1098,7 +1098,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xba lsl r0, r0, #2 add r0, r4, r0 @@ -1120,7 +1120,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 add r1, r4, r1 mov r2, #0 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xc2 lsl r0, r0, #2 ldr r1, [r4, #0x48] @@ -1143,7 +1143,7 @@ MOD54_021D7DB4: ; 0x021D7DB4 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xa6 lsl r0, r0, #2 add r0, r4, r0 @@ -1205,19 +1205,19 @@ MOD54_021D7EDC: ; 0x021D7EDC mov r0, #0xa6 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xc2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xbe lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xba lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 thumb_func_end MOD54_021D7EDC @@ -1318,7 +1318,7 @@ MOD54_021D7F70: ; 0x021D7F70 pop {r3, r4, pc} _021D7FCC: ldr r0, _021D8094 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} _021D7FD6: @@ -1343,7 +1343,7 @@ _021D7FD6: pop {r3, r4, pc} _021D8002: ldr r0, _021D8094 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} _021D800C: @@ -1378,7 +1378,7 @@ _021D800C: pop {r3, r4, pc} _021D8050: ldr r0, _021D8094 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} _021D805A: @@ -1536,7 +1536,7 @@ MOD54_021D8150: ; 0x021D8150 tst r0, r1 beq _021D8178 ldr r0, _021D8274 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D8178: add r0, r5, #0 bl MOD54_021D80A0 @@ -1554,7 +1554,7 @@ _021D8184: tst r0, r1 beq _021D819C ldr r0, _021D8274 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D819C: add r0, r5, #0 bl MOD54_021D80A0 @@ -1803,7 +1803,7 @@ _021D838A: tst r0, r1 beq _021D839A ldr r0, _021D8418 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D839A: add r0, r5, #0 bl MOD54_021D80A0 @@ -2164,7 +2164,7 @@ _021D864A: tst r0, r1 beq _021D865A ldr r0, _021D86D8 ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE _021D865A: add r0, r5, #0 bl MOD54_021D80A0 @@ -3221,7 +3221,7 @@ _021D8E3E: cmp r0, #0 beq _021D8E5C ldr r0, _021D8E60 ; =0x0000064F - bl FUN_020054C8 + bl PlaySE _021D8E5C: add sp, #0x1c pop {r4, r5, r6, r7, pc} diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index b9f3c277..ce354a55 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -43,9 +43,9 @@ MOD55_021D7504: ; 0x021D7504 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #0x34 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] bl MOD55_021D780C ldr r0, [r4, #4] @@ -89,7 +89,7 @@ _021D7580: mov r0, #3 mov r1, #0x34 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7610 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 @@ -164,7 +164,7 @@ _021D7628: mov r0, #3 mov r1, #0x34 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D76B8 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 @@ -349,7 +349,7 @@ MOD55_021D77AC: ; 0x021D77AC add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x34 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end MOD55_021D77AC @@ -368,7 +368,7 @@ MOD55_021D77D0: ; 0x021D77D0 bl FUN_020081C4 _021D77E6: ldr r0, [r4, #4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_02009F80 ldr r3, _021D7804 ; =0x027E0000 @@ -406,7 +406,7 @@ MOD55_021D781C: ; 0x021D781C ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7978 ; =0x021DA34C add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -421,15 +421,15 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D797C ; =0x021DA368 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -444,15 +444,15 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7980 ; =0x021DA384 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -467,15 +467,15 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7984 ; =0x021DA3A0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -490,15 +490,15 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7988 ; =0x021DA3BC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -513,32 +513,32 @@ MOD55_021D781C: ; 0x021D781C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D798C ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -691,22 +691,22 @@ MOD55_021D7AA4: ; 0x021D7AA4 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -1211,13 +1211,13 @@ MOD55_021D7EE4: ; 0x021D7EE4 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D7F02 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D7F02: mov r0, #0 str r0, [sp] @@ -1233,7 +1233,7 @@ _021D7F02: ldr r0, [r5, #4] add r1, r5, r1 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -1264,7 +1264,7 @@ _021D7F02: mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r6, #0 mov r0, #0xd2 lsl r0, r0, #2 @@ -1274,11 +1274,11 @@ _021D7F02: add r7, r5, #0 _021D7F76: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D7F86 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021D7F86: ldr r0, [sp, #0x14] ldr r1, [sp, #0x18] @@ -1302,7 +1302,7 @@ _021D7F86: add r1, r4, #0 mov r2, #3 mov r3, #7 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -1347,7 +1347,7 @@ _021D8002: mov r3, #0x90 bl MOD55_021D80F0 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x18] add r6, r6, #1 add r0, #0x3c @@ -1385,7 +1385,7 @@ MOD55_021D8044: ; 0x021D8044 ldr r0, [sp] mov r1, #1 ldr r0, [r0, #4] - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 mov r1, #0xf2 ldr r0, [sp] @@ -1452,7 +1452,7 @@ _021D80C6: ldr r0, [sp] mov r1, #1 ldr r0, [r0, #4] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -1512,11 +1512,11 @@ MOD55_021D8140: ; 0x021D8140 add r5, r6, r0 _021D814C: add r0, r5, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D815C add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _021D815C: add r4, r4, #1 add r5, #0x10 @@ -1528,11 +1528,11 @@ _021D815C: add r4, r6, r0 _021D816C: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D817C add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021D817C: add r5, r5, #1 add r4, #0x10 @@ -1541,35 +1541,35 @@ _021D817C: mov r0, #0xce lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D819C mov r0, #0xce lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow _021D819C: mov r0, #0xe6 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D81B4 mov r0, #0xe6 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow _021D81B4: mov r0, #0xe2 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D81CC mov r0, #0xe2 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow _021D81CC: pop {r4, r5, r6, pc} .align 2, 0 @@ -1602,7 +1602,7 @@ _021D81EE: tst r1, r0 beq _021D824C ldr r0, _021D82BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xf2 lsl r0, r0, #2 ldrb r1, [r4, r0] @@ -1652,7 +1652,7 @@ _021D824C: tst r0, r1 beq _021D8262 ldr r0, _021D82BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x11 lsl r0, r0, #4 @@ -1669,7 +1669,7 @@ _021D8262: cmp r0, #0 beq _021D82B2 ldr r0, _021D82BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xf2 lsl r0, r0, #2 ldrb r1, [r4, r0] @@ -1688,7 +1688,7 @@ _021D828C: cmp r0, #3 bhs _021D82B2 ldr r0, _021D82BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xf2 lsl r0, r0, #2 ldrb r1, [r4, r0] @@ -2207,7 +2207,7 @@ MOD55_021D868C: ; 0x021D868C mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x3b mov r1, #6 lsl r0, r0, #4 @@ -2245,7 +2245,7 @@ MOD55_021D86D4: ; 0x021D86D4 ldr r0, [sp] mov r1, #1 ldr r0, [r0, #4] - bl FUN_0201886C + bl GetBgTilemapBuffer str r0, [sp, #0x24] mov r1, #0xf2 ldr r0, [sp] @@ -2482,7 +2482,7 @@ _021D88AA: ldr r0, [sp] mov r1, #1 ldr r0, [r0, #4] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x40 pop {r3, r4, r5, r6, r7, pc} nop @@ -2642,11 +2642,11 @@ _021D8A00: cmp r7, #0 bne _021D8A0C add r0, r5, #0 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer b _021D8A12 _021D8A0C: add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021D8A12: ldr r0, [sp, #0x14] add r4, r4, #1 @@ -2713,7 +2713,7 @@ MOD55_021D8A7C: ; 0x021D8A7C bl FUN_020286EC ldr r0, [r5, #4] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -2748,13 +2748,13 @@ MOD55_021D8A7C: ; 0x021D8A7C mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D8AEE mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D8AEE: mov r0, #0 str r0, [sp] @@ -2770,7 +2770,7 @@ _021D8AEE: ldr r0, [r5, #4] add r1, r5, r1 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -2801,17 +2801,17 @@ _021D8AEE: mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D8B6C mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D8B6C: mov r0, #0x15 str r0, [sp] @@ -2829,7 +2829,7 @@ _021D8B6C: add r1, r5, r1 mov r2, #3 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 @@ -2859,7 +2859,7 @@ _021D8B6C: mov r0, #0xde lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 bl MOD55_021D8A28 mov r0, #0xae @@ -2878,11 +2878,11 @@ _021D8BEE: str r0, [sp, #0x18] _021D8BF2: add r0, r4, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D8C02 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _021D8C02: lsr r2, r6, #0x1f lsl r1, r6, #0x1e @@ -2914,12 +2914,12 @@ _021D8C02: add r1, r4, #0 mov r2, #3 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r6, r6, #1 add r4, #0x10 add r7, #0x18 @@ -3052,7 +3052,7 @@ _021D8D52: tst r1, r0 beq _021D8D88 ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r1, _021D8E64 ; =0x000003CB ldrb r0, [r5, r1] cmp r0, #0 @@ -3077,7 +3077,7 @@ _021D8D88: tst r1, r3 beq _021D8D9E ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #6 lsl r0, r0, #4 @@ -3095,7 +3095,7 @@ _021D8D9E: sub r1, r1, #1 strb r1, [r5, r0] ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r1, #0 add r0, r5, #0 mvn r1, r1 @@ -3112,7 +3112,7 @@ _021D8DC4: add r1, r1, #1 strb r1, [r5, r0] ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #1 bl MOD55_021D8CBC @@ -3131,7 +3131,7 @@ _021D8DE6: sub r0, r2, #1 strb r1, [r5, r0] ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r1, #3 add r0, r5, #0 mvn r1, r1 @@ -3151,7 +3151,7 @@ _021D8E10: sub r0, r2, #1 strb r1, [r5, r0] ldr r0, _021D8E60 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #4 bl MOD55_021D8CBC @@ -3259,13 +3259,13 @@ _021D8F02: mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D8F1A mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D8F1A: mov r1, #9 str r1, [sp] @@ -3288,7 +3288,7 @@ _021D8F1A: add r1, r5, r1 mov r2, #2 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe2 lsl r0, r0, #2 ldr r2, _021D8FDC ; =0x000001D9 @@ -3312,7 +3312,7 @@ _021D8F1A: str r0, [r5, r1] sub r1, #0x20 add r0, r5, r1 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x34 bl PlayerProfile_new mov r1, #0xf2 @@ -3388,7 +3388,7 @@ _021D9002: cmp r7, r0 beq _021D902C ldr r0, _021D90D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D902C: mov r0, #1 mvn r0, r0 @@ -3402,7 +3402,7 @@ _021D902C: pop {r4, r5, r6, r7, pc} _021D9040: ldr r0, _021D90D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x2b lsl r0, r0, #4 ldr r0, [r5, r0] @@ -3420,12 +3420,12 @@ _021D9040: b _021D9098 _021D9068: ldr r0, _021D90D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0x14 bne _021D9092 ldr r0, [r5, #4] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #6 str r0, [sp] mov r0, #1 @@ -3452,7 +3452,7 @@ _021D9098: mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xea lsl r0, r0, #2 mov r1, #0 @@ -3518,7 +3518,7 @@ MOD55_021D90D8: ; 0x021D90D8 add r0, r6, #0 bl CopyPlayerName ldr r0, _021D9180 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r2, [sp, #4] add r0, r5, #0 add r1, r4, #0 @@ -3562,7 +3562,7 @@ MOD55_021D9184: ; 0x021D9184 add r4, r1, #0 ldr r0, [r5, #4] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -3577,13 +3577,13 @@ MOD55_021D9184: ; 0x021D9184 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D91D6 mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D91D6: mov r0, #0 str r0, [sp] @@ -3600,7 +3600,7 @@ _021D91D6: str r0, [sp, #0x10] ldr r0, [r5, #4] mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 @@ -3645,17 +3645,17 @@ _021D91D6: mov r0, #0xe6 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D9278 mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D9278: mov r1, #0xd str r1, [sp] @@ -3672,7 +3672,7 @@ _021D9278: add r1, r5, r1 mov r2, #3 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 @@ -3724,7 +3724,7 @@ _021D92CE: mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r1, #0 mov r0, #0 eor r1, r4 @@ -3738,13 +3738,13 @@ _021D92CE: mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D9338 mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021D9338: mov r0, #8 str r0, [sp] @@ -3762,7 +3762,7 @@ _021D9338: add r1, r5, r1 mov r2, #3 mov r3, #9 - bl FUN_02019064 + bl AddWindowParameterized add r2, r5, #0 add r2, #0xb8 ldr r0, [r5, #0x10] @@ -3807,7 +3807,7 @@ _021D9338: mov r0, #0xe2 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021D93C2: mov r0, #0x3b mov r1, #0x13 @@ -3914,7 +3914,7 @@ MOD55_021D9474: ; 0x021D9474 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D9568 ; =0x021DA2F8 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -3929,15 +3929,15 @@ MOD55_021D9474: ; 0x021D9474 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D956C ; =0x021DA330 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -3952,15 +3952,15 @@ MOD55_021D9474: ; 0x021D9474 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9570 ; =0x021DA314 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -3975,32 +3975,32 @@ MOD55_021D9474: ; 0x021D9474 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x34 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority add sp, #0x64 pop {r4, r5, pc} .align 2, 0 @@ -4096,7 +4096,7 @@ _021D9618: ldr r0, [r4, #4] bl MOD55_021D7AA4 mov r0, #0x34 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] bl MOD55_021D9474 bl MOD55_021D9574 @@ -4136,13 +4136,13 @@ _021D9618: mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D969A mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _021D969A: mov r0, #0 str r0, [sp] @@ -4159,7 +4159,7 @@ _021D969A: str r0, [sp, #0x10] ldr r0, [r4, #4] mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 @@ -4211,17 +4211,17 @@ _021D969A: mov r0, #0xe6 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D974E mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _021D974E: mov r0, #0x12 str r0, [sp] @@ -4238,7 +4238,7 @@ _021D974E: str r0, [sp, #0x10] ldr r0, [r4, #4] mov r2, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 @@ -4276,7 +4276,7 @@ _021D974E: mov r0, #0xe2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x34 bl FUN_02006D98 add r1, r4, #0 @@ -4322,7 +4322,7 @@ _021D974E: bne _021D9864 ldr r0, [r4, #4] mov r1, #2 - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r2, _021D9A5C ; =0x00000FFF mov r7, #0x10 mov ip, r0 @@ -4348,18 +4348,18 @@ _021D9844: blt _021D983C ldr r0, [r4, #4] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram _021D9864: mov r0, #0xd2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021D987C mov r0, #0xd2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _021D987C: mov r0, #4 str r0, [sp] @@ -4377,7 +4377,7 @@ _021D987C: add r1, r4, r1 mov r2, #3 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd2 lsl r0, r0, #2 add r0, r4, r0 @@ -4775,7 +4775,7 @@ _021D9C18: mov r0, #0xd2 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [sp, #0x20] bl FreeToHeap mov r0, #0x3b @@ -4828,7 +4828,7 @@ _021D9C82: tst r0, r1 beq _021D9CB2 ldr r0, _021D9CC0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -4895,7 +4895,7 @@ _021D9D16: ldr r0, [r5, #4] bl MOD55_021D7AA4 mov r0, #0x34 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5, #4] bl MOD55_021D781C add r0, r5, #0 @@ -4951,7 +4951,7 @@ MOD55_021D9D88: ; 0x021D9D88 ldr r0, [r6, #4] str r1, [sp, #0x10] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -5354,13 +5354,13 @@ MOD55_021DA0A4: ; 0x021DA0A4 mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021DA0D0 mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021DA0D0: mov r0, #0x13 str r0, [sp] @@ -5378,7 +5378,7 @@ _021DA0D0: ldr r0, [r5, #4] add r1, r5, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized add r2, r5, #0 add r2, #0xb8 ldr r0, [r5, #0x10] @@ -5435,13 +5435,13 @@ MOD55_021DA15C: ; 0x021DA15C lsl r0, r0, #2 add r0, r5, r0 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _021DA17C mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _021DA17C: mov r0, #0x13 str r0, [sp] @@ -5459,7 +5459,7 @@ _021DA17C: ldr r0, [r5, #4] add r1, r5, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized add r2, r5, #0 add r2, #0xb8 ldr r0, [r5, #0x10] @@ -5505,7 +5505,7 @@ _021DA17C: mov r0, #0xce lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 531194c6..7e036d8c 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -267,9 +267,9 @@ MOD56_02211FD4: ; 0x02211FD4 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #0x36 - bl FUN_02016B94 + bl BgConfig_Alloc add r1, r4, #0 add r1, #0xc0 str r0, [r1] @@ -340,14 +340,14 @@ _02212098: mov r0, #3 mov r1, #0x36 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap b _022120BE _022120B2: mov r2, #0xb mov r0, #3 mov r1, #0x36 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap _022120BE: mov r1, #0x3f add r0, r4, #0 @@ -564,7 +564,7 @@ _02212274: add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x36 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 @@ -575,7 +575,7 @@ MOD56_0221228C: ; 0x0221228C push {r3, lr} add r0, #0xc0 ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_02009F80 ldr r3, _022122AC ; =0x027E0000 @@ -623,7 +623,7 @@ MOD56_022122D4: ; 0x022122D4 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02212430 ; =0x02216368 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -638,15 +638,15 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02212434 ; =0x02216384 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -661,15 +661,15 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02212438 ; =0x022163A0 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -684,15 +684,15 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0221243C ; =0x022163BC add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -707,15 +707,15 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02212440 ; =0x022163D8 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -730,32 +730,32 @@ MOD56_022122D4: ; 0x022122D4 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x36 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, _02212444 ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -899,22 +899,22 @@ MOD56_02212540: ; 0x02212540 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -1306,7 +1306,7 @@ MOD56_022128A4: ; 0x022128A4 mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022128CE mov r0, #0xd7 @@ -1317,7 +1317,7 @@ MOD56_022128A4: ; 0x022128A4 mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022128CE: mov r0, #1 str r0, [sp] @@ -1337,7 +1337,7 @@ _022128CE: add r1, r4, r1 mov r2, #3 mov r3, #5 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 @@ -1376,7 +1376,7 @@ _022128CE: mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r3, r4, pc} nop @@ -1391,57 +1391,57 @@ MOD56_0221295C: ; 0x0221295C mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02212978 mov r0, #0xd7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02212978: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02212990 mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02212990: mov r0, #0xe7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022129A8 mov r0, #0xe7 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022129A8: mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022129C0 mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022129C0: mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022129D8 mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022129D8: add r0, r4, #0 add r0, #0xb4 @@ -1466,13 +1466,13 @@ _02212A00: mov r0, #0xdb lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02212A18 mov r0, #0xdb lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02212A18: pop {r4, pc} .align 2, 0 @@ -1544,16 +1544,16 @@ _02212A9A: bne _02212AFA mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority add r0, r5, #0 mov r1, #0x11 bl MOD56_02215FF4 @@ -1709,16 +1709,16 @@ MOD56_02212BE8: ; 0x02212BE8 bl MOD56_02215FF4 mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0x36 str r0, [sp] add r0, r5, #0 @@ -1772,7 +1772,7 @@ _02212C74: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow cmp r6, #0 bne _02212CB4 add r0, r5, #0 @@ -1832,7 +1832,7 @@ _02212CEC: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow cmp r6, #0 bne _02212D44 ldr r0, [r5] @@ -1900,7 +1900,7 @@ _02212D74: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow cmp r6, #0 bne _02212DC6 mov r1, #0x3b @@ -1947,16 +1947,16 @@ MOD56_02212DD8: ; 0x02212DD8 add r4, r1, #0 mov r0, #0 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #1 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority mov r0, #3 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #2 mov r1, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #0x3b mov r1, #0xf lsl r0, r0, #4 @@ -2272,7 +2272,7 @@ MOD56_02213048: ; 0x02213048 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0221307C mov r0, #0xdb @@ -2283,7 +2283,7 @@ MOD56_02213048: ; 0x02213048 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _0221307C: mov r0, #0x3b mov r1, #8 @@ -2329,7 +2329,7 @@ MOD56_022130A4: ; 0x022130A4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022130D8 mov r0, #0xdb @@ -2340,7 +2340,7 @@ MOD56_022130A4: ; 0x022130A4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _022130D8: add r0, r5, #0 mov r1, #0x33 @@ -2452,7 +2452,7 @@ MOD56_02213194: ; 0x02213194 add r0, #0xc0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -2473,7 +2473,7 @@ MOD56_02213194: ; 0x02213194 mov r0, #0xdf lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #0 add r0, #0xb4 mov r1, #0 @@ -2740,7 +2740,7 @@ _022133DA: str r1, [r5, r0] sub r0, #0x44 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02213412 mov r0, #0xdb @@ -2751,7 +2751,7 @@ _022133DA: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02213412: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -2774,7 +2774,7 @@ MOD56_0221341C: ; 0x0221341C mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0221344C add r0, r6, #0 @@ -3004,7 +3004,7 @@ _022135DC: mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _02213614: add sp, #0x10 pop {r4, r5, r6, pc} @@ -3139,7 +3139,7 @@ _022136B8: mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _02213706: ldr r0, [r4] add r1, r5, #0 @@ -3174,7 +3174,7 @@ _02213722: mov r0, #0xdf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _0221374C: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -3253,7 +3253,7 @@ MOD56_0221375C: ; 0x0221375C strh r1, [r2, #6] ldr r0, [r0] mov r1, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer add r1, r0, #0 mov r2, #0 cmp r4, #0x11 @@ -3371,7 +3371,7 @@ MOD56_022138A4: ; 0x022138A4 add r7, r1, #0 ldr r0, [r0] mov r1, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r6, #0 mov r4, #5 _022138BA: @@ -3426,7 +3426,7 @@ _02213906: add r5, #0xc0 ldr r0, [r5] mov r1, #0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #8 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD56_022138A4 @@ -3437,7 +3437,7 @@ MOD56_02213924: ; 0x02213924 cmp r2, #0 bne _02213930 ldr r0, _02213934 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02213930: pop {r3, pc} nop @@ -3508,7 +3508,7 @@ MOD56_02213990: ; 0x02213990 mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022139D0 mov r0, #0xdf @@ -3519,7 +3519,7 @@ MOD56_02213990: ; 0x02213990 mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _022139D0: mov r0, #5 str r0, [sp] @@ -3539,7 +3539,7 @@ _022139D0: add r1, r5, r1 mov r2, #3 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized ldr r6, _02213A3C ; =0x022163F4 add r3, sp, #0x14 add r2, r3, #0 @@ -3584,7 +3584,7 @@ MOD56_02213A40: ; 0x02213A40 mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02213A6A mov r0, #0xd3 @@ -3595,7 +3595,7 @@ MOD56_02213A40: ; 0x02213A40 mov r0, #0xd3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02213A6A: mov r0, #0x15 str r0, [sp] @@ -3614,7 +3614,7 @@ _02213A6A: add r1, r4, r1 mov r2, #3 mov r3, #7 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} thumb_func_end MOD56_02213A40 @@ -3632,7 +3632,7 @@ MOD56_02213A94: ; 0x02213A94 add r0, #0xc0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -3648,7 +3648,7 @@ MOD56_02213A94: ; 0x02213A94 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02213AF0 mov r0, #0xd7 @@ -3659,7 +3659,7 @@ MOD56_02213A94: ; 0x02213A94 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02213AF0: add r0, r5, #0 add r0, #0xb0 @@ -3669,7 +3669,7 @@ _02213AF0: mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xb4 mov r1, #0 @@ -3707,7 +3707,7 @@ _02213B2C: add r1, r5, r1 mov r2, #3 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 @@ -3738,7 +3738,7 @@ _02213B2C: mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 bl MOD56_02216120 add r0, r5, #0 @@ -4020,7 +4020,7 @@ _02213DD2: bl MOD56_02215EA4 _02213DDC: ldr r0, _02213F88 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x14 lsl r0, r0, #4 @@ -4041,7 +4041,7 @@ _02213E00: cmp r0, #0 beq _02213E1C ldr r0, _02213F8C ; =0x00000624 - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x2f lsl r0, r0, #4 @@ -4093,7 +4093,7 @@ _02213E5C: mov r0, #0xdf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xb4 mov r1, #0 @@ -4153,7 +4153,7 @@ _02213EE8: pop {r4, r5, r6, pc} _02213EFA: ldr r0, _02213F88 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #4] ldrb r0, [r0, #0x1b] bl MOD56_02211E88 @@ -4181,7 +4181,7 @@ _02213F2E: pop {r4, r5, r6, pc} _02213F32: ldr r0, _02213F88 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #4] ldrb r0, [r0, #0x1b] bl MOD56_02211E88 @@ -5082,7 +5082,7 @@ _02214602: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02214642 mov r0, #0xe3 @@ -5093,7 +5093,7 @@ _02214602: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02214642: mov r0, #9 str r0, [sp] @@ -5113,7 +5113,7 @@ _02214642: add r1, r5, r1 mov r2, #2 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe3 lsl r0, r0, #2 ldr r2, _022146C8 ; =0x000001D9 @@ -5141,7 +5141,7 @@ _02214642: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 mov r1, #5 mov r2, #0 @@ -5206,11 +5206,11 @@ _0221471A: add r0, r5, #0 bl MOD56_02216120 ldr r0, _02214804 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _022147CE _02214730: ldr r0, _02214804 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE cmp r4, #0xf bne _02214752 cmp r7, #2 @@ -5249,7 +5249,7 @@ _0221476E: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xbc mov r2, #0xf7 @@ -5290,7 +5290,7 @@ _022147CE: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xbc mov r2, #0xf7 @@ -5363,7 +5363,7 @@ _02214868: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0221488C mov r0, #0xe3 @@ -5374,7 +5374,7 @@ _02214868: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _0221488C: mov r1, #9 str r1, [sp] @@ -5399,7 +5399,7 @@ _0221488C: add r1, r5, r1 mov r2, #2 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe3 lsl r0, r0, #2 ldr r2, _0221491C ; =0x000001D9 @@ -5432,7 +5432,7 @@ _0221488C: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #1 add sp, #0x34 pop {r4, r5, r6, r7, pc} @@ -5483,7 +5483,7 @@ _02214956: pop {r4, r5, r6, pc} _02214968: ldr r0, _022149D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x24 lsl r0, r0, #4 @@ -5491,7 +5491,7 @@ _02214968: b _02214994 _02214978: ldr r0, _022149D0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r1, r4, #0 bl MOD56_0221617C @@ -5510,7 +5510,7 @@ _02214994: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r3, _022149D4 ; =0x000003DE add r0, r5, #0 add r2, r5, r3 @@ -5697,7 +5697,7 @@ _02214ADC: add r1, r5, r1 mov r2, #2 mov r3, #0x10 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe3 lsl r0, r0, #2 ldr r2, _02214BB8 ; =0x000001D9 @@ -5724,7 +5724,7 @@ _02214ADC: mov r0, #0xe3 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [sp, #0x18] add r0, r5, #0 bl MOD56_022160E4 @@ -5857,7 +5857,7 @@ _02214C36: pop {r3, r4, r5, r6, r7, pc} _02214C4A: ldr r0, _02214E20 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0x3b mov r1, #0x13 lsl r0, r0, #4 @@ -5865,7 +5865,7 @@ _02214C4A: b _02214DE2 _02214C5A: ldr r0, _02214E20 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE cmp r5, #1 beq _02214C66 b _02214DD6 @@ -6068,7 +6068,7 @@ _02214DEC: mov r0, #0xe3 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0xbc mov r1, #0 @@ -6917,7 +6917,7 @@ MOD56_0221547C: ; 0x0221547C add r4, r1, #0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -6951,7 +6951,7 @@ MOD56_022154BC: ; 0x022154BC add r7, r1, #0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6983,7 +6983,7 @@ MOD56_022154BC: ; 0x022154BC mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02215532 mov r0, #0xe7 @@ -6994,7 +6994,7 @@ MOD56_022154BC: ; 0x022154BC mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02215532: mov r0, #2 str r0, [sp] @@ -7014,7 +7014,7 @@ _02215532: ldr r0, [r0] add r1, r5, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 @@ -7069,7 +7069,7 @@ _02215532: mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 mov r1, #0x29 mov r2, #0 @@ -7473,7 +7473,7 @@ _0221594C: mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x3b mov r1, #0x36 lsl r0, r0, #4 @@ -7540,17 +7540,17 @@ MOD56_022159B0: ; 0x022159B0 mov r0, #0xe7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0xc0 ldr r0, [r0] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 add r0, #0xc0 ldr r0, [r0] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 bl MOD56_02216120 mov r3, #0 @@ -7595,7 +7595,7 @@ MOD56_022159B0: ; 0x022159B0 mov r0, #0xd7 lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 bl MOD56_02212EFC add r0, r5, #0 @@ -8169,7 +8169,7 @@ MOD56_02215EA4: ; 0x02215EA4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02215EE0 mov r0, #0xdb @@ -8180,12 +8180,12 @@ MOD56_02215EA4: ; 0x02215EA4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02215EE0: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02215F04 mov r0, #0xcf @@ -8196,7 +8196,7 @@ _02215EE0: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02215F04: mov r0, #0x5e lsl r0, r0, #2 @@ -8237,7 +8237,7 @@ _02215F30: ldr r0, [r0] add r1, r5, r1 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized cmp r6, #0 beq _02215F70 add r0, r5, #0 @@ -8281,7 +8281,7 @@ _02215F82: mov r3, #0xa bl FUN_0200D0BC mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C mov r3, #0 @@ -8302,7 +8302,7 @@ _02215F82: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -8320,7 +8320,7 @@ MOD56_02215FF4: ; 0x02215FF4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02216024 mov r0, #0xdb @@ -8331,12 +8331,12 @@ MOD56_02215FF4: ; 0x02215FF4 mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02216024: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02216048 mov r0, #0xcf @@ -8347,7 +8347,7 @@ _02216024: mov r0, #0xcf lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _02216048: mov r3, #4 str r3, [sp] @@ -8366,7 +8366,7 @@ _02216048: ldr r0, [r0] add r1, r5, r1 mov r2, #2 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r2, #0x56 add r0, #0xd0 @@ -8414,7 +8414,7 @@ _02216048: mov r0, #0xdb lsl r0, r0, #2 add r0, r5, r0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, pc} nop @@ -8480,7 +8480,7 @@ _02216154: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _02216178 mov r0, #0xcf @@ -8491,7 +8491,7 @@ _02216154: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _02216178: pop {r4, pc} .align 2, 0 @@ -8663,7 +8663,7 @@ _022162B8: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _022162DC mov r0, #0xcf @@ -8674,7 +8674,7 @@ _022162B8: mov r0, #0xcf lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow _022162DC: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 481488f8..52ef15ff 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -28,12 +28,12 @@ MOD57_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #0xa mov r0, #3 mov r1, #0x19 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap ldr r1, _021D76F0 ; =0x00003320 add r0, r5, #0 mov r2, #0x19 @@ -48,7 +48,7 @@ MOD57_021D74E0: ; 0x021D74E0 add r1, #0xb4 str r0, [r1] mov r0, #0x19 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] add r0, r4, #0 bl MOD57_021D79AC @@ -68,7 +68,7 @@ MOD57_021D74E0: ; 0x021D74E0 add r0, r4, r0 bl MOD57_021D95A8 ldr r0, _021D76F8 ; =0x00000695 - bl FUN_020054C8 + bl PlaySE ldr r0, _021D76FC ; =0x000030E4 add r0, r4, r0 bl MOD57_021D9184 @@ -124,7 +124,7 @@ _021D75E4: blo _021D75CE ldr r0, [r4] mov r1, #3 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r1, r4, #0 add r1, #0xb4 ldr r1, [r1] @@ -404,7 +404,7 @@ _021D7832: cmp r6, #4 bne _021D7856 ldr r0, _021D7938 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -561,7 +561,7 @@ MOD57_021D7944: ; 0x021D7944 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x19 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 mov r1, #0x7f bl FUN_020051EC @@ -839,7 +839,7 @@ MOD57_021D7B94: ; 0x021D7B94 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7C90 ; =0x021D9774 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -854,10 +854,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7C94 ; =0x021D9790 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -872,10 +872,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7C98 ; =0x021D97C8 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -890,10 +890,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7C9C ; =0x021D97E4 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -908,10 +908,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7CA0 ; =0x021D97AC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -926,10 +926,10 @@ MOD57_021D7B94: ; 0x021D7B94 str r0, [r3] add r0, r4, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x9c pop {r4, r5, pc} .align 2, 0 @@ -1214,19 +1214,19 @@ MOD57_021D7EDC: ; 0x021D7EDC bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -1272,7 +1272,7 @@ _021D7F46: add r2, #0x80 str r2, [r4, r0] ldr r0, _021D80E4 ; =0x00000696 - bl FUN_020054C8 + bl PlaySE ldr r0, _021D80DC ; =0x0000331A ldrb r1, [r4, r0] add r1, r1, #1 @@ -1336,7 +1336,7 @@ _021D7FB0: bl MOD57_021D86E8 ldr r0, [r4] mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r1, r4, #0 add r1, #0xb4 ldr r1, [r1] @@ -1366,7 +1366,7 @@ _021D8006: bl MOD57_021D8FB8 ldr r0, [r4] mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 bl MOD57_021D8690 add r1, r4, #0 @@ -1845,7 +1845,7 @@ MOD57_021D83D8: ; 0x021D83D8 add r4, r1, #0 ldr r0, [r0] mov r1, #2 - bl FUN_0201886C + bl GetBgTilemapBuffer add r7, r0, #0 lsl r0, r4, #2 add r0, #0x80 @@ -1878,7 +1878,7 @@ _021D8400: ldr r0, [sp] mov r1, #2 ldr r0, [r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD57_021D83D8 @@ -1909,7 +1909,7 @@ MOD57_021D8428: ; 0x021D8428 ldr r0, [r0] add r1, r6, #0 lsr r4, r4, #0x18 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r2, #0 add r3, r0, r4 add r0, r2, #0 @@ -2212,10 +2212,10 @@ MOD57_021D8690: ; 0x021D8690 ldr r2, [r3, #0x14] ldr r0, [r5] ldr r3, [r3, #0x10] - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r0, [r5] mov r1, #7 - bl FUN_0201886C + bl GetBgTilemapBuffer cmp r0, #0 beq _021D86CA ldr r2, _021D86E0 ; =0x000032FC @@ -2224,7 +2224,7 @@ MOD57_021D8690: ; 0x021D8690 mov r1, #7 add r2, #0xc add r3, r4, #0 - bl FUN_02017DFC + bl BG_LoadScreenTilemapData _021D86CA: mov r0, #0 str r0, [sp] @@ -2234,7 +2234,7 @@ _021D86CA: mov r1, #7 add r2, #0xc add r3, r4, #0 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram pop {r3, r4, r5, pc} .align 2, 0 _021D86E0: .word 0x000032FC @@ -2256,7 +2256,7 @@ MOD57_021D86E8: ; 0x021D86E8 mov r1, #7 mov r2, #0 mov r3, #0x14 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r3, pc} .align 2, 0 @@ -2337,7 +2337,7 @@ MOD57_021D875C: ; 0x021D875C cmp r0, #0 bne _021D8782 ldr r0, _021D87D8 ; =0x00000692 - bl FUN_020054C8 + bl PlaySE _021D8782: mov r0, #0 ldrsb r1, [r4, r0] @@ -2367,7 +2367,7 @@ _021D879A: ldr r0, [r0, r1] lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021D87BC: mov r0, #2 ldrsb r0, [r4, r0] @@ -2444,11 +2444,11 @@ MOD57_021D8830: ; 0x021D8830 str r0, [sp, #4] lsr r1, r1, #0x18 lsl r3, r3, #0xc - bl FUN_02017E14 + bl BG_LoadCharTilesData lsl r1, r7, #0x18 ldr r0, [sp, #4] lsr r1, r1, #0x18 - bl FUN_0201886C + bl GetBgTilemapBuffer mov r4, #0 add r1, r0, #0 add r3, r4, #0 @@ -2479,7 +2479,7 @@ _021D8864: lsl r1, r7, #0x18 ldr r0, [sp, #4] lsr r1, r1, #0x18 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -2487,11 +2487,11 @@ _021D8864: thumb_func_start MOD57_021D8894 MOD57_021D8894: ; 0x021D8894 - ldr r3, _021D889C ; =FUN_020054C8 + ldr r3, _021D889C ; =PlaySE ldr r0, _021D88A0 ; =0x00000699 bx r3 nop -_021D889C: .word FUN_020054C8 +_021D889C: .word PlaySE _021D88A0: .word 0x00000699 thumb_func_end MOD57_021D8894 @@ -2572,7 +2572,7 @@ MOD57_021D890C: ; 0x021D890C ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #2 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 bne _021D894A mov r0, #0 @@ -2612,7 +2612,7 @@ MOD57_021D8954: ; 0x021D8954 ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #2 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 bne _021D8992 mov r0, #0 @@ -2641,7 +2641,7 @@ _021D89A6: add r0, r5, #0 add r1, r6, r1 add r2, r7, r2 - bl FUN_02019150 + bl AddWindow add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -2652,7 +2652,7 @@ _021D89A6: mov r1, #7 mov r3, #1 str r2, [sp] - bl FUN_02017F48 + bl BG_FillCharDataRange pop {r3, r4, r5, r6, r7, pc} nop _021D89D0: .word MOD57_021D98F4 @@ -2666,7 +2666,7 @@ MOD57_021D89D4: ; 0x021D89D4 _021D89DA: lsl r0, r4, #4 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -3355,7 +3355,7 @@ MOD57_021D8FB8: ; 0x021D8FB8 _021D8FC4: lsl r0, r4, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index eb13ddb7..1cdd6b43 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -43,7 +43,7 @@ _021D9A36: mov r0, #3 mov r1, #0x27 lsl r2, r2, #6 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D9B74 ; =0x00005CB0 add r0, r6, #0 mov r2, #0x27 @@ -53,7 +53,7 @@ _021D9A36: add r4, r0, #0 bl memset mov r0, #0x27 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] mov r0, #0x27 bl ScrStrBufs_new @@ -66,7 +66,7 @@ _021D9A36: str r0, [r4, #0x14] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD58_021D9CDC ldr r0, [r4] bl MOD58_021D9CFC @@ -274,7 +274,7 @@ _021D9C40: add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x27 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop @@ -289,7 +289,7 @@ MOD58_021D9CB4: ; 0x021D9CB4 bl FUN_0201C30C bl FUN_02009F80 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D9CD4 ; =0x027E0000 ldr r1, _021D9CD8 ; =0x00003FF8 mov r0, #1 @@ -335,7 +335,7 @@ MOD58_021D9CFC: ; 0x021D9CFC ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D9DF0 ; =0x021DAE18 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -350,10 +350,10 @@ MOD58_021D9CFC: ; 0x021D9CFC str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9DF4 ; =0x021DAE34 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -368,10 +368,10 @@ MOD58_021D9CFC: ; 0x021D9CFC str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9DF8 ; =0x021DAE50 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -386,7 +386,7 @@ MOD58_021D9CFC: ; 0x021D9CFC str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D9DFC ; =0x021DADE0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -401,10 +401,10 @@ MOD58_021D9CFC: ; 0x021D9CFC str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9E00 ; =0x021DADFC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -419,17 +419,17 @@ MOD58_021D9CFC: ; 0x021D9CFC add r0, r4, #0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4, r5, pc} nop @@ -544,22 +544,22 @@ MOD58_021D9ED8: ; 0x021D9ED8 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -604,7 +604,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r1, #0x20 mov r2, #0 mov r3, #0x27 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 str r0, [sp] mov r0, #2 @@ -1072,7 +1072,7 @@ MOD58_021DA30C: ; 0x021DA30C add r1, r5, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb5 lsl r0, r0, #2 add r0, r5, r0 @@ -1092,7 +1092,7 @@ MOD58_021DA30C: ; 0x021DA30C ldr r0, [r5] add r1, r5, r1 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb1 lsl r0, r0, #2 add r0, r5, r0 @@ -1113,7 +1113,7 @@ MOD58_021DA30C: ; 0x021DA30C add r1, r5, r1 mov r2, #1 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb9 lsl r0, r0, #2 add r0, r5, r0 @@ -1179,7 +1179,7 @@ _021DA3C2: ldr r0, [r5] add r1, r5, r1 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, [r5, #0x30] mov r0, #1 mov r2, #0 @@ -1231,7 +1231,7 @@ _021DA46A: add r1, r4, #0 mov r2, #4 mov r3, #5 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -1269,7 +1269,7 @@ MOD58_021DA4CC: ; 0x021DA4CC add r5, r6, r0 _021DA4D8: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #5 @@ -1277,19 +1277,19 @@ _021DA4D8: mov r0, #0xbd lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb9 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb1 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xb5 lsl r0, r0, #2 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, r5, r6, pc} thumb_func_end MOD58_021DA4CC @@ -1330,7 +1330,7 @@ MOD58_021DA514: ; 0x021DA514 mov r1, #1 bl MOD58_021DA614 ldr r0, _021DA5E0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021DA568 _021DA55A: ldr r0, _021DA5E4 ; =0x0000431A @@ -2435,7 +2435,7 @@ MOD58_021DAD3C: ; 0x021DAD3C cmp r0, #0 bne _021DAD60 ldr r0, _021DAD9C ; =0x0000069A - bl FUN_020054C8 + bl PlaySE _021DAD60: mov r0, #0 ldrsb r1, [r4, r0] @@ -2455,7 +2455,7 @@ _021DAD78: cmp r0, #0 bne _021DAD88 ldr r0, _021DAD9C ; =0x0000069A - bl FUN_020054C8 + bl PlaySE _021DAD88: mov r0, #2 ldrsb r0, [r4, r0] diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 5604bf3c..27c05dd6 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -3,266 +3,7 @@ .section .text .balign 4, 0 - thumb_func_start MOD59_021D7564 -MOD59_021D7564: ; 0x021D7564 - push {r3, r4, r5, r6, lr} - sub sp, #0xc - add r5, r1, #0 - bl OverlayManager_GetData - ldr r1, [r5] - add r4, r0, #0 - mov r6, #0 - cmp r1, #5 - bls _021D757A - b _021D76AC -_021D757A: - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_021D7586: ; jump table - .short _021D7592 - _021D7586 - 2 ; case 0 - .short _021D75FA - _021D7586 - 2 ; case 1 - .short _021D7642 - _021D7586 - 2 ; case 2 - .short _021D7668 - _021D7586 - 2 ; case 3 - .short _021D7690 - _021D7586 - 2 ; case 4 - .short _021D76AA - _021D7586 - 2 ; case 5 -_021D7592: - add r0, r6, #0 - add r1, r6, #0 - bl FUN_0200E3A0 - mov r0, #1 - add r1, r6, #0 - bl FUN_0200E3A0 - add r0, r6, #0 - add r1, r0, #0 - bl Main_SetVBlankIntrCB - add r0, r6, #0 - add r1, r0, #0 - bl FUN_02015F34 - bl GX_DisableEngineALayers - bl GX_DisableEngineBLayers - mov r2, #1 - lsl r2, r2, #0x1a - ldr r1, [r2] - ldr r0, _021D76B4 ; =0xFFFFE0FF - and r1, r0 - str r1, [r2] - ldr r2, _021D76B8 ; =0x04001000 - ldr r1, [r2] - and r0, r1 - str r0, [r2] - mov r0, #4 - mov r1, #8 - bl FUN_0201669C - add r0, r4, #0 - bl MOD59_021D778C - add r0, r4, #0 - bl MOD59_021D79F8 - add r0, r4, #0 - bl MOD59_021D7A4C - ldr r0, _021D76BC ; =MOD59_021D7724 - add r1, r4, #0 - bl Main_SetVBlankIntrCB - bl GX_BothDispOn - mov r0, #1 - str r0, [r5] - b _021D76AC -_021D75FA: - bl MOD59_021D8920 - cmp r0, #1 - bne _021D761E - mov r0, #6 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - ldr r0, [r4] - str r0, [sp, #8] - add r0, r6, #0 - add r1, r0, #0 - add r2, r0, #0 - add r3, r0, #0 - bl FUN_0200E1D0 - mov r0, #2 - str r0, [r5] -_021D761E: - ldr r0, [r4, #0x14] - cmp r0, #0 - beq _021D76AC - mov r0, #6 - str r0, [sp] - mov r0, #1 - str r0, [sp, #4] - ldr r0, [r4] - str r0, [sp, #8] - mov r0, #0 - add r1, r0, #0 - add r2, r0, #0 - add r3, r0, #0 - bl FUN_0200E1D0 - mov r0, #3 - str r0, [r5] - b _021D76AC -_021D7642: - bl FUN_0200E308 - cmp r0, #1 - bne _021D76AC - add r0, r4, #0 - bl MOD59_021D7A34 - add r0, r4, #0 - bl MOD59_021D796C - add r0, r4, #0 - bl MOD59_021D7A5C - add r0, r6, #0 - add r1, r0, #0 - bl Main_SetVBlankIntrCB - mov r6, #1 - b _021D76AC -_021D7668: - bl FUN_0200E308 - cmp r0, #1 - bne _021D76AC - add r0, r4, #0 - bl MOD59_021D7A34 - add r0, r4, #0 - bl MOD59_021D796C - add r0, r4, #0 - bl MOD59_021D7A5C - add r0, r6, #0 - add r1, r0, #0 - bl Main_SetVBlankIntrCB - mov r0, #4 - str r0, [r5] - b _021D76AC -_021D7690: - ldr r0, [r4, #0x14] - bl OverlayManager_Run - cmp r0, #1 - bne _021D76AC - ldr r0, [r4, #0x14] - bl OverlayManager_delete - add r0, r6, #0 - str r0, [r4, #0x14] - mov r0, #5 - str r0, [r5] - b _021D76AC -_021D76AA: - str r6, [r5] -_021D76AC: - add r0, r6, #0 - add sp, #0xc - pop {r3, r4, r5, r6, pc} - nop -_021D76B4: .word 0xFFFFE0FF -_021D76B8: .word 0x04001000 -_021D76BC: .word MOD59_021D7724 - thumb_func_end MOD59_021D7564 - - thumb_func_start MOD59_021D76C0 -MOD59_021D76C0: ; 0x021D76C0 - push {r4, r5, r6, lr} - add r6, r0, #0 - bl OverlayManager_GetData - add r4, r0, #0 - ldr r0, [r4, #4] - ldr r5, [r4] - bl Sav2_PlayerData_GetProfileAddr - ldr r1, [r4, #0x70] - ldr r1, [r1, #0x18] - bl PlayerName_StringToFlat - ldr r0, [r4, #4] - bl Sav2_PlayerData_GetProfileAddr - ldr r1, [r4, #0x70] - ldr r1, [r1, #4] - bl PlayerProfile_SetTrainerGender - ldr r0, [r4, #4] - bl FUN_02024EB4 - ldr r1, [r4, #0x74] - ldr r1, [r1, #0x18] - bl RivalsNameToU16Array - ldr r0, [r4, #0x70] - bl FUN_02077AC4 - ldr r0, [r4, #0x74] - bl FUN_02077AC4 - add r0, r6, #0 - bl OverlayManager_FreeData - add r0, r5, #0 - bl FUN_020168D0 - ldr r0, _021D771C ; =SDK_OVERLAY_MODULE_52_ID - ldr r1, _021D7720 ; =MOD52_021D76D8 - bl RegisterMainOverlay - mov r0, #1 - pop {r4, r5, r6, pc} - nop -_021D771C: .word SDK_OVERLAY_MODULE_52_ID -_021D7720: .word MOD52_021D76D8 - thumb_func_end MOD59_021D76C0 - - thumb_func_start MOD59_021D7724 -MOD59_021D7724: ; 0x021D7724 - ldr r3, _021D772C ; =FUN_0201AB60 - ldr r0, [r0, #0x18] - bx r3 - nop -_021D772C: .word FUN_0201AB60 - thumb_func_end MOD59_021D7724 - - thumb_func_start MOD59_021D7730 -MOD59_021D7730: ; 0x021D7730 - push {r3, r4} - ldr r2, _021D7788 ; =gMain + 0x40 - mov r0, #0 - ldrh r1, [r2, #0x20] - cmp r1, #0 - beq _021D7784 - ldrh r3, [r2, #0x1c] - mov r1, #1 - lsl r1, r1, #8 - cmp r3, r1 - bhs _021D7784 - ldrh r2, [r2, #0x1e] - cmp r2, #0xc0 - bhs _021D7784 - cmp r3, #0x80 - bhs _021D7758 - mov r1, #0x80 - sub r1, r1, r3 - lsl r1, r1, #0x10 - b _021D775C -_021D7758: - sub r3, #0x80 - lsl r1, r3, #0x10 -_021D775C: - lsr r3, r1, #0x10 - cmp r2, #0x64 - bhs _021D776A - mov r1, #0x64 - sub r1, r1, r2 - lsl r1, r1, #0x10 - b _021D776E -_021D776A: - sub r2, #0x64 - lsl r1, r2, #0x10 -_021D776E: - lsr r4, r1, #0x10 - add r2, r3, #0 - add r1, r4, #0 - mul r2, r3 - mul r1, r4 - add r2, r2, r1 - mov r1, #1 - lsl r1, r1, #8 - cmp r2, r1 - bgt _021D7784 - mov r0, #1 -_021D7784: - pop {r3, r4} - bx lr - .align 2, 0 -_021D7788: .word gMain + 0x40 - thumb_func_end MOD59_021D7730 + .extern MOD59_021D7730 thumb_func_start MOD59_021D778C MOD59_021D778C: ; 0x021D778C @@ -280,7 +21,7 @@ _021D7798: add r0, sp, #0x50 bl GX_SetBanks ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x40 ldr r5, _021D7958 ; =0x021D9DCC str r0, [r4, #0x18] @@ -290,7 +31,7 @@ _021D7798: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D795C ; =0x021D9EA0 add r3, sp, #0x24 ldmia r5!, {r0, r1} @@ -309,10 +50,10 @@ _021D7798: strb r0, [r2, #0x13] ldr r0, [r4, #0x18] add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0xe add r2, sp, #0x24 strb r0, [r2, #0x12] @@ -321,10 +62,10 @@ _021D7798: ldr r0, [r4, #0x18] mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0xd add r2, sp, #0x24 strb r0, [r2, #0x12] @@ -333,10 +74,10 @@ _021D7798: ldr r0, [r4, #0x18] mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0xc add r2, sp, #0x24 strb r0, [r2, #0x12] @@ -344,10 +85,10 @@ _021D7798: strb r1, [r2, #0x13] ldr r0, [r4, #0x18] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0 str r1, [sp] ldr r0, [r4] @@ -391,10 +132,10 @@ _021D7798: ldr r0, [r4, #0x18] mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0xe add r0, sp, #8 strb r1, [r0, #0x12] @@ -403,10 +144,10 @@ _021D7798: ldr r0, [r4, #0x18] add r2, sp, #8 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0xd add r0, sp, #8 strb r1, [r0, #0x12] @@ -416,10 +157,10 @@ _021D7798: mov r1, #6 add r2, sp, #8 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #0xc add r0, sp, #8 strb r1, [r0, #0x12] @@ -429,34 +170,34 @@ _021D7798: mov r1, #7 add r2, sp, #8 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer add r0, r4, #0 bl MOD59_021D8058 mov r0, #0 @@ -478,52 +219,52 @@ MOD59_021D796C: ; 0x021D796C add r4, r0, #0 mov r0, #0 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] bl FreeToHeap pop {r4, pc} @@ -690,7 +431,7 @@ _021D7B0E: lsl r0, r4, #0x18 lsr r0, r0, #0x18 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer b _021D7BDE _021D7B1A: mov r0, #0x10 @@ -783,7 +524,7 @@ _021D7BC0: lsl r0, r4, #0x18 lsr r0, r0, #0x18 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer b _021D7BDE _021D7BD0: ldr r0, _021D7BE4 ; =0x04000050 @@ -843,11 +584,11 @@ MOD59_021D7C10: ; 0x021D7C10 ldr r0, [r5, #0x18] lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette lsl r1, r4, #0x18 ldr r0, [r5, #0x18] lsr r1, r1, #0x18 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -873,7 +614,7 @@ _021D7C5E: ldr r0, [r5, #0x18] ldr r2, _021D7D5C ; =0x021D9DB8 add r1, #0x1c - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x20 @@ -891,7 +632,7 @@ _021D7C5E: mov r3, #4 bl FUN_0200D0BC mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint add r0, r4, #0 bl FUN_02002B7C mov r0, #1 @@ -974,7 +715,7 @@ _021D7D36: _021D7D46: add r0, r5, #0 add r0, #0x1c - bl FUN_02019178 + bl RemoveWindow mov r0, #0 str r0, [r5, #0x50] mov r4, #1 @@ -994,7 +735,7 @@ MOD59_021D7D68: ; 0x021D7D68 cmp r2, #0 bne _021D7D74 ldr r0, _021D7D78 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D7D74: pop {r3, pc} nop @@ -1048,7 +789,7 @@ _021D7DC4: add r1, r5, #0 ldr r0, [r5, #0x18] add r1, #0x30 - bl FUN_02019150 + bl AddWindow ldr r1, [r5] add r0, r6, #0 bl ListMenuItems_ctor @@ -1129,7 +870,7 @@ _021D7E66: bl FUN_0200CCF8 add r0, r5, #0 add r0, #0x30 - bl FUN_02019178 + bl RemoveWindow mov r1, #0 ldr r0, [r5, #0x40] add r2, r1, #0 @@ -1137,7 +878,7 @@ _021D7E66: ldr r0, [r5, #0x44] bl ListMenuItems_dtor ldr r0, _021D7EC8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r5, #0x2c] mov r0, #1 @@ -1191,7 +932,7 @@ _021D7EEE: ; jump table _021D7EFA: add r0, r5, #0 add r1, r5, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 ldr r1, [r4] lsl r0, r0, #0xa @@ -1225,7 +966,7 @@ _021D7EFA: ldr r0, [r4, #0x18] add r1, #0x1c add r2, sp, #0x14 - bl FUN_02019150 + bl AddWindow add r1, r5, #0 mov r0, #0xc0 str r0, [sp] @@ -1264,7 +1005,7 @@ _021D7F7C: add r1, r4, #0 ldr r0, [r4, #0x18] add r1, #0x1c - bl FUN_02019150 + bl AddWindow add r1, r5, #0 mov r0, #0xc0 str r0, [sp] @@ -1319,7 +1060,7 @@ _021D7FF6: bne _021D803C _021D800A: ldr r0, _021D8054 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r4, #0x54] b _021D803C @@ -1334,10 +1075,10 @@ _021D8016: b _021D803C _021D8028: add r0, #0x1c - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 str r0, [r4, #0x54] mov r5, #1 @@ -1372,7 +1113,7 @@ MOD59_021D8058: ; 0x021D8058 ldr r3, [r5] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1420,10 +1161,10 @@ _021D80AA: bl MOD59_021D8234 mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -1696,7 +1437,7 @@ _021D82C8: ldr r0, [r5, #0x18] mov r1, #2 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0xb str r3, [sp] mov r0, #0xa @@ -1705,7 +1446,7 @@ _021D82C8: ldr r0, [r5, #0x18] mov r1, #2 add r2, r7, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 mov r1, #2 mov r2, #9 @@ -1714,7 +1455,7 @@ _021D82C8: mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 str r0, [sp] mov r3, #0x32 @@ -1722,19 +1463,19 @@ _021D82C8: mov r1, #2 add r2, r4, #0 lsl r3, r3, #6 - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r3, #0x20 add r2, r3, #0 mov r0, #2 add r1, r6, #0 add r3, #0xe0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r3, #0x12 ldr r1, _021D83F4 ; =0x021D9ED8 mov r0, #2 mov r2, #0x20 lsl r3, r3, #4 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -1746,7 +1487,7 @@ _021D82C8: ldr r0, [r5, #0x18] mov r1, #5 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #7 str r0, [sp] mov r0, #0xa @@ -1756,7 +1497,7 @@ _021D82C8: mov r1, #5 add r2, r7, #0 mov r3, #0xb - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r5, #0 mov r1, #5 mov r2, #0xa @@ -1765,7 +1506,7 @@ _021D82C8: mov r0, #5 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 str r0, [sp] mov r3, #0x32 @@ -1773,17 +1514,17 @@ _021D82C8: mov r1, #5 add r2, r4, #0 lsl r3, r3, #6 - bl FUN_02017E14 + bl BG_LoadCharTilesData mov r0, #5 add r1, r6, #0 mov r2, #0x20 lsl r3, r0, #6 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #5 ldr r1, _021D83F4 ; =0x021D9ED8 mov r2, #0x20 lsl r3, r0, #6 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r6, #0 bl FreeToHeap add r0, r4, #0 @@ -1831,7 +1572,7 @@ MOD59_021D83F8: ; 0x021D83F8 mov r0, #6 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x20 str r0, [sp] mov r0, #0 @@ -1858,7 +1599,7 @@ MOD59_021D8460: ; 0x021D8460 cmp r2, #0 bne _021D849C ldr r0, [r5, #0x18] - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0 beq _021D8498 cmp r0, #0 @@ -1868,14 +1609,14 @@ MOD59_021D8460: ; 0x021D8460 lsr r1, r1, #0x18 mov r2, #2 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D84E2 _021D848A: lsl r1, r4, #0x18 lsr r1, r1, #0x18 mov r2, #1 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D84E2 _021D8498: mov r6, #1 @@ -1884,7 +1625,7 @@ _021D849C: cmp r2, #1 bne _021D84C2 ldr r0, [r5, #0x18] - bl FUN_02017B48 + bl Bg_GetXpos add r1, r6, #0 sub r1, #0x30 cmp r0, r1 @@ -1894,7 +1635,7 @@ _021D849C: lsr r1, r1, #0x18 mov r2, #2 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D84E2 _021D84BE: mov r6, #1 @@ -1903,7 +1644,7 @@ _021D84C2: cmp r2, #2 bne _021D84E2 ldr r0, [r5, #0x18] - bl FUN_02017B48 + bl Bg_GetXpos cmp r0, #0 beq _021D84E0 lsl r1, r4, #0x18 @@ -1911,7 +1652,7 @@ _021D84C2: lsr r1, r1, #0x18 mov r2, #1 mov r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D84E2 _021D84E0: mov r6, #1 @@ -2206,19 +1947,19 @@ _021D86E4: mov r1, #2 add r2, r7, #0 add r3, r7, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #3 add r3, r2, #0 ldr r0, [r4, #0x18] mov r1, #2 sub r3, #0x6b - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #2 add r1, r7, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #5 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer add r0, r4, #0 add r2, r7, #0 add r0, #0xa8 @@ -2235,10 +1976,10 @@ _021D86E4: _021D8728: ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B48 + bl Bg_GetXpos ldr r0, [r4, #0x18] mov r1, #5 - bl FUN_02017B54 + bl Bg_GetYpos add r1, r4, #0 add r1, #0xb0 ldr r3, [r1] @@ -2269,22 +2010,22 @@ _021D8728: mov r1, #2 ldr r0, [r4, #0x18] add r3, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x18] mov r1, #5 mov r2, #1 mov r3, #2 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x18] mov r1, #5 mov r2, #3 add r3, r5, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D890A _021D8792: mov r0, #5 add r1, r7, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x1e add r4, #0xb0 str r0, [r4] @@ -2307,7 +2048,7 @@ _021D87A6: _021D87BE: mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer add r0, r4, #0 add r2, r7, #0 add r0, #0xa8 @@ -2324,10 +2065,10 @@ _021D87BE: _021D87E0: ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B48 + bl Bg_GetXpos ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B54 + bl Bg_GetYpos add r0, r4, #0 add r0, #0xb0 ldr r1, [r0] @@ -2356,7 +2097,7 @@ _021D87E0: mov r1, #2 mov r2, #3 add r3, r7, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 add r2, r7, #0 add r0, #0xa8 @@ -2385,7 +2126,7 @@ _021D8846: ldr r0, [r4, #0x18] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit asr r5, r5, #1 cmp r5, #0x90 ble _021D886E @@ -2395,15 +2136,15 @@ _021D886E: mov r1, #2 mov r2, #3 add r3, r5, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D890A _021D887C: ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B48 + bl Bg_GetXpos ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02017B54 + bl Bg_GetYpos add r0, r4, #0 add r0, #0xb0 ldr r1, [r0] @@ -2431,7 +2172,7 @@ _021D887C: mov r1, #2 mov r2, #3 add r3, r7, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #5 str r0, [r6] b _021D890A @@ -2447,12 +2188,12 @@ _021D88CC: mov r1, #2 ldr r0, [r4, #0x18] add r3, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x18] mov r1, #2 mov r2, #3 add r3, r5, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, #0xa8 str r5, [r4] b _021D890A @@ -2478,7 +2219,7 @@ MOD59_021D8914: ; 0x021D8914 mov r1, #1 bx r3 .align 2, 0 -_021D891C: .word FUN_020178BC +_021D891C: .word SetBgPriority thumb_func_end MOD59_021D8914 thumb_func_start MOD59_021D8920 @@ -2619,10 +2360,10 @@ _021D8A1A: bl FUN_02005350 add r0, r5, #0 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #1 str r0, [sp] @@ -2658,7 +2399,7 @@ _021D8A76: str r0, [r4, #0xc] ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit bl _021D985C _021D8A92: ldr r0, _021D8D70 ; =0x00000405 @@ -2675,10 +2416,10 @@ _021D8A92: bl MOD59_021D8140 mov r0, #3 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 str r0, [sp] mov r0, #4 @@ -2748,7 +2489,7 @@ _021D8B44: str r0, [r4, #0xc] ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit bl _021D985C _021D8B58: mov r0, #0x29 @@ -2775,10 +2516,10 @@ _021D8B80: bne _021D8C84 ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #1 add r1, r5, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x10] str r0, [r4, #0xc] bl _021D985C @@ -2893,12 +2634,12 @@ _021D8C88: str r0, [r4, #0xc] ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit bl _021D985C _021D8C98: add r0, r5, #0 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x14 str r0, [r4, #0xc] bl _021D985C @@ -2928,7 +2669,7 @@ _021D8CBC: bl FUN_020145C8 mov r0, #6 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer add r0, r4, #0 mov r1, #3 add r0, #0x8b @@ -3003,7 +2744,7 @@ _021D8D7C: bne _021D8DA0 ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x1c str r0, [r4, #0xc] bl _021D985C @@ -3018,7 +2759,7 @@ _021D8DA0: _021D8DA4: ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x68] bl FUN_020146C4 add r0, r4, #0 @@ -3058,12 +2799,12 @@ _021D8DEA: bl MOD59_021D8234 mov r0, #1 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer add r2, r5, #0 ldr r0, [r4, #0x18] mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #6 mov r1, #1 str r0, [sp] @@ -3220,10 +2961,10 @@ _021D8F5E: bne _021D8FCE ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x1c str r0, [r4, #0xc] bl _021D985C @@ -3277,7 +3018,7 @@ _021D8FD2: bl MOD59_021D8234 mov r0, #6 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #1 str r0, [sp] @@ -3319,7 +3060,7 @@ _021D9030: add r0, #0x98 str r1, [r0] ldr r0, [r4, #0x18] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x30 str r0, [r4, #0xc] bl _021D985C @@ -3360,7 +3101,7 @@ _021D9078: cmp r1, r0 bne _021D90A2 ldr r0, _021D937C ; =0x00000706 - bl FUN_020054C8 + bl PlaySE mov r0, #0x32 str r0, [r4, #0xc] b _021D985C @@ -3482,7 +3223,7 @@ _021D9192: bl MOD59_021D82A0 mov r0, #6 add r1, r5, #0 - bl FUN_0201797C + bl ToggleBgLayer add r0, r4, #0 add r1, r5, #0 add r0, #0x94 @@ -3557,7 +3298,7 @@ _021D922A: bne _021D92FA ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x3b str r0, [r4, #0xc] b _021D985C @@ -3615,12 +3356,12 @@ _021D9290: ldr r0, [r4, #0x18] mov r1, #1 sub r3, #0x30 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x18] mov r1, #2 add r2, r5, #0 mov r3, #0x30 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x40 str r0, [r4, #0xc] b _021D985C @@ -3709,7 +3450,7 @@ _021D935C: add r0, #0x84 str r1, [r0] ldr r0, _021D9380 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D9368: add r0, r4, #0 bl MOD59_021D8504 @@ -3801,7 +3542,7 @@ _021D9416: _021D941C: ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x4a str r0, [r4, #0xc] b _021D985C @@ -3848,13 +3589,13 @@ _021D945C: _021D9476: add r0, r5, #0 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer add r0, r4, #0 add r0, #0x84 ldr r0, [r0] @@ -3862,22 +3603,22 @@ _021D9476: bne _021D94AE mov r0, #1 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer add r2, r5, #0 ldr r0, [r4, #0x18] mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit b _021D94C2 _021D94AE: mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer add r2, r5, #0 ldr r0, [r4, #0x18] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _021D94C2: mov r0, #6 mov r1, #1 @@ -3925,7 +3666,7 @@ _021D950C: bne _021D9530 ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, [r4, #0x48] sub r0, r5, #2 cmp r1, r0 @@ -4124,21 +3865,21 @@ _021D9684: _021D9696: add r0, r5, #0 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer add r2, r5, #0 ldr r0, [r4, #0x18] mov r1, #1 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #6 mov r1, #1 str r0, [sp] @@ -4187,7 +3928,7 @@ _021D971A: _021D971C: ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x61 str r0, [r4, #0xc] b _021D985C @@ -4263,7 +4004,7 @@ _021D97B2: bne _021D985C ldr r0, [r4, #0x18] add r1, r5, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x67 str r0, [r4, #0xc] b _021D985C diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index 2925c404..147b3a99 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -11,7 +11,7 @@ MOD59_021D9868: ; 0x021D9868 mov r0, #3 mov r1, #0x53 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap add r0, r4, #0 mov r1, #0x28 mov r2, #0x53 @@ -81,7 +81,7 @@ _021D98C6: str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD59_021D9A20 add r0, r4, #0 @@ -200,7 +200,7 @@ MOD59_021D99F8: ; 0x021D99F8 add r0, r5, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -212,7 +212,7 @@ MOD59_021D9A14: ; 0x021D9A14 ldr r0, [r0, #4] bx r3 nop -_021D9A1C: .word FUN_0201AB60 +_021D9A1C: .word DoScheduledBgGpuUpdates thumb_func_end MOD59_021D9A14 thumb_func_start MOD59_021D9A20 @@ -231,7 +231,7 @@ _021D9A2C: add r0, sp, #0x90 bl GX_SetBanks ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x80 ldr r5, _021D9BB8 ; =0x021DA054 str r0, [r4, #4] @@ -241,7 +241,7 @@ _021D9A2C: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D9BBC ; =0x021DA080 add r3, sp, #0x64 ldmia r5!, {r0, r1} @@ -256,15 +256,15 @@ _021D9A2C: str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r3, [r4] mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [r4, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D9BC0 ; =0x021DA09C add r3, sp, #0x48 ldmia r5!, {r0, r1} @@ -279,7 +279,7 @@ _021D9A2C: str r0, [r3] ldr r0, [r4, #4] add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r3, #0 str r3, [sp] str r3, [sp, #4] @@ -314,7 +314,7 @@ _021D9A2C: str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -351,7 +351,7 @@ _021D9A2C: str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r1, #0 str r1, [sp] str r1, [sp, #4] @@ -387,10 +387,10 @@ _021D9A2C: bl FUN_02002ED0 mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r2, #0xc ldr r0, _021D9BCC ; =0x04000050 mov r1, #2 @@ -415,43 +415,43 @@ MOD59_021D9BD0: ; 0x021D9BD0 add r4, r0, #0 mov r0, #0 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, _021D9C44 ; =0x04000050 mov r1, #0 strh r1, [r0] ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap pop {r4, pc} @@ -511,7 +511,7 @@ _021D9C92: ; jump table _021D9C9A: mov r0, #2 add r1, r5, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 ldr r1, [r4] lsl r0, r0, #0xa @@ -525,7 +525,7 @@ _021D9C9A: ldr r0, [r4, #4] ldr r2, _021D9D6C ; =0x021DA04C add r1, #0x10 - bl FUN_02019150 + bl AddWindow add r1, r5, #0 mov r0, #1 lsl r0, r0, #8 @@ -562,7 +562,7 @@ _021D9C9A: bl CopyWindowToVram mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0xf0 str r0, [r4, #0x24] mov r0, #1 @@ -597,10 +597,10 @@ _021D9D4A: _021D9D50: add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r5, #0 str r0, [r4, #0xc] mov r5, #1 @@ -624,7 +624,7 @@ MOD59_021D9D78: ; 0x021D9D78 ldr r0, [r0, #4] mov r1, #1 asr r3, r3, #4 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r3, pc} .align 2, 0 thumb_func_end MOD59_021D9D78 diff --git a/arm9/modules/59/include/mod59_021D74E0.h b/arm9/modules/59/include/mod59_021D74E0.h index 9342913d..d6f52bba 100644 --- a/arm9/modules/59/include/mod59_021D74E0.h +++ b/arm9/modules/59/include/mod59_021D74E0.h @@ -5,6 +5,15 @@ #include "options.h" #include "save_block_2.h" #include "main.h" +#include "player_data.h" + +struct MOD59_UnkPlayerStruct +{ + u8 padding[0x4]; + GenderEnum gender; + u8 padding2[0x10]; + struct String *name; +}; typedef struct MOD59_OverlayData { @@ -13,10 +22,11 @@ typedef struct MOD59_OverlayData struct Options *options; u32 Unk0C; u32 Unk10; - u32 Unk14; - u8 padding[0x58]; - u32 Unk70; - u32 Unk74; + struct UnkStruct_02006234 *Unk14; + struct BgConfig *Unk18; + u8 padding[0x54]; + struct MOD59_UnkPlayerStruct *playerStruct; + struct MOD59_UnkPlayerStruct *rivalStruct; u8 padding2[0x10]; u8 Unk88; u8 Unk89; @@ -24,9 +34,13 @@ typedef struct MOD59_OverlayData u8 Unk8B; u8 padding3[4]; u32 Unk90; - //TODO pad to 0xb4 + u8 padding4[32]; } MOD59_OverlayData; BOOL MOD59_Init(struct UnkStruct_02006234 *param0); +BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1); +BOOL MOD59_021D76C0(struct UnkStruct_02006234 *param0); +void MOD59_021D7724(MOD59_OverlayData *data); +BOOL MOD59_021D7730(void); #endif //POKEDIAMOND_MOD59_021D74E0_H diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c index 4d7a4a98..e104cf4f 100644 --- a/arm9/modules/59/src/mod59_021D74E0_src.c +++ b/arm9/modules/59/src/mod59_021D74E0_src.c @@ -3,24 +3,45 @@ #include "overlay_manager.h" #include "mod59_021D74E0.h" #include "heap.h" +#include "game_init.h" +#include "GX_layers.h" +#include "unk_02024E64.h" +#include "bg_window.h" +#include "module_52.h" +extern void *FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options); -extern u32 FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct Options *options); +extern void FUN_0200E3A0(PMLCDTarget, int); + +extern void MOD59_021D778C(MOD59_OverlayData *data); +extern void MOD59_021D79F8(MOD59_OverlayData *data); +extern void MOD59_021D7A34(MOD59_OverlayData *data); +extern void MOD59_021D796C(MOD59_OverlayData *data); +extern void MOD59_021D7A4C(MOD59_OverlayData *data); +extern void MOD59_021D7A5C(MOD59_OverlayData *data); +extern u32 MOD59_021D8920(MOD59_OverlayData *data); + +extern void FUN_0200E1D0(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 heap_id); +extern u32 FUN_0200E308(void); + +extern void FUN_02077AC4(void *param0); + +FS_EXTERN_OVERLAY(MODULE_52); THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) { - //note: 0xb4 is likely the overlay data struct size, once struct is padded replace with sizeof - FUN_0201681C(3, 0x52, 1 << 18); - MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_CreateAndGetData(param0, 0xb4, 0x52); + CreateHeap(3, 0x52, 1 << 18); + MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_CreateAndGetData(param0, sizeof(MOD59_OverlayData), 0x52); (void)memset((void *)data, 0, 0xb4); data->heap_id = 0x52; - int *field18 = OverlayManager_GetField18(param0); + s32 *field18 = OverlayManager_GetField18(param0); data->sav2 = (struct SaveBlock2 *)field18[2]; //? data->options = Sav2_PlayerData_GetOptionsAddr(data->sav2); - data->Unk14 = data->Unk10 = data->Unk0C = 0; - data->Unk70 = FUN_02077A84(0x52, 0, 0, 7, data->options); - data->Unk74 = FUN_02077A84(0x52, 3, 0, 7, data->options); + data->Unk10 = data->Unk0C = 0; + data->Unk14 = NULL; + data->playerStruct = (struct MOD59_UnkPlayerStruct *)FUN_02077A84(0x52, 0, 0, 7, data->options); + data->rivalStruct = (struct MOD59_UnkPlayerStruct *)FUN_02077A84(0x52, 3, 0, 7, data->options); data->Unk88 = 0; data->Unk89 = 0; data->Unk8A = 0; @@ -28,3 +49,154 @@ THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) data->Unk90 = 0; return TRUE; } + +THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1) +{ + MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_GetData(param0); + BOOL ret = FALSE; + + switch (*param1) + { + case 0: + FUN_0200E3A0(PM_LCD_TOP, 0); + FUN_0200E3A0(PM_LCD_BOTTOM, 0); + + Main_SetVBlankIntrCB(NULL, NULL); + + FUN_02015F34(NULL, NULL); + GX_DisableEngineALayers(); + GX_DisableEngineBLayers(); + + reg_GX_DISPCNT = reg_GX_DISPCNT & 0xFFFFE0FF; + reg_GXS_DB_DISPCNT = reg_GXS_DB_DISPCNT & 0xFFFFE0FF; + + SetKeyRepeatTimers(4, 8); + + MOD59_021D778C(data); + MOD59_021D79F8(data); + MOD59_021D7A4C(data); + + Main_SetVBlankIntrCB((void (*)(void *))MOD59_021D7724, data); + + GX_BothDispOn(); + + *param1 = 1; + + break; + + case 1: + if (MOD59_021D8920(data) == 1) + { + FUN_0200E1D0(0, 0, 0, 0, 6, 1, data->heap_id); + *param1 = 2; + } + + if (data->Unk14 == NULL) + { + break; + } + + FUN_0200E1D0(0, 0, 0, 0, 6, 1, data->heap_id); + *param1 = 3; + + break; + + case 2: + if (FUN_0200E308() != 1) + { + break; + } + + MOD59_021D7A34(data); + MOD59_021D796C(data); + MOD59_021D7A5C(data); + + Main_SetVBlankIntrCB(NULL, NULL); + + ret = TRUE; + break; + + case 3: + if (FUN_0200E308() != 1) + { + break; + } + + MOD59_021D7A34(data); + MOD59_021D796C(data); + MOD59_021D7A5C(data); + + Main_SetVBlankIntrCB(NULL, NULL); + + *param1 = 4; + + break; + + case 4: + if (OverlayManager_Run(data->Unk14) != TRUE) + { + break; + } + + OverlayManager_delete(data->Unk14); + data->Unk14 = NULL; + + *param1 = 5; + + break; + + case 5: + *param1 = 0; + + break; + } + + return ret; +} + +THUMB_FUNC BOOL MOD59_021D76C0(struct UnkStruct_02006234 *param0) +{ + MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_GetData(param0); + + u32 heap_id = data->heap_id; + PlayerName_StringToFlat(Sav2_PlayerData_GetProfileAddr(data->sav2), data->playerStruct->name); + PlayerProfile_SetTrainerGender(Sav2_PlayerData_GetProfileAddr(data->sav2), data->playerStruct->gender); + + RivalsNameToU16Array(FUN_02024EB4(data->sav2), data->rivalStruct->name); + + FUN_02077AC4(data->playerStruct); + FUN_02077AC4(data->rivalStruct); + + OverlayManager_FreeData(param0); + DestroyHeap(heap_id); + + RegisterMainOverlay(FS_OVERLAY_ID(MODULE_52), &MOD52_021D76D8); + + return TRUE; +} + +THUMB_FUNC void MOD59_021D7724(MOD59_OverlayData *data) +{ + DoScheduledBgGpuUpdates(data->Unk18); +} + +THUMB_FUNC BOOL MOD59_021D7730(void) +{ + BOOL ret = FALSE; + + if (gMain.touchNew != 0 && gMain.touchX < 256 && gMain.touchY < 192) + { + s32 distanceFromXCentre = gMain.touchX < 128 ? (u16)(128 - gMain.touchX) : (u16)(gMain.touchX - 128); + s32 distanceFromYCentre = gMain.touchY < 100 ? (u16)(100 - gMain.touchY) : (u16)(gMain.touchY - 100); + + s32 distanceXSquare = distanceFromXCentre * distanceFromXCentre; + s32 distanceYSquare = distanceFromYCentre * distanceFromYCentre; + + if (distanceXSquare + distanceYSquare <= 256) + { + ret = TRUE; + } + } + + return ret; +} diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 8c6d04fc..bce93cc6 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -13,7 +13,7 @@ MOD60_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x26 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0xad add r0, r4, #0 lsl r1, r1, #2 @@ -215,7 +215,7 @@ _021D769A: add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} nop @@ -284,7 +284,7 @@ _021D7714: cmp r1, #6 bne _021D773C ldr r0, _021D77B0 ; =0x0000061B - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x10] mov r0, #3 bic r1, r0 @@ -405,7 +405,7 @@ _021D7804: bl FUN_0200BC30 bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x14] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D782C ; =0x027E0000 ldr r1, _021D7830 ; =0x00003FF8 mov r0, #1 @@ -587,7 +587,7 @@ MOD60_021D7990: ; 0x021D7990 sub sp, #0x80 add r6, r0, #0 ldr r0, [r6] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0 ldr r4, _021D7A08 ; =0x021D8114 str r0, [r6, #0x14] @@ -597,7 +597,7 @@ MOD60_021D7990: ; 0x021D7990 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D7A0C ; =0x021D8168 add r3, sp, #0x10 mov r2, #0xe @@ -616,12 +616,12 @@ _021D79C6: lsr r1, r1, #0x18 add r2, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r1, [r5] ldr r0, [r6, #0x14] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r7, r7, #1 add r4, #0x1c add r5, r5, #4 @@ -631,12 +631,12 @@ _021D79C6: ldr r3, [r6] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r6] mov r0, #4 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x80 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -651,16 +651,16 @@ MOD60_021D7A14: ; 0x021D7A14 add r4, r0, #0 ldr r0, [r4, #0x14] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x14] bl FreeToHeap pop {r4, pc} @@ -695,7 +695,7 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r2, [r3, #0x14] ldr r0, [r5, #0x14] ldr r3, [r3, #0x10] - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r3, [sp, #0x20] mov r0, #0 str r0, [sp] @@ -703,7 +703,7 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r0, [r5, #0x14] ldr r3, [r3, #0x10] mov r1, #4 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r6, #0 bl FreeToHeap mov r0, #0x49 @@ -725,13 +725,13 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r1, [r1, #0xc] mov r2, #0x20 add r3, r0, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, [sp, #0x1c] mov r0, #4 ldr r1, [r1, #0xc] mov r2, #0x20 mov r3, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r6, #0 bl FreeToHeap mov r0, #0x49 @@ -761,7 +761,7 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r0, [r5, #0x14] mov r1, #2 mov r2, #1 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0 str r3, [sp] mov r0, #0x20 @@ -772,7 +772,7 @@ MOD60_021D7A40: ; 0x021D7A40 ldr r0, [r5, #0x14] mov r1, #4 mov r2, #1 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x28] mov r1, #0x20 str r1, [sp] @@ -795,22 +795,22 @@ MOD60_021D7A40: ; 0x021D7A40 lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r5, #0x14] - bl FUN_020181EC + bl CopyRectToBgTilemapRect mov r2, #3 add r3, r2, #0 ldr r0, [r5, #0x14] mov r1, #0 sub r3, #0x1b - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5, #0x14] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x14] mov r1, #0 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x14] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x24 pop {r3, r4, r5, r6, pc} thumb_func_end MOD60_021D7A40 @@ -844,7 +844,7 @@ MOD60_021D7BA4: ; 0x021D7BA4 ldr r0, [r4, #0x14] add r1, #0x2c add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #3 str r0, [sp] mov r0, #0x1e @@ -860,7 +860,7 @@ MOD60_021D7BA4: ; 0x021D7BA4 ldr r0, [r4, #0x14] add r1, #0x3c add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -876,7 +876,7 @@ MOD60_021D7BA4: ; 0x021D7BA4 add r1, #0x4c mov r2, #1 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] ldr r0, [r4] @@ -933,13 +933,13 @@ MOD60_021D7BA4: ; 0x021D7BA4 bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x4c - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r4, #0 add r0, #0x3c - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r4, #0 add r0, #0x2c - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r4, #0 ldr r2, _021D7CCC ; =0x00000232 add r0, #0x3c @@ -977,14 +977,14 @@ MOD60_021D7CD4: ; 0x021D7CD4 _021D7CF0: lsl r4, r6, #4 add r0, r5, r4 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, r4 add r1, r7, #0 bl FillWindowPixelBuffer add r0, r5, r4 - bl FUN_020192B8 + bl ClearWindowTilemap add r0, r5, r4 - bl FUN_02019178 + bl RemoveWindow add r0, r6, #1 lsl r0, r0, #0x10 lsr r6, r0, #0x10 @@ -1451,7 +1451,7 @@ _021D8080: mov r1, #0 mov r2, #3 neg r3, r3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r3, r4, r5, pc} _021D80BE: mov r0, #0x80 @@ -1479,7 +1479,7 @@ _021D80BE: mov r1, #0 mov r2, #3 neg r3, r3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _021D80F6: pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index ed9e0e05..cbb58d60 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -12,7 +12,7 @@ MOD61_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x29 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #0xbc mov r2, #0x29 @@ -80,7 +80,7 @@ MOD61_021D7568: ; 0x021D7568 add r0, r5, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -120,7 +120,7 @@ MOD61_021D75AC: ; 0x021D75AC tst r0, r1 beq _021D75C2 ldr r0, _021D75CC ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D75C2: @@ -152,7 +152,7 @@ MOD61_021D75D0: ; 0x021D75D0 cmp r0, #0 beq _021D7604 ldr r0, _021D76E4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #2 strb r0, [r4, #0xc] mov r0, #0 @@ -162,11 +162,11 @@ _021D7604: mov r1, #3 strh r1, [r0] ldr r0, _021D76E8 ; =0x000005E3 - bl FUN_020054C8 + bl PlaySE b _021D7620 _021D7612: ldr r0, _021D76E4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #3 strb r0, [r4, #0xc] mov r0, #0 @@ -189,7 +189,7 @@ _021D762E: ldr r0, [r4, #0x1c] strb r1, [r0, #3] ldr r0, _021D76E4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021D7644: mov r0, #1 pop {r3, r4, r5, pc} @@ -198,7 +198,7 @@ _021D7648: tst r0, r2 beq _021D765C ldr r0, _021D76E4 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #3 strb r0, [r4, #0xc] mov r0, #0 @@ -264,7 +264,7 @@ _021D76BE: pop {r3, r4, r5, pc} _021D76C6: ldr r0, _021D76EC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldrb r1, [r4, #0x11] cmp r1, #3 bne _021D76DA @@ -344,7 +344,7 @@ _021D775E: bl FUN_0200D0E0 add r0, r5, #0 add r0, #0x94 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0 strh r0, [r5, #8] ldrb r1, [r5, #0xd] @@ -499,7 +499,7 @@ _021D788A: bl FUN_0200D0E0 add r0, r5, #0 add r0, #0x94 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0 strh r0, [r5, #8] cmp r4, #0 @@ -739,7 +739,7 @@ _021D7A7A: _021D7A88: bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x18] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7AA0 ; =0x027E0000 ldr r1, _021D7AA4 ; =0x00003FF8 mov r0, #1 @@ -921,7 +921,7 @@ MOD61_021D7BD0: ; 0x021D7BD0 add r4, r0, #0 bl MOD61_021D7BB0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0 ldr r5, _021D7CAC ; =0x021D8434 str r0, [r4, #0x18] @@ -931,7 +931,7 @@ MOD61_021D7BD0: ; 0x021D7BD0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7CB0 ; =0x021D84C8 add r3, sp, #0x10 mov r2, #0x11 @@ -946,67 +946,67 @@ _021D7BFC: ldr r0, [r4, #0x18] add r2, sp, #0x10 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #1 add r2, sp, #0x2c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #2 add r2, sp, #0x48 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #3 add r2, sp, #0x64 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #4 add r2, sp, #0x80 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x18] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x18] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0x18] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 ldr r3, [r4] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #1 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #3 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r4] mov r0, #4 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x9c pop {r4, r5, pc} .align 2, 0 @@ -1020,19 +1020,19 @@ MOD61_021D7CB4: ; 0x021D7CB4 add r4, r0, #0 ldr r0, [r4, #0x18] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x18] bl FreeToHeap pop {r4, pc} @@ -1095,7 +1095,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 ldr r0, [r5, #0x18] ldr r3, [r3, #0x10] mov r1, #1 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r3, [sp, #0x28] mov r0, #0 str r0, [sp] @@ -1103,7 +1103,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 ldr r0, [r5, #0x18] ldr r3, [r3, #0x10] mov r1, #4 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r7, #0 bl FreeToHeap ldr r1, [sp, #0x1c] @@ -1127,7 +1127,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 mov r3, #0 lsl r2, r2, #0x10 lsr r2, r2, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r0, [r5] bl FUN_02002FD0 str r0, [r5, #0x30] @@ -1281,7 +1281,7 @@ _021D7E00: ldr r0, [r5, #0x18] ldr r2, _021D7FAC ; =0x00002001 mov r1, #4 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 ldr r0, [r5, #0x3c] mov r1, #0x20 @@ -1304,13 +1304,13 @@ _021D7E00: lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r5, #0x18] - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, [r5, #0x18] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x18] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r5, #0xc] cmp r0, #1 bne _021D7FA6 @@ -1336,10 +1336,10 @@ _021D7E00: lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r5, #0x18] - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, [r5, #0x18] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r2, #0 strb r2, [r5, #0x14] ldr r0, _021D7FB0 ; =MOD61_021D7AA8 @@ -1402,7 +1402,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 str r0, [sp, #0x10] ldr r0, [r5, #0x18] add r1, #0x44 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #8 str r0, [sp] mov r0, #0x1a @@ -1417,7 +1417,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 ldr r0, [r5, #0x18] add r1, #0x54 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd str r0, [sp] mov r0, #0x1a @@ -1432,7 +1432,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 ldr r0, [r5, #0x18] add r1, #0x64 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x14 str r0, [sp] mov r0, #8 @@ -1447,7 +1447,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 ldr r0, [r5, #0x18] add r1, #0x74 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x14 str r0, [sp] mov r0, #8 @@ -1462,7 +1462,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 ldr r0, [r5, #0x18] add r1, #0x84 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -1477,7 +1477,7 @@ MOD61_021D7FF4: ; 0x021D7FF4 add r1, #0x94 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r4, #0 add r5, #0x44 add r6, r4, #0 @@ -1513,9 +1513,9 @@ MOD61_021D80F4: ; 0x021D80F4 add r5, #0x44 _021D80FC: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #6 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 26b7d486..313e1dd9 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1162,7 +1162,7 @@ MOD62_0222DE00: ; 0x0222DE00 add r1, sp, #0x1c mov r2, #0xa mov r3, #2 - bl FUN_020190EC + bl AddTextWindowTopLeftCorner mov r3, #0 str r3, [sp] mov r0, #0xff @@ -1238,7 +1238,7 @@ MOD62_0222DE00: ; 0x0222DE00 ldr r0, [sp, #0x14] bl DestroyMsgData add r0, sp, #0x1c - bl FUN_02019178 + bl RemoveWindow add sp, #0x5c pop {r4, r5, r6, r7, pc} nop @@ -1550,7 +1550,7 @@ _0222E120: ldrsh r3, [r7, r3] mov r1, #5 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x59 lsl r3, r3, #2 ldr r0, [r7, r3] @@ -1558,7 +1558,7 @@ _0222E120: ldrsh r3, [r7, r3] mov r1, #5 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit _0222E160: ldr r0, [sp, #4] cmp r0, #0 @@ -1675,14 +1675,14 @@ _0222E22E: lsl r1, r1, #2 ldr r0, [r0, r1] mov r1, #5 - bl FUN_02017B48 + bl Bg_GetXpos add r4, r0, #0 mov r1, #0x59 ldr r0, [sp, #0x1c] lsl r1, r1, #2 ldr r0, [r0, r1] mov r1, #5 - bl FUN_02017B54 + bl Bg_GetYpos add r3, r0, #0 ldr r0, [sp, #0xc] mov r5, #0x37 @@ -1954,7 +1954,7 @@ _0222E442: ldr r1, [sp, #0x18] lsr r2, r2, #0x18 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized add r0, r7, #0 mov r1, #0x35 bl ListMenuItems_ctor @@ -3323,7 +3323,7 @@ MOD62_0222EEE0: ; 0x0222EEE0 str r0, [sp, #0x10] add r0, r7, #0 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized mov r1, #1 add r0, r5, #0 add r2, r1, #0 @@ -3374,7 +3374,7 @@ MOD62_0222EF44: ; 0x0222EF44 lsr r0, r0, #0x10 str r0, [sp, #0x10] add r0, r7, #0 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0xf bl FillWindowPixelBuffer @@ -3673,9 +3673,9 @@ MOD62_0222F1E8: ; 0x0222F1E8 add r5, #0x30 _0222F1F2: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xb @@ -4603,7 +4603,7 @@ MOD62_0222F904: ; 0x0222F904 bl FUN_0200CCF8 add r0, r4, #0 add r0, #0xfc - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x1a lsl r0, r0, #4 ldr r0, [r4, r0] @@ -4615,7 +4615,7 @@ MOD62_0222F904: ; 0x0222F904 bl ListMenuItems_dtor add r4, #0xfc add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow mov r0, #1 pop {r4, pc} .align 2, 0 @@ -5002,7 +5002,7 @@ _0222FBF0: add r0, r4, #0 bl MOD62_0222D654 ldr r0, _0222FD64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222FD4C _0222FC4C: ldr r0, _0222FD68 ; =gMain @@ -5033,7 +5033,7 @@ _0222FC4C: add r3, r4, #0 bl MOD62_0222E3C4 ldr r0, _0222FD64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222FD4C _0222FC8E: mov r0, #2 @@ -5043,7 +5043,7 @@ _0222FC8E: add r1, #0x10 str r0, [r4, r1] ldr r0, _0222FD6C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _0222FD4C _0222FCA2: mov r0, #0x1a @@ -5105,7 +5105,7 @@ _0222FD10: bne _0222FD4C add r0, r4, #0 add r0, #0xec - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl MOD62_0222ED04 add r0, r4, #0 @@ -5335,7 +5335,7 @@ _0222FEBA: add r0, r4, #0 bl MOD62_0222F0D4 ldr r0, _022300B0 ; =0x000006C5 - bl FUN_020054C8 + bl PlaySE _0222FEE6: ldr r0, _022300B4 ; =0x00000404 add r1, r6, #0 @@ -5368,7 +5368,7 @@ _0222FEF2: add r0, r4, #0 bl MOD62_0222F0D4 ldr r0, _022300B0 ; =0x000006C5 - bl FUN_020054C8 + bl PlaySE _0222FF34: ldr r0, _022300B8 ; =0x00000408 add r1, r6, #0 @@ -5386,7 +5386,7 @@ _0222FF40: mov r1, #5 str r1, [r4, r0] ldr r0, _022300BC ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _0222FF58: ldr r0, _022300C0 ; =0x0000040C mov r1, #0 @@ -5412,7 +5412,7 @@ _0222FF6E: mov r1, #0 bl MOD62_022300DC ldr r0, _022300C4 ; =0x000005E2 - bl FUN_020054C8 + bl PlaySE _0222FF8E: mov r0, #0x41 mov r1, #0x8e @@ -5442,7 +5442,7 @@ _0222FFAC: mov r1, #0 bl MOD62_022300DC ldr r0, _022300BC ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _0222FFCC: ldr r0, _022300C8 ; =0x00000414 mov r1, #0x8f @@ -5464,7 +5464,7 @@ _0222FFE6: cmp r0, #0 bne _02230006 ldr r0, _022300CC ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add r4, #0xec add r0, r4, #0 mov r1, #0xf @@ -5505,14 +5505,14 @@ _02230006: add r1, r5, #0 bl MOD62_0222F168 ldr r0, _022300D0 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _0223005C: ldrb r0, [r6, r5] cmp r0, #0 beq _022300A8 ldr r0, _022300CC ; =0x000005F2 - bl FUN_020054C8 + bl PlaySE add r4, #0xec add r0, r4, #0 mov r1, #0x10 @@ -5537,7 +5537,7 @@ _02230074: add r0, r4, #0 bl MOD62_0222F208 ldr r0, _022300D0 ; =0x000005EB - bl FUN_020054C8 + bl PlaySE pop {r4, r5, r6, pc} _022300A4: bl GF_AssertFail @@ -6028,7 +6028,7 @@ _0223042E: bl GX_EngineBToggleLayers mov r0, #7 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority add r0, r4, #0 mov r1, #1 bl MOD62_0222F738 @@ -6052,7 +6052,7 @@ _0223049A: bne _02230598 mov r0, #3 mov r1, #1 - bl FUN_020178BC + bl SetBgPriority mov r0, #0x10 str r0, [sp] mov r3, #0 @@ -6272,7 +6272,7 @@ _02230646: add r0, r4, #0 bl MOD62_0223026C ldr r0, _02230728 ; =0x000006C6 - bl FUN_020054C8 + bl PlaySE mov r0, #0xf7 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -6697,11 +6697,11 @@ _022309DC: mov r0, #0x43 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0x43 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xf7 lsl r0, r0, #2 ldr r1, [r4, r0] @@ -6844,10 +6844,10 @@ _02230B40: bl FUN_02003210 mov r0, #3 add r1, r0, #0 - bl FUN_020178BC + bl SetBgPriority mov r0, #7 mov r1, #3 - bl FUN_020178BC + bl SetBgPriority mov r0, #4 mov r1, #0 bl GX_EngineBToggleLayers @@ -6979,7 +6979,7 @@ _02230C3E: bl MOD62_0222DB78 _02230C80: ldr r0, _02230CB8 ; =0x000005EA - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0xff add r0, #0xd4 @@ -7036,7 +7036,7 @@ _02230CEC: bne _02230D26 add r0, r4, #0 add r0, #0xec - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 bl MOD62_0222ED04 add r0, r4, #0 @@ -7212,7 +7212,7 @@ _02230E46: mov r2, #0 bl MOD62_0222FA40 ldr r0, _02230F28 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230F18 _02230E66: ldr r0, _02230F2C ; =gMain @@ -7240,7 +7240,7 @@ _02230E66: lsl r0, r0, #2 str r1, [r4, r0] ldr r0, _02230F28 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230F18 _02230EA4: mov r0, #2 @@ -7260,7 +7260,7 @@ _02230EA4: lsl r0, r0, #2 str r1, [r4, r0] ldr r0, _02230F30 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _02230F18 _02230ED0: ldr r1, _02230F2C ; =gMain @@ -7398,7 +7398,7 @@ _02230F90: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _022310C0 ; =MOD62_02231294 add r3, sp, #0xa8 mov r2, #0xa @@ -7413,26 +7413,26 @@ _02230FF0: add r0, r4, #0 add r2, sp, #0xa8 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 add r2, sp, #0xc4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 add r2, sp, #0xe0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _022310C4 ; =0x04000008 mov r0, #3 ldrh r2, [r1] @@ -7454,34 +7454,34 @@ _02231052: mov r1, #4 add r2, sp, #0x38 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #5 add r2, sp, #0x54 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #6 add r2, sp, #0x70 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #7 add r2, sp, #0x8c mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #6 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #4 mov r1, #0 bl GX_EngineBToggleLayers @@ -7511,7 +7511,7 @@ MOD62_022310CC: ; 0x022310CC bl FUN_0200372C add r4, #0xe4 ldr r0, [r4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _02231104 ; =0x027E0000 ldr r1, _02231108 ; =0x00003FF8 mov r0, #1 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index ea96bf3b..182b8d56 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -37,12 +37,12 @@ MOD63_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #1 mov r0, #3 mov r1, #0x1e lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap mov r1, #0x79 add r0, r4, #0 lsl r1, r1, #2 @@ -214,7 +214,7 @@ _021D768C: mov r1, #0x3c bl FUN_020053CC ldr r0, _021D77AC ; =0x000005F4 - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r5] b _021D779C @@ -363,7 +363,7 @@ MOD63_021D77B4: ; 0x021D77B4 add r0, r7, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap cmp r5, #1 beq _021D77F2 cmp r5, #2 @@ -404,7 +404,7 @@ MOD63_021D782C: ; 0x021D782C ldr r0, [r0, #4] bx r3 nop -_021D7834: .word FUN_0201AB60 +_021D7834: .word DoScheduledBgGpuUpdates thumb_func_end MOD63_021D782C thumb_func_start MOD63_021D7838 @@ -500,7 +500,7 @@ MOD63_021D78BC: ; 0x021D78BC add r0, #0x68 add r1, r4, #0 mov r2, #4 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator mov r0, #0x30 add r1, r6, #0 add r2, r4, #0 @@ -692,7 +692,7 @@ MOD63_021D7A48: ; 0x021D7A48 sub sp, #0xb8 add r4, r0, #0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0xa8 ldr r5, _021D7B80 ; =MOD63_021DB9B4 str r0, [r4, #4] @@ -702,7 +702,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7B84 ; =MOD63_021DB9E0 add r3, sp, #0x8c ldmia r5!, {r0, r1} @@ -717,7 +717,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B88 ; =MOD63_021DB9C4 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -732,7 +732,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B8C ; =MOD63_021DBA50 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -747,7 +747,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B90 ; =MOD63_021DBA34 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -762,7 +762,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B94 ; =MOD63_021DB9FC add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -777,7 +777,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldr r0, [r4, #4] mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7B98 ; =MOD63_021DBA18 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -792,7 +792,7 @@ MOD63_021D7A48: ; 0x021D7A48 str r0, [r3] ldr r0, [r4, #4] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -819,10 +819,10 @@ MOD63_021D7A48: ; 0x021D7A48 bl GX_EngineBToggleLayers mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0xb8 pop {r3, r4, r5, pc} nop @@ -865,22 +865,22 @@ MOD63_021D7B9C: ; 0x021D7B9C bl GX_EngineBToggleLayers ldr r0, [r4, #4] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap pop {r4, pc} @@ -2031,15 +2031,15 @@ _021D844C: bl GfGfxLoader_GXLoadPal mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r2, _021D85CC ; =0x00000227 mov r0, #1 mov r1, #0x1a @@ -2054,7 +2054,7 @@ _021D844C: ldr r2, _021D85D0 ; =MOD63_021DB9A0 add r0, r5, #0 add r1, #0xac - bl FUN_02019150 + bl AddWindow mov r1, #0 mov r0, #0xe0 str r0, [sp] @@ -2104,12 +2104,12 @@ _021D844C: add r1, #2 mov r2, #2 mov r3, #0x42 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #4 add r1, sp, #0x1c mov r2, #2 mov r3, #0x44 - bl FUN_02017FB4 + bl BG_LoadPlttData add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop @@ -2183,7 +2183,7 @@ MOD63_021D8644: ; 0x021D8644 add r0, r2, #0 bx r3 .align 2, 0 -_021D864C: .word FUN_02019178 +_021D864C: .word RemoveWindow thumb_func_end MOD63_021D8644 thumb_func_start MOD63_021D8650 diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index 6f6f8f75..34d50a11 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -69,7 +69,7 @@ MOD63_021D88F0: ; 0x021D88F0 sub sp, #0xb8 add r4, r0, #0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0xa8 ldr r5, _021D89E8 ; =MOD63_021DBB4C str r0, [r4, #0xc] @@ -79,7 +79,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D89EC ; =MOD63_021DBC88 add r3, sp, #0x8c ldmia r5!, {r0, r1} @@ -94,7 +94,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D89F0 ; =MOD63_021DBC6C add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -109,7 +109,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D89F4 ; =MOD63_021DBBC4 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -124,7 +124,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D89F8 ; =MOD63_021DBBFC add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -139,7 +139,7 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D89FC ; =MOD63_021DBC18 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -154,7 +154,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldr r0, [r4, #0xc] mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8A00 ; =MOD63_021DBC34 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -169,13 +169,13 @@ MOD63_021D88F0: ; 0x021D88F0 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0xb8 pop {r3, r4, r5, pc} nop @@ -194,7 +194,7 @@ MOD63_021D8A04: ; 0x021D8A04 sub sp, #0x80 add r4, r0, #0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x70 ldr r5, _021D8AC4 ; =MOD63_021DBB3C str r0, [r4, #0xc] @@ -204,7 +204,7 @@ MOD63_021D8A04: ; 0x021D8A04 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -227,7 +227,7 @@ MOD63_021D8A04: ; 0x021D8A04 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8AD0 ; =MOD63_021DBCA4 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -242,7 +242,7 @@ MOD63_021D8A04: ; 0x021D8A04 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8AD4 ; =MOD63_021DBCC0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -257,7 +257,7 @@ MOD63_021D8A04: ; 0x021D8A04 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8AD8 ; =MOD63_021DBCDC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -272,10 +272,10 @@ MOD63_021D8A04: ; 0x021D8A04 str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x80 pop {r3, r4, r5, pc} nop @@ -293,7 +293,7 @@ MOD63_021D8ADC: ; 0x021D8ADC sub sp, #0x9c add r4, r0, #0 ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x8c ldr r5, _021D8BBC ; =MOD63_021DBB6C str r0, [r4, #0xc] @@ -303,7 +303,7 @@ MOD63_021D8ADC: ; 0x021D8ADC ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -326,7 +326,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8BC8 ; =MOD63_021DBD14 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -341,7 +341,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8BCC ; =MOD63_021DBD30 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -356,7 +356,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8BD0 ; =MOD63_021DBBA8 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -371,7 +371,7 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D8BD4 ; =MOD63_021DBBE0 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -386,10 +386,10 @@ MOD63_021D8ADC: ; 0x021D8ADC str r0, [r3] ldr r0, [r4, #0xc] mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x9c pop {r4, r5, pc} nop @@ -582,11 +582,11 @@ MOD63_021D8D10: ; 0x021D8D10 bl GX_DisableEngineBLayers mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #3 mov r1, #0x4c lsl r2, r0, #0x11 - bl FUN_0201681C + bl CreateHeap mov r1, #0xab add r0, r4, #0 lsl r1, r1, #2 @@ -739,7 +739,7 @@ MOD63_021D8E68: ; 0x021D8E68 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x4c - bl FUN_020168D0 + bl DestroyHeap ldr r0, _021D8E94 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _021D8E98 ; =MOD63_021DBAB8 bl RegisterMainOverlay @@ -1200,22 +1200,22 @@ MOD63_021D9234: ; 0x021D9234 bl MOD63_021DAF9C ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] bl FreeToHeap mov r0, #0 @@ -1708,16 +1708,16 @@ _021D964A: _021D965E: ldr r0, [r5, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0xc] bl FreeToHeap ldr r0, [r5, #0x10] @@ -1930,7 +1930,7 @@ _021D9840: ldr r1, [r2, #0x14] add r1, r2, r1 sub r1, r1, r0 - bl FUN_02016B44 + bl ReallocFromHeap mov r0, #0x80 mov r1, #0x4c bl NARC_ctor @@ -2716,7 +2716,7 @@ MOD63_021D9EE0: ; 0x021D9EE0 ldr r0, [r4, #0xc] mov r1, #1 sub r3, r2, #5 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 str r0, [r4, #8] _021D9EFE: @@ -2736,7 +2736,7 @@ MOD63_021D9F00: ; 0x021D9F00 ldr r0, [r4, #0xc] mov r1, #2 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 str r0, [r4, #8] _021D9F1E: @@ -2752,7 +2752,7 @@ MOD63_021D9F20: ; 0x021D9F20 ldr r0, [r4, #0xc] mov r1, #3 sub r3, #0x11 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0 str r0, [r4, #8] pop {r4, pc} @@ -3183,7 +3183,7 @@ _021DA192: mov r1, #3 mov r2, #1 mov r3, #0x40 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #1 lsl r0, r0, #0xc bl FX_Inv @@ -3203,14 +3203,14 @@ _021DA192: mov r1, #2 add r2, sp, #0x10 mov r3, #0x80 - bl FUN_02017BD0 + bl SetBgAffine mov r0, #0x60 str r0, [sp] ldr r0, [r4, #0xc] mov r1, #3 add r2, sp, #0x10 mov r3, #0xc0 - bl FUN_02017BD0 + bl SetBgAffine mov r0, #1 strb r0, [r4, #3] add sp, #0x20 @@ -3357,19 +3357,19 @@ MOD63_021DA418: ; 0x021DA418 beq _021DA458 ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] bl FreeToHeap ldr r0, _021DA470 ; =0x0000028E @@ -3438,7 +3438,7 @@ MOD63_021DA478: ; 0x021DA478 mov r1, #2 mov r2, #4 mov r3, #1 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams mov r0, #1 ldr r1, [r4, #8] lsl r0, r0, #0xa @@ -3454,7 +3454,7 @@ MOD63_021DA478: ; 0x021DA478 mov r1, #3 mov r2, #4 mov r3, #1 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams _021DA4FE: add sp, #0x2c pop {r4, r5, pc} @@ -3502,7 +3502,7 @@ MOD63_021DA504: ; 0x021DA504 mov r1, #2 mov r2, #4 mov r3, #1 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams mov r0, #2 ldr r1, [r4, #8] lsl r0, r0, #0xa @@ -3518,7 +3518,7 @@ MOD63_021DA504: ; 0x021DA504 mov r1, #3 mov r2, #4 mov r3, #1 - bl FUN_02017B60 + bl Bg_SetTextDimAndAffineParams add sp, #0x2c pop {r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 7a70bf1f..47d2195c 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -12,7 +12,7 @@ MOD64_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x2f lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7630 ; =0x000006B4 add r0, r4, #0 mov r2, #0x2f @@ -30,7 +30,7 @@ _021D7504: add r0, r5, r0 mov r1, #0x2f mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 bl OverlayManager_GetField18 add r4, r0, #0 @@ -60,7 +60,7 @@ _021D755E: mov r1, #0x2f bl MOD64_021D7810 mov r0, #0x2f - bl FUN_02016B94 + bl BgConfig_Alloc add r1, r5, #0 add r1, #0x94 str r0, [r1] @@ -71,7 +71,7 @@ _021D755E: str r1, [sp] str r1, [sp, #8] str r1, [sp, #0xc] - bl FUN_02016BBC + bl SetBothScreensModesAndDisable add r0, r5, #0 add r0, #0x94 ldr r0, [r0] @@ -299,7 +299,7 @@ _021D7726: add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x2f - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} thumb_func_end MOD64_021D76F4 @@ -312,7 +312,7 @@ MOD64_021D77A4: ; 0x021D77A4 add r0, r4, #0 add r0, #0x94 ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates mov r0, #2 lsl r0, r0, #8 ldr r0, [r4, r0] @@ -566,15 +566,15 @@ MOD64_021D7970: ; 0x021D7970 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r7, #0 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 add r1, r7, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D7A30 ; =0x021D9094 add r3, sp, #0x1c ldmia r6!, {r0, r1} @@ -589,15 +589,15 @@ MOD64_021D7970: ; 0x021D7970 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r6, _021D7A34 ; =0x021D90CC add r3, sp, #0 ldmia r6!, {r0, r1} @@ -612,15 +612,15 @@ MOD64_021D7970: ; 0x021D7970 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #3 mov r1, #0x20 mov r2, #0 add r3, r4, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r0, r5, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x54 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -635,13 +635,13 @@ MOD64_021D7A38: ; 0x021D7A38 push {r4, lr} add r4, r0, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD64_021D7A38 @@ -678,7 +678,7 @@ MOD64_021D7A54: ; 0x021D7A54 ldr r0, [r0] ldr r1, [r1] mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x98 ldr r0, [r0] @@ -724,7 +724,7 @@ MOD64_021D7AEC: ; 0x021D7AEC add r4, r0, #0 add r0, #0x98 ldr r0, [r0] - bl FUN_02019178 + bl RemoveWindow add r4, #0x98 ldr r0, [r4] bl FreeToHeap @@ -1508,7 +1508,7 @@ _021D80D2: add r0, r4, #0 bl MOD64_021D83C4 ldr r0, _021D80FC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _021D80F4 _021D80F0: mov r0, #1 @@ -1566,7 +1566,7 @@ _021D8146: mov r1, #1 bl MOD64_021D83C4 ldr r0, _021D81D0 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _021D815E: mov r0, #0x26 @@ -1867,7 +1867,7 @@ MOD64_021D8384: ; 0x021D8384 bmi _021D83A0 str r0, [r4, #0x54] ldr r0, _021D83C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D83A0: ldr r0, _021D83BC ; =gMain ldr r1, [r0, #0x48] @@ -1880,7 +1880,7 @@ _021D83A0: bge _021D83BA str r0, [r4, #0x54] ldr r0, _021D83C0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D83BA: pop {r4, pc} .align 2, 0 @@ -3445,7 +3445,7 @@ _021D8F52: ldr r1, [r1] mov r2, #3 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _021D8FA8 ; =0x0001020A mov r2, #5 str r0, [sp] @@ -3476,7 +3476,7 @@ _021D8FB2: add r0, r5, #0 add r0, #0x9c ldr r0, [r0] - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0x9c ldr r0, [r0] @@ -3537,14 +3537,14 @@ MOD64_021D902C: ; 0x021D902C add r1, r0, #0 add r1, #0xa8 ldr r1, [r1] - ldr r3, _021D9040 ; =FUN_02019570 + ldr r3, _021D9040 ; =ClearWindowTilemapAndCopyToVram lsl r1, r1, #2 add r0, r0, r1 add r0, #0x9c ldr r0, [r0] bx r3 nop -_021D9040: .word FUN_02019570 +_021D9040: .word ClearWindowTilemapAndCopyToVram thumb_func_end MOD64_021D902C thumb_func_start MOD64_021D9044 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index e9e1ed78..4fc8d105 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -13,7 +13,7 @@ MOD65_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x2d lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #2 add r0, r4, #0 lsl r1, r1, #8 @@ -80,7 +80,7 @@ MOD65_021D753C: ; 0x021D753C add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end MOD65_021D753C @@ -264,7 +264,7 @@ MOD65_021D76DC: ; 0x021D76DC _021D76EE: bl FUN_0201C30C ldr r0, [r4, #0x24] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7708 ; =0x027E0000 ldr r1, _021D770C ; =0x00003FF8 mov r0, #1 @@ -362,7 +362,7 @@ _021D77A2: tst r0, r1 beq _021D77BE ldr r0, _021D77FC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xff strb r0, [r5, #0x1a] mov r0, #0 @@ -374,7 +374,7 @@ _021D77BE: tst r0, r1 beq _021D77F2 ldr r0, _021D77FC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0xff beq _021D77DC mov r0, #1 @@ -433,7 +433,7 @@ MOD65_021D7818: ; 0x021D7818 tst r0, r1 beq _021D784A ldr r0, _021D78A8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD65_021D86BC add r0, r5, #0 @@ -447,7 +447,7 @@ _021D784A: tst r0, r1 beq _021D789E ldr r0, _021D78A8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #1 mvn r0, r0 cmp r4, r0 @@ -528,7 +528,7 @@ MOD65_021D78CC: ; 0x021D78CC b _021D7916 _021D78E8: ldr r0, _021D791C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD65_021D8764 mov r0, #5 @@ -537,7 +537,7 @@ _021D78E8: pop {r4, pc} _021D78FC: ldr r0, _021D791C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x42 lsl r0, r0, #2 add r0, r4, r0 @@ -581,7 +581,7 @@ _021D7940: mov r0, #0x42 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldrb r0, [r4, #0x1a] ldr r3, [r4, #0x20] lsl r2, r0, #3 @@ -754,7 +754,7 @@ MOD65_021D7A8C: ; 0x021D7A8C add r5, r0, #0 bl MOD65_021D7A6C ldr r0, [r5] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0 ldr r4, _021D7AFC ; =0x021DA040 str r0, [r5, #0x24] @@ -764,7 +764,7 @@ MOD65_021D7A8C: ; 0x021D7A8C ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D7B00 ; =0x021DA140 add r3, sp, #0x10 mov r2, #0x15 @@ -782,17 +782,17 @@ _021D7AC6: lsr r1, r1, #0x18 add r2, r6, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 ldr r0, [r5, #0x24] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit lsl r0, r4, #0x18 ldr r3, [r5] lsr r0, r0, #0x18 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r7, r7, #1 add r4, r4, #1 add r6, #0x1c @@ -814,7 +814,7 @@ _021D7B0A: lsl r1, r4, #0x18 ldr r0, [r5, #0x24] lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #6 blt _021D7B0A @@ -919,10 +919,10 @@ MOD65_021D7B24: ; 0x021D7B24 bl NARC_dtor ldr r0, [r5, #0x24] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x24] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -995,7 +995,7 @@ _021D7C68: ldrb r2, [r4] ldrb r3, [r4, #1] ldr r0, [r6, #0x24] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -1020,9 +1020,9 @@ MOD65_021D7CA8: ; 0x021D7CA8 add r5, #0xe8 _021D7CB0: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xd @@ -1406,7 +1406,7 @@ _021D7FCA: add r3, r2, #0 bl FillWindowPixelRect mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C mov r3, #0 @@ -1716,7 +1716,7 @@ MOD65_021D8214: ; 0x021D8214 beq _021D823E add r0, r5, #0 add r0, #0xe8 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _021D823E: add r0, r5, #0 add r0, #0xc4 @@ -1900,7 +1900,7 @@ MOD65_021D83A0: ; 0x021D83A0 add r4, r0, #0 ldr r0, _021D8470 ; =0x000005E4 add r5, r1, #0 - bl FUN_020054C8 + bl PlaySE ldrh r1, [r4, #0x14] ldr r0, _021D8474 ; =0x0000FFFF cmp r1, r0 @@ -2077,7 +2077,7 @@ MOD65_021D84F0: ; 0x021D84F0 cmp r6, #0 bne _021D850C ldr r0, _021D862C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D850C: add r1, sp, #0x10 add r0, r7, #0 @@ -2297,7 +2297,7 @@ MOD65_021D86BC: ; 0x021D86BC mov r0, #0x46 lsl r0, r0, #2 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0xc8 add r2, sp, #0 @@ -2326,7 +2326,7 @@ MOD65_021D8704: ; 0x021D8704 cmp r2, #0 bne _021D8710 ldr r0, _021D8714 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D8710: pop {r3, pc} nop @@ -2710,7 +2710,7 @@ MOD65_021D8A08: ; 0x021D8A08 mov r0, #3 mov r1, #0x2e lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0x6f add r0, r4, #0 lsl r1, r1, #2 @@ -2921,7 +2921,7 @@ MOD65_021D8BBC: ; 0x021D8BBC add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -3025,7 +3025,7 @@ MOD65_021D8C88: ; 0x021D8C88 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x68] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r0, [r4, #0x44] bl FUN_020081C4 bl FUN_0200BC30 @@ -3069,7 +3069,7 @@ MOD65_021D8CD8: ; 0x021D8CD8 add r5, r0, #0 bl MOD65_021D8CB8 ldr r0, [r5] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #8 ldr r4, _021D8D5C ; =0x021DA35C str r0, [r5, #0x68] @@ -3079,7 +3079,7 @@ MOD65_021D8CD8: ; 0x021D8CD8 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D8D60 ; =0x021DA3C8 add r3, sp, #0x18 mov r2, #0xa @@ -3108,15 +3108,15 @@ _021D8D28: add r2, r6, #0 add r1, r7, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #0x68] add r1, r7, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r3, [r5] add r0, r7, #0 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r0, [sp] add r4, r4, #1 add r0, r0, #1 @@ -3141,13 +3141,13 @@ _021D8D6E: lsl r1, r4, #0x18 ldr r0, [r5, #0x68] lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #3 blt _021D8D6E ldr r0, [r5, #0x68] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r5, #0x68] bl FreeToHeap pop {r3, r4, r5, pc} @@ -3248,10 +3248,10 @@ MOD65_021D8D90: ; 0x021D8D90 bl NARC_dtor ldr r0, [r5, #0x68] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x68] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} thumb_func_end MOD65_021D8D90 @@ -3265,7 +3265,7 @@ MOD65_021D8E68: ; 0x021D8E68 ldr r0, [r4, #0x68] ldr r2, _021D8EAC ; =0x021DA354 add r1, #0x6c - bl FUN_02019150 + bl AddWindow add r0, r4, #0 add r0, #0x6c mov r1, #0 @@ -3296,10 +3296,10 @@ MOD65_021D8EB0: ; 0x021D8EB0 push {r4, lr} add r4, r0, #0 add r0, #0x6c - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r4, #0x6c add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_end MOD65_021D8EB0 @@ -3917,7 +3917,7 @@ _021D9366: bl FUN_0200D0E0 add r4, #0x6c add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #8 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index c902cd22..95660bd2 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -13,7 +13,7 @@ MOD66_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x11 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r4, #0 mov r1, #0xe4 mov r2, #0x11 @@ -119,7 +119,7 @@ MOD66_021D75B0: ; 0x021D75B0 add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x11 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD66_021D75B0 @@ -142,7 +142,7 @@ _021D75DE: add r0, r4, #0 bl MOD66_021D9220 ldr r0, [r4, #0x28] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7600 ; =0x027E0000 ldr r1, _021D7604 ; =0x00003FF8 mov r0, #1 @@ -269,7 +269,7 @@ _021D7694: _021D76E4: bl MOD66_021D7608 ldr r0, [r4, #4] - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x28] ldr r1, [r4, #0x28] add r0, r4, #0 @@ -336,7 +336,7 @@ _021D7782: lsl r1, r4, #0x18 ldr r0, [r5, #0x28] lsr r1, r1, #0x18 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, r4, #1 cmp r4, #8 blt _021D7782 @@ -393,7 +393,7 @@ MOD66_021D77E4: ; 0x021D77E4 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D78B0 ; =0x021D9634 add r3, sp, #0x14 mov r2, #0x1c @@ -411,12 +411,12 @@ _021D7814: lsr r1, r1, #0x18 add r2, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 add r0, r6, #0 lsr r1, r1, #0x18 add r4, r4, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add r7, r7, #1 add r5, #0x1c cmp r7, #8 @@ -426,49 +426,49 @@ _021D7814: ldr r3, [r3, #4] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #1 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #2 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #3 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #4 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #5 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #6 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [sp] mov r0, #7 ldr r3, [r3, #4] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0xf4 pop {r4, r5, r6, r7, pc} nop @@ -1001,7 +1001,7 @@ MOD66_021D7CAC: ; 0x021D7CAC mov r1, #0x11 bl FUN_0200E1D0 ldr r0, _021D7CF0 ; =0x0000068F - bl FUN_020054C8 + bl PlaySE mov r0, #0 bl FUN_0200E394 mov r0, #1 @@ -1038,7 +1038,7 @@ MOD66_021D7CF8: ; 0x021D7CF8 bl FUN_0200E1D0 mov r0, #0x69 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE mov r0, #0 add sp, #0xc pop {pc} @@ -1061,7 +1061,7 @@ MOD66_021D7D24: ; 0x021D7D24 add r2, r1, #0 bl FUN_0200E1D0 ldr r0, _021D7D64 ; =0x0000068F - bl FUN_020054C8 + bl PlaySE mov r0, #0 bl FUN_0200E394 mov r1, #4 @@ -1096,7 +1096,7 @@ MOD66_021D7D6C: ; 0x021D7D6C bl FUN_0200E1D0 mov r0, #0x69 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE mov r0, #0 add sp, #0xc pop {pc} @@ -1115,7 +1115,7 @@ MOD66_021D7D98: ; 0x021D7D98 tst r1, r2 beq _021D7DB6 ldr r0, _021D7DD0 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D7DB6: @@ -1150,7 +1150,7 @@ MOD66_021D7DD4: ; 0x021D7DD4 cmp r0, #0 beq _021D7DFA ldr r0, _021D7E28 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D7DFA: @@ -1161,7 +1161,7 @@ _021D7DFE: tst r2, r3 beq _021D7E0E ldr r0, _021D7E28 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D7E0E: @@ -1189,7 +1189,7 @@ MOD66_021D7E2C: ; 0x021D7E2C tst r1, r3 beq _021D7E42 ldr r0, _021D7E50 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, pc} _021D7E42: @@ -1407,7 +1407,7 @@ _021D7FCE: ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #5 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 beq _021D7FEE mov r4, #0 @@ -1630,10 +1630,10 @@ MOD66_021D8140: ; 0x021D8140 bl MOD66_021D8480 ldr r0, [r5, #0x28] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021D818A: pop {r3, r4, r5, pc} thumb_func_end MOD66_021D8140 @@ -1805,7 +1805,7 @@ MOD66_021D82B8: ; 0x021D82B8 add r0, r6, #0 bl CopyWindowToVram add r0, r6, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} _021D82DC: @@ -2046,7 +2046,7 @@ MOD66_021D8494: ; 0x021D8494 add r0, r5, #0 bl FillWindowPixelBuffer add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldrb r1, [r4, #0x15] add r0, r5, #0 mov r2, #0 @@ -2055,7 +2055,7 @@ MOD66_021D8494: ; 0x021D8494 bl FUN_0200D7A0 ldr r0, [r6, #0x28] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021D84C6: pop {r4, r5, r6, pc} thumb_func_end MOD66_021D8494 @@ -2090,7 +2090,7 @@ MOD66_021D84C8: ; 0x021D84C8 lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r4, #0x28] - bl FUN_020181EC + bl CopyRectToBgTilemapRect add r4, #0x84 ldr r0, [r4] mov r1, #1 @@ -2147,7 +2147,7 @@ MOD66_021D8554: ; 0x021D8554 ldr r0, [r5, #0x28] add r1, #0x28 mov r2, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #3 str r0, [sp] mov r0, #0x15 @@ -2162,7 +2162,7 @@ MOD66_021D8554: ; 0x021D8554 str r0, [sp, #0x10] ldr r0, [r5, #0x28] mov r3, #9 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #3 str r0, [sp] mov r0, #0x1c @@ -2177,7 +2177,7 @@ MOD66_021D8554: ; 0x021D8554 str r0, [sp, #0x10] ldr r0, [r5, #0x28] mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #8 str r0, [sp] mov r0, #0x1c @@ -2192,7 +2192,7 @@ MOD66_021D8554: ; 0x021D8554 add r1, #0x58 mov r2, #4 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0 str r0, [sp] mov r0, #0xa @@ -2208,7 +2208,7 @@ MOD66_021D8554: ; 0x021D8554 add r1, #0x68 mov r2, #4 mov r3, #0xb - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x28 mov r1, #0 @@ -2234,16 +2234,16 @@ MOD66_021D8554: ; 0x021D8554 bl CopyWindowToVram add r0, r4, #0 add r0, #0x38 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x48 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x58 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r4, #0x68 add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add sp, #0x14 pop {r4, r5, pc} nop @@ -2262,7 +2262,7 @@ MOD66_021D8670: ; 0x021D8670 _021D8678: lsl r0, r5, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 @@ -2302,7 +2302,7 @@ MOD66_021D868C: ; 0x021D868C lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r5, #0x28] - bl FUN_02018170 + bl CopyToBgTilemapRect _021D86CA: add r0, r5, #0 add r0, #0xcc @@ -2333,7 +2333,7 @@ _021D86CA: lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r5, #0x28] - bl FUN_020181EC + bl CopyRectToBgTilemapRect add sp, #0x1c pop {r4, r5, pc} thumb_func_end MOD66_021D868C @@ -2394,7 +2394,7 @@ MOD66_021D870C: ; 0x021D870C ldrb r2, [r3, #2] ldrb r3, [r3, #3] ldr r0, [r5, #0x28] - bl FUN_02018170 + bl CopyToBgTilemapRect add r0, r5, #0 add r0, #0xd4 ldrb r1, [r7, #4] @@ -2423,7 +2423,7 @@ MOD66_021D870C: ; 0x021D870C ldrb r2, [r7, #2] ldrb r3, [r7, #3] ldr r0, [r5, #0x28] - bl FUN_020181EC + bl CopyRectToBgTilemapRect ldr r0, [sp, #0x1c] cmp r0, #2 beq _021D882E @@ -2453,7 +2453,7 @@ MOD66_021D870C: ; 0x021D870C ldrb r2, [r6, #2] ldrb r3, [r6, #3] ldr r0, [r5, #0x28] - bl FUN_02018170 + bl CopyToBgTilemapRect add r0, r5, #0 add r0, #0xd4 ldrb r1, [r4, #4] @@ -2480,7 +2480,7 @@ MOD66_021D870C: ; 0x021D870C ldrb r2, [r4, #2] ldrb r3, [r4, #3] ldr r0, [r5, #0x28] - bl FUN_020181EC + bl CopyRectToBgTilemapRect _021D882E: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -2516,7 +2516,7 @@ MOD66_021D8838: ; 0x021D8838 lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r4, #0x28] - bl FUN_02018170 + bl CopyToBgTilemapRect add r0, r4, #0 add r0, #0xbc mov r2, #0 @@ -2541,7 +2541,7 @@ MOD66_021D8838: ; 0x021D8838 lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r4, #0x28] - bl FUN_02018170 + bl CopyToBgTilemapRect ldrb r0, [r4] cmp r0, #1 beq _021D88DE @@ -2569,7 +2569,7 @@ MOD66_021D8838: ; 0x021D8838 lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r4, #0x28] - bl FUN_02018170 + bl CopyToBgTilemapRect _021D88DE: add r0, r4, #0 mov r1, #0 @@ -2598,7 +2598,7 @@ _021D88DE: lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r4, #0x28] - bl FUN_020181EC + bl CopyRectToBgTilemapRect add r0, r4, #0 add r0, #0xc4 mov r2, #0 @@ -2622,7 +2622,7 @@ _021D88DE: lsr r0, r0, #0x18 str r0, [sp, #0x18] ldr r0, [r4, #0x28] - bl FUN_020181EC + bl CopyRectToBgTilemapRect ldrh r1, [r4, #2] mov r0, #1 tst r0, r1 @@ -2657,19 +2657,19 @@ _021D897C: _021D898C: ldr r0, [r4, #0x28] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r3, r4, pc} thumb_func_end MOD66_021D8838 @@ -2683,22 +2683,22 @@ MOD66_021D89B8: ; 0x021D89B8 mov r1, #6 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x28] mov r1, #7 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0 ldr r0, [r4, #0x28] mov r1, #6 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #0 ldr r0, [r4, #0x28] mov r1, #7 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0 str r1, [sp] mov r0, #0x20 @@ -2709,7 +2709,7 @@ MOD66_021D89B8: ; 0x021D89B8 ldr r0, [r4, #0x28] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -2720,7 +2720,7 @@ MOD66_021D89B8: ; 0x021D89B8 ldr r0, [r4, #0x28] mov r1, #1 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -2731,7 +2731,7 @@ MOD66_021D89B8: ; 0x021D89B8 ldr r0, [r4, #0x28] mov r1, #2 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -2742,7 +2742,7 @@ MOD66_021D89B8: ; 0x021D89B8 ldr r0, [r4, #0x28] mov r1, #3 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -2753,7 +2753,7 @@ MOD66_021D89B8: ; 0x021D89B8 ldr r0, [r4, #0x28] mov r1, #4 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -2764,7 +2764,7 @@ MOD66_021D89B8: ; 0x021D89B8 ldr r0, [r4, #0x28] mov r1, #5 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -2775,7 +2775,7 @@ MOD66_021D89B8: ; 0x021D89B8 ldr r0, [r4, #0x28] mov r1, #6 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -2786,31 +2786,31 @@ MOD66_021D89B8: ; 0x021D89B8 ldr r0, [r4, #0x28] mov r1, #7 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4, #0x28] mov r1, #0 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #3 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #6 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r4, #0x28] mov r1, #7 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2943,12 +2943,12 @@ MOD66_021D8BF0: ; 0x021D8BF0 mov r1, #6 mov r2, #0 mov r3, #8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #0 mov r3, #8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _021D8C4A _021D8C16: cmp r4, #0xf8 @@ -2957,23 +2957,23 @@ _021D8C16: mov r1, #6 mov r2, #0 mov r3, #0xf8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #0 mov r3, #0xf8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText b _021D8C4A _021D8C34: mov r1, #6 mov r2, #0 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #0 add r3, r4, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _021D8C4A: cmp r6, #0x50 bge _021D8C68 @@ -2981,12 +2981,12 @@ _021D8C4A: mov r1, #6 mov r2, #3 mov r3, #0x50 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #3 mov r3, #0x50 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, r5, r6, pc} _021D8C68: mov r3, #0x13 @@ -2996,24 +2996,24 @@ _021D8C68: ble _021D8C8A mov r1, #6 mov r2, #3 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r3, #0x13 ldr r0, [r5, #0x28] mov r1, #7 mov r2, #3 lsl r3, r3, #4 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, r5, r6, pc} _021D8C8A: mov r1, #6 mov r2, #3 add r3, r6, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r0, [r5, #0x28] mov r1, #7 mov r2, #3 add r3, r6, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD66_021D8BF0 @@ -3336,7 +3336,7 @@ _021D8ED0: mov r1, #1 bl FUN_02020208 ldr r0, _021D9018 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] add sp, #0x10 add r0, r0, #1 @@ -3360,7 +3360,7 @@ _021D8F04: bl MOD66_021D868C ldr r0, [r5, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021D8F2C: ldr r1, [r4, #8] add r0, r1, #1 @@ -3416,7 +3416,7 @@ _021D8F7C: ldr r0, [r5, #0x28] mov r1, #4 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -3427,7 +3427,7 @@ _021D8F7C: ldr r0, [r5, #0x28] mov r1, #5 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r1, r4, #0 add r0, r5, #0 add r1, #0x68 @@ -3507,7 +3507,7 @@ _021D903C: mov r2, #2 bl FUN_0200E1D0 ldr r0, _021D90EC ; =0x00000691 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] add sp, #0x10 add r0, r0, #1 @@ -3527,17 +3527,17 @@ _021D9066: ldr r0, [r5, #0x28] mov r1, #4 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r5, #0 mov r1, #0 mov r2, #1 bl MOD66_021D868C ldr r0, [r5, #0x28] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r0, [r5, #0x28] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r3, #0 str r3, [r5, #0x14] mov r0, #8 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 60bd02b5..c17a7105 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -30,12 +30,12 @@ MOD67_021D74E0: ; 0x021D74E0 strh r1, [r3] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #2 mov r0, #3 mov r1, #0x2a lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r4, #0 bl OverlayManager_GetField18 add r5, r0, #0 @@ -48,7 +48,7 @@ MOD67_021D74E0: ; 0x021D74E0 add r4, r0, #0 bl memset mov r0, #0x2a - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] str r5, [r4, #0x4c] add r0, r5, #0 @@ -165,7 +165,7 @@ MOD67_021D7624: ; 0x021D7624 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x2a - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -175,7 +175,7 @@ MOD67_021D7624: ; 0x021D7624 MOD67_021D7660: ; 0x021D7660 push {r3, lr} ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7678 ; =0x027E0000 ldr r1, _021D767C ; =0x00003FF8 mov r0, #1 @@ -221,7 +221,7 @@ MOD67_021D76A0: ; 0x021D76A0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D776C ; =0x021D975C add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -236,10 +236,10 @@ MOD67_021D76A0: ; 0x021D76A0 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7770 ; =0x021D9740 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -254,10 +254,10 @@ MOD67_021D76A0: ; 0x021D76A0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7774 ; =0x021D9778 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -272,7 +272,7 @@ MOD67_021D76A0: ; 0x021D76A0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021D7778 ; =0x021D9794 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -287,17 +287,17 @@ MOD67_021D76A0: ; 0x021D76A0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x2a - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x2a - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x80 pop {r3, r4, r5, pc} nop @@ -315,16 +315,16 @@ MOD67_021D777C: ; 0x021D777C bl GX_DisableEngineALayers add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x2a add r1, r4, #0 bl FreeToHeapExplicit @@ -405,7 +405,7 @@ _021D7802: _021D7844: ldr r0, [r4] mov r1, #2 - bl FUN_0201886C + bl GetBgTilemapBuffer add r1, r4, #0 mov r2, #2 add r1, #0x5c @@ -417,7 +417,7 @@ _021D7844: mov r1, #3 add r2, r4, #0 lsl r3, r3, #0xa - bl FUN_02017DFC + bl BG_LoadScreenTilemapData mov r1, #0x1e mov r0, #0 lsl r1, r1, #4 @@ -425,7 +425,7 @@ _021D7844: bl FUN_02002ED0 mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x10 pop {r4, pc} thumb_func_end MOD67_021D77B0 @@ -587,7 +587,7 @@ _021D7970: mov r1, #1 strb r1, [r4, r0] ldr r0, _021D7A24 ; =0x00000691 - bl FUN_020054C8 + bl PlaySE b _021D7A12 _021D79AC: bl MOD67_021D7C30 @@ -613,7 +613,7 @@ _021D79AC: ldrb r1, [r4, r1] ldr r0, [r4] add r2, r4, r2 - bl FUN_02018148 + bl LoadRectToBgTilemapRect mov r3, #0 add r2, r4, #0 str r3, [sp] @@ -624,15 +624,15 @@ _021D79AC: ldr r0, [r4] ldrb r1, [r4, r1] add r2, #0x5c - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r1, _021D7A34 ; =0x00001062 ldr r0, [r4] ldrb r1, [r4, r1] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldr r1, _021D7A30 ; =0x00001061 ldr r0, [r4] ldrb r1, [r4, r1] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc mov r0, #1 pop {r3, r4, pc} @@ -678,7 +678,7 @@ _021D7A4A: mov r1, #1 strb r1, [r4, r0] ldr r0, _021D7AA0 ; =0x00000691 - bl FUN_020054C8 + bl PlaySE b _021D7A92 _021D7A72: bl MOD67_021D7CBC @@ -826,10 +826,10 @@ MOD67_021D7B5C: ; 0x021D7B5C ldr r0, [r5] add r3, r2, #0 add r4, r1, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, [r5] add r1, r4, #0 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -841,7 +841,7 @@ MOD67_021D7B84: ; 0x021D7B84 add r4, r0, #0 ldr r0, [r4] mov r1, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r2, _021D7B9C ; =0x0000085C add r1, r4, r2 sub r2, #0x5c @@ -863,7 +863,7 @@ MOD67_021D7BA0: ; 0x021D7BA0 ldr r0, [r7] lsr r1, r1, #0x18 add r5, r3, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer str r0, [sp, #0x14] ldr r1, _021D7C2C ; =0x021D97D8 lsl r0, r5, #5 @@ -890,7 +890,7 @@ _021D7BCA: ldr r1, [sp, #0x18] mov r2, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect b _021D7C10 _021D7BF0: ldr r0, [sp, #0x14] @@ -920,7 +920,7 @@ _021D7C10: ldr r0, [r7] lsl r1, r1, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -965,19 +965,19 @@ MOD67_021D7C30: ; 0x021D7C30 add r0, r0, #5 ldrb r0, [r4, r0] mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7CB8 ; =0x00001063 mov r1, #1 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7CA8 ; =0x00001062 mov r1, #2 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7CB0 ; =0x00001061 mov r1, #3 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority mov r0, #1 pop {r4, pc} _021D7CA4: @@ -1031,19 +1031,19 @@ MOD67_021D7CBC: ; 0x021D7CBC add r0, r0, #5 ldrb r0, [r4, r0] mov r1, #0 - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7D50 ; =0x00001063 mov r1, #1 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7D58 ; =0x00001062 mov r1, #2 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority ldr r0, _021D7D5C ; =0x00001061 mov r1, #3 ldrb r0, [r4, r0] - bl FUN_020178BC + bl SetBgPriority _021D7D30: ldr r0, _021D7D54 ; =0x0000105F ldrsb r1, [r4, r0] @@ -1077,7 +1077,7 @@ _021D7D6A: ldr r0, [r7] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -1095,7 +1095,7 @@ MOD67_021D7D84: ; 0x021D7D84 add r5, r0, #4 _021D7D8A: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #4 @@ -1146,9 +1146,9 @@ _021D7DB4: bl MOD67_021D8344 _021D7DF2: add r0, r6, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, r5, r6, pc} thumb_func_end MOD67_021D7D9C diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index b2170444..e30ad283 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -32,7 +32,7 @@ MOD68_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x24 lsr r2, r2, #9 - bl FUN_0201681C + bl CreateHeap mov r1, #0x81 add r0, r4, #0 lsl r1, r1, #2 @@ -49,7 +49,7 @@ MOD68_021D74E0: ; 0x021D74E0 lsl r1, r1, #2 str r0, [r5, r1] mov r0, #0x24 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r5] mov r0, #0x7e lsl r0, r0, #2 @@ -73,7 +73,7 @@ MOD68_021D74E0: ; 0x021D74E0 bl MOD68_021D7870 mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl FUN_0201CC08 mov r0, #4 bl FUN_0201CC24 @@ -173,7 +173,7 @@ MOD68_021D762C: ; 0x021D762C add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x24 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _021D767C ; =0x04000050 mov r1, #0 strh r1, [r0] @@ -187,7 +187,7 @@ _021D767C: .word 0x04000050 MOD68_021D7680: ; 0x021D7680 push {r3, lr} ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D7698 ; =0x027E0000 ldr r1, _021D769C ; =0x00003FF8 mov r0, #1 @@ -233,7 +233,7 @@ MOD68_021D76C0: ; 0x021D76C0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable bl MOD68_021D7FD8 ldr r5, _021D7768 ; =0x021D8910 add r3, sp, #0x38 @@ -249,10 +249,10 @@ MOD68_021D76C0: ; 0x021D76C0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D776C ; =0x021D88D8 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -267,12 +267,12 @@ MOD68_021D76C0: ; 0x021D76C0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 mov r2, #3 mov r3, #8 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText ldr r5, _021D7770 ; =0x021D88F4 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -287,12 +287,12 @@ MOD68_021D76C0: ; 0x021D76C0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x24 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x64 pop {r4, r5, pc} nop @@ -311,13 +311,13 @@ MOD68_021D7774: ; 0x021D7774 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x24 add r1, r4, #0 bl FreeToHeapExplicit @@ -393,12 +393,12 @@ _021D7812: mov r1, #1 add r2, r4, #0 mov r3, #2 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 bl FreeToHeap ldr r0, [r5] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r1, #0x1e mov r0, #0 lsl r1, r1, #4 @@ -482,7 +482,7 @@ _021D78D2: ldr r0, [r7] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r6, r6, #1 add r4, #8 add r5, #0x10 @@ -500,7 +500,7 @@ MOD68_021D78EC: ; 0x021D78EC mov r4, #0 _021D78F2: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xc @@ -544,7 +544,7 @@ MOD68_021D7904: ; 0x021D7904 ldr r0, [sp, #0x10] bl String_dtor add r0, r5, r4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} thumb_func_end MOD68_021D7904 @@ -736,7 +736,7 @@ MOD68_021D7A18: ; 0x021D7A18 add r0, r5, #0 bl String_dtor add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -774,7 +774,7 @@ MOD68_021D7AE4: ; 0x021D7AE4 add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -810,7 +810,7 @@ MOD68_021D7B34: ; 0x021D7B34 add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -855,7 +855,7 @@ _021D7BA4: add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -891,7 +891,7 @@ MOD68_021D7BDC: ; 0x021D7BDC add r0, r4, #0 bl String_dtor add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -980,7 +980,7 @@ MOD68_021D7C28: ; 0x021D7C28 add r0, r4, #0 bl String_dtor add r0, r6, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -1393,7 +1393,7 @@ MOD68_021D7F98: ; 0x021D7F98 bl MOD68_021D85F4 ldr r0, [r4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, pc} .align 2, 0 thumb_func_end MOD68_021D7F98 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 58d0b4f8..b29554ea 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -13,7 +13,7 @@ HOF_OverlayInit: ; 0x0222D5C0 mov r0, #3 mov r1, #0x3f lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222D70C ; =0x00001B60 add r0, r5, #0 mov r2, #0x3f @@ -213,7 +213,7 @@ _0222D762: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0x3f - bl FUN_020168D0 + bl DestroyHeap ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -735,7 +735,7 @@ MOD69_0222DBAC: ; 0x0222DBAC sub sp, #0x14 add r4, r0, #0 mov r0, #0x3f - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x10] ldr r0, _0222DCF4 ; =0x0222F8CC bl GX_SetBanks @@ -745,28 +745,28 @@ MOD69_0222DBAC: ; 0x0222DBAC and r0, r1 strh r0, [r2] ldr r0, _0222DD00 ; =0x0222F7C4 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x10] ldr r2, _0222DD04 ; =0x0222F850 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] ldr r2, _0222DD08 ; =0x0222F818 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] ldr r2, _0222DD0C ; =0x0222F834 mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r2, #0 str r2, [sp] mov r1, #1 ldr r0, [r4, #0x10] add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -776,7 +776,7 @@ MOD69_0222DBAC: ; 0x0222DBAC ldr r0, [r4, #0x10] mov r1, #1 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0 add r1, r4, #0 str r3, [sp] @@ -789,17 +789,17 @@ MOD69_0222DBAC: ; 0x0222DBAC str r2, [sp, #0x10] ldr r0, [r4, #0x10] add r1, #0x14 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x14 mov r1, #0 bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 add r0, #0x14 - bl FUN_02019270 + bl PutWindowTilemap mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -846,7 +846,7 @@ MOD69_0222DBAC: ; 0x0222DBAC bl GfGfxLoader_LoadScrnData ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, _0222DD10 ; =0x04000040 mov r1, #0 strh r1, [r0] @@ -900,16 +900,16 @@ MOD69_0222DD18: ; 0x0222DD18 str r0, [r2] add r0, r4, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] bl FreeToHeap pop {r4, pc} @@ -2469,7 +2469,7 @@ _0222E9D8: mov r1, #0x18 bl MOD69_0222E89C ldr r0, [r4, #0x10] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0x14 str r0, [r4, #0x30] ldr r0, [r4, #0x34] @@ -2490,7 +2490,7 @@ _0222E9FC: mov r1, #0x58 bl MOD69_0222E89C ldr r0, [r4, #0x10] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0x14 str r0, [r4, #0x30] ldr r0, [r4, #0x34] @@ -2521,7 +2521,7 @@ _0222EA2E: mov r1, #0x88 bl MOD69_0222E89C ldr r0, [r4, #0x10] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #0x34] add r0, r0, #1 str r0, [r4, #0x34] @@ -2595,7 +2595,7 @@ _0222EAEA: ldr r0, [r4, #0xc] lsr r1, r1, #0x18 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 add r0, #0x14 bl MOD69_0222F6C0 @@ -2610,7 +2610,7 @@ _0222EB16: mov r1, #0 bl FillWindowPixelBuffer ldr r0, [r4, #0x10] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode ldr r0, [r4, #0x28] add r0, r0, #1 str r0, [r4, #0x28] @@ -2622,7 +2622,7 @@ _0222EB2C: lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 bl MOD69_0222E204 add r0, r5, #0 @@ -2744,7 +2744,7 @@ MOD69_0222EB4C: ; 0x0222EB4C bl AddTextPrinterParameterized2 add r4, #0x14 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r4, pc} nop diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 9db294af..8dc21247 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -11,12 +11,12 @@ MOD70_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x3c lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r2, #7 mov r0, #3 mov r1, #0x3d lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #0xdc mov r2, #0x3c @@ -76,9 +76,9 @@ MOD70_021D755C: ; 0x021D755C add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x3d - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x3c - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -405,7 +405,7 @@ MOD70_021D77CC: ; 0x021D77CC str r5, [r4] str r6, [r4, #4] mov r0, #0x3d - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x10] bl NNS_G2dInitOamManagerModule mov r0, #0 @@ -647,7 +647,7 @@ MOD70_021D79C0: ; 0x021D79C0 b _021D7A14 _021D79D4: ldr r0, _021D7A1C ; =0x0000060E - bl FUN_020054C8 + bl PlaySE mov r1, #0 mov r0, #6 str r0, [sp] @@ -788,7 +788,7 @@ MOD70_021D7ADC: ; 0x021D7ADC push {r4, lr} add r4, r0, #0 ldr r0, _021D7AF0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD70_021D7D98 mov r0, #1 @@ -810,17 +810,17 @@ MOD70_021D7AF4: ; 0x021D7AF4 orr r0, r1 strh r0, [r2] ldr r0, _021D7C00 ; =0x021D823C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r5, #0x10] ldr r2, _021D7C04 ; =0x021D8268 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #0x10] ldr r2, _021D7C08 ; =0x021D824C mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -857,7 +857,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 mov r1, #1 ldr r0, [r5, #0x10] add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -867,7 +867,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 ldr r0, [r5, #0x10] mov r1, #1 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r5, #0 mov r1, #1 bl MOD70_021D7C2C @@ -900,7 +900,7 @@ MOD70_021D7AF4: ; 0x021D7AF4 bl FUN_0200CCA4 ldr r0, [r5, #0x10] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r3, #8 ldr r0, _021D7C0C ; =0x04000050 mov r1, #0 @@ -927,10 +927,10 @@ MOD70_021D7C10: ; 0x021D7C10 add r4, r0, #0 ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl MOD70_021D7C98 pop {r4, pc} @@ -957,7 +957,7 @@ MOD70_021D7C2C: ; 0x021D7C2C ldr r0, [r5, #0x10] add r1, #0x14 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x1e @@ -976,13 +976,13 @@ MOD70_021D7C2C: ; 0x021D7C2C ldr r0, [r5, #0x10] add r1, #0x24 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x14 - bl FUN_02019270 + bl PutWindowTilemap add r5, #0x24 add r0, r5, #0 - bl FUN_02019270 + bl PutWindowTilemap add r4, #0xb4 add r0, r4, #0 add sp, #0x14 @@ -998,7 +998,7 @@ MOD70_021D7C98: ; 0x021D7C98 add r5, #0x14 _021D7CA0: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #2 @@ -1029,10 +1029,10 @@ MOD70_021D7CC0: ; 0x021D7CC0 bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add r4, #0x24 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r4, pc} thumb_func_end MOD70_021D7CC0 @@ -1114,7 +1114,7 @@ MOD70_021D7CE8: ; 0x021D7CE8 add r3, r1, #0 bl AddTextPrinterParameterized add r0, r6, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end MOD70_021D7CE8 @@ -1341,7 +1341,7 @@ _021D7F1E: blt _021D7F1E _021D7F66: ldr r0, [sp, #0xc] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD70_021D7D98 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 303bee40..5ece5081 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -27,7 +27,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 ldr r2, _0222D734 ; =0x000707D0 mov r0, #3 mov r1, #0x1a - bl FUN_0201681C + bl CreateHeap ldr r1, _0222D738 ; =0x000036B4 add r0, r5, #0 mov r2, #0x1a @@ -38,7 +38,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 add r1, r4, #0 bl MIi_CpuClearFast mov r0, #0x1a - bl FUN_02016B94 + bl BgConfig_Alloc mov r1, #0x5d lsl r1, r1, #2 str r0, [r4, r1] @@ -74,7 +74,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 bl MOD71_0222E76C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD71_0222E558 mov r0, #0x5d lsl r0, r0, #2 @@ -128,7 +128,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 bl FUN_02083B84 mov r0, #0 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -314,28 +314,28 @@ MOD71_0222D820: ; 0x0222D820 bl MOD71_02230F40 mov r0, #4 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 mov r1, #1 bl GX_EngineBToggleLayers mov r0, #0 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -932,7 +932,7 @@ _0222DDA6: mov r0, #0x50 bl FUN_02031588 mov r0, #2 - bl FUN_020166A8 + bl SetSoftResetDisableMask add r0, r4, #0 bl MOD71_02230B88 ldr r0, [r4, #0x4c] @@ -1211,13 +1211,13 @@ _0222DFD6: bl FUN_0200A208 mov r0, #1 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #2 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -1267,13 +1267,13 @@ _0222E054: bl FUN_0200A208 mov r0, #4 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 mov r1, #1 bl GX_EngineBToggleLayers @@ -1304,7 +1304,7 @@ _0222E094: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -1317,7 +1317,7 @@ _0222E094: mov r2, #1 bl MOD71_02230F40 mov r0, #2 - bl FUN_020166B8 + bl ClearSoftResetDisableMask add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -1777,7 +1777,7 @@ MOD71_0222E438: ; 0x0222E438 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x1a - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} nop @@ -1793,7 +1793,7 @@ MOD71_0222E4DC: ; 0x0222E4DC mov r0, #0x5d lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r0, _0222E548 ; =0x00002110 ldr r0, [r5, r0] cmp r0, #0 @@ -1876,7 +1876,7 @@ MOD71_0222E578: ; 0x0222E578 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _0222E74C ; =0x0223115C add r3, sp, #0xa8 ldmia r4!, {r0, r1} @@ -1891,10 +1891,10 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r4, _0222E750 ; =0x02231124 add r3, sp, #0x8c ldmia r4!, {r0, r1} @@ -1909,10 +1909,10 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r4, _0222E754 ; =0x02231178 add r3, sp, #0x70 ldmia r4!, {r0, r1} @@ -1927,10 +1927,10 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r4, _0222E758 ; =0x02231194 add r3, sp, #0x54 ldmia r4!, {r0, r1} @@ -1945,7 +1945,7 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r4, _0222E75C ; =0x022310EC add r3, sp, #0x38 ldmia r4!, {r0, r1} @@ -1960,10 +1960,10 @@ MOD71_0222E578: ; 0x0222E578 add r0, r5, #0 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r4, _0222E760 ; =0x02231108 add r3, sp, #0x1c ldmia r4!, {r0, r1} @@ -1978,7 +1978,7 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r4, _0222E764 ; =0x02231140 add r3, sp, #0 ldmia r4!, {r0, r1} @@ -1993,22 +1993,22 @@ MOD71_0222E578: ; 0x0222E578 str r0, [r3] add r0, r5, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x1a - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #1 mov r1, #0x20 mov r2, #0 mov r3, #0x1a - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x1a - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r4, #0 mov r6, #3 add r7, r4, #0 @@ -2018,51 +2018,51 @@ _0222E6BC: add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit lsl r1, r4, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 add r2, r6, #0 add r3, r7, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 mov r2, #0 add r0, r5, #0 lsr r1, r1, #0x18 add r3, r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r1, r4, #4 lsl r1, r1, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, r4, #1 cmp r4, #4 blt _0222E6BC mov r0, #0 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r2, #1 lsl r2, r2, #0x1a ldr r1, [r2] @@ -2188,25 +2188,25 @@ MOD71_0222E848: ; 0x0222E848 push {r4, lr} add r4, r0, #0 mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD71_0222E848 @@ -2237,7 +2237,7 @@ _0222E8B2: lsl r1, r4, #0x18 add r0, r5, #0 lsr r1, r1, #0x18 - bl FUN_0201886C + bl GetBgTilemapBuffer cmp r0, #0 beq _0222E8D0 ldr r2, [sp, #4] @@ -2246,7 +2246,7 @@ _0222E8B2: add r0, r5, #0 lsr r1, r1, #0x18 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData _0222E8D0: add r0, r6, #0 bl FreeToHeap @@ -2262,7 +2262,7 @@ MOD71_0222E8DC: ; 0x0222E8DC sub sp, #4 mov r1, #2 add r4, r0, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer add r2, r0, #0 mov r0, #0 mov r3, #6 @@ -2270,7 +2270,7 @@ MOD71_0222E8DC: ; 0x0222E8DC add r0, r4, #0 mov r1, #2 lsl r3, r3, #8 - bl FUN_02017CE8 + bl BgCopyOrUncompressTilemapBufferRangeToVram add sp, #4 pop {r3, r4, pc} .align 2, 0 @@ -2304,10 +2304,10 @@ MOD71_0222E900: ; 0x0222E900 bl GfGfxLoader_GXLoadPal mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r1, #0x1a mov r0, #0 lsl r1, r1, #4 @@ -2414,7 +2414,7 @@ MOD71_0222E900: ; 0x0222E900 bl FUN_02002ED0 add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2958,7 +2958,7 @@ _0222EE9A: add r0, #0x1c lsl r0, r0, #4 add r0, r6, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram _0222EEA6: mov r0, #3 str r0, [sp] @@ -3046,21 +3046,21 @@ MOD71_0222EF24: ; 0x0222EF24 add r0, #0x1a lsl r0, r0, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x1c lsl r0, r0, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x1e lsl r0, r0, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r4, #0x20 lsl r0, r4, #4 add r0, r5, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram pop {r4, r5, r6, pc} thumb_func_end MOD71_0222EF24 @@ -3633,7 +3633,7 @@ MOD71_0222F3DC: ; 0x0222F3DC cmp r0, r6 beq _0222F416 ldr r0, _0222F428 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE str r6, [r4] mov r7, #1 _0222F416: @@ -3966,7 +3966,7 @@ MOD71_0222F674: ; 0x0222F674 ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -4023,7 +4023,7 @@ _0222F6EE: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -4058,7 +4058,7 @@ _0222F738: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -4103,7 +4103,7 @@ MOD71_0222F790: ; 0x0222F790 ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -4149,7 +4149,7 @@ MOD71_0222F7E4: ; 0x0222F7E4 ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -4326,7 +4326,7 @@ MOD71_0222F954: ; 0x0222F954 pop {r4, r5, r6, pc} _0222F976: ldr r0, _0222FA10 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0222FA14 ; =0x0000366C ldr r0, [r5, r0] bl FUN_0202DFA4 @@ -4344,7 +4344,7 @@ _0222F976: b _0222F9E4 _0222F9A0: ldr r0, _0222FA10 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0222FA24 ; =0x00003670 str r4, [r5, r0] mov r0, #0x1a @@ -4377,7 +4377,7 @@ _0222F9E4: bl FUN_0200CCF8 ldr r0, _0222FA30 ; =0x00003684 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xda lsl r0, r0, #6 mov r1, #0 @@ -4895,7 +4895,7 @@ MOD71_0222FDD8: ; 0x0222FDD8 ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5f lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5005,7 +5005,7 @@ _0222FF10: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5044,7 +5044,7 @@ _0222FF64: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5081,7 +5081,7 @@ _0222FFB4: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5134,7 +5134,7 @@ MOD71_02230020: ; 0x02230020 ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5243,7 +5243,7 @@ _02230108: lsl r1, r0, #4 ldr r0, [sp, #4] add r0, r0, r1 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r7, #0 add r0, #0x8c ldr r0, [r0] @@ -5280,7 +5280,7 @@ _02230154: lsl r1, r0, #4 ldr r0, [sp, #4] add r0, r0, r1 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r6, r6, #1 add r4, r4, #4 add r5, #0x10 @@ -5550,11 +5550,11 @@ MOD71_02230390: ; 0x02230390 ldr r1, _0223048C ; =0x00000568 str r0, [sp] add r0, r0, r1 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r1, _02230490 ; =0x00000578 ldr r0, [sp] add r0, r0, r1 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer ldr r6, [sp] ldr r1, _02230494 ; =0x00000438 add r0, r6, #0 @@ -5622,7 +5622,7 @@ _0223042C: lsl r1, r0, #4 ldr r0, [sp, #4] add r0, r0, r1 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _02230438: add r7, r7, #1 add r6, #0x10 @@ -5688,7 +5688,7 @@ MOD71_022304AC: ; 0x022304AC ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, _02230534 ; =0x00002218 add r1, r4, #0 add r1, #0x88 @@ -5787,7 +5787,7 @@ _0223056E: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5836,7 +5836,7 @@ _022305EE: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5885,7 +5885,7 @@ MOD71_02230650: ; 0x02230650 ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5f lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5942,7 +5942,7 @@ _022306CA: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -5977,7 +5977,7 @@ _02230714: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -6141,7 +6141,7 @@ MOD71_02230810: ; 0x02230810 ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5f lsl r3, r3, #2 ldr r0, [r4, r3] @@ -6237,7 +6237,7 @@ _0223092E: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -6276,7 +6276,7 @@ _02230982: ldr r0, [r4, r0] add r2, r1, #0 add r3, r1, #0 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0x5e lsl r3, r3, #2 ldr r0, [r4, r3] @@ -6467,7 +6467,7 @@ MOD71_02230B3C: ; 0x02230B3C ldr r0, [r4, r0] ldr r3, [r4, r3] mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x5d ldr r3, _02230B6C ; =0x000022B8 lsl r0, r0, #2 @@ -6475,7 +6475,7 @@ MOD71_02230B3C: ; 0x02230B3C ldr r3, [r4, r3] mov r1, #3 mov r2, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} .align 2, 0 _02230B6C: .word 0x000022B8 @@ -6624,7 +6624,7 @@ MOD71_02230C48: ; 0x02230C48 add r5, r1, #0 str r0, [sp, #0x14] str r2, [sp, #0x10] - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -6642,7 +6642,7 @@ MOD71_02230C48: ; 0x02230C48 ldr r0, [sp, #0x14] add r1, #0x10 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x10 mov r1, #0 @@ -6662,7 +6662,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, #0x60 mov r2, #1 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r0, #0x60 mov r1, #0 @@ -6701,7 +6701,7 @@ MOD71_02230C48: ; 0x02230C48 ldr r0, [sp, #0x14] add r1, r5, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x15 lsl r0, r0, #4 add r0, r5, r0 @@ -6723,7 +6723,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, r5, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x16 lsl r0, r0, #4 add r0, r5, r0 @@ -6745,7 +6745,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, r5, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x17 lsl r0, r0, #4 add r0, r5, r0 @@ -6766,7 +6766,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, r5, r1 mov r2, #0 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #6 lsl r0, r0, #6 add r0, r5, r0 @@ -6787,7 +6787,7 @@ MOD71_02230C48: ; 0x02230C48 add r1, r5, r1 mov r2, #0 mov r3, #0x14 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x19 lsl r0, r0, #4 add r0, r5, r0 @@ -6820,7 +6820,7 @@ _02230DE2: add r1, r5, r1 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x18] mov r1, #0 add r0, r5, r0 @@ -6858,7 +6858,7 @@ _02230E2C: ldr r0, [sp, #0x14] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, r7 mov r1, #0 bl FillWindowPixelBuffer @@ -6884,7 +6884,7 @@ _02230E8E: add r0, r5, #7 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r5, r5, #1 cmp r5, #0xe blt _02230E8E @@ -6894,38 +6894,38 @@ _02230EA0: add r0, #0x1a lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r5, r5, #1 cmp r5, #8 blt _02230EA0 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x10 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x60 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x15 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x16 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x17 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #6 lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x19 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r3, r4, r5, pc} thumb_func_end MOD71_02230E88 @@ -7097,7 +7097,7 @@ MOD71_02231018: ; 0x02231018 add r1, r4, #0 mov r2, #0 mov r3, #0x13 - bl FUN_02019064 + bl AddWindowParameterized ldr r2, _0223108C ; =0x000001F7 add r0, r4, #0 mov r1, #0 @@ -7143,7 +7143,7 @@ MOD71_02231098: ; 0x02231098 cmp r2, #0 bne _022310A4 ldr r0, _022310A8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022310A4: pop {r3, pc} nop diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 7d9850cc..28b61540 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -23,7 +23,7 @@ MOD73_021D74F0: ; 0x021D74F0 mov r0, #3 mov r1, #0x38 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D757C ; =0x000015E8 add r0, r5, #0 mov r2, #0x38 @@ -201,7 +201,7 @@ MOD73_021D7640: ; 0x021D7640 mov r0, #0 str r0, [r6, #0x18] add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop @@ -588,11 +588,11 @@ _021D7966: cmp r7, #0xa bge _021D799C ldr r0, _021D79D8 ; =0x000006BD - bl FUN_020054C8 + bl PlaySE b _021D79A2 _021D799C: ldr r0, _021D79DC ; =0x000006BE - bl FUN_020054C8 + bl PlaySE _021D79A2: mov r0, #0xd6 lsl r0, r0, #2 @@ -777,7 +777,7 @@ _021D7AE2: mov r1, #0 bl FUN_020054F0 ldr r0, _021D7C88 ; =0x000006C2 - bl FUN_020054C8 + bl PlaySE ldr r0, _021D7C8C ; =0x000005A4 mov r1, #0 add r0, r4, r0 @@ -1022,7 +1022,7 @@ _021D7D42: add r0, r4, r0 bl MOD73_021DA730 ldr r0, _021D7F4C ; =0x000006C3 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -1042,7 +1042,7 @@ _021D7D66: add r0, r4, r0 bl MOD73_021DB260 ldr r0, _021D7F4C ; =0x000006C3 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -1673,7 +1673,7 @@ _021D8292: add r0, r4, r0 bl MOD73_021DAEAC ldr r0, _021D82F8 ; =0x000006C1 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} _021D82C2: add r0, r0, #4 @@ -1693,7 +1693,7 @@ _021D82C2: add r0, r4, r0 bl MOD73_021DAEAC ldr r0, _021D82F8 ; =0x000006C1 - bl FUN_020054C8 + bl PlaySE _021D82EC: pop {r4, pc} nop @@ -1829,7 +1829,7 @@ MOD73_021D83D0: ; 0x021D83D0 ldr r0, [r0, r1] lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021D83FC: ldrb r0, [r4, #0x12] cmp r0, #1 @@ -1846,7 +1846,7 @@ _021D83FC: ldr r0, [r0, r1] lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE b _021D8434 _021D8422: cmp r0, #2 @@ -1896,7 +1896,7 @@ MOD73_021D8458: ; 0x021D8458 add r0, r4, r0 bl MOD73_021DAEAC ldr r0, _021D84F8 ; =0x000006C1 - bl FUN_020054C8 + bl PlaySE mov r0, #0xb mov r1, #1 lsl r0, r0, #6 @@ -1911,7 +1911,7 @@ _021D8490: add r0, r4, r0 bl MOD73_021DAEAC ldr r0, _021D84F8 ; =0x000006C1 - bl FUN_020054C8 + bl PlaySE mov r0, #0xb mov r1, #2 lsl r0, r0, #6 @@ -1969,7 +1969,7 @@ MOD73_021D84FC: ; 0x021D84FC add r0, r0, r3 bl MOD73_021DB020 ldr r0, _021D8528 ; =0x000006BF - bl FUN_020054C8 + bl PlaySE _021D851C: pop {r3, pc} nop @@ -2108,7 +2108,7 @@ _021D860E: ldr r0, [r0, r1] lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021D861E: ldrh r1, [r4, #8] mov r0, #0xd5 @@ -2407,7 +2407,7 @@ MOD73_021D88B0: ; 0x021D88B0 ldr r0, [r4, #0x20] cmp r0, #0 beq _021D88C2 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates _021D88C2: pop {r4, pc} thumb_func_end MOD73_021D88B0 @@ -2440,7 +2440,7 @@ MOD73_021D88E4: ; 0x021D88E4 add r6, r0, #0 bl MOD73_021D88C4 ldr r0, [sp] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #8 ldr r4, _021D8974 ; =0x021DBD30 str r0, [r6] @@ -2450,13 +2450,13 @@ MOD73_021D88E4: ; 0x021D88E4 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers mov r0, #0 mov r1, #2 - bl FUN_020178BC + bl SetBgPriority ldr r4, _021D8978 ; =0x021DBD68 add r3, sp, #0x18 mov r2, #0xe @@ -2483,15 +2483,15 @@ _021D8944: ldr r0, [r6] add r2, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldrb r1, [r5] ldr r0, [r6] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldrb r0, [r5] ldr r3, [sp] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange add r7, r7, #1 add r4, #0x1c add r5, r5, #1 @@ -2511,16 +2511,16 @@ MOD73_021D8980: ; 0x021D8980 add r4, r0, #0 ldr r0, [r4] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4] bl FreeToHeap pop {r4, pc} @@ -4642,7 +4642,7 @@ _021D9958: mov r1, #0 bl FUN_020200A0 ldr r0, _021D9A24 ; =0x000006BC - bl FUN_020054C8 + bl PlaySE mov r0, #0x73 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -4792,10 +4792,10 @@ MOD73_021D9AB4: ; 0x021D9AB4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4, #4] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit pop {r4, pc} thumb_func_end MOD73_021D9AB4 @@ -4874,7 +4874,7 @@ _021D9B02: mov r1, #5 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r0, #0xa ldr r3, [sp, #0x1c] str r0, [sp] @@ -4890,7 +4890,7 @@ _021D9B02: mov r1, #5 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r7, [r5, #0x1c] mov r2, #0x13 ldr r0, [r5, #0x18] @@ -4930,10 +4930,10 @@ _021D9B02: blt _021D9B02 _021D9BCE: ldr r0, [r5, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [r5, #4] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021D9BDC: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -4966,7 +4966,7 @@ MOD73_021D9BE0: ; 0x021D9BE0 ldr r0, [r5, #4] ldr r1, [r5, #8] add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd str r0, [sp] mov r0, #0x14 @@ -4981,7 +4981,7 @@ MOD73_021D9BE0: ; 0x021D9BE0 ldr r1, [r5, #0xc] mov r2, #4 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r5, #8] mov r1, #0xf bl FillWindowPixelBuffer @@ -5017,15 +5017,15 @@ MOD73_021D9C7C: ; 0x021D9C7C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #8] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor ldr r0, [r4, #0xc] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020191A4 + bl WindowArray_dtor pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021D9C7C @@ -5081,7 +5081,7 @@ _021D9CD8: lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r5, #4] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r1, [r5, #0x24] mov r2, #0 ldrh r0, [r1] @@ -5097,7 +5097,7 @@ _021D9CD8: mov r0, #3 str r0, [sp, #8] ldr r0, [r5, #4] - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r3, r5, #0 str r4, [sp] mov r0, #0x7a @@ -5108,7 +5108,7 @@ _021D9CD8: str r0, [r5, #0x28] ldr r0, [r5, #4] mov r1, #5 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD73_021D9CA0 @@ -5950,7 +5950,7 @@ _021DA2FA: ldr r1, [r4, #8] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r4, #8] mov r1, #0 bl FillWindowPixelBuffer @@ -5973,10 +5973,10 @@ MOD73_021DA354: ; 0x021DA354 mov r6, #1 _021DA35C: ldr r0, [r5, #8] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r5, #8] add r1, r6, #0 - bl FUN_020191A4 + bl WindowArray_dtor add r4, r4, #1 add r5, r5, #4 cmp r4, #4 @@ -6029,7 +6029,7 @@ MOD73_021DA374: ; 0x021DA374 lsr r0, r0, #0x18 str r0, [sp, #8] ldr r0, [r4, #4] - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r1, [sp, #0x10] mov r2, #0 ldrh r0, [r1] @@ -6045,12 +6045,12 @@ MOD73_021DA374: ; 0x021DA374 mov r0, #4 str r0, [sp, #8] ldr r0, [r4, #4] - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r5, #0 bl FreeToHeap ldr r0, [r4, #4] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} thumb_func_end MOD73_021DA374 @@ -6170,7 +6170,7 @@ MOD73_021DA4D4: ; 0x021DA4D4 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0xc] mov r1, #0xf bl FillWindowPixelBuffer @@ -6210,9 +6210,9 @@ MOD73_021DA4D4: ; 0x021DA4D4 mov r3, #1 bl FUN_0200CCA4 ldr r0, [r4, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, [r4, #0x10] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, pc} nop @@ -6386,7 +6386,7 @@ _021DA682: mov r3, #0xa0 bl AddTextPrinterParameterized2 ldr r0, [r4, #0xc] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, pc} nop @@ -6442,7 +6442,7 @@ MOD73_021DA6BC: ; 0x021DA6BC mov r3, #0x10 bl AddTextPrinterParameterized2 ldr r0, [r4, #0x10] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -6477,11 +6477,11 @@ MOD73_021DA754: ; 0x021DA754 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, [r4, #0xc] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, [r4, #0x10] - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021DA754 @@ -6572,7 +6572,7 @@ _021DA7EC: add r3, r1, #0 bl FUN_0200D0BC ldr r0, [r4, #0x14] - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 44254d39..26a78f49 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -13,7 +13,7 @@ MOD74_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x4a lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0xad add r0, r4, #0 lsl r1, r1, #2 @@ -56,7 +56,7 @@ MOD74_021D7540: ; 0x021D7540 add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -343,7 +343,7 @@ MOD74_021D7784: ; 0x021D7784 bl MOD74_021D82E8 bl NNS_GfdDoVramTransfer ldr r0, [r4, #0x10] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _021D77A4 ; =0x027E0000 ldr r1, _021D77A8 ; =0x00003FF8 mov r0, #1 @@ -584,7 +584,7 @@ MOD74_021D7934: ; 0x021D7934 sub sp, #0x64 add r5, r0, #0 ldr r0, [r5] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0 ldr r4, _021D79C0 ; =0x021D84A0 str r0, [r5, #0x10] @@ -594,7 +594,7 @@ MOD74_021D7934: ; 0x021D7934 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r4, _021D79C4 ; =0x021D8570 add r3, sp, #0x10 mov r2, #0xa @@ -618,11 +618,11 @@ _021D7976: lsr r1, r1, #0x18 add r2, r6, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 ldr r0, [r5, #0x10] lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldrh r0, [r5, #8] add r7, r7, #1 add r4, r4, #1 @@ -635,7 +635,7 @@ _021D799C: ldr r3, [r5] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldrh r0, [r5, #8] cmp r0, #0 beq _021D79BA @@ -643,7 +643,7 @@ _021D799C: mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange _021D79BA: add sp, #0x64 pop {r4, r5, r6, r7, pc} @@ -667,7 +667,7 @@ _021D79D8: ldr r0, [r6, #0x10] lsr r1, r1, #0x18 add r5, r5, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldrh r0, [r6, #8] add r4, r4, #1 add r0, r0, #2 @@ -747,7 +747,7 @@ _021D7A5A: bl NARC_dtor ldr r0, [r5, #0x10] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0x14 pop {r4, r5, pc} .align 2, 0 @@ -768,7 +768,7 @@ _021D7A9A: ldr r0, [r6, #0x10] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -787,7 +787,7 @@ _021D7AC0: ldr r0, [r6, #0x10] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -825,9 +825,9 @@ _021D7AFE: add r5, #0x6c _021D7B08: add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, r6 @@ -1667,7 +1667,7 @@ MOD74_021D81E0: ; 0x021D81E0 bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x8c - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 mov r1, #1 bl MOD74_021D8388 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 3500c458..23d75c48 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -32,7 +32,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 mov r1, #6 mov r0, #3 lsl r2, r1, #0xf - bl FUN_0201681C + bl CreateHeap ldr r1, _021E6D60 ; =0x000004A4 add r0, r5, #0 mov r2, #6 @@ -49,7 +49,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 add r0, r4, #0 bl MOD75_021E6FA4 mov r0, #6 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] add r0, r4, #0 add r0, #0xcc @@ -68,7 +68,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 bl FUN_0200E1D0 mov r0, #3 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD75_021E7470 add r0, r4, #0 @@ -460,7 +460,7 @@ MOD75_021E6F00: ; 0x021E6F00 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #6 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -530,7 +530,7 @@ MOD75_021E6FFC: ; 0x021E6FFC MOD75_021E700C: ; 0x021E700C push {r3, lr} ldr r0, [r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_0200BC30 ldr r3, _021E702C ; =0x027E0000 @@ -578,7 +578,7 @@ MOD75_021E7054: ; 0x021E7054 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021E71A0 ; =0x021EC440 add r3, sp, #0xa8 ldmia r5!, {r0, r1} @@ -593,10 +593,10 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021E71A4 ; =0x021EC45C add r3, sp, #0x8c ldmia r5!, {r0, r1} @@ -611,7 +611,7 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021E71A8 ; =0x021EC494 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -626,10 +626,10 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021E71AC ; =0x021EC4E8 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -644,7 +644,7 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021E71B0 ; =0x021EC478 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -659,10 +659,10 @@ MOD75_021E7054: ; 0x021E7054 add r0, r4, #0 mov r1, #4 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021E71B4 ; =0x021EC4B0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -677,7 +677,7 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _021E71B8 ; =0x021EC4CC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -692,27 +692,27 @@ MOD75_021E7054: ; 0x021E7054 str r0, [r3] add r0, r4, #0 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #7 mov r2, #9 mov r3, #0x80 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos add r0, r4, #0 mov r1, #7 mov r2, #0xc mov r3, #0x50 - bl FUN_0201AF50 + bl ScheduleSetBgAffinePos mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #6 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #6 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0xd4 pop {r4, r5, pc} nop @@ -738,25 +738,25 @@ MOD75_021E71BC: ; 0x021E71BC bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #6 add r1, r4, #0 bl FreeToHeapExplicit @@ -1611,7 +1611,7 @@ _021E784E: lsl r1, r1, #2 str r0, [r4, r1] add r0, r4, #4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x20 pop {r4, r5, r6, pc} nop @@ -1637,15 +1637,15 @@ MOD75_021E7870: ; 0x021E7870 b _021E78A0 _021E7890: ldr r0, _021E7964 ; =0x000006CC - bl FUN_020054C8 + bl PlaySE b _021E78A6 _021E7898: ldr r0, _021E7968 ; =0x000006CD - bl FUN_020054C8 + bl PlaySE b _021E78A6 _021E78A0: ldr r0, _021E796C ; =0x000006CE - bl FUN_020054C8 + bl PlaySE _021E78A6: ldr r0, _021E7960 ; =0x00000482 mov r1, #3 @@ -1731,7 +1731,7 @@ _021E794C: bne _021E795C add r5, #0x14 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021E795C: pop {r3, r4, r5, r6, r7, pc} nop @@ -1962,7 +1962,7 @@ _021E7B12: bl FillWindowPixelBuffer add r0, r4, #0 add r0, #0x14 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 bl MOD75_021E8B70 add r0, r4, #0 @@ -2030,7 +2030,7 @@ MOD75_021E7B7C: ; 0x021E7B7C cmp r0, #1 bne _021E7BC0 ldr r0, _021E7CDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add sp, #4 mov r0, #2 pop {r3, r4, r5, r6, pc} @@ -2130,7 +2130,7 @@ _021E7C6E: pop {r3, r4, r5, r6, pc} _021E7C82: ldr r0, _021E7CDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] @@ -2150,7 +2150,7 @@ _021E7C82: pop {r3, r4, r5, r6, pc} _021E7CAC: ldr r0, _021E7CDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] lsl r2, r6, #2 ldrh r1, [r0, r2] @@ -2220,7 +2220,7 @@ MOD75_021E7D14: ; 0x021E7D14 pop {r4, pc} _021E7D2E: ldr r0, _021E7E00 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] @@ -2259,7 +2259,7 @@ _021E7D68: bl MOD75_021E7E0C ldr r0, [r4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #1 pop {r4, pc} _021E7D88: @@ -2274,7 +2274,7 @@ _021E7D88: pop {r4, pc} _021E7D9A: ldr r0, _021E7E00 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] @@ -2312,7 +2312,7 @@ _021E7DD4: bl MOD75_021E7E0C ldr r0, [r4] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer mov r0, #1 pop {r4, pc} _021E7DF2: @@ -2402,10 +2402,10 @@ MOD75_021E7E60: ; 0x021E7E60 mov r1, #0 bl FillWindowPixelBuffer add r0, r4, #4 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 add r0, #0xf0 ldr r0, [r0] @@ -2574,7 +2574,7 @@ _021E7FB6: bl MOD75_021E84E4 ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer _021E8004: add r5, #0xfc ldr r0, [r5] @@ -2609,7 +2609,7 @@ MOD75_021E8020: ; 0x021E8020 pop {r3, r4, r5, pc} _021E803E: ldr r0, _021E8190 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r1, #0xc4 ldr r3, [r1] @@ -2628,7 +2628,7 @@ _021E803E: bl MOD75_021E84E4 ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] @@ -2695,7 +2695,7 @@ _021E80D8: pop {r3, r4, r5, pc} _021E80EA: ldr r0, _021E8190 ; =0x000006CA - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r1, #0xc4 ldr r3, [r1] @@ -2714,7 +2714,7 @@ _021E80EA: bl MOD75_021E84E4 ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add r0, r5, #0 add r0, #0xc4 ldr r0, [r0] @@ -3045,7 +3045,7 @@ MOD75_021E8374: ; 0x021E8374 ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #4 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 bne _021E83B6 mov r0, #0 @@ -3089,7 +3089,7 @@ MOD75_021E83CC: ; 0x021E83CC ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #4 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 bne _021E840E mov r0, #0 @@ -3146,14 +3146,14 @@ _021E8460: cmp r0, #3 bne _021E84CA ldr r0, _021E84D8 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE ldrb r1, [r4, #6] add r0, r5, #0 mov r2, #2 bl MOD75_021E84E4 ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer ldrb r0, [r4, #6] lsl r3, r0, #1 ldr r0, _021E84DC ; =0x00000424 @@ -3215,7 +3215,7 @@ MOD75_021E84E4: ; 0x021E84E4 add r5, r1, #0 mov r1, #4 add r6, r2, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer add r7, r0, #0 ldr r0, _021E856C ; =0x00000424 ldrb r0, [r4, r0] @@ -3289,7 +3289,7 @@ MOD75_021E8574: ; 0x021E8574 add r4, r1, #0 ldr r0, [r0] mov r1, #4 - bl FUN_0201886C + bl GetBgTilemapBuffer mov ip, r0 add r1, r4, #0 mov r0, #6 @@ -3329,7 +3329,7 @@ _021E85A8: ldr r0, [sp] mov r1, #4 ldr r0, [r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3, r4, r5, r6, r7, pc} nop _021E85D4: .word 0x00000276 @@ -3360,7 +3360,7 @@ _021E85FA: mov r2, #0x50 bl MOD75_021EC380 ldr r0, _021E8678 ; =0x000005E4 - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #2 bl MOD75_021E8574 @@ -3452,7 +3452,7 @@ _021E869C: _021E86B2: ldr r0, [r5] mov r1, #4 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _021E86BC: .word 0x00000424 @@ -3603,7 +3603,7 @@ MOD75_021E87B8: ; 0x021E87B8 ldrh r2, [r3, #0x1c] ldrh r3, [r3, #0x1e] mov r1, #4 - bl FUN_0201AFBC + bl DoesPixelAtScreenXYMatchPtrVal cmp r0, #0 beq _021E87EE add sp, #8 @@ -3750,7 +3750,7 @@ _021E88D0: cmp r0, #1 bne _021E8912 ldr r0, _021E89E8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD75_021E89F0 mov r1, #0x49 @@ -3766,7 +3766,7 @@ _021E8912: tst r0, r1 beq _021E892E ldr r0, _021E89E8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD75_021E89F0 add sp, #4 @@ -3833,7 +3833,7 @@ _021E899A: b _021E89E0 _021E89AA: ldr r0, _021E89E8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _021E89EC ; =gMain ldr r1, [r0, #0x48] mov r0, #1 @@ -3851,7 +3851,7 @@ _021E89C8: pop {r3, r4, r5, r6, pc} _021E89CE: ldr r0, _021E89E8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl MOD75_021E89F0 add sp, #4 @@ -4366,7 +4366,7 @@ MOD75_021E8DAC: ; 0x021E8DAC ldr r2, _021E8E08 ; =0x021EC5C0 mov r1, #1 mov r3, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 add r0, #0xfc ldr r0, [r0] @@ -4383,7 +4383,7 @@ _021E8DDA: ldr r2, _021E8E0C ; =0x021EC5F2 mov r1, #1 mov r3, #0 - bl FUN_02018148 + bl LoadRectToBgTilemapRect add r0, r4, #0 add r0, #0xfc ldr r0, [r0] @@ -4392,7 +4392,7 @@ _021E8DDA: _021E8DFC: ldr r0, [r4] mov r1, #1 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc pop {r3, r4, pc} .align 2, 0 @@ -4504,7 +4504,7 @@ _021E8ED2: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -4834,7 +4834,7 @@ _021E917A: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -4970,7 +4970,7 @@ _021E9286: strh r1, [r4, r0] mov r0, #6 lsl r0, r0, #8 - bl FUN_020054C8 + bl PlaySE mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -5150,7 +5150,7 @@ _021E9402: _021E940E: add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5296,7 +5296,7 @@ _021E952C: add r0, r4, #0 bl MOD75_021EB504 ldr r0, _021E95B0 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE mov r0, #7 pop {r4, pc} _021E9544: @@ -5307,7 +5307,7 @@ _021E9544: add r0, r4, #0 bl MOD75_021EB504 ldr r0, _021E95B0 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE mov r0, #7 pop {r4, pc} _021E955E: @@ -5322,7 +5322,7 @@ _021E955E: mov r1, #0 bl MOD75_021EC298 ldr r0, _021E95B8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #8 pop {r4, pc} _021E9580: @@ -5338,7 +5338,7 @@ _021E9580: mov r1, #1 bl MOD75_021EC090 ldr r0, _021E95B8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, pc} _021E95A6: @@ -5507,7 +5507,7 @@ _021E96EC: bl FUN_0200D0E0 add r0, r5, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 mov r1, #1 bl MOD75_021EC090 @@ -5542,7 +5542,7 @@ _021E9730: bl MOD75_021E92BC add r4, #0x64 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0xb pop {r4, pc} .align 2, 0 @@ -5577,7 +5577,7 @@ _021E9772: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5613,7 +5613,7 @@ MOD75_021E97A8: ; 0x021E97A8 bl MOD75_021EB344 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5638,7 +5638,7 @@ MOD75_021E97E4: ; 0x021E97E4 bl MOD75_021EB344 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -5807,7 +5807,7 @@ _021E9952: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -6162,7 +6162,7 @@ _021E9C46: mov r1, #1 bl MOD75_021EB708 ldr r0, _021E9D5C ; =0x00000638 - bl FUN_020054C8 + bl PlaySE add sp, #8 mov r0, #0x12 pop {r3, r4, r5, pc} @@ -6175,7 +6175,7 @@ _021E9C62: mov r1, #1 bl MOD75_021EB708 ldr r0, _021E9D5C ; =0x00000638 - bl FUN_020054C8 + bl PlaySE add sp, #8 mov r0, #0x12 pop {r3, r4, r5, pc} @@ -6231,7 +6231,7 @@ _021E9C80: ldr r1, _021E9D58 ; =0x00000426 strb r0, [r4, r1] ldr r0, _021E9D64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add sp, #8 mov r0, #0x13 pop {r3, r4, r5, pc} @@ -6258,12 +6258,12 @@ _021E9D00: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 ldr r0, _021E9D64 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add sp, #8 mov r0, #0x10 pop {r3, r4, r5, pc} @@ -6446,7 +6446,7 @@ _021E9EA2: bl FUN_0200D0E0 add r0, r5, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 mov r1, #1 bl MOD75_021EC090 @@ -6476,7 +6476,7 @@ MOD75_021E9EE4: ; 0x021E9EE4 pop {r4, pc} _021E9EF8: ldr r0, _021E9F68 ; =0x00000644 - bl FUN_020054C8 + bl PlaySE ldr r1, _021E9F6C ; =0x00000488 add r0, r4, #0 ldrsh r2, [r4, r1] @@ -6523,7 +6523,7 @@ _021E9F44: bl MOD75_021E92BC add r4, #0x64 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #0x16 pop {r4, pc} .align 2, 0 @@ -6567,7 +6567,7 @@ _021E9F96: bl FUN_0200D0E0 add r0, r4, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 mov r1, #1 bl MOD75_021EC090 @@ -6707,7 +6707,7 @@ MOD75_021EA0CC: ; 0x021EA0CC ldr r0, [r4] add r5, r1, #0 mov r1, #7 - bl FUN_02018878 + bl GetBgAffineRotation lsl r0, r0, #0x10 asr r0, r0, #0x10 add r0, r0, r5 @@ -6733,7 +6733,7 @@ _021EA0FE: mov r1, #7 mov r2, #0 lsr r3, r3, #0x10 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, _021EA114 ; =0x0000049A strh r5, [r4, r0] pop {r3, r4, r5, pc} @@ -6862,7 +6862,7 @@ _021EA1EC: ldrh r3, [r5, r3] mov r1, #7 mov r2, #0 - bl FUN_0201AF08 + bl ScheduleSetBgAffineRotation ldr r0, _021EA2CC ; =0x000001F6 add r1, r6, #0 bl _s32_div_f @@ -7376,7 +7376,7 @@ _021EA5C2: cmp r1, r3 beq _021EA5F8 ldr r0, _021EA600 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021EA5D4: @@ -7396,7 +7396,7 @@ _021EA5E8: cmp r1, r3 beq _021EA5F8 ldr r0, _021EA600 ; =0x00000638 - bl FUN_020054C8 + bl PlaySE mov r0, #1 _021EA5F8: pop {r3, r4, r5, r6, r7, pc} @@ -7424,7 +7424,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, r4, #4 mov r2, #2 mov r3, #0xe - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x12 str r0, [sp] mov r0, #0x20 @@ -7440,7 +7440,7 @@ MOD75_021EA604: ; 0x021EA604 ldr r0, [r4] add r1, #0x14 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd str r0, [sp] mov r0, #0x24 @@ -7455,7 +7455,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x24 mov r2, #2 mov r3, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0xe @@ -7471,7 +7471,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x34 mov r2, #0 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0xd @@ -7487,7 +7487,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x44 mov r2, #0 mov r3, #6 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xb str r0, [sp] mov r0, #0xc @@ -7503,7 +7503,7 @@ MOD75_021EA604: ; 0x021EA604 ldr r0, [r4] add r1, #0x54 add r3, r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #0x1b @@ -7519,7 +7519,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x64 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd str r0, [sp] mov r0, #0xc @@ -7535,7 +7535,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x74 mov r2, #0 mov r3, #0x13 - bl FUN_02019064 + bl AddWindowParameterized mov r3, #1 add r1, r4, #0 str r3, [sp] @@ -7550,7 +7550,7 @@ MOD75_021EA604: ; 0x021EA604 str r0, [sp, #0x10] ldr r0, [r4] mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x13 str r0, [sp] mov r0, #7 @@ -7566,7 +7566,7 @@ MOD75_021EA604: ; 0x021EA604 add r1, #0x94 mov r2, #0 mov r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xc str r0, [sp] mov r0, #0xb @@ -7582,7 +7582,7 @@ MOD75_021EA604: ; 0x021EA604 add r4, #0xa4 add r1, r4, #0 mov r3, #1 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} nop @@ -7604,7 +7604,7 @@ MOD75_021EA7A0: ; 0x021EA7A0 _021EA7A6: lsl r0, r4, #4 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -7689,7 +7689,7 @@ _021EA828: mov r1, #2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0xe str r0, [sp] mov r0, #1 @@ -7705,7 +7705,7 @@ _021EA828: mov r1, #2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -7817,7 +7817,7 @@ _021EA936: bl MOD75_021EA880 add r4, #0x24 add r0, r4, #0 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode pop {r3, r4, r5, r6, r7, pc} nop _021EA94C: .word 0x00000429 @@ -7901,7 +7901,7 @@ _021EA9A8: bl BlitBitmapRectToWindow add r5, #0x54 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r0, #6 add r1, r7, #0 bl FreeToHeapExplicit @@ -7990,7 +7990,7 @@ _021EAA4C: _021EAA8C: add r5, #0x54 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [sp, #0x18] mov r0, #6 bl FreeToHeapExplicit @@ -8850,7 +8850,7 @@ MOD75_021EB130: ; 0x021EB130 ldr r0, [r5] add r1, #0xb4 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #4 str r0, [sp, #0x14] b _021EB1B0 @@ -8875,7 +8875,7 @@ _021EB180: add r1, #0xb4 mov r2, #0 mov r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #3 str r0, [sp, #0x14] _021EB1B0: @@ -8981,7 +8981,7 @@ _021EB22E: bl MOD75_021EAB44 add r0, r5, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r1, r5, #0 add r1, #0xc4 ldr r1, [r1] @@ -9048,7 +9048,7 @@ _021EB298: ldr r0, [sp, #0x18] bl String_dtor add r0, r4, r6 - bl FUN_02019220 + bl ScheduleWindowCopyToVram _021EB31E: add r0, r5, #0 ldr r2, _021EB340 ; =0x000003F7 @@ -9058,7 +9058,7 @@ _021EB31E: bl FUN_0200CCA4 add r5, #0xb4 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -9095,7 +9095,7 @@ _021EB364: mov r1, #1 bl FUN_0200D0E0 add r0, r4, r6 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer _021EB37A: add r0, r5, #0 add r0, #0xb4 @@ -9103,7 +9103,7 @@ _021EB37A: bl FUN_0200CCF8 add r0, r5, #0 add r0, #0xb4 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer mov r0, #0x56 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -9115,7 +9115,7 @@ _021EB37A: bl ListMenuItems_dtor add r0, r5, #0 add r0, #0xb4 - bl FUN_02019178 + bl RemoveWindow add r0, r5, #0 add r0, #0x14 mov r1, #0 @@ -9129,7 +9129,7 @@ _021EB37A: bl MOD75_021EAAE8 add r0, r5, #0 add r0, #0x14 - bl FUN_02019220 + bl ScheduleWindowCopyToVram mov r1, #0 add r0, r5, #0 add r2, r1, #0 @@ -9181,7 +9181,7 @@ MOD75_021EB3D8: ; 0x021EB3D8 bl AddTextPrinterParameterized2 add r5, #0x14 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -9259,7 +9259,7 @@ MOD75_021EB454: ; 0x021EB454 bl AddTextPrinterParameterized add r5, #0x34 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 bl String_dtor add r0, r6, #0 @@ -9320,7 +9320,7 @@ MOD75_021EB504: ; 0x021EB504 mov r3, #0x10 bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r6, #0 bl String_dtor add sp, #0xc @@ -9342,13 +9342,13 @@ MOD75_021EB580: ; 0x021EB580 bl FUN_0200CCF8 add r0, r4, #0 add r0, #0x34 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r4, #0 add r0, #0x94 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r4, #0x14 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r4, pc} thumb_func_end MOD75_021EB580 @@ -9441,7 +9441,7 @@ MOD75_021EB660: ; 0x021EB660 sub sp, #0xc add r4, r0, #0 mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C add r0, r4, #0 @@ -9491,7 +9491,7 @@ _021EB6C2: pop {r3, pc} _021EB6C8: ldr r0, _021EB6DC ; =0x0000060D - bl FUN_020054C8 + bl PlaySE b _021EB6D8 _021EB6D0: ldr r0, _021EB6DC ; =0x0000060D @@ -9632,7 +9632,7 @@ _021EB722: sub r3, r5, r3 bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r6, #0 bl String_dtor add sp, #0xc @@ -9737,7 +9737,7 @@ _021EB866: sub r3, r5, r3 bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r6, #0 bl String_dtor add sp, #0xc @@ -9831,7 +9831,7 @@ MOD75_021EB8E8: ; 0x021EB8E8 sub r3, r5, r3 bl AddTextPrinterParameterized add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r3, r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index fc6dc5bd..ae83c7a7 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -11,7 +11,7 @@ MOD76_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x43 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0x62 add r0, r5, #0 lsl r1, r1, #2 @@ -50,7 +50,7 @@ MOD76_021D74E0: ; 0x021D74E0 str r1, [r4, r0] add r0, r4, #0 add r0, #0xc8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r4, #0 bl MOD76_021D8CD4 ldr r0, _021D7564 ; =MOD76_021D76E8 @@ -166,7 +166,7 @@ MOD76_021D761C: ; 0x021D761C add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x43 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD76_021D761C @@ -192,7 +192,7 @@ MOD76_021D7638: ; 0x021D7638 and r0, r1 str r0, [r2] mov r0, #0x43 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] mov r0, #0 mov r1, #0x43 @@ -247,7 +247,7 @@ MOD76_021D76B8: ; 0x021D76B8 MOD76_021D76E8: ; 0x021D76E8 push {r3, lr} ldr r0, [r0, #4] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates bl FUN_0201C30C bl FUN_0200BC30 ldr r3, _021D7708 ; =0x027E0000 @@ -295,7 +295,7 @@ MOD76_021D7730: ; 0x021D7730 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D77D8 ; =0x021D8E88 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -310,10 +310,10 @@ MOD76_021D7730: ; 0x021D7730 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D77DC ; =0x021D8EC0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -328,10 +328,10 @@ MOD76_021D7730: ; 0x021D7730 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D77E0 ; =0x021D8EA4 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -346,15 +346,15 @@ MOD76_021D7730: ; 0x021D7730 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x43 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x64 pop {r4, r5, pc} nop @@ -373,13 +373,13 @@ MOD76_021D77E4: ; 0x021D77E4 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer mov r0, #0x43 add r1, r4, #0 bl FreeToHeapExplicit @@ -464,7 +464,7 @@ _021D78A8: ldr r0, [r7, #4] add r1, r5, #0 add r2, r4, #0 - bl FUN_02019150 + bl AddWindow add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -498,7 +498,7 @@ MOD76_021D78E8: ; 0x021D78E8 add r5, #8 _021D78F0: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xf @@ -580,7 +580,7 @@ MOD76_021D7974: ; 0x021D7974 tst r1, r0 beq _021D799C ldr r0, _021D7A8C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r2, [r5] mov r0, #1 ldrb r1, [r2, #0x14] @@ -640,7 +640,7 @@ _021D79EE: b _021D7A38 _021D7A04: ldr r0, _021D7A8C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, [r5] add r0, r5, #0 ldrh r1, [r1, #0x10] @@ -663,7 +663,7 @@ _021D7A04: pop {r3, r4, r5, pc} _021D7A38: ldr r0, _021D7A8C ; =0x000005DD - bl FUN_020054C8 + bl PlaySE ldr r1, [r5] add r0, r5, #0 ldrh r1, [r1, #0x10] @@ -901,19 +901,19 @@ MOD76_021D7BE0: ; 0x021D7BE0 mov r2, #0 mov r1, #2 add r3, r2, #0 - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r5, #0 add r0, #0x18 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x68 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0xb8 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _021D7CC4 ; =0x0000FFFF cmp r4, r0 beq _021D7C2E @@ -932,37 +932,37 @@ _021D7C3A: add r3, r1, #0 mov r2, #0 add r3, #0xfe - bl FUN_0201AEE4 + bl ScheduleSetBgPosText add r0, r5, #0 add r0, #8 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x28 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x38 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x48 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x58 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0xa8 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x78 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x88 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x98 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x18 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r0, _021D7CC4 ; =0x0000FFFF cmp r4, r0 beq _021D7CA6 @@ -1346,7 +1346,7 @@ _021D7F50: str r0, [r5, r1] add r5, #0xd8 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1385,7 +1385,7 @@ MOD76_021D7FD0: ; 0x021D7FD0 cmp r6, #1 beq _021D7FE8 ldr r0, _021D8004 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021D7FE8: ldr r0, [r4] ldrb r0, [r0, #0x14] @@ -1549,43 +1549,43 @@ _021D80BE: bl FUN_0200C644 add r0, r5, #0 add r0, #0x28 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x38 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x48 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x58 - bl FUN_02019220 + bl ScheduleWindowCopyToVram b _021D817E _021D815E: add r0, r5, #0 add r0, #0x28 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x38 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x48 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer add r0, r5, #0 add r0, #0x58 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer _021D817E: add r0, r5, #0 add r0, #0xa8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x78 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r0, r5, #0 add r0, #0x88 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add r5, #0x98 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #4 pop {r3, r4, r5, r6, pc} nop @@ -1643,7 +1643,7 @@ MOD76_021D81AC: ; 0x021D81AC bl MOD76_021D8300 add r0, r5, #0 add r0, #0x68 - bl FUN_02019220 + bl ScheduleWindowCopyToVram b _021D8232 _021D8222: add r0, r5, #0 @@ -1651,11 +1651,11 @@ _021D8222: bl MOD76_021D8300 add r0, r5, #0 add r0, #0x68 - bl FUN_0201958C + bl ClearWindowTilemapAndScheduleTransfer _021D8232: add r5, #0xb8 add r0, r5, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -1683,7 +1683,7 @@ MOD76_021D8244: ; 0x021D8244 mov r1, #2 add r2, r4, #0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #5 str r0, [sp] mov r0, #1 @@ -1699,7 +1699,7 @@ MOD76_021D8244: ; 0x021D8244 mov r1, #2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #6 str r0, [sp] mov r0, #1 @@ -1715,7 +1715,7 @@ MOD76_021D8244: ; 0x021D8244 mov r1, #2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #6 str r0, [sp] mov r0, #1 @@ -1730,7 +1730,7 @@ MOD76_021D8244: ; 0x021D8244 mov r1, #2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -1755,7 +1755,7 @@ _021D82E0: blo _021D82E0 ldr r0, [r5, #4] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r4, r5, r6, pc} thumb_func_end MOD76_021D82D8 @@ -1794,7 +1794,7 @@ _021D832E: _021D8344: ldr r0, [r5, #4] mov r1, #2 - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer pop {r3, r4, r5, r6, r7, pc} nop _021D8350: .word 0x0000FFFF @@ -2048,7 +2048,7 @@ MOD76_021D853C: ; 0x021D853C add r1, r5, #0 bl MOD76_021D8354 mov r0, #1 - bl FUN_02002B60 + bl TextFlags_SetCanABSpeedUpPrint mov r0, #0 bl FUN_02002B7C ldr r0, [r4] @@ -2101,7 +2101,7 @@ _021D85B8: pop {r3, pc} _021D85BE: ldr r0, _021D85DC ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE b _021D85D6 _021D85C6: ldr r0, _021D85E0 ; =0x00000483 @@ -2182,7 +2182,7 @@ MOD76_021D862C: ; 0x021D862C bl MOD76_021D7CC8 add r0, r4, #0 add r0, #0xc8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [r4] add r0, r4, #0 ldrh r1, [r1, #0x10] @@ -2230,7 +2230,7 @@ MOD76_021D8688: ; 0x021D8688 bl MOD76_021D7CC8 add r0, r4, #0 add r0, #0xc8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram ldr r1, [r4] add r0, r4, #0 ldrh r1, [r1, #0x10] diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 6affcb88..2d4f838a 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -28,7 +28,7 @@ MOD77_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x32 lsl r2, r2, #7 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D75DC ; =0x0000C32C add r0, r4, #0 mov r2, #0x32 @@ -76,7 +76,7 @@ _021D7540: lsr r0, r0, #0x18 bl FUN_0201B2EC ldr r0, [r5] - bl FUN_02016B94 + bl BgConfig_Alloc ldr r1, _021D75F4 ; =0x0000C010 str r0, [r5, r1] bl GX_BothDispOn @@ -100,7 +100,7 @@ _021D7540: bl GX_SwapDisplay mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r5, #0 bl MOD77_021D7C64 mov r0, #1 @@ -250,7 +250,7 @@ _021D76FA: add r0, r4, #0 bl MOD77_021D84D8 ldr r0, _021D798C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #2 cmp r0, #4 bhi _021D7732 @@ -369,7 +369,7 @@ _021D77F0: add r0, r4, #0 bl MOD77_021D84D8 ldr r0, _021D798C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE sub r0, r7, #2 cmp r6, r0 beq _021D780A @@ -446,7 +446,7 @@ _021D7886: add r0, r4, #0 bl MOD77_021D84D8 ldr r0, _021D798C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE sub r0, r7, #2 cmp r6, r0 beq _021D78B6 @@ -646,7 +646,7 @@ _021D7A4E: add r0, r4, r0 bl FUN_0200CCF8 ldr r0, _021D7B98 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE mov r0, #0xd8 str r0, [sp] mov r0, #0x20 @@ -692,7 +692,7 @@ _021D7A94: cmp r0, #1 bne _021D7B66 ldr r0, _021D7B98 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021D7B66 _021D7AC0: ldr r0, _021D7B9C ; =0x00000403 @@ -730,7 +730,7 @@ _021D7AFA: mov r0, #0x10 str r0, [r5] ldr r0, _021D7B98 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE b _021D7B66 _021D7B0E: bl MOD77_021D8CF8 @@ -831,7 +831,7 @@ MOD77_021D7BAC: ; 0x021D7BAC add r0, r6, #0 bl OverlayManager_FreeData add r0, r5, #0 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _021D7C20 ; =gMain + 0x60 mov r1, #0 strb r1, [r0, #5] @@ -876,7 +876,7 @@ MOD77_021D7C44: ; 0x021D7C44 ldmia r4!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -1338,17 +1338,17 @@ MOD77_021D7FAC: ; 0x021D7FAC ldr r0, [r5, r0] mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, _021D8208 ; =0x0000C010 mov r1, #6 ldr r0, [r5, r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021D8208 ; =0x0000C010 ldr r2, _021D8210 ; =0x021D8F98 ldr r0, [r5, r0] mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1413,16 +1413,16 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #6 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r1, _021D821C ; =0x00004753 mov r0, #6 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, _021D8208 ; =0x0000C010 ldr r2, _021D8220 ; =0x021D8F40 ldr r0, [r5, r1] add r1, r1, #4 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x20 @@ -1446,17 +1446,17 @@ MOD77_021D7FAC: ; 0x021D7FAC ldr r0, [r5, r0] ldr r2, _021D820C ; =0x021D8F7C mov r1, #2 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, _021D8208 ; =0x0000C010 mov r1, #2 ldr r0, [r5, r0] - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _021D8208 ; =0x0000C010 ldr r2, _021D8210 ; =0x021D8F98 ldr r0, [r5, r0] mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -1508,10 +1508,10 @@ MOD77_021D7FAC: ; 0x021D7FAC mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #2 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor ldr r1, [r5] mov r0, #0x10 bl String_ctor @@ -1533,29 +1533,29 @@ MOD77_021D7FAC: ; 0x021D7FAC add r1, sp, #0x14 add r1, #2 add r2, r0, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 add r1, sp, #0x14 add r2, r0, #0 mov r3, #0x84 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 add r1, sp, #0x10 add r1, #2 add r2, r0, #0 mov r3, #0x86 - bl FUN_02017FB4 + bl BG_LoadPlttData mov r0, #2 add r1, sp, #0x10 add r2, r0, #0 mov r3, #0x9e - bl FUN_02017FB4 + bl BG_LoadPlttData ldr r1, _021D8208 ; =0x0000C010 ldr r2, _021D823C ; =0x021D8F30 ldr r0, [r5, r1] add r1, #0x24 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x20 @@ -1618,26 +1618,26 @@ MOD77_021D8248: ; 0x021D8248 add r4, r0, #0 ldr r0, _021D8288 ; =0x0000C034 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _021D828C ; =0x0000C014 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _021D8290 ; =0x0000C010 mov r1, #2 ldr r0, [r4, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _021D8290 ; =0x0000C010 mov r1, #6 ldr r0, [r4, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _021D8290 ; =0x0000C010 mov r1, #3 ldr r0, [r4, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _021D8290 ; =0x0000C010 mov r1, #7 ldr r0, [r4, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} nop _021D8288: .word 0x0000C034 @@ -1748,7 +1748,7 @@ MOD77_021D835C: ; 0x021D835C cmp r2, #0 bne _021D8368 ldr r0, _021D836C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021D8368: pop {r3, pc} nop @@ -1764,7 +1764,7 @@ MOD77_021D8370: ; 0x021D8370 add r6, r3, #0 ldr r0, [r5, r0] str r1, [sp] - bl FUN_02019150 + bl AddWindow ldrh r0, [r6, #0x10] ldr r1, [r5] bl ListMenuItems_ctor @@ -1844,7 +1844,7 @@ MOD77_021D8418: ; 0x021D8418 str r3, [sp, #4] ldr r7, [sp, #0x44] ldr r6, [sp, #0x48] - bl FUN_02019150 + bl AddWindow ldr r2, [sp, #0x40] ldr r3, [r5] mov r0, #0 @@ -1932,7 +1932,7 @@ MOD77_021D84D8: ; 0x021D84D8 bl FUN_0200CCF8 ldr r0, _021D8504 ; =0x0000C024 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _021D8508 ; =0x0000C054 mov r1, #0 ldr r0, [r4, r0] @@ -1968,7 +1968,7 @@ MOD77_021D8510: ; 0x021D8510 add r1, #0x34 ldr r2, _021D85C8 ; =0x021D8F28 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x30 @@ -2057,7 +2057,7 @@ MOD77_021D85E0: ; 0x021D85E0 add r1, #0x34 ldr r2, _021D868C ; =0x021D8F28 add r1, r5, r1 - bl FUN_02019150 + bl AddWindow mov r0, #0xd8 str r0, [sp] mov r0, #0x30 @@ -2130,7 +2130,7 @@ MOD77_021D8698: ; 0x021D8698 bl FUN_0200CCF8 ldr r0, _021D86B0 ; =0x0000C044 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 _021D86B0: .word 0x0000C044 diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 7fc7439a..4b4209f2 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -12,7 +12,7 @@ MOD78_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x48 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #0xa0 mov r2, #0x48 @@ -148,7 +148,7 @@ _021D75DE: b _021D7662 _021D7614: ldr r0, _021D76B4 ; =0x000006DC - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -259,7 +259,7 @@ _021D76C8: bl OverlayManager_FreeData bl FUN_0201B398 mov r0, #0x48 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD78_021D76B8 @@ -338,7 +338,7 @@ MOD78_021D778C: ; 0x021D778C add r0, #0x70 mov r1, #0x48 mov r2, #4 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r1, r5, #0 add r1, #0x9c ldrb r2, [r1] diff --git a/arm9/modules/79/asm/module_79_arm.s b/arm9/modules/79/asm/module_79_arm.s index 24356937..6564b7da 100644 --- a/arm9/modules/79/asm/module_79_arm.s +++ b/arm9/modules/79/asm/module_79_arm.s @@ -3438,7 +3438,7 @@ _022152DC: cmp r0, #0 beq _02215448 add r4, r0, #9 - ldr r1, _0221562C ; =UNK_0210430C + ldr r1, _0221562C ; =__msl_digit mov r2, #0 b _02215330 _0221532C: @@ -3460,7 +3460,7 @@ _02215358: cmp r0, #0 bne _0221532C mov r3, r4 - ldr r1, _0221562C ; =UNK_0210430C + ldr r1, _0221562C ; =__msl_digit mov r2, #0 b _02215374 _02215370: @@ -3655,7 +3655,7 @@ _0221561C: .word MOD79_02216F64 _02215620: .word MOD79_02216F6C _02215624: .word 0x51EB851F _02215628: .word MOD79_02216F70 -_0221562C: .word UNK_0210430C +_0221562C: .word __msl_digit _02215630: .word MOD79_02216F7C _02215634: .word MOD79_02216F8C _02215638: .word MOD79_0221673C @@ -4101,7 +4101,7 @@ _02215C1C: bl sscanf mov r3, #0 mov ip, #1 - ldr r2, _02215D24 ; =UNK_0210430C + ldr r2, _02215D24 ; =__msl_digit b _02215C5C _02215C50: ldr r1, [sp, #0x14] @@ -4163,7 +4163,7 @@ _02215D14: .word 0x0000024E _02215D18: .word MOD79_02217000 _02215D1C: .word 0x0000024F _02215D20: .word MOD79_02217020 -_02215D24: .word UNK_0210430C +_02215D24: .word __msl_digit arm_func_end MOD79_02215BD8 arm_func_start MOD79_02215D28 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 83e02d71..a1fe2ee3 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1391,7 +1391,7 @@ _0222DFE4: mov r0, #3 mov r1, #0x3e lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222E108 ; =0x00001044 add r0, r6, #0 mov r2, #0x3e @@ -1401,7 +1401,7 @@ _0222DFE4: add r4, r0, #0 bl memset mov r0, #0x3e - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] ldr r0, _0222E10C ; =0x02237E24 add r2, sp, #0 @@ -1413,7 +1413,7 @@ _0222DFE4: ldmia r3!, {r0, r1} stmia r2!, {r0, r1} add r0, r7, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #0xb mov r1, #0x40 mov r2, #0x3e @@ -1453,7 +1453,7 @@ _0222DFE4: str r0, [r4, r1] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 add r1, r6, #0 bl MOD80_0222E338 @@ -1689,7 +1689,7 @@ MOD80_0222E25C: ; 0x0222E25C add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x3e - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -2631,7 +2631,7 @@ MOD80_0222EA04: ; 0x0222EA04 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0222EB00 ; =0x02236F04 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -2646,10 +2646,10 @@ MOD80_0222EA04: ; 0x0222EA04 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222EB04 ; =0x02236EE8 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -2664,7 +2664,7 @@ MOD80_0222EA04: ; 0x0222EA04 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0222EB08 ; =0x02236F20 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -2679,7 +2679,7 @@ MOD80_0222EA04: ; 0x0222EA04 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0222EB0C ; =0x02236F3C add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -2694,10 +2694,10 @@ MOD80_0222EA04: ; 0x0222EA04 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222EB10 ; =0x02236ECC add r3, sp, #0 ldmia r5!, {r0, r1} @@ -2712,17 +2712,17 @@ MOD80_0222EA04: ; 0x0222EA04 add r0, r4, #0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -2745,19 +2745,19 @@ MOD80_0222EB14: ; 0x0222EB14 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_0222EB14 @@ -2947,7 +2947,7 @@ MOD80_0222EC98: ; 0x0222EC98 ldr r0, [r7, #4] add r1, r7, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0222ED88 ; =0x00000EB8 mov r1, #0 add r0, r7, r0 @@ -2989,7 +2989,7 @@ _0222ECF2: add r1, r5, #0 mov r2, #1 mov r3, #9 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -3015,7 +3015,7 @@ _0222ECF2: ldr r0, [r7, #4] add r1, r7, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0222ED94 ; =0x00000E98 mov r1, #0xf add r0, r7, r0 @@ -3035,7 +3035,7 @@ _0222ECF2: add r1, r7, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0222ED98 ; =0x00000FB8 mov r1, #0xf add r0, r7, r0 @@ -3056,23 +3056,23 @@ MOD80_0222ED9C: ; 0x0222ED9C add r6, r0, #0 ldr r0, _0222EDD0 ; =0x00000FB8 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0222EDD4 ; =0x00000E98 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0222EDD8 ; =0x00000ED8 mov r4, #0 add r5, r6, r0 _0222EDB6: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #3 blt _0222EDB6 ldr r0, _0222EDDC ; =0x00000EB8 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, r5, r6, pc} nop _0222EDD0: .word 0x00000FB8 @@ -3290,7 +3290,7 @@ _0222EF50: mov r0, #9 str r0, [r4, #0x2c] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F07C _0222EF6A: ldrh r1, [r4, #0x3a] @@ -3306,7 +3306,7 @@ _0222EF6A: ldr r0, _0222F094 ; =0x00000708 strh r0, [r4, #0x3a] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F07C _0222EF8C: ldr r0, _0222F08C ; =0x00000D5C @@ -3325,7 +3325,7 @@ _0222EF8C: mov r2, #5 bl MOD80_0222E6DC ldr r0, _0222F098 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE ldr r0, _0222F09C ; =0x00000FDC mov r1, #0 str r1, [r4, r0] @@ -3337,7 +3337,7 @@ _0222EFBE: mov r0, #9 str r0, [r4, #0x2c] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F07C _0222EFD2: bl MOD80_0222E7BC @@ -3357,7 +3357,7 @@ _0222EFD2: ldr r0, [r4, r0] bl FUN_020200BC ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F07C _0222F002: mov r0, #0x40 @@ -3376,7 +3376,7 @@ _0222F002: add r0, #0xb4 strh r1, [r0] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xb4 ldrh r0, [r0] @@ -3406,7 +3406,7 @@ _0222F040: add r0, #0xb4 strh r1, [r0] ldr r0, _0222F090 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xb4 ldrh r0, [r0] @@ -3550,7 +3550,7 @@ MOD80_0222F14C: ; 0x0222F14C bl FUN_0200D0E0 ldr r0, _0222F1B0 ; =0x00000FB8 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _0222F1B4 ; =0x00000D5C mov r1, #1 ldr r0, [r4, r0] @@ -3564,7 +3564,7 @@ _0222F18A: bl FUN_0200D0E0 ldr r0, _0222F1B0 ; =0x00000FB8 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r1, #0 add r0, r4, #0 add r2, r1, #0 @@ -3959,10 +3959,10 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222F56C ; =0x02236FAC add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -3977,7 +3977,7 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0222F570 ; =0x02236F90 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -3992,7 +3992,7 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _0222F574 ; =0x02236F74 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -4007,10 +4007,10 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222F578 ; =0x02236F58 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -4025,17 +4025,17 @@ MOD80_0222F494: ; 0x0222F494 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x8c pop {r4, r5, pc} nop @@ -4051,19 +4051,19 @@ MOD80_0222F57C: ; 0x0222F57C push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_0222F57C @@ -4245,7 +4245,7 @@ MOD80_0222F6EC: ; 0x0222F6EC ldr r0, [r0, #4] add r1, r1, r2 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _0222F7A8 ; =0x00000E98 ldr r0, [sp, #0x14] add r0, r0, r1 @@ -4268,7 +4268,7 @@ MOD80_0222F6EC: ; 0x0222F6EC add r1, r1, r2 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _0222F7B0 ; =0x00000F08 ldr r0, [sp, #0x14] ldr r4, _0222F7B4 ; =0x02236FE4 @@ -4300,7 +4300,7 @@ _0222F754: ldr r0, [r0, #4] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -4328,16 +4328,16 @@ MOD80_0222F7B8: ; 0x0222F7B8 add r5, r0, #0 ldr r0, _0222F7E4 ; =0x00000E98 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0222F7E8 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0222F7EC ; =0x00000F08 mov r4, #0 add r5, r5, r0 _0222F7D2: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xa @@ -4441,7 +4441,7 @@ MOD80_0222F86C: ; 0x0222F86C mov r2, #7 bl MOD80_0222E6DC ldr r0, _0222F8C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F8B8 _0222F8A2: mov r1, #2 @@ -4452,7 +4452,7 @@ _0222F8A2: mov r2, #0 bl MOD80_0222E7A8 ldr r0, _0222F8C8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222F8B8: mov r0, #3 add sp, #8 @@ -5286,10 +5286,10 @@ MOD80_0222FF6C: ; 0x0222FF6C str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02230024 ; =0x022370BC add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -5304,7 +5304,7 @@ MOD80_0222FF6C: ; 0x0222FF6C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02230028 ; =0x022370A0 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -5319,10 +5319,10 @@ MOD80_0222FF6C: ; 0x0222FF6C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223002C ; =0x02237084 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -5337,17 +5337,17 @@ MOD80_0222FF6C: ; 0x0222FF6C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x70 pop {r3, r4, r5, pc} nop @@ -5362,16 +5362,16 @@ MOD80_02230030: ; 0x02230030 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02230030 @@ -5501,7 +5501,7 @@ MOD80_02230128: ; 0x02230128 ldr r0, [r0, #4] add r1, r1, r2 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _022301E4 ; =0x00000E98 ldr r0, [sp, #0x14] add r0, r0, r1 @@ -5524,7 +5524,7 @@ MOD80_02230128: ; 0x02230128 add r1, r1, r2 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _022301EC ; =0x00000F08 ldr r0, [sp, #0x14] ldr r4, _022301F0 ; =0x022370F4 @@ -5556,7 +5556,7 @@ _02230190: ldr r0, [r0, #4] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -5584,16 +5584,16 @@ MOD80_022301F4: ; 0x022301F4 add r5, r0, #0 ldr r0, _02230220 ; =0x00000E98 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02230224 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02230228 ; =0x00000F08 mov r4, #0 add r5, r5, r0 _0223020E: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #0xa @@ -5724,7 +5724,7 @@ MOD80_022302F8: ; 0x022302F8 mov r2, #4 bl MOD80_0222E6DC ldr r0, _02230390 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230384 _02230326: mov r3, #2 @@ -5736,7 +5736,7 @@ _02230326: str r3, [r4, #0x2c] bl MOD80_0222E7A8 ldr r0, _02230390 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230384 _02230340: mov r0, #0x10 @@ -5753,7 +5753,7 @@ _02230340: mov r0, #6 str r0, [r4, #0x2c] ldr r0, _02230390 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230384 _02230362: mov r0, #0x20 @@ -5771,7 +5771,7 @@ _02230362: mov r0, #6 str r0, [r4, #0x2c] ldr r0, _02230390 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02230384: mov r0, #3 pop {r3, r4, r5, pc} @@ -6279,10 +6279,10 @@ MOD80_02230760: ; 0x02230760 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223080C ; =0x022371EC add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -6297,10 +6297,10 @@ MOD80_02230760: ; 0x02230760 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02230810 ; =0x022371B4 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -6315,25 +6315,25 @@ MOD80_02230760: ; 0x02230760 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #2 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x54 pop {r4, r5, pc} nop @@ -6347,19 +6347,19 @@ MOD80_02230814: ; 0x02230814 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02230814 @@ -6511,7 +6511,7 @@ MOD80_02230944: ; 0x02230944 ldr r0, [r0, #4] add r1, r1, r2 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _02230A6C ; =0x00000EB8 ldr r0, [sp, #0x14] add r0, r0, r1 @@ -6546,7 +6546,7 @@ MOD80_02230944: ; 0x02230944 ldr r0, [r0, #4] add r1, r1, r2 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, _02230A74 ; =0x00000E98 ldr r0, [sp, #0x14] add r0, r0, r1 @@ -6579,7 +6579,7 @@ _022309D2: lsl r3, r3, #0x18 ldr r0, [r0, #4] lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -6620,7 +6620,7 @@ _02230A20: lsl r3, r3, #0x18 ldr r0, [r0, #4] lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [sp, #0x18] mov r1, #0 add r0, r0, r7 @@ -6648,16 +6648,16 @@ MOD80_02230A88: ; 0x02230A88 add r5, r0, #0 ldr r0, _02230AB4 ; =0x00000E98 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02230AB8 ; =0x00000EB8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02230ABC ; =0x00000F08 mov r4, #0 add r5, r5, r0 _02230AA2: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #8 @@ -6803,7 +6803,7 @@ _02230BC8: mov r0, #3 str r0, [r4, #0x2c] ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230BD4: ldr r0, _02230CBC ; =0x00000B22 @@ -6824,20 +6824,20 @@ _02230BD4: cmp r0, #0 beq _02230C04 ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #3 pop {r3, r4, r5, pc} _02230C04: mov r0, #8 str r0, [r4, #0x2c] ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230C10: mov r0, #0xb str r0, [r4, #0x2c] ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230C1C: mov r0, #0xe @@ -6856,7 +6856,7 @@ _02230C22: mov r2, #0x16 bl MOD80_0222E6DC ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230C44: mov r0, #2 @@ -6873,7 +6873,7 @@ _02230C44: mov r2, #0x16 bl MOD80_0222E6DC ldr r0, _02230CB8 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02230CAE _02230C6A: add r0, r4, #0 @@ -6905,7 +6905,7 @@ _02230C6A: add r4, #0xc4 ldr r0, _02230CB8 ; =0x000005DC str r5, [r4] - bl FUN_020054C8 + bl PlaySE _02230CAE: mov r0, #3 pop {r3, r4, r5, pc} @@ -6937,7 +6937,7 @@ MOD80_02230CC8: ; 0x02230CC8 mov r2, #1 bl MOD80_0222E6DC ldr r0, _02230D5C ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _02230D4C _02230CF6: add r0, r4, r1 @@ -6958,11 +6958,11 @@ _02230CF6: mov r2, #1 bl MOD80_0222E6DC ldr r0, _02230D5C ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _02230D4C _02230D26: ldr r0, _02230D60 ; =0x000005FF - bl FUN_020054C8 + bl PlaySE ldr r0, _02230D58 ; =0x00000F0F mov r1, #0xd str r0, [sp] @@ -7172,7 +7172,7 @@ MOD80_02230E9C: ; 0x02230E9C mov r2, #1 bl MOD80_0222E6DC ldr r0, _02230EF4 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE b _02230EE8 _02230ECC: str r1, [sp] @@ -7249,7 +7249,7 @@ MOD80_02230F3C: ; 0x02230F3C mov r2, #1 bl MOD80_0222E6DC ldr r0, _02230F74 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE mov r0, #3 add sp, #4 pop {r3, r4, pc} @@ -7278,7 +7278,7 @@ MOD80_02230F78: ; 0x02230F78 mov r1, #0 str r1, [r4, r0] ldr r0, _02230FB0 ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE mov r0, #3 add sp, #4 pop {r3, r4, pc} @@ -7308,7 +7308,7 @@ MOD80_02230FB4: ; 0x02230FB4 add r2, r1, #0 bl MOD80_0222E7A8 ldr r0, _02230FEC ; =0x000005F3 - bl FUN_020054C8 + bl PlaySE mov r0, #3 add sp, #4 pop {r3, r4, pc} @@ -7356,14 +7356,14 @@ MOD80_02231008: ; 0x02231008 sub r0, r0, #1 str r0, [r1, #0x28] ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _022310D0 _02231036: ldr r0, [r1, #0x2c] cmp r0, #0 beq _02231042 ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02231042: mov r0, #0xfe lsl r0, r0, #4 @@ -7387,14 +7387,14 @@ _0223104E: add r0, r0, #1 str r0, [r1, #0x28] ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _022310D0 _02231072: ldr r0, [r1, #0x2c] cmp r0, #1 beq _0223107E ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0223107E: mov r0, #0xfe lsl r0, r0, #4 @@ -7413,7 +7413,7 @@ _0223108A: cmp r0, #1 beq _022310A2 ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022310A2: mov r0, #0xfe lsl r0, r0, #4 @@ -7432,7 +7432,7 @@ _022310AE: cmp r0, #0 beq _022310C6 ldr r0, _02231104 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022310C6: mov r0, #0xfe lsl r0, r0, #4 @@ -7520,7 +7520,7 @@ MOD80_0223113C: ; 0x0223113C add r1, r4, r1 mov r2, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022311BC ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -7539,7 +7539,7 @@ MOD80_0223113C: ; 0x0223113C add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022311C4 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 @@ -7631,7 +7631,7 @@ _02231240: ldr r0, [r4, r0] bl ListMenuItems_dtor ldr r0, _022312BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [r4, #0x2c] b _022312AE @@ -7657,12 +7657,12 @@ _02231266: bl FUN_0200D0E0 ldr r0, _022312C0 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _022312C8 ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _022312BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r4, #0x2c] _022312AE: @@ -7756,7 +7756,7 @@ _02231342: add r0, r4, r0 bl FUN_0200CCF8 ldr r0, _02231470 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r4, #0x2c] mov r0, #0xfe @@ -7794,16 +7794,16 @@ _0223138C: bl FUN_0200CCF8 ldr r0, _02231474 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223146C ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02231478 ; =0x00000B22 strh r5, [r4, r0] mov r0, #0 str r0, [r4, #0x2c] ldr r0, _02231470 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0223147C ; =0x00000F18 mov r1, #0 add r0, r4, r0 @@ -7909,7 +7909,7 @@ MOD80_02231490: ; 0x02231490 add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022314E8 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -7994,9 +7994,9 @@ _0223154A: bl FUN_0200D0E0 ldr r0, _022315F8 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02231600 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r5, #0x2c] b _022315EA @@ -8015,9 +8015,9 @@ _0223158E: bl FUN_0200CCF8 ldr r0, _022315F8 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02231600 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02231604 ; =0x00000B24 add r1, r4, #1 strb r1, [r5, r0] @@ -8085,7 +8085,7 @@ MOD80_02231614: ; 0x02231614 add r1, r4, r1 mov r2, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0223166C ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -8167,9 +8167,9 @@ _022316D0: bl FUN_0200D0E0 ldr r0, _02231774 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223177C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r5, #0x2c] b _02231766 @@ -8188,9 +8188,9 @@ _0223170C: bl FUN_0200CCF8 ldr r0, _02231774 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223177C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02231780 ; =0x00000B22 add r1, r4, #0 add r0, r5, r0 @@ -8642,7 +8642,7 @@ MOD80_02231AB0: ; 0x02231AB0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02231BB4 ; =0x02237288 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -8657,10 +8657,10 @@ MOD80_02231AB0: ; 0x02231AB0 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02231BB8 ; =0x022372A4 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -8675,7 +8675,7 @@ MOD80_02231AB0: ; 0x02231AB0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02231BBC ; =0x0223726C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -8690,10 +8690,10 @@ MOD80_02231AB0: ; 0x02231AB0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02231BC0 ; =0x02237234 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -8708,10 +8708,10 @@ MOD80_02231AB0: ; 0x02231AB0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02231BC4 ; =0x02237250 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -8726,17 +8726,17 @@ MOD80_02231AB0: ; 0x02231AB0 add r0, r4, #0 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -8759,19 +8759,19 @@ MOD80_02231BC8: ; 0x02231BC8 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02231BC8 @@ -9117,7 +9117,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, [r4, #4] add r1, r4, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FDC ; =0x00000EB8 mov r1, #0 add r0, r4, r0 @@ -9146,7 +9146,7 @@ MOD80_02231EA8: ; 0x02231EA8 add r1, r4, r1 mov r2, #0 mov r3, #5 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FE4 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 @@ -9168,7 +9168,7 @@ MOD80_02231EA8: ; 0x02231EA8 ldr r0, [r4, #4] add r1, r4, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FE8 ; =0x00000E98 mov r1, #0 add r0, r4, r0 @@ -9188,7 +9188,7 @@ MOD80_02231EA8: ; 0x02231EA8 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FF0 ; =0x00000FB8 mov r1, #0 add r0, r4, r0 @@ -9208,7 +9208,7 @@ MOD80_02231EA8: ; 0x02231EA8 add r1, r4, r1 mov r2, #1 mov r3, #0x19 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02231FF8 ; =0x00000EE8 mov r1, #6 add r0, r4, r0 @@ -9237,7 +9237,7 @@ MOD80_02231EA8: ; 0x02231EA8 add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized add sp, #0x14 pop {r3, r4, pc} .align 2, 0 @@ -9261,22 +9261,22 @@ MOD80_0223200C: ; 0x0223200C add r4, r0, #0 ldr r0, _02232044 ; =0x00000FB8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02232048 ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223204C ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02232050 ; =0x00000E98 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02232054 ; =0x00000EC8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02232058 ; =0x00000EB8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} nop _02232044: .word 0x00000FB8 @@ -9434,13 +9434,13 @@ _02232168: mov r0, #2 str r0, [r5, #0x2c] ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _0223218E: cmp r0, #0x1f beq _022321B6 ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r2, r5, #0 add r3, r5, #0 ldr r1, [r5] @@ -9542,7 +9542,7 @@ _02232250: mov r0, #2 str r0, [r5, #0x2c] ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _02232274: mov r0, #1 @@ -9560,7 +9560,7 @@ _02232274: mov r0, #2 str r0, [r5, #0x2c] ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _0223229A: cmp r3, #0x1f @@ -9636,7 +9636,7 @@ _022322BC: mov r2, #9 bl MOD80_0222E6DC ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _0223233C: ldr r0, _02232378 ; =0x00000F0F @@ -9654,11 +9654,11 @@ _0223233C: b _02232368 _0223235A: ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02232368 _02232362: ldr r0, _02232374 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02232368: mov r0, #3 add sp, #8 @@ -9732,7 +9732,7 @@ _022323CE: add r0, r5, #0 bl MOD80_02232D7C ldr r0, _02232450 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _022323FE _022323F6: add r0, r5, #0 @@ -9743,7 +9743,7 @@ _022323FE: cmp r4, #0 beq _02232420 ldr r0, _02232450 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xba ldrh r0, [r0] @@ -11706,10 +11706,10 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02233430 ; =0x0223743C add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -11724,7 +11724,7 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02233434 ; =0x02237458 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -11739,7 +11739,7 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r5, _02233438 ; =0x02237404 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -11754,10 +11754,10 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223343C ; =0x022373E8 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -11772,17 +11772,17 @@ MOD80_02233358: ; 0x02233358 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x8c pop {r4, r5, pc} nop @@ -11798,19 +11798,19 @@ MOD80_02233440: ; 0x02233440 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02233440 @@ -11904,7 +11904,7 @@ MOD80_02233500: ; 0x02233500 ldr r0, [r7, #4] add r1, r7, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022335CC ; =0x00000EB8 mov r1, #0 add r0, r7, r0 @@ -11934,7 +11934,7 @@ MOD80_02233500: ; 0x02233500 ldr r0, [r7, #4] add r1, r7, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _022335D4 ; =0x00000E98 mov r1, #0 add r0, r7, r0 @@ -11965,7 +11965,7 @@ _0223357E: ldr r0, [r7, #4] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -11998,17 +11998,17 @@ MOD80_022335E0: ; 0x022335E0 add r5, r6, r0 _022335EA: add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow add r4, r4, #1 add r5, #0x10 cmp r4, #6 blt _022335EA ldr r0, _02233610 ; =0x00000E98 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233614 ; =0x00000EB8 add r0, r6, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, r5, r6, pc} nop _0223360C: .word 0x00000F08 @@ -12154,7 +12154,7 @@ _02233714: add r1, r4, r1 mov r2, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02233778 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12173,7 +12173,7 @@ _02233714: add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02233780 ; =0x00000EE8 mov r1, #0 add r0, r4, r0 @@ -12267,7 +12267,7 @@ _022337FA: mov r0, #5 str r0, [r4, #0x2c] ldr r0, _02233880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02233872 _02233820: mov r0, #0xfe @@ -12291,10 +12291,10 @@ _02233820: bl FUN_0200D0E0 ldr r0, _02233884 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223388C ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r1, #5 add r0, r4, #0 add r2, r1, #0 @@ -12302,7 +12302,7 @@ _02233820: mov r0, #2 str r0, [r4, #0x2c] ldr r0, _02233880 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02233872: mov r0, #3 pop {r4, pc} @@ -12425,14 +12425,14 @@ _02233932: bl FUN_0200CCF8 ldr r0, _02233A58 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233A54 ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0 str r0, [r4, #0x2c] ldr r0, _02233A5C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xfe lsl r0, r0, #4 ldr r3, [r4, r0] @@ -12468,14 +12468,14 @@ _0223398C: bl FUN_0200CCF8 ldr r0, _02233A58 ; =0x00000ED8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233A54 ; =0x00000EE8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233A60 ; =0x00000B1C strh r5, [r4, r0] ldr r0, _02233A5C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0x12 ; BASE_GENDER_RATIO bl GetMonBaseStat @@ -12573,7 +12573,7 @@ MOD80_02233A6C: ; 0x02233A6C add r1, r4, r1 mov r2, #0 mov r3, #0x15 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02233AC4 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12658,9 +12658,9 @@ _02233B26: bl FUN_0200D0E0 ldr r0, _02233BD4 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233BDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r5, #0x2c] b _02233BC6 @@ -12679,9 +12679,9 @@ _02233B6A: bl FUN_0200CCF8 ldr r0, _02233BD4 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233BDC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r3, _02233BE0 ; =0x00000F08 ldr r2, _02233BE4 ; =0x00000B1E add r0, r4, #1 @@ -12748,7 +12748,7 @@ MOD80_02233BE8: ; 0x02233BE8 add r1, r4, r1 mov r2, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02233C40 ; =0x00000ED8 mov r1, #0 add r0, r4, r0 @@ -12830,9 +12830,9 @@ _02233CA4: bl FUN_0200D0E0 ldr r0, _02233D74 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233D7C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r1, #0xfe lsl r1, r1, #4 ldr r1, [r5, r1] @@ -12851,7 +12851,7 @@ _02233CF4: b _02233D66 _02233CFA: ldr r0, _02233D7C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _02233D6C ; =0x00000FD4 mov r1, #0 ldr r0, [r5, r0] @@ -12866,7 +12866,7 @@ _02233CFA: bl FUN_0200CCF8 ldr r0, _02233D74 ; =0x00000ED8 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02233D80 ; =0x00000B1C add r1, r4, #0 add r0, r5, r0 @@ -14103,7 +14103,7 @@ MOD80_02234698: ; 0x02234698 cmp r1, r0 beq _022346C4 ldr r0, _022346D4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _022346C4: add r0, sp, #0 ldrh r0, [r0] @@ -14222,7 +14222,7 @@ MOD80_02234780: ; 0x02234780 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _0223488C ; =0x02237544 add r3, sp, #0x70 ldmia r5!, {r0, r1} @@ -14237,10 +14237,10 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02234890 ; =0x02237528 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -14255,10 +14255,10 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02234894 ; =0x0223757C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -14273,10 +14273,10 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02234898 ; =0x02237560 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -14291,10 +14291,10 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0223489C ; =0x0223750C add r3, sp, #0 ldmia r5!, {r0, r1} @@ -14309,17 +14309,17 @@ MOD80_02234780: ; 0x02234780 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -14342,19 +14342,19 @@ MOD80_022348A0: ; 0x022348A0 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_022348A0 @@ -14405,10 +14405,10 @@ MOD80_022348CC: ; 0x022348CC bne _02234944 mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 mov r1, #0 bl GX_EngineBToggleLayers @@ -14445,7 +14445,7 @@ MOD80_02234958: ; 0x02234958 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02234990 ; =0x00000E98 mov r1, #0 add r0, r4, r0 @@ -14464,7 +14464,7 @@ MOD80_02234994: ; 0x02234994 bx r3 .align 2, 0 _0223499C: .word 0x00000E98 -_022349A0: .word FUN_02019178 +_022349A0: .word RemoveWindow thumb_func_end MOD80_02234994 thumb_func_start MOD80_022349A4 @@ -16555,7 +16555,7 @@ MOD80_02235900: ; 0x02235900 str r5, [r0, #0xc] bl MOD80_02235948 ldr r0, _02235944 ; =0x0000062F - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _0223593C: .word MOD80_02235964 @@ -16655,7 +16655,7 @@ _022359DE: pop {r4, r5, r6, pc} _022359F2: ldr r0, _02235A08 ; =0x0000060D - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0xc] ldr r0, _02235A0C ; =0x00000FEC mov r2, #1 @@ -16692,7 +16692,7 @@ MOD80_02235A10: ; 0x02235A10 str r5, [r0, #0xc] bl MOD80_02235948 ldr r0, _02235A50 ; =0x0000060E - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _02235A48: .word MOD80_02235A54 @@ -16754,7 +16754,7 @@ _02235A9E: str r0, [r4] mov r0, #0x63 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} _02235AC2: mov r0, #0x13 @@ -16876,7 +16876,7 @@ MOD80_02235B90: ; 0x02235B90 cmp r0, #1 bne _02235BAA ldr r0, _02235C24 ; =0x0000064F - bl FUN_020054C8 + bl PlaySE _02235BAA: ldr r4, [sp, #4] mov r0, #0xe @@ -17886,13 +17886,13 @@ MOD80_02236378: ; 0x02236378 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02236458 ; =0x0223761C add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -17907,7 +17907,7 @@ MOD80_02236378: ; 0x02236378 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -17925,13 +17925,13 @@ MOD80_02236378: ; 0x02236378 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02236460 ; =0x02237600 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -17946,7 +17946,7 @@ MOD80_02236378: ; 0x02236378 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineBToggleLayers @@ -17954,12 +17954,12 @@ MOD80_02236378: ; 0x02236378 mov r1, #0x20 add r2, r0, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x3e - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0x10 mov r1, #0 bl GX_EngineBToggleLayers @@ -17977,16 +17977,16 @@ MOD80_02236464: ; 0x02236464 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD80_02236464 @@ -18097,10 +18097,10 @@ MOD80_02236488: ; 0x02236488 bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD80_02236488 @@ -18124,7 +18124,7 @@ MOD80_02236580: ; 0x02236580 ldr r0, [r4, #4] add r1, r4, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02236628 ; =0x00000EC8 mov r1, #0 add r0, r4, r0 @@ -18145,7 +18145,7 @@ MOD80_02236580: ; 0x02236580 add r1, r4, r1 mov r2, #0 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _0223662C ; =0x00000EB8 mov r1, #0 add r0, r4, r0 @@ -18176,7 +18176,7 @@ MOD80_02236580: ; 0x02236580 add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _02236634 ; =0x00000E98 mov r1, #0 add r0, r4, r0 @@ -18196,13 +18196,13 @@ MOD80_02236638: ; 0x02236638 add r4, r0, #0 ldr r0, _02236658 ; =0x00000E98 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _0223665C ; =0x00000EB8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _02236660 ; =0x00000EC8 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} nop _02236658: .word 0x00000E98 @@ -19842,4 +19842,3 @@ MOD80_02237E1C: ; 0x02237E1C .global MOD80_02237E24 MOD80_02237E24: ; 0x02237E24 .space 0x1C - diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index c8b46eb9..09e12fdf 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -16,11 +16,11 @@ _02237E50: mov r0, #3 mov r1, #0x39 lsl r2, r0, #0xf - bl FUN_0201681C + bl CreateHeap mov r0, #3 mov r1, #0x3a lsl r2, r0, #0xf - bl FUN_0201681C + bl CreateHeap bl MOD81_02238858 ldr r1, _02237FD0 ; =0x00000492 mov r0, #3 @@ -41,7 +41,7 @@ _02237E84: mov r0, #0 str r0, [r4, #4] mov r0, #0x39 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #8] mov r0, #0x19 lsl r0, r0, #4 @@ -237,9 +237,9 @@ MOD81_02238004: ; 0x02238004 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x39 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x3a - bl FUN_020168D0 + bl DestroyHeap add r0, r6, #0 bl OS_RestoreInterrupts mov r0, #1 @@ -520,7 +520,7 @@ MOD81_02238248: ; 0x02238248 cmp r0, #0 bgt _02238284 ldr r0, _0223832C ; =0x000006AE - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0x1e add r0, #0xf0 @@ -944,7 +944,7 @@ MOD81_02238588: ; 0x02238588 mov r1, #2 str r0, [sp] ldr r0, [r4] - bl FUN_02017BD0 + bl SetBgAffine ldr r0, [r4, #0x1c] add r2, sp, #4 lsl r1, r0, #2 @@ -954,7 +954,7 @@ MOD81_02238588: ; 0x02238588 mov r1, #6 str r0, [sp] ldr r0, [r4] - bl FUN_02017BD0 + bl SetBgAffine add sp, #0x14 pop {r3, r4, pc} .align 2, 0 @@ -1048,7 +1048,7 @@ _02238648: lsr r1, r1, #0x18 add r2, r7, #0 add r3, r6, #0 - bl FUN_02017E14 + bl BG_LoadCharTilesData ldr r1, [sp, #0x20] add r0, r4, #0 bl ReleaseBoxMonLock @@ -1130,7 +1130,7 @@ _022386DE: lsr r1, r1, #0x18 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r0, #0xa str r0, [sp] str r0, [sp, #4] @@ -1146,7 +1146,7 @@ _022386DE: lsr r1, r1, #0x18 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r7, #0 bl FreeToHeap _02238746: @@ -2059,16 +2059,16 @@ MOD81_02238D64: ; 0x02238D64 bl MOD81_0223890C ldr r0, [r4, #0x40] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x40] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x40] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0x44 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x10] cmp r0, #0 beq _02238DB6 @@ -2158,22 +2158,22 @@ MOD81_02238E44: ; 0x02238E44 and r0, r1 strh r0, [r2] ldr r0, _0223904C ; =0x0223D00C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x40] ldr r2, _02239050 ; =0x0223D01C mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x40] ldr r2, _02239054 ; =0x0223D038 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x40] ldr r2, _02239054 ; =0x0223D038 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -2189,7 +2189,7 @@ MOD81_02238E44: ; 0x02238E44 str r2, [sp] ldr r0, [r4, #0x40] add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -2199,7 +2199,7 @@ MOD81_02238E44: ; 0x02238E44 ldr r0, [r4, #0x40] mov r1, #1 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4] bl MOD81_02238844 lsl r0, r0, #0x18 @@ -2225,7 +2225,7 @@ MOD81_02238E44: ; 0x02238E44 ldr r0, [r4, #0x40] add r1, #0x44 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x44 mov r1, #0xf @@ -2306,7 +2306,7 @@ MOD81_02238E44: ; 0x02238E44 bl GfGfxLoader_GXLoadPal ldr r0, [r4, #0x40] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD81_022392D8 mov r1, #0 @@ -2540,7 +2540,7 @@ _0223918A: bl AddTextPrinterParameterized add r0, r4, #0 add r0, #0x44 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0 str r0, [r4, #8] ldr r0, [r5] @@ -2601,7 +2601,7 @@ _0223920E: ; jump table .short _022392B6 - _0223920E - 2 ; case 4 _02239218: ldr r0, _022392D4 ; =0x000006A8 - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 mov r1, #0 mov r2, #0x10 @@ -3143,7 +3143,7 @@ _0223962A: str r0, [r4, #0x24] _02239658: ldr r0, _022396E4 ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x20] add r0, r0, #1 str r0, [r4, #0x20] @@ -3590,7 +3590,7 @@ _022399A0: bne _022399B6 mov r0, #0x6b lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE _022399B6: mov r0, #0x16 lsl r0, r0, #4 @@ -3641,21 +3641,21 @@ MOD81_022399FC: ; 0x022399FC and r0, r1 strh r0, [r2] ldr r0, _02239C84 ; =0x0223D084 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] ldr r2, _02239C88 ; =0x0223D0B4 mov r1, #2 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] ldr r2, _02239C88 ; =0x0223D0B4 mov r1, #6 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate bl OS_DisableInterrupts add r5, r0, #0 add r0, r4, #0 @@ -3664,14 +3664,14 @@ MOD81_022399FC: ; 0x022399FC ldr r2, _02239C8C ; =0x0223D0D0 mov r1, #3 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] ldr r2, _02239C8C ; =0x0223D0D0 mov r1, #7 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 bl OS_RestoreInterrupts mov r0, #0 @@ -3866,10 +3866,10 @@ _02239C02: mov r1, #6 mov r2, #3 mvn r3, r3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -3882,7 +3882,7 @@ _02239C02: ldr r0, [r0] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r4, #0 add r0, #0xc8 mov r1, #1 @@ -3938,21 +3938,21 @@ _02239CAA: add r0, #0xc0 ldr r0, [r0] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0xc0 ldr r0, [r0] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r4, #0xc0 ldr r0, [r4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_02239C94 @@ -4272,19 +4272,19 @@ MOD81_02239F58: ; 0x02239F58 mov r1, #2 mov r2, #3 mvn r3, r3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, #0xc0 ldr r0, [r4] mov r1, #6 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #3 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer ldr r2, _02239FB0 ; =0x04000304 ldrh r1, [r2] lsr r0, r2, #0xb @@ -4493,7 +4493,7 @@ MOD81_0223A104: ; 0x0223A104 str r1, [r4, r0] ldr r0, [r4, r0] mov r1, #2 - bl FUN_02017B54 + bl Bg_GetYpos lsl r1, r0, #0xc mov r0, #0x56 lsl r0, r0, #2 @@ -4501,7 +4501,7 @@ MOD81_0223A104: ; 0x0223A104 sub r0, r0, #4 ldr r0, [r4, r0] mov r1, #6 - bl FUN_02017B54 + bl Bg_GetYpos mov r1, #0x57 lsl r0, r0, #0xc lsl r1, r1, #2 @@ -4564,7 +4564,7 @@ MOD81_0223A178: ; 0x0223A178 mov r1, #2 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r5, #0x55 lsl r5, r5, #2 add r3, r5, #0 @@ -4577,7 +4577,7 @@ MOD81_0223A178: ; 0x0223A178 sub r3, r6, r3 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #0x59 lsl r1, r1, #2 mov r0, #2 @@ -5630,7 +5630,7 @@ _0223A9C8: cmp r0, #0xa ble _0223AA54 ldr r0, _0223AA5C ; =0x000006AC - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r0, r5, #0 add r1, #0x34 @@ -5649,7 +5649,7 @@ _0223A9F2: cmp r0, #0 beq _0223AA54 ldr r0, _0223AA60 ; =0x000006AD - bl FUN_020054C8 + bl PlaySE ldr r0, [r5, #0x20] mov r1, #3 bl FUN_02020130 @@ -5710,17 +5710,17 @@ MOD81_0223AA68: ; 0x0223AA68 and r0, r1 strh r0, [r2] ldr r0, _0223ABB8 ; =0x0223D11C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x24] ldr r2, _0223ABBC ; =0x0223D13C mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x24] ldr r2, _0223ABBC ; =0x0223D13C mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] bl MOD81_02238828 cmp r0, #3 @@ -5838,12 +5838,12 @@ _0223AAE8: ldr r0, [r4, #0x24] add r2, r1, #0 add r3, #0xfd - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x24] mov r1, #7 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -5866,10 +5866,10 @@ MOD81_0223ABC0: ; 0x0223ABC0 add r4, r0, #0 ldr r0, [r4, #0x24] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x24] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_0223ABC0 @@ -6491,13 +6491,13 @@ MOD81_0223B090: ; 0x0223B090 mov r1, #3 ldr r0, [r4, #0x24] add r2, r1, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #3 add r3, r2, #0 ldr r0, [r4, #0x24] mov r1, #7 add r3, #0xfd - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x28] add r1, sp, #0 bl MOD81_02238C70 @@ -6645,7 +6645,7 @@ _0223B1C2: cmp r0, #0 beq _0223B1FC ldr r0, _0223B214 ; =0x000006A9 - bl FUN_020054C8 + bl PlaySE mov r0, #0x10 str r0, [sp] mov r0, #1 @@ -6732,32 +6732,32 @@ MOD81_0223B264: ; 0x0223B264 orr r0, r1 strh r0, [r2] ldr r0, _0223B464 ; =0x0223D188 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0xc] ldr r2, _0223B468 ; =0x0223D198 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223B468 ; =0x0223D198 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223B46C ; =0x0223D1B4 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223B470 ; =0x0223D1D0 mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223B470 ; =0x0223D1D0 mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -6830,21 +6830,21 @@ MOD81_0223B264: ; 0x0223B264 ldr r0, [r4, #0xc] mov r2, #0 add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r0, #0xc8 str r0, [sp] ldr r0, [r4, #0xc] mov r1, #5 mov r2, #0 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r0, #0xc8 str r0, [sp] ldr r0, [r4, #0xc] mov r1, #2 mov r2, #0 mov r3, #1 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r1, #0 str r1, [sp] ldr r0, [r4] @@ -6874,7 +6874,7 @@ MOD81_0223B264: ; 0x0223B264 ldr r0, [r4, #0xc] mov r1, #1 mov r2, #0xc8 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0 str r3, [sp] mov r0, #0x20 @@ -6885,7 +6885,7 @@ MOD81_0223B264: ; 0x0223B264 ldr r0, [r4, #0xc] mov r1, #5 mov r2, #0xc8 - bl FUN_02018540 + bl FillBgTilemapRect mov r3, #0 str r3, [sp] mov r0, #0x20 @@ -6896,7 +6896,7 @@ MOD81_0223B264: ; 0x0223B264 ldr r0, [r4, #0xc] mov r1, #2 mov r2, #0xc8 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x14 str r0, [sp] mov r1, #0 @@ -6923,13 +6923,13 @@ MOD81_0223B264: ; 0x0223B264 bl MOD81_022386BC ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r4, #0xc] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r0, [r4, #0xc] ldr r2, _0223B474 ; =0xFFFFFE80 mov r1, #0x50 @@ -6958,22 +6958,22 @@ MOD81_0223B478: ; 0x0223B478 add r4, r0, #0 ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_0223B478 @@ -6989,18 +6989,18 @@ MOD81_0223B4B0: ; 0x0223B4B0 mov r1, #2 mov r2, #3 and r3, r6 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 mov r1, #1 mov r2, #3 add r3, r4, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r4, #0xc0 add r0, r5, #0 mov r1, #5 mov r2, #3 add r3, r4, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, r5, r6, pc} nop _0223B4E4: .word 0x000001FF @@ -7157,7 +7157,7 @@ _0223B5FE: cmp r0, #0 bne _0223B662 ldr r0, _0223B668 ; =0x000006AB - bl FUN_020054C8 + bl PlaySE add r1, r5, #0 add r0, r5, #0 add r1, #0x34 @@ -7219,17 +7219,17 @@ MOD81_0223B670: ; 0x0223B670 orr r0, r1 strh r0, [r2] ldr r0, _0223B7C8 ; =0x0223D21C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x24] ldr r2, _0223B7CC ; =0x0223D23C mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x24] ldr r2, _0223B7CC ; =0x0223D23C mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] bl MOD81_02238828 cmp r0, #3 @@ -7346,13 +7346,13 @@ _0223B6F0: ldr r0, [r4, #0x24] add r2, r1, #0 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #3 add r3, r2, #0 ldr r0, [r4, #0x24] mov r1, #7 add r3, #0xfd - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -7378,10 +7378,10 @@ MOD81_0223B7D0: ; 0x0223B7D0 add r4, r0, #0 ldr r0, [r4, #0x24] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x24] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_0223B7D0 @@ -8018,12 +8018,12 @@ _0223BCC6: ldr r0, [r4, #0x24] add r2, r1, #0 add r3, #0xfd - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x24] mov r1, #7 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x28] add r1, sp, #0 bl MOD81_02238C70 @@ -8381,29 +8381,29 @@ MOD81_0223BF74: ; 0x0223BF74 orr r0, r1 strh r0, [r2] ldr r0, _0223C194 ; =0x0223D294 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0xc] ldr r2, _0223C198 ; =0x0223D2B4 mov r1, #2 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223C198 ; =0x0223D2B4 mov r1, #6 mov r3, #1 - bl FUN_02016C18 + bl InitBgFromTemplate bl OS_DisableInterrupts add r5, r0, #0 ldr r0, [r4, #0xc] ldr r2, _0223C19C ; =0x0223D2D0 mov r1, #3 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0xc] ldr r2, _0223C19C ; =0x0223D2D0 mov r1, #7 mov r3, #2 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r5, #0 bl OS_RestoreInterrupts mov r0, #0 @@ -8579,21 +8579,21 @@ _0223C14A: ldr r3, _0223C1A4 ; =0xFFFFFE80 mov r1, #2 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r2, #3 add r3, r2, #0 ldr r0, [r4, #0xc] mov r1, #6 sub r3, #0xc3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r1, #3 ldr r0, [r4, #0xc] add r2, r1, #0 mov r3, #0x43 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #0x10 mov r1, #1 bl GX_EngineAToggleLayers @@ -8624,16 +8624,16 @@ MOD81_0223C1A8: ; 0x0223C1A8 _0223C1B8: ldr r0, [r4, #0xc] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0xc] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD81_0223C1A8 @@ -8828,13 +8828,13 @@ MOD81_0223C350: ; 0x0223C350 ldr r0, [r4, #4] mov r1, #2 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r3, [r4, #0x10] ldr r0, [r4, #4] mov r1, #6 mov r2, #3 asr r3, r3, #0xc - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #8] sub r0, r0, #1 str r0, [r4, #8] @@ -8844,12 +8844,12 @@ _0223C390: mov r1, #2 mov r2, #3 mov r3, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] mov r1, #6 mov r2, #3 mov r3, #0xc0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit add r0, r5, #0 bl MOD81_0223C3B0 pop {r3, r4, r5, pc} @@ -9119,10 +9119,10 @@ MOD81_0223C580: ; 0x0223C580 _0223C5AC: ldr r0, [r4, #0x44] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 add r0, #0x48 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x14] cmp r0, #0 beq _0223C5C6 @@ -9215,17 +9215,17 @@ MOD81_0223C658: ; 0x0223C658 orr r0, r1 strh r0, [r2] ldr r0, _0223C810 ; =0x0223D32C - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #0x44] ldr r2, _0223C814 ; =0x0223D33C mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x44] ldr r2, _0223C818 ; =0x0223D358 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 add r1, r0, #0 bl GX_EngineAToggleLayers @@ -9241,7 +9241,7 @@ MOD81_0223C658: ; 0x0223C658 str r2, [sp] ldr r0, [r4, #0x44] add r3, r1, #0 - bl FUN_02017F48 + bl BG_FillCharDataRange mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -9251,7 +9251,7 @@ MOD81_0223C658: ; 0x0223C658 ldr r0, [r4, #0x44] mov r1, #1 add r3, r2, #0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4] bl MOD81_02238844 lsl r0, r0, #0x18 @@ -9277,7 +9277,7 @@ MOD81_0223C658: ; 0x0223C658 ldr r0, [r4, #0x44] add r1, #0x48 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized add r0, r4, #0 add r0, #0x48 mov r1, #0xf @@ -9292,7 +9292,7 @@ MOD81_0223C658: ; 0x0223C658 bl GfGfxLoader_GXLoadPal ldr r0, [r4, #0x44] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -9653,7 +9653,7 @@ _0223C9D0: bl AddTextPrinterParameterized add r0, r4, #0 add r0, #0x48 - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0 str r0, [r4, #8] ldr r0, [r5] @@ -10287,7 +10287,7 @@ _0223CEDC: cmp r1, r0 bge _0223CF62 ldr r0, _0223CF68 ; =0x000005E6 - bl FUN_020054C8 + bl PlaySE mov r0, #0 ldr r1, [r4, #0x30] mvn r0, r0 @@ -10580,4 +10580,3 @@ MOD81_0223D448: ; 0x0223D448 .global MOD81_0223D450 MOD81_0223D450: ; 0x0223D450 .space 0x10 - diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index ce3a33bb..01d50253 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -641,7 +641,7 @@ _0222DA48: mov r0, #3 mov r1, #0x44 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222DB58 ; =0x00000EC8 add r0, r6, #0 mov r2, #0x44 @@ -651,7 +651,7 @@ _0222DA48: add r4, r0, #0 bl memset mov r0, #0x44 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] ldr r0, _0222DB5C ; =0x0222FC0C add r2, sp, #0 @@ -663,7 +663,7 @@ _0222DA48: ldmia r3!, {r0, r1} stmia r2!, {r0, r1} add r0, r7, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r0, #0xb mov r1, #0x20 mov r2, #0x44 @@ -695,7 +695,7 @@ _0222DA48: str r0, [r4, r1] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 add r1, r6, #0 bl MOD82_0222DD04 @@ -887,7 +887,7 @@ MOD82_0222DC50: ; 0x0222DC50 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x44 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -1503,13 +1503,13 @@ MOD82_0222E15C: ; 0x0222E15C str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222E234 ; =0x0222F878 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -1524,7 +1524,7 @@ MOD82_0222E15C: ; 0x0222E15C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -1542,13 +1542,13 @@ MOD82_0222E15C: ; 0x0222E15C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #1 mov r1, #0 bl GX_EngineBToggleLayers add r0, r4, #0 mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _0222E23C ; =0x0222F85C add r3, sp, #0 ldmia r5!, {r0, r1} @@ -1563,7 +1563,7 @@ MOD82_0222E15C: ; 0x0222E15C str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r0, #2 mov r1, #0 bl GX_EngineBToggleLayers @@ -1571,12 +1571,12 @@ MOD82_0222E15C: ; 0x0222E15C mov r1, #0x20 add r2, r0, #0 mov r3, #0x44 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #4 mov r1, #0x20 mov r2, #0 mov r3, #0x44 - bl FUN_02017F18 + bl BG_ClearCharDataRange add sp, #0x70 pop {r3, r4, r5, pc} nop @@ -1591,16 +1591,16 @@ MOD82_0222E240: ; 0x0222E240 push {r4, lr} add r4, r0, #0 mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD82_0222E240 @@ -1711,10 +1711,10 @@ MOD82_0222E264: ; 0x0222E264 bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor mov r0, #4 mov r1, #0 - bl FUN_02017FE4 + bl BG_SetMaskColor add sp, #0x10 pop {r3, r4, r5, pc} thumb_func_end MOD82_0222E264 @@ -1739,7 +1739,7 @@ MOD82_0222E35C: ; 0x0222E35C ldr r0, [r4, #4] add r1, r4, r1 mov r2, #0 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x37 lsl r0, r0, #6 add r0, r4, r0 @@ -1761,7 +1761,7 @@ MOD82_0222E35C: ; 0x0222E35C add r1, r4, r1 mov r2, #0 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xda lsl r0, r0, #4 add r0, r4, r0 @@ -1783,7 +1783,7 @@ MOD82_0222E35C: ; 0x0222E35C add r1, r4, r1 mov r2, #0 mov r3, #0x1a - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xd9 lsl r0, r0, #4 add r0, r4, r0 @@ -1805,7 +1805,7 @@ MOD82_0222E35C: ; 0x0222E35C ldr r0, [r4, #4] add r1, r4, r1 mov r3, #4 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0xdb lsl r0, r0, #4 add r0, r4, r0 @@ -1837,7 +1837,7 @@ MOD82_0222E35C: ; 0x0222E35C add r1, r4, r1 mov r2, #0 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized mov r0, #0x36 lsl r0, r0, #6 add r0, r4, r0 @@ -1857,23 +1857,23 @@ MOD82_0222E474: ; 0x0222E474 mov r0, #0x36 lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xdb lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xd9 lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0xda lsl r0, r0, #4 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x37 lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} thumb_func_end MOD82_0222E474 @@ -2586,7 +2586,7 @@ _0222E9EC: mov r3, #3 bl MOD82_0222F694 ldr r0, _0222EAA0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EA94 _0222EA08: mov r1, #0x80 @@ -2610,7 +2610,7 @@ _0222EA1C: mov r3, #3 bl MOD82_0222F694 ldr r0, _0222EAA0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EA94 _0222EA38: ldr r2, [r2, #0x48] @@ -2643,7 +2643,7 @@ _0222EA68: add r2, r1, #0 bl MOD82_0222F6D8 ldr r0, _0222EAA0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EA94 _0222EA7C: mov r1, #2 @@ -2655,7 +2655,7 @@ _0222EA7C: mov r0, #0x13 str r0, [r4, #0x1c] ldr r0, _0222EAA0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222EA94: mov r0, #3 add sp, #0x1c @@ -3176,7 +3176,7 @@ _0222EE90: mov r3, #2 bl MOD82_0222F694 ldr r0, _0222EF20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EF12 _0222EEAA: mov r1, #0x80 @@ -3199,7 +3199,7 @@ _0222EEBE: mov r3, #2 bl MOD82_0222F694 ldr r0, _0222EF20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EF12 _0222EED8: ldr r2, [r2, #0x48] @@ -3214,7 +3214,7 @@ _0222EED8: mov r2, #0x1e bl MOD82_0222DF6C ldr r0, _0222EF20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222EF12 _0222EEFA: mov r1, #2 @@ -3226,7 +3226,7 @@ _0222EEFA: mov r0, #0x15 str r0, [r4, #0x1c] ldr r0, _0222EF20 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222EF12: mov r0, #3 pop {r4, pc} @@ -3325,7 +3325,7 @@ _0222EFBC: mov r3, #3 bl MOD82_0222F694 ldr r0, _0222F044 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F03C _0222EFD8: mov r1, #0x80 @@ -3349,7 +3349,7 @@ _0222EFEC: mov r3, #3 bl MOD82_0222F694 ldr r0, _0222F044 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F03C _0222F008: ldr r2, [r2, #0x48] @@ -3362,7 +3362,7 @@ _0222F008: mov r0, #0x21 str r0, [r4, #0x1c] ldr r0, _0222F044 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222F03C _0222F024: mov r1, #2 @@ -3374,7 +3374,7 @@ _0222F024: mov r0, #0x1b str r0, [r4, #0x1c] ldr r0, _0222F044 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222F03C: mov r0, #3 pop {r4, pc} @@ -4580,4 +4580,3 @@ MOD82_0222FC03: ; 0x0222FC03 .global MOD82_0222FC0C MOD82_0222FC0C: ; 0x0222FC0C .space 0x14 - diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 09c161b4..d58de0be 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -18,7 +18,7 @@ MOD83_0222D5C4: ; 0x0222D5C4 mov r0, #5 lsl r0, r0, #6 add r0, r5, r0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0222D63C mov r1, #0x4f @@ -77,7 +77,7 @@ _0222D63C: tst r0, r1 beq _0222D662 ldr r0, _0222D678 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #5 lsl r0, r0, #6 add r0, r5, r0 @@ -86,7 +86,7 @@ _0222D63C: mov r0, #5 lsl r0, r0, #6 add r0, r5, r0 - bl FUN_02019178 + bl RemoveWindow _0222D662: add sp, #0x5c mov r0, #1 @@ -354,7 +354,7 @@ _0222D832: bl FUN_0200CB00 ldr r0, [r4] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r1, _0222D99C ; =0x00006B5A ldr r0, _0222D9A0 ; =0x05000042 strh r1, [r0] @@ -428,10 +428,10 @@ _0222D8B2: ldr r3, [r5, #4] bl MOD83_02238A38 ldr r0, [sp, #0x1c] - bl FUN_0201AB14 + bl GetWindowX add r6, r0, #0 ldr r0, [sp, #0x1c] - bl FUN_0201AB18 + bl GetWindowY add r7, r0, #0 ldr r0, [sp, #0x1c] bl GetWindowWidth @@ -446,7 +446,7 @@ _0222D8B2: mov r1, #1 add r2, r6, #0 add r3, r7, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette mov r0, #1 mov r1, #0 bl GX_EngineAToggleLayers @@ -485,7 +485,7 @@ _0222D94A: beq _0222D994 add r1, #0x10 add r0, r4, r1 - bl FUN_02019178 + bl RemoveWindow mov r0, #0x45 mov r1, #0x13 lsl r0, r0, #2 @@ -495,7 +495,7 @@ _0222D94A: ldr r1, [r1, #0x48] str r1, [r4, r0] ldr r0, _0222D9BC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _0222D994 _0222D974: mov r0, #1 @@ -586,7 +586,7 @@ _0222DA18: mov r1, #0 mov r2, #3 asr r3, r3, #0xc - bl FUN_0201AEE4 + bl ScheduleSetBgPosText mov r3, #0x41 lsl r3, r3, #2 ldr r0, [r4] @@ -597,7 +597,7 @@ _0222DA18: add r3, r4, r3 mov r2, #3 asr r3, r3, #0xc - bl FUN_0201AEE4 + bl ScheduleSetBgPosText _0222DA48: pop {r3, r4, r5, pc} nop @@ -626,7 +626,7 @@ _0222DA5C: add r0, sp, #0x18 bl GX_SetBanks add r0, sp, #8 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0 str r1, [sp] mov r3, #0xf @@ -645,7 +645,7 @@ _0222DA5C: mov r0, #0 mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #2 lsl r0, r0, #0xe str r0, [sp] @@ -665,7 +665,7 @@ _0222DA5C: strh r2, [r1] mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange mov r0, #0 str r0, [sp] mov r1, #2 @@ -683,7 +683,7 @@ _0222DA5C: mov r0, #2 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange bl FUN_0201BD5C mov r0, #0 mov r1, #0x20 @@ -822,7 +822,7 @@ MOD83_0222DC10: ; 0x0222DC10 mov r1, #2 add r6, r2, #0 add r7, r3, #0 - bl FUN_0201886C + bl GetBgTilemapBuffer ldr r1, _0222DC5C ; =0x00004380 cmp r7, #2 bne _0222DC2A @@ -849,7 +849,7 @@ _0222DC2A: strh r1, [r0, r2] ldr r0, [r5] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r3, r4, r5, r6, r7, pc} nop _0222DC5C: .word 0x00004380 @@ -863,7 +863,7 @@ MOD83_0222DC60: ; 0x0222DC60 add r4, r1, #0 add r6, r2, #0 mov r1, #2 - bl FUN_0201886C + bl GetBgTilemapBuffer lsl r1, r6, #5 add r3, r4, r1 ldr r1, _0222DC9C ; =0x00004384 @@ -882,7 +882,7 @@ MOD83_0222DC60: ; 0x0222DC60 strh r1, [r0, r2] ldr r0, [r5] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, r5, r6, pc} nop _0222DC9C: .word 0x00004384 @@ -1477,11 +1477,11 @@ _0222E104: beq _0222E188 ldr r0, [sp, #0x2c] mov r1, #3 - bl FUN_0201AB1C + bl MoveWindowX lsl r1, r5, #0x18 ldr r0, [sp, #0x2c] lsr r1, r1, #0x18 - bl FUN_0201AB20 + bl MoveWindowY ldr r2, [sp, #0x54] ldr r3, [sp, #0x58] lsl r2, r2, #0x10 @@ -1583,7 +1583,7 @@ MOD83_0222E1F8: ; 0x0222E1F8 add r5, #0x5c _0222E206: add r0, r5, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0222E294 ldr r0, [sp, #0xc] @@ -1595,10 +1595,10 @@ _0222E206: mov r3, #3 bl FUN_0200CCA4 add r0, r5, #0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x10] add r0, r5, #0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x14] add r0, r5, #0 bl GetWindowWidth @@ -1613,7 +1613,7 @@ _0222E206: ldr r2, [sp, #0x10] ldr r3, [sp, #0x14] mov r1, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette b _0222E294 _0222E256: mov r1, #1 @@ -1622,10 +1622,10 @@ _0222E256: mov r3, #2 bl FUN_0200CCA4 add r0, r5, #0 - bl FUN_0201AB14 + bl GetWindowX str r0, [sp, #0x18] add r0, r5, #0 - bl FUN_0201AB18 + bl GetWindowY str r0, [sp, #0x1c] add r0, r5, #0 bl GetWindowWidth @@ -1640,7 +1640,7 @@ _0222E256: ldr r2, [sp, #0x18] ldr r3, [sp, #0x1c] mov r1, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette _0222E294: add r4, r4, #1 add r5, #0x10 @@ -1648,7 +1648,7 @@ _0222E294: blo _0222E206 ldr r0, [r6] mov r1, #0 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD83_0222E1F8 @@ -1682,7 +1682,7 @@ _0222E2C6: cmp r3, #0 beq _0222E2B8 ldr r0, _0222E2E0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _0222E2DC: str r4, [r5, #0x54] pop {r3, r4, r5, r6, r7, pc} @@ -1699,7 +1699,7 @@ MOD83_0222E2E4: ; 0x0222E2E4 add r1, #0x5c lsl r0, r0, #4 add r0, r1, r0 - bl FUN_0201AB18 + bl GetWindowY sub r0, r0, #1 lsl r4, r0, #3 ldr r0, [r5, #0x54] @@ -1761,11 +1761,11 @@ MOD83_0222E338: ; 0x0222E338 str r0, [sp, #0xc] _0222E362: add r0, r5, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0222E38E add r0, r5, #0 - bl FUN_0201AB18 + bl GetWindowY sub r0, r0, #1 lsl r4, r0, #3 add r0, r5, #0 @@ -1833,9 +1833,9 @@ _0222E3EC: cmp r0, #0 beq _0222E3FE add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _0222E3FE: add r6, r6, #1 add r4, #0x10 @@ -1844,13 +1844,13 @@ _0222E3FE: blo _0222E3EC ldr r0, [r7] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] bl FreeToHeap mov r0, #0 @@ -1895,7 +1895,7 @@ MOD83_0222E464: ; 0x0222E464 bl FUN_0201C30C bl FUN_02009F80 add r0, r4, #0 - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _0222E484 ; =MOD83_027E0000 ldr r1, _0222E488 ; =0x00003FF8 mov r0, #1 @@ -1916,7 +1916,7 @@ MOD83_0222E48C: ; 0x0222E48C mov r0, #3 mov r1, #0x51 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap mov r1, #0x57 add r0, r5, #0 lsl r1, r1, #2 @@ -1928,7 +1928,7 @@ MOD83_0222E48C: ; 0x0222E48C add r4, r0, #0 bl memset mov r0, #0x51 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] mov r0, #0 add r1, r0, #0 @@ -2129,7 +2129,7 @@ _0222E656: tst r0, r1 ldr r0, _0222E7A8 ; =0x000005DC beq _0222E69A - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x54] lsl r0, r0, #2 add r0, r4, r0 @@ -2152,7 +2152,7 @@ _0222E692: bl FUN_02089F24 b _0222E6A8 _0222E69A: - bl FUN_020054C8 + bl PlaySE mov r0, #0 str r0, [r4, #0x58] mov r0, #1 @@ -2372,7 +2372,7 @@ MOD83_0222E850: ; 0x0222E850 add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x51 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0 bl MOD83_02239450 mov r0, #1 @@ -2513,7 +2513,7 @@ _0222E960: add r0, sp, #0x20 bl GX_SetBanks add r0, sp, #0x10 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0 str r1, [sp] mov r3, #0xf @@ -2618,10 +2618,10 @@ _0222E960: ldr r0, [r4, #4] mov r1, #1 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, [r4, #4] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD83_0222EA88 add sp, #0x48 @@ -2683,10 +2683,10 @@ MOD83_0222EA88: ; 0x0222EA88 ldr r0, [r4, #4] mov r1, #4 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, [r4, #4] mov r1, #4 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -2698,7 +2698,7 @@ MOD83_0222EB04: ; 0x0222EB04 sub sp, #0x5c add r4, r0, #0 add r0, #0x18 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _0222EB4E mov r0, #1 @@ -2739,7 +2739,7 @@ _0222EB4E: bl FUN_0200CCF8 add r4, #0x18 add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow add sp, #0x5c mov r0, #0 pop {r3, r4, pc} @@ -2994,40 +2994,40 @@ MOD83_0222ED88: ; 0x0222ED88 bl MOD83_02238E48 add r0, r4, #0 add r0, #0x18 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #1 bne _0222EDD0 add r0, r4, #0 add r0, #0x18 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x28 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x28 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x38 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 add r0, #0x38 - bl FUN_02019178 + bl RemoveWindow _0222EDD0: ldr r0, [r4, #4] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap pop {r4, pc} @@ -3045,7 +3045,7 @@ MOD83_0222EDF8: ; 0x0222EDF8 add r4, r0, #0 mov r0, #0x55 str r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] add r0, r5, #0 bl OverlayManager_GetField18 @@ -3085,7 +3085,7 @@ MOD83_0222EDF8: ; 0x0222EDF8 mov r2, #3 mov r1, #0x5b lsl r2, r2, #8 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222EE88 ; =0x00000496 mov r0, #9 mov r2, #1 @@ -3312,14 +3312,14 @@ MOD83_0222F048: ; 0x0222F048 push {r4, lr} add r4, r0, #0 mov r0, #0x5b - bl FUN_020168D0 + bl DestroyHeap ldr r0, _0222F06C ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _0222F070 ; =MOD63_021DBAB8 bl RegisterMainOverlay add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x55 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} nop @@ -3703,7 +3703,7 @@ _0222F35E: mov r1, #0 str r1, [r4, r0] ldr r0, _0222F5F0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x16 ldr r1, _0222F5E8 ; =0x00000708 lsl r0, r0, #4 @@ -3761,7 +3761,7 @@ _0222F3D6: mov r3, #0x13 bl MOD83_02238A38 ldr r0, _0222F5F0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0222F5E4 ; =0x000034D8 mov r1, #0 str r1, [r4, r0] @@ -4040,7 +4040,7 @@ _0222F62E: ldr r0, [r4, r0] bl FUN_0200DBFC ldr r0, _0222F744 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE ldr r0, _0222F740 ; =0x000034D8 mov r1, #0 str r1, [r4, r0] @@ -4620,21 +4620,21 @@ _0222FA62: _0222FA70: add r0, r7, #0 add r0, #0x18 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r7, #0 add r0, #0x18 - bl FUN_02019178 + bl RemoveWindow add r0, r7, #0 add r0, #0x58 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 beq _0222FA9C add r0, r7, #0 add r0, #0x58 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r7, #0 add r0, #0x58 - bl FUN_02019178 + bl RemoveWindow _0222FA9C: add r5, r7, #0 mov r6, #0 @@ -4645,9 +4645,9 @@ _0222FAA4: cmp r0, #0 beq _0222FAB6 add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _0222FAB6: add r6, r6, #1 add r4, #0x10 @@ -4656,16 +4656,16 @@ _0222FAB6: blt _0222FAA4 ldr r0, [r7] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r7] bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} @@ -4726,7 +4726,7 @@ MOD83_0222FB44: ; 0x0222FB44 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #1 bne _0222FB5A add r0, r5, #0 @@ -4919,7 +4919,7 @@ _0222FCBE: cmp r0, #1 bhi _0222FCD4 ldr r0, _0222FCDC ; =0x0000061B - bl FUN_020054C8 + bl PlaySE ldr r0, _0222FCE0 ; =0x0000298C mov r1, #0 str r1, [r4, r0] @@ -5044,7 +5044,7 @@ _0222FD9C: ldr r0, [r0] add r1, r4, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FDC6: add r0, r4, #0 mov r1, #1 @@ -5132,7 +5132,7 @@ _0222FE3E: ldr r0, [r5] add r1, r4, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FE76: add r0, r4, #0 mov r1, #1 @@ -5186,7 +5186,7 @@ MOD83_0222FEA0: ; 0x0222FEA0 ldr r0, [r4] add r1, r5, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FEE6: add r0, r5, #0 mov r1, #1 @@ -5241,7 +5241,7 @@ MOD83_0222FF10: ; 0x0222FF10 ldr r0, [r4] add r1, r5, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FF56: add r0, r5, #0 mov r1, #1 @@ -5288,7 +5288,7 @@ MOD83_0222FF80: ; 0x0222FF80 ldr r0, [r0] add r1, r4, #0 mov r3, #0x17 - bl FUN_02019064 + bl AddWindowParameterized _0222FFB4: add r0, r4, #0 mov r1, #1 @@ -5512,7 +5512,7 @@ _0223013E: ldr r0, [r5] add r1, r4, #0 mov r3, #0xf - bl FUN_02019064 + bl AddWindowParameterized _02230172: add r0, r4, #0 mov r1, #1 @@ -5620,11 +5620,11 @@ MOD83_0223020C: ; 0x0223020C lsr r1, r1, #0x18 mov r2, ip mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 add r0, r7, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5644,7 +5644,7 @@ MOD83_02230258: ; 0x02230258 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable mov r1, #0 mov r2, #0xf add r0, r4, #0 @@ -5728,10 +5728,10 @@ MOD83_022302B4: ; 0x022302B4 add r0, r4, #0 mov r1, #5 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r4, #0 mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -5788,10 +5788,10 @@ MOD83_02230330: ; 0x02230330 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r4, #0 mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r4, #0 bl MOD83_022302B4 add sp, #0x10 @@ -5951,7 +5951,7 @@ _022304A8: ldr r0, [r7] add r1, r4, #0 mov r3, #8 - bl FUN_02019064 + bl AddWindowParameterized _022304E6: add r0, r4, #0 mov r1, #1 @@ -6104,7 +6104,7 @@ MOD83_02230604: ; 0x02230604 b _02230642 _02230628: ldr r0, _02230660 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r6, #0 beq _0223065E add r0, r7, #0 @@ -6117,7 +6117,7 @@ _02230628: pop {r3, r4, r5, r6, r7, pc} _02230642: ldr r0, _02230660 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0 beq _0223065E ldr r0, _02230664 ; =MOD83_0223B888 @@ -6178,7 +6178,7 @@ MOD83_02230668: ; 0x02230668 strh r1, [r0] add r0, r4, #0 add r0, #0x18 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _022306EC mov r0, #0x13 @@ -6195,7 +6195,7 @@ MOD83_02230668: ; 0x02230668 ldr r0, [r4] add r1, #0x18 mov r3, #2 - bl FUN_02019064 + bl AddWindowParameterized _022306EC: add r1, r4, #0 add r0, r5, #0 @@ -6267,15 +6267,15 @@ _02230768: _02230776: ldr r0, _022307AC ; =0x00002624 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _022307AC ; =0x00002624 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r0, _022307B0 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 mov r1, #0xc4 mov r2, #0 @@ -6309,7 +6309,7 @@ _022307C8: bl GX_EngineAToggleLayers ldr r0, [r5] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0x56 bl ScrStrBufs_new mov r1, #2 @@ -6505,7 +6505,7 @@ MOD83_02230954: ; 0x02230954 mov r0, #3 mov r1, #0x56 lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _022309FC ; =0x00002998 add r0, r5, #0 mov r2, #0x56 @@ -6515,7 +6515,7 @@ MOD83_02230954: ; 0x02230954 add r4, r0, #0 bl memset mov r0, #0x56 - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4] bl GX_DisableEngineALayers bl GX_DisableEngineBLayers @@ -6561,7 +6561,7 @@ _022309D0: mov r0, #0 mov r1, #0x5b lsl r2, r2, #8 - bl FUN_0201681C + bl CreateHeap mov r0, #1 pop {r3, r4, r5, pc} nop @@ -6737,7 +6737,7 @@ _02230B28: _02230B6C: add r0, r4, #0 add r0, #0x58 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _02230B9A mov r0, #2 @@ -6755,7 +6755,7 @@ _02230B6C: ldr r0, [r4] add r1, #0x58 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized _02230B9A: bl MOD83_02239DA0 add r1, r4, #0 @@ -6823,7 +6823,7 @@ _02230C16: mvn r1, r1 bl MOD83_0222FB0C ldr r0, _02230D78 ; =0x00000624 - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r0, r6, #0 add r1, #0x18 @@ -6895,7 +6895,7 @@ _02230CA0: str r0, [r1] add r0, r4, #0 add r0, #0x58 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _02230CFA mov r0, #2 @@ -6913,7 +6913,7 @@ _02230CA0: ldr r0, [r4] add r1, #0x58 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized _02230CFA: add r1, r4, #0 add r2, r4, #0 @@ -7246,7 +7246,7 @@ _02230FCE: bl MOD83_0222F9DC bl FUN_02033ED0 ldr r0, _02231130 ; =0x00000624 - bl FUN_020054C8 + bl PlaySE mov r1, #0 add r0, r4, #0 mvn r1, r1 @@ -7261,7 +7261,7 @@ _02230FCE: b _02231334 _0223100E: ldr r0, _02231134 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r0, r6, #0 add r1, #0x18 @@ -7279,7 +7279,7 @@ _02231030: mov r1, #0 bl MOD83_0222FA0C ldr r0, _02231134 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r0, r6, #0 add r1, #0x18 @@ -7301,7 +7301,7 @@ _02231062: b _02231334 _02231064: ldr r0, _02231134 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 mov r1, #0xc4 mov r2, #0 @@ -7342,7 +7342,7 @@ _02231090: _022310B8: add r0, r4, #0 add r0, #0x58 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #0 bne _022310E6 mov r0, #2 @@ -7360,7 +7360,7 @@ _022310B8: ldr r0, [r4] add r1, #0x58 mov r3, #3 - bl FUN_02019064 + bl AddWindowParameterized _022310E6: add r1, r4, #0 add r2, r4, #0 @@ -7453,7 +7453,7 @@ _02231198: mvn r1, r1 bl MOD83_0222FB0C ldr r0, _02231350 ; =0x00000624 - bl FUN_020054C8 + bl PlaySE add r1, r4, #0 add r0, r6, #0 add r1, #0x18 @@ -7576,7 +7576,7 @@ _022312AA: cmp r0, #0 beq _02231334 ldr r0, _02231358 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 add r0, #0xda ldrb r0, [r0] @@ -7695,11 +7695,11 @@ _0223139A: bl RegisterMainOverlay _022313A6: mov r0, #0x5b - bl FUN_020168D0 + bl DestroyHeap add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x56 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _022313E0 ; =0x000015D4 ldr r0, [r4, r0] cmp r0, #2 @@ -8105,7 +8105,7 @@ MOD83_022316C0: ; 0x022316C0 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #1 bne _022316D6 add r0, r5, #0 @@ -8120,7 +8120,7 @@ MOD83_022316D8: ; 0x022316D8 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - bl FUN_02019048 + bl WindowIsInUse cmp r0, #1 bne _022316EE add r0, r5, #0 @@ -8332,10 +8332,10 @@ MOD83_02231820: ; 0x02231820 add r0, r4, #0 mov r1, #1 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r4, #0 mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -8520,11 +8520,11 @@ MOD83_02231A00: ; 0x02231A00 mov r0, #0xae lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0xae lsl r0, r0, #6 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow pop {r4, pc} .align 2, 0 _02231A40: .word 0x00002B6C @@ -8865,9 +8865,9 @@ _02231CC2: str r2, [r3, #4] ldr r6, [r5, r0] add r0, r7, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r7, #0 - bl FUN_02019178 + bl RemoveWindow add r1, r4, #1 mov r0, #4 sub r0, r0, r1 @@ -8900,7 +8900,7 @@ _02231CC2: ldr r0, [r5, r0] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized add r0, r5, #0 add r1, sp, #0x14 add r2, r4, #1 @@ -9056,9 +9056,9 @@ _02231E2E: cmp r0, #0 beq _02231E50 add r0, r6, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow _02231E50: ldr r0, [sp, #0x1c] add r7, #0x30 @@ -9114,7 +9114,7 @@ _02231E72: ldr r0, [r5, r0] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized _02231EBE: ldr r0, [r4, #0x14] ldr r1, [r4, #0x1c] @@ -9243,7 +9243,7 @@ MOD83_02231F88: ; 0x02231F88 ldr r0, [r5, r0] lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized _02231FD2: ldr r1, [r4, #0x1c] add r0, r6, #0 @@ -9393,7 +9393,7 @@ MOD83_022320D8: ; 0x022320D8 lsr r1, r1, #0x18 add r2, #0xc add r3, r6, #0 - bl FUN_02017DFC + bl BG_LoadScreenTilemapData add r0, r7, #0 bl FreeToHeap add sp, #8 @@ -9509,11 +9509,11 @@ _0223219C: ldr r0, [r5, r0] mov r1, #3 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, _02232204 ; =0x0000299C mov r1, #3 ldr r0, [r5, r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r3, r4, r5, pc} .align 2, 0 @@ -9541,7 +9541,7 @@ MOD83_02232208: ; 0x02232208 b _02232248 _0223222E: ldr r0, _02232274 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r6, #0 beq _0223226C add r0, r7, #0 @@ -9554,7 +9554,7 @@ _0223222E: pop {r3, r4, r5, r6, r7, pc} _02232248: ldr r0, _02232274 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE cmp r4, #0 beq _0223226C cmp r4, #0x1e @@ -9726,7 +9726,7 @@ MOD83_022323A8: ; 0x022323A8 mov r0, #3 mov r1, #0x57 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0223240C ; =0x00003CF4 add r0, r4, #0 mov r2, #0x57 @@ -9736,7 +9736,7 @@ MOD83_022323A8: ; 0x022323A8 add r4, r0, #0 bl memset mov r0, #0x57 - bl FUN_02016B94 + bl BgConfig_Alloc ldr r1, _02232410 ; =0x0000299C str r0, [r4, r1] mov r0, #0x57 @@ -9759,7 +9759,7 @@ MOD83_022323A8: ; 0x022323A8 mov r0, #0 mov r1, #0x5b lsl r2, r2, #8 - bl FUN_0201681C + bl CreateHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -10018,7 +10018,7 @@ MOD83_022325EC: ; 0x022325EC cmp r0, #1 bhi _02232606 ldr r0, _02232608 ; =0x0000061B - bl FUN_020054C8 + bl PlaySE ldr r0, _0223260C ; =0x00003CE8 mov r1, #0 str r1, [r4, r0] @@ -10172,7 +10172,7 @@ _0223270E: cmp r4, #1 bne _02232746 ldr r0, _02232778 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xab bl FUN_02031588 mov r3, #0xa @@ -10197,7 +10197,7 @@ _02232746: cmp r4, #2 bne _0223275A ldr r0, _02232778 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r1, r7, #0 mov r2, #0x13 @@ -10206,7 +10206,7 @@ _0223275A: cmp r4, #3 bne _02232764 ldr r0, _02232778 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _02232764: pop {r3, r4, r5, r6, r7, pc} nop @@ -10406,7 +10406,7 @@ _0223290A: tst r0, r1 beq _02232924 ldr r0, _02232B78 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 mov r1, #0 mov r2, #0x1c @@ -10418,7 +10418,7 @@ _02232924: tst r0, r1 beq _02232934 ldr r0, _02232B78 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #4 str r0, [r5] _02232934: @@ -10430,7 +10430,7 @@ _02232934: _0223293E: mov r0, #6 lsl r0, r0, #8 - bl FUN_020054C8 + bl PlaySE ldr r0, _02232B6C ; =0x00002B60 mov r1, #1 str r6, [r4, r0] @@ -10468,14 +10468,14 @@ _0223297E: tst r0, r1 beq _02232A54 ldr r0, _02232B78 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0xb str r0, [r5] b _02232CF4 _0223299E: mov r0, #6 lsl r0, r0, #8 - bl FUN_020054C8 + bl PlaySE mov r0, #0x10 mov r1, #0 bl GX_EngineAToggleLayers @@ -10520,7 +10520,7 @@ _022329FA: tst r1, r0 beq _02232A54 lsl r0, r0, #9 - bl FUN_020054C8 + bl PlaySE mov r1, #1 add r0, r4, #0 lsl r2, r1, #0xc @@ -10584,10 +10584,10 @@ _02232A88: bl MOD83_022316D8 ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow mov r0, #3 str r0, [r5] b _02232CF4 @@ -10626,10 +10626,10 @@ _02232AE2: bl MOD83_022316D8 ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _02232B7C ; =0x00002B70 add r0, r4, r0 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 mov r1, #0 mov r2, #3 @@ -11312,9 +11312,9 @@ _022330B6: cmp r0, #0 beq _022330CA add r0, r5, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r5, #0 - bl FUN_02019178 + bl RemoveWindow _022330CA: add r6, r6, #1 add r4, #0x10 @@ -11326,10 +11326,10 @@ _022330CA: cmp r1, #0 beq _022330EA add r0, r7, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram ldr r0, _02233158 ; =0x00002B70 add r0, r7, r0 - bl FUN_02019178 + bl RemoveWindow _022330EA: mov r0, #0xae lsl r0, r0, #6 @@ -11337,28 +11337,28 @@ _022330EA: cmp r1, #0 beq _02233104 add r0, r7, r0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram mov r0, #0xae lsl r0, r0, #6 add r0, r7, r0 - bl FUN_02019178 + bl RemoveWindow _02233104: ldr r0, _0223315C ; =0x0000299C mov r1, #0 ldr r0, [r7, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C mov r1, #1 ldr r0, [r7, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C mov r1, #2 ldr r0, [r7, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C mov r1, #3 ldr r0, [r7, r0] - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, _0223315C ; =0x0000299C ldr r0, [r7, r0] bl FreeToHeap @@ -11366,11 +11366,11 @@ _02233104: ldr r1, _02233164 ; =MOD83_0223A434 bl RegisterMainOverlay mov r0, #0x5b - bl FUN_020168D0 + bl DestroyHeap ldr r0, [sp] bl OverlayManager_FreeData mov r0, #0x57 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop @@ -11453,7 +11453,7 @@ MOD83_022331E0: ; 0x022331E0 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _022332A4 ; =MOD83_0223A480 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -11468,10 +11468,10 @@ MOD83_022331E0: ; 0x022331E0 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022332A8 ; =MOD83_0223A4B8 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -11486,10 +11486,10 @@ MOD83_022331E0: ; 0x022331E0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022332AC ; =MOD83_0223A49C add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -11504,10 +11504,10 @@ MOD83_022331E0: ; 0x022331E0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _022332B0 ; =MOD83_0223A464 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -11522,10 +11522,10 @@ MOD83_022331E0: ; 0x022331E0 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x80 pop {r3, r4, r5, pc} nop @@ -15353,11 +15353,11 @@ MOD83_02234E40: ; 0x02234E40 add r0, r4, #0 bl FUN_0202BF90 mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask ldr r0, [r5, #0x10] bl FUN_02022720 mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask pop {r3, r4, r5, pc} thumb_func_end MOD83_02234E40 @@ -15502,7 +15502,7 @@ _02234F3C: ldr r0, [r0, #0x20] lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02019064 + bl AddWindowParameterized _02234F7A: mov r0, #2 tst r0, r4 @@ -17117,7 +17117,7 @@ MOD83_02235BF4: ; 0x02235BF4 ldr r0, [r5, #0x20] add r6, r1, #0 mov r1, #2 - bl FUN_0201886C + bl GetBgTilemapBuffer add r4, r0, #0 cmp r6, #0 beq _02235C18 @@ -17155,7 +17155,7 @@ _02235C2E: blt _02235C1E ldr r0, [r5, #0x20] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD83_02235BF4 @@ -17427,7 +17427,7 @@ MOD83_02235E68: ; 0x02235E68 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _02235F2C ; =MOD83_0223A52C add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -17442,10 +17442,10 @@ MOD83_02235E68: ; 0x02235E68 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02235F30 ; =MOD83_0223A548 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -17460,10 +17460,10 @@ MOD83_02235E68: ; 0x02235E68 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02235F34 ; =MOD83_0223A564 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -17478,10 +17478,10 @@ MOD83_02235E68: ; 0x02235E68 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _02235F38 ; =MOD83_0223A580 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -17496,10 +17496,10 @@ MOD83_02235E68: ; 0x02235E68 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x80 pop {r3, r4, r5, pc} nop @@ -17601,10 +17601,10 @@ MOD83_02235FBC: ; 0x02235FBC mov r1, #2 str r0, [sp, #8] ldr r0, [r4, #0x20] - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, [r4, #0x20] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add sp, #0x10 pop {r4, pc} .align 2, 0 @@ -17859,10 +17859,10 @@ _02236148: mov r1, #2 str r0, [sp, #8] ldr r0, [r6, #0x20] - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, [r6, #0x20] mov r1, #2 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #2 mov r1, #0 bl GX_EngineAToggleLayers @@ -17921,9 +17921,9 @@ MOD83_02236298: ; 0x02236298 mov r1, #0 bl FUN_0200D0E0 add r0, r4, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r4, #0 - bl FUN_02019178 + bl RemoveWindow _022362B4: pop {r4, pc} .align 2, 0 @@ -18097,16 +18097,16 @@ _022363E2: bl GX_SwapDisplay ldr r0, [r6, #0x20] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r6, #0x20] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r6, #0x20] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r6, #0x20] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r3, r4, r5, r6, r7, pc} nop _0223643C: .word 0x00000478 @@ -18219,7 +18219,7 @@ _02236520: bl FUN_0201C30C bl FUN_02009F80 ldr r0, [r4, #0x20] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates ldr r3, _02236540 ; =MOD83_027E0000 ldr r1, _02236544 ; =0x00003FF8 mov r0, #1 @@ -18459,7 +18459,7 @@ MOD83_022366D0: ; 0x022366D0 mvn r0, r0 str r0, [r5, #8] ldr r0, _02236754 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236750 _02236712: cmp r4, #0 @@ -18488,7 +18488,7 @@ _02236740: mov r0, #0 bl FUN_02002BB8 ldr r0, _02236754 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r3, r4, r5, pc} _02236750: @@ -18509,7 +18509,7 @@ MOD83_02236764: ; 0x02236764 mov r0, #3 mov r1, #0x4e lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap ldr r1, _022367F0 ; =0x00012608 add r0, r5, #0 mov r2, #0x4e @@ -18519,7 +18519,7 @@ MOD83_02236764: ; 0x02236764 add r4, r0, #0 bl memset mov r0, #0x4e - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #0x20] mov r0, #0x4e bl FUN_02014590 @@ -19023,7 +19023,7 @@ _02236BAC: add r0, r4, #0 bl MOD83_022354F0 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236D90 _02236BBC: ldr r0, _02236DA0 ; =0x0000E884 @@ -19039,7 +19039,7 @@ _02236BCE: add r0, r4, #0 bl MOD83_022354F0 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236D90 _02236BDC: add r0, r4, #0 @@ -19048,7 +19048,7 @@ _02236BDC: add r3, r5, #0 bl MOD83_02235E34 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236D90 _02236BF0: add r0, r4, #0 @@ -19127,7 +19127,7 @@ _02236C76: add r0, r4, #0 bl MOD83_02236450 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x13 str r0, [r5] b _02236D90 @@ -19168,7 +19168,7 @@ _02236CAE: mov r0, #0x15 str r0, [r5] mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask b _02236D90 _02236CF0: ldr r0, _02236DB0 ; =0x0000E88C @@ -19196,7 +19196,7 @@ _02236D12: ldr r0, [r4, r0] bl FUN_0200DBFC ldr r0, _02236DC0 ; =0x0000061B - bl FUN_020054C8 + bl PlaySE cmp r6, #0xb bne _02236D34 .ifdef DIAMOND @@ -19219,7 +19219,7 @@ _02236D36: mov r0, #0x16 str r0, [r5] mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask b _02236D90 _02236D54: ldr r0, _02236DC8 ; =gMain + 0x40 @@ -19237,7 +19237,7 @@ _02236D64: add r3, r5, #0 bl MOD83_02235E34 ldr r0, _02236DA4 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE b _02236D90 _02236D78: bl FUN_0200E308 @@ -19287,7 +19287,7 @@ MOD83_02236DD0: ; 0x02236DD0 add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x4e - bl FUN_020168D0 + bl DestroyHeap mov r0, #0 bl MOD83_02239450 mov r0, #1 @@ -22827,7 +22827,7 @@ MOD83_022387A0: ; 0x022387A0 add r6, r1, #0 mov r0, #3 add r2, r3, #0 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 @@ -22910,11 +22910,11 @@ _02238832: add r0, r7, #0 lsr r1, r1, #0x18 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate lsl r1, r4, #0x18 add r0, r7, #0 lsr r1, r1, #0x18 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -23214,7 +23214,7 @@ MOD83_02238A38: ; 0x02238A38 ldr r2, [r4, #0x2c] lsl r2, r2, #0x18 lsr r2, r2, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r1, [sp, #0x28] add r0, r4, #0 bl MOD83_0223894C @@ -23228,7 +23228,7 @@ _02238A8A: add r0, r1, #0 lsl r1, r6, #0x18 lsr r1, r1, #0x18 - bl FUN_0201AB1C + bl MoveWindowX _02238A9C: mov r0, #0 mvn r0, r0 @@ -23237,7 +23237,7 @@ _02238A9C: lsl r1, r5, #0x18 ldr r0, [r4, #0x10] lsr r1, r1, #0x18 - bl FUN_0201AB20 + bl MoveWindowY _02238AAE: ldr r1, [sp, #0x28] add r0, r4, #0 @@ -24230,7 +24230,7 @@ MOD83_022391EC: ; 0x022391EC mov r1, #5 add r2, #0xc lsl r3, r3, #8 - bl FUN_02017DFC + bl BG_LoadScreenTilemapData ldr r0, [sp, #0x10] bl FreeToHeap mov r0, #0x20 @@ -24245,10 +24245,10 @@ MOD83_022391EC: ; 0x022391EC add r0, r5, #0 mov r1, #5 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r5, #0 mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram ldr r1, _022392E0 ; =MOD83_022391CC ldr r0, _022392E4 ; =MOD83_0223CAB0 cmp r4, #0xb @@ -24459,7 +24459,7 @@ MOD83_02239414: ; 0x02239414 pop {r3, pc} _0223941E: ldr r0, _02239428 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE pop {r3, pc} nop _02239428: .word 0x000005DC @@ -24577,7 +24577,7 @@ _022394E4: ; jump table .short _02239538 - _022394E4 - 2 ; case 4 _022394EE: mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask ldr r0, [r4, #0x14] mov r1, #2 bl FUN_02022840 @@ -24610,7 +24610,7 @@ _02239528: cmp r0, #1 bhi _02239534 mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask _02239534: add r0, r5, #0 pop {r3, r4, r5, pc} @@ -24645,7 +24645,7 @@ MOD83_0223955C: ; 0x0223955C ldr r0, [r0, #0x14] bl FUN_0202287C mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask pop {r3, pc} nop _02239570: .word MOD83_0223BC30 @@ -27529,4 +27529,3 @@ MOD83_0223CADC: ; 0x0223CADC .global MOD83_0223CAEC MOD83_0223CAEC: ; 0x0223CAEC .space 0x6F4 - diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index a5838988..ea18857a 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -25,7 +25,7 @@ _021D74FC: mov r0, #3 mov r1, #0x4b lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7670 ; =0x00001244 add r0, r6, #0 mov r2, #0x4b @@ -269,7 +269,7 @@ _021D772E: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0x4b - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} _021D773E: @@ -562,7 +562,7 @@ MOD84_021D7968: ; 0x021D7968 sub sp, #0xc add r4, r0, #0 mov r0, #0x4b - bl FUN_02016B94 + bl BgConfig_Alloc str r0, [r4, #4] ldr r0, _021D7A60 ; =0x021DA68C bl GX_SetBanks @@ -576,17 +576,17 @@ MOD84_021D7968: ; 0x021D7968 add r2, r0, #0 bl GX_SetGraphicsMode ldr r0, _021D7A6C ; =0x021DA650 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r0, [r4, #4] ldr r2, _021D7A70 ; =0x021DA670 mov r1, #1 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D7A70 ; =0x021DA670 mov r1, #5 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -692,10 +692,10 @@ MOD84_021D7A84: ; 0x021D7A84 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] bl FreeToHeap pop {r4, pc} @@ -934,7 +934,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 add r0, #0x6c mov r1, #0x4b mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator ldr r0, [r4, #4] mov r1, #0 bl NNS_G3dGetAnmByIdx diff --git a/arm9/modules/84/asm/module_84_thumb2.s b/arm9/modules/84/asm/module_84_thumb2.s index 17f9316e..d97e5a59 100644 --- a/arm9/modules/84/asm/module_84_thumb2.s +++ b/arm9/modules/84/asm/module_84_thumb2.s @@ -32,12 +32,12 @@ _021D817A: mov r1, #2 lsl r0, r0, #24 lsr r0, r0, #24 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r5, #20] mov r1, #3 lsl r0, r0, #24 lsr r0, r0, #24 - bl FUN_020178BC + bl SetBgPriority ldr r0, [r5, #16] add r0, r0, #1 str r0, [r5, #16] @@ -574,12 +574,12 @@ MOD84_021D84F8: ; 0x021D84F8 ldr r1, [r4, #0x24] add r0, r6, #0 lsr r2, r2, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, [r4, #0x24] mov r1, #0 bl FillWindowPixelBuffer ldr r0, [r4, #0x24] - bl FUN_02019270 + bl PutWindowTilemap ldr r0, [r4, #0x24] bl CopyWindowToVram mov r0, #0x4b @@ -600,7 +600,7 @@ MOD84_021D84F8: ; 0x021D84F8 ldr r1, [r4, #0x28] add r0, r6, #0 lsr r2, r2, #0x18 - bl FUN_02019064 + bl AddWindowParameterized ldr r0, _021D85B4 ; =MOD84_021D8784 add r1, r4, #0 mov r2, #0 @@ -626,9 +626,9 @@ _021D85C6: ldr r0, [r4, #0x30] bl String_dtor ldr r0, [r4, #0x24] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x28] - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x24] bl FreeToHeap ldr r0, [r4, #0x28] @@ -850,7 +850,7 @@ MOD84_021D8784: ; 0x021D8784 cmp r0, #0 beq _021D8798 ldr r0, [r4, #0x24] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode mov r0, #0 str r0, [r4, #0x18] _021D8798: @@ -862,7 +862,7 @@ _021D8798: lsr r1, r1, #0x18 mov r2, #3 lsr r3, r3, #0x18 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D8784 @@ -913,7 +913,7 @@ _021D87D0: ldr r2, [r5, #0x30] bl AddTextPrinterParameterized3 ldr r0, [r5, #0x24] - bl FUN_02019548 + bl CopyWindowPixelsToVram_TextMode add sp, #0x18 pop {r3, r4, r5, pc} .align 2, 0 @@ -1041,12 +1041,12 @@ MOD84_021D88DC: ; 0x021D88DC mov r1, #2 mov r2, #0 add r3, r6, r7 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r5, #4] mov r1, #6 mov r2, #0 add r3, r6, r7 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4] cmp r0, #0 beq _021D8914 @@ -1115,12 +1115,12 @@ _021D897C: ldr r2, _021D8A6C ; =0x021DAC70 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _021D8A6C ; =0x021DAC70 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1238,10 +1238,10 @@ MOD84_021D8A74: ; 0x021D8A74 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D8A74 @@ -1399,12 +1399,12 @@ _021D8B92: ldr r2, _021D8C38 ; =0x021DAC8C mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _021D8C38 ; =0x021DAC8C mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1486,10 +1486,10 @@ MOD84_021D8C3C: ; 0x021D8C3C add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D8C3C @@ -1739,12 +1739,12 @@ _021D8E26: ldr r2, _021D903C ; =0x021DACB8 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D903C ; =0x021DACB8 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [sp, #0x14] ldr r0, [r0] add r1, r0, #1 @@ -2052,10 +2052,10 @@ _021D90A2: _021D90AC: ldr r0, [r6, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r6, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [sp] bl OS_RestoreInterrupts pop {r3, r4, r5, r6, r7, pc} @@ -2558,12 +2558,12 @@ _021D949A: ldr r2, _021D9540 ; =0x021DACD4 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _021D9540 ; =0x021DACD4 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -2645,10 +2645,10 @@ MOD84_021D9544: ; 0x021D9544 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D9544 @@ -2730,22 +2730,22 @@ MOD84_021D95CC: ; 0x021D95CC mov r1, #2 mov r2, #0 add r3, r6, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] mov r1, #6 mov r2, #0 add r3, r6, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] mov r1, #3 mov r2, #0 add r3, r6, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #4] mov r1, #7 mov r2, #0 add r3, r6, #0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit ldr r0, [r4, #0x50] cmp r0, #0 beq _021D9632 @@ -3018,22 +3018,22 @@ _021D9832: ldr r2, _021D99FC ; =0x021DACF0 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D9A00 ; =0x021DAD0C mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D99FC ; =0x021DACF0 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021D9A00 ; =0x021DAD0C mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -3264,16 +3264,16 @@ _021D9A26: _021D9A30: ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D9A04 @@ -3431,12 +3431,12 @@ _021D9B5A: ldr r2, _021D9C00 ; =0x021DAD28 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5, #4] ldr r2, _021D9C00 ; =0x021DAD28 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -3518,10 +3518,10 @@ MOD84_021D9C04: ; 0x021D9C04 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} .align 2, 0 thumb_func_end MOD84_021D9C04 @@ -4105,22 +4105,22 @@ _021DA0AA: ldr r2, _021DA30C ; =0x021DAD68 mov r1, #2 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021DA310 ; =0x021DAD4C mov r1, #3 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021DA30C ; =0x021DAD68 mov r1, #6 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #4] ldr r2, _021DA310 ; =0x021DAD4C mov r1, #7 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -4437,16 +4437,16 @@ _021DA35C: _021DA366: ldr r0, [r4, #4] mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #6 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #4] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer pop {r4, pc} thumb_func_end MOD84_021DA31C diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 221d2f9d..042746c2 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -18,7 +18,7 @@ MOD85_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x4f lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #8 mov r2, #0x4f @@ -193,7 +193,7 @@ MOD85_021D7644: ; 0x021D7644 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x4f - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 @@ -263,7 +263,7 @@ MOD85_021D76FC: ; 0x021D76FC push {r3, r4, r5, r6, r7, lr} add r4, r0, #0 mov r0, #0x4f - bl FUN_02016B94 + bl BgConfig_Alloc ldr r1, _021D77CC ; =0x0000043C str r0, [r4, r1] bl MOD85_021D77F8 @@ -408,7 +408,7 @@ MOD85_021D7818: ; 0x021D7818 ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D78F4 ; =0x021DED28 add r3, sp, #0x54 ldmia r5!, {r0, r1} @@ -423,15 +423,15 @@ MOD85_021D7818: ; 0x021D7818 str r0, [r3] add r0, r4, #0 add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 mov r1, #0x20 add r2, r0, #0 mov r3, #0x4f - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r5, _021D78F8 ; =0x021DED44 add r3, sp, #0x38 ldmia r5!, {r0, r1} @@ -446,10 +446,10 @@ MOD85_021D7818: ; 0x021D7818 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D78FC ; =0x021DED60 add r3, sp, #0x1c ldmia r5!, {r0, r1} @@ -464,10 +464,10 @@ MOD85_021D7818: ; 0x021D7818 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #2 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit ldr r5, _021D7900 ; =0x021DED0C add r3, sp, #0 ldmia r5!, {r0, r1} @@ -482,10 +482,10 @@ MOD85_021D7818: ; 0x021D7818 str r0, [r3] add r0, r4, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate add r0, r4, #0 mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit add sp, #0x80 pop {r3, r4, r5, pc} .align 2, 0 @@ -502,16 +502,16 @@ MOD85_021D7904: ; 0x021D7904 push {r4, lr} add r4, r0, #0 mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #2 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer add r0, r4, #0 bl FreeToHeap pop {r4, pc} @@ -578,7 +578,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, [r1, #0xc] lsl r2, r2, #4 mov r3, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r5, #0 bl FreeToHeap mov r1, #0 @@ -598,7 +598,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] ldr r3, [r3, #0x10] mov r1, #1 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -619,11 +619,11 @@ MOD85_021D797C: ; 0x021D797C ldr r3, [r3, #8] mov r1, #1 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData ldr r0, _021D7B24 ; =0x0000043C mov r1, #1 ldr r0, [r4, r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -643,7 +643,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] ldr r3, [r3, #0x10] mov r1, #2 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -664,11 +664,11 @@ MOD85_021D797C: ; 0x021D797C ldr r3, [r3, #8] mov r1, #2 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData ldr r0, _021D7B24 ; =0x0000043C mov r1, #2 ldr r0, [r4, r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -686,7 +686,7 @@ MOD85_021D797C: ; 0x021D797C ldr r1, [r1, #0xc] lsl r2, r2, #4 mov r3, #0 - bl FUN_02017FB4 + bl BG_LoadPlttData add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -706,7 +706,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] ldr r3, [r3, #0x10] mov r1, #7 - bl FUN_02017E14 + bl BG_LoadCharTilesData add r0, r5, #0 bl FreeToHeap add r0, r4, #0 @@ -727,11 +727,11 @@ MOD85_021D797C: ; 0x021D797C ldr r3, [r3, #8] mov r1, #7 add r2, #0xc - bl FUN_02017DFC + bl BG_LoadScreenTilemapData ldr r0, _021D7B24 ; =0x0000043C mov r1, #7 ldr r0, [r4, r0] - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram add r0, r5, #0 bl FreeToHeap pop {r3, r4, r5, pc} @@ -790,7 +790,7 @@ MOD85_021D7B28: ; 0x021D7B28 ldr r0, [r5, r0] ldr r2, _021D7BB4 ; =0x021DECE4 add r1, #8 - bl FUN_02019150 + bl AddWindow mov r0, #1 lsl r0, r0, #8 mov r1, #0x4f @@ -815,9 +815,9 @@ MOD85_021D7BB8: ; 0x021D7BB8 add r6, r4, #0 add r6, #8 add r0, r6, #0 - bl FUN_02019570 + bl ClearWindowTilemapAndCopyToVram add r0, r6, #0 - bl FUN_02019178 + bl RemoveWindow ldr r0, _021D7BE8 ; =0x00000408 ldr r0, [r5, r0] bl DestroyMsgData @@ -865,7 +865,7 @@ MOD85_021D7BEC: ; 0x021D7BEC bl AddTextPrinterParameterized add r4, #8 add r0, r4, #0 - bl FUN_02019220 + bl ScheduleWindowCopyToVram add sp, #0xc pop {r3, r4, r5, r6, pc} nop @@ -887,7 +887,7 @@ MOD85_021D7C44: ; 0x021D7C44 bl FillWindowPixelBuffer add r0, r5, r4 add r0, #8 - bl FUN_02019220 + bl ScheduleWindowCopyToVram pop {r3, r4, r5, pc} .align 2, 0 _021D7C68: .word 0x00000408 @@ -1462,7 +1462,7 @@ MOD85_021D80DC: ; 0x021D80DC bl FUN_02009F80 ldr r0, _021D80F4 ; =0x0000043C ldr r0, [r4, r0] - bl FUN_0201AB60 + bl DoScheduledBgGpuUpdates pop {r4, pc} nop _021D80F4: .word 0x0000043C @@ -1727,7 +1727,7 @@ _021D82BC: mov r0, #2 str r0, [r4] ldr r0, _021D82F8 ; =0x000005ED - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD85_021DB9A0 add r0, r4, #0 @@ -1861,7 +1861,7 @@ _021D8398: mov r0, #4 str r0, [r4] ldr r0, _021D83F8 ; =0x000005EE - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, pc} nop @@ -1920,7 +1920,7 @@ _021D844A: mov r1, #0 bl MOD85_021D9350 ldr r0, _021D8510 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE b _021D84EA _021D8462: add r0, r4, #0 @@ -1951,7 +1951,7 @@ _021D848E: mov r1, #1 bl MOD85_021D9350 ldr r0, _021D8510 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE b _021D84EA _021D84A6: add r0, r4, #0 @@ -1983,7 +1983,7 @@ _021D84D4: mov r1, #2 bl MOD85_021D9350 ldr r0, _021D8510 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE _021D84EA: ldr r0, [r4, #0x7c] cmp r0, #2 @@ -2587,7 +2587,7 @@ _021D8914: mov r0, #0x1b str r0, [r4] ldr r0, _021D8950 ; =0x000005ED - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD85_021DB9A0 add r0, r4, #0 @@ -2703,7 +2703,7 @@ _021D89C4: mov r0, #0x1d str r0, [r4] ldr r0, _021D8A2C ; =0x000005EE - bl FUN_020054C8 + bl PlaySE mov r0, #1 pop {r4, pc} nop @@ -2762,7 +2762,7 @@ _021D8A7E: mov r1, #0 bl MOD85_021D9350 ldr r0, _021D8B44 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE b _021D8B1E _021D8A96: add r0, r4, #0 @@ -2793,7 +2793,7 @@ _021D8AC2: mov r1, #1 bl MOD85_021D9350 ldr r0, _021D8B44 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE b _021D8B1E _021D8ADA: add r0, r4, #0 @@ -2825,7 +2825,7 @@ _021D8B08: mov r1, #2 bl MOD85_021D9350 ldr r0, _021D8B44 ; =0x00000626 - bl FUN_020054C8 + bl PlaySE _021D8B1E: ldr r0, [r4, #0x7c] cmp r0, #2 @@ -3262,7 +3262,7 @@ _021D8E3C: mov r0, #0x2d str r0, [r4] ldr r0, _021D8E60 ; =0x000005ED - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl MOD85_021DB9A0 add r0, r4, #0 @@ -3364,7 +3364,7 @@ MOD85_021D8E98: ; 0x021D8E98 mov r0, #0x2f str r0, [r4] ldr r0, _021D8F80 ; =0x000005EE - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0x24] cmp r0, #0 bne _021D8F4C @@ -3477,7 +3477,7 @@ _021D8FE0: mov r1, #0 bl MOD85_021D9350 ldr r0, _021D90AC ; =0x000005F5 - bl FUN_020054C8 + bl PlaySE b _021D9084 _021D8FF8: add r0, r4, #0 @@ -3509,7 +3509,7 @@ _021D9026: mov r1, #1 bl MOD85_021D9350 ldr r0, _021D90AC ; =0x000005F5 - bl FUN_020054C8 + bl PlaySE b _021D9084 _021D903E: add r0, r4, #0 @@ -3542,7 +3542,7 @@ _021D906E: mov r1, #2 bl MOD85_021D9350 ldr r0, _021D90AC ; =0x000005F5 - bl FUN_020054C8 + bl PlaySE _021D9084: ldr r0, [r4, #0x7c] cmp r0, #2 @@ -7597,7 +7597,7 @@ _021DADC0: bne _021DAE20 _021DADD2: ldr r0, _021DAE60 ; =0x0000062D - bl FUN_020054C8 + bl PlaySE ldr r1, [r4, #0x60] ldr r0, [r4, #0x64] add r1, r1, r0 @@ -7662,7 +7662,7 @@ _021DAE2E: str r0, [r4, #0x60] _021DAE4C: ldr r0, _021DAE60 ; =0x0000062D - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #8] cmp r0, #1 bne _021DAE5E @@ -8830,7 +8830,7 @@ MOD85_021DB69C: ; 0x021DB69C lsr r0, r0, #0x18 mov r2, #0x20 lsr r3, r3, #0x10 - bl FUN_02017FB4 + bl BG_LoadPlttData pop {r4, pc} .align 2, 0 thumb_func_end MOD85_021DB69C @@ -9517,7 +9517,7 @@ MOD85_021DBB54: ; 0x021DBB54 bl FUN_0200CA44 mov r0, #0x5f lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} .align 2, 0 _021DBB84: .word MOD85_021DBC48 @@ -10243,11 +10243,11 @@ MOD85_021DC050: ; 0x021DC050 mov r1, #1 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, _021DC090 ; =0x0000043C mov r1, #1 ldr r0, [r4, r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -10278,11 +10278,11 @@ MOD85_021DC094: ; 0x021DC094 mov r1, #1 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, _021DC0D4 ; =0x0000043C mov r1, #1 ldr r0, [r4, r0] - bl FUN_0201AC68 + bl ScheduleBgTilemapBufferTransfer add sp, #0xc pop {r4, r5, pc} .align 2, 0 @@ -11027,7 +11027,7 @@ MOD85_021DC5E0: ; 0x021DC5E0 mov r1, #0 bl FUN_02020208 ldr r0, _021DC644 ; =0x00000624 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -11126,7 +11126,7 @@ MOD85_021DC6CC: ; 0x021DC6CC bl FUN_020200BC mov r0, #0x6d lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #4] add r0, r0, #1 str r0, [r4, #4] @@ -12483,7 +12483,7 @@ MOD85_021DD0F0: ; 0x021DD0F0 mov r1, #0 bl FUN_020200BC ldr r0, _021DD154 ; =0x000006D1 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #8] add r0, r0, #1 str r0, [r4, #8] diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 2bd7d12a..17607453 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -11,7 +11,7 @@ MOD86_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x54 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #0x44 mov r2, #0x54 @@ -57,7 +57,7 @@ MOD86_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD86_021D76EC add r0, r4, #0 @@ -106,22 +106,22 @@ _021D75B8: bl MOD86_021D7B80 add r0, r6, #0 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #4 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #1 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #1 str r0, [sp] @@ -233,7 +233,7 @@ MOD86_021D76B0: ; 0x021D76B0 add r0, r5, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 @@ -245,7 +245,7 @@ MOD86_021D76E0: ; 0x021D76E0 ldr r0, [r0, #0x10] bx r3 nop -_021D76E8: .word FUN_0201AB60 +_021D76E8: .word DoScheduledBgGpuUpdates thumb_func_end MOD86_021D76E0 thumb_func_start MOD86_021D76EC @@ -264,7 +264,7 @@ _021D76F8: add r0, sp, #0x2c bl GX_SetBanks ldr r0, [r4] - bl FUN_02016B94 + bl BgConfig_Alloc add r3, sp, #0x1c ldr r5, _021D7850 ; =0x021D7C90 str r0, [r4, #0x10] @@ -274,7 +274,7 @@ _021D76F8: ldmia r5!, {r0, r1} stmia r3!, {r0, r1} add r0, r2, #0 - bl FUN_02016BBC + bl SetBothScreensModesAndDisable ldr r5, _021D7854 ; =0x021D7CA0 add r3, sp, #0 ldmia r5!, {r0, r1} @@ -297,10 +297,10 @@ _021D76F8: strb r3, [r0, #0x10] ldr r0, [r4, #0x10] add r3, r1, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #0 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #2 add r0, sp, #0 strb r2, [r0, #0x12] @@ -312,10 +312,10 @@ _021D76F8: mov r1, #1 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #4 add r0, sp, #0 strb r1, [r0, #0x12] @@ -328,10 +328,10 @@ _021D76F8: mov r1, #3 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #3 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #4 mov r3, #0 add r0, sp, #0 @@ -343,10 +343,10 @@ _021D76F8: strb r2, [r0, #0x10] ldr r0, [r4, #0x10] add r2, sp, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #4 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r2, #2 add r0, sp, #0 strb r2, [r0, #0x12] @@ -358,10 +358,10 @@ _021D76F8: mov r1, #5 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #5 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r1, #4 add r0, sp, #0 strb r1, [r0, #0x12] @@ -374,34 +374,34 @@ _021D76F8: mov r1, #7 add r2, sp, #0 mov r3, #0 - bl FUN_02016C18 + bl InitBgFromTemplate ldr r0, [r4, #0x10] mov r1, #7 - bl FUN_02018744 + bl BgClearTilemapBufferAndCommit mov r0, #0 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer add sp, #0x54 pop {r4, r5, pc} .align 2, 0 @@ -416,46 +416,46 @@ MOD86_021D7858: ; 0x021D7858 add r4, r0, #0 mov r0, #0 add r1, r0, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #1 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #2 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #3 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #4 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #5 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #6 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer mov r0, #7 mov r1, #0 - bl FUN_0201797C + bl ToggleBgLayer ldr r0, [r4, #0x10] mov r1, #0 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #1 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #3 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #4 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #5 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] mov r1, #7 - bl FUN_020178A0 + bl FreeBgTilemapBuffer ldr r0, [r4, #0x10] bl FreeToHeap pop {r4, pc} @@ -493,7 +493,7 @@ MOD86_021D78D4: ; 0x021D78D4 ldr r0, [r4, #0x10] add r1, #0x14 add r2, sp, #8 - bl FUN_02019150 + bl AddWindow mov r1, #0 mov r0, #1 lsl r0, r0, #8 @@ -512,7 +512,7 @@ MOD86_021D78D4: ; 0x021D78D4 ldr r0, [r4, #0x10] add r1, #0x24 add r2, sp, #8 - bl FUN_02019150 + bl AddWindow mov r1, #0 mov r0, #1 lsl r0, r0, #8 @@ -535,10 +535,10 @@ MOD86_021D7964: ; 0x021D7964 push {r4, lr} add r4, r0, #0 add r0, #0x24 - bl FUN_02019178 + bl RemoveWindow add r0, r4, #0 add r0, #0x14 - bl FUN_02019178 + bl RemoveWindow ldr r0, [r4, #0x38] bl ScrStrBufs_delete ldr r0, [r4, #0x34] @@ -565,27 +565,27 @@ MOD86_021D7990: ; 0x021D7990 ldr r0, [r4, #0x10] mov r1, #1 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x3c ldrsh r3, [r4, r3] ldr r0, [r4, #0x10] mov r1, #5 mov r2, #3 add r3, #0xc0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x3c ldrsh r3, [r4, r3] ldr r0, [r4, #0x10] mov r1, #0 mov r2, #3 - bl FUN_020179E0 + bl BgSetPosTextAndCommit mov r3, #0x3c ldrsh r3, [r4, r3] ldr r0, [r4, #0x10] mov r1, #4 mov r2, #3 add r3, #0xc0 - bl FUN_020179E0 + bl BgSetPosTextAndCommit pop {r4, pc} .align 2, 0 thumb_func_end MOD86_021D7990 @@ -701,10 +701,10 @@ _021D7A06: mov r2, #0 ldr r0, [r5, #0x10] add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, [r5, #0x10] mov r1, #1 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -745,10 +745,10 @@ _021D7A06: ldr r0, [r5, #0x10] mov r1, #5 add r3, r2, #0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette ldr r0, [r5, #0x10] mov r1, #5 - bl FUN_02017CD0 + bl BgCommitTilemapBufferToVram mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -772,12 +772,12 @@ _021D7A06: ldr r3, [r5] mov r1, #0x20 add r2, r0, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r3, [r5] mov r0, #4 mov r1, #0x20 mov r2, #0 - bl FUN_02017F18 + bl BG_ClearCharDataRange ldr r2, [r5] mov r0, #0 mov r1, #0x40 |