diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-05 10:43:46 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-05 10:43:46 -0400 |
commit | cc45732d6b7acab3dd1fc533064206dd11b32ce6 (patch) | |
tree | d7cd82f8ac2cb3876304cfa95264b6126a122c55 /arm9/asm | |
parent | ae369d76f0415f105020c6084fc1a6687c86407c (diff) |
Rename more bg routines, vars, etc
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/unk_020023C0.s | 14 | ||||
-rw-r--r-- | arm9/asm/unk_0200CABC.s | 132 | ||||
-rw-r--r-- | arm9/asm/unk_02014590.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_020484A8.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020625EC.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0206F3FC.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_02073DA8.s | 12 | ||||
-rw-r--r-- | arm9/asm/unk_02079C70.s | 16 | ||||
-rw-r--r-- | arm9/asm/unk_0207D5BC.s | 4 |
9 files changed, 99 insertions, 99 deletions
diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index 14707ffd..1d1f994a 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -468,7 +468,7 @@ _02002700: ldrb r2, [r2, #0x0] ldrb r3, [r3, #0x0] ldr r0, [r4, #0x4] - bl FUN_0201974C + bl CopyGlyphToWindow add r5, #0x80 ldrb r1, [r5, #0x0] ldrb r0, [r4, #0xe] @@ -723,7 +723,7 @@ _020028AC: lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r1, [sp, #0x20] add r0, r0, #0x2 @@ -752,7 +752,7 @@ _020028AC: lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x28] add r7, r6, #0x0 add r0, r0, #0x3 @@ -781,7 +781,7 @@ _020028AC: lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x14] add r6, #0x15 lsl r0, r0, #0x18 @@ -807,7 +807,7 @@ _020028AC: lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x4] ldr r1, [sp, #0x20] ldr r0, [r0, #0x0] @@ -878,7 +878,7 @@ FUN_02002A00: ; 0x02002A00 ldr r1, [sp, #0x10] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -897,7 +897,7 @@ FUN_02002A00: ; 0x02002A00 ldr r1, [sp, #0x10] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x4] ldr r1, [sp, #0x10] ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s index 8f5c8dcb..860397ce 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -147,7 +147,7 @@ FUN_0200CB6C: ; 0x0200CB6C add r2, sp, #0x28 ldrh r2, [r2, #0x1c] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r1, sp, #0x28 ldrh r4, [r1, #0x1c] lsl r0, r7, #0x18 @@ -164,7 +164,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] ldr r3, [sp, #0x18] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect add r0, sp, #0x28 ldrb r1, [r0, #0x10] ldr r0, [sp, #0x18] @@ -185,7 +185,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x3 str r0, [sp, #0x0] @@ -201,7 +201,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x20] str r0, [sp, #0x0] @@ -218,7 +218,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, sp, #0x28 ldrb r1, [r0, #0x14] ldr r0, [sp, #0x1c] @@ -237,7 +237,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -253,7 +253,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] ldr r3, [sp, #0x18] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -269,7 +269,7 @@ FUN_0200CB6C: ; 0x0200CB6C ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x24 pop {r4-r7, pc} .balign 4 @@ -352,7 +352,7 @@ FUN_0200CCF8: ; 0x0200CCF8 ldr r0, [r5, #0x0] ldr r1, [sp, #0x10] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect cmp r4, #0x0 bne _0200CD5A add r0, r5, #0x0 @@ -454,7 +454,7 @@ FUN_0200CDD8: ; 0x0200CDD8 lsl r3, r3, #0x18 ldrh r2, [r2, #0x1c] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x14] sub r0, r0, #0x1 str r0, [sp, #0x24] @@ -475,7 +475,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -491,7 +491,7 @@ FUN_0200CDD8: ; 0x0200CDD8 ldr r3, [sp, #0x14] add r0, r7, #0x0 lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect add r0, sp, #0x38 ldrb r1, [r0, #0x10] ldr r0, [sp, #0x14] @@ -512,7 +512,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x2c] add r2, r4, #0x4 add r0, r0, #0x1 @@ -531,7 +531,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x2c] add r2, r4, #0x5 add r0, r0, #0x2 @@ -550,7 +550,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] ldr r3, [sp, #0x28] str r0, [sp, #0x0] @@ -566,7 +566,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] ldr r3, [sp, #0x24] str r0, [sp, #0x0] @@ -582,7 +582,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -599,7 +599,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -616,7 +616,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -633,7 +633,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r2, r4, #0x0 ldr r3, [sp, #0x28] add r2, #0xc @@ -653,7 +653,7 @@ FUN_0200CDD8: ; 0x0200CDD8 ldr r1, [sp, #0x10] add r0, r7, #0x0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -670,7 +670,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -687,7 +687,7 @@ FUN_0200CDD8: ; 0x0200CDD8 ldr r3, [sp, #0x14] add r0, r7, #0x0 lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -704,7 +704,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -721,7 +721,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -737,7 +737,7 @@ FUN_0200CDD8: ; 0x0200CDD8 add r0, r7, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x30 pop {r3-r7, pc} .balign 4 @@ -837,7 +837,7 @@ FUN_0200D0E0: ; 0x0200D0E0 ldr r0, [r5, #0x0] ldr r1, [sp, #0x10] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect cmp r4, #0x0 bne _0200D142 add r0, r5, #0x0 @@ -1176,7 +1176,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldrh r2, [r2, #0x1c] lsr r3, r3, #0x18 str r0, [sp, #0x10] - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x18] str r0, [sp, #0x30] sub r0, #0x8 @@ -1198,7 +1198,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, sp, #0x48 ldrb r0, [r0, #0x10] add r2, r4, #0x2 @@ -1225,7 +1225,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r2, r4, #0x3 lsl r2, r2, #0x10 ldr r1, [sp, #0x18] @@ -1245,7 +1245,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r0, [sp, #0x10] ldr r1, [sp, #0x14] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x38] add r2, r4, #0x4 add r0, r0, #0x1 @@ -1264,7 +1264,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x38] add r0, r0, #0x2 str r0, [sp, #0x28] @@ -1283,7 +1283,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x34] str r0, [sp, #0x0] @@ -1298,7 +1298,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x30] str r0, [sp, #0x0] @@ -1313,7 +1313,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -1330,7 +1330,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -1346,7 +1346,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -1362,7 +1362,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 str r0, [sp, #0x0] @@ -1378,7 +1378,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r2, r4, #0x0 add r6, r0, r6 @@ -1397,7 +1397,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1414,7 +1414,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1434,7 +1434,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1451,7 +1451,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1468,7 +1468,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r6, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1484,7 +1484,7 @@ FUN_0200D3B0: ; 0x0200D3B0 ldr r1, [sp, #0x14] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x40 pop {r3-r7, pc} .balign 4 @@ -1538,7 +1538,7 @@ _0200D6BA: ldr r1, [sp, #0x20] lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0x1 lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -1671,7 +1671,7 @@ FUN_0200D7A0: ; 0x0200D7A0 ldr r0, [r5, #0x0] ldr r1, [sp, #0x14] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect b _0200D846 _0200D7FE: add r0, r5, #0x0 @@ -1704,7 +1704,7 @@ _0200D7FE: ldr r0, [r5, #0x0] ldr r1, [sp, #0x14] lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect _0200D846: ldr r0, [sp, #0x10] cmp r0, #0x0 @@ -1904,7 +1904,7 @@ FUN_0200D980: ; 0x0200D980 add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1924,7 +1924,7 @@ FUN_0200D980: ; 0x0200D980 add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x14] add r7, r0, #0x3 @@ -1946,7 +1946,7 @@ FUN_0200D980: ; 0x0200D980 add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -1965,7 +1965,7 @@ FUN_0200D980: ; 0x0200D980 add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x0] add r1, r4, #0x0 ldr r0, [r0, #0x0] @@ -2017,7 +2017,7 @@ _0200DA8A: add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -2037,7 +2037,7 @@ _0200DA8A: add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] ldr r3, [sp, #0x10] add r7, r0, #0x3 @@ -2059,7 +2059,7 @@ _0200DA8A: add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect lsl r0, r7, #0x18 lsr r0, r0, #0x18 str r0, [sp, #0x0] @@ -2078,7 +2078,7 @@ _0200DA8A: add r1, r4, #0x0 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x0] add r1, r4, #0x0 ldr r0, [r0, #0x0] @@ -2646,7 +2646,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r3, r3, #0x18 add r6, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x1 ldrb r0, [r5, r3] @@ -2667,7 +2667,7 @@ FUN_0200DFD8: ; 0x0200DFD8 ldrb r3, [r5, r3] ldr r0, [r5, r0] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x2 ldrb r0, [r5, r3] @@ -2690,7 +2690,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x4 ldrb r0, [r5, r3] @@ -2707,7 +2707,7 @@ FUN_0200DFD8: ; 0x0200DFD8 ldrb r3, [r5, r3] ldr r0, [r5, r0] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x3 ldrb r0, [r5, r3] @@ -2728,7 +2728,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x5 ldrb r0, [r5, r3] @@ -2749,7 +2749,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x6 ldrb r0, [r5, r3] @@ -2772,7 +2772,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r2, r6, #0x7 ldrb r0, [r5, r3] @@ -2793,7 +2793,7 @@ FUN_0200DFD8: ; 0x0200DFD8 ldrb r3, [r5, r3] ldr r0, [r5, r0] lsr r2, r2, #0x10 - bl FUN_02018540 + bl FillBgTilemapRect ldr r3, _0200E184 ; =0x0000016E add r6, #0x8 ldrb r0, [r5, r3] @@ -2816,7 +2816,7 @@ FUN_0200DFD8: ; 0x0200DFD8 lsl r3, r3, #0x18 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r1, #0x5a lsl r1, r1, #0x2 ldr r0, [r5, r1] @@ -2853,7 +2853,7 @@ FUN_0200E188: ; 0x0200E188 sub r3, r3, #0x1 lsl r3, r3, #0x18 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r1, #0x5a lsl r1, r1, #0x2 ldr r0, [r4, r1] diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index bee153d7..201e2a14 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -557,7 +557,7 @@ FUN_02014970: ; 0x02014970 lsl r1, r1, #0x18 ldr r0, [r6, #0x0] lsr r1, r1, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect ldr r1, [r6, #0x4] ldr r0, [r6, #0x0] lsl r1, r1, #0x18 @@ -817,7 +817,7 @@ FUN_02014B58: ; 0x02014B58 lsr r2, r2, #0x18 lsr r3, r3, #0x18 add r5, r0, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect lsl r1, r4, #0x18 add r0, r5, #0x0 lsr r1, r1, #0x18 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 5adb2c02..d6a12464 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -376,7 +376,7 @@ FUN_02048764: ; 0x02048764 ldr r0, [r4, #0x8] mov r1, #0x3 add r3, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r4, #0x8] mov r1, #0x3 bl FUN_02017CD0 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index d9e6755b..0f7304c8 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1080,7 +1080,7 @@ FUN_02062DB0: ; 0x02062DB0 ldr r0, [r0, #0x0] mov r1, #0x1 add r3, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0x0 add r0, #0xd0 ldr r0, [r0, #0x0] @@ -1213,7 +1213,7 @@ FUN_02062EC4: ; 0x02062EC4 ldr r0, [r0, #0x0] mov r1, #0x1 add r3, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect add r0, r4, #0x0 add r0, #0xd0 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index dfe7d1f8..48ec90c3 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -2090,7 +2090,7 @@ _020703F2: mov r1, #0x2 add r2, r6, #0x0 add r3, r7, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect add r0, sp, #0x20 ldrb r0, [r0, #0x10] cmp r0, #0x0 @@ -2111,7 +2111,7 @@ _020703F2: mov r1, #0x2 mov r2, #0x17 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect _0207044C: mov r0, #0x10 str r0, [sp, #0x0] @@ -2125,7 +2125,7 @@ _0207044C: mov r1, #0x2 add r2, r6, #0x0 add r3, r7, #0x0 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r5, #0x0 add r1, r4, #0x0 bl FUN_020709FC @@ -2775,7 +2775,7 @@ FUN_02070988: ; 0x02070988 mov r1, #0x2 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_02018170 + bl CopyToBgTilemapRect mov r0, #0x10 str r0, [sp, #0x0] mov r0, #0x6 @@ -2788,7 +2788,7 @@ FUN_02070988: ; 0x02070988 mov r1, #0x2 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_020186B4 + bl BgTilemapRectChangePalette add r0, r5, #0x0 add r1, r7, #0x0 mov r2, #0x7 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 3ed800a5..1b491322 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -1303,7 +1303,7 @@ FUN_02074848: ; 0x02074848 ldr r3, [sp, #0x20] mov r1, #0x2 mov r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect str r6, [sp, #0x0] mov r1, #0x10 str r1, [sp, #0x4] @@ -1314,7 +1314,7 @@ FUN_02074848: ; 0x02074848 ldr r3, [sp, #0x20] mov r1, #0x1 mov r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [sp, #0x1c] add r1, r4, r0 ldr r0, _02074994 ; =0x00000302 @@ -1345,7 +1345,7 @@ FUN_02074848: ; 0x02074848 ldr r2, [sp, #0x20] mov r1, #0x2 add r3, r6, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, _02074998 ; =0x00000306 mov r3, #0x10 ldrb r2, [r4, r0] @@ -1368,7 +1368,7 @@ FUN_02074848: ; 0x02074848 ldr r2, [sp, #0x20] mov r1, #0x1 add r3, r6, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect add sp, #0x28 pop {r3-r7, pc} _02074918: @@ -1399,7 +1399,7 @@ _02074918: mov r1, #0x2 lsr r2, r2, #0x18 add r3, r6, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect ldr r0, _02074998 ; =0x00000306 ldrb r2, [r4, r0] mov r0, #0x10 @@ -1426,7 +1426,7 @@ _02074918: mov r1, #0x1 lsr r2, r2, #0x18 add r3, r6, #0x0 - bl FUN_02018170 + bl CopyToBgTilemapRect add sp, #0x28 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 692aea6e..36744f2e 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -2600,7 +2600,7 @@ _0207B0EC: ldr r0, [r5, #0x0] mov r1, #0x1 mov r3, #0xe - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, [r5, #0x0] mov r1, #0x1 bl FUN_02017CD0 @@ -2760,7 +2760,7 @@ _0207B256: ldr r0, [r5, #0x0] mov r1, #0x3 add r2, #0xc - bl FUN_02018148 + bl LoadRectToBgTilemapRect ldr r0, [r5, #0x0] mov r1, #0x3 bl ScheduleBgTilemapBufferTransfer @@ -2858,7 +2858,7 @@ _0207B318: ldr r0, [r6, #0x0] mov r1, #0x3 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect cmp r4, #0x8 bhs _0207B33E mov r4, #0x0 @@ -2936,7 +2936,7 @@ _0207B3AC: ldr r0, [r6, #0x0] mov r1, #0x3 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect cmp r4, #0x8 bhs _0207B3D0 mov r4, #0x0 @@ -4066,7 +4066,7 @@ FUN_0207BCC8: ; 0x0207BCC8 mov r1, #0x2 add r2, r4, #0x0 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x2f str r0, [sp, #0x0] mov r0, #0x1 @@ -4082,7 +4082,7 @@ FUN_0207BCC8: ; 0x0207BCC8 mov r1, #0x2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x30 str r0, [sp, #0x0] mov r0, #0x1 @@ -4098,7 +4098,7 @@ FUN_0207BCC8: ; 0x0207BCC8 mov r1, #0x2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x30 str r0, [sp, #0x0] mov r0, #0x1 @@ -4113,7 +4113,7 @@ FUN_0207BCC8: ; 0x0207BCC8 mov r1, #0x2 lsr r2, r2, #0x10 lsr r3, r3, #0x18 - bl FUN_02018540 + bl FillBgTilemapRect add sp, #0x10 pop {r3-r7, pc} diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 9b1bc9b8..c988d22c 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -1039,7 +1039,7 @@ FUN_0207DD88: ; 0x0207DD88 ldr r0, [r4, #0x0] mov r1, #0x1 add r3, r2, #0x0 - bl FUN_02018540 + bl FillBgTilemapRect mov r0, #0x2 str r0, [sp, #0x0] mov r0, #0x12 @@ -1052,7 +1052,7 @@ FUN_0207DD88: ; 0x0207DD88 mov r1, #0x1 mov r2, #0x0 mov r3, #0xe - bl FUN_02018540 + bl FillBgTilemapRect ldr r0, _0207DE38 ; =0x0000068C ldrsb r0, [r4, r0] cmp r0, #0x7 |