diff options
author | YamaArashi <shadow962@live.com> | 2016-05-27 15:08:48 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-05-30 02:19:25 -0700 |
commit | 0ebfe95d65fc2852a6b7f0528a2a114de7fe698e (patch) | |
tree | a20b2e0e839661df88664d6547841a3a79e07222 /asm/rom5.s | |
parent | 1d8ca2c1b995be87bb78dcf9bdfdc1d924a48979 (diff) |
text.c
Diffstat (limited to 'asm/rom5.s')
-rw-r--r-- | asm/rom5.s | 622 |
1 files changed, 311 insertions, 311 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 1e61563c0..35c353323 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -91,11 +91,11 @@ _0807AE20: bl dp12_8087EA4 ldr r4, _0807AE5C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig bl sub_8073B94 ldr r0, _0807AE60 adds r1, r4, 0 - bl sub_8002D54 + bl InitWindowFromConfig ldr r0, _0807AE64 movs r1, 0 strh r1, [r0] @@ -115,7 +115,7 @@ _0807AE20: strh r1, [r0] b _0807B040 .align 2, 0 -_0807AE5C: .4byte gUnknown_081E6C58 +_0807AE5C: .4byte gWindowConfig_81E6C58 _0807AE60: .4byte 0x03004210 _0807AE64: .4byte 0x030042a4 _0807AE68: .4byte 0x030042a0 @@ -13745,7 +13745,7 @@ _08081852: movs r3, 0x13 bl Reset ldr r0, _0808189C - bl sub_8002A1C + bl LoadFontDefaultPalette ldr r1, _080818A0 movs r0, 0xFF strh r0, [r1] @@ -13773,7 +13773,7 @@ _08081892: pop {r0} bx r0 .align 2, 0 -_0808189C: .4byte gUnknown_081E6CE4 +_0808189C: .4byte gWindowConfig_81E6CE4 _080818A0: .4byte 0x04000040 thumb_func_end sub_80816A8 @@ -27821,7 +27821,7 @@ sub_8088380: @ 8088380 bl SetVBlankCallback ldr r4, _080883D0 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C movs r0, 0x26 @@ -27844,7 +27844,7 @@ sub_8088380: @ 8088380 pop {r0} bx r0 .align 2, 0 -_080883D0: .4byte gUnknown_081E6CE4 +_080883D0: .4byte gWindowConfig_81E6CE4 _080883D4: .4byte 0x02020004 _080883D8: .4byte sub_8088120 thumb_func_end sub_8088380 @@ -28177,7 +28177,7 @@ sub_808862C: @ 808862C bl SetVBlankCallback ldr r4, _080886A4 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C movs r0, 0x26 @@ -28202,7 +28202,7 @@ sub_808862C: @ 808862C .align 2, 0 _0808869C: .4byte 0x04000008 _080886A0: .4byte 0x05000200 -_080886A4: .4byte gUnknown_081E6CE4 +_080886A4: .4byte gWindowConfig_81E6CE4 _080886A8: .4byte 0x02020004 _080886AC: .4byte sub_808847C thumb_func_end sub_808862C @@ -34356,13 +34356,13 @@ _0808B758: b _0808B95C _0808B76A: ldr r0, _0808B778 - bl sub_8002A34 + bl SetUpWindowConfig ldr r1, _0808B77C ldr r2, _0808B780 adds r1, r2 b _0808B962 .align 2, 0 -_0808B778: .4byte gUnknown_081E71B4 +_0808B778: .4byte gWindowConfig_81E71B4 _0808B77C: .4byte 0x03001770 _0808B780: .4byte 0x0000043c _0808B784: @@ -34370,7 +34370,7 @@ _0808B784: bl sub_8071C58 b _0808B95C .align 2, 0 -_0808B78C: .4byte gUnknown_081E71B4 +_0808B78C: .4byte gWindowConfig_81E71B4 _0808B790: bl sub_8071C94 cmp r0, 0 @@ -35878,7 +35878,7 @@ _0808C344: strb r0, [r1] ldr r4, _0808C378 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C ldrb r0, [r5] @@ -35887,7 +35887,7 @@ _0808C344: b _0808C50C .align 2, 0 _0808C374: .4byte 0x030028f8 -_0808C378: .4byte gUnknown_081E7048 +_0808C378: .4byte gWindowConfig_81E7048 _0808C37C: bl Random movs r1, 0x3 @@ -37933,7 +37933,7 @@ _0808D4D4: .4byte 0x0000043c _0808D4D8: ldr r4, _0808D4F8 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C ldr r0, _0808D4FC @@ -37944,7 +37944,7 @@ _0808D4D8: adds r1, r0 b _0808D5E4 .align 2, 0 -_0808D4F8: .4byte gUnknown_081E7048 +_0808D4F8: .4byte gWindowConfig_81E7048 _0808D4FC: .4byte gUnknown_0839FA7C _0808D500: .4byte 0x0600ff80 _0808D504: .4byte 0x03001770 @@ -41851,7 +41851,7 @@ _0808F3F0: .4byte 0x0000064d _0808F3F4: ldr r4, _0808F40C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C ldr r1, _0808F410 @@ -41859,7 +41859,7 @@ _0808F3F4: adds r1, r3 b _0808F682 .align 2, 0 -_0808F40C: .4byte gUnknown_081E7064 +_0808F40C: .4byte gWindowConfig_81E7064 _0808F410: .4byte 0x03001770 _0808F414: .4byte 0x0000043c _0808F418: @@ -42760,7 +42760,7 @@ _0808FB98: .4byte 0x0000043c _0808FB9C: ldr r4, _0808FBB8 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C bl sub_8073B94 @@ -42769,7 +42769,7 @@ _0808FB9C: adds r1, r0 b _0808FDA0 .align 2, 0 -_0808FBB8: .4byte gUnknown_081E702C +_0808FBB8: .4byte gWindowConfig_81E702C _0808FBBC: .4byte 0x03001770 _0808FBC0: .4byte 0x0000043c _0808FBC4: @@ -43427,7 +43427,7 @@ _08090170: .4byte 0x0000043c _08090174: ldr r4, _080901AC adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C add r1, sp, 0x4 @@ -43449,7 +43449,7 @@ _08090174: adds r1, r2 b _08090368 .align 2, 0 -_080901AC: .4byte gUnknown_081E702C +_080901AC: .4byte gWindowConfig_81E702C _080901B0: .4byte gUnknown_0840E035 _080901B4: .4byte 0x02024ea4 _080901B8: .4byte 0x03001770 @@ -44271,7 +44271,7 @@ _08090858: .4byte gUnknown_08E87AF6 _0809085C: ldr r4, _0809088C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C ldr r2, _08090890 @@ -44291,7 +44291,7 @@ _0809085C: adds r0, r1 b _080909E0 .align 2, 0 -_0809088C: .4byte gUnknown_081E7064 +_0809088C: .4byte gWindowConfig_81E7064 _08090890: .4byte 0x0600c000 _08090894: .4byte 0x040000d4 _08090898: .4byte 0x81000100 @@ -47216,7 +47216,7 @@ _08091F4C: .4byte 0x0000043c _08091F50: ldr r4, _08091FA8 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C ldr r0, _08091FAC @@ -47252,7 +47252,7 @@ _08091F7C: adds r1, r2 b _08091FF6 .align 2, 0 -_08091FA8: .4byte gUnknown_081E7064 +_08091FA8: .4byte gWindowConfig_81E7064 _08091FAC: .4byte gUnknown_083A05CC _08091FB0: .4byte gUnknown_083A05DC _08091FB4: .4byte 0x03004b28 @@ -50303,14 +50303,14 @@ sub_80937BC: @ 80937BC push {r4,lr} ldr r4, _080937D4 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C58 pop {r4} pop {r0} bx r0 .align 2, 0 -_080937D4: .4byte gUnknown_081E6DC4 +_080937D4: .4byte gWindowConfig_81E6DC4 thumb_func_end sub_80937BC thumb_func_start sub_80937D8 @@ -50586,7 +50586,7 @@ sub_80939A4: @ 80939A4 bx r0 .align 2, 0 _080939B8: .4byte sub_80939DC -_080939BC: .4byte gUnknown_081E6DC4 +_080939BC: .4byte gWindowConfig_81E6DC4 thumb_func_end sub_80939A4 thumb_func_start sub_80939C0 @@ -51607,7 +51607,7 @@ sub_8094140: @ 8094140 bl StringCopy ldrb r1, [r5, 0x8] adds r0, r4, 0 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset adds r0, r4, 0 movs r1, 0x7 movs r2, 0x5 @@ -51620,7 +51620,7 @@ sub_8094140: @ 8094140 pop {r0} bx r0 .align 2, 0 -_0809417C: .4byte gUnknown_081E6DC4 +_0809417C: .4byte gWindowConfig_81E6DC4 _08094180: .4byte 0x020231cc _08094184: .4byte 0x02000094 thumb_func_end sub_8094140 @@ -51648,8 +51648,8 @@ sub_8094188: @ 8094188 pop {r0} bx r0 .align 2, 0 -_080941D0: .4byte gUnknown_081E6DC4 -_080941D4: .4byte gUnknown_081E6DE0 +_080941D0: .4byte gWindowConfig_81E6DC4 +_080941D4: .4byte gWindowConfig_81E6DE0 thumb_func_end sub_8094188 thumb_func_start sub_80941D8 @@ -51812,7 +51812,7 @@ sub_80942F8: @ 80942F8 bl StringCopy ldrb r1, [r5, 0x8] adds r0, r4, 0 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset ldr r1, _08094330 adds r0, r4, 0 bl StringAppend @@ -54620,7 +54620,7 @@ sub_8095904: @ 8095904 lsrs r0, 24 str r0, [sp, 0x8] ldr r0, [sp] - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 mov r8, r0 @@ -54662,7 +54662,7 @@ _0809593E: b _08095A2E .align 2, 0 _08095980: .4byte 0x0000fff0 -_08095984: .4byte gUnknown_08EA2C44 +_08095984: .4byte gFont3LatinGlyphs _08095988: movs r0, 0 mov r9, r0 @@ -54762,7 +54762,7 @@ _08095A2E: pop {r0} bx r0 .align 2, 0 -_08095A40: .4byte gUnknown_08EA2C44 +_08095A40: .4byte gFont3LatinGlyphs _08095A44: .4byte 0x0000fff0 thumb_func_end sub_8095904 @@ -56504,7 +56504,7 @@ _0809676C: .4byte gUnknown_083B6DB8 _08096770: .4byte 0x00001111 _08096774: .4byte 0x040000d4 _08096778: .4byte 0x81000200 -_0809677C: .4byte gUnknown_081E6D38 +_0809677C: .4byte gWindowConfig_81E6D38 _08096780: .4byte 0x80000200 thumb_func_end sub_80966F4 @@ -56689,17 +56689,17 @@ _080968D4: b _0809697A _080968E8: ldr r0, _080968F0 - bl sub_8002A34 + bl SetUpWindowConfig b _0809697A .align 2, 0 -_080968F0: .4byte gUnknown_081E6D00 +_080968F0: .4byte gWindowConfig_81E6D00 _080968F4: ldr r0, _08096900 bl sub_8071C4C bl sub_8071EF4 b _0809697A .align 2, 0 -_08096900: .4byte gUnknown_081E6D00 +_08096900: .4byte gWindowConfig_81E6D00 _08096904: bl sub_80967DC bl sub_8096848 @@ -56828,17 +56828,17 @@ _08096A2C: .4byte 0x0203847d _08096A30: .4byte 0x0203847f _08096A34: ldr r0, _08096A3C - bl sub_8002A34 + bl SetUpWindowConfig b _08096AD8 .align 2, 0 -_08096A3C: .4byte gUnknown_081E6D00 +_08096A3C: .4byte gWindowConfig_81E6D00 _08096A40: ldr r0, _08096A4C bl sub_8071C4C bl sub_8071EF4 b _08096AD8 .align 2, 0 -_08096A4C: .4byte gUnknown_081E6D00 +_08096A4C: .4byte gWindowConfig_81E6D00 _08096A50: bl sub_80967DC b _08096AD8 @@ -59316,7 +59316,7 @@ _08097F40: .4byte gUnknown_08E8E0E8 _08097F44: .4byte gUnknown_08E8E108 _08097F48: .4byte gUnknown_083B6D74 _08097F4C: .4byte gUnknown_083B6D94 -_08097F50: .4byte gUnknown_081E6694 +_08097F50: .4byte gUnknownPalette_81E6692+0x2 _08097F54: .4byte gUnknown_083B6DBC thumb_func_end sub_8097E70 @@ -60589,7 +60589,7 @@ _08098974: adds r0, r1 ldr r6, [r0] adds r0, r6, 0 - bl StringGetLength + bl StringLength adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 @@ -60618,7 +60618,7 @@ _080989B8: adds r0, r1 ldr r6, [r0] adds r0, r6, 0 - bl StringGetLength + bl StringLength adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 @@ -63816,7 +63816,7 @@ sub_809A1BC: @ 809A1BC _0809A228: .4byte gUnknown_083B6DB8 _0809A22C: .4byte 0x040000d4 _0809A230: .4byte 0x81000100 -_0809A234: .4byte gUnknown_081E6D38 +_0809A234: .4byte gWindowConfig_81E6D38 _0809A238: .4byte 0x80000040 thumb_func_end sub_809A1BC @@ -71189,10 +71189,10 @@ _0809DB8C: .4byte 0x03001770 _0809DB90: .4byte 0x0000043c _0809DB94: ldr r0, _0809DB9C - bl sub_8002A34 + bl SetUpWindowConfig b _0809DDE8 .align 2, 0 -_0809DB9C: .4byte gUnknown_081E6E6C +_0809DB9C: .4byte gWindowConfig_81E6E6C _0809DBA0: ldr r0, _0809DBB0 bl sub_8071C58 @@ -71201,7 +71201,7 @@ _0809DBA0: adds r1, r2 b _0809DDEE .align 2, 0 -_0809DBB0: .4byte gUnknown_081E6E6C +_0809DBB0: .4byte gWindowConfig_81E6E6C _0809DBB4: .4byte 0x03001770 _0809DBB8: .4byte 0x0000043c _0809DBBC: @@ -71811,8 +71811,8 @@ sub_809E044: @ 809E044 pop {r0} bx r0 .align 2, 0 -_0809E0F4: .4byte gUnknown_081E66AE -_0809E0F8: .4byte gUnknown_081E66B2 +_0809E0F4: .4byte gUnknownPalette_81E6692+0x1C +_0809E0F8: .4byte gFontDefaultPalette thumb_func_end sub_809E044 thumb_func_start sub_809E0FC @@ -75411,7 +75411,7 @@ _0809FD1C: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset ldr r5, _0809FD68 adds r0, r5, 0 movs r1, 0xD @@ -76546,7 +76546,7 @@ sub_80A0664: @ 80A0664 adds r0, r4, 0 bl StringCopy adds r0, r4, 0 - bl StripExtendedControlCodes + bl SkipExtCtrlCodes b _080A06C2 .align 2, 0 _080A06A0: .4byte 0x02018000 @@ -76576,7 +76576,7 @@ _080A06C2: bl PokemonGetField ldr r0, _080A06F4 adds r1, r4, 0 - bl CompareStringWithoutExtendedControlCodes + bl StringCompareWithoutExtCtrlCodes cmp r0, 0 beq _080A0700 _080A06EA: @@ -77151,7 +77151,7 @@ _080A0BA8: adds r0, r4, 0 bl StringCopy adds r0, r4, 0 - bl StringGetLength + bl StringLength lsls r0, 24 lsrs r0, 24 subs r4, 0x2 @@ -82224,10 +82224,10 @@ _080A3268: .4byte 0x03001770 _080A326C: .4byte 0x0000043c _080A3270: ldr r0, _080A3278 - bl sub_8002A34 + bl SetUpWindowConfig b _080A3464 .align 2, 0 -_080A3278: .4byte gUnknown_081E6DFC +_080A3278: .4byte gWindowConfig_81E6DFC _080A327C: ldr r0, _080A328C bl sub_8071C58 @@ -82236,7 +82236,7 @@ _080A327C: adds r1, r0 b _080A346A .align 2, 0 -_080A328C: .4byte gUnknown_081E6DFC +_080A328C: .4byte gWindowConfig_81E6DFC _080A3290: .4byte 0x03001770 _080A3294: .4byte 0x0000043c _080A3298: @@ -96385,10 +96385,10 @@ sub_80A9F50: @ 80A9F50 strh r0, [r2] ldr r4, _080A9FB8 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _080A9FBC adds r1, r4, 0 - bl sub_8002D54 + bl InitWindowFromConfig ldr r0, _080A9FC0 movs r1, 0 strh r1, [r0] @@ -96422,7 +96422,7 @@ sub_80A9F50: @ 80A9F50 pop {r0} bx r0 .align 2, 0 -_080A9FB8: .4byte gUnknown_081E6C3C +_080A9FB8: .4byte gWindowConfig_81E6C3C _080A9FBC: .4byte 0x0202e908 _080A9FC0: .4byte 0x0400004c _080A9FC4: .4byte 0x030042a4 @@ -96483,7 +96483,7 @@ _080AA012: mov r1, sp bl sub_80034D4 ldr r0, _080AA060 - bl sub_8002A1C + bl LoadFontDefaultPalette add sp, 0xC pop {r3} mov r8, r3 @@ -96494,7 +96494,7 @@ _080AA012: _080AA054: .4byte gUnknown_083C9228 _080AA058: .4byte 0x040000d4 _080AA05C: .4byte 0x85000400 -_080AA060: .4byte gUnknown_081E6C3C +_080AA060: .4byte gWindowConfig_81E6C3C thumb_func_end sub_80A9FE4 thumb_func_start sub_80AA064 @@ -96739,7 +96739,7 @@ sub_80AA280: @ 80AA280 movs r1, 0 movs r2, 0 movs r3, 0 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette ldr r4, _080AA2EC ldr r1, _080AA2F0 adds r0, r4, 0 @@ -97058,7 +97058,7 @@ sub_80AA4F0: @ 80AA4F0 movs r1, 0 mov r2, r9 mov r3, r10 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette ldr r0, _080AA5B0 lsls r4, 6 adds r4, r5, r4 @@ -98193,7 +98193,7 @@ sub_80AAD84: @ 80AAD84 str r0, [r4, 0x8] ldr r0, [r4, 0x8] mov r0, r9 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x8 @@ -98630,13 +98630,13 @@ _080AB108: ldr r0, [r1, 0x8] ldr r4, _080AB17C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig ldr r5, _080AB180 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8002D54 + bl InitWindowFromConfig adds r0, r4, 0 - bl sub_8002A1C + bl LoadFontDefaultPalette movs r0, 0x7 str r0, [sp] adds r0, r5, 0 @@ -98658,7 +98658,7 @@ _080AB16C: .4byte 0x04000004 _080AB170: .4byte sub_80AB184 _080AB174: .4byte 0x040000d4 _080AB178: .4byte 0x85000400 -_080AB17C: .4byte gUnknown_081E6FD8 +_080AB17C: .4byte gWindowConfig_81E6FD8 _080AB180: .4byte 0x03004210 thumb_func_end sub_80AB084 @@ -98860,28 +98860,28 @@ sub_80AB320: @ 80AB320 push {r4,lr} ldr r4, _080AB340 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _080AB344 adds r1, r4, 0 - bl sub_8002D54 + bl InitWindowFromConfig ldr r0, _080AB348 ldr r1, _080AB34C - bl sub_8002D54 + bl InitWindowFromConfig pop {r4} pop {r0} bx r0 .align 2, 0 -_080AB340: .4byte gUnknown_081E6FD8 +_080AB340: .4byte gWindowConfig_81E6FD8 _080AB344: .4byte 0x03004210 _080AB348: .4byte 0x0202e908 -_080AB34C: .4byte gUnknown_081E6FF4 +_080AB34C: .4byte gWindowConfig_81E6FF4 thumb_func_end sub_80AB320 thumb_func_start sub_80AB350 sub_80AB350: @ 80AB350 push {r4,lr} ldr r0, _080AB38C - bl sub_8002A1C + bl LoadFontDefaultPalette movs r0, 0 movs r1, 0 movs r2, 0x2 @@ -98906,7 +98906,7 @@ _080AB364: pop {r0} bx r0 .align 2, 0 -_080AB38C: .4byte gUnknown_081E6FD8 +_080AB38C: .4byte gWindowConfig_81E6FD8 _080AB390: .4byte 0x0202ecaa _080AB394: .4byte 0x00007e3f thumb_func_end sub_80AB350 @@ -100045,7 +100045,7 @@ sub_80ABCDC: @ 80ABCDC str r0, [sp, 0x4] adds r0, r5, 0 movs r1, 0 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette movs r6, 0 ldr r0, _080ABD90 mov r8, r0 @@ -100308,7 +100308,7 @@ _080ABF26: ldrb r1, [r1, 0x3] str r1, [sp, 0x4] movs r1, 0 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette ldr r0, _080ABF6C ldrb r0, [r0] bl sub_80AF59C @@ -104373,7 +104373,7 @@ sub_80AE098: @ 80AE098 adds r1, r6, 0 bl StringCopy mov r0, sp - bl StripExtendedControlCodes + bl SkipExtCtrlCodes ldr r0, _080AE0F4 ldrb r1, [r0] movs r0, 0x1 @@ -104455,7 +104455,7 @@ _080AE108: cmp r0, 0 beq _080AE19A mov r0, sp - bl StripExtendedControlCodes + bl SkipExtCtrlCodes adds r0, r6, 0 movs r1, 0x3 bl PokemonGetField @@ -104972,7 +104972,7 @@ _080AE52C: str r0, [sp, 0x4] ldr r0, _080AE594 movs r1, 0 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette adds r0, r5, 0 bl sub_80AE5BC adds r0, r5, 0 @@ -105097,11 +105097,11 @@ sub_80AE5D4: @ 80AE5D4 lsls r4, 3 str r4, [sp] str r6, [sp, 0x4] - bl AddTextPrinterParametrized2 + bl sub_8004D04 b _080AE6B0 .align 2, 0 _080AE660: .4byte 0x020238cc -_080AE664: .4byte gUnknown_081E72B0 +_080AE664: .4byte gEmptyString_81E72B0 _080AE668: .4byte 0x0203869a _080AE66C: .4byte 0x03002970 _080AE670: .4byte 0x03004210 @@ -105214,7 +105214,7 @@ sub_80AE6E4: @ 80AE6E4 str r4, [sp] movs r4, 0x1 str r4, [sp, 0x4] - bl AddTextPrinterParametrized2 + bl sub_8004D04 add sp, 0x8 pop {r4-r6} pop {r0} @@ -105811,7 +105811,7 @@ sub_80AEBEC: @ 80AEBEC movs r1, 0 movs r2, 0xB movs r3, 0x1F - bl sub_80047C8 + bl FillWindowRect_DefaultPalette ldr r1, _080AEC78 lsls r0, r4, 3 adds r0, r1 @@ -105988,7 +105988,7 @@ sub_80AED58: @ 80AED58 movs r1, 0 movs r2, 0xB movs r3, 0x23 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette add sp, 0x8 pop {r0} bx r0 @@ -106514,7 +106514,7 @@ sub_80AF138: @ 80AF138 movs r1, 0 movs r2, 0x1 movs r3, 0xF - bl sub_80047C8 + bl FillWindowRect_DefaultPalette add sp, 0x8 pop {r0} bx r0 @@ -106714,7 +106714,7 @@ sub_80AF2A0: @ 80AF2A0 str r0, [sp, 0x4] adds r0, r4, 0 movs r1, 0 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette add sp, 0x8 pop {r4} pop {r0} @@ -110259,7 +110259,7 @@ _080B0D1C: str r0, [sp, 0x4] ldr r0, _080B0D68 movs r1, 0 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -110329,7 +110329,7 @@ _080B0DA6: str r0, [sp, 0x4] ldr r0, _080B0EDC movs r1, 0 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -114940,7 +114940,7 @@ BuyMenuDrawGraphics: @ 80B3108 bl ResetTasks ldr r4, _080B3228 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C bl BuyMenuDrawMapGraphics @@ -115001,7 +115001,7 @@ _080B3218: .4byte 0x06007c00 _080B321C: .4byte gUnknown_08E77928 _080B3220: .4byte 0x02018000 _080B3224: .4byte gUnknown_08E77900 -_080B3228: .4byte gUnknown_081E6DFC +_080B3228: .4byte gWindowConfig_81E6DFC _080B322C: .4byte 0x03000708 _080B3230: .4byte 0x02025734 _080B3234: .4byte sub_80B40E8 @@ -119011,7 +119011,7 @@ GetStringWidthInTilesForScriptMenu: @ 80B511C push {lr} adds r1, r0, 0 ldr r0, _080B5134 - bl GetStringWidthGivenTextRendererTemplate + bl GetStringWidthGivenWindowConfig lsls r0, 24 lsrs r0, 24 adds r1, r0, 0x7 @@ -119019,7 +119019,7 @@ GetStringWidthInTilesForScriptMenu: @ 80B511C pop {r1} bx r1 .align 2, 0 -_080B5134: .4byte gUnknown_081E6CE4 +_080B5134: .4byte gWindowConfig_81E6CE4 thumb_func_end GetStringWidthInTilesForScriptMenu thumb_func_start sub_80B5138 @@ -120638,14 +120638,14 @@ sub_80B5DC8: @ 80B5DC8 push {r4,lr} ldr r4, _080B5DE0 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C pop {r4} pop {r0} bx r0 .align 2, 0 -_080B5DE0: .4byte gUnknown_081E6E88 +_080B5DE0: .4byte gWindowConfig_81E6E88 thumb_func_end sub_80B5DC8 thumb_func_start NamingScreen_ResetObjects @@ -123842,7 +123842,7 @@ _080B7528: .4byte 0x020231cc _080B752C: .4byte 0x02000000 _080B7530: .4byte 0x020234cc _080B7534: .4byte gUnknown_0842C9A4 -_080B7538: .4byte gUnknown_081E6E88 +_080B7538: .4byte gWindowConfig_81E6E88 thumb_func_end sub_80B74FC thumb_func_start sub_80B753C @@ -124351,7 +124351,7 @@ sub_80B78A8: @ 80B78A8 pop {r0} bx r0 .align 2, 0 -_080B78E4: .4byte gUnknown_081E6F4C +_080B78E4: .4byte gWindowConfig_81E6F4C _080B78E8: .4byte gUnknown_083CE358 _080B78EC: .4byte 0x02000000 _080B78F0: .4byte gUnknown_083CE368 @@ -124452,7 +124452,7 @@ sub_80B7960: @ 80B7960 .align 2, 0 _080B799C: .4byte 0x020231cc _080B79A0: .4byte 0x02000011 -_080B79A4: .4byte gUnknown_081E6F4C +_080B79A4: .4byte gWindowConfig_81E6F4C thumb_func_end sub_80B7960 thumb_func_start IsEnoughMoney @@ -129722,7 +129722,7 @@ sub_80BA0EC: @ 80BA0EC bl ResetTasks bl ResetSpriteData ldr r0, _080BA220 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _080BA224 bl sub_8071C4C movs r0, 0x1 @@ -129801,8 +129801,8 @@ _080BA210: .4byte 0x040000d4 _080BA214: .4byte 0x8100c000 _080BA218: .4byte 0x85000100 _080BA21C: .4byte 0x81000200 -_080BA220: .4byte gUnknown_081E6C3C -_080BA224: .4byte gUnknown_081E6CE4 +_080BA220: .4byte gWindowConfig_81E6C3C +_080BA224: .4byte gWindowConfig_81E6CE4 _080BA228: .4byte 0x04000040 _080BA22C: .4byte 0x04000048 _080BA230: .4byte 0x00001111 @@ -131795,7 +131795,7 @@ sub_80BB25C: @ 80BB25C lsls r0, 24 lsrs r6, r0, 24 ldr r0, _080BB374 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _080BB378 bl sub_8071C4C ldr r1, _080BB37C @@ -131922,8 +131922,8 @@ _080BB306: pop {r0} bx r0 .align 2, 0 -_080BB374: .4byte gUnknown_081E6C3C -_080BB378: .4byte gUnknown_081E6CE4 +_080BB374: .4byte gWindowConfig_81E6C3C +_080BB378: .4byte gWindowConfig_81E6CE4 _080BB37C: .4byte 0x03005d34 _080BB380: .4byte 0xffff0000 _080BB384: .4byte 0xff00ffff @@ -137622,7 +137622,7 @@ _080BDEFE: adds r0, r1 adds r1, r5, 0 adds r1, 0x2A - bl CompareStringWithoutExtendedControlCodes + bl StringCompareWithoutExtCtrlCodes cmp r0, 0 bne _080BDF16 b _080BE012 @@ -137746,7 +137746,7 @@ _080BDFDE: bl sub_80BDEAC strb r0, [r5, 0x3] adds r0, r6, 0 - bl StripExtendedControlCodes + bl SkipExtCtrlCodes _080BE012: pop {r3} mov r8, r3 @@ -138009,7 +138009,7 @@ sub_80BE188: @ 80BE188 bl sub_80BDEAC strb r0, [r4, 0x1F] adds r0, r5, 0 - bl StripExtendedControlCodes + bl SkipExtCtrlCodes _080BE224: pop {r4-r6} pop {r0} @@ -138315,13 +138315,13 @@ sub_80BE478: @ 80BE478 ldr r1, _080BE564 mov r9, r1 mov r0, r9 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 bls _080BE548 adds r0, r4, 0 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 @@ -138381,7 +138381,7 @@ sub_80BE478: @ 80BE478 bl sub_80BDEAC strb r0, [r4, 0x1F] adds r0, r5, 0 - bl StripExtendedControlCodes + bl SkipExtCtrlCodes _080BE548: pop {r3,r4} mov r8, r3 @@ -138630,7 +138630,7 @@ sub_80BE6A0: @ 80BE6A0 bl sub_80BDEAC strb r0, [r4, 0xE] adds r0, r5, 0 - bl StripExtendedControlCodes + bl SkipExtCtrlCodes pop {r3} mov r8, r3 pop {r4-r6} @@ -140440,7 +140440,7 @@ sub_80BF4F4: @ 80BF4F4 ldr r1, _080BF538 adds r0, r1 adds r1, r5, 0 - bl CompareStringWithoutExtendedControlCodes + bl StringCompareWithoutExtCtrlCodes cmp r0, 0 beq _080BF53C movs r0, 0x1 @@ -140909,7 +140909,7 @@ _080BF844: ldr r4, [sp, 0x20] adds r4, 0xF adds r0, r4, 0 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r2, r0, 16 cmp r6, 0 @@ -140951,7 +140951,7 @@ _080BF8A6: ldr r4, [sp, 0x20] adds r4, 0x4 adds r0, r4, 0 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r2, r0, 16 cmp r6, 0 @@ -140992,7 +140992,7 @@ _080BF8F4: muls r4, r0 ldr r7, _080BF910 adds r0, r4, r7 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r2, r0, 16 cmp r6, 0 @@ -141110,7 +141110,7 @@ sub_80BF9B4: @ 80BF9B4 bl PokemonGetField ldr r0, _080BF9EC adds r1, r4, 0 - bl CompareStringWithoutExtendedControlCodes + bl StringCompareWithoutExtCtrlCodes cmp r0, 0 beq _080BF9F0 bl sub_80BE478 @@ -143054,7 +143054,7 @@ sub_80C08FC: @ 80C08FC bhi _080C0914 adds r0, r5, 0 movs r1, 0x1 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset _080C0914: pop {r4,r5} pop {r0} @@ -143125,7 +143125,7 @@ _080C0980: adds r0, r1 adds r1, r4, 0 adds r1, 0x8 - bl CompareStringWithoutExtendedControlCodes + bl StringCompareWithoutExtCtrlCodes cmp r0, 0 bne _080C09CC ldr r1, _080C09C8 @@ -145619,10 +145619,10 @@ sub_80C2020: @ 80C2020 strh r0, [r5] ldr r4, _080C20F0 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _080C20F4 adds r1, r4, 0 - bl sub_8002D54 + bl InitWindowFromConfig ldr r1, _080C20F8 movs r2, 0xF8 lsls r2, 6 @@ -145715,7 +145715,7 @@ sub_80C2020: @ 80C2020 pop {r0} bx r0 .align 2, 0 -_080C20F0: .4byte gUnknown_081E6FA0 +_080C20F0: .4byte gWindowConfig_81E6FA0 _080C20F4: .4byte 0x0202e908 _080C20F8: .4byte 0x04000008 _080C20FC: .4byte 0x00001803 @@ -145794,7 +145794,7 @@ _080C2162: movs r1, 0 bl decompress_palette ldr r0, _080C2234 - bl sub_8002A1C + bl LoadFontDefaultPalette movs r6, 0 _080C21C0: lsls r5, r6, 24 @@ -145847,7 +145847,7 @@ _080C2224: .4byte 0x0600e000 _080C2228: .4byte gUnknown_08D1A250 _080C222C: .4byte 0x0600f000 _080C2230: .4byte gUnknown_08D1A618 -_080C2234: .4byte gUnknown_081E6FA0 +_080C2234: .4byte gWindowConfig_81E6FA0 _080C2238: .4byte 0x000060b2 _080C223C: .4byte 0x000060a4 _080C2240: @@ -147799,7 +147799,7 @@ _080C31CE: bge _080C31CE mov r0, r8 mov r1, r9 - bl GetStringWidthGivenTextRendererTemplate + bl GetStringWidthGivenWindowConfig lsls r0, 24 lsrs r5, r0, 24 ldr r2, _080C32D4 @@ -147901,7 +147901,7 @@ _080C32B2: b _080C3322 .align 2, 0 _080C32C0: .4byte 0x02020004 -_080C32C4: .4byte gUnknown_081E7278 +_080C32C4: .4byte gWindowConfig_81E7278 _080C32C8: .4byte 0x06010000 _080C32CC: .4byte 0x040000d4 _080C32D0: .4byte 0x85000100 @@ -148127,7 +148127,7 @@ _080C34A8: .4byte 0x02018000 thumb_func_start sub_80C34AC sub_80C34AC: @ 80C34AC push {lr} - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 lsls r1, r0, 1 @@ -150457,7 +150457,7 @@ sub_80C4674: @ 80C4674 bne _080C4690 adds r0, r4, 0 movs r1, 0x1 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset _080C4690: pop {r4} pop {r0} @@ -150495,7 +150495,7 @@ sub_80C4698: @ 80C4698 lsls r1, 24 lsrs r1, 24 adds r0, r5, 0 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset _080C46DA: pop {r4,r5} pop {r0} @@ -158819,7 +158819,7 @@ sub_80C86A0: @ 80C86A0 b _080C872C _080C86B6: adds r0, r4, 0 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 @@ -158990,7 +158990,7 @@ _080C87EA: lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset b _080C883E .align 2, 0 _080C8818: .4byte 0x02038570 @@ -159003,7 +159003,7 @@ _080C8828: bne _080C8838 adds r0, r4, 0 movs r1, 0x1 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset b _080C883E _080C8838: strb r0, [r4, 0x5] @@ -220531,10 +220531,10 @@ _080E6344: _080E637C: .4byte gUnknown_083DB698 _080E6380: ldr r0, _080E6388 - bl sub_8002A34 + bl SetUpWindowConfig b _080E6402 .align 2, 0 -_080E6388: .4byte gUnknown_081E6DA8 +_080E6388: .4byte gWindowConfig_81E6DA8 _080E638C: ldr r0, _080E63A0 bl sub_8071C4C @@ -220543,8 +220543,8 @@ _080E638C: bl sub_8071EF4 b _080E6402 .align 2, 0 -_080E63A0: .4byte gUnknown_081E6D54 -_080E63A4: .4byte gUnknown_081E6DA8 +_080E63A0: .4byte gWindowConfig_81E6D54 +_080E63A4: .4byte gWindowConfig_81E6DA8 _080E63A8: bl sub_80E6424 b _080E6402 @@ -226567,7 +226567,7 @@ sub_80E91D4: @ 80E91D4 bl sub_80E9198 b _080E935C .align 2, 0 -_080E91FC: .4byte gUnknown_081E6DA8 +_080E91FC: .4byte gWindowConfig_81E6DA8 _080E9200: bl sub_80E91A4 lsls r0, 24 @@ -226837,7 +226837,7 @@ _080E93FA: bl Print b _080E9476 .align 2, 0 -_080E943C: .4byte gUnknown_081E6D8C +_080E943C: .4byte gWindowConfig_81E6D8C _080E9440: .4byte gUnknown_083DB694 _080E9444: .4byte 0x00009f8e _080E9448: .4byte 0x00009f90 @@ -226868,7 +226868,7 @@ _080E9476: bx r0 .align 2, 0 _080E9484: .4byte 0x00009f91 -_080E9488: .4byte gUnknown_081E6DA8 +_080E9488: .4byte gWindowConfig_81E6DA8 thumb_func_end sub_80E9368 thumb_func_start sub_80E948C @@ -227023,7 +227023,7 @@ sub_80E95A4: @ 80E95A4 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E95C0: .4byte gUnknown_081E6D8C +_080E95C0: .4byte gWindowConfig_81E6D8C _080E95C4: .4byte gUnknown_083DB694 _080E95C8: .4byte _080E95CC .align 2, 0 @@ -227067,7 +227067,7 @@ _080E9612: pop {r0} bx r0 .align 2, 0 -_080E961C: .4byte gUnknown_081E6DA8 +_080E961C: .4byte gWindowConfig_81E6DA8 thumb_func_end sub_80E95A4 thumb_func_start sub_80E9620 @@ -227232,7 +227232,7 @@ sub_80E9744: @ 80E9744 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E9760: .4byte gUnknown_081E6D8C +_080E9760: .4byte gWindowConfig_81E6D8C _080E9764: .4byte gUnknown_083DB694 _080E9768: .4byte _080E976C .align 2, 0 @@ -227276,7 +227276,7 @@ _080E97B2: pop {r0} bx r0 .align 2, 0 -_080E97BC: .4byte gUnknown_081E6DA8 +_080E97BC: .4byte gWindowConfig_81E6DA8 thumb_func_end sub_80E9744 thumb_func_start sub_80E97C0 @@ -227429,7 +227429,7 @@ sub_80E98C4: @ 80E98C4 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E98E0: .4byte gUnknown_081E6D8C +_080E98E0: .4byte gWindowConfig_81E6D8C _080E98E4: .4byte gUnknown_083DB694 _080E98E8: .4byte _080E98EC .align 2, 0 @@ -227474,7 +227474,7 @@ _080E9936: pop {r0} bx r0 .align 2, 0 -_080E993C: .4byte gUnknown_081E6DA8 +_080E993C: .4byte gWindowConfig_81E6DA8 thumb_func_end sub_80E98C4 thumb_func_start sub_80E9940 @@ -227545,7 +227545,7 @@ _080E99A4: blt _080E99A4 b _080E9A08 .align 2, 0 -_080E99C4: .4byte gUnknown_081E6D54 +_080E99C4: .4byte gWindowConfig_81E6D54 _080E99C8: .4byte gUnknown_083DB694 _080E99CC: .4byte 0x000001b5 _080E99D0: .4byte 0x00009dc9 @@ -227707,7 +227707,7 @@ _080E9ADE: pop {r0} bx r0 .align 2, 0 -_080E9AF4: .4byte gUnknown_081E6D54 +_080E9AF4: .4byte gWindowConfig_81E6D54 thumb_func_end sub_80E9AD4 thumb_func_start sub_80E9AF8 @@ -227782,7 +227782,7 @@ _080E9B80: .4byte 0x00009e14 _080E9B84: .4byte 0x00009e17 _080E9B88: .4byte 0x000099a6 _080E9B8C: .4byte 0x00009a2a -_080E9B90: .4byte gUnknown_081E6D70 +_080E9B90: .4byte gWindowConfig_81E6D70 _080E9B94: ldr r0, _080E9BE0 bl sub_8071E2C @@ -227820,7 +227820,7 @@ _080E9B9A: blt _080E9B58 b _080E9C52 .align 2, 0 -_080E9BE0: .4byte gUnknown_081E6D54 +_080E9BE0: .4byte gWindowConfig_81E6D54 _080E9BE4: .4byte gUnknown_083DB694 _080E9BE8: .4byte 0x00009a2a _080E9BEC: .4byte 0x00009e14 @@ -227881,7 +227881,7 @@ _080E9C52: pop {r0} bx r0 .align 2, 0 -_080E9C64: .4byte gUnknown_081E6D54 +_080E9C64: .4byte gWindowConfig_81E6D54 _080E9C68: .4byte 0x000099a6 _080E9C6C: .4byte 0x00009a2a _080E9C70: .4byte 0x00009e14 @@ -228054,7 +228054,7 @@ sub_80E9D7C: @ 80E9D7C subs r0, r6 b _080E9DCC .align 2, 0 -_080E9DAC: .4byte gUnknown_081E6D54 +_080E9DAC: .4byte gWindowConfig_81E6D54 _080E9DB0: .4byte gUnknown_083DB694 _080E9DB4: .4byte 0x000001b5 _080E9DB8: @@ -230792,7 +230792,7 @@ sub_80EB2D4: @ 80EB2D4 cmp r0, 0 beq _080EB2F8 ldr r0, _080EB2F4 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 b _080EB374 @@ -238729,16 +238729,16 @@ _080EF2E4: b _080EF40C _080EF2EA: ldr r0, _080EF2F4 - bl sub_8002A34 + bl SetUpWindowConfig b _080EF40C .align 2, 0 -_080EF2F4: .4byte gUnknown_081E7224 +_080EF2F4: .4byte gWindowConfig_81E7224 _080EF2F8: ldr r0, _080EF300 bl sub_8071C58 b _080EF40C .align 2, 0 -_080EF300: .4byte gUnknown_081E7224 +_080EF300: .4byte gWindowConfig_81E7224 _080EF304: bl sub_8071C94 cmp r0, 0 @@ -239483,16 +239483,16 @@ _080EF8CC: b _080EF9DC _080EF8D2: ldr r0, _080EF8DC - bl sub_8002A34 + bl SetUpWindowConfig b _080EF9DC .align 2, 0 -_080EF8DC: .4byte gUnknown_081E7224 +_080EF8DC: .4byte gWindowConfig_81E7224 _080EF8E0: ldr r0, _080EF8E8 bl sub_8071C58 b _080EF9DC .align 2, 0 -_080EF8E8: .4byte gUnknown_081E7224 +_080EF8E8: .4byte gWindowConfig_81E7224 _080EF8EC: bl sub_8071C94 cmp r0, 0 @@ -240373,16 +240373,16 @@ _080EFFE0: .4byte gUnknown_083DFEC4 _080EFFE4: .4byte 0x0000d162 _080EFFE8: ldr r0, _080EFFF0 - bl sub_8002A34 + bl SetUpWindowConfig b _080F0154 .align 2, 0 -_080EFFF0: .4byte gUnknown_081E7080 +_080EFFF0: .4byte gWindowConfig_81E7080 _080EFFF4: ldr r0, _080EFFFC bl sub_8071C58 b _080F0154 .align 2, 0 -_080EFFFC: .4byte gUnknown_081E7080 +_080EFFFC: .4byte gWindowConfig_81E7080 _080F0000: bl sub_8071C94 cmp r0, 0 @@ -240489,7 +240489,7 @@ _080F00AC: b _080F0154 .align 2, 0 _080F00EC: .4byte gUnknown_083E0254 -_080F00F0: .4byte gUnknown_081E6692 +_080F00F0: .4byte gUnknownPalette_81E6692 _080F00F4: .4byte gUnknown_08E8A1C2 _080F00F8: ldr r0, _080F0110 @@ -240774,16 +240774,16 @@ _080F033C: .4byte 0x000087c8 _080F0340: .4byte 0x0000d162 _080F0344: ldr r0, _080F034C - bl sub_8002A34 + bl SetUpWindowConfig b _080F0618 .align 2, 0 -_080F034C: .4byte gUnknown_081E70D4 +_080F034C: .4byte gWindowConfig_81E70D4 _080F0350: ldr r0, _080F0358 bl sub_8071C58 b _080F0618 .align 2, 0 -_080F0358: .4byte gUnknown_081E70D4 +_080F0358: .4byte gWindowConfig_81E70D4 _080F035C: bl sub_8071C94 cmp r0, 0 @@ -240863,7 +240863,7 @@ _080F0404: .4byte gUnknown_083DFEC4 _080F0408: .4byte 0x000087ca _080F040C: .4byte gUnknown_083E0294 _080F0410: .4byte 0x0202eac8 -_080F0414: .4byte gUnknown_081E6692 +_080F0414: .4byte gUnknownPalette_81E6692 _080F0418: cmp r0, 0x1 bne _080F0464 @@ -240895,7 +240895,7 @@ _080F0418: .align 2, 0 _080F0458: .4byte gUnknown_083E0274 _080F045C: .4byte 0x0202eac8 -_080F0460: .4byte gUnknown_081E6692 +_080F0460: .4byte gUnknownPalette_81E6692 _080F0464: ldr r4, _080F04B0 adds r0, r4, 0 @@ -241350,7 +241350,7 @@ _080F080A: bx r0 .align 2, 0 _080F0810: .4byte 0x00008788 -_080F0814: .4byte gUnknown_081E710C +_080F0814: .4byte gWindowConfig_81E710C _080F0818: .4byte gUnknown_083DFEC4 thumb_func_end ShowMapNamePopUpWindow @@ -241369,7 +241369,7 @@ sub_80F081C: @ 80F081C ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F0838: .4byte gUnknown_081E710C +_080F0838: .4byte gWindowConfig_81E710C _080F083C: .4byte _080F0840 .align 2, 0 _080F0840: @@ -241459,7 +241459,7 @@ sub_80F08E4: @ 80F08E4 pop {r0} bx r0 .align 2, 0 -_080F08FC: .4byte gUnknown_081E710C +_080F08FC: .4byte gWindowConfig_81E710C thumb_func_end sub_80F08E4 thumb_func_start sub_80F0900 @@ -241648,7 +241648,7 @@ _080F0A40: _080F0A64: .4byte gUnknown_083DFEC4 _080F0A68: .4byte 0x000087c8 _080F0A6C: .4byte 0x00008788 -_080F0A70: .4byte gUnknown_081E70D4 +_080F0A70: .4byte gWindowConfig_81E70D4 thumb_func_end sub_80F0A24 thumb_func_start sub_80F0A74 @@ -241704,7 +241704,7 @@ sub_80F0A74: @ 80F0A74 .align 2, 0 _080F0ADC: .4byte gUnknown_083DFEC4 _080F0AE0: .4byte 0x00008788 -_080F0AE4: .4byte gUnknown_081E70D4 +_080F0AE4: .4byte gWindowConfig_81E70D4 _080F0AE8: .4byte 0x0000d158 _080F0AEC: .4byte 0x0000ceed _080F0AF0: .4byte 0x0600f000 @@ -241816,7 +241816,7 @@ _080F0BB4: _080F0BBC: .4byte 0x00000306 _080F0BC0: .4byte 0x00008778 _080F0BC4: .4byte 0x0000876c -_080F0BC8: .4byte gUnknown_081E70D4 +_080F0BC8: .4byte gWindowConfig_81E70D4 _080F0BCC: ldr r0, _080F0C10 bl sub_8071E2C @@ -241852,7 +241852,7 @@ _080F0BE2: movs r0, 0 b _080F0C22 .align 2, 0 -_080F0C10: .4byte gUnknown_081E70D4 +_080F0C10: .4byte gWindowConfig_81E70D4 _080F0C14: .4byte 0x00008778 _080F0C18: .4byte gUnknown_083DFEC4 _080F0C1C: .4byte 0x0000d15c @@ -241942,7 +241942,7 @@ _080F0C64: .align 2, 0 _080F0CBC: .4byte 0x00000306 _080F0CC0: .4byte 0x0000ffff -_080F0CC4: .4byte gUnknown_081E70D4 +_080F0CC4: .4byte gWindowConfig_81E70D4 _080F0CC8: .4byte 0x00008770 _080F0CCC: .4byte 0x00008778 _080F0CD0: @@ -242069,7 +242069,7 @@ _080F0D8C: mov pc, r0 .align 2, 0 _080F0DB8: .4byte 0x00000306 -_080F0DBC: .4byte gUnknown_081E70D4 +_080F0DBC: .4byte gWindowConfig_81E70D4 _080F0DC0: .4byte 0x00008778 _080F0DC4: .4byte _080F0DC8 .align 2, 0 @@ -242267,7 +242267,7 @@ _080F0F52: .align 2, 0 _080F0F58: .4byte 0x00000306 _080F0F5C: .4byte 0x00008778 -_080F0F60: .4byte gUnknown_081E70D4 +_080F0F60: .4byte gWindowConfig_81E70D4 thumb_func_end sub_80F0EF4 thumb_func_start sub_80F0F64 @@ -242389,7 +242389,7 @@ sub_80F0FFC: @ 80F0FFC _080F1048: .4byte gUnknown_083DFEC4 _080F104C: .4byte 0x00008788 _080F1050: .4byte 0x0000ceea -_080F1054: .4byte gUnknown_081E710C +_080F1054: .4byte gWindowConfig_81E710C _080F1058: .4byte 0x0000d138 thumb_func_end sub_80F0FFC @@ -242465,16 +242465,16 @@ _080F10FC: .4byte gUnknown_083DFEC4 _080F1100: .4byte 0x0000d162 _080F1104: ldr r0, _080F110C - bl sub_8002A34 + bl SetUpWindowConfig b _080F1218 .align 2, 0 -_080F110C: .4byte gUnknown_081E70B8 +_080F110C: .4byte gWindowConfig_81E70B8 _080F1110: ldr r0, _080F1118 bl sub_8071C58 b _080F1218 .align 2, 0 -_080F1118: .4byte gUnknown_081E70B8 +_080F1118: .4byte gWindowConfig_81E70B8 _080F111C: bl sub_8071C94 cmp r0, 0 @@ -242557,7 +242557,7 @@ _080F1194: _080F11CC: .4byte gUnknown_08E9FAFC _080F11D0: .4byte gUnknown_083E03A8 _080F11D4: .4byte gUnknown_083E3C60 -_080F11D8: .4byte gUnknown_081E6692 +_080F11D8: .4byte gUnknownPalette_81E6692 _080F11DC: bl sub_80F1438 b _080F1218 @@ -243030,7 +243030,7 @@ _080F158A: pop {r0} bx r0 .align 2, 0 -_080F15A4: .4byte gUnknown_081E72B0 +_080F15A4: .4byte gEmptyString_81E72B0 thumb_func_end sub_80F1494 thumb_func_start sub_80F15A8 @@ -243399,7 +243399,7 @@ _080F186C: b _080F1914 .align 2, 0 _080F18AC: .4byte gUnknown_083E0254 -_080F18B0: .4byte gUnknown_081E6692 +_080F18B0: .4byte gUnknownPalette_81E6692 _080F18B4: .4byte gUnknown_08E8A1C2 _080F18B8: ldr r0, _080F18D0 @@ -243534,7 +243534,7 @@ _080F19B8: pop {r0} bx r0 .align 2, 0 -_080F19D0: .4byte gUnknown_081E72B0 +_080F19D0: .4byte gEmptyString_81E72B0 _080F19D4: .4byte gUnknown_083DFEC4 _080F19D8: .4byte 0x00008788 thumb_func_end sub_80F1934 @@ -248886,7 +248886,7 @@ _080F42A4: .4byte gUnknown_083DFEC8 _080F42A8: .4byte 0x00001111 _080F42AC: .4byte 0x040000d4 _080F42B0: .4byte 0x81000140 -_080F42B4: .4byte gUnknown_081E70F0 +_080F42B4: .4byte gWindowConfig_81E70F0 _080F42B8: .4byte 0x81000030 _080F42BC: .4byte 0x0fffffff _080F42C0: .4byte 0x80000040 @@ -249364,7 +249364,7 @@ _080F4676: bx r0 .align 2, 0 _080F467C: .4byte 0x00008829 -_080F4680: .4byte gUnknown_081E72B0 +_080F4680: .4byte gEmptyString_81E72B0 _080F4684: .4byte 0x000088e9 _080F4688: .4byte 0x00008937 thumb_func_end sub_80F45A0 @@ -253413,7 +253413,7 @@ _080F65EA: movs r4, 0xFF _080F65FC: adds r0, r5, 0 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 adds r5, r0 @@ -257029,7 +257029,7 @@ _080F81D8: ldr r4, _080F820C ldr r0, [r4] ldr r1, _080F8210 - bl sub_8002D54 + bl InitWindowFromConfig ldr r0, [r4] ldr r1, _080F8214 movs r2, 0xF @@ -257048,7 +257048,7 @@ _080F81D8: b _080F83C6 .align 2, 0 _080F820C: .4byte 0x0202e9c8 -_080F8210: .4byte gUnknown_081E6CE4 +_080F8210: .4byte gWindowConfig_81E6CE4 _080F8214: .4byte 0x020234cc _080F8218: bl sub_8074FD0 @@ -257535,7 +257535,7 @@ sub_80F8560: @ 80F8560 ldr r0, _080F8594 adds r5, r0 adds r0, r6, 0 - bl StringGetLength + bl StringLength adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -258243,16 +258243,16 @@ _080F8ADA: _080F8B0C: .4byte 0x04000010 _080F8B10: ldr r0, _080F8B18 - bl sub_8002A34 + bl SetUpWindowConfig b _080F8D30 .align 2, 0 -_080F8B18: .4byte gUnknown_081E6DFC +_080F8B18: .4byte gWindowConfig_81E6DFC _080F8B1C: ldr r0, _080F8B24 bl sub_8071C58 b _080F8D30 .align 2, 0 -_080F8B24: .4byte gUnknown_081E6DFC +_080F8B24: .4byte gWindowConfig_81E6DFC _080F8B28: bl sub_8071C94 cmp r0, 0 @@ -258547,7 +258547,7 @@ sub_80F8D7C: @ 80F8D7C adds r0, r4, 0 bl sub_814A568 adds r0, r4, 0 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 adds r4, r0 @@ -258626,7 +258626,7 @@ _080F8E04: ldr r1, _080F8E44 bl StringCopy ldr r0, _080F8E40 - bl StringGetLength + bl StringLength movs r2, 0x86 lsls r2, 1 adds r1, r4, r2 @@ -265320,17 +265320,17 @@ _080FC0C4: b _080FC1E6 _080FC104: ldr r0, _080FC10C - bl sub_8002A34 + bl SetUpWindowConfig b _080FC1E6 .align 2, 0 -_080FC10C: .4byte gUnknown_081E7224 +_080FC10C: .4byte gWindowConfig_81E7224 _080FC110: ldr r0, _080FC11C bl sub_8071C4C bl sub_8071EF4 b _080FC1E6 .align 2, 0 -_080FC11C: .4byte gUnknown_081E7224 +_080FC11C: .4byte gWindowConfig_81E7224 _080FC120: ldr r4, _080FC158 adds r0, r4, 0 @@ -277198,14 +277198,14 @@ sub_8101C84: @ 8101C84 push {r4,lr} ldr r4, _08101C9C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C pop {r4} pop {r0} bx r0 .align 2, 0 -_08101C9C: .4byte gUnknown_081E7128 +_08101C9C: .4byte gWindowConfig_81E7128 thumb_func_end sub_8101C84 thumb_func_start sub_8101CA0 @@ -283624,7 +283624,7 @@ sub_8104B80: @ 8104B80 pop {r0} bx r0 .align 2, 0 -_08104BC0: .4byte gUnknown_081E7144 +_08104BC0: .4byte gWindowConfig_81E7144 _08104BC4: .4byte gUnknown_0842CAF7 thumb_func_end sub_8104B80 @@ -283687,7 +283687,7 @@ sub_8104BFC: @ 8104BFC pop {r0} bx r0 .align 2, 0 -_08104C3C: .4byte gUnknown_081E7128 +_08104C3C: .4byte gWindowConfig_81E7128 _08104C40: .4byte 0x02000000 thumb_func_end sub_8104BFC @@ -287513,12 +287513,12 @@ sub_81068FC: @ 81068FC adds r0, r4, 0 bl sub_8071C4C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig pop {r4} pop {r0} bx r0 .align 2, 0 -_08106914: .4byte gUnknown_081E7160 +_08106914: .4byte gWindowConfig_81E7160 thumb_func_end sub_81068FC thumb_func_start sub_8106918 @@ -294715,7 +294715,7 @@ sub_8109E80: @ 8109E80 ldr r0, _0810A0C8 bl LoadSpritePalettes ldr r0, _0810A0CC - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _0810A0D0 bl sub_8071C4C movs r0, 0x1 @@ -294878,8 +294878,8 @@ _0810A0BC: .4byte gUnknown_083F62EC _0810A0C0: .4byte gUnknown_083F7794 _0810A0C4: .4byte gUnknown_083F77A4 _0810A0C8: .4byte gUnknown_083F77B4 -_0810A0CC: .4byte gUnknown_081E6C3C -_0810A0D0: .4byte gUnknown_081E6CE4 +_0810A0CC: .4byte gWindowConfig_81E6C3C +_0810A0D0: .4byte gWindowConfig_81E6CE4 _0810A0D4: .4byte 0x04000208 _0810A0D8: .4byte 0x04000200 _0810A0DC: .4byte 0x04000004 @@ -295792,7 +295792,7 @@ _0810A816: ldr r0, _0810A858 bl LoadSpritePalettes ldr r0, _0810A85C - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _0810A860 bl sub_8071C4C add sp, 0x8 @@ -295805,8 +295805,8 @@ _0810A816: _0810A850: .4byte gUnknown_08E8F824 _0810A854: .4byte gUnknown_083F7A90 _0810A858: .4byte gUnknown_083F7AA0 -_0810A85C: .4byte gUnknown_081E6C3C -_0810A860: .4byte gUnknown_081E6CE4 +_0810A85C: .4byte gWindowConfig_81E6C3C +_0810A860: .4byte gWindowConfig_81E6CE4 thumb_func_end LoadWallClockGraphics thumb_func_start sub_810A864 @@ -297777,19 +297777,19 @@ _0810B7AC: .4byte 0x03001770 _0810B7B0: .4byte 0x0000043c _0810B7B4: ldr r0, _0810B7BC - bl sub_8002A34 + bl SetUpWindowConfig b _0810B91C .align 2, 0 -_0810B7BC: .4byte gUnknown_081E6E34 +_0810B7BC: .4byte gWindowConfig_81E6E34 _0810B7C0: ldr r0, _0810B7D0 - bl sub_8002A34 + bl SetUpWindowConfig ldr r1, _0810B7D4 ldr r0, _0810B7D8 adds r1, r0 b _0810B922 .align 2, 0 -_0810B7D0: .4byte gUnknown_081E6E50 +_0810B7D0: .4byte gWindowConfig_81E6E50 _0810B7D4: .4byte 0x03001770 _0810B7D8: .4byte 0x0000043c _0810B7DC: @@ -297797,7 +297797,7 @@ _0810B7DC: bl sub_8071C58 b _0810B91C .align 2, 0 -_0810B7E4: .4byte gUnknown_081E6E34 +_0810B7E4: .4byte gWindowConfig_81E6E34 _0810B7E8: bl sub_8071C94 cmp r0, 0 @@ -297816,7 +297816,7 @@ _0810B804: bl sub_8071C58 b _0810B91C .align 2, 0 -_0810B80C: .4byte gUnknown_081E6E50 +_0810B80C: .4byte gWindowConfig_81E6E50 _0810B810: bl sub_8071C94 cmp r0, 0 @@ -298199,7 +298199,7 @@ sub_810BB0C: @ 810BB0C pop {r0} bx r0 .align 2, 0 -_0810BB28: .4byte gUnknown_081E6E34 +_0810BB28: .4byte gWindowConfig_81E6E34 _0810BB2C: .4byte 0x00000111 thumb_func_end sub_810BB0C @@ -298231,7 +298231,7 @@ sub_810BB30: @ 810BB30 pop {r0} bx r0 .align 2, 0 -_0810BB70: .4byte gUnknown_081E6E34 +_0810BB70: .4byte gWindowConfig_81E6E34 _0810BB74: .4byte gUnknown_0840EBED _0810BB78: .4byte gUnknown_0840EBF3 _0810BB7C: .4byte gUnknown_0840EBF7 @@ -298292,7 +298292,7 @@ _0810BBB0: bl Reset b _0810BC6C .align 2, 0 -_0810BBF4: .4byte gUnknown_081E6E34 +_0810BBF4: .4byte gWindowConfig_81E6E34 _0810BBF8: .4byte 0x020231cc _0810BBFC: .4byte 0x02025734 _0810BC00: .4byte 0x02039248 @@ -298692,7 +298692,7 @@ _0810BECC: bl Print b _0810BF2C .align 2, 0 -_0810BF10: .4byte gUnknown_081E6E34 +_0810BF10: .4byte gWindowConfig_81E6E34 _0810BF14: .4byte 0x02039248 _0810BF18: .4byte 0x020231cc _0810BF1C: .4byte 0x02025f2c @@ -299303,7 +299303,7 @@ _0810C37C: bx r0 .align 2, 0 _0810C3E8: .4byte 0x02039244 -_0810C3EC: .4byte gUnknown_081E6E50 +_0810C3EC: .4byte gWindowConfig_81E6E50 _0810C3F0: .4byte 0x0203924c _0810C3F4: .4byte gUnknown_083F7EF4 _0810C3F8: .4byte 0x03000758 @@ -299504,7 +299504,7 @@ sub_810C540: @ 810C540 pop {r0} bx r0 .align 2, 0 -_0810C5A0: .4byte gUnknown_081E6E50 +_0810C5A0: .4byte gWindowConfig_81E6E50 _0810C5A4: .4byte 0x020231cc _0810C5A8: .4byte gUnknown_083F7EB8 _0810C5AC: .4byte 0x02025734 @@ -299645,7 +299645,7 @@ _0810C698: bx r0 .align 2, 0 _0810C6CC: .4byte 0x02039248 -_0810C6D0: .4byte gUnknown_081E6E50 +_0810C6D0: .4byte gWindowConfig_81E6E50 _0810C6D4: .4byte 0x03004b20 _0810C6D8: .4byte sub_810BF7C thumb_func_end sub_810C668 @@ -299700,7 +299700,7 @@ sub_810C704: @ 810C704 pop {r0} bx r0 .align 2, 0 -_0810C738: .4byte gUnknown_081E6E34 +_0810C738: .4byte gWindowConfig_81E6E34 _0810C73C: .4byte 0x02039248 _0810C740: .4byte 0x03004b20 _0810C744: .4byte sub_810C6DC @@ -306268,7 +306268,7 @@ sub_810F96C: @ 810F96C bl PokemonGetField ldr r0, _0810F9A0 adds r1, r4, 0 - bl CompareStringWithoutExtendedControlCodes + bl StringCompareWithoutExtCtrlCodes cmp r0, 0 beq _0810F9A4 movs r0, 0x1 @@ -306954,7 +306954,7 @@ _0810FED0: bne _0810FEF2 adds r0, r4, 0 movs r1, 0x1 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset _0810FEF2: pop {r4} pop {r0} @@ -307117,7 +307117,7 @@ _0810FFFE: strb r0, [r6, 0x7] adds r0, r6, 0 mov r1, r8 - bl CompareStringWithoutExtendedControlCodes + bl StringCompareWithoutExtCtrlCodes cmp r0, 0 bne _08110028 ldrh r0, [r4, 0x8] @@ -307520,7 +307520,7 @@ sub_81102E8: @ 81102E8 adds r0, r4, 0 movs r2, 0x1 movs r3, 0x4 - bl ConvertIntToDecimalStringN_UnknownExtCtrlCode + bl ConvertIntToDecimalStringN_DigitWidth6 ldr r4, _0811033C movs r0, 0x18 bl sub_8053108 @@ -307528,7 +307528,7 @@ sub_81102E8: @ 81102E8 adds r0, r4, 0 movs r2, 0x1 movs r3, 0x4 - bl ConvertIntToDecimalStringN_UnknownExtCtrlCode + bl ConvertIntToDecimalStringN_DigitWidth6 ldr r4, _08110340 movs r0, 0x19 bl sub_8053108 @@ -307536,7 +307536,7 @@ sub_81102E8: @ 81102E8 adds r0, r4, 0 movs r2, 0x1 movs r3, 0x4 - bl ConvertIntToDecimalStringN_UnknownExtCtrlCode + bl ConvertIntToDecimalStringN_DigitWidth6 ldr r0, _08110344 movs r1, 0x3 movs r2, 0x3 @@ -310457,7 +310457,7 @@ evolution_cutscene: @ 8111984 strh r5, [r0] ldr r4, _08111C18 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig bl sub_8073B94 ldr r0, _08111C1C strh r5, [r0] @@ -310480,7 +310480,7 @@ evolution_cutscene: @ 8111984 strh r5, [r0] ldr r0, _08111C3C adds r1, r4, 0 - bl sub_8002D54 + bl InitWindowFromConfig ldr r1, _08111C40 movs r0, 0x9 strb r0, [r1] @@ -310705,7 +310705,7 @@ evolution_cutscene: @ 8111984 .align 2, 0 _08111C10: .4byte 0x05006000 _08111C14: .4byte 0x0400004c -_08111C18: .4byte gUnknown_081E6C58 +_08111C18: .4byte gWindowConfig_81E6C58 _08111C1C: .4byte 0x030042a4 _08111C20: .4byte 0x030042a0 _08111C24: .4byte 0x030042c0 @@ -310796,7 +310796,7 @@ sub_8111C90: @ 8111C90 strh r5, [r0] ldr r4, _08111E28 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig bl sub_8073B94 ldr r0, _08111E2C strh r5, [r0] @@ -310819,7 +310819,7 @@ sub_8111C90: @ 8111C90 strh r5, [r0] ldr r0, _08111E4C adds r1, r4, 0 - bl sub_8002D54 + bl InitWindowFromConfig ldr r1, _08111E50 movs r0, 0x9 strb r0, [r1] @@ -310917,7 +310917,7 @@ _08111E18: .4byte 0x02014800 _08111E1C: .4byte 0x03004360 _08111E20: .4byte 0x05006000 _08111E24: .4byte 0x0400004c -_08111E28: .4byte gUnknown_081E6C58 +_08111E28: .4byte gWindowConfig_81E6C58 _08111E2C: .4byte 0x030042a4 _08111E30: .4byte 0x030042a0 _08111E34: .4byte 0x030042c0 @@ -311040,15 +311040,15 @@ _08111F64: .4byte 0x0000043c _08111F68: ldr r4, _08111F80 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _08111F84 ldr r0, [r0] adds r0, 0x4 adds r1, r4, 0 - bl sub_8002D54 + bl InitWindowFromConfig b _08112088 .align 2, 0 -_08111F80: .4byte gUnknown_081E6F84 +_08111F80: .4byte gWindowConfig_81E6F84 _08111F84: .4byte 0x03004828 _08111F88: ldr r4, _08111FC8 @@ -313715,7 +313715,7 @@ _0811369C: movs r3, 0x9 str r3, [sp] movs r3, 0x19 - bl CreateTextRenderer + bl InitWindow ldr r0, [r5] adds r0, 0x4 bl sub_8002F44 @@ -313796,7 +313796,7 @@ _08113768: movs r1, 0x18 movs r2, 0x8 movs r3, 0x1D - bl sub_80047FC + bl ZeroFillWindowRect bl sub_814A7FC ldr r0, _081137D8 movs r1, 0x92 @@ -313870,7 +313870,7 @@ _08113818: movs r1, 0x18 movs r2, 0x8 movs r3, 0x1D - bl sub_80047FC + bl ZeroFillWindowRect bl sub_814A7FC ldr r0, _08113874 movs r1, 0x92 @@ -317387,7 +317387,7 @@ _08115458: .4byte 0x03001770 _0811545C: .4byte 0x0000043c _08115460: ldr r0, _08115480 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _08115484 bl sub_8071C4C ldr r0, _08115488 @@ -317400,8 +317400,8 @@ _08115460: adds r1, r2 b _0811557A .align 2, 0 -_08115480: .4byte gUnknown_081E6C3C -_08115484: .4byte gUnknown_081E6CE4 +_08115480: .4byte gWindowConfig_81E6C3C +_08115484: .4byte gWindowConfig_81E6CE4 _08115488: .4byte gUnknown_083F86BC _0811548C: .4byte 0x03001770 _08115490: .4byte 0x0000043c @@ -327928,7 +327928,7 @@ _0811A7EA: movs r0, 0x11 strb r0, [r4, 0x1] mov r0, sp - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 subs r0, r5, r0 @@ -363565,7 +363565,7 @@ sub_812BB10: @ 812BB10 movs r1, 0xA movs r2, 0x2 movs r3, 0xF - bl sub_80047C8 + bl FillWindowRect_DefaultPalette movs r0, 0x10 str r0, [sp] movs r0, 0x24 @@ -363574,7 +363574,7 @@ sub_812BB10: @ 812BB10 movs r1, 0xA movs r2, 0x2 movs r3, 0x23 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette ldr r1, _0812BBD8 ldr r0, _0812BBDC ldrb r0, [r0] @@ -363589,7 +363589,7 @@ sub_812BB10: @ 812BB10 str r0, [sp] adds r0, r4, 0 movs r3, 0x12 - bl CreateTextRenderer + bl InitWindow adds r0, r4, 0 bl sub_8002F44 ldr r1, _0812BBE8 @@ -363623,7 +363623,7 @@ _0812BB84: str r0, [sp] adds r0, r4, 0 movs r3, 0x2 - bl CreateTextRenderer + bl InitWindow adds r0, r4, 0 bl sub_8002F44 add sp, 0x8 @@ -377547,13 +377547,13 @@ sub_81326D8: @ 81326D8 bl SetVBlankCallback ldr r4, _0813278C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C bl sub_8071EF4 ldr r4, _08132790 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C bl sub_8071EF4 @@ -377587,8 +377587,8 @@ _0813277C: .4byte 0x02017000 _08132780: .4byte 0x0202e8cc _08132784: .4byte 0x000002c5 _08132788: .4byte sub_813265C -_0813278C: .4byte gUnknown_081E7240 -_08132790: .4byte gUnknown_081E6CE4 +_0813278C: .4byte gWindowConfig_81E7240 +_08132790: .4byte gWindowConfig_81E6CE4 _08132794: .4byte 0x04000012 _08132798: .4byte gUnknown_08402D80 _0813279C: .4byte gUnknown_08402D88 @@ -377616,13 +377616,13 @@ sub_81327A4: @ 81327A4 bl SetVBlankCallback ldr r4, _08132858 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C bl sub_8071EF4 ldr r4, _0813285C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C bl sub_8071EF4 @@ -377663,8 +377663,8 @@ _08132848: .4byte 0x02017000 _0813284C: .4byte 0x0202e8ce _08132850: .4byte 0x000002c6 _08132854: .4byte sub_813265C -_08132858: .4byte gUnknown_081E7240 -_0813285C: .4byte gUnknown_081E6CE4 +_08132858: .4byte gWindowConfig_81E7240 +_0813285C: .4byte gWindowConfig_81E6CE4 _08132860: .4byte 0x04000012 _08132864: .4byte gUnknown_08402D80 _08132868: .4byte gUnknown_08402D88 @@ -378586,9 +378586,9 @@ _08132FFA: pop {r0} bx r0 .align 2, 0 -_08133024: .4byte gUnknown_081E7240 +_08133024: .4byte gWindowConfig_81E7240 _08133028: .4byte gUnknown_08402CF8 -_0813302C: .4byte gUnknown_081E6CE4 +_0813302C: .4byte gWindowConfig_81E6CE4 thumb_func_end sub_8132FEC thumb_func_start sub_8133030 @@ -379618,7 +379618,7 @@ _0813381C: _08133834: .4byte 0x030007b0 _08133838: .4byte 0x02039360 _0813383C: .4byte gBattleMoves -_08133840: .4byte gUnknown_081E72B0 +_08133840: .4byte gEmptyString_81E72B0 _08133844: ldrb r0, [r2, 0x1A] subs r0, 0x1 @@ -385173,16 +385173,16 @@ _0813635E: b _08136524 _08136366: ldr r0, _08136370 - bl sub_8002A34 + bl SetUpWindowConfig b _08136524 .align 2, 0 -_08136370: .4byte gUnknown_081E7080 +_08136370: .4byte gWindowConfig_81E7080 _08136374: ldr r0, _0813637C bl sub_8071C58 b _08136524 .align 2, 0 -_0813637C: .4byte gUnknown_081E7080 +_0813637C: .4byte gWindowConfig_81E7080 _08136380: bl sub_8071C94 cmp r0, 0 @@ -386235,7 +386235,7 @@ _08136C2C: .4byte 0x000087dc _08136C30: .4byte 0x03004360 _08136C34: .4byte 0x02039304 _08136C38: .4byte gUnknown_08411581 -_08136C3C: .4byte gUnknown_081E709C +_08136C3C: .4byte gWindowConfig_81E709C thumb_func_end sub_8136BB8 thumb_func_start sub_8136C40 @@ -386259,7 +386259,7 @@ _08136C60: pop {r1} bx r1 .align 2, 0 -_08136C68: .4byte gUnknown_081E7080 +_08136C68: .4byte gWindowConfig_81E7080 thumb_func_end sub_8136C40 thumb_func_start sub_8136C6C @@ -386278,7 +386278,7 @@ sub_8136C6C: @ 8136C6C movs r1, 0 b _08136C9C .align 2, 0 -_08136C8C: .4byte gUnknown_081E709C +_08136C8C: .4byte gWindowConfig_81E709C _08136C90: .4byte 0x02039304 _08136C94: ldr r0, [r3] @@ -386407,7 +386407,7 @@ sub_8136D60: @ 8136D60 pop {r0} bx r0 .align 2, 0 -_08136D84: .4byte gUnknown_081E709C +_08136D84: .4byte gWindowConfig_81E709C _08136D88: .4byte gUnknown_084115E1 thumb_func_end sub_8136D60 @@ -386420,7 +386420,7 @@ sub_8136D8C: @ 8136D8C pop {r0} bx r0 .align 2, 0 -_08136D9C: .4byte gUnknown_081E7080 +_08136D9C: .4byte gWindowConfig_81E7080 thumb_func_end sub_8136D8C thumb_func_start sub_8136DA0 @@ -390965,7 +390965,7 @@ sub_8139298: @ 8139298 movs r1, 0xA movs r2, 0x2 movs r3, 0xF - bl sub_80047C8 + bl FillWindowRect_DefaultPalette movs r0, 0x10 str r0, [sp] movs r0, 0x24 @@ -390974,7 +390974,7 @@ sub_8139298: @ 8139298 movs r1, 0xA movs r2, 0x2 movs r3, 0x23 - bl sub_80047C8 + bl FillWindowRect_DefaultPalette ldr r1, _08139358 ldr r0, _0813935C ldrb r0, [r0] @@ -390989,7 +390989,7 @@ sub_8139298: @ 8139298 str r0, [sp] adds r0, r4, 0 movs r3, 0x12 - bl CreateTextRenderer + bl InitWindow adds r0, r4, 0 bl sub_8002F44 ldr r1, _08139368 @@ -391019,7 +391019,7 @@ _0813930C: str r0, [sp] adds r0, r4, 0 movs r3, 0x2 - bl CreateTextRenderer + bl InitWindow adds r0, r4, 0 bl sub_8002F44 add sp, 0x8 @@ -402689,7 +402689,7 @@ sub_813EEE4: @ 813EEE4 bl sub_80FBB3C ldr r4, _0813EF9C adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C bl sub_8071EF4 @@ -402731,7 +402731,7 @@ sub_813EEE4: @ 813EEE4 bx r0 .align 2, 0 _0813EF98: .4byte 0x02000008 -_0813EF9C: .4byte gUnknown_081E709C +_0813EF9C: .4byte gWindowConfig_81E709C _0813EFA0: .4byte 0x04000008 _0813EFA4: .4byte gUnknown_0842C5B5 _0813EFA8: .4byte sub_813EFC4 @@ -409222,7 +409222,7 @@ sub_81422E8: @ 81422E8 lsrs r4, 24 ldr r5, _08142314 adds r0, r5, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r5, 0 bl sub_8071C4C ldr r1, _08142318 @@ -409236,7 +409236,7 @@ sub_81422E8: @ 81422E8 pop {r0} bx r0 .align 2, 0 -_08142314: .4byte gUnknown_081E7198 +_08142314: .4byte gWindowConfig_81E7198 _08142318: .4byte 0x03004b20 _0814231C: .4byte sub_8142320 thumb_func_end sub_81422E8 @@ -409777,7 +409777,7 @@ sub_8142738: @ 8142738 strh r0, [r1] ldr r4, _08142784 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C ldr r0, _08142788 @@ -409800,7 +409800,7 @@ sub_8142738: @ 8142738 pop {r0} bx r0 .align 2, 0 -_08142784: .4byte gUnknown_081E71B4 +_08142784: .4byte gWindowConfig_81E71B4 _08142788: .4byte 0x02024ea4 _0814278C: .4byte 0x03004b20 _08142790: .4byte sub_8142794 @@ -410205,7 +410205,7 @@ _08142AB8: bls _08142AB8 ldr r4, _08142AFC adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C ldr r1, _08142AF0 @@ -410222,7 +410222,7 @@ _08142AEA: _08142AF0: .4byte 0x03004b20 _08142AF4: .4byte 0x0600381a _08142AF8: .4byte 0x0600385a -_08142AFC: .4byte gUnknown_081E7198 +_08142AFC: .4byte gWindowConfig_81E7198 _08142B00: .4byte sub_8142B04 thumb_func_end sub_8142A28 @@ -411542,7 +411542,7 @@ sub_8143570: @ 8143570 bl LoadCompressedObjectPalette ldr r4, _081435B4 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C pop {r4} @@ -411552,7 +411552,7 @@ sub_8143570: @ 8143570 _081435A8: .4byte 0x030028f8 _081435AC: .4byte gUnknown_0840B514 _081435B0: .4byte gUnknown_0840B524 -_081435B4: .4byte gUnknown_081E71B4 +_081435B4: .4byte gWindowConfig_81E71B4 thumb_func_end sub_8143570 thumb_func_start sub_81435B8 @@ -412130,7 +412130,7 @@ _08143A0E: strh r1, [r0, 0x8] ldr r4, _08143AF8 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C ldr r0, _08143AFC @@ -412210,7 +412210,7 @@ _08143A0E: .align 2, 0 _08143AF0: .4byte sub_8143B38 _08143AF4: .4byte 0x03004b20 -_08143AF8: .4byte gUnknown_081E7208 +_08143AF8: .4byte gWindowConfig_81E7208 _08143AFC: .4byte gUnknown_0840B7BC _08143B00: .4byte gUnknown_0840B7FC _08143B04: .4byte 0x0600bee0 @@ -416662,7 +416662,7 @@ sub_8145D88: @ 8145D88 movs r2, 0x40 bl gpu_pal_apply ldr r0, _08145ED4 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _08145ED8 bl sub_8071C4C bl pokedex_diploma_something @@ -416724,8 +416724,8 @@ _08145EC4: .4byte gUnknown_0840D288 _08145EC8: .4byte gUnknown_0840CB4C _08145ECC: .4byte 0x06003000 _08145ED0: .4byte gUnknown_0840CB0C -_08145ED4: .4byte gUnknown_081E6C3C -_08145ED8: .4byte gUnknown_081E6CE4 +_08145ED4: .4byte gWindowConfig_81E6C3C +_08145ED8: .4byte gWindowConfig_81E6CE4 _08145EDC: .4byte 0x04000208 _08145EE0: .4byte 0x04000200 _08145EE4: .4byte 0x04000004 @@ -416972,13 +416972,13 @@ _081460F0: b _0814620C _081460F6: ldr r0, _08146104 - bl sub_8002A34 + bl SetUpWindowConfig ldr r1, _08146108 ldr r0, _0814610C adds r1, r0 b _08146212 .align 2, 0 -_08146104: .4byte gUnknown_081E6E18 +_08146104: .4byte gWindowConfig_81E6E18 _08146108: .4byte 0x03001770 _0814610C: .4byte 0x0000043c _08146110: @@ -416986,7 +416986,7 @@ _08146110: bl sub_8071C58 b _0814620C .align 2, 0 -_08146118: .4byte gUnknown_081E6E18 +_08146118: .4byte gWindowConfig_81E6E18 _0814611C: bl sub_8071C94 cmp r0, 0 @@ -418019,7 +418019,7 @@ sub_8146930: @ 8146930 bl SetVBlankCallback ldr r4, _081469A0 adds r0, r4, 0 - bl sub_8002A34 + bl SetUpWindowConfig adds r0, r4, 0 bl sub_8071C4C bl sub_8071EF4 @@ -418051,7 +418051,7 @@ sub_8146930: @ 8146930 bx r0 .align 2, 0 _0814699C: .4byte sub_8146900 -_081469A0: .4byte gUnknown_081E6CE4 +_081469A0: .4byte gWindowConfig_81E6CE4 _081469A4: .4byte sub_8007080 _081469A8: .4byte sub_81469E4 thumb_func_end sub_8146930 @@ -418687,7 +418687,7 @@ _08146E6C: movs r2, 0x20 bl gpu_pal_apply ldr r0, _08146FF4 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _08146FF8 bl sub_8071C4C movs r0, 0xD @@ -418764,8 +418764,8 @@ _08146FE4: .4byte gUnknown_08411980 _08146FE8: .4byte 0x06010020 _08146FEC: .4byte gUnknown_083F62EC _08146FF0: .4byte gUnknown_08411960 -_08146FF4: .4byte gUnknown_081E6C3C -_08146FF8: .4byte gUnknown_081E6CE4 +_08146FF4: .4byte gWindowConfig_81E6C3C +_08146FF8: .4byte gWindowConfig_81E6CE4 _08146FFC: .4byte gUnknown_084115F9 _08147000: .4byte 0x04000208 _08147004: .4byte 0x04000200 @@ -419920,13 +419920,13 @@ _08147960: b _08147A44 _08147966: ldr r0, _08147974 - bl sub_8002A34 + bl SetUpWindowConfig ldr r1, _08147978 ldr r2, _0814797C adds r1, r2 b _08147A4A .align 2, 0 -_08147974: .4byte gUnknown_081E6E50 +_08147974: .4byte gWindowConfig_81E6E50 _08147978: .4byte 0x03001770 _0814797C: .4byte 0x0000043c _08147980: @@ -419934,7 +419934,7 @@ _08147980: bl sub_8071C58 b _08147A44 .align 2, 0 -_08147988: .4byte gUnknown_081E6E50 +_08147988: .4byte gWindowConfig_81E6E50 _0814798C: bl sub_8071C94 cmp r0, 0 @@ -421942,7 +421942,7 @@ _08148A2C: bl ResetTasks bl ResetSpriteData ldr r0, _08148AE0 - bl sub_8002A34 + bl SetUpWindowConfig ldr r0, _08148AE4 bl sub_8071C4C movs r0, 0x1 @@ -422000,8 +422000,8 @@ _08148AD0: .4byte 0x06000020 _08148AD4: .4byte 0x00001111 _08148AD8: .4byte 0x06003800 _08148ADC: .4byte 0x000004ff -_08148AE0: .4byte gUnknown_081E6C3C -_08148AE4: .4byte gUnknown_081E6CE4 +_08148AE0: .4byte gWindowConfig_81E6C3C +_08148AE4: .4byte gWindowConfig_81E6CE4 _08148AE8: .4byte 0x0000ffff _08148AEC: .4byte 0x04000208 _08148AF0: .4byte 0x04000200 @@ -425376,9 +425376,9 @@ sub_814A518: @ 814A518 adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - bl StripExtendedControlCodes + bl SkipExtCtrlCodes adds r0, r4, 0 - bl StringGetLength + bl StringLength lsls r0, 24 lsrs r1, r0, 24 cmp r5, 0xFC @@ -425419,18 +425419,18 @@ _0814A55A: sub_814A568: @ 814A568 push {r4,lr} adds r4, r0, 0 - bl StringGetLength + bl StringLength lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 bhi _0814A582 adds r0, r4, 0 movs r1, 0x1 - bl StopMusicWhileStringIsPrinted + bl SetStringCharset b _0814A588 _0814A582: adds r0, r4, 0 - bl StripExtendedControlCodes + bl SkipExtCtrlCodes _0814A588: pop {r4} pop {r0} |