diff options
Diffstat (limited to 'asm')
121 files changed, 2353 insertions, 4336 deletions
@@ -138,7 +138,7 @@ sub_810B958: @ 810B958 movs r0, 0x1 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0x48 subs r2, r0 lsrs r2, 1 @@ -174,7 +174,7 @@ sub_810B994: @ 810B994 movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r3, 0x40 subs r3, r0 lsrs r3, 1 diff --git a/asm/battle_1.s b/asm/battle_1.s index c31187f21..2c3b04c6f 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -1038,7 +1038,7 @@ _0800F9FC: bl sub_800F5CC _0800FA08: movs r0, 0x71 - bl sub_80722CC + bl PlaySE adds r0, r7, 0 bl DestroyTask ldr r4, _0800FAD0 @ =gUnknown_202063C diff --git a/asm/battle_2.s b/asm/battle_2.s index 23f7b3834..c5baa1bf9 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -3267,7 +3267,7 @@ sub_801182C: @ 801182C ldr r0, _08011848 @ =sub_80117BC str r0, [r4, 0x1C] movs r0, 0x61 - bl sub_80722CC + bl PlaySE pop {r4} pop {r0} bx r0 @@ -13686,7 +13686,7 @@ HandleAction_SafriZoneRun: @ 8016C60 ldrb r0, [r0] strb r0, [r2] movs r0, 0x11 - bl sub_80722CC + bl PlaySE ldr r0, _08016C94 @ =gUnknown_2023BCC ldrb r0, [r0] strb r0, [r4] diff --git a/asm/battle_anim.s b/asm/battle_anim.s index 9ec1ed55a..d311aaee9 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -944,7 +944,7 @@ sub_8072C08: @ 8072C08 ldrb r1, [r1, 0x1] lsls r1, 8 orrs r0, r1 - bl sub_80722CC + bl PlaySE ldr r0, [r4] adds r0, 0x2 str r0, [r4] diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index e36e9e23f..1d5e34fbd 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -39516,7 +39516,7 @@ _080B538A: cmp r0, 0 ble _080B5396 movs r0, 0xBD - bl sub_80722CC + bl PlaySE _080B5396: movs r1, 0x3A ldrsh r0, [r4, r1] diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index 4630d5e28..1cd0b1955 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -1759,7 +1759,7 @@ sub_80EFA0C: @ 80EFA0C cmp r0, 0xB bne _080EFA3E movs r0, 0x35 - bl sub_80722CC + bl PlaySE _080EFA3E: movs r1, 0x8 ldrsh r0, [r5, r1] @@ -1992,19 +1992,19 @@ _080EFC00: b _080EFC1E _080EFC06: movs r0, 0x31 - bl sub_80722CC + bl PlaySE b _080EFC52 _080EFC0E: movs r0, 0x32 - bl sub_80722CC + bl PlaySE b _080EFC52 _080EFC16: movs r0, 0x33 - bl sub_80722CC + bl PlaySE b _080EFC52 _080EFC1E: movs r0, 0x34 - bl sub_80722CC + bl PlaySE b _080EFC52 _080EFC26: movs r2, 0x38 @@ -2097,7 +2097,7 @@ sub_80EFCA0: @ 80EFCA0 ldr r0, _080EFCE8 @ =sub_80EFCEC str r0, [r4, 0x1C] movs r0, 0x17 - bl sub_80722CC + bl PlaySE _080EFCDC: pop {r4,r5} pop {r0} @@ -2440,7 +2440,7 @@ _080EFF6C: bl StartSpriteAffineAnim _080EFF74: movs r0, 0x17 - bl sub_80722CC + bl PlaySE _080EFF7A: pop {r4-r6} pop {r0} @@ -2506,7 +2506,7 @@ sub_80EFFC4: @ 80EFFC4 cmp r1, 0x28 bne _080F0008 movs r0, 0xF7 - bl sub_80722CC + bl PlaySE ldrb r1, [r6, 0x5] lsrs r1, 4 movs r0, 0x80 @@ -2545,7 +2545,7 @@ _080F0026: bl UpdateOamPriorityInAllHealthboxes bl m4aMPlayAllStop ldr r0, _080F0048 @ =0x0000013f - bl sub_80722CC + bl PlaySE b _080F0088 .align 2, 0 _080F0044: .4byte gUnknown_2024005 @@ -3331,7 +3331,7 @@ LaunchBallStarsTask: @ 80F05EC strh r1, [r0, 0x10] strh r5, [r0, 0x26] movs r0, 0xF - bl sub_80722CC + bl PlaySE adds r0, r4, 0 pop {r3-r5} mov r8, r3 diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index c975b7de2..99f8d7201 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -115,7 +115,7 @@ sub_80E763C: @ 80E763C cmp r0, 0 beq _080E76D4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _080E76A8 @ =gUnknown_2023FF8 ldrb r0, [r4] adds r0, r1 @@ -172,7 +172,7 @@ _080E76D4: b _080E7838 _080E76EE: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -200,7 +200,7 @@ _080E770C: b _080E7838 _080E7726: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -244,7 +244,7 @@ _080E7764: bne _080E7838 _080E777C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -311,7 +311,7 @@ _080E77AC: bl sub_809A084 _080E780A: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 movs r1, 0xC _080E7814: @@ -380,7 +380,7 @@ _080E787C: cmp r0, 0 bne _080E78D8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl ActionSelectionDestroyCursorAt movs r0, 0x1 @@ -406,7 +406,7 @@ _080E78B4: cmp r0, 0 bne _080E78D8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 movs r1, 0x1 movs r2, 0 @@ -1303,7 +1303,7 @@ sub_80E7F7C: @ 80E7F7C mov r0, r10 bl SetBattleBarStruct movs r0, 0x1B - bl sub_80722CC + bl PlaySE ldr r0, _080E8048 @ =sub_80E804C mov r1, r8 str r0, [r1] @@ -6156,7 +6156,7 @@ _080EA83E: cmp r0, 0 bne _080EA866 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r2, 0x80 lsls r2, 1 movs r0, 0x1 @@ -6715,7 +6715,7 @@ sub_80EAC84: @ 80EAC84 ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - bl sub_80722CC + bl PlaySE bl WallyBufferExecCompleted pop {r0} bx r0 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 3dacf2d99..59e807fb3 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -188,7 +188,7 @@ sub_802E438: @ 802E438 cmp r0, 0 beq _0802E4D0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802E4A4 @ =gUnknown_2023FF8 ldrb r0, [r4] adds r0, r1 @@ -245,7 +245,7 @@ _0802E4D0: b _0802E634 _0802E4EA: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -273,7 +273,7 @@ _0802E508: b _0802E634 _0802E522: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -317,7 +317,7 @@ _0802E560: bne _0802E634 _0802E578: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -384,7 +384,7 @@ _0802E5A8: bl sub_809A084 _0802E606: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 movs r1, 0xC _0802E610: @@ -478,7 +478,7 @@ _0802E6B6: cmp r0, 0 beq _0802E72C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _0802E718 @ =gUnknown_202063C ldr r1, _0802E71C @ =gUnknown_2023D44 ldr r4, _0802E70C @ =gUnknown_3004FF4 @@ -524,7 +524,7 @@ _0802E72C: cmp r0, 0 beq _0802E7A0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _0802E784 @ =gUnknown_202063C ldr r1, _0802E788 @ =gUnknown_2023D44 ldr r5, _0802E78C @ =gUnknown_3004FF4 @@ -575,7 +575,7 @@ _0802E7A0: b _0802E8C4 _0802E7AA: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _0802E7DC @ =gUnknown_202063C ldr r1, _0802E7E0 @ =gUnknown_2023D44 ldr r3, _0802E7E4 @ =gUnknown_3004FF4 @@ -716,7 +716,7 @@ _0802E8C4: b _0802E9DC _0802E8CE: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _0802E900 @ =gUnknown_202063C ldr r1, _0802E904 @ =gUnknown_2023D44 ldr r3, _0802E908 @ =gUnknown_3004FF4 @@ -895,7 +895,7 @@ sub_802EA10: @ 802EA10 b _0802EC10 _0802EA3A: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802EA78 @ =gUnknown_2023FFC ldrb r0, [r6] adds r0, r1 @@ -1119,7 +1119,7 @@ _0802EC10: cmp r0, 0 beq _0802EC38 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _0802EC34 @ =0x0000ffff movs r0, 0x1 movs r1, 0xA @@ -1242,7 +1242,7 @@ _0802ECDC: _0802ED10: strb r0, [r1] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r6] adds r0, r4 ldrb r0, [r0] @@ -1344,7 +1344,7 @@ sub_802EDDC: @ 802EDDC cmp r0, 0 beq _0802EDF6 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r7, 0x1 _0802EDF6: ldrh r1, [r4, 0x2E] @@ -1353,7 +1353,7 @@ _0802EDF6: cmp r0, 0 beq _0802EE18 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802EF44 @ =gUnknown_2022974 movs r0, 0 strh r0, [r1] @@ -1387,7 +1387,7 @@ _0802EE18: eors r0, r2 strb r0, [r1] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1424,7 +1424,7 @@ _0802EE58: eors r0, r6 strb r0, [r1] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1455,7 +1455,7 @@ _0802EEA6: eors r0, r2 strb r0, [r1] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1492,7 +1492,7 @@ _0802EEE8: eors r0, r6 strb r0, [r1] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -1529,7 +1529,7 @@ sub_802EF58: @ 802EF58 b _0802F34C _0802EF72: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0802F2E8 @ =gUnknown_2023FFC mov r10, r0 ldr r1, _0802F2EC @ =gUnknown_2023BC4 @@ -2017,7 +2017,7 @@ _0802F34C: cmp r0, 0 beq _0802F3C8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0802F3A0 @ =gUnknown_3004FF4 ldrb r0, [r0] bl MoveSelectionDestroyCursorAt @@ -2101,7 +2101,7 @@ _0802F416: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802F444 @ =gUnknown_2023FFC ldr r0, _0802F448 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -2168,7 +2168,7 @@ _0802F4AA: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802F4D8 @ =gUnknown_2023FFC ldr r0, _0802F4DC @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -2228,7 +2228,7 @@ _0802F52E: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802F55C @ =gUnknown_2023FFC ldr r0, _0802F560 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -2295,7 +2295,7 @@ _0802F5C2: eors r0, r1 strb r0, [r4] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802F5F0 @ =gUnknown_2023FFC ldr r0, _0802F5F4 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -3632,7 +3632,7 @@ sub_8030024: @ 8030024 mov r0, r10 bl SetBattleBarStruct movs r0, 0x1B - bl sub_80722CC + bl PlaySE ldr r0, _080300F0 @ =sub_80300F4 mov r1, r8 str r0, [r1] @@ -4090,7 +4090,7 @@ _0803047C: b _080304E0 _08030486: movs r0, 0x58 - bl sub_80722CC + bl PlaySE bl IsMonGettingExpSentOut cmp r0, 0 beq _080304E0 diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index 105922382..7326f6728 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -1279,7 +1279,7 @@ sub_8156A54: @ 8156A54 mov r0, r10 bl SetBattleBarStruct movs r0, 0x1B - bl sub_80722CC + bl PlaySE ldr r0, _08156B20 @ =sub_8156B24 mov r1, r8 str r0, [r1] @@ -6010,7 +6010,7 @@ sub_815920C: @ 815920C ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - bl sub_80722CC + bl PlaySE bl PlayerPartnerBufferExecCompleted pop {r0} bx r0 @@ -6791,7 +6791,7 @@ _0815985C: cmp r0, 0 bne _08159888 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08159888: ldrb r0, [r4] lsls r0, 2 @@ -6886,7 +6886,7 @@ _0815992C: cmp r0, r1 bne _08159972 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -6961,7 +6961,7 @@ sub_8159998: @ 8159998 cmp r0, 0 bne _081599DE movs r0, 0x5 - bl sub_80722CC + bl PlaySE _081599DE: ldrb r0, [r6] lsls r0, 2 @@ -7023,7 +7023,7 @@ _08159A48: cmp r0, r4 bne _08159A8E movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r6] adds r0, r5 ldrb r0, [r0] @@ -7288,7 +7288,7 @@ _08159C64: cmp r0, 0 beq _08159CEE movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x81 negs r0, r0 str r4, [sp] @@ -7488,7 +7488,7 @@ _08159E0C: cmp r0, 0 beq _08159EDE movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _08159E5C @ =gUnknown_825E45C ldr r0, _08159E60 @ =gUnknown_2023FE8 ldr r0, [r0] diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 04269dca0..65551bec5 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -77,7 +77,7 @@ HandleInputChooseAction_0: @ 80DD5A4 cmp r0, 0 beq _080DD612 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _080DD5D8 @ =gUnknown_2023FF8 ldr r0, _080DD5DC @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -138,7 +138,7 @@ _080DD612: cmp r0, 0 beq _080DD71A movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -166,7 +166,7 @@ _080DD650: cmp r0, 0 bne _080DD71A movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -194,7 +194,7 @@ _080DD68C: cmp r0, 0 beq _080DD71A movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] @@ -230,7 +230,7 @@ _080DD6D8: cmp r0, 0 bne _080DD71A movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, r5 ldrb r0, [r0] diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index 49c778509..36320e346 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -2581,7 +2581,7 @@ HandleLowHpMusicChange: @ 8035244 cmp r0, 0 bne _080352AA movs r0, 0x53 - bl sub_80722CC + bl PlaySE _080352AA: ldr r0, [r7] ldr r1, [r0] diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 1c7342735..b67482edd 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -1379,7 +1379,7 @@ _0804858A: str r1, [sp, 0xC] adds r2, r5, 0 movs r3, 0 - bl sub_8006124 + bl RenderTextFont9 movs r5, 0 ldr r1, _0804860C @ =gUnknown_202063C mov r2, r9 @@ -1505,7 +1505,7 @@ _08048698: str r1, [sp, 0xC] add r2, sp, 0x10 movs r3, 0 - bl sub_8006124 + bl RenderTextFont9 adds r4, r6, 0 adds r0, r4, 0x3 cmp r4, r0 @@ -1716,7 +1716,7 @@ sub_80487F8: @ 80487F8 movs r1, 0 add r2, sp, 0x10 movs r3, 0 - bl sub_8006124 + bl RenderTextFont9 movs r7, 0x6 movs r5, 0 mov r2, sp @@ -1878,7 +1878,7 @@ _08048966: str r1, [sp, 0xC] add r2, sp, 0x10 movs r3, 0 - bl sub_8006124 + bl RenderTextFont9 movs r7, 0 lsls r0, r4, 4 adds r0, r4 @@ -4315,7 +4315,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10 movs r0, 0 mov r1, sp movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0x2F subs r1, r0 add r3, sp, 0x10 diff --git a/asm/battle_message.s b/asm/battle_message.s index 395b0ebcb..a799634f3 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -863,12 +863,12 @@ _080D7974: ldrb r0, [r5] cmp r0, 0xFD bne _080D798C - ldr r4, _080D7988 @ =gUnknown_2021CD0 + ldr r4, _080D7988 @ =gStringVar1 adds r0, r5, 0 b _080D79C4 .align 2, 0 _080D7984: .4byte gUnknown_2022AB8 -_080D7988: .4byte gUnknown_2021CD0 +_080D7988: .4byte gStringVar1 _080D798C: adds r0, r5, 0 bl TryGetStatusString @@ -884,17 +884,17 @@ _080D79A2: ldrb r0, [r1] cmp r0, 0xFD bne _080D79D8 - ldr r4, _080D79B4 @ =gUnknown_2021CF0 + ldr r4, _080D79B4 @ =gStringVar2 b _080D79C2 .align 2, 0 _080D79B0: .4byte gUnknown_2022AC8 -_080D79B4: .4byte gUnknown_2021CF0 +_080D79B4: .4byte gStringVar2 _080D79B8: ldr r1, _080D79D0 @ =gUnknown_2022AD8 ldrb r0, [r1] cmp r0, 0xFD bne _080D79D8 - ldr r4, _080D79D4 @ =gUnknown_2021D04 + ldr r4, _080D79D4 @ =gStringVar3 _080D79C2: adds r0, r1, 0 _080D79C4: @@ -903,25 +903,25 @@ _080D79C4: bl _080D8382 .align 2, 0 _080D79D0: .4byte gUnknown_2022AD8 -_080D79D4: .4byte gUnknown_2021D04 +_080D79D4: .4byte gStringVar3 _080D79D8: adds r4, r1, 0 bl _080D8382 _080D79DE: - ldr r4, _080D79E4 @ =gUnknown_2021CD0 + ldr r4, _080D79E4 @ =gStringVar1 bl _080D8382 .align 2, 0 -_080D79E4: .4byte gUnknown_2021CD0 +_080D79E4: .4byte gStringVar1 _080D79E8: - ldr r4, _080D79F0 @ =gUnknown_2021CF0 + ldr r4, _080D79F0 @ =gStringVar2 bl _080D8382 .align 2, 0 -_080D79F0: .4byte gUnknown_2021CF0 +_080D79F0: .4byte gStringVar2 _080D79F4: - ldr r4, _080D79FC @ =gUnknown_2021D04 + ldr r4, _080D79FC @ =gStringVar3 bl _080D8382 .align 2, 0 -_080D79FC: .4byte gUnknown_2021D04 +_080D79FC: .4byte gStringVar3 _080D7A00: movs r0, 0 bl GetBankByIdentity @@ -1908,14 +1908,14 @@ _080D81E8: ands r0, r1 cmp r0, 0 beq _080D820C - ldr r4, _080D8208 @ =gUnknown_2021D18 + ldr r4, _080D8208 @ =gStringVar4 adds r0, r4, 0 movs r1, 0 bl sub_815DC40 b _080D8382 .align 2, 0 _080D8204: .4byte gUnknown_2022B4C -_080D8208: .4byte gUnknown_2021D18 +_080D8208: .4byte gStringVar4 _080D820C: bl sub_80806EC adds r4, r0, 0 @@ -1928,34 +1928,34 @@ _080D8214: ands r0, r1 cmp r0, 0 beq _080D8238 - ldr r4, _080D8234 @ =gUnknown_2021D18 + ldr r4, _080D8234 @ =gStringVar4 adds r0, r4, 0 movs r1, 0 bl sub_815DBF4 b _080D8382 .align 2, 0 _080D8230: .4byte gUnknown_2022B4C -_080D8234: .4byte gUnknown_2021D18 +_080D8234: .4byte gStringVar4 _080D8238: bl sub_8080710 adds r4, r0, 0 b _080D8382 _080D8240: - ldr r4, _080D824C @ =gUnknown_2021D18 + ldr r4, _080D824C @ =gStringVar4 adds r0, r4, 0 movs r1, 0x1 bl sub_815DC40 b _080D8382 .align 2, 0 -_080D824C: .4byte gUnknown_2021D18 +_080D824C: .4byte gStringVar4 _080D8250: - ldr r4, _080D825C @ =gUnknown_2021D18 + ldr r4, _080D825C @ =gStringVar4 adds r0, r4, 0 movs r1, 0x1 bl sub_815DBF4 b _080D8382 .align 2, 0 -_080D825C: .4byte gUnknown_2021D18 +_080D825C: .4byte gStringVar4 _080D8260: ldr r0, _080D82B4 @ =gUnknown_2023FC4 ldrb r0, [r0, 0x17] @@ -2718,7 +2718,7 @@ _080D882E: ldrb r0, [r1, 0x1] ldrb r2, [r1, 0x4] adds r1, r4, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0x30 b _080D8868 .align 2, 0 @@ -2733,7 +2733,7 @@ _080D8850: ldrb r0, [r1, 0x1] ldrb r2, [r1, 0x4] adds r1, r4, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0x40 _080D8868: subs r1, r0 @@ -2804,7 +2804,7 @@ _080D8888: mov r3, r12 cmp r7, 0x18 bne _080D8900 - ldr r0, _080D88FC @ =gUnknown_3003E50 + ldr r0, _080D88FC @ =gTextFlags ldrb r2, [r0] movs r1, 0x3 negs r1, r1 @@ -2812,9 +2812,9 @@ _080D8888: b _080D8908 .align 2, 0 _080D88F8: .4byte gUnknown_83FEB64 -_080D88FC: .4byte gUnknown_3003E50 +_080D88FC: .4byte gTextFlags _080D8900: - ldr r0, _080D8930 @ =gUnknown_3003E50 + ldr r0, _080D8930 @ =gTextFlags ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 @@ -2841,7 +2841,7 @@ _080D8928: orrs r0, r1 b _080D8940 .align 2, 0 -_080D8930: .4byte gUnknown_3003E50 +_080D8930: .4byte gTextFlags _080D8934: .4byte gUnknown_2022B4C _080D8938: ldrb r1, [r4] @@ -2867,14 +2867,14 @@ _080D8958: lsls r0, 24 lsrs r3, r0, 24 _080D8960: - ldr r0, _080D896C @ =gUnknown_3003E50 + ldr r0, _080D896C @ =gTextFlags ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] b _080D8982 .align 2, 0 -_080D896C: .4byte gUnknown_3003E50 +_080D896C: .4byte gTextFlags _080D8970: adds r0, r6, r7 lsls r0, 2 diff --git a/asm/battle_records.s b/asm/battle_records.s index 239b59dd4..3464f4414 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -233,7 +233,7 @@ sub_80CD3E8: @ 80CD3E8 beq _080CD416 _080CD40C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _080CD424 @ =sub_80CD428 str r0, [r4] _080CD416: @@ -1028,24 +1028,24 @@ _080CDA1E: bls _080CDA24 adds r6, r0, 0 _080CDA24: - ldr r0, _080CDAB4 @ =gUnknown_2021CD0 + ldr r0, _080CDAB4 @ =gStringVar1 adds r1, r4, 0 movs r2, 0 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r0, _080CDAB8 @ =gUnknown_2021CF0 + ldr r0, _080CDAB8 @ =gStringVar2 adds r1, r5, 0 movs r2, 0 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r0, _080CDABC @ =gUnknown_2021D04 + ldr r0, _080CDABC @ =gStringVar3 adds r1, r6, 0 movs r2, 0 movs r3, 0x4 bl ConvertIntToDecimalStringN movs r3, 0 ldr r6, _080CDAC0 @ =gUnknown_83F6C84 - ldr r7, _080CDAC4 @ =gUnknown_2021D18 + ldr r7, _080CDAC4 @ =gStringVar4 ldr r0, _080CDAC8 @ =gUnknown_8418188 mov r12, r0 movs r5, 0 @@ -1099,11 +1099,11 @@ _080CDA72: bx r0 .align 2, 0 _080CDAB0: .4byte 0x0000270f -_080CDAB4: .4byte gUnknown_2021CD0 -_080CDAB8: .4byte gUnknown_2021CF0 -_080CDABC: .4byte gUnknown_2021D04 +_080CDAB4: .4byte gStringVar1 +_080CDAB8: .4byte gStringVar2 +_080CDABC: .4byte gStringVar3 _080CDAC0: .4byte gUnknown_83F6C84 -_080CDAC4: .4byte gUnknown_2021D18 +_080CDAC4: .4byte gStringVar4 _080CDAC8: .4byte gUnknown_8418188 _080CDACC: .4byte gUnknown_83F6C78 thumb_func_end sub_80CD9F4 @@ -1174,7 +1174,7 @@ _080CDB48: .4byte gUnknown_84181B6 _080CDB4C: .4byte gUnknown_84181BE _080CDB50: movs r5, 0 - ldr r7, _080CDB70 @ =gUnknown_2021CD0 + ldr r7, _080CDB70 @ =gStringVar1 mov r9, r5 _080CDB56: cmp r5, 0 @@ -1189,7 +1189,7 @@ _080CDB56: bl StringCopyN b _080CDBA6 .align 2, 0 -_080CDB70: .4byte gUnknown_2021CD0 +_080CDB70: .4byte gStringVar1 _080CDB74: cmp r5, 0x1 bne _080CDB7E @@ -1202,17 +1202,17 @@ _080CDB7E: movs r4, 0x84 ldrh r1, [r6, 0xC] _080CDB86: - ldr r0, _080CDB94 @ =gUnknown_2021CD0 + ldr r0, _080CDB94 @ =gStringVar1 movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN b _080CDBA6 .align 2, 0 -_080CDB94: .4byte gUnknown_2021CD0 +_080CDB94: .4byte gStringVar1 _080CDB98: movs r4, 0xB4 ldrh r1, [r6, 0xE] - ldr r0, _080CDBDC @ =gUnknown_2021CD0 + ldr r0, _080CDBDC @ =gStringVar1 movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN @@ -1245,7 +1245,7 @@ _080CDBCE: pop {r0} bx r0 .align 2, 0 -_080CDBDC: .4byte gUnknown_2021CD0 +_080CDBDC: .4byte gStringVar1 _080CDBE0: .4byte gUnknown_83F6C78 thumb_func_end sub_80CDAD0 @@ -1265,7 +1265,7 @@ sub_80CDBE4: @ 80CDBE4 movs r2, 0 movs r3, 0 bl FillWindowPixelRect - ldr r5, _080CDC9C @ =gUnknown_2021D18 + ldr r5, _080CDC9C @ =gStringVar4 ldr r1, _080CDCA0 @ =gUnknown_8418174 adds r0, r5, 0 bl StringExpandPlaceholders @@ -1273,7 +1273,7 @@ sub_80CDBE4: @ 80CDBE4 negs r2, r2 movs r0, 0x2 adds r1, r5, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0xD0 subs r2, r0 lsrs r2, 1 @@ -1337,7 +1337,7 @@ _080CDC70: pop {r0} bx r0 .align 2, 0 -_080CDC9C: .4byte gUnknown_2021D18 +_080CDC9C: .4byte gStringVar4 _080CDCA0: .4byte gUnknown_8418174 _080CDCA4: .4byte gUnknown_83F6C78 _080CDCA8: .4byte gSaveBlock2Ptr diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 2c8756ae1..06fe2be47 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -15584,7 +15584,7 @@ _080253FC: cmp r0, 0 beq _08025422 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0 strb r0, [r4, 0x1] @@ -15601,7 +15601,7 @@ _08025422: cmp r0, 0 bne _08025448 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0x1 strb r0, [r4, 0x1] @@ -15615,7 +15615,7 @@ _08025448: cmp r0, 0 beq _0802548C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08025488 @ =gUnknown_2023E82 ldrb r4, [r0, 0x1] cmp r4, 0 @@ -15645,7 +15645,7 @@ _0802548C: b _080256D0 _08025496: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0802549C: ldr r1, _080254A4 @ =gUnknown_2023FC4 movs r0, 0x4 @@ -15959,7 +15959,7 @@ _08025728: cmp r0, 0 beq _0802574E movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0 strb r0, [r4, 0x1] @@ -15976,7 +15976,7 @@ _0802574E: cmp r0, 0 bne _08025774 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0x1 strb r0, [r4, 0x1] @@ -15990,7 +15990,7 @@ _08025774: cmp r0, 0 beq _080257D8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _080257B0 @ =gUnknown_2023E82 ldrb r0, [r0, 0x1] cmp r0, 0 @@ -16035,7 +16035,7 @@ _080257D8: cmp r0, 0 beq _0802580E movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r3, _08025818 @ =gUnknown_2023D74 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -16952,7 +16952,7 @@ _08025F0C: cmp r0, 0 beq _08025F30 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0 strb r0, [r5, 0x1] @@ -16969,7 +16969,7 @@ _08025F30: cmp r0, 0 bne _08025F56 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0x1 strb r0, [r4, 0x1] @@ -16996,7 +16996,7 @@ _08025F74: beq _08025F9A _08025F7E: movs r0, 0x5 - bl sub_80722CC + bl PlaySE str r4, [sp] movs r0, 0x17 movs r1, 0x8 @@ -17449,7 +17449,7 @@ _08026330: cmp r0, 0 beq _080263F6 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_8026448 movs r0, 0xC movs r1, 0x2 @@ -17463,7 +17463,7 @@ _08026350: cmp r0, 0 beq _080263F6 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x81 str r0, [sp] movs r0, 0x12 @@ -17712,7 +17712,7 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524 ldrb r0, [r0, 0x10] muls r0, r5 adds r0, r4 - ldr r6, _08026600 @ =gUnknown_2021D18 + ldr r6, _08026600 @ =gStringVar4 adds r1, r6, 0 bl GetMonNickname str r6, [sp] @@ -17784,7 +17784,7 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524 .align 2, 0 _080265F8: .4byte gUnknown_2023FE8 _080265FC: .4byte gUnknown_2024284 -_08026600: .4byte gUnknown_2021D18 +_08026600: .4byte gStringVar4 _08026604: adds r0, r6, 0 movs r1, 0 @@ -32219,7 +32219,7 @@ sub_802D800: @ 802D800 bne _0802D88C ldr r0, _0802D87C @ =gUnknown_2023E82 strb r1, [r0, 0x5] - ldr r4, _0802D880 @ =gUnknown_2021CD0 + ldr r4, _0802D880 @ =gStringVar1 ldr r0, _0802D884 @ =0x00004037 bl VarGet lsls r0, 24 @@ -32235,7 +32235,7 @@ sub_802D800: @ 802D800 ldrh r0, [r0] muls r0, r7 add r0, r8 - ldr r2, _0802D888 @ =gUnknown_2021CF0 + ldr r2, _0802D888 @ =gStringVar2 movs r1, 0x2 bl GetMonData b _0802D8D6 @@ -32244,11 +32244,11 @@ _0802D870: .4byte gUnknown_2023BCE _0802D874: .4byte gUnknown_2023D6B _0802D878: .4byte gUnknown_202402C _0802D87C: .4byte gUnknown_2023E82 -_0802D880: .4byte gUnknown_2021CD0 +_0802D880: .4byte gStringVar1 _0802D884: .4byte 0x00004037 -_0802D888: .4byte gUnknown_2021CF0 +_0802D888: .4byte gStringVar2 _0802D88C: - ldr r4, _0802D92C @ =gUnknown_2021CD0 + ldr r4, _0802D92C @ =gStringVar1 ldr r0, _0802D930 @ =0x00004037 bl VarGet lsls r0, 24 @@ -32264,10 +32264,10 @@ _0802D88C: ldrh r0, [r0] muls r0, r7 add r0, r8 - ldr r2, _0802D934 @ =gUnknown_2021CF0 + ldr r2, _0802D934 @ =gStringVar2 movs r1, 0x2 bl GetMonData - ldr r4, _0802D938 @ =gUnknown_2021D04 + ldr r4, _0802D938 @ =gStringVar3 bl get_unknown_box_id lsls r0, 24 lsrs r0, 24 @@ -32322,10 +32322,10 @@ _0802D8EA: pop {r0} bx r0 .align 2, 0 -_0802D92C: .4byte gUnknown_2021CD0 +_0802D92C: .4byte gStringVar1 _0802D930: .4byte 0x00004037 -_0802D934: .4byte gUnknown_2021CF0 -_0802D938: .4byte gUnknown_2021D04 +_0802D934: .4byte gStringVar2 +_0802D938: .4byte gStringVar3 _0802D93C: .4byte gUnknown_2023E82 _0802D940: .4byte 0x00000834 _0802D944: .4byte gUnknown_3004F90 @@ -32885,7 +32885,7 @@ _0802DDA8: cmp r0, 0 beq _0802DDCC movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0 strb r0, [r4, 0x1] @@ -32902,7 +32902,7 @@ _0802DDCC: cmp r0, 0 bne _0802DDF2 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0x1 strb r0, [r4, 0x1] @@ -32915,7 +32915,7 @@ _0802DDF2: cmp r0, 0 beq _0802DE24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802DE20 @ =gUnknown_2023E82 ldrb r0, [r1, 0x1] cmp r0, 0 @@ -32937,7 +32937,7 @@ _0802DE24: b _0802DFA6 _0802DE2E: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0802DE3C @ =gUnknown_2023E82 _0802DE36: movs r0, 0x4 diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 3034167f4..a7d13e747 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -2132,7 +2132,7 @@ sub_80806EC: @ 80806EC push {r4,lr} ldr r0, _08080708 @ =gUnknown_20386B8 ldr r0, [r0] - ldr r4, _0808070C @ =gUnknown_2021D18 + ldr r4, _0808070C @ =gStringVar4 bl sub_80806C8 adds r1, r0, 0 adds r0, r4, 0 @@ -2143,13 +2143,13 @@ sub_80806EC: @ 80806EC bx r1 .align 2, 0 _08080708: .4byte gUnknown_20386B8 -_0808070C: .4byte gUnknown_2021D18 +_0808070C: .4byte gStringVar4 thumb_func_end sub_80806EC thumb_func_start sub_8080710 sub_8080710: @ 8080710 push {r4,lr} - ldr r4, _0808072C @ =gUnknown_2021D18 + ldr r4, _0808072C @ =gStringVar4 ldr r0, _08080730 @ =gUnknown_20386BC ldr r0, [r0] bl sub_80806C8 @@ -2161,7 +2161,7 @@ sub_8080710: @ 8080710 pop {r1} bx r1 .align 2, 0 -_0808072C: .4byte gUnknown_2021D18 +_0808072C: .4byte gStringVar4 _08080730: .4byte gUnknown_20386BC thumb_func_end sub_8080710 diff --git a/asm/battle_tower.s b/asm/battle_tower.s index d44353044..0d00cf89c 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -1512,14 +1512,14 @@ sub_80E64C0: @ 80E64C0 beq _080E6554 cmp r4, 0 bne _080E64EC - ldr r0, _080E6514 @ =gUnknown_2021CD0 + ldr r0, _080E6514 @ =gStringVar1 ldr r1, _080E6518 @ =gUnknown_83FE859 bl StringAppend _080E64EC: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _080E6514 @ =gUnknown_2021CD0 + ldr r6, _080E6514 @ =gStringVar1 movs r0, 0xB adds r1, r5, 0 muls r1, r0 @@ -1535,7 +1535,7 @@ _080E64EC: beq _080E652A b _080E654C .align 2, 0 -_080E6514: .4byte gUnknown_2021CD0 +_080E6514: .4byte gStringVar1 _080E6518: .4byte gUnknown_83FE859 _080E651C: .4byte gUnknown_8245EE0 _080E6520: @@ -1552,15 +1552,15 @@ _080E652A: .align 2, 0 _080E6534: .4byte gUnknown_83FE85E _080E6538: - ldr r0, _080E6544 @ =gUnknown_2021CD0 + ldr r0, _080E6544 @ =gStringVar1 ldr r1, _080E6548 @ =gUnknown_83FE85C bl StringAppend b _080E6554 .align 2, 0 -_080E6544: .4byte gUnknown_2021CD0 +_080E6544: .4byte gStringVar1 _080E6548: .4byte gUnknown_83FE85C _080E654C: - ldr r0, _080E655C @ =gUnknown_2021CD0 + ldr r0, _080E655C @ =gStringVar1 ldr r1, _080E6560 @ =gUnknown_83FE859 bl StringAppend _080E6554: @@ -1569,7 +1569,7 @@ _080E6554: pop {r1} bx r1 .align 2, 0 -_080E655C: .4byte gUnknown_2021CD0 +_080E655C: .4byte gStringVar1 _080E6560: .4byte gUnknown_83FE859 thumb_func_end sub_80E64C0 @@ -1766,7 +1766,7 @@ _080E6662: ldrb r0, [r1] cmp r0, 0x2 bhi _080E6750 - ldr r1, _080E672C @ =gUnknown_2021CD0 + ldr r1, _080E672C @ =gStringVar1 movs r0, 0xFF strb r0, [r1] ldr r1, _080E6730 @ =gUnknown_20370C0 @@ -1793,7 +1793,7 @@ _080E66F2: cmp r0, r6 bne _080E66F2 _080E6704: - ldr r4, _080E672C @ =gUnknown_2021CD0 + ldr r4, _080E672C @ =gStringVar1 adds r0, r4, 0 bl StringLength lsls r0, 16 @@ -1811,7 +1811,7 @@ _080E6704: .align 2, 0 _080E6724: .4byte gUnknown_2024284 _080E6728: .4byte gUnknown_20370D0 -_080E672C: .4byte gUnknown_2021CD0 +_080E672C: .4byte gStringVar1 _080E6730: .4byte gUnknown_20370C0 _080E6734: .4byte gUnknown_84020C4 _080E6738: .4byte 0x0000ffff @@ -1867,7 +1867,7 @@ sub_80E678C: @ 80E678C lsls r0, 24 cmp r0, 0 beq _080E67E4 - ldr r5, _080E67E0 @ =gUnknown_2021D18 + ldr r5, _080E67E0 @ =gStringVar4 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x2 @@ -1885,7 +1885,7 @@ _080E67B8: cmp r0, 0xFE bne _080E67B8 _080E67C2: - ldr r2, _080E67E0 @ =gUnknown_2021D18 + ldr r2, _080E67E0 @ =gStringVar4 adds r0, r1, r2 ldrb r0, [r0] adds r3, r2, 0 @@ -1903,9 +1903,9 @@ _080E67D8: strb r0, [r1] b _080E67F0 .align 2, 0 -_080E67E0: .4byte gUnknown_2021D18 +_080E67E0: .4byte gStringVar4 _080E67E4: - ldr r0, _080E67F8 @ =gUnknown_2021D18 + ldr r0, _080E67F8 @ =gStringVar4 adds r1, r4, 0 movs r2, 0x3 movs r3, 0x2 @@ -1915,7 +1915,7 @@ _080E67F0: pop {r0} bx r0 .align 2, 0 -_080E67F8: .4byte gUnknown_2021D18 +_080E67F8: .4byte gStringVar4 thumb_func_end sub_80E678C thumb_func_start sub_80E67FC @@ -2345,7 +2345,7 @@ _080E6B66: adds r0, r5 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080E6BA0 @ =gUnknown_2021CD0 + ldr r1, _080E6BA0 @ =gStringVar1 adds r0, 0xA1 strb r0, [r1] movs r0, 0xFF @@ -2355,7 +2355,7 @@ _080E6B66: _080E6B94: .4byte 0x0000056c _080E6B98: .4byte 0x0000270e _080E6B9C: .4byte gUnknown_20370D0 -_080E6BA0: .4byte gUnknown_2021CD0 +_080E6BA0: .4byte gStringVar1 _080E6BA4: ldr r0, [r6] lsls r5, 1 @@ -3228,7 +3228,7 @@ sub_80E724C: @ 80E724C lsls r1, 3 adds r0, r1 ldrh r0, [r0] - ldr r1, _080E7290 @ =gUnknown_2021CD0 + ldr r1, _080E7290 @ =gStringVar1 bl sub_8099E90 ldr r0, _080E7294 @ =gUnknown_20370D0 strh r4, [r0] @@ -3236,7 +3236,7 @@ sub_80E724C: @ 80E724C .align 2, 0 _080E7288: .4byte gSaveBlock2Ptr _080E728C: .4byte 0x0000055c -_080E7290: .4byte gUnknown_2021CD0 +_080E7290: .4byte gStringVar1 _080E7294: .4byte gUnknown_20370D0 _080E7298: ldr r1, _080E72B0 @ =gUnknown_20370D0 @@ -3616,13 +3616,13 @@ sub_80E7550: @ 80E7550 ldrb r0, [r0] cmp r0, 0x3 bne _080E756C - ldr r1, _080E7568 @ =gUnknown_2021D18 + ldr r1, _080E7568 @ =gStringVar4 movs r0, 0xFF strb r0, [r1] b _080E7590 .align 2, 0 _080E7564: .4byte gUnknown_2023E8A -_080E7568: .4byte gUnknown_2021D18 +_080E7568: .4byte gStringVar4 _080E756C: cmp r0, 0x1 bne _080E7584 diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 67a711dea..46e7b9dc2 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -4413,7 +4413,7 @@ _080D2A68: ldrsh r0, [r4, r1] bl sub_80D3138 movs r0, 0x61 - bl sub_80722CC + bl PlaySE ldr r1, [r5] ldrb r0, [r1] adds r0, 0x1 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index 02abba1df..df2127048 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -51,7 +51,7 @@ _0813CD98: movs r0, 0xFF strb r0, [r1, 0x6] movs r2, 0 - ldr r6, _0813CDF0 @ =gUnknown_3003E50 + ldr r6, _0813CDF0 @ =gTextFlags ldr r0, _0813CDF4 @ =gUnknown_203AD30 mov r12, r0 ldr r1, _0813CDF8 @ =sub_813CE30 @@ -88,7 +88,7 @@ _0813CDE2: bx r0 .align 2, 0 _0813CDEC: .4byte gUnknown_203F370 -_0813CDF0: .4byte gUnknown_3003E50 +_0813CDF0: .4byte gTextFlags _0813CDF4: .4byte gUnknown_203AD30 _0813CDF8: .4byte sub_813CE30 _0813CDFC: .4byte 0x0000080c @@ -714,14 +714,14 @@ sub_813D31C: @ 813D31C mov r8, r0 lsls r5, r1, 16 lsrs r5, 16 - ldr r4, _0813D384 @ =gUnknown_2021D18 + ldr r4, _0813D384 @ =gStringVar4 ldr r1, _0813D388 @ =gUnknown_84166FF adds r0, r4, 0 bl StringCopy ldr r1, _0813D38C @ =gUnknown_8416226 adds r0, r4, 0 bl StringAppend - ldr r6, _0813D390 @ =gUnknown_2021CD0 + ldr r6, _0813D390 @ =gStringVar1 adds r1, r5, 0 subs r1, 0x84 adds r0, r6, 0 @@ -752,10 +752,10 @@ sub_813D31C: @ 813D31C pop {r0} bx r0 .align 2, 0 -_0813D384: .4byte gUnknown_2021D18 +_0813D384: .4byte gStringVar4 _0813D388: .4byte gUnknown_84166FF _0813D38C: .4byte gUnknown_8416226 -_0813D390: .4byte gUnknown_2021CD0 +_0813D390: .4byte gStringVar1 _0813D394: .4byte gUnknown_84643B4 _0813D398: .4byte gUnknown_8416703 thumb_func_end sub_813D31C @@ -790,7 +790,7 @@ sub_813D3C0: @ 813D3C0 cmp r1, 0x1 beq _0813D3D6 movs r0, 0xF5 - bl sub_80722CC + bl PlaySE bl sub_813EC28 _0813D3D6: ldr r4, _0813D404 @ =gUnknown_203F36C @@ -864,11 +864,11 @@ sub_813D430: @ 813D430 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _0813D4A4 @ =gUnknown_2021CD0 + ldr r0, _0813D4A4 @ =gStringVar1 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _0813D4A8 @ =gUnknown_2021D18 + ldr r4, _0813D4A8 @ =gStringVar4 ldr r1, _0813D4AC @ =gUnknown_84162B9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -892,8 +892,8 @@ _0813D498: bx r0 .align 2, 0 _0813D4A0: .4byte gUnknown_203F36C -_0813D4A4: .4byte gUnknown_2021CD0 -_0813D4A8: .4byte gUnknown_2021D18 +_0813D4A4: .4byte gStringVar1 +_0813D4A8: .4byte gStringVar4 _0813D4AC: .4byte gUnknown_84162B9 thumb_func_end sub_813D430 @@ -1171,7 +1171,7 @@ sub_813D6A4: @ 813D6A4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r3, 0x48 subs r3, r0 lsrs r3, 1 @@ -1543,10 +1543,10 @@ sub_813D940: @ 813D940 lsrs r5, 24 movs r1, 0x2 ldrsh r0, [r4, r1] - ldr r1, _0813D9EC @ =gUnknown_2021CD0 + ldr r1, _0813D9EC @ =gStringVar1 mov r10, r1 bl sub_813D39C - ldr r0, _0813D9F0 @ =gUnknown_2021D18 + ldr r0, _0813D9F0 @ =gStringVar4 mov r9, r0 adds r1, r6, 0 bl StringExpandPlaceholders @@ -1599,8 +1599,8 @@ sub_813D940: @ 813D940 bx r0 .align 2, 0 _0813D9E8: .4byte gUnknown_3005098 -_0813D9EC: .4byte gUnknown_2021CD0 -_0813D9F0: .4byte gUnknown_2021D18 +_0813D9EC: .4byte gStringVar1 +_0813D9F0: .4byte gStringVar4 _0813D9F4: .4byte gUnknown_84162B9 thumb_func_end sub_813D940 @@ -1623,14 +1623,14 @@ sub_813D9F8: @ 813D9F8 adds r0, r6, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, _0813DA5C @ =gUnknown_2021CD0 + ldr r0, _0813DA5C @ =gStringVar1 lsls r4, 16 asrs r4, 16 adds r1, r4, 0 movs r2, 0x2 adds r3, r5, 0 bl ConvertIntToDecimalStringN - ldr r4, _0813DA60 @ =gUnknown_2021D18 + ldr r4, _0813DA60 @ =gStringVar4 ldr r1, _0813DA64 @ =gUnknown_84162B9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1652,8 +1652,8 @@ sub_813D9F8: @ 813D9F8 pop {r0} bx r0 .align 2, 0 -_0813DA5C: .4byte gUnknown_2021CD0 -_0813DA60: .4byte gUnknown_2021D18 +_0813DA5C: .4byte gStringVar1 +_0813DA60: .4byte gStringVar4 _0813DA64: .4byte gUnknown_84162B9 thumb_func_end sub_813D9F8 @@ -1707,7 +1707,7 @@ _0813DA9E: cmp r0, 0x1 bne _0813DAEC movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0813DAE8 @ =gUnknown_203AD30 mov r1, r8 strh r1, [r0] @@ -1733,13 +1733,13 @@ _0813DAFC: cmp r0, 0x5 beq _0813DB9E movs r0, 0x5 - bl sub_80722CC + bl PlaySE b _0813DB42 .align 2, 0 _0813DB0C: .4byte gUnknown_203F370 _0813DB10: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r3, _0813DB30 @ =gUnknown_203F370 mov r8, r3 ldrb r0, [r3, 0x4] @@ -1982,9 +1982,9 @@ _0813DC86: lsrs r4, 24 movs r1, 0x2 ldrsh r0, [r7, r1] - ldr r1, _0813DD68 @ =gUnknown_2021CD0 + ldr r1, _0813DD68 @ =gStringVar1 bl sub_813D39C - ldr r5, _0813DD6C @ =gUnknown_2021D18 + ldr r5, _0813DD6C @ =gStringVar4 ldr r1, _0813DD70 @ =gUnknown_84162FF adds r0, r5, 0 bl StringExpandPlaceholders @@ -2012,8 +2012,8 @@ _0813DD58: .4byte gUnknown_203F384 _0813DD5C: .4byte gUnknown_84643A4 _0813DD60: .4byte gUnknown_203F388 _0813DD64: .4byte gUnknown_846437C -_0813DD68: .4byte gUnknown_2021CD0 -_0813DD6C: .4byte gUnknown_2021D18 +_0813DD68: .4byte gStringVar1 +_0813DD6C: .4byte gStringVar4 _0813DD70: .4byte gUnknown_84162FF thumb_func_end sub_813DBE4 @@ -2062,7 +2062,7 @@ sub_813DDA0: @ 813DDA0 cmp r4, r0 bne _0813DDE0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0813DDDC @ =gUnknown_846437C ldr r1, [r0, 0x1C] adds r0, r5, 0 @@ -2072,7 +2072,7 @@ sub_813DDA0: @ 813DDA0 _0813DDDC: .4byte gUnknown_846437C _0813DDE0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0813DE04 @ =gUnknown_846437C ldr r0, _0813DE08 @ =gUnknown_203F384 ldr r0, [r0] @@ -2250,13 +2250,13 @@ sub_813DF54: @ 813DF54 lsls r1, 3 ldr r0, _0813DFB4 @ =gUnknown_3005098 adds r1, r0 - ldr r0, _0813DFB8 @ =gUnknown_2021CF0 + ldr r0, _0813DFB8 @ =gStringVar2 movs r2, 0x10 ldrsh r1, [r1, r2] movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r5, _0813DFBC @ =gUnknown_2021D18 + ldr r5, _0813DFBC @ =gStringVar4 ldr r1, _0813DFC0 @ =gUnknown_8416409 adds r0, r5, 0 bl StringExpandPlaceholders @@ -2285,8 +2285,8 @@ sub_813DF54: @ 813DF54 bx r0 .align 2, 0 _0813DFB4: .4byte gUnknown_3005098 -_0813DFB8: .4byte gUnknown_2021CF0 -_0813DFBC: .4byte gUnknown_2021D18 +_0813DFB8: .4byte gStringVar2 +_0813DFBC: .4byte gStringVar4 _0813DFC0: .4byte gUnknown_8416409 _0813DFC4: .4byte gUnknown_846436C thumb_func_end sub_813DF54 @@ -2359,7 +2359,7 @@ _0813E048: cmp r0, 0 beq _0813E090 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x8 bl sub_813EB10 lsls r0, 24 @@ -2385,7 +2385,7 @@ _0813E090: cmp r0, 0 beq _0813E0D4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x8 bl sub_813EA98 movs r0, 0 @@ -2425,15 +2425,15 @@ sub_813E0DC: @ 813E0DC bl sub_813EA98 movs r1, 0x2 ldrsh r0, [r5, r1] - ldr r1, _0813E150 @ =gUnknown_2021CD0 + ldr r1, _0813E150 @ =gStringVar1 bl sub_813D39C - ldr r0, _0813E154 @ =gUnknown_2021CF0 + ldr r0, _0813E154 @ =gStringVar2 movs r2, 0x10 ldrsh r1, [r5, r2] movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r5, _0813E158 @ =gUnknown_2021D18 + ldr r5, _0813E158 @ =gStringVar4 ldr r1, _0813E15C @ =gUnknown_84163F4 adds r0, r5, 0 bl StringExpandPlaceholders @@ -2463,9 +2463,9 @@ sub_813E0DC: @ 813E0DC bx r0 .align 2, 0 _0813E14C: .4byte gUnknown_3005098 -_0813E150: .4byte gUnknown_2021CD0 -_0813E154: .4byte gUnknown_2021CF0 -_0813E158: .4byte gUnknown_2021D18 +_0813E150: .4byte gStringVar1 +_0813E154: .4byte gStringVar2 +_0813E158: .4byte gStringVar4 _0813E15C: .4byte gUnknown_84163F4 _0813E160: .4byte sub_813E164 thumb_func_end sub_813E0DC @@ -2493,7 +2493,7 @@ sub_813E164: @ 813E164 beq _0813E1E4 _0813E18A: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0813E1F4 @ =gUnknown_203AD30 ldrh r0, [r0] ldrh r1, [r5, 0x10] @@ -2618,7 +2618,7 @@ sub_813E290: @ 813E290 cmp r0, 0 beq _0813E2AE movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_813E2B8 _0813E2AE: @@ -2734,10 +2734,10 @@ sub_813E37C: @ 813E37C lsls r0, 24 cmp r0, 0 bne _0813E3D8 - ldr r1, _0813E3C8 @ =gUnknown_2021CD0 + ldr r1, _0813E3C8 @ =gStringVar1 adds r0, r4, 0 bl sub_8099E90 - ldr r4, _0813E3CC @ =gUnknown_2021D18 + ldr r4, _0813E3CC @ =gStringVar4 ldr r1, _0813E3D0 @ =gUnknown_8416374 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2749,8 +2749,8 @@ sub_813E37C: @ 813E37C b _0813E3EA .align 2, 0 _0813E3C4: .4byte gUnknown_3005098 -_0813E3C8: .4byte gUnknown_2021CD0 -_0813E3CC: .4byte gUnknown_2021D18 +_0813E3C8: .4byte gStringVar1 +_0813E3CC: .4byte gStringVar4 _0813E3D0: .4byte gUnknown_8416374 _0813E3D4: .4byte sub_813E290 _0813E3D8: @@ -2814,9 +2814,9 @@ sub_813E428: @ 813E428 cmp r0, 0 bne _0813E488 ldrh r0, [r6] - ldr r1, _0813E478 @ =gUnknown_2021CD0 + ldr r1, _0813E478 @ =gStringVar1 bl sub_8099E90 - ldr r4, _0813E47C @ =gUnknown_2021D18 + ldr r4, _0813E47C @ =gStringVar4 ldr r1, _0813E480 @ =gUnknown_84168F1 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2832,8 +2832,8 @@ sub_813E428: @ 813E428 .align 2, 0 _0813E470: .4byte gUnknown_3005098 _0813E474: .4byte gUnknown_203AD30 -_0813E478: .4byte gUnknown_2021CD0 -_0813E47C: .4byte gUnknown_2021D18 +_0813E478: .4byte gStringVar1 +_0813E47C: .4byte gStringVar4 _0813E480: .4byte gUnknown_84168F1 _0813E484: .4byte sub_813E2B8 _0813E488: @@ -2854,9 +2854,9 @@ _0813E4A0: strh r0, [r4, 0x4] _0813E4A8: ldrh r0, [r6] - ldr r1, _0813E4D4 @ =gUnknown_2021CD0 + ldr r1, _0813E4D4 @ =gStringVar1 bl sub_8099E90 - ldr r4, _0813E4D8 @ =gUnknown_2021D18 + ldr r4, _0813E4D8 @ =gStringVar4 ldr r1, _0813E4DC @ =gUnknown_8416911 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2873,8 +2873,8 @@ _0813E4CE: pop {r0} bx r0 .align 2, 0 -_0813E4D4: .4byte gUnknown_2021CD0 -_0813E4D8: .4byte gUnknown_2021D18 +_0813E4D4: .4byte gStringVar1 +_0813E4D8: .4byte gStringVar4 _0813E4DC: .4byte gUnknown_8416911 _0813E4E0: .4byte sub_813E5B8 thumb_func_end sub_813E428 @@ -2890,7 +2890,7 @@ sub_813E4E4: @ 813E4E4 lsls r4, 3 ldr r0, _0813E540 @ =gUnknown_3005098 adds r4, r0 - ldr r6, _0813E544 @ =gUnknown_2021D04 + ldr r6, _0813E544 @ =gStringVar3 ldrh r1, [r4, 0x2] movs r0, 0x5 bl sub_809A798 @@ -2906,7 +2906,7 @@ sub_813E4E4: @ 813E4E4 movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r4, _0813E548 @ =gUnknown_2021D18 + ldr r4, _0813E548 @ =gStringVar4 ldr r1, _0813E54C @ =gUnknown_8416936 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2923,8 +2923,8 @@ sub_813E4E4: @ 813E4E4 bx r0 .align 2, 0 _0813E540: .4byte gUnknown_3005098 -_0813E544: .4byte gUnknown_2021D04 -_0813E548: .4byte gUnknown_2021D18 +_0813E544: .4byte gStringVar3 +_0813E548: .4byte gStringVar4 _0813E54C: .4byte gUnknown_8416936 _0813E550: .4byte sub_813E554 thumb_func_end sub_813E4E4 @@ -2997,12 +2997,12 @@ sub_813E5B8: @ 813E5B8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0813E658 @ =gUnknown_2021CD0 + ldr r0, _0813E658 @ =gStringVar1 movs r1, 0x1 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r2, _0813E65C @ =gUnknown_2021D18 + ldr r2, _0813E65C @ =gStringVar4 mov r8, r2 ldr r1, _0813E660 @ =gUnknown_84162B9 mov r0, r8 @@ -3050,8 +3050,8 @@ sub_813E5B8: @ 813E5B8 bx r0 .align 2, 0 _0813E654: .4byte gUnknown_3005098 -_0813E658: .4byte gUnknown_2021CD0 -_0813E65C: .4byte gUnknown_2021D18 +_0813E658: .4byte gStringVar1 +_0813E65C: .4byte gStringVar4 _0813E660: .4byte gUnknown_84162B9 _0813E664: .4byte sub_813E690 thumb_func_end sub_813E5B8 @@ -3124,7 +3124,7 @@ _0813E6E4: cmp r0, 0 beq _0813E718 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl sub_813EA98 movs r0, 0 @@ -3143,7 +3143,7 @@ _0813E718: cmp r0, 0 beq _0813E762 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl sub_813EA98 movs r0, 0x2 @@ -3187,9 +3187,9 @@ sub_813E768: @ 813E768 bl schedule_bg_copy_tilemap_to_vram ldr r0, _0813E7D8 @ =gUnknown_203AD30 ldrh r0, [r0] - ldr r1, _0813E7DC @ =gUnknown_2021CD0 + ldr r1, _0813E7DC @ =gStringVar1 bl sub_8099E90 - ldr r6, _0813E7E0 @ =gUnknown_2021D04 + ldr r6, _0813E7E0 @ =gStringVar3 ldrh r1, [r4, 0x2] movs r0, 0x5 bl sub_809A798 @@ -3205,7 +3205,7 @@ sub_813E768: @ 813E768 movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r4, _0813E7E4 @ =gUnknown_2021D18 + ldr r4, _0813E7E4 @ =gStringVar4 ldr r1, _0813E7E8 @ =gUnknown_8416959 adds r0, r4, 0 bl StringExpandPlaceholders @@ -3220,9 +3220,9 @@ sub_813E768: @ 813E768 .align 2, 0 _0813E7D4: .4byte gUnknown_3005098 _0813E7D8: .4byte gUnknown_203AD30 -_0813E7DC: .4byte gUnknown_2021CD0 -_0813E7E0: .4byte gUnknown_2021D04 -_0813E7E4: .4byte gUnknown_2021D18 +_0813E7DC: .4byte gStringVar1 +_0813E7E0: .4byte gStringVar3 +_0813E7E4: .4byte gStringVar4 _0813E7E8: .4byte gUnknown_8416959 _0813E7EC: .4byte sub_813E7F0 thumb_func_end sub_813E768 @@ -3245,7 +3245,7 @@ sub_813E7F0: @ 813E7F0 add r1, r9 mov r8, r1 movs r0, 0xF8 - bl sub_80722CC + bl PlaySE ldr r5, _0813E8C0 @ =gUnknown_203AD30 ldrh r0, [r5] mov r2, r8 @@ -3343,7 +3343,7 @@ sub_813E8D4: @ 813E8D4 beq _0813E906 _0813E8EE: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x2 bl sub_813EA98 movs r0, 0x2 diff --git a/asm/braille_text.s b/asm/braille_text.s index 64e3f532c..8297df7e7 100644 --- a/asm/braille_text.s +++ b/asm/braille_text.s @@ -55,7 +55,7 @@ _0814F8DA: beq _0814F91C subs r0, r1, 0x1 strb r0, [r6, 0x1E] - ldr r0, _0814F918 @ =gUnknown_3003E50 + ldr r0, _0814F918 @ =gTextFlags ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -79,9 +79,9 @@ _0814F904: b _0814FB42 .align 2, 0 _0814F914: .4byte gMain -_0814F918: .4byte gUnknown_3003E50 +_0814F918: .4byte gTextFlags _0814F91C: - ldr r2, _0814F92C @ =gUnknown_3003E50 + ldr r2, _0814F92C @ =gTextFlags ldrb r1, [r2] movs r0, 0x4 ands r0, r1 @@ -90,7 +90,7 @@ _0814F91C: movs r0, 0x1 b _0814F932 .align 2, 0 -_0814F92C: .4byte gUnknown_3003E50 +_0814F92C: .4byte gTextFlags _0814F930: ldrb r0, [r6, 0x1D] _0814F932: @@ -385,7 +385,7 @@ _0814FB62: bl DecompressGlyphFont6 adds r0, r6, 0 bl CopyGlyphToWindow - ldr r0, _0814FB84 @ =gGlyphBuffer1 + ldr r0, _0814FB84 @ =gGlyphInfo adds r0, 0x80 ldrb r1, [r6, 0xA] ldrb r0, [r0] @@ -396,7 +396,7 @@ _0814FB62: movs r0, 0 b _0814FC96 .align 2, 0 -_0814FB84: .4byte gGlyphBuffer1 +_0814FB84: .4byte gGlyphInfo _0814FB88: adds r0, r6, 0 bl TextPrinterWait @@ -433,7 +433,7 @@ _0814FBC4: cmp r0, 0 beq _0814FB42 adds r0, r6, 0 - bl sub_80055D4 + bl TextPrinterClearDownArrow ldrb r1, [r6, 0x5] ldr r0, _0814FBF8 @ =gFonts ldr r2, [r0] @@ -551,7 +551,7 @@ DecompressGlyphFont6: @ 814FC9C ldr r0, _0814FCF8 @ =gUnknown_846FB0C adds r1, r0 adds r5, r2, r1 - ldr r4, _0814FCFC @ =gGlyphBuffer1 + ldr r4, _0814FCFC @ =gGlyphInfo adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -583,7 +583,7 @@ DecompressGlyphFont6: @ 814FC9C bx r0 .align 2, 0 _0814FCF8: .4byte gUnknown_846FB0C -_0814FCFC: .4byte gGlyphBuffer1 +_0814FCFC: .4byte gGlyphInfo thumb_func_end DecompressGlyphFont6 thumb_func_start GetGlyphWidthFont6 diff --git a/asm/cable_club.s b/asm/cable_club.s index 773e064ea..ab312a92f 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -47,7 +47,7 @@ sub_808078C: @ 808078C adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _080807DC @ =gUnknown_2021CD0 + ldr r0, _080807DC @ =gStringVar1 movs r2, 0 movs r3, 0x1 bl ConvertIntToDecimalStringN @@ -56,7 +56,7 @@ sub_808078C: @ 808078C adds r0, r4, 0 movs r1, 0 bl sub_80F7750 - ldr r5, _080807E0 @ =gUnknown_2021D18 + ldr r5, _080807E0 @ =gStringVar4 ldr r1, _080807E4 @ =gUnknown_841DF82 adds r0, r5, 0 bl StringExpandPlaceholders @@ -78,8 +78,8 @@ sub_808078C: @ 808078C pop {r0} bx r0 .align 2, 0 -_080807DC: .4byte gUnknown_2021CD0 -_080807E0: .4byte gUnknown_2021D18 +_080807DC: .4byte gStringVar1 +_080807E0: .4byte gStringVar4 _080807E4: .4byte gUnknown_841DF82 thumb_func_end sub_808078C @@ -176,7 +176,7 @@ _08080890: movs r0, 0x9 b _080808B6 _08080894: - ldr r4, _080808B0 @ =gUnknown_2021CD0 + ldr r4, _080808B0 @ =gStringVar1 bl GetLinkPlayerCount_2 adds r1, r0, 0 lsls r1, 24 @@ -188,7 +188,7 @@ _08080894: movs r0, 0x4 b _080808B6 .align 2, 0 -_080808B0: .4byte gUnknown_2021CD0 +_080808B0: .4byte gStringVar1 _080808B4: movs r0, 0 _080808B6: @@ -445,7 +445,7 @@ sub_8080A4C: @ 8080A4C cmp r0, 0x1 bne _08080AB0 movs r0, 0x15 - bl sub_80722CC + bl PlaySE ldr r0, _08080AA8 @ =gUnknown_81BC4CE bl ShowFieldAutoScrollMessage ldr r0, _08080AAC @ =sub_8080AD0 @@ -456,7 +456,7 @@ _08080AA8: .4byte gUnknown_81BC4CE _08080AAC: .4byte sub_8080AD0 _08080AB0: movs r0, 0x16 - bl sub_80722CC + bl PlaySE ldr r0, _08080AC8 @ =gUnknown_81BC54C bl ShowFieldAutoScrollMessage ldr r0, _08080ACC @ =sub_8080CDC @@ -559,7 +559,7 @@ sub_8080B20: @ 8080B20 bl sub_800A900 ldrh r0, [r7, 0xA] bl sub_80807E8 - ldr r0, _08080BBC @ =gUnknown_2021CD0 + ldr r0, _08080BBC @ =gStringVar1 adds r1, r5, 0 movs r2, 0 movs r3, 0x1 @@ -581,7 +581,7 @@ _08080BA8: .align 2, 0 _08080BB4: .4byte gUnknown_3005098 _08080BB8: .4byte gMain -_08080BBC: .4byte gUnknown_2021CD0 +_08080BBC: .4byte gStringVar1 _08080BC0: .4byte gUnknown_81BC50D _08080BC4: .4byte sub_8080BC8 thumb_func_end sub_8080B20 @@ -643,7 +643,7 @@ _08080C3C: cmp r0, 0 beq _08080C5C movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_800A5BC ldr r0, _08080C64 @ =gUnknown_3005090 lsls r1, r6, 2 @@ -2404,7 +2404,7 @@ sub_8081A34: @ 8081A34 lsrs r4, 24 ldr r0, _08081A74 @ =gUnknown_20370C4 strh r4, [r0] - ldr r0, _08081A78 @ =gUnknown_2021CD0 + ldr r0, _08081A78 @ =gStringVar1 lsls r1, r4, 3 subs r1, r4 lsls r1, 2 @@ -2417,7 +2417,7 @@ sub_8081A34: @ 8081A34 lsrs r1, r0, 24 cmp r1, 0 beq _08081A88 - ldr r0, _08081A80 @ =gUnknown_2021CF0 + ldr r0, _08081A80 @ =gStringVar2 ldr r2, _08081A84 @ =gUnknown_83C6AB8 subs r1, 0x1 lsls r1, 2 @@ -2428,9 +2428,9 @@ sub_8081A34: @ 8081A34 b _08081A8A .align 2, 0 _08081A74: .4byte gUnknown_20370C4 -_08081A78: .4byte gUnknown_2021CD0 +_08081A78: .4byte gStringVar1 _08081A7C: .4byte gUnknown_2022744 -_08081A80: .4byte gUnknown_2021CF0 +_08081A80: .4byte gStringVar2 _08081A84: .4byte gUnknown_83C6AB8 _08081A88: movs r0, 0 diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index 132d88a25..4dbebc1ba 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -219,13 +219,13 @@ sub_80F5708: @ 80F5708 bne _080F5792 _080F5736: movs r0, 0x5 - bl sub_80722CC + bl PlaySE b _080F577A .align 2, 0 _080F5740: .4byte gUnknown_203AB54 _080F5744: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer diff --git a/asm/coins.s b/asm/coins.s index 54649c141..3b914a15a 100644 --- a/asm/coins.s +++ b/asm/coins.s @@ -134,11 +134,11 @@ sub_80D060C: @ 80D060C lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _080D0668 @ =gUnknown_2021CD0 + ldr r0, _080D0668 @ =gStringVar1 movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r0, _080D066C @ =gUnknown_2021D18 + ldr r0, _080D066C @ =gStringVar4 mov r9, r0 ldr r1, _080D0670 @ =gUnknown_84162C4 bl StringExpandPlaceholders @@ -159,8 +159,8 @@ sub_80D060C: @ 80D060C pop {r0} bx r0 .align 2, 0 -_080D0668: .4byte gUnknown_2021CD0 -_080D066C: .4byte gUnknown_2021D18 +_080D0668: .4byte gStringVar1 +_080D066C: .4byte gStringVar4 _080D0670: .4byte gUnknown_84162C4 thumb_func_end sub_80D060C @@ -216,18 +216,18 @@ sub_80D06D0: @ 80D06D0 push {r4,lr} sub sp, 0xC adds r1, r0, 0 - ldr r0, _080D071C @ =gUnknown_2021CD0 + ldr r0, _080D071C @ =gStringVar1 movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r4, _080D0720 @ =gUnknown_2021D18 + ldr r4, _080D0720 @ =gStringVar4 ldr r1, _080D0724 @ =gUnknown_84162C4 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth ldr r1, _080D0728 @ =gUnknown_2039A28 ldrb r1, [r1] movs r3, 0x40 @@ -248,8 +248,8 @@ sub_80D06D0: @ 80D06D0 pop {r0} bx r0 .align 2, 0 -_080D071C: .4byte gUnknown_2021CD0 -_080D0720: .4byte gUnknown_2021D18 +_080D071C: .4byte gStringVar1 +_080D0720: .4byte gStringVar4 _080D0724: .4byte gUnknown_84162C4 _080D0728: .4byte gUnknown_2039A28 thumb_func_end sub_80D06D0 diff --git a/asm/daycare.s b/asm/daycare.s index abb851749..7d49d555a 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -360,7 +360,7 @@ TakeSelectedPokemonFromDaycare: @ 804565C push {r4-r7,lr} sub sp, 0x68 adds r5, r0, 0 - ldr r1, _080456F8 @ =gUnknown_2021CD0 + ldr r1, _080456F8 @ =gStringVar1 bl GetBoxMonNick adds r0, r5, 0 movs r1, 0xB @@ -425,7 +425,7 @@ _080456D8: pop {r1} bx r1 .align 2, 0 -_080456F8: .4byte gUnknown_2021CD0 +_080456F8: .4byte gStringVar1 _080456FC: .4byte gUnknown_2024284 thumb_func_end TakeSelectedPokemonFromDaycare @@ -530,12 +530,12 @@ GetNumLevelsGainedForDaycareMon: @ 80457B4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080457E0 @ =gUnknown_2021CF0 + ldr r0, _080457E0 @ =gStringVar2 adds r1, r4, 0 movs r2, 0 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r1, _080457E4 @ =gUnknown_2021CD0 + ldr r1, _080457E4 @ =gStringVar1 adds r0, r5, 0 bl GetBoxMonNick adds r0, r4, 0 @@ -543,8 +543,8 @@ GetNumLevelsGainedForDaycareMon: @ 80457B4 pop {r1} bx r1 .align 2, 0 -_080457E0: .4byte gUnknown_2021CF0 -_080457E4: .4byte gUnknown_2021CD0 +_080457E0: .4byte gStringVar2 +_080457E4: .4byte gStringVar1 thumb_func_end GetNumLevelsGainedForDaycareMon thumb_func_start GetDaycareCostForSelectedMon @@ -555,13 +555,13 @@ GetDaycareCostForSelectedMon: @ 80457E8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08045818 @ =gUnknown_2021CD0 + ldr r1, _08045818 @ =gStringVar1 adds r0, r5, 0 bl GetBoxMonNick movs r0, 0x64 muls r4, r0 adds r4, 0x64 - ldr r0, _0804581C @ =gUnknown_2021CF0 + ldr r0, _0804581C @ =gStringVar2 adds r1, r4, 0 movs r2, 0 movs r3, 0x5 @@ -571,8 +571,8 @@ GetDaycareCostForSelectedMon: @ 80457E8 pop {r1} bx r1 .align 2, 0 -_08045818: .4byte gUnknown_2021CD0 -_0804581C: .4byte gUnknown_2021CF0 +_08045818: .4byte gStringVar1 +_0804581C: .4byte gStringVar2 thumb_func_end GetDaycareCostForSelectedMon thumb_func_start GetDaycareCostForMon @@ -2163,14 +2163,14 @@ _GetDaycareMonNicknames: @ 804640C bl GetBoxMonData cmp r0, 0 beq _08046436 - ldr r1, _08046454 @ =gUnknown_2021CD0 + ldr r1, _08046454 @ =gStringVar1 adds r0, r4, 0 bl GetBoxMonNick adds r0, r4, 0 movs r1, 0x7 mov r2, sp bl GetBoxMonData - ldr r0, _08046458 @ =gUnknown_2021D04 + ldr r0, _08046458 @ =gStringVar3 mov r1, sp bl StringCopy _08046436: @@ -2180,7 +2180,7 @@ _08046436: bl GetBoxMonData cmp r0, 0 beq _0804644C - ldr r1, _0804645C @ =gUnknown_2021CF0 + ldr r1, _0804645C @ =gStringVar2 adds r0, r4, 0 bl GetBoxMonNick _0804644C: @@ -2189,9 +2189,9 @@ _0804644C: pop {r0} bx r0 .align 2, 0 -_08046454: .4byte gUnknown_2021CD0 -_08046458: .4byte gUnknown_2021D04 -_0804645C: .4byte gUnknown_2021CF0 +_08046454: .4byte gStringVar1 +_08046458: .4byte gStringVar3 +_0804645C: .4byte gStringVar2 thumb_func_end _GetDaycareMonNicknames thumb_func_start GetSelectedMonNickAndSpecies @@ -2204,7 +2204,7 @@ GetSelectedMonNickAndSpecies: @ 8046460 muls r0, r5 ldr r4, _08046494 @ =gUnknown_2024284 adds r0, r4 - ldr r1, _08046498 @ =gUnknown_2021CD0 + ldr r1, _08046498 @ =gStringVar1 bl GetBoxMonNick bl GetCursorSelectionMonId lsls r0, 24 @@ -2220,7 +2220,7 @@ GetSelectedMonNickAndSpecies: @ 8046460 bx r1 .align 2, 0 _08046494: .4byte gUnknown_2024284 -_08046498: .4byte gUnknown_2021CD0 +_08046498: .4byte gStringVar1 thumb_func_end GetSelectedMonNickAndSpecies thumb_func_start GetDaycareMonNicknames @@ -2522,7 +2522,7 @@ _080466A8: bne _080466AE movs r1, 0 _080466AE: - ldr r0, _080466C0 @ =gUnknown_2021D18 + ldr r0, _080466C0 @ =gStringVar4 ldr r2, _080466C4 @ =gUnknown_825F82C lsls r1, 2 adds r1, r2 @@ -2531,7 +2531,7 @@ _080466AE: pop {r0} bx r0 .align 2, 0 -_080466C0: .4byte gUnknown_2021D18 +_080466C0: .4byte gStringVar4 _080466C4: .4byte gUnknown_825F82C thumb_func_end SetDaycareCompatibilityString @@ -2799,7 +2799,7 @@ DaycareAddTextPrinter: @ 8046898 adds r0, r2, 0 ands r0, r1 strb r0, [r3, 0xC] - ldr r3, _08046908 @ =gUnknown_3003E50 + ldr r3, _08046908 @ =gTextFlags ldrb r1, [r3] movs r0, 0x3 negs r0, r0 @@ -2836,7 +2836,7 @@ DaycareAddTextPrinter: @ 8046898 pop {r0} bx r0 .align 2, 0 -_08046908: .4byte gUnknown_3003E50 +_08046908: .4byte gTextFlags thumb_func_end DaycareAddTextPrinter thumb_func_start DaycarePrintMonNick @@ -2905,7 +2905,7 @@ DaycarePrintMonLvl: @ 8046944 movs r0, 0x3 mov r1, sp movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0x84 subs r2, r0 adds r0, r5, 0 diff --git a/asm/diploma.s b/asm/diploma.s index f2dfa0785..763015118 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -545,7 +545,7 @@ _080F5050: movs r0, 0x2 add r1, sp, 0xC adds r2, r5, 0 - bl sub_8005ED4 + bl GetStringWidth lsrs r2, r0, 1 movs r4, 0x78 subs r2, r4, r2 @@ -566,7 +566,7 @@ _080F5050: movs r0, 0x2 add r1, sp, 0xC adds r2, r5, 0 - bl sub_8005ED4 + bl GetStringWidth lsrs r0, 1 subs r4, r0 lsls r4, 24 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 4a5032729..6e20b06da 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -560,7 +560,7 @@ _080BDAF4: _080BDAF6: movs r3, 0x2 _080BDAF8: - ldr r4, _080BDB18 @ =gUnknown_2021D18 + ldr r4, _080BDB18 @ =gStringVar4 adds r0, r4, 0 adds r1, r5, 0 bl ConvertEasyChatWordsToString @@ -573,7 +573,7 @@ _080BDB08: .align 2, 0 _080BDB10: .4byte gSaveBlock1Ptr _080BDB14: .4byte 0x00002cc4 -_080BDB18: .4byte gUnknown_2021D18 +_080BDB18: .4byte gStringVar4 thumb_func_end sub_80BDA7C thumb_func_start sub_80BDB1C @@ -591,12 +591,12 @@ _080BDB2E: adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _080BDB44 @ =gUnknown_2021CF0 + ldr r0, _080BDB44 @ =gStringVar2 bl CopyEasyChatWord pop {r0} bx r0 .align 2, 0 -_080BDB44: .4byte gUnknown_2021CF0 +_080BDB44: .4byte gStringVar2 thumb_func_end sub_80BDB1C thumb_func_start sub_80BDB48 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index b733fa4c3..40e89ac65 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -218,7 +218,7 @@ AddHatchedMonToParty: @ 8046D60 adds r0, r4, 0 movs r1, 0x3 bl sub_8088E74 - ldr r1, _08046E1C @ =gUnknown_2021CD0 + ldr r1, _08046E1C @ =gStringVar1 adds r0, r5, 0 bl GetMonNick mov r2, sp @@ -252,7 +252,7 @@ AddHatchedMonToParty: @ 8046D60 .align 2, 0 _08046E14: .4byte gUnknown_2024284 _08046E18: .4byte gUnknown_202402C -_08046E1C: .4byte gUnknown_2021CD0 +_08046E1C: .4byte gStringVar1 thumb_func_end AddHatchedMonToParty thumb_func_start ScriptHatchMon @@ -299,22 +299,22 @@ sub_8046E34: @ 8046E34 cmp r0, 0 beq _08046EA0 _08046E74: - ldr r0, _08046E94 @ =gUnknown_2021CD0 + ldr r0, _08046E94 @ =gStringVar1 mov r1, sp bl StringCopy - ldr r0, _08046E98 @ =gUnknown_2021CF0 + ldr r0, _08046E98 @ =gStringVar2 adds r1, r4, 0 bl StringCopy - ldr r0, _08046E9C @ =gUnknown_2021D04 + ldr r0, _08046E9C @ =gStringVar3 adds r1, r5, 0 bl StringCopy movs r0, 0x1 b _08046EA2 .align 2, 0 _08046E90: .4byte gSaveBlock2Ptr -_08046E94: .4byte gUnknown_2021CD0 -_08046E98: .4byte gUnknown_2021CF0 -_08046E9C: .4byte gUnknown_2021D04 +_08046E94: .4byte gStringVar1 +_08046E98: .4byte gStringVar2 +_08046E9C: .4byte gStringVar3 _08046EA0: movs r0, 0 _08046EA2: @@ -776,7 +776,7 @@ EggHatchSetMonNickname: @ 80472A0 muls r0, r1 ldr r1, _080472D4 @ =gUnknown_2024284 adds r0, r1 - ldr r2, _080472D8 @ =gUnknown_2021D04 + ldr r2, _080472D8 @ =gStringVar3 movs r1, 0x2 bl sub_804037C bl FreeMonSpritesGfx @@ -791,7 +791,7 @@ EggHatchSetMonNickname: @ 80472A0 .align 2, 0 _080472D0: .4byte gUnknown_20370C0 _080472D4: .4byte gUnknown_2024284 -_080472D8: .4byte gUnknown_2021D04 +_080472D8: .4byte gStringVar3 _080472DC: .4byte gUnknown_3000E74 _080472E0: .4byte c2_exit_to_overworld_2_switch thumb_func_end EggHatchSetMonNickname @@ -999,9 +999,9 @@ _08047482: muls r0, r1 ldr r1, _080474D4 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _080474D8 @ =gUnknown_2021CD0 + ldr r1, _080474D8 @ =gStringVar1 bl GetMonNick - ldr r4, _080474DC @ =gUnknown_2021D18 + ldr r4, _080474DC @ =gStringVar4 ldr r1, _080474E0 @ =gUnknown_841B6FD adds r0, r4, 0 bl StringExpandPlaceholders @@ -1029,8 +1029,8 @@ _08047482: b _08047684 .align 2, 0 _080474D4: .4byte gUnknown_2024284 -_080474D8: .4byte gUnknown_2021CD0 -_080474DC: .4byte gUnknown_2021D18 +_080474D8: .4byte gStringVar1 +_080474DC: .4byte gStringVar4 _080474E0: .4byte gUnknown_841B6FD _080474E4: .4byte 0x00000103 _080474E8: @@ -1056,9 +1056,9 @@ _08047504: muls r0, r1 ldr r1, _08047538 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _0804753C @ =gUnknown_2021CD0 + ldr r1, _0804753C @ =gStringVar1 bl GetMonNick - ldr r4, _08047540 @ =gUnknown_2021D18 + ldr r4, _08047540 @ =gStringVar4 ldr r1, _08047544 @ =gUnknown_841B716 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1074,8 +1074,8 @@ _08047504: b _08047648 .align 2, 0 _08047538: .4byte gUnknown_2024284 -_0804753C: .4byte gUnknown_2021CD0 -_08047540: .4byte gUnknown_2021D18 +_0804753C: .4byte gStringVar1 +_08047540: .4byte gStringVar4 _08047544: .4byte gUnknown_841B716 _08047548: ldr r0, [r5] @@ -1136,7 +1136,7 @@ _080475A8: adds r0, r1, 0 ldr r6, _08047628 @ =gUnknown_2024284 adds r0, r6 - ldr r1, _0804762C @ =gUnknown_2021D04 + ldr r1, _0804762C @ =gStringVar3 mov r10, r1 bl GetMonNick mov r1, r9 @@ -1184,7 +1184,7 @@ _080475A8: .align 2, 0 _08047624: .4byte gUnknown_3000E74 _08047628: .4byte gUnknown_2024284 -_0804762C: .4byte gUnknown_2021D04 +_0804762C: .4byte gStringVar3 _08047630: .4byte EggHatchSetMonNickname _08047634: movs r0, 0x1 @@ -1276,7 +1276,7 @@ _080476D0: cmp r0, 0xF bne _08047700 movs r0, 0x17 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 movs r1, 0x1 bl StartSpriteAnim @@ -1329,7 +1329,7 @@ _08047738: cmp r0, 0xF bne _08047764 movs r0, 0x17 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 movs r1, 0x2 bl StartSpriteAnim @@ -1412,7 +1412,7 @@ _080477E4: cmp r0, 0xF bne _08047818 movs r0, 0x17 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 movs r1, 0x2 bl StartSpriteAnim @@ -1424,7 +1424,7 @@ _08047818: cmp r0, 0x1E bne _08047826 movs r0, 0x17 - bl sub_80722CC + bl PlaySE _08047826: pop {r4-r6} pop {r0} @@ -1498,7 +1498,7 @@ _0804788C: cmp r4, 0 bne _080478BA movs r0, 0x6A - bl sub_80722CC + bl PlaySE adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 86fda2a88..9f02a0320 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -636,7 +636,7 @@ sub_80F5DD0: @ 80F5DD0 ldr r0, _080F5E1C @ =EvoTask_CreatePreEvoSparkleSet1 str r0, [r5] movs r0, 0x85 - bl sub_80722CC + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} @@ -768,7 +768,7 @@ sub_80F5ED8: @ 80F5ED8 ldr r1, _080F5F08 @ =EvoTask_CreatePreEvoSparklesSet2 str r1, [r0] movs r0, 0xB0 - bl sub_80722CC + bl PlaySE pop {r4} pop {r0} bx r0 @@ -867,7 +867,7 @@ sub_80F5F8C: @ 80F5F8C ldr r1, _080F5FBC @ =EvoTask_CreatePostEvoSparklesSet1 str r1, [r0] movs r0, 0x5F - bl sub_80722CC + bl PlaySE pop {r4} pop {r0} bx r0 @@ -1011,7 +1011,7 @@ sub_80F6080: @ 80F6080 ldr r0, _080F60E0 @ =sub_80F60E4 str r0, [r5] movs r0, 0xC3 - bl sub_80722CC + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} @@ -1173,7 +1173,7 @@ sub_80F61C0: @ 80F61C0 ldr r0, _080F6220 @ =sub_80F6224 str r0, [r5] movs r0, 0xC3 - bl sub_80722CC + bl PlaySE add sp, 0x4 pop {r4,r5} pop {r0} diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index e2a66525d..9b5153c89 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -213,10 +213,10 @@ EvolutionScene: @ 80CDDF4 movs r1, 0x2 mov r2, sp bl GetMonData - ldr r0, _080CE0AC @ =gUnknown_2021CD0 + ldr r0, _080CE0AC @ =gStringVar1 mov r1, sp bl StringCopy10 - ldr r0, _080CE0B0 @ =gUnknown_2021CF0 + ldr r0, _080CE0B0 @ =gStringVar2 movs r1, 0xB mov r2, r10 muls r2, r1 @@ -412,8 +412,8 @@ _080CE09C: .4byte gUnknown_2022982 _080CE0A0: .4byte gUnknown_2022B50 _080CE0A4: .4byte gUnknown_3003E58 _080CE0A8: .4byte gUnknown_2039A20 -_080CE0AC: .4byte gUnknown_2021CD0 -_080CE0B0: .4byte gUnknown_2021CF0 +_080CE0AC: .4byte gStringVar1 +_080CE0B0: .4byte gStringVar2 _080CE0B4: .4byte gUnknown_8245EE0 _080CE0B8: .4byte gUnknown_82350AC _080CE0BC: .4byte gUnknown_202401C @@ -915,10 +915,10 @@ TradeEvolutionScene: @ 80CE540 movs r1, 0x2 mov r2, sp bl GetMonData - ldr r0, _080CE6B0 @ =gUnknown_2021CD0 + ldr r0, _080CE6B0 @ =gStringVar1 mov r1, sp bl StringCopy10 - ldr r0, _080CE6B4 @ =gUnknown_2021CF0 + ldr r0, _080CE6B4 @ =gStringVar2 movs r1, 0xB muls r1, r5 ldr r2, _080CE6B8 @ =gUnknown_8245EE0 @@ -1046,7 +1046,7 @@ TradeEvolutionScene: @ 80CE540 strh r0, [r1] ldr r0, _080CE700 @ =gUnknown_2022982 strh r4, [r0] - ldr r2, _080CE704 @ =gUnknown_3003E50 + ldr r2, _080CE704 @ =gTextFlags ldrb r0, [r2] movs r1, 0x2 orrs r0, r1 @@ -1064,8 +1064,8 @@ TradeEvolutionScene: @ 80CE540 pop {r0} bx r0 .align 2, 0 -_080CE6B0: .4byte gUnknown_2021CD0 -_080CE6B4: .4byte gUnknown_2021CF0 +_080CE6B0: .4byte gStringVar1 +_080CE6B4: .4byte gStringVar2 _080CE6B8: .4byte gUnknown_8245EE0 _080CE6BC: .4byte gUnknown_2021CCC _080CE6C0: .4byte gUnknown_2039A20 @@ -1085,7 +1085,7 @@ _080CE6F4: .4byte gUnknown_202297C _080CE6F8: .4byte gUnknown_202297E _080CE6FC: .4byte gUnknown_2022980 _080CE700: .4byte gUnknown_2022982 -_080CE704: .4byte gUnknown_3003E50 +_080CE704: .4byte gTextFlags _080CE708: .4byte sub_80D00D8 _080CE70C: .4byte sub_80CE72C thumb_func_end TradeEvolutionScene @@ -1491,7 +1491,7 @@ _080CEA90: beq _080CEAA0 bl _080CF528 _080CEAA0: - ldr r4, _080CEAC4 @ =gUnknown_2021D18 + ldr r4, _080CEAC4 @ =gStringVar4 ldr r1, _080CEAC8 @ =gUnknown_83FE672 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1506,7 +1506,7 @@ _080CEAA0: b _080CEFDE .align 2, 0 _080CEAC0: .4byte gUnknown_2037AB8 -_080CEAC4: .4byte gUnknown_2021D18 +_080CEAC4: .4byte gStringVar4 _080CEAC8: .4byte gUnknown_83FE672 _080CEACC: .4byte gUnknown_3005090 _080CEAD0: @@ -1533,7 +1533,7 @@ _080CEAF0: bl _080CF528 _080CEAFE: ldr r0, _080CEB10 @ =0x00000107 - bl sub_80722CC + bl PlaySE ldr r0, _080CEB14 @ =gUnknown_3005090 mov r2, r8 adds r1, r2, r7 @@ -1732,7 +1732,7 @@ _080CEC94: bl _080CF528 _080CECAA: movs r0, 0x1B - bl sub_80722CC + bl PlaySE mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -1796,7 +1796,7 @@ _080CED2C: bne _080CED3A bl _080CF528 _080CED3A: - ldr r4, _080CEDA8 @ =gUnknown_2021D18 + ldr r4, _080CEDA8 @ =gStringVar4 ldr r1, _080CEDAC @ =gUnknown_83FE688 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1840,7 +1840,7 @@ _080CED3A: bl IncrementGameStat b _080CF528 .align 2, 0 -_080CEDA8: .4byte gUnknown_2021D18 +_080CEDA8: .4byte gStringVar4 _080CEDAC: .4byte gUnknown_83FE688 _080CEDB0: .4byte 0x00000103 _080CEDB4: .4byte gUnknown_3005090 @@ -2040,20 +2040,20 @@ _080CEF48: ldrsh r0, [r1, r3] cmp r0, 0 beq _080CEF70 - ldr r0, _080CEF68 @ =gUnknown_2021D18 + ldr r0, _080CEF68 @ =gStringVar4 ldr r1, _080CEF6C @ =gUnknown_83FE6D0 bl StringExpandPlaceholders b _080CEF78 .align 2, 0 _080CEF64: .4byte gUnknown_3005090 -_080CEF68: .4byte gUnknown_2021D18 +_080CEF68: .4byte gStringVar4 _080CEF6C: .4byte gUnknown_83FE6D0 _080CEF70: - ldr r0, _080CEF90 @ =gUnknown_2021D18 + ldr r0, _080CEF90 @ =gStringVar4 ldr r1, _080CEF94 @ =gUnknown_83FE6B5 bl StringExpandPlaceholders _080CEF78: - ldr r0, _080CEF90 @ =gUnknown_2021D18 + ldr r0, _080CEF90 @ =gStringVar4 movs r1, 0 bl sub_80D87BC ldr r1, _080CEF98 @ =gUnknown_3005090 @@ -2065,7 +2065,7 @@ _080CEF78: strh r1, [r0, 0x1A] b _080CF4F2 .align 2, 0 -_080CEF90: .4byte gUnknown_2021D18 +_080CEF90: .4byte gStringVar4 _080CEF94: .4byte gUnknown_83FE6B5 _080CEF98: .4byte gUnknown_3005090 _080CEF9C: @@ -2321,7 +2321,7 @@ _080CF1BC: cmp r0, 0 beq _080CF1E2 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0 strb r0, [r4, 0x1] @@ -2338,7 +2338,7 @@ _080CF1E2: cmp r0, 0 bne _080CF208 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_802DCF8 movs r0, 0x1 strb r0, [r4, 0x1] @@ -2358,7 +2358,7 @@ _080CF208: movs r3, 0xD bl sub_802DB7C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _080CF248 @ =gUnknown_2023E82 ldrb r2, [r0, 0x1] cmp r2, 0 @@ -2411,7 +2411,7 @@ _080CF284: movs r3, 0xD bl sub_802DB7C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _080CF2AC @ =gUnknown_3005090 mov r2, r8 adds r0, r2, r7 @@ -2810,7 +2810,7 @@ _080CF5CC: .4byte _080CFB34 .4byte _080CFB70 _080CF620: - ldr r4, _080CF640 @ =gUnknown_2021D18 + ldr r4, _080CF640 @ =gStringVar4 ldr r1, _080CF644 @ =gUnknown_83FE672 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2824,7 +2824,7 @@ _080CF620: adds r1, r0 b _080CFB1A .align 2, 0 -_080CF640: .4byte gUnknown_2021D18 +_080CF640: .4byte gStringVar4 _080CF644: .4byte gUnknown_83FE672 _080CF648: .4byte gUnknown_3005090 _080CF64C: @@ -2853,7 +2853,7 @@ _080CF67A: lsls r0, 1 bl m4aSongNumStop ldr r0, _080CF694 @ =0x00000107 - bl sub_80722CC + bl PlaySE ldr r0, _080CF698 @ =gUnknown_3005090 adds r1, r7, r6 lsls r1, 3 @@ -3064,7 +3064,7 @@ _080CF838: bl _080D003A _080CF84E: movs r0, 0x1B - bl sub_80722CC + bl PlaySE adds r1, r7, r6 lsls r1, 3 adds r1, r5 @@ -3103,7 +3103,7 @@ _080CF89C: bne _080CF8A8 b _080D003A _080CF8A8: - ldr r4, _080CF914 @ =gUnknown_2021D18 + ldr r4, _080CF914 @ =gStringVar4 ldr r1, _080CF918 @ =gUnknown_83FE688 adds r0, r4, 0 bl StringExpandPlaceholders @@ -3147,7 +3147,7 @@ _080CF8A8: bl IncrementGameStat b _080D003A .align 2, 0 -_080CF914: .4byte gUnknown_2021D18 +_080CF914: .4byte gStringVar4 _080CF918: .4byte gUnknown_83FE688 _080CF91C: .4byte 0x00000103 _080CF920: .4byte gUnknown_3005090 @@ -3246,7 +3246,7 @@ _080CF9E0: ldr r0, [r4] bl Free str r5, [r4] - ldr r2, _080CFA0C @ =gUnknown_3003E50 + ldr r2, _080CFA0C @ =gTextFlags ldrb r1, [r2] movs r0, 0x3 negs r0, r0 @@ -3258,7 +3258,7 @@ _080CF9E0: b _080D003A .align 2, 0 _080CFA08: .4byte gUnknown_2039A20 -_080CFA0C: .4byte gUnknown_3003E50 +_080CFA0C: .4byte gTextFlags _080CFA10: .4byte gUnknown_300537C _080CFA14: ldr r0, _080CFA60 @ =gUnknown_2023E82 @@ -3334,7 +3334,7 @@ _080CFA9C: bne _080CFAA8 b _080D003A _080CFAA8: - ldr r4, _080CFACC @ =gUnknown_2021D18 + ldr r4, _080CFACC @ =gStringVar4 ldr r1, _080CFAD0 @ =gUnknown_83FE6D0 adds r0, r4, 0 bl StringExpandPlaceholders @@ -3350,7 +3350,7 @@ _080CFAA8: strh r1, [r0, 0x1A] b _080D0006 .align 2, 0 -_080CFACC: .4byte gUnknown_2021D18 +_080CFACC: .4byte gStringVar4 _080CFAD0: .4byte gUnknown_83FE6D0 _080CFAD4: .4byte gUnknown_3005090 _080CFAD8: diff --git a/asm/fame_checker.s b/asm/fame_checker.s index ef3157dd2..c8a629b2a 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -51,7 +51,7 @@ sub_812C3AC: @ 812C3AC ands r0, r2 strb r0, [r1] movs r0, 0xC7 - bl sub_80722CC + bl PlaySE ldr r0, _0812C3F4 @ =sub_812C3F8 bl SetMainCallback2 pop {r4,r5} @@ -404,7 +404,7 @@ _0812C6E8: cmp r0, 0x1 bne _0812C728 movs r0, 0xCB - bl sub_80722CC + bl PlaySE b _0812C8EA .align 2, 0 _0812C714: .4byte gUnknown_3005090 @@ -423,7 +423,7 @@ _0812C728: b _0812C8EA _0812C738: movs r0, 0xCB - bl sub_80722CC + bl PlaySE movs r0, 0x58 str r0, [sp] movs r0, 0x20 @@ -534,7 +534,7 @@ _0812C828: cmp r0, 0 beq _0812C8EA movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r1, 0xA ldrsh r0, [r7, r1] bl sub_812D724 @@ -917,7 +917,7 @@ _0812CB2E: cmp r0, 0 beq _0812CBB8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r4, 0 ldr r6, _0812CBA4 @ =gUnknown_203B0FC _0812CB44: @@ -1079,7 +1079,7 @@ sub_812CC68: @ 812CC68 ldr r1, _0812CD18 @ =gUnknown_3005098 adds r6, r0, r1 movs r0, 0xBB - bl sub_80722CC + bl PlaySE ldr r2, _0812CD1C @ =gUnknown_202063C movs r0, 0 ldrsh r1, [r6, r0] @@ -1217,7 +1217,7 @@ _0812CD88: movs r0, 0x10 mov r8, r0 _0812CDAC: - ldr r4, _0812CDFC @ =gUnknown_2021D18 + ldr r4, _0812CDFC @ =gStringVar4 ldr r1, _0812CE00 @ =gUnknown_845F63C ldr r0, [r7] adds r0, 0xC @@ -1254,7 +1254,7 @@ _0812CDEE: pop {r0} bx r0 .align 2, 0 -_0812CDFC: .4byte gUnknown_2021D18 +_0812CDFC: .4byte gStringVar4 _0812CE00: .4byte gUnknown_845F63C thumb_func_end sub_812CD3C @@ -1282,7 +1282,7 @@ sub_812CE04: @ 812CE04 movs r2, 0 movs r3, 0 bl FillWindowPixelRect - ldr r6, _0812CE90 @ =gUnknown_2021D18 + ldr r6, _0812CE90 @ =gStringVar4 ldr r2, _0812CE94 @ =gUnknown_845F6BC ldr r0, _0812CE98 @ =gUnknown_203B0FC ldr r0, [r0] @@ -1324,7 +1324,7 @@ sub_812CE04: @ 812CE04 bx r0 .align 2, 0 _0812CE8C: .4byte gUnknown_3005098 -_0812CE90: .4byte gUnknown_2021D18 +_0812CE90: .4byte gStringVar4 _0812CE94: .4byte gUnknown_845F6BC _0812CE98: .4byte gUnknown_203B0FC thumb_func_end sub_812CE04 @@ -1426,7 +1426,7 @@ sub_812CF3C: @ 812CF3C lsls r4, 24 lsrs r4, 24 movs r0, 0xC7 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -1635,7 +1635,7 @@ _0812D10A: movs r0, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r4, r0, 0 movs r0, 0xC0 str r0, [sp] @@ -2831,7 +2831,7 @@ sub_812DA14: @ 812DA14 movs r0, 0 adds r1, r6, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r4, 0x54 subs r0, r4, r0 lsrs r1, r0, 31 @@ -2856,7 +2856,7 @@ sub_812DA14: @ 812DA14 movs r1, 0 movs r3, 0 bl AddTextPrinterParametrized2 - ldr r6, _0812DB08 @ =gUnknown_2021CD0 + ldr r6, _0812DB08 @ =gStringVar1 ldr r0, _0812DB0C @ =gUnknown_845FA1C adds r5, r0 ldr r1, [r5] @@ -2865,7 +2865,7 @@ sub_812DA14: @ 812DA14 movs r0, 0 adds r1, r6, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth subs r4, r0 lsrs r0, r4, 31 adds r4, r0 @@ -2899,7 +2899,7 @@ _0812DAF8: .4byte gUnknown_203B0FC _0812DAFC: .4byte gUnknown_3005EC8 _0812DB00: .4byte gUnknown_845F89C _0812DB04: .4byte gUnknown_845F5E3 -_0812DB08: .4byte gUnknown_2021CD0 +_0812DB08: .4byte gStringVar1 _0812DB0C: .4byte gUnknown_845FA1C thumb_func_end sub_812DA14 @@ -3032,7 +3032,7 @@ _0812DBFE: ldr r1, _0812DC74 @ =gUnknown_3005090 adds r5, r0, r1 movs r0, 0x5 - bl sub_80722CC + bl PlaySE mov r0, r8 strh r0, [r5, 0xA] ldr r0, [r6] diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 4add791f3..8c4e2fe98 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -566,7 +566,7 @@ _0806CCCC: ldr r0, _0806CCF8 @ =0x0000083e bl FlagSet movs r0, 0x6 - bl sub_80722CC + bl PlaySE bl sub_806F258 b _0806CB6C .align 2, 0 @@ -707,7 +707,7 @@ sub_806CDF8: @ 806CDF8 cmp r0, 0 bne _0806CE18 movs r0, 0x6 - bl sub_80722CC + bl PlaySE bl sub_806F258 adds r0, r4, 0 bl DestroyTask @@ -805,7 +805,7 @@ _0806CEB8: cmp r4, r0 beq _0806CECA movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0806CECA: adds r0, r4, 0 bl ScriptContext1_SetupScript @@ -2803,7 +2803,7 @@ sub_806DE28: @ 806DE28 cmp r0, 0x66 bne _0806DE64 movs r0, 0x25 - bl sub_80722CC + bl PlaySE ldrb r0, [r5, 0x8] ldr r4, _0806DE6C @ =gSaveBlock1Ptr ldr r2, [r4] @@ -2992,7 +2992,7 @@ _0806DF98: bl sub_8055A08 bl sp13E_warp_to_last_warp movs r0, 0xE2 - bl sub_80722CC + bl PlaySE movs r0, 0x1 b _0806DFB2 _0806DFB0: diff --git a/asm/field_effect.s b/asm/field_effect.s index 5433dfe60..cef2ed259 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -1464,7 +1464,7 @@ _08083EA4: subs r0, 0x1 strh r0, [r4, 0x3A] movs r0, 0x17 - bl sub_80722CC + bl PlaySE _08083F00: movs r1, 0x3A ldrsh r0, [r4, r1] @@ -2343,7 +2343,7 @@ sub_8084580: @ 8084580 ands r0, r2 strb r0, [r1, 0x1] movs r0, 0x25 - bl sub_80722CC + bl PlaySE ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -2431,7 +2431,7 @@ _08084674: cmp r0, 0 blt _08084698 movs r0, 0xCF - bl sub_80722CC + bl PlaySE ldrb r0, [r6] movs r1, 0x8 orrs r0, r1 @@ -2685,7 +2685,7 @@ _0808484A: strh r0, [r5, 0x8] _08084878: movs r0, 0x49 - bl sub_80722CC + bl PlaySE _0808487E: movs r0, 0 pop {r4,r5} @@ -3710,7 +3710,7 @@ sub_808500C: @ 808500C movs r0, 0x32 bl FieldEffectStart movs r0, 0xAB - bl sub_80722CC + bl PlaySE ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -4063,7 +4063,7 @@ sub_80852C0: @ 80852C0 strb r0, [r4, 0x1] bl CameraObjectReset1 movs r0, 0xA8 - bl sub_80722CC + bl PlaySE movs r0, 0x4 bl sub_8064194 adds r1, r0, 0 @@ -4313,7 +4313,7 @@ _080854C4: adds r0, r4, 0 bl sub_8063CA4 movs r0, 0x21 - bl sub_80722CC + bl PlaySE _080854E4: movs r0, 0 pop {r4-r6} @@ -4568,7 +4568,7 @@ sub_8085690: @ 8085690 cmp r0, 0x14 bne _08085702 movs r0, 0x27 - bl sub_80722CC + bl PlaySE b _08085702 .align 2, 0 _080856D4: .4byte gUnknown_2037078 @@ -4942,7 +4942,7 @@ _0808599C: cmp r0, 0 blt _080859C2 movs r0, 0x1E - bl sub_80722CC + bl PlaySE bl CameraObjectReset1 ldrh r0, [r5] adds r0, 0x1 @@ -5030,7 +5030,7 @@ sub_8085A54: @ 8085A54 cmp r0, 0 beq _08085A78 movs r0, 0x28 - bl sub_80722CC + bl PlaySE bl player_get_direction_lower_nybble lsls r0, 24 lsrs r0, 24 @@ -5273,7 +5273,7 @@ _08085C1C: movs r0, 0x1 strh r0, [r4, 0xE] movs r0, 0x27 - bl sub_80722CC + bl PlaySE _08085C4A: add sp, 0x8 pop {r4,r5} @@ -5545,7 +5545,7 @@ sub_8085E0C: @ 8085E0C lsrs r0, 24 strh r0, [r6, 0x26] movs r0, 0x27 - bl sub_80722CC + bl PlaySE _08085E82: pop {r4-r6} pop {r0} @@ -7460,7 +7460,7 @@ sub_8086D38: @ 8086D38 ldr r0, [r0] strh r0, [r2, 0x30] movs r0, 0x97 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 pop {r4} pop {r1} @@ -7773,7 +7773,7 @@ _08086FCE: adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x97 - bl sub_80722CC + bl PlaySE ldrb r0, [r4, 0xA] bl sub_80871C8 _08086FEC: @@ -9357,7 +9357,7 @@ sub_8087C00: @ 8087C00 lsls r4, 24 lsrs r4, 24 movs r0, 0x51 - bl sub_80722CC + bl PlaySE strh r4, [r5, 0xA] ldrh r0, [r5, 0x2] adds r0, 0x1 @@ -9413,7 +9413,7 @@ sub_8087C2C: @ 8087C2C adds r0, r4, 0 bl sub_8087CFC movs r0, 0x50 - bl sub_80722CC + bl PlaySE ldrb r0, [r7, 0xA] bl sub_8087BA8 movs r0, 0 diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 2b1ca9bc8..4640875c8 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -1892,7 +1892,7 @@ FldEff_Splash: @ 80DBB88 subs r0, 0x4 strh r0, [r3, 0x26] movs r0, 0x3F - bl sub_80722CC + bl PlaySE _080DBC12: movs r0, 0 pop {r4-r6} @@ -2250,7 +2250,7 @@ _080DBE98: cmp r0, 0 bne _080DBEE2 movs r0, 0x3F - bl sub_80722CC + bl PlaySE _080DBEE2: add sp, 0x4 pop {r4,r5} diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index 10cf2dee5..b227e7464 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -591,7 +591,7 @@ sub_807DF94: @ 807DF94 bl pal_fill_for_maplights bl sub_8111CF0 movs r0, 0x28 - bl sub_80722CC + bl PlaySE ldr r0, _0807DFB8 @ =sub_807E31C movs r1, 0xA bl CreateTask @@ -694,7 +694,7 @@ _0807E074: bl sub_805B364 lsls r0, 16 lsrs r0, 16 - bl sub_80722CC + bl PlaySE movs r1, 0 ldrsh r0, [r6, r1] movs r2, 0 @@ -1161,7 +1161,7 @@ sub_807E438: @ 807E438 bl sub_807DC18 bl play_some_sound movs r0, 0x9 - bl sub_80722CC + bl PlaySE ldr r0, _0807E464 @ =gUnknown_3005020 ldr r1, _0807E468 @ =sub_807DF64 str r1, [r0] @@ -1431,7 +1431,7 @@ sub_807E654: @ 807E654 bl sub_8055F88 bl sub_807DC18 movs r0, 0x9 - bl sub_80722CC + bl PlaySE ldr r0, _0807E674 @ =sub_807E5EC movs r1, 0xA bl CreateTask @@ -1473,7 +1473,7 @@ _0807E6A6: bl fade_screen bl sub_8055F88 movs r0, 0x9 - bl sub_80722CC + bl PlaySE b _0807E6D4 _0807E6BE: bl sub_807E40C @@ -1607,7 +1607,7 @@ _0807E7B6: bl player_bitmagic bl ScriptContext2_Enable movs r0, 0x27 - bl sub_80722CC + bl PlaySE bl sub_805DAB0 b _0807E7EA _0807E7CA: @@ -1693,7 +1693,7 @@ _0807E85C: bl sub_805B364 lsls r0, 16 lsrs r0, 16 - bl sub_80722CC + bl PlaySE movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0 @@ -1904,7 +1904,7 @@ _0807EA10: adds r2, r5, 0x6 bl sub_807EB64 movs r0, 0x9 - bl sub_80722CC + bl PlaySE b _0807EA92 _0807EA38: movs r1, 0x4 diff --git a/asm/field_message_box.s b/asm/field_message_box.s index 95a088c19..13e81b7cc 100644 --- a/asm/field_message_box.s +++ b/asm/field_message_box.s @@ -10,7 +10,7 @@ sub_8069348: @ 8069348 ldr r1, _08069368 @ =gUnknown_203709C movs r0, 0 strb r0, [r1] - ldr r2, _0806936C @ =gUnknown_3003E50 + ldr r2, _0806936C @ =gTextFlags ldrb r1, [r2] movs r0, 0x2 negs r0, r0 @@ -24,7 +24,7 @@ sub_8069348: @ 8069348 bx lr .align 2, 0 _08069368: .4byte gUnknown_203709C -_0806936C: .4byte gUnknown_3003E50 +_0806936C: .4byte gTextFlags thumb_func_end sub_8069348 thumb_func_start sub_8069370 @@ -57,7 +57,7 @@ _0806939E: ldrb r0, [r0] cmp r0, 0x2 bne _080693C4 - ldr r2, _080693C0 @ =gUnknown_3003E50 + ldr r2, _080693C0 @ =gTextFlags ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 @@ -69,7 +69,7 @@ _0806939E: b _080693E2 .align 2, 0 _080693BC: .4byte gUnknown_203ADFA -_080693C0: .4byte gUnknown_3003E50 +_080693C0: .4byte gTextFlags _080693C4: bl sub_8069A38 lsls r0, 24 @@ -223,7 +223,7 @@ _080694C2: textbox_fdecode_auto_and_task_add: @ 80694C8 push {lr} adds r1, r0, 0 - ldr r0, _080694E0 @ =gUnknown_2021D18 + ldr r0, _080694E0 @ =gStringVar4 bl StringExpandPlaceholders movs r0, 0x1 bl sub_80F6D5C @@ -231,7 +231,7 @@ textbox_fdecode_auto_and_task_add: @ 80694C8 pop {r0} bx r0 .align 2, 0 -_080694E0: .4byte gUnknown_2021D18 +_080694E0: .4byte gStringVar4 thumb_func_end textbox_fdecode_auto_and_task_add thumb_func_start textbox_auto_and_task_add diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 657732fa3..a0a4bdb96 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -612,7 +612,7 @@ _0805B81C: .4byte sub_805C2B4 sub_805B820: @ 805B820 push {lr} movs r0, 0x99 - bl sub_80722CC + bl PlaySE pop {r0} bx r0 thumb_func_end sub_805B820 @@ -2020,7 +2020,7 @@ sub_805C23C: @ 805C23C lsls r4, 24 lsrs r4, 24 movs r0, 0xA - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl GetJumpLedgeAnimId lsls r0, 24 @@ -2178,7 +2178,7 @@ sub_805C354: @ 805C354 lsls r4, 24 lsrs r4, 24 movs r0, 0x1C - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_8064378 lsls r0, 24 @@ -2197,7 +2197,7 @@ sub_805C378: @ 805C378 lsls r4, 24 lsrs r4, 24 movs r0, 0x1C - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_80643A4 lsls r0, 24 @@ -2216,7 +2216,7 @@ sub_805C39C: @ 805C39C lsls r4, 24 lsrs r4, 24 movs r0, 0x1C - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_80643D0 lsls r0, 24 @@ -2235,7 +2235,7 @@ sub_805C3C0: @ 805C3C0 lsls r4, 24 lsrs r4, 24 movs r0, 0x1C - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_8064168 lsls r0, 24 @@ -2254,7 +2254,7 @@ sub_805C3E4: @ 805C3E4 lsls r4, 24 lsrs r4, 24 movs r0, 0x7 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_80643FC lsls r0, 24 @@ -2371,7 +2371,7 @@ _0805C4A0: bne _0805C4DE _0805C4D8: movs r0, 0x7 - bl sub_80722CC + bl PlaySE _0805C4DE: add sp, 0x4 pop {r4-r6} @@ -3582,7 +3582,7 @@ sub_805CD84: @ 805CD84 movs r0, 0xA bl FieldEffectStart movs r0, 0xCF - bl sub_80722CC + bl PlaySE ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] @@ -3709,7 +3709,7 @@ PlayerAvatar_DoSecretBaseMatJump: @ 805CEEC cmp r0, 0 beq _0805CF48 movs r0, 0xA - bl sub_80722CC + bl PlaySE ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 @@ -3817,7 +3817,7 @@ sub_805CFC4: @ 805CFC4 strb r0, [r1, 0x6] bl ScriptContext2_Enable movs r0, 0x27 - bl sub_80722CC + bl PlaySE movs r0, 0x1 pop {r1} bx r1 diff --git a/asm/field_poison.s b/asm/field_poison.s index 05522fa61..8847b7cd5 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -79,7 +79,7 @@ MonFaintFromPoisonOnField: @ 80A04B8 movs r1, 0x37 mov r2, sp bl sub_804037C - ldr r5, _080A0500 @ =gUnknown_2021CD0 + ldr r5, _080A0500 @ =gStringVar1 adds r0, r4, 0 movs r1, 0x2 adds r2, r5, 0 @@ -92,7 +92,7 @@ MonFaintFromPoisonOnField: @ 80A04B8 bx r0 .align 2, 0 _080A04FC: .4byte gUnknown_2024284 -_080A0500: .4byte gUnknown_2021CD0 +_080A0500: .4byte gStringVar1 thumb_func_end MonFaintFromPoisonOnField thumb_func_start CheckMonFaintedFromPoison diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index ace3190ac..d67cfc42a 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -768,7 +768,7 @@ _0807F3E0: adds r0, r7, 0 movs r1, 0 bl FillWindowPixelBuffer - ldr r5, _0807F424 @ =gUnknown_2021D18 + ldr r5, _0807F424 @ =gStringVar4 adds r0, r5, 0 mov r1, r8 bl StringExpandPlaceholders @@ -786,7 +786,7 @@ _0807F3E0: mov r2, r10 mov r3, r9 bl AddTextPrinterParametrized2 - ldr r2, _0807F42C @ =gUnknown_3003E50 + ldr r2, _0807F42C @ =gTextFlags ldrb r1, [r2] movs r0, 0x2 negs r0, r0 @@ -796,9 +796,9 @@ _0807F3E0: strh r0, [r4, 0xC] b _0807F448 .align 2, 0 -_0807F424: .4byte gUnknown_2021D18 +_0807F424: .4byte gStringVar4 _0807F428: .4byte gUnknown_83C68EC -_0807F42C: .4byte gUnknown_3003E50 +_0807F42C: .4byte gTextFlags _0807F430: bl RunTextPrinters adds r0, r7, 0 diff --git a/asm/field_specials.s b/asm/field_specials.s index cab7ecc82..37d522660 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -76,12 +76,12 @@ _080CA688: thumb_func_start sub_80CA68C sub_80CA68C: @ 80CA68C push {lr} - ldr r0, _080CA698 @ =gUnknown_2021D18 + ldr r0, _080CA698 @ =gStringVar4 bl ShowFieldMessage pop {r0} bx r0 .align 2, 0 -_080CA698: .4byte gUnknown_2021D18 +_080CA698: .4byte gStringVar4 thumb_func_end sub_80CA68C thumb_func_start sub_80CA69C @@ -128,23 +128,23 @@ sub_80CA6DC: @ 80CA6DC ldrb r0, [r0, 0x8] cmp r0, 0 bne _080CA700 - ldr r0, _080CA6F8 @ =gUnknown_2021CD0 + ldr r0, _080CA6F8 @ =gStringVar1 ldr r1, _080CA6FC @ =gUnknown_8417FBB bl StringCopy b _080CA708 .align 2, 0 _080CA6F4: .4byte gSaveBlock2Ptr -_080CA6F8: .4byte gUnknown_2021CD0 +_080CA6F8: .4byte gStringVar1 _080CA6FC: .4byte gUnknown_8417FBB _080CA700: - ldr r0, _080CA70C @ =gUnknown_2021CD0 + ldr r0, _080CA70C @ =gStringVar1 ldr r1, _080CA710 @ =gUnknown_8417FC3 bl StringCopy _080CA708: pop {r0} bx r0 .align 2, 0 -_080CA70C: .4byte gUnknown_2021CD0 +_080CA70C: .4byte gStringVar1 _080CA710: .4byte gUnknown_8417FC3 thumb_func_end sub_80CA6DC @@ -156,23 +156,23 @@ sub_80CA714: @ 80CA714 ldrb r0, [r0, 0x8] cmp r0, 0 bne _080CA738 - ldr r0, _080CA730 @ =gUnknown_2021CD0 + ldr r0, _080CA730 @ =gStringVar1 ldr r1, _080CA734 @ =gUnknown_8417FD0 bl StringCopy b _080CA740 .align 2, 0 _080CA72C: .4byte gSaveBlock2Ptr -_080CA730: .4byte gUnknown_2021CD0 +_080CA730: .4byte gStringVar1 _080CA734: .4byte gUnknown_8417FD0 _080CA738: - ldr r0, _080CA744 @ =gUnknown_2021CD0 + ldr r0, _080CA744 @ =gStringVar1 ldr r1, _080CA748 @ =gUnknown_8417FCC bl StringCopy _080CA740: pop {r0} bx r0 .align 2, 0 -_080CA744: .4byte gUnknown_2021CD0 +_080CA744: .4byte gStringVar1 _080CA748: .4byte gUnknown_8417FCC thumb_func_end sub_80CA714 @@ -645,12 +645,12 @@ _080CAAA8: .4byte gSaveBlock1Ptr thumb_func_start sub_80CAAAC sub_80CAAAC: @ 80CAAAC push {lr} - ldr r0, _080CAAB8 @ =gUnknown_2021CD0 + ldr r0, _080CAAB8 @ =gStringVar1 bl sub_80E7460 pop {r0} bx r0 .align 2, 0 -_080CAAB8: .4byte gUnknown_2021CD0 +_080CAAB8: .4byte gStringVar1 thumb_func_end sub_80CAAAC thumb_func_start sub_80CAABC @@ -879,7 +879,7 @@ sub_80CAC28: @ 80CAC28 movs r0, 0 bl SetCameraPanningCallback movs r0, 0xCF - bl sub_80722CC + bl PlaySE pop {r0} bx r0 .align 2, 0 @@ -1029,7 +1029,7 @@ sub_80CAD7C: @ 80CAD7C muls r0, r1 ldr r1, _080CADAC @ =gUnknown_2024284 adds r0, r1 - ldr r4, _080CADB0 @ =gUnknown_2021CD0 + ldr r4, _080CADB0 @ =gStringVar1 movs r1, 0x7 adds r2, r4, 0 bl GetMonData @@ -1044,7 +1044,7 @@ sub_80CAD7C: @ 80CAD7C .align 2, 0 _080CADA8: .4byte gUnknown_20370C0 _080CADAC: .4byte gUnknown_2024284 -_080CADB0: .4byte gUnknown_2021CD0 +_080CADB0: .4byte gStringVar1 _080CADB4: .4byte gSaveBlock2Ptr _080CADB8: movs r0, 0 @@ -1450,7 +1450,7 @@ _080CB0C0: movs r1, 0 bl VarSet _080CB0EA: - ldr r4, _080CB11C @ =gUnknown_2021CD0 + ldr r4, _080CB11C @ =gStringVar1 ldr r0, _080CB10C @ =0x00004036 bl VarGet lsls r0, 16 @@ -1469,7 +1469,7 @@ _080CB10C: .4byte 0x00004036 _080CB110: .4byte 0x0000ffff _080CB114: .4byte 0x0000403b _080CB118: .4byte 0x00004035 -_080CB11C: .4byte gUnknown_2021CD0 +_080CB11C: .4byte gStringVar1 _080CB120: .4byte gUnknown_8245EE0 thumb_func_end sub_80CB0A8 @@ -1991,7 +1991,7 @@ _080CB4EE: adds r0, r5, 0 bl sub_80CB658 movs r0, 0x52 - bl sub_80722CC + bl PlaySE pop {r4-r6} pop {r0} bx r0 @@ -2038,7 +2038,7 @@ sub_80CB514: @ 80CB514 cmp r1, r0 bne _080CB574 movs r0, 0x42 - bl sub_80722CC + bl PlaySE adds r0, r5, 0 bl DestroyTask bl EnableBothScriptContexts @@ -2098,7 +2098,7 @@ sub_80CB580: @ 80CB580 movs r0, 0x2 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth ldrb r1, [r4] movs r3, 0x38 subs r3, r0 @@ -2575,7 +2575,7 @@ _080CB974: str r4, [r3, 0x4] movs r0, 0x2 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth cmp r0, r6 ble _080CB9A0 adds r6, r0, 0 @@ -2735,7 +2735,7 @@ _080CBAD8: .4byte sub_80CBADC sub_80CBADC: @ 80CBADC push {r4,lr} movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _080CBB18 @ =sub_80CBB28 bl FindTaskIdByFunc lsls r0, 24 @@ -2798,7 +2798,7 @@ _080CBB58: movs r0, 0x7F strh r0, [r1] movs r0, 0x5 - bl sub_80722CC + bl PlaySE b _080CBB88 .align 2, 0 _080CBB68: .4byte gUnknown_20370D0 @@ -2806,7 +2806,7 @@ _080CBB6C: ldr r0, _080CBB90 @ =gUnknown_20370D0 strh r4, [r0] movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r1, 0x14 ldrsh r0, [r6, r1] cmp r0, 0 @@ -3204,7 +3204,7 @@ sub_80CBE50: @ 80CBE50 muls r1, r0 ldr r0, _080CBEA4 @ =gUnknown_2024284 adds r5, r1, r0 - ldr r6, _080CBEA8 @ =gUnknown_2021CD0 + ldr r6, _080CBEA8 @ =gStringVar1 adds r0, r5, 0 movs r1, 0x2 adds r2, r6, 0 @@ -3235,7 +3235,7 @@ sub_80CBE50: @ 80CBE50 b _080CBEB2 .align 2, 0 _080CBEA4: .4byte gUnknown_2024284 -_080CBEA8: .4byte gUnknown_2021CD0 +_080CBEA8: .4byte gStringVar1 _080CBEAC: .4byte gUnknown_8245EE0 _080CBEB0: movs r0, 0x1 @@ -3377,11 +3377,11 @@ sub_80CBFA0: @ 80CBFA0 muls r0, r1 ldr r1, _080CBFCC @ =gUnknown_2024284 adds r0, r1 - ldr r4, _080CBFD0 @ =gUnknown_2021CD0 + ldr r4, _080CBFD0 @ =gStringVar1 movs r1, 0x2 adds r2, r4, 0 bl GetMonData - ldr r0, _080CBFD4 @ =gUnknown_2021D04 + ldr r0, _080CBFD4 @ =gStringVar3 adds r1, r4, 0 bl StringCompare cmp r0, 0 @@ -3391,8 +3391,8 @@ sub_80CBFA0: @ 80CBFA0 .align 2, 0 _080CBFC8: .4byte gUnknown_20370C0 _080CBFCC: .4byte gUnknown_2024284 -_080CBFD0: .4byte gUnknown_2021CD0 -_080CBFD4: .4byte gUnknown_2021D04 +_080CBFD0: .4byte gStringVar1 +_080CBFD4: .4byte gStringVar3 _080CBFD8: movs r0, 0 _080CBFDA: @@ -3413,10 +3413,10 @@ ChangeBoxPokemonNickname: @ 80CBFE0 ldrb r1, [r1] bl GetBoxedMonPtr adds r6, r0, 0 - ldr r2, _080CC058 @ =gUnknown_2021D04 + ldr r2, _080CC058 @ =gStringVar3 movs r1, 0x2 bl GetBoxMonData - ldr r0, _080CC05C @ =gUnknown_2021CF0 + ldr r0, _080CC05C @ =gStringVar2 mov r8, r0 adds r0, r6, 0 movs r1, 0x2 @@ -3455,8 +3455,8 @@ ChangeBoxPokemonNickname: @ 80CBFE0 .align 2, 0 _080CC050: .4byte gUnknown_20370D6 _080CC054: .4byte gUnknown_20370D8 -_080CC058: .4byte gUnknown_2021D04 -_080CC05C: .4byte gUnknown_2021CF0 +_080CC058: .4byte gStringVar3 +_080CC05C: .4byte gStringVar2 _080CC060: .4byte ChangeBoxPokemonNickname_CB thumb_func_end ChangeBoxPokemonNickname @@ -3467,7 +3467,7 @@ ChangeBoxPokemonNickname_CB: @ 80CC064 ldrb r0, [r0] ldr r1, _080CC080 @ =gUnknown_20370D8 ldrb r1, [r1] - ldr r2, _080CC084 @ =gUnknown_2021CF0 + ldr r2, _080CC084 @ =gStringVar2 bl SetBoxMonNickFromAnyBox bl c2_exit_to_overworld_1_continue_scripts_restart_music pop {r0} @@ -3475,7 +3475,7 @@ ChangeBoxPokemonNickname_CB: @ 80CC064 .align 2, 0 _080CC07C: .4byte gUnknown_20370D6 _080CC080: .4byte gUnknown_20370D8 -_080CC084: .4byte gUnknown_2021CF0 +_080CC084: .4byte gStringVar2 thumb_func_end ChangeBoxPokemonNickname_CB thumb_func_start ChangePokemonNickname @@ -3496,7 +3496,7 @@ ChangePokemonNickname: @ 80CC088 adds r0, r1, 0 ldr r6, _080CC134 @ =gUnknown_2024284 adds r0, r6 - ldr r2, _080CC138 @ =gUnknown_2021D04 + ldr r2, _080CC138 @ =gStringVar3 movs r1, 0x2 bl GetMonData mov r1, r9 @@ -3505,7 +3505,7 @@ ChangePokemonNickname: @ 80CC088 muls r1, r0 adds r0, r1, 0 adds r0, r6 - ldr r1, _080CC13C @ =gUnknown_2021CF0 + ldr r1, _080CC13C @ =gStringVar2 mov r10, r1 movs r1, 0x2 mov r2, r10 @@ -3560,8 +3560,8 @@ ChangePokemonNickname: @ 80CC088 .align 2, 0 _080CC130: .4byte gUnknown_20370C0 _080CC134: .4byte gUnknown_2024284 -_080CC138: .4byte gUnknown_2021D04 -_080CC13C: .4byte gUnknown_2021CF0 +_080CC138: .4byte gStringVar3 +_080CC13C: .4byte gStringVar2 _080CC140: .4byte ChangePokemonNickname_CB thumb_func_end ChangePokemonNickname @@ -3574,7 +3574,7 @@ ChangePokemonNickname_CB: @ 80CC144 muls r0, r1 ldr r1, _080CC168 @ =gUnknown_2024284 adds r0, r1 - ldr r2, _080CC16C @ =gUnknown_2021CF0 + ldr r2, _080CC16C @ =gStringVar2 movs r1, 0x2 bl sub_804037C bl c2_exit_to_overworld_1_continue_scripts_restart_music @@ -3583,7 +3583,7 @@ ChangePokemonNickname_CB: @ 80CC144 .align 2, 0 _080CC164: .4byte gUnknown_20370C0 _080CC168: .4byte gUnknown_2024284 -_080CC16C: .4byte gUnknown_2021CF0 +_080CC16C: .4byte gStringVar2 thumb_func_end ChangePokemonNickname_CB thumb_func_start TV_CopyNicknameToStringVar1AndEnsureTerminated @@ -3595,7 +3595,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 muls r0, r1 ldr r1, _080CC198 @ =gUnknown_2024284 adds r0, r1 - ldr r4, _080CC19C @ =gUnknown_2021CD0 + ldr r4, _080CC19C @ =gStringVar1 movs r1, 0x2 adds r2, r4, 0 bl GetMonData @@ -3607,7 +3607,7 @@ TV_CopyNicknameToStringVar1AndEnsureTerminated: @ 80CC170 .align 2, 0 _080CC194: .4byte gUnknown_20370C0 _080CC198: .4byte gUnknown_2024284 -_080CC19C: .4byte gUnknown_2021CD0 +_080CC19C: .4byte gStringVar1 thumb_func_end TV_CopyNicknameToStringVar1AndEnsureTerminated thumb_func_start TV_CheckMonOTIDEqualsPlayerID @@ -4563,7 +4563,7 @@ sub_80CC8CC: @ 80CC8CC _080CC8E4: .4byte gUnknown_20370C0 _080CC8E8: .4byte 0xfffffedf _080CC8EC: - ldr r4, _080CC910 @ =gUnknown_2021CD0 + ldr r4, _080CC910 @ =gStringVar1 ldrh r0, [r1] bl ItemIdToBattleMoveId lsls r0, 16 @@ -4580,7 +4580,7 @@ _080CC908: pop {r1} bx r1 .align 2, 0 -_080CC910: .4byte gUnknown_2021CD0 +_080CC910: .4byte gStringVar1 _080CC914: .4byte gUnknown_8247094 thumb_func_end sub_80CC8CC @@ -4950,7 +4950,7 @@ _080CCBEA: bne _080CCC7A cmp r7, 0 bne _080CCC34 - ldr r0, _080CCC24 @ =gUnknown_2021CF0 + ldr r0, _080CCC24 @ =gStringVar2 ldr r1, _080CCC28 @ =gUnknown_82481BE bl StringCopy ldr r1, _080CCC2C @ =gUnknown_20370C2 @@ -4961,14 +4961,14 @@ _080CCBEA: .align 2, 0 _080CCC1C: .4byte gUnknown_83F6203 _080CCC20: .4byte gUnknown_2024284 -_080CCC24: .4byte gUnknown_2021CF0 +_080CCC24: .4byte gStringVar2 _080CCC28: .4byte gUnknown_82481BE _080CCC2C: .4byte gUnknown_20370C2 _080CCC30: .4byte 0x000002de _080CCC34: cmp r7, 0x1 bne _080CCC5C - ldr r0, _080CCC4C @ =gUnknown_2021CF0 + ldr r0, _080CCC4C @ =gStringVar2 ldr r1, _080CCC50 @ =gUnknown_824802B bl StringCopy ldr r1, _080CCC54 @ =gUnknown_20370C2 @@ -4977,12 +4977,12 @@ _080CCC34: ldr r0, _080CCC58 @ =0x000002df b _080CCC6E .align 2, 0 -_080CCC4C: .4byte gUnknown_2021CF0 +_080CCC4C: .4byte gStringVar2 _080CCC50: .4byte gUnknown_824802B _080CCC54: .4byte gUnknown_20370C2 _080CCC58: .4byte 0x000002df _080CCC5C: - ldr r0, _080CCC80 @ =gUnknown_2021CF0 + ldr r0, _080CCC80 @ =gStringVar2 ldr r1, _080CCC84 @ =gUnknown_8248038 bl StringCopy ldr r1, _080CCC88 @ =gUnknown_20370C2 @@ -5000,7 +5000,7 @@ _080CCC7A: movs r0, 0 b _080CCCE4 .align 2, 0 -_080CCC80: .4byte gUnknown_2021CF0 +_080CCC80: .4byte gStringVar2 _080CCC84: .4byte gUnknown_8248038 _080CCC88: .4byte gUnknown_20370C2 _080CCC8C: @@ -5181,7 +5181,7 @@ sub_80CCDD0: @ 80CCDD0 bl MapGridSetMetatileIdAt bl DrawWholeMapView movs r0, 0x14 - bl sub_80722CC + bl PlaySE ldr r0, _080CCDF8 @ =0x000002e3 bl FlagSet bl ScriptContext2_Disable @@ -5326,14 +5326,14 @@ sub_80CCEE8: @ 80CCEE8 cmp r4, 0 bne _080CCF2C movs r0, 0xBD - bl sub_80722CC + bl PlaySE b _080CCF32 .align 2, 0 _080CCF24: .4byte gUnknown_83F6206 _080CCF28: .4byte gSaveBlock1Ptr _080CCF2C: movs r0, 0xFD - bl sub_80722CC + bl PlaySE _080CCF32: ldr r0, _080CCF64 @ =sub_80CCF98 movs r1, 0x8 @@ -5671,7 +5671,7 @@ sub_80CD1B4: @ 80CD1B4 movs r1, 0x8 bl CreateTask movs r0, 0x96 - bl sub_80722CC + bl PlaySE pop {r0} bx r0 .align 2, 0 @@ -5704,7 +5704,7 @@ sub_80CD1CC: @ 80CD1CC movs r0, 0 strh r0, [r4, 0x2] movs r0, 0x96 - bl sub_80722CC + bl PlaySE _080CD200: movs r0, 0 ldrsh r1, [r4, r0] diff --git a/asm/field_tasks.s b/asm/field_tasks.s index aefda5fab..7e19f99a3 100644 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -373,7 +373,7 @@ _0806EAB0: ldrh r0, [r5, 0xA] strh r0, [r4] movs r0, 0x24 - bl sub_80722CC + bl PlaySE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -409,7 +409,7 @@ _0806EB04: ldrh r0, [r5, 0xA] strh r0, [r4] movs r0, 0x23 - bl sub_80722CC + bl PlaySE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] diff --git a/asm/field_weather.s b/asm/field_weather.s index 4186d50e6..af194db68 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -2617,7 +2617,7 @@ _0807AFEC: _0807AFF2: strb r0, [r1] adds r0, r2, 0 - bl sub_80722CC + bl PlaySE _0807AFFA: pop {r0} bx r0 @@ -2643,18 +2643,18 @@ play_some_sound: @ 807B004 cmp r0, 0 bne _0807B03C movs r0, 0x4F - bl sub_80722CC + bl PlaySE b _0807B042 .align 2, 0 _0807B02C: .4byte gUnknown_2037F34 _0807B030: .4byte 0x000006dd _0807B034: movs r0, 0x4D - bl sub_80722CC + bl PlaySE b _0807B042 _0807B03C: movs r0, 0x4B - bl sub_80722CC + bl PlaySE _0807B042: pop {r0} bx r0 diff --git a/asm/field_weather_effects.s b/asm/field_weather_effects.s index 4412f2d2c..1f4c51568 100644 --- a/asm/field_weather_effects.s +++ b/asm/field_weather_effects.s @@ -2835,14 +2835,14 @@ UpdateThunderSound: @ 807C898 cmp r4, 0 beq _0807C8D8 movs r0, 0x50 - bl sub_80722CC + bl PlaySE b _0807C8DE .align 2, 0 _0807C8D0: .4byte gUnknown_83C2BBC _0807C8D4: .4byte 0x000006ed _0807C8D8: movs r0, 0x51 - bl sub_80722CC + bl PlaySE _0807C8DE: ldr r0, _0807C8EC @ =gUnknown_83C2BBC ldr r0, [r0] diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index b28ac79ce..c13f2c389 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -252,7 +252,7 @@ sub_8097A48: @ 8097A48 push {r6,r7} movs r7, 0 movs r0, 0x79 - bl sub_80722CC + bl PlaySE ldr r4, _08097B38 @ =gUnknown_2039A04 adds r1, r4, 0x2 adds r0, r4, 0 @@ -524,7 +524,7 @@ _08097C68: .4byte gUnknown_202063C sub_8097C6C: @ 8097C6C push {lr} movs r0, 0x79 - bl sub_80722CC + bl PlaySE movs r0, 0x2 bl FieldEffectActiveListRemove bl EnableBothScriptContexts diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 5e144a46a..5f20daf0e 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -73,7 +73,7 @@ _080C9BAC: .4byte sub_80C9BB0 sub_80C9BB0: @ 80C9BB0 push {lr} movs r0, 0xC8 - bl sub_80722CC + bl PlaySE ldr r0, _080C9BC8 @ =0x00000806 bl FlagSet ldr r0, _080C9BCC @ =gUnknown_81BFB5F diff --git a/asm/fldeff_poison.s b/asm/fldeff_poison.s index d911b2db3..8f5f3433c 100644 --- a/asm/fldeff_poison.s +++ b/asm/fldeff_poison.s @@ -72,7 +72,7 @@ _080A0E42: overworld_poison_effect: @ 80A0E48 push {lr} movs r0, 0x48 - bl sub_80722CC + bl PlaySE ldr r0, _080A0E5C @ =task50_overworld_poison_effect movs r1, 0x50 bl CreateTask diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s index 6ab470630..112659afd 100644 --- a/asm/fldeff_softboiled.s +++ b/asm/fldeff_softboiled.s @@ -146,7 +146,7 @@ _080E5796: _080E57A0: .4byte gUnknown_2024284 _080E57A4: movs r0, 0x1 - bl sub_80722CC + bl PlaySE mov r1, r10 mov r0, r8 muls r0, r1 @@ -186,7 +186,7 @@ sub_80E57E8: @ 80E57E8 lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl sub_80722CC + bl PlaySE ldr r5, _080E5830 @ =gUnknown_203B0A0 movs r1, 0x9 ldrsb r1, [r5, r1] @@ -230,9 +230,9 @@ sub_80E583C: @ 80E583C muls r0, r1 ldr r1, _080E5888 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _080E588C @ =gUnknown_2021CD0 + ldr r1, _080E588C @ =gStringVar1 bl GetMonNickname - ldr r4, _080E5890 @ =gUnknown_2021D18 + ldr r4, _080E5890 @ =gStringVar4 ldr r1, _080E5894 @ =gUnknown_8416F27 adds r0, r4, 0 bl StringExpandPlaceholders @@ -254,8 +254,8 @@ sub_80E583C: @ 80E583C .align 2, 0 _080E5884: .4byte gUnknown_203B0A0 _080E5888: .4byte gUnknown_2024284 -_080E588C: .4byte gUnknown_2021CD0 -_080E5890: .4byte gUnknown_2021D18 +_080E588C: .4byte gStringVar1 +_080E5890: .4byte gStringVar4 _080E5894: .4byte gUnknown_8416F27 _080E5898: .4byte gUnknown_3005090 _080E589C: .4byte sub_80E58A0 @@ -341,7 +341,7 @@ sub_80E5934: @ 80E5934 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _080E5964 @ =gUnknown_84169F8 movs r1, 0 bl sub_81202F8 diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index 3ca91f0a9..6deadcd61 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -85,7 +85,7 @@ sub_80D0860: @ 80D0860 muls r0, r1 ldr r1, _080D08A0 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _080D08A4 @ =gUnknown_2021CD0 + ldr r1, _080D08A4 @ =gStringVar1 bl GetMonNickname movs r0, 0 pop {r1} @@ -95,7 +95,7 @@ _080D0894: .4byte gUnknown_3005090 _080D0898: .4byte sub_80D08A8 _080D089C: .4byte gUnknown_20386E0 _080D08A0: .4byte gUnknown_2024284 -_080D08A4: .4byte gUnknown_2021CD0 +_080D08A4: .4byte gStringVar1 thumb_func_end sub_80D0860 thumb_func_start sub_80D08A8 diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index 2c12c2548..a2ff63c00 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -80,7 +80,7 @@ sub_80DE134: @ 80DE134 push {r4,r5,lr} sub sp, 0x4 movs r0, 0xE5 - bl sub_80722CC + bl PlaySE ldr r4, _080DE1B8 @ =gUnknown_203AAB0 movs r0, 0x80 lsls r0, 3 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index cdf2bd638..ea1c07052 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -560,7 +560,7 @@ sub_80F2220: @ 80F2220 movs r0, 0x3 bl TrySavingData movs r0, 0x30 - bl sub_80722CC + bl PlaySE ldr r1, _080F225C @ =gUnknown_3005090 lsls r0, r4, 2 adds r0, r4 @@ -979,7 +979,7 @@ _080F2564: movs r1, 0xF bl HallOfFame_PrintWelcomeText movs r0, 0x62 - bl sub_80722CC + bl PlaySE ldr r1, _080F25A8 @ =gUnknown_3005090 mov r2, r8 adds r0, r2, r4 @@ -1869,7 +1869,7 @@ _080F2CB4: ldr r2, _080F2D0C @ =0x00007716 movs r1, 0xC bl BlendPalettes - ldr r0, _080F2D10 @ =gUnknown_2021CD0 + ldr r0, _080F2D10 @ =gStringVar1 ldr r1, _080F2D14 @ =gUnknown_3005090 ldr r4, [sp, 0x14] add r4, r9 @@ -1880,7 +1880,7 @@ _080F2CB4: movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r5, _080F2D18 @ =gUnknown_2021D18 + ldr r5, _080F2D18 @ =gStringVar4 ldr r1, _080F2D1C @ =gUnknown_84160B4 adds r0, r5, 0 bl StringExpandPlaceholders @@ -1899,9 +1899,9 @@ _080F2CB4: .align 2, 0 _080F2D08: .4byte 0xffff0000 _080F2D0C: .4byte 0x00007716 -_080F2D10: .4byte gUnknown_2021CD0 +_080F2D10: .4byte gStringVar1 _080F2D14: .4byte gUnknown_3005090 -_080F2D18: .4byte gUnknown_2021D18 +_080F2D18: .4byte gStringVar4 _080F2D1C: .4byte gUnknown_84160B4 _080F2D20: .4byte gUnknown_8415D78 _080F2D24: @@ -2415,7 +2415,7 @@ HallOfFame_PrintWelcomeText: @ 80F313C movs r0, 0x2 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r4, 0xD0 subs r4, r0 lsrs r0, r4, 31 @@ -2573,7 +2573,7 @@ _080F327C: lsrs r2, 24 movs r0, 0x2 add r1, sp, 0xC - bl sub_8005ED4 + bl GetStringWidth adds r2, r0, 0 ldrh r1, [r7, 0x8] ldr r0, _080F32BC @ =0x000001ff @@ -2770,7 +2770,7 @@ sub_80F33DC: @ 80F33DC ldr r1, [r0] movs r0, 0x2 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r2, r0, 0 ldr r1, [sp, 0x28] subs r2, r1, r2 diff --git a/asm/help_system.s b/asm/help_system.s index 2ac8159aa..b19c6ea58 100644 --- a/asm/help_system.s +++ b/asm/help_system.s @@ -72,7 +72,7 @@ _0813B8E8: bne _0813B918 _0813B8FA: movs r0, 0xFC - bl sub_80722CC + bl PlaySE _0813B900: movs r0, 0 b _0813BB28 @@ -88,7 +88,7 @@ _0813B918: ldr r0, _0813B950 @ =gMPlay_SE2 bl m4aMPlayStop movs r0, 0xFA - bl sub_80722CC + bl PlaySE ldr r0, _0813B954 @ =gUnknown_203F174 ldrb r0, [r0] cmp r0, 0 @@ -228,7 +228,7 @@ _0813BA78: cmp r0, 0 bne _0813BB24 movs r0, 0xFB - bl sub_80722CC + bl PlaySE ldr r1, _0813BA9C @ =gUnknown_203F178 movs r0, 0x6 b _0813BB22 @@ -1100,7 +1100,7 @@ _0813C0EC: ldrb r1, [r1] cmp r1, 0xFF beq _0813C0AC - ldr r5, _0813C150 @ =gUnknown_3003E20 + ldr r5, _0813C150 @ =gGlyphInfo + 0x80 _0813C106: ldr r0, [r0] adds r0, r4 @@ -1137,15 +1137,15 @@ _0813C106: b _0813C0AC .align 2, 0 _0813C14C: .4byte gSaveBlock2Ptr -_0813C150: .4byte gUnknown_3003E20 +_0813C150: .4byte gGlyphInfo + 0x80 _0813C154: cmp r1, 0x2 bne _0813C0AC movs r4, 0 - ldr r5, _0813C160 @ =gUnknown_3003E20 + ldr r5, _0813C160 @ =gGlyphInfo + 0x80 b _0813C1BC .align 2, 0 -_0813C160: .4byte gUnknown_3003E20 +_0813C160: .4byte gGlyphInfo + 0x80 _0813C164: ldrb r1, [r1] ldr r2, [sp, 0x28] @@ -1210,7 +1210,7 @@ _0813C1DC: .4byte 0x00000834 _0813C1E0: .4byte gUnknown_841CB3C _0813C1E4: ldr r7, [sp, 0x34] - ldr r1, _0813C1FC @ =gGlyphBuffer1 + ldr r1, _0813C1FC @ =gGlyphInfo adds r1, 0x81 mov r0, r10 adds r0, 0x1 @@ -1221,7 +1221,7 @@ _0813C1E4: mov r10, r0 b _0813C0AC .align 2, 0 -_0813C1FC: .4byte gGlyphBuffer1 +_0813C1FC: .4byte gGlyphInfo _0813C200: mov r2, r9 ldrb r1, [r2] @@ -1401,7 +1401,7 @@ _0813C36A: add r2, sp, 0x14 bl sub_813C3AC ldr r1, [sp, 0x24] - ldr r0, _0813C398 @ =gGlyphBuffer1 + ldr r0, _0813C398 @ =gGlyphInfo adds r0, 0x80 ldrb r0, [r0] _0813C38E: @@ -1411,7 +1411,7 @@ _0813C390: lsrs r7, r0, 24 b _0813C0AC .align 2, 0 -_0813C398: .4byte gGlyphBuffer1 +_0813C398: .4byte gGlyphInfo _0813C39C: add sp, 0x38 pop {r3-r5} @@ -1455,20 +1455,20 @@ sub_813C3AC: @ 813C3AC cmp r6, 0 bne _0813C3EE movs r1, 0 - bl sub_8006448 + bl DecompressGlyphFont0 b _0813C402 _0813C3EE: cmp r6, 0x5 bne _0813C3FA movs r1, 0 - bl sub_8006958 + bl DecompressGlyphFont5 b _0813C402 _0813C3FA: adds r0, r1, 0 movs r1, 0 - bl sub_80065B8 + bl DecompressGlyphFont2 _0813C402: - ldr r1, _0813C450 @ =gGlyphBuffer1 + ldr r1, _0813C450 @ =gGlyphInfo str r1, [r7] movs r2, 0 movs r0, 0x10 @@ -1506,7 +1506,7 @@ _0813C402: pop {r0} bx r0 .align 2, 0 -_0813C450: .4byte gGlyphBuffer1 +_0813C450: .4byte gGlyphInfo thumb_func_end sub_813C3AC thumb_func_start sub_813C454 @@ -1544,7 +1544,7 @@ sub_813C488: @ 813C488 movs r0, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r4, 0x7C subs r4, r0 movs r0, 0x1 @@ -1822,7 +1822,7 @@ _0813C6A4: cmp r0, 0 beq _0813C6D0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0813C6CC @ =gUnknown_203F190 ldrb r0, [r1, 0xC] ldrb r2, [r1, 0xD] @@ -1841,7 +1841,7 @@ _0813C6D0: cmp r0, 0 beq _0813C6E4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x2 negs r0, r0 b _0813C756 @@ -1882,7 +1882,7 @@ _0813C718: cmp r0, 0 bne _0813C72A movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0813C72A: movs r0, 0x4 negs r0, r0 @@ -1900,7 +1900,7 @@ _0813C73A: cmp r0, 0 bne _0813C74C movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0813C74C: movs r0, 0x5 negs r0, r0 diff --git a/asm/help_system_812B1E0.s b/asm/help_system_812B1E0.s index 8f584f55c..3c98ace0a 100644 --- a/asm/help_system_812B1E0.s +++ b/asm/help_system_812B1E0.s @@ -1319,7 +1319,7 @@ sub_812BC80: @ 812BC80 cmp r0, 0 beq _0812BC9A movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0xA strb r0, [r4, 0xE] _0812BC9A: @@ -1658,7 +1658,7 @@ sub_812BF18: @ 812BF18 beq _0812BF44 _0812BF30: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x5 strb r0, [r4, 0xE] movs r0, 0x1 diff --git a/asm/intro.s b/asm/intro.s index cc3f1559d..824471b40 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -809,7 +809,7 @@ _080ECC50: b _080ECC9C _080ECC56: ldr r0, _080ECC64 @ =0x00000141 - bl sub_80722CC + bl PlaySE bl sub_80EDC40 strh r5, [r4, 0x12] b _080ECC7E diff --git a/asm/item_menu.s b/asm/item_menu.s index ce700b255..36c696505 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -93,7 +93,7 @@ _08107E50: _08107E5A: strb r0, [r2, 0x5] movs r1, 0 - ldr r4, _08107EA4 @ =gUnknown_3003E50 + ldr r4, _08107EA4 @ =gTextFlags ldr r5, _08107EA8 @ =gUnknown_203AD30 ldr r6, _08107EAC @ =sub_8107F10 ldr r3, _08107EB0 @ =gUnknown_203AD10 @@ -131,7 +131,7 @@ _08107E9A: pop {r0} bx r0 .align 2, 0 -_08107EA4: .4byte gUnknown_3003E50 +_08107EA4: .4byte gTextFlags _08107EA8: .4byte gUnknown_203AD30 _08107EAC: .4byte sub_8107F10 _08107EB0: .4byte gUnknown_203AD10 @@ -1001,7 +1001,7 @@ sub_81085A4: @ 81085A4 cmp r1, 0x1 beq _081085BA movs r0, 0xF5 - bl sub_80722CC + bl PlaySE bl sub_8098580 _081085BA: ldr r4, _08108604 @ =gUnknown_203AD10 @@ -1149,12 +1149,12 @@ _08108690: lsrs r5, r0, 24 cmp r5, 0 bne _0810872C - ldr r0, _08108720 @ =gUnknown_2021CD0 + ldr r0, _08108720 @ =gStringVar1 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _08108724 @ =gUnknown_2021D18 + ldr r4, _08108724 @ =gStringVar4 ldr r1, _08108728 @ =gUnknown_84162B9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1174,8 +1174,8 @@ _08108690: .align 2, 0 _08108718: .4byte gUnknown_203AD10 _0810871C: .4byte gUnknown_203ACFC -_08108720: .4byte gUnknown_2021CD0 -_08108724: .4byte gUnknown_2021D18 +_08108720: .4byte gStringVar1 +_08108724: .4byte gStringVar4 _08108728: .4byte gUnknown_84162B9 _0810872C: ldr r0, _08108760 @ =gSaveBlock1Ptr @@ -2327,7 +2327,7 @@ _08108FA0: cmp r1, r0 beq _08108FE4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE mov r0, sp ldrh r1, [r4] ldrh r0, [r0] @@ -2366,7 +2366,7 @@ _08108FE4: _08109014: .4byte gUnknown_203ACFC _08109018: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _08109038 @ =gUnknown_203AD30 movs r0, 0 strh r0, [r1] @@ -2384,7 +2384,7 @@ _0810903C: .4byte gUnknown_3005090 _08109040: .4byte sub_8108B50 _08109044: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08109074 @ =gUnknown_203AD10 ldr r0, [r0] adds r0, 0xA @@ -2549,7 +2549,7 @@ _08109194: cmp r4, 0 beq _081091C6 movs r0, 0xF6 - bl sub_80722CC + bl PlaySE movs r0, 0x1 b _081091C8 .align 2, 0 @@ -2566,7 +2566,7 @@ _081091B8: cmp r4, 0x1 bhi _081091C6 movs r0, 0xF6 - bl sub_80722CC + bl PlaySE movs r0, 0x2 b _081091C8 _081091C6: @@ -2842,7 +2842,7 @@ sub_81093B8: @ 81093B8 ldr r0, [r0] movs r6, 0 strb r4, [r0, 0x4] - ldr r4, _0810949C @ =gUnknown_2021CD0 + ldr r4, _0810949C @ =gStringVar1 ldr r0, _081094A0 @ =gUnknown_203ACFC ldrb r0, [r0, 0x6] adds r0, 0x1 @@ -2857,7 +2857,7 @@ sub_81093B8: @ 81093B8 adds r1, r0, 0 adds r0, r4, 0 bl StringCopy - ldr r4, _081094A4 @ =gUnknown_2021D18 + ldr r4, _081094A4 @ =gStringVar4 ldr r1, _081094A8 @ =gUnknown_841633F adds r0, r4, 0 bl StringExpandPlaceholders @@ -2907,9 +2907,9 @@ sub_81093B8: @ 81093B8 .align 2, 0 _08109494: .4byte gUnknown_3005098 _08109498: .4byte gUnknown_203AD10 -_0810949C: .4byte gUnknown_2021CD0 +_0810949C: .4byte gStringVar1 _081094A0: .4byte gUnknown_203ACFC -_081094A4: .4byte gUnknown_2021D18 +_081094A4: .4byte gStringVar4 _081094A8: .4byte gUnknown_841633F _081094AC: .4byte sub_81094B0 thumb_func_end sub_81093B8 @@ -2957,7 +2957,7 @@ sub_81094B0: @ 81094B0 cmp r0, 0 beq _08109548 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08109544 @ =gUnknown_203AD10 ldr r1, [r0] movs r0, 0xFF @@ -2991,7 +2991,7 @@ _08109548: b _0810959E _08109558: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08109584 @ =gUnknown_203AD10 ldr r1, [r0] movs r0, 0xFF @@ -3013,7 +3013,7 @@ _08109558: _08109584: .4byte gUnknown_203AD10 _08109588: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _081095A8 @ =gUnknown_203AD10 ldr r1, [r0] movs r0, 0xFF @@ -3235,10 +3235,10 @@ sub_810971C: @ 810971C bl sub_809A798 lsls r0, 16 lsrs r0, 16 - ldr r1, _081097D8 @ =gUnknown_2021CD0 + ldr r1, _081097D8 @ =gStringVar1 mov r10, r1 bl sub_8099E90 - ldr r0, _081097DC @ =gUnknown_2021D18 + ldr r0, _081097DC @ =gStringVar4 mov r9, r0 adds r1, r6, 0 bl StringExpandPlaceholders @@ -3293,8 +3293,8 @@ sub_810971C: @ 810971C bx r0 .align 2, 0 _081097D4: .4byte gUnknown_203ACFC -_081097D8: .4byte gUnknown_2021CD0 -_081097DC: .4byte gUnknown_2021D18 +_081097D8: .4byte gStringVar1 +_081097DC: .4byte gStringVar4 _081097E0: .4byte gUnknown_84162B9 thumb_func_end sub_810971C @@ -3316,14 +3316,14 @@ sub_81097E4: @ 81097E4 adds r0, r6, 0 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, _08109848 @ =gUnknown_2021CD0 + ldr r0, _08109848 @ =gStringVar1 lsls r4, 16 asrs r4, 16 adds r1, r4, 0 movs r2, 0x2 adds r3, r5, 0 bl ConvertIntToDecimalStringN - ldr r4, _0810984C @ =gUnknown_2021D18 + ldr r4, _0810984C @ =gStringVar4 ldr r1, _08109850 @ =gUnknown_84162B9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -3345,8 +3345,8 @@ sub_81097E4: @ 81097E4 pop {r0} bx r0 .align 2, 0 -_08109848: .4byte gUnknown_2021CD0 -_0810984C: .4byte gUnknown_2021D18 +_08109848: .4byte gStringVar1 +_0810984C: .4byte gStringVar4 _08109850: .4byte gUnknown_84162B9 thumb_func_end sub_81097E4 @@ -3724,9 +3724,9 @@ _08109AD4: lsrs r4, 24 ldr r0, _08109BA8 @ =gUnknown_203AD30 ldrh r0, [r0] - ldr r1, _08109BAC @ =gUnknown_2021CD0 + ldr r1, _08109BAC @ =gStringVar1 bl sub_8099E90 - ldr r6, _08109BB0 @ =gUnknown_2021D18 + ldr r6, _08109BB0 @ =gStringVar4 ldr r1, _08109BB4 @ =gUnknown_84162FF adds r0, r6, 0 bl StringExpandPlaceholders @@ -3752,8 +3752,8 @@ _08109B9C: .4byte gUnknown_8452F18 _08109BA0: .4byte gUnknown_203AD28 _08109BA4: .4byte gUnknown_8452EB8 _08109BA8: .4byte gUnknown_203AD30 -_08109BAC: .4byte gUnknown_2021CD0 -_08109BB0: .4byte gUnknown_2021D18 +_08109BAC: .4byte gStringVar1 +_08109BB0: .4byte gStringVar4 _08109BB4: .4byte gUnknown_84162FF thumb_func_end sub_8109890 @@ -3802,7 +3802,7 @@ sub_8109BE4: @ 8109BE4 cmp r4, r0 bne _08109C24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08109C20 @ =gUnknown_8452EB8 ldr r1, [r0, 0x24] adds r0, r5, 0 @@ -3812,7 +3812,7 @@ sub_8109BE4: @ 8109BE4 _08109C20: .4byte gUnknown_8452EB8 _08109C24: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _08109C48 @ =gUnknown_8452EB8 ldr r0, _08109C4C @ =gUnknown_203AD24 ldr r0, [r0] @@ -3950,13 +3950,13 @@ sub_8109D38: @ 8109D38 lsls r1, 3 ldr r0, _08109D9C @ =gUnknown_3005098 adds r1, r0 - ldr r0, _08109DA0 @ =gUnknown_2021CF0 + ldr r0, _08109DA0 @ =gStringVar2 movs r2, 0x10 ldrsh r1, [r1, r2] movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r5, _08109DA4 @ =gUnknown_2021D18 + ldr r5, _08109DA4 @ =gStringVar4 ldr r1, _08109DA8 @ =gUnknown_8416409 adds r0, r5, 0 bl StringExpandPlaceholders @@ -3986,8 +3986,8 @@ sub_8109D38: @ 8109D38 bx r0 .align 2, 0 _08109D9C: .4byte gUnknown_3005098 -_08109DA0: .4byte gUnknown_2021CF0 -_08109DA4: .4byte gUnknown_2021D18 +_08109DA0: .4byte gStringVar2 +_08109DA4: .4byte gStringVar4 _08109DA8: .4byte gUnknown_8416409 _08109DAC: .4byte gUnknown_8452F50 thumb_func_end sub_8109D38 @@ -4055,7 +4055,7 @@ _08109E20: cmp r0, 0 beq _08109E64 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x6 bl sub_810BAD8 lsls r0, 24 @@ -4079,7 +4079,7 @@ _08109E64: cmp r0, 0 beq _08109EA2 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x6 bl sub_810BA3C movs r0, 0 @@ -4124,15 +4124,15 @@ sub_8109EA8: @ 8109EA8 bl sub_809A798 lsls r0, 16 lsrs r0, 16 - ldr r1, _08109F30 @ =gUnknown_2021CD0 + ldr r1, _08109F30 @ =gStringVar1 bl sub_8099E90 - ldr r0, _08109F34 @ =gUnknown_2021CF0 + ldr r0, _08109F34 @ =gStringVar2 movs r2, 0x10 ldrsh r1, [r6, r2] movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r6, _08109F38 @ =gUnknown_2021D18 + ldr r6, _08109F38 @ =gStringVar4 ldr r1, _08109F3C @ =gUnknown_84163F4 adds r0, r6, 0 bl StringExpandPlaceholders @@ -4164,9 +4164,9 @@ sub_8109EA8: @ 8109EA8 .align 2, 0 _08109F28: .4byte gUnknown_3005098 _08109F2C: .4byte gUnknown_203ACFC -_08109F30: .4byte gUnknown_2021CD0 -_08109F34: .4byte gUnknown_2021CF0 -_08109F38: .4byte gUnknown_2021D18 +_08109F30: .4byte gStringVar1 +_08109F34: .4byte gStringVar2 +_08109F38: .4byte gStringVar4 _08109F3C: .4byte gUnknown_84163F4 _08109F40: .4byte sub_8109F44 thumb_func_end sub_8109EA8 @@ -4196,7 +4196,7 @@ sub_8109F44: @ 8109F44 beq _08109FE0 _08109F6E: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08109FF4 @ =gUnknown_203AD30 ldrh r0, [r0] ldrh r1, [r7, 0x10] @@ -4446,9 +4446,9 @@ sub_810A18C: @ 810A18C lsrs r4, 24 ldr r0, _0810A1BC @ =gUnknown_203AD30 ldrh r0, [r0] - ldr r1, _0810A1C0 @ =gUnknown_2021CD0 + ldr r1, _0810A1C0 @ =gStringVar1 bl sub_8099E90 - ldr r5, _0810A1C4 @ =gUnknown_2021D18 + ldr r5, _0810A1C4 @ =gStringVar4 ldr r1, _0810A1C8 @ =gUnknown_841635E adds r0, r5, 0 bl StringExpandPlaceholders @@ -4462,8 +4462,8 @@ sub_810A18C: @ 810A18C bx r0 .align 2, 0 _0810A1BC: .4byte gUnknown_203AD30 -_0810A1C0: .4byte gUnknown_2021CD0 -_0810A1C4: .4byte gUnknown_2021D18 +_0810A1C0: .4byte gStringVar1 +_0810A1C4: .4byte gStringVar4 _0810A1C8: .4byte gUnknown_841635E _0810A1CC: .4byte sub_810A1D0 thumb_func_end sub_810A18C @@ -4480,7 +4480,7 @@ sub_810A1D0: @ 810A1D0 cmp r0, 0 beq _0810A1EE movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_810A1F8 _0810A1EE: @@ -4968,9 +4968,9 @@ _0810A5B4: cmp r0, 0 bne _0810A5F8 ldrh r0, [r6] - ldr r1, _0810A5E8 @ =gUnknown_2021CD0 + ldr r1, _0810A5E8 @ =gStringVar1 bl sub_8099E90 - ldr r4, _0810A5EC @ =gUnknown_2021D18 + ldr r4, _0810A5EC @ =gStringVar4 ldr r1, _0810A5F0 @ =gUnknown_84168F1 adds r0, r4, 0 bl StringExpandPlaceholders @@ -4984,8 +4984,8 @@ _0810A5B4: bl sub_8108E70 b _0810A63E .align 2, 0 -_0810A5E8: .4byte gUnknown_2021CD0 -_0810A5EC: .4byte gUnknown_2021D18 +_0810A5E8: .4byte gStringVar1 +_0810A5EC: .4byte gStringVar4 _0810A5F0: .4byte gUnknown_84168F1 _0810A5F4: .4byte sub_810A1F8 _0810A5F8: @@ -5006,9 +5006,9 @@ _0810A610: strh r0, [r4, 0x4] _0810A618: ldrh r0, [r6] - ldr r1, _0810A644 @ =gUnknown_2021CD0 + ldr r1, _0810A644 @ =gStringVar1 bl sub_8099E90 - ldr r4, _0810A648 @ =gUnknown_2021D18 + ldr r4, _0810A648 @ =gStringVar4 ldr r1, _0810A64C @ =gUnknown_8416911 adds r0, r4, 0 bl StringExpandPlaceholders @@ -5025,8 +5025,8 @@ _0810A63E: pop {r0} bx r0 .align 2, 0 -_0810A644: .4byte gUnknown_2021CD0 -_0810A648: .4byte gUnknown_2021D18 +_0810A644: .4byte gStringVar1 +_0810A648: .4byte gStringVar4 _0810A64C: .4byte gUnknown_8416911 _0810A650: .4byte sub_810A770 thumb_func_end sub_810A568 @@ -5081,7 +5081,7 @@ sub_810A690: @ 810A690 lsls r4, 3 ldr r0, _0810A6F4 @ =gUnknown_3005098 adds r4, r0 - ldr r6, _0810A6F8 @ =gUnknown_2021D04 + ldr r6, _0810A6F8 @ =gStringVar3 ldr r0, _0810A6FC @ =gUnknown_203ACFC ldrb r0, [r0, 0x6] adds r0, 0x1 @@ -5101,7 +5101,7 @@ sub_810A690: @ 810A690 movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r4, _0810A700 @ =gUnknown_2021D18 + ldr r4, _0810A700 @ =gStringVar4 ldr r1, _0810A704 @ =gUnknown_8416936 adds r0, r4, 0 bl StringExpandPlaceholders @@ -5118,9 +5118,9 @@ sub_810A690: @ 810A690 bx r0 .align 2, 0 _0810A6F4: .4byte gUnknown_3005098 -_0810A6F8: .4byte gUnknown_2021D04 +_0810A6F8: .4byte gStringVar3 _0810A6FC: .4byte gUnknown_203ACFC -_0810A700: .4byte gUnknown_2021D18 +_0810A700: .4byte gStringVar4 _0810A704: .4byte gUnknown_8416936 _0810A708: .4byte sub_810A70C thumb_func_end sub_810A690 @@ -5196,12 +5196,12 @@ sub_810A770: @ 810A770 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0810A820 @ =gUnknown_2021CD0 + ldr r0, _0810A820 @ =gStringVar1 movs r1, 0x1 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r6, _0810A824 @ =gUnknown_2021D18 + ldr r6, _0810A824 @ =gStringVar4 ldr r1, _0810A828 @ =gUnknown_84162B9 adds r0, r6, 0 bl StringExpandPlaceholders @@ -5254,8 +5254,8 @@ sub_810A770: @ 810A770 bx r0 .align 2, 0 _0810A81C: .4byte gUnknown_3005098 -_0810A820: .4byte gUnknown_2021CD0 -_0810A824: .4byte gUnknown_2021D18 +_0810A820: .4byte gStringVar1 +_0810A824: .4byte gStringVar4 _0810A828: .4byte gUnknown_84162B9 _0810A82C: .4byte gUnknown_203ACFC _0810A830: .4byte sub_810A85C @@ -5333,7 +5333,7 @@ _0810A8BC: cmp r0, 0 beq _0810A8F0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl sub_810BA3C movs r0, 0 @@ -5352,7 +5352,7 @@ _0810A8F0: cmp r0, 0 beq _0810A93A movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl sub_810BA3C movs r0, 0x2 @@ -5396,9 +5396,9 @@ sub_810A940: @ 810A940 bl schedule_bg_copy_tilemap_to_vram ldr r0, _0810A9B8 @ =gUnknown_203AD30 ldrh r0, [r0] - ldr r1, _0810A9BC @ =gUnknown_2021CD0 + ldr r1, _0810A9BC @ =gStringVar1 bl sub_8099E90 - ldr r6, _0810A9C0 @ =gUnknown_2021D04 + ldr r6, _0810A9C0 @ =gStringVar3 ldr r0, _0810A9C4 @ =gUnknown_203ACFC ldrb r0, [r0, 0x6] adds r0, 0x1 @@ -5418,7 +5418,7 @@ sub_810A940: @ 810A940 movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r4, _0810A9C8 @ =gUnknown_2021D18 + ldr r4, _0810A9C8 @ =gStringVar4 ldr r1, _0810A9CC @ =gUnknown_8416959 adds r0, r4, 0 bl StringExpandPlaceholders @@ -5433,10 +5433,10 @@ sub_810A940: @ 810A940 .align 2, 0 _0810A9B4: .4byte gUnknown_3005098 _0810A9B8: .4byte gUnknown_203AD30 -_0810A9BC: .4byte gUnknown_2021CD0 -_0810A9C0: .4byte gUnknown_2021D04 +_0810A9BC: .4byte gStringVar1 +_0810A9C0: .4byte gStringVar3 _0810A9C4: .4byte gUnknown_203ACFC -_0810A9C8: .4byte gUnknown_2021D18 +_0810A9C8: .4byte gStringVar4 _0810A9CC: .4byte gUnknown_8416959 _0810A9D0: .4byte sub_810A9D4 thumb_func_end sub_810A940 @@ -5459,7 +5459,7 @@ sub_810A9D4: @ 810A9D4 add r1, r10 mov r8, r1 movs r0, 0xF8 - bl sub_80722CC + bl PlaySE ldr r5, _0810AADC @ =gUnknown_203AD30 ldrh r0, [r5] mov r2, r8 @@ -5584,7 +5584,7 @@ sub_810AAF4: @ 810AAF4 beq _0810AB32 _0810AB0E: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x2 bl sub_810BA3C movs r0, 0x2 @@ -5679,7 +5679,7 @@ _0810ABBC: cmp r0, 0 beq _0810AC00 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x6 bl sub_810BAD8 lsls r0, 24 @@ -5703,7 +5703,7 @@ _0810AC00: cmp r0, 0 beq _0810AC38 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x6 bl sub_810BA3C movs r0, 0 @@ -5755,15 +5755,15 @@ sub_810AC40: @ 810AC40 movs r1, 0 bl sub_80A2294 ldrh r0, [r5] - ldr r1, _0810ACD8 @ =gUnknown_2021CD0 + ldr r1, _0810ACD8 @ =gStringVar1 bl sub_8099E90 - ldr r0, _0810ACDC @ =gUnknown_2021CF0 + ldr r0, _0810ACDC @ =gStringVar2 movs r2, 0x10 ldrsh r1, [r7, r2] movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _0810ACE0 @ =gUnknown_2021D18 + ldr r4, _0810ACE0 @ =gStringVar4 ldr r1, _0810ACE4 @ =gUnknown_84163A7 adds r0, r4, 0 bl StringExpandPlaceholders @@ -5793,9 +5793,9 @@ sub_810AC40: @ 810AC40 _0810ACCC: .4byte gUnknown_3005098 _0810ACD0: .4byte gUnknown_203AD30 _0810ACD4: .4byte 0x0000ffff -_0810ACD8: .4byte gUnknown_2021CD0 -_0810ACDC: .4byte gUnknown_2021CF0 -_0810ACE0: .4byte gUnknown_2021D18 +_0810ACD8: .4byte gStringVar1 +_0810ACDC: .4byte gStringVar2 +_0810ACE0: .4byte gStringVar4 _0810ACE4: .4byte gUnknown_84163A7 _0810ACE8: .4byte sub_8109F44 _0810ACEC: @@ -6173,7 +6173,7 @@ _0810AFD4: b _0810B064 _0810AFE4: movs r0, 0xF6 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 movs r1, 0x1 movs r2, 0 @@ -6181,7 +6181,7 @@ _0810AFE4: b _0810B064 _0810AFF6: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r5] movs r1, 0x2 bl bag_menu_print_cursor_ @@ -6197,7 +6197,7 @@ _0810AFF6: _0810B018: .4byte gUnknown_203AD30 _0810B01C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0xA bl sub_810BA3C movs r0, 0x6 @@ -6479,7 +6479,7 @@ _0810B24E: _0810B250: .4byte 0x000002ca _0810B254: movs r0, 0xF6 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 movs r1, 0x1 movs r2, 0 @@ -6487,7 +6487,7 @@ _0810B254: b _0810B36C _0810B266: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r7] movs r1, 0x2 bl bag_menu_print_cursor_ @@ -6505,13 +6505,13 @@ _0810B266: _0810B28C: .4byte gUnknown_203AD30 _0810B290: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl MoveMenuCursorNoWrapAround b _0810B36C _0810B29E: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0810B318 @ =gSaveBlock1Ptr ldr r0, [r0] ldr r1, _0810B31C @ =gUnknown_203AD30 @@ -6579,7 +6579,7 @@ _0810B32C: _0810B340: .4byte gMain _0810B344: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r7] movs r1, 0 movs r2, 0 @@ -6679,7 +6679,7 @@ _0810B3F4: _0810B404: .4byte 0x000002ca _0810B408: movs r0, 0xF6 - bl sub_80722CC + bl PlaySE adds r0, r5, 0 movs r1, 0x1 movs r2, 0 @@ -6707,7 +6707,7 @@ _0810B430: _0810B43C: .4byte gMain _0810B440: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] movs r1, 0x2 bl bag_menu_print_cursor_ @@ -6723,7 +6723,7 @@ _0810B440: _0810B464: .4byte gUnknown_203AD30 _0810B468: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0xA bl sub_810BA3C movs r0, 0x6 @@ -6823,7 +6823,7 @@ _0810B528: _0810B538: .4byte gMain _0810B53C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r5] movs r1, 0x2 bl bag_menu_print_cursor_ @@ -6839,7 +6839,7 @@ _0810B53C: _0810B560: .4byte gUnknown_203AD30 _0810B564: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0xA bl sub_810BA3C movs r0, 0x6 @@ -6939,7 +6939,7 @@ _0810B62C: b _0810B6E0 _0810B63C: movs r0, 0xF6 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 movs r1, 0x1 movs r2, 0 @@ -6956,7 +6956,7 @@ _0810B64E: _0810B65C: .4byte gMain _0810B660: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r6] movs r1, 0x2 bl bag_menu_print_cursor_ @@ -6974,7 +6974,7 @@ _0810B660: _0810B688: .4byte gUnknown_203AD30 _0810B68C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0xA bl sub_810BA3C movs r0, 0x6 diff --git a/asm/item_pc.s b/asm/item_pc.s index 3d02d0d69..f79e0bede 100644 --- a/asm/item_pc.s +++ b/asm/item_pc.s @@ -295,7 +295,7 @@ _0810D650: movs r0, 0x1 bl sub_810DE94 movs r0, 0x2 - bl sub_80722CC + bl PlaySE b _0810D674 _0810D668: bl sub_80BF72C @@ -673,7 +673,7 @@ sub_810D954: @ 810D954 cmp r1, 0x1 beq _0810D968 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0810D968: ldr r5, _0810D9BC @ =gUnknown_203ADBC ldr r1, [r5] @@ -799,11 +799,11 @@ _0810DA58: adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _0810DAA8 @ =gUnknown_2021CD0 + ldr r0, _0810DAA8 @ =gStringVar1 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _0810DAAC @ =gUnknown_2021D18 + ldr r4, _0810DAAC @ =gStringVar4 ldr r1, _0810DAB0 @ =gUnknown_84162B9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -826,8 +826,8 @@ _0810DA9E: pop {r0} bx r0 .align 2, 0 -_0810DAA8: .4byte gUnknown_2021CD0 -_0810DAAC: .4byte gUnknown_2021D18 +_0810DAA8: .4byte gStringVar1 +_0810DAAC: .4byte gStringVar4 _0810DAB0: .4byte gUnknown_84162B9 thumb_func_end sub_810DA20 @@ -1112,7 +1112,7 @@ _0810DCB4: movs r2, 0 bl sub_80A0A70 movs r0, 0x3 - bl sub_80722CC + bl PlaySE _0810DCC4: ldr r0, _0810DCDC @ =gUnknown_3005090 lsls r1, r4, 2 @@ -1414,7 +1414,7 @@ sub_810DEA0: @ 810DEA0 cmp r1, r0 beq _0810DF20 movs r0, 0x5 - bl sub_80722CC + bl PlaySE mov r0, sp ldrh r1, [r4] ldrh r0, [r0] @@ -1449,7 +1449,7 @@ _0810DF20: _0810DF44: .4byte gUnknown_203ADD0 _0810DF48: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl sub_810DE94 ldr r0, _0810DF64 @ =gUnknown_3005090 @@ -1465,7 +1465,7 @@ _0810DF64: .4byte gUnknown_3005090 _0810DF68: .4byte sub_810DC8C _0810DF6C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl sub_810DE6C bl sub_810DBD0 @@ -1546,7 +1546,7 @@ sub_810DFE0: @ 810DFE0 movs r1, 0 mov r9, r1 strb r4, [r0, 0x4] - ldr r4, _0810E0A4 @ =gUnknown_2021CD0 + ldr r4, _0810E0A4 @ =gStringVar1 ldrh r0, [r6, 0x2] bl sub_810DD68 lsls r0, 16 @@ -1555,7 +1555,7 @@ sub_810DFE0: @ 810DFE0 adds r1, r0, 0 adds r0, r4, 0 bl StringCopy - ldr r4, _0810E0A8 @ =gUnknown_2021D18 + ldr r4, _0810E0A8 @ =gStringVar4 ldr r1, _0810E0AC @ =gUnknown_841633F adds r0, r4, 0 bl StringExpandPlaceholders @@ -1605,8 +1605,8 @@ sub_810DFE0: @ 810DFE0 .align 2, 0 _0810E09C: .4byte gUnknown_3005098 _0810E0A0: .4byte gUnknown_203ADBC -_0810E0A4: .4byte gUnknown_2021CD0 -_0810E0A8: .4byte gUnknown_2021D18 +_0810E0A4: .4byte gStringVar1 +_0810E0A8: .4byte gStringVar4 _0810E0AC: .4byte gUnknown_841633F _0810E0B0: .4byte sub_810E0B4 thumb_func_end sub_810DFE0 @@ -1647,7 +1647,7 @@ sub_810E0B4: @ 810E0B4 cmp r0, 0 beq _0810E12C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0810E128 @ =gUnknown_203ADBC ldr r1, [r0] movs r0, 0xFF @@ -1670,7 +1670,7 @@ _0810E12C: cmp r0, 0 beq _0810E150 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0810E15C @ =gUnknown_203ADBC ldr r1, [r0] movs r0, 0xFF @@ -1885,9 +1885,9 @@ sub_810E274: @ 810E274 bl sub_810DD68 lsls r0, 16 lsrs r0, 16 - ldr r1, _0810E348 @ =gUnknown_2021CD0 + ldr r1, _0810E348 @ =gStringVar1 bl sub_8099E90 - ldr r6, _0810E34C @ =gUnknown_2021D18 + ldr r6, _0810E34C @ =gStringVar4 ldr r1, _0810E350 @ =gUnknown_84162FF adds r0, r6, 0 bl StringExpandPlaceholders @@ -1921,8 +1921,8 @@ sub_810E274: @ 810E274 .align 2, 0 _0810E340: .4byte gUnknown_3005098 _0810E344: .4byte gUnknown_8453F74 -_0810E348: .4byte gUnknown_2021CD0 -_0810E34C: .4byte gUnknown_2021D18 +_0810E348: .4byte gStringVar1 +_0810E34C: .4byte gStringVar4 _0810E350: .4byte gUnknown_84162FF _0810E354: .4byte sub_810E358 thumb_func_end sub_810E274 @@ -1944,13 +1944,13 @@ sub_810E358: @ 810E358 cmp r4, r0 bne _0810E384 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r5, 0 bl sub_810E8A0 b _0810E39A _0810E384: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0810E3A0 @ =gUnknown_8453F74 lsls r1, r4, 3 adds r0, 0x4 @@ -2046,16 +2046,16 @@ sub_810E418: @ 810E418 movs r1, 0 adds r2, r4, 0 bl sub_80A2294 - ldr r1, _0810E4A4 @ =gUnknown_2021CD0 + ldr r1, _0810E4A4 @ =gStringVar1 adds r0, r4, 0 bl sub_8099E90 - ldr r0, _0810E4A8 @ =gUnknown_2021CF0 + ldr r0, _0810E4A8 @ =gStringVar2 movs r2, 0x10 ldrsh r1, [r5, r2] movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _0810E4AC @ =gUnknown_2021D18 + ldr r4, _0810E4AC @ =gStringVar4 ldr r1, _0810E4B0 @ =gUnknown_84177C5 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2081,9 +2081,9 @@ sub_810E418: @ 810E418 .align 2, 0 _0810E49C: .4byte gUnknown_3005098 _0810E4A0: .4byte 0x0000ffff -_0810E4A4: .4byte gUnknown_2021CD0 -_0810E4A8: .4byte gUnknown_2021CF0 -_0810E4AC: .4byte gUnknown_2021D18 +_0810E4A4: .4byte gStringVar1 +_0810E4A8: .4byte gStringVar2 +_0810E4AC: .4byte gStringVar4 _0810E4B0: .4byte gUnknown_84177C5 _0810E4B4: .4byte sub_810E4F4 _0810E4B8: @@ -2139,7 +2139,7 @@ sub_810E4F4: @ 810E4F4 beq _0810E53A _0810E51A: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrh r0, [r5, 0x2] bl sub_810DD68 lsls r0, 16 @@ -2175,7 +2175,7 @@ sub_810E548: @ 810E548 beq _0810E56E _0810E562: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_810E578 _0810E56E: @@ -2239,10 +2239,10 @@ sub_810E5E0: @ 810E5E0 bl sub_810DD68 lsls r0, 16 lsrs r0, 16 - ldr r6, _0810E660 @ =gUnknown_2021CD0 + ldr r6, _0810E660 @ =gStringVar1 adds r1, r6, 0 bl sub_8099E90 - ldr r5, _0810E664 @ =gUnknown_2021D18 + ldr r5, _0810E664 @ =gStringVar4 ldr r1, _0810E668 @ =gUnknown_84177AC adds r0, r5, 0 bl StringExpandPlaceholders @@ -2287,8 +2287,8 @@ sub_810E5E0: @ 810E5E0 pop {r0} bx r0 .align 2, 0 -_0810E660: .4byte gUnknown_2021CD0 -_0810E664: .4byte gUnknown_2021D18 +_0810E660: .4byte gStringVar1 +_0810E664: .4byte gStringVar4 _0810E668: .4byte gUnknown_84177AC _0810E66C: .4byte gUnknown_84162B9 thumb_func_end sub_810E5E0 @@ -2309,14 +2309,14 @@ sub_810E670: @ 810E670 movs r2, 0xA movs r3, 0xA bl FillWindowPixelRect - ldr r0, _0810E6CC @ =gUnknown_2021CD0 + ldr r0, _0810E6CC @ =gStringVar1 lsls r4, 16 asrs r4, 16 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _0810E6D0 @ =gUnknown_2021D18 + ldr r4, _0810E6D0 @ =gStringVar4 ldr r1, _0810E6D4 @ =gUnknown_84162B9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2338,8 +2338,8 @@ sub_810E670: @ 810E670 pop {r0} bx r0 .align 2, 0 -_0810E6CC: .4byte gUnknown_2021CD0 -_0810E6D0: .4byte gUnknown_2021D18 +_0810E6CC: .4byte gStringVar1 +_0810E6D0: .4byte gStringVar4 _0810E6D4: .4byte gUnknown_84162B9 thumb_func_end sub_810E670 @@ -2376,7 +2376,7 @@ _0810E70C: cmp r0, 0 beq _0810E750 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl sub_810EAF0 movs r0, 0x3 @@ -2400,7 +2400,7 @@ _0810E750: cmp r0, 0 beq _0810E796 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x3 movs r1, 0 bl sub_810F4D8 @@ -2525,7 +2525,7 @@ sub_810E848: @ 810E848 cmp r0, 0 beq _0810E892 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x5 movs r1, 0 bl sub_810F260 diff --git a/asm/item_use.s b/asm/item_use.s index cd83baa59..fa31bbe78 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -151,7 +151,7 @@ sub_80A10C4: @ 80A10C4 lsrs r4, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r5, _080A10F0 @ =gUnknown_2021D18 + ldr r5, _080A10F0 @ =gStringVar4 adds r0, r5, 0 bl StringExpandPlaceholders cmp r4, 0 @@ -163,7 +163,7 @@ sub_80A10C4: @ 80A10C4 bl sub_8108E70 b _080A1104 .align 2, 0 -_080A10F0: .4byte gUnknown_2021D18 +_080A10F0: .4byte gStringVar4 _080A10F4: .4byte sub_810A1F8 _080A10F8: ldr r3, _080A110C @ =sub_80A112C @@ -443,7 +443,7 @@ sub_80A1304: @ 80A1304 cmp r0, 0 bne _080A131C movs r0, 0xB - bl sub_80722CC + bl PlaySE _080A131C: movs r0, 0x6 bl sub_80BD5C8 @@ -612,7 +612,7 @@ sub_80A1460: @ 80A1460 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080A14B4 @ =gUnknown_2021CD0 + ldr r4, _080A14B4 @ =gStringVar1 bl sub_80D0554 adds r1, r0, 0 lsls r1, 16 @@ -621,7 +621,7 @@ sub_80A1460: @ 80A1460 movs r2, 0 movs r3, 0x4 bl ConvertIntToDecimalStringN - ldr r4, _080A14B8 @ =gUnknown_2021D18 + ldr r4, _080A14B8 @ =gStringVar4 ldr r1, _080A14BC @ =gUnknown_8416537 adds r0, r4, 0 bl StringExpandPlaceholders @@ -647,8 +647,8 @@ sub_80A1460: @ 80A1460 bl sub_8108E70 b _080A14DC .align 2, 0 -_080A14B4: .4byte gUnknown_2021CD0 -_080A14B8: .4byte gUnknown_2021D18 +_080A14B4: .4byte gStringVar1 +_080A14B8: .4byte gStringVar4 _080A14BC: .4byte gUnknown_8416537 _080A14C0: .4byte gUnknown_203AD30 _080A14C4: .4byte 0x0000ffff @@ -673,14 +673,14 @@ sub_80A14E8: @ 80A14E8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080A1538 @ =gUnknown_2021CD0 + ldr r4, _080A1538 @ =gStringVar1 bl sub_815EFA0 adds r1, r0, 0 adds r0, r4, 0 movs r2, 0 movs r3, 0x5 bl ConvertIntToDecimalStringN - ldr r4, _080A153C @ =gUnknown_2021D18 + ldr r4, _080A153C @ =gStringVar4 ldr r1, _080A1540 @ =gUnknown_8416644 adds r0, r4, 0 bl StringExpandPlaceholders @@ -706,8 +706,8 @@ sub_80A14E8: @ 80A14E8 bl sub_8108E70 b _080A1560 .align 2, 0 -_080A1538: .4byte gUnknown_2021CD0 -_080A153C: .4byte gUnknown_2021D18 +_080A1538: .4byte gStringVar1 +_080A153C: .4byte gStringVar4 _080A1540: .4byte gUnknown_8416644 _080A1544: .4byte gUnknown_203AD30 _080A1548: .4byte 0x0000ffff @@ -1286,7 +1286,7 @@ sub_80A1998: @ 80A1998 cmp r0, 0 bne _080A19CC movs r0, 0x29 - bl sub_80722CC + bl PlaySE ldr r0, _080A19C4 @ =gUnknown_3005090 lsls r1, r4, 2 adds r1, r4 @@ -1338,7 +1338,7 @@ sub_80A19E8: @ 80A19E8 adds r0, r5, 0 bl VarSet bl sub_80A1A44 - ldr r2, _080A1A3C @ =gUnknown_2021D18 + ldr r2, _080A1A3C @ =gStringVar4 ldr r3, _080A1A40 @ =sub_810A1F8 adds r0, r6, 0 movs r1, 0x2 @@ -1351,7 +1351,7 @@ _080A1A2A: _080A1A30: .4byte gUnknown_203AD30 _080A1A34: .4byte 0x0000ffff _080A1A38: .4byte 0x00004020 -_080A1A3C: .4byte gUnknown_2021D18 +_080A1A3C: .4byte gStringVar4 _080A1A40: .4byte sub_810A1F8 thumb_func_end sub_80A19E8 @@ -1373,9 +1373,9 @@ sub_80A1A44: @ 80A1A44 lsrs r0, 24 bl sub_81089F4 ldrh r0, [r4] - ldr r1, _080A1A88 @ =gUnknown_2021CF0 + ldr r1, _080A1A88 @ =gStringVar2 bl sub_8099E90 - ldr r0, _080A1A8C @ =gUnknown_2021D18 + ldr r0, _080A1A8C @ =gStringVar4 ldr r1, _080A1A90 @ =gUnknown_841658C bl StringExpandPlaceholders pop {r4} @@ -1383,8 +1383,8 @@ sub_80A1A44: @ 80A1A44 bx r0 .align 2, 0 _080A1A84: .4byte gUnknown_203AD30 -_080A1A88: .4byte gUnknown_2021CF0 -_080A1A8C: .4byte gUnknown_2021D18 +_080A1A88: .4byte gStringVar2 +_080A1A8C: .4byte gStringVar4 _080A1A90: .4byte gUnknown_841658C thumb_func_end sub_80A1A44 @@ -1408,9 +1408,9 @@ sub_80A1A94: @ 80A1A94 ldr r0, _080A1AE0 @ =0x00000804 bl FlagClear ldrh r0, [r5] - ldr r1, _080A1AE4 @ =gUnknown_2021CF0 + ldr r1, _080A1AE4 @ =gStringVar2 bl sub_8099E90 - ldr r0, _080A1AE8 @ =gUnknown_2021D18 + ldr r0, _080A1AE8 @ =gStringVar4 ldr r1, _080A1AEC @ =gUnknown_84165D2 bl StringExpandPlaceholders ldr r1, _080A1AF0 @ =gUnknown_3005090 @@ -1422,8 +1422,8 @@ _080A1AD4: .4byte gUnknown_203AD30 _080A1AD8: .4byte 0x0000ffff _080A1ADC: .4byte 0x00000803 _080A1AE0: .4byte 0x00000804 -_080A1AE4: .4byte gUnknown_2021CF0 -_080A1AE8: .4byte gUnknown_2021D18 +_080A1AE4: .4byte gStringVar2 +_080A1AE8: .4byte gStringVar4 _080A1AEC: .4byte gUnknown_84165D2 _080A1AF0: .4byte gUnknown_3005090 _080A1AF4: @@ -1434,9 +1434,9 @@ _080A1AF4: ldr r0, _080A1B30 @ =0x00000803 bl FlagClear ldrh r0, [r5] - ldr r1, _080A1B34 @ =gUnknown_2021CF0 + ldr r1, _080A1B34 @ =gStringVar2 bl sub_8099E90 - ldr r0, _080A1B38 @ =gUnknown_2021D18 + ldr r0, _080A1B38 @ =gStringVar4 ldr r1, _080A1B3C @ =gUnknown_8416600 bl StringExpandPlaceholders ldr r1, _080A1B40 @ =gUnknown_3005090 @@ -1456,8 +1456,8 @@ _080A1B26: .align 2, 0 _080A1B2C: .4byte 0x00000804 _080A1B30: .4byte 0x00000803 -_080A1B34: .4byte gUnknown_2021CF0 -_080A1B38: .4byte gUnknown_2021D18 +_080A1B34: .4byte gStringVar2 +_080A1B38: .4byte gStringVar4 _080A1B3C: .4byte gUnknown_8416600 _080A1B40: .4byte gUnknown_3005090 _080A1B44: .4byte sub_80A1B48 @@ -1481,8 +1481,8 @@ sub_80A1B48: @ 80A1B48 cmp r0, 0x7 ble _080A1B78 movs r0, 0x6E - bl sub_80722CC - ldr r2, _080A1B84 @ =gUnknown_2021D18 + bl PlaySE + ldr r2, _080A1B84 @ =gStringVar4 ldr r3, _080A1B88 @ =sub_810A1F8 adds r0, r4, 0 movs r1, 0x2 @@ -1493,7 +1493,7 @@ _080A1B78: bx r0 .align 2, 0 _080A1B80: .4byte gUnknown_3005090 -_080A1B84: .4byte gUnknown_2021D18 +_080A1B84: .4byte gStringVar4 _080A1B88: .4byte sub_810A1F8 thumb_func_end sub_80A1B48 @@ -1577,7 +1577,7 @@ sub_80A1C08: @ 80A1C08 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] - ldr r2, _080A1C3C @ =gUnknown_2021D18 + ldr r2, _080A1C3C @ =gStringVar4 ldr r3, _080A1C40 @ =sub_80A1C44 adds r0, r4, 0 movs r1, 0x2 @@ -1587,7 +1587,7 @@ sub_80A1C08: @ 80A1C08 bx r0 .align 2, 0 _080A1C38: .4byte gUnknown_3005090 -_080A1C3C: .4byte gUnknown_2021D18 +_080A1C3C: .4byte gStringVar4 _080A1C40: .4byte sub_80A1C44 thumb_func_end sub_80A1C08 @@ -1956,7 +1956,7 @@ sub_80A1EF4: @ 80A1EF4 ldr r0, _080A1F40 @ =gUnknown_203AD30 ldrh r4, [r0] movs r0, 0x1 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 movs r1, 0x1 bl sub_809A1D8 @@ -2103,7 +2103,7 @@ sub_80A2010: @ 80A2010 movs r0, 0x4 movs r1, 0 bl sub_80A2294 - ldr r2, _080A2050 @ =gUnknown_2021D18 + ldr r2, _080A2050 @ =gStringVar4 ldr r3, _080A2054 @ =sub_8108B50 adds r0, r4, 0 movs r1, 0x2 @@ -2113,7 +2113,7 @@ sub_80A2010: @ 80A2010 _080A2044: .4byte gUnknown_2022B4C _080A2048: .4byte gUnknown_203AD30 _080A204C: .4byte 0x0000ffff -_080A2050: .4byte gUnknown_2021D18 +_080A2050: .4byte gStringVar4 _080A2054: .4byte sub_8108B50 _080A2058: adds r0, r4, 0 @@ -2331,7 +2331,7 @@ sub_80A2238: @ 80A2238 lsrs r0, 24 cmp r0, 0x5 bne _080A2278 - ldr r4, _080A226C @ =gUnknown_2021D18 + ldr r4, _080A226C @ =gStringVar4 ldr r1, _080A2270 @ =gUnknown_8416425 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2343,7 +2343,7 @@ sub_80A2238: @ 80A2238 b _080A228A .align 2, 0 _080A2268: .4byte gUnknown_203AD30 -_080A226C: .4byte gUnknown_2021D18 +_080A226C: .4byte gStringVar4 _080A2270: .4byte gUnknown_8416425 _080A2274: .4byte sub_813E2B8 _080A2278: diff --git a/asm/itemfinder.s b/asm/itemfinder.s index c3d2e64a5..667cf65fc 100644 --- a/asm/itemfinder.s +++ b/asm/itemfinder.s @@ -130,7 +130,7 @@ _0813ED80: .4byte gUnknown_3005098 _0813ED84: .4byte sub_813F364 _0813ED88: movs r0, 0x41 - bl sub_80722CC + bl PlaySE ldrb r0, [r4, 0xA] adds r1, r5, 0 bl sub_813F40C @@ -182,7 +182,7 @@ _0813EDE4: .4byte gUnknown_3005098 _0813EDE8: .4byte sub_813F3A8 _0813EDEC: movs r0, 0x41 - bl sub_80722CC + bl PlaySE bl sub_813F5AC lsls r0, 24 lsrs r0, 24 diff --git a/asm/learn_move.s b/asm/learn_move.s index 3791a2a22..01cd369b7 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -293,7 +293,7 @@ sub_80E48C0: @ 80E48C0 push {r4,lr} sub sp, 0x8 adds r1, r0, 0 - ldr r4, _080E48F0 @ =gUnknown_2021D18 + ldr r4, _080E48F0 @ =gStringVar4 adds r0, r4, 0 bl StringExpandPlaceholders bl sub_80F78A8 @@ -312,7 +312,7 @@ sub_80E48C0: @ 80E48C0 pop {r0} bx r0 .align 2, 0 -_080E48F0: .4byte gUnknown_2021D18 +_080E48F0: .4byte gStringVar4 thumb_func_end sub_80E48C0 thumb_func_start sub_80E48F4 @@ -877,7 +877,7 @@ _080E4DB4: bl GetMonData lsls r0, 16 lsrs r0, 16 - ldr r2, _080E4E54 @ =gUnknown_2021D04 + ldr r2, _080E4E54 @ =gStringVar3 movs r1, 0xD mov r9, r1 mov r1, r9 @@ -913,7 +913,7 @@ _080E4DB4: adds r3, r6 ldrb r2, [r3] bl SetMonMoveSlot - ldr r0, _080E4E64 @ =gUnknown_2021CF0 + ldr r0, _080E4E64 @ =gStringVar2 ldr r2, [r7] adds r4, r2, r4 ldrb r1, [r4] @@ -937,11 +937,11 @@ _080E4DB4: b _080E4EDA .align 2, 0 _080E4E50: .4byte gUnknown_2024284 -_080E4E54: .4byte gUnknown_2021D04 +_080E4E54: .4byte gStringVar3 _080E4E58: .4byte gUnknown_8247094 _080E4E5C: .4byte 0x00000261 _080E4E60: .4byte 0x00000a67 -_080E4E64: .4byte gUnknown_2021CF0 +_080E4E64: .4byte gStringVar2 _080E4E68: .4byte gUnknown_841E493 _080E4E6C: .4byte gUnknown_20370C0 _080E4E70: @@ -986,7 +986,7 @@ _080E4EC0: cmp r0, 0 beq _080E4EDA movs r0, 0x5 - bl sub_80722CC + bl PlaySE _080E4ED2: ldr r0, _080E4EEC @ =gUnknown_203AAB4 ldr r1, [r0] @@ -1033,7 +1033,7 @@ sub_80E4F0C: @ 80E4F0C lsrs r5, r0, 24 cmp r5, 0 bne _080E4F42 - ldr r4, _080E4F4C @ =gUnknown_2021D18 + ldr r4, _080E4F4C @ =gStringVar4 ldr r1, _080E4F50 @ =gUnknown_841E3E3 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1056,7 +1056,7 @@ _080E4F42: pop {r0} bx r0 .align 2, 0 -_080E4F4C: .4byte gUnknown_2021D18 +_080E4F4C: .4byte gStringVar4 _080E4F50: .4byte gUnknown_841E3E3 thumb_func_end sub_80E4F0C @@ -1320,7 +1320,7 @@ _080E513C: movs r1, 0x2 mov r2, sp bl GetMonData - ldr r0, _080E51F4 @ =gUnknown_2021CD0 + ldr r0, _080E51F4 @ =gStringVar1 mov r1, sp bl StringCopy10 ldr r0, [r4] @@ -1395,7 +1395,7 @@ _080E51AA: _080E51E8: .4byte gUnknown_203AAB4 _080E51EC: .4byte gUnknown_2024284 _080E51F0: .4byte gUnknown_8247094 -_080E51F4: .4byte gUnknown_2021CD0 +_080E51F4: .4byte gStringVar1 _080E51F8: .4byte gUnknown_84161C1 _080E51FC: .4byte gUnknown_3005E70 _080E5200: .4byte gUnknown_83FFA94 @@ -1417,7 +1417,7 @@ sub_80E5204: @ 80E5204 cmp r0, 0 beq _080E5284 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, [r4] ldr r2, _080E5264 @ =0x00000a67 adds r0, r1, r2 @@ -1426,7 +1426,7 @@ sub_80E5204: @ 80E5204 beq _080E5270 movs r0, 0x8 strb r0, [r1] - ldr r0, _080E5268 @ =gUnknown_2021CF0 + ldr r0, _080E5268 @ =gStringVar2 ldr r1, [r4] adds r2, r1, r2 ldrb r3, [r2] @@ -1445,7 +1445,7 @@ _080E5258: .4byte gUnknown_203AAB4 _080E525C: .4byte 0x00000263 _080E5260: .4byte gMain _080E5264: .4byte 0x00000a67 -_080E5268: .4byte gUnknown_2021CF0 +_080E5268: .4byte gStringVar2 _080E526C: .4byte gUnknown_841E3FB _080E5270: ldr r0, _080E5280 @ =gUnknown_841E4E2 @@ -1462,7 +1462,7 @@ _080E5284: cmp r0, 0 beq _080E529E movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, [r4] movs r1, 0xC strb r1, [r0] @@ -1790,7 +1790,7 @@ sub_80E553C: @ 80E553C cmp r1, 0 bne _080E5560 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _080E5568 @ =gUnknown_203AAB4 ldr r0, [r2] ldr r1, _080E556C @ =0x0000025f diff --git a/asm/link.s b/asm/link.s index 0dd52991a..b573e430b 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3505,7 +3505,7 @@ _0800AF6C: b _0800AFC4 _0800AF72: movs r0, 0x16 - bl sub_80722CC + bl PlaySE b _0800AFC4 _0800AF7A: ldr r0, _0800AF9C @ =gUnknown_3003F3C @@ -3560,7 +3560,7 @@ _0800AFC4: beq _0800B02E bl sub_812B484 movs r0, 0x15 - bl sub_80722CC + bl PlaySE movs r0, 0 strb r0, [r4] ldr r1, _0800B00C @ =gUnknown_2022854 diff --git a/asm/link_rfu.s b/asm/link_rfu.s index 0cf9e7529..c6c47eb25 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -3355,7 +3355,7 @@ _080FED10: cmp r4, 0 beq _080FED6E movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_8100134 _080FED20: @@ -6401,7 +6401,7 @@ _081002EE: movs r0, 0x1 ldr r1, _0810030C @ =gUnknown_843F8D8 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth lsls r1, r0, 3 subs r0, r1, r0 b _08100322 @@ -6416,7 +6416,7 @@ _08100310: movs r0, 0x1 mov r1, sp movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth _08100322: adds r0, 0x11 lsls r1, r6, 16 @@ -7702,7 +7702,7 @@ sub_8100D24: @ 8100D24 movs r0, 0x1 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r4, 0x80 subs r4, r0 lsrs r4, 1 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 565a92117..8389c6494 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -199,14 +199,14 @@ _081159B8: .4byte _08115A10 .4byte _08115A10 _08115A10: - ldr r0, _08115A1C @ =gUnknown_2021D18 + ldr r0, _08115A1C @ =gStringVar4 ldr r1, _08115A20 @ =gUnknown_8457234 bl StringExpandPlaceholders _08115A18: pop {r0} bx r0 .align 2, 0 -_08115A1C: .4byte gUnknown_2021D18 +_08115A1C: .4byte gStringVar4 _08115A20: .4byte gUnknown_8457234 thumb_func_end sub_811599C @@ -437,7 +437,7 @@ _08115C54: .4byte gUnknown_845747C _08115C58: .4byte gUnknown_3005E70 _08115C5C: .4byte gUnknown_8456D34 _08115C60: - ldr r0, _08115C98 @ =gUnknown_2021CD0 + ldr r0, _08115C98 @ =gStringVar1 ldr r2, _08115C9C @ =gUnknown_8456C74 ldr r4, _08115CA0 @ =gUnknown_203B058 ldrb r1, [r4] @@ -458,27 +458,27 @@ _08115C60: ands r0, r2 cmp r0, 0 beq _08115CB0 - ldr r0, _08115CA8 @ =gUnknown_2021D18 + ldr r0, _08115CA8 @ =gStringVar4 ldr r1, _08115CAC @ =gUnknown_8457264 bl StringExpandPlaceholders b _08115CCC .align 2, 0 -_08115C98: .4byte gUnknown_2021CD0 +_08115C98: .4byte gStringVar1 _08115C9C: .4byte gUnknown_8456C74 _08115CA0: .4byte gUnknown_203B058 _08115CA4: .4byte gUnknown_203B059 -_08115CA8: .4byte gUnknown_2021D18 +_08115CA8: .4byte gStringVar4 _08115CAC: .4byte gUnknown_8457264 _08115CB0: - ldr r0, _08115CBC @ =gUnknown_2021D18 + ldr r0, _08115CBC @ =gStringVar4 ldr r1, _08115CC0 @ =gUnknown_8457234 bl StringExpandPlaceholders b _08115CCC .align 2, 0 -_08115CBC: .4byte gUnknown_2021D18 +_08115CBC: .4byte gStringVar4 _08115CC0: .4byte gUnknown_8457234 _08115CC4: - ldr r0, _08115CE0 @ =gUnknown_2021D18 + ldr r0, _08115CE0 @ =gStringVar4 ldrb r1, [r4] bl sub_811599C _08115CCC: @@ -491,12 +491,12 @@ _08115CCC: strb r0, [r5, 0xC] b _081161D8 .align 2, 0 -_08115CE0: .4byte gUnknown_2021D18 +_08115CE0: .4byte gStringVar4 _08115CE4: .4byte gUnknown_203B059 _08115CE8: adds r0, r5, 0 adds r0, 0xD - ldr r1, _08115D00 @ =gUnknown_2021D18 + ldr r1, _08115D00 @ =gStringVar4 bl sub_811A0F8 lsls r0, 24 cmp r0, 0 @@ -507,7 +507,7 @@ _08115CFA: strb r0, [r5, 0xC] b _081161D8 .align 2, 0 -_08115D00: .4byte gUnknown_2021D18 +_08115D00: .4byte gStringVar4 _08115D04: adds r0, r5, 0 movs r1, 0x7 @@ -656,7 +656,7 @@ _08115E20: .4byte gUnknown_845767C _08115E24: adds r0, r5, 0 adds r0, 0xD - ldr r1, _08115E3C @ =gUnknown_2021D18 + ldr r1, _08115E3C @ =gStringVar4 bl sub_811A0F8 lsls r0, 24 cmp r0, 0 @@ -667,7 +667,7 @@ _08115E36: strb r0, [r5, 0xC] b _081161D8 .align 2, 0 -_08115E3C: .4byte gUnknown_2021D18 +_08115E3C: .4byte gStringVar4 _08115E40: adds r4, r5, 0 adds r4, 0xD @@ -808,7 +808,7 @@ _08115F54: .align 2, 0 _08115F58: .4byte gUnknown_203B059 _08115F5C: - ldr r4, _08115FA4 @ =gUnknown_2021CD0 + ldr r4, _08115FA4 @ =gStringVar1 ldrb r1, [r5, 0x13] lsls r1, 5 ldr r0, [r5] @@ -826,7 +826,7 @@ _08115F5C: lsrs r1, 28 adds r0, r4, 0 bl ConvertInternationalString - ldr r0, _08115FA8 @ =gUnknown_2021D18 + ldr r0, _08115FA8 @ =gStringVar4 ldr r1, _08115FAC @ =gUnknown_8457554 bl StringExpandPlaceholders movs r0, 0xD @@ -840,8 +840,8 @@ _08115F90: bl sub_811586C b _08115FF4 .align 2, 0 -_08115FA4: .4byte gUnknown_2021CD0 -_08115FA8: .4byte gUnknown_2021D18 +_08115FA4: .4byte gStringVar1 +_08115FA8: .4byte gStringVar4 _08115FAC: .4byte gUnknown_8457554 _08115FB0: .4byte gUnknown_203B059 _08115FB4: @@ -890,7 +890,7 @@ _08116000: _0811600A: adds r0, r5, 0 adds r0, 0xD - ldr r1, _08116024 @ =gUnknown_2021D18 + ldr r1, _08116024 @ =gStringVar4 bl sub_811A0F8 lsls r0, 24 cmp r0, 0 @@ -901,7 +901,7 @@ _0811601C: strb r0, [r5, 0xC] b _081161D8 .align 2, 0 -_08116024: .4byte gUnknown_2021D18 +_08116024: .4byte gStringVar4 _08116028: ldrb r0, [r5, 0xE] adds r0, 0x1 @@ -1398,10 +1398,10 @@ sub_8116444: @ 8116444 b _081164C0 _08116460: movs r0, 0x2 - bl sub_80722CC + bl PlaySE ldrb r0, [r5, 0x12] bl sub_8107180 - ldr r4, _081164A0 @ =gUnknown_2021CF0 + ldr r4, _081164A0 @ =gStringVar2 ldrb r0, [r5, 0x13] lsls r0, 5 ldr r1, [r5] @@ -1418,15 +1418,15 @@ _08116460: lsrs r1, 28 adds r0, r4, 0 bl ConvertInternationalString - ldr r0, _081164A4 @ =gUnknown_2021D18 + ldr r0, _081164A4 @ =gStringVar4 ldr r1, _081164A8 @ =gUnknown_203B058 ldrb r1, [r1] bl sub_8116244 strb r6, [r5, 0xC] b _081164C0 .align 2, 0 -_081164A0: .4byte gUnknown_2021CF0 -_081164A4: .4byte gUnknown_2021D18 +_081164A0: .4byte gStringVar2 +_081164A4: .4byte gStringVar4 _081164A8: .4byte gUnknown_203B058 _081164AC: movs r0, 0 @@ -1968,7 +1968,7 @@ _08116904: b _08116BF6 _08116916: movs r0, 0x2 - bl sub_80722CC + bl PlaySE b _08116BF6 _0811691E: ldrb r0, [r6, 0xE] @@ -2010,7 +2010,7 @@ _0811691E: .align 2, 0 _0811696C: .4byte gMain _08116970: - ldr r0, _0811698C @ =gUnknown_2021D18 + ldr r0, _0811698C @ =gStringVar4 ldr r2, _08116990 @ =gUnknown_8457608 subs r1, 0x1 lsls r1, 2 @@ -2021,14 +2021,14 @@ _08116970: _08116982: strb r0, [r6, 0x8] movs r0, 0x67 - bl sub_80722CC + bl PlaySE b _08116D06 .align 2, 0 -_0811698C: .4byte gUnknown_2021D18 +_0811698C: .4byte gStringVar4 _08116990: .4byte gUnknown_8457608 _08116994: movs r0, 0x7 - bl sub_80722CC + bl PlaySE b _08116D06 _0811699C: ldr r0, _081169B0 @ =gMain @@ -2045,7 +2045,7 @@ _081169AA: .align 2, 0 _081169B0: .4byte gMain _081169B4: - ldr r4, _081169FC @ =gUnknown_2021D18 + ldr r4, _081169FC @ =gStringVar4 ldr r0, _08116A00 @ =gUnknown_203B058 ldrb r1, [r0] adds r0, r4, 0 @@ -2059,7 +2059,7 @@ _081169B4: bne _081169D2 b _08116D06 _081169D2: - ldr r4, _08116A04 @ =gUnknown_2021CD0 + ldr r4, _08116A04 @ =gStringVar1 ldrb r0, [r6, 0xF] lsls r0, 5 ldr r1, [r6] @@ -2078,9 +2078,9 @@ _081169D2: bl ConvertInternationalString b _08116C0A .align 2, 0 -_081169FC: .4byte gUnknown_2021D18 +_081169FC: .4byte gStringVar4 _08116A00: .4byte gUnknown_203B058 -_08116A04: .4byte gUnknown_2021CD0 +_08116A04: .4byte gStringVar1 _08116A08: ldr r0, _08116A3C @ =gUnknown_3003F64 ldrb r0, [r0] @@ -2172,7 +2172,7 @@ _08116AEA: strb r0, [r6, 0x8] b _08116B70 _08116AF0: - ldr r4, _08116B30 @ =gUnknown_2021D18 + ldr r4, _08116B30 @ =gStringVar4 ldr r5, _08116B34 @ =gUnknown_203B058 ldrb r1, [r5] adds r0, r4, 0 @@ -2187,7 +2187,7 @@ _08116AF0: movs r0, 0x7 movs r1, 0 bl sub_80FB9E4 - ldr r0, _08116B38 @ =gUnknown_2021CD0 + ldr r0, _08116B38 @ =gStringVar1 ldr r2, _08116B3C @ =gUnknown_8456C74 ldrb r1, [r5] lsls r1, 2 @@ -2199,9 +2199,9 @@ _08116AF0: bl StringExpandPlaceholders b _08116B70 .align 2, 0 -_08116B30: .4byte gUnknown_2021D18 +_08116B30: .4byte gStringVar4 _08116B34: .4byte gUnknown_203B058 -_08116B38: .4byte gUnknown_2021CD0 +_08116B38: .4byte gStringVar1 _08116B3C: .4byte gUnknown_8456C74 _08116B40: .4byte gUnknown_8457700 _08116B44: @@ -2210,7 +2210,7 @@ _08116B44: bls _08116B6C adds r0, r6, 0 adds r0, 0x9 - ldr r1, _08116B68 @ =gUnknown_2021D18 + ldr r1, _08116B68 @ =gStringVar4 bl sub_811A0F8 lsls r0, 24 cmp r0, 0 @@ -2221,7 +2221,7 @@ _08116B44: movs r0, 0 b _08116B6E .align 2, 0 -_08116B68: .4byte gUnknown_2021D18 +_08116B68: .4byte gStringVar4 _08116B6C: adds r0, 0x1 _08116B6E: @@ -2391,7 +2391,7 @@ _08116CC4: .4byte gUnknown_8457754 _08116CC8: adds r0, r6, 0 adds r0, 0x9 - ldr r1, _08116CE4 @ =gUnknown_2021D18 + ldr r1, _08116CE4 @ =gStringVar4 _08116CCE: bl sub_811A0F8 lsls r0, 24 @@ -2405,7 +2405,7 @@ _08116CDC: strb r0, [r6, 0x8] b _08116D06 .align 2, 0 -_08116CE4: .4byte gUnknown_2021D18 +_08116CE4: .4byte gStringVar4 _08116CE8: .4byte gUnknown_20370D0 _08116CEC: adds r0, r4, 0 @@ -2481,7 +2481,7 @@ sub_8116D60: @ 8116D60 bl sub_80FCD74 ldrb r0, [r4, 0xE] bl sub_8107180 - ldr r5, _08116DD4 @ =gUnknown_2021CD0 + ldr r5, _08116DD4 @ =gStringVar1 ldrb r0, [r4, 0xF] lsls r0, 5 ldr r1, [r4] @@ -2523,7 +2523,7 @@ sub_8116D60: @ 8116D60 pop {r0} bx r0 .align 2, 0 -_08116DD4: .4byte gUnknown_2021CD0 +_08116DD4: .4byte gStringVar1 _08116DD8: .4byte gUnknown_84570C8 _08116DDC: .4byte gUnknown_20370C0 thumb_func_end sub_8116D60 @@ -2632,7 +2632,7 @@ _08116EC8: cmp r0, 0x1 bne _08116EDA movs r0, 0x2 - bl sub_80722CC + bl PlaySE _08116EDA: ldr r0, _08116EF4 @ =gUnknown_3005090 lsls r1, r5, 2 @@ -4092,7 +4092,7 @@ _08117B70: .4byte 0x0000ffff _08117B74: .4byte gUnknown_3005E70 _08117B78: .4byte gUnknown_8456D34 _08117B7C: - ldr r0, _08117B9C @ =gUnknown_2021CD0 + ldr r0, _08117B9C @ =gStringVar1 ldr r2, _08117BA0 @ =gUnknown_8456C74 ldr r4, _08117BA4 @ =gUnknown_203B058 ldrb r1, [r4] @@ -4100,25 +4100,25 @@ _08117B7C: adds r1, r2 ldr r1, [r1] bl StringCopy - ldr r0, _08117BA8 @ =gUnknown_2021D18 + ldr r0, _08117BA8 @ =gStringVar4 ldrb r1, [r4] bl sub_811599C movs r0, 0x3 strb r0, [r5, 0xC] b _08117ECA .align 2, 0 -_08117B9C: .4byte gUnknown_2021CD0 +_08117B9C: .4byte gStringVar1 _08117BA0: .4byte gUnknown_8456C74 _08117BA4: .4byte gUnknown_203B058 -_08117BA8: .4byte gUnknown_2021D18 +_08117BA8: .4byte gStringVar4 _08117BAC: - ldr r0, _08117BB8 @ =gUnknown_2021D18 + ldr r0, _08117BB8 @ =gStringVar4 bl sub_8142504 movs r0, 0x4 strb r0, [r5, 0xC] b _08117ECA .align 2, 0 -_08117BB8: .4byte gUnknown_2021D18 +_08117BB8: .4byte gStringVar4 _08117BBC: adds r0, r5, 0 movs r1, 0x5 @@ -4167,7 +4167,7 @@ _08117C12: adds r0, 0xD adds r1, r5, 0 adds r1, 0x14 - ldr r3, _08117C38 @ =gUnknown_2021D18 + ldr r3, _08117C38 @ =gStringVar4 movs r2, 0 bl sub_81427A0 lsls r0, 24 @@ -4182,7 +4182,7 @@ _08117C12: beq _08117C84 b _08117ECA .align 2, 0 -_08117C38: .4byte gUnknown_2021D18 +_08117C38: .4byte gStringVar4 _08117C3C: cmp r4, 0x1 beq _08117C84 @@ -4272,7 +4272,7 @@ _08117CB2: ldrb r0, [r5, 0x13] adds r0, 0x1 strb r0, [r5, 0x13] - ldr r4, _08117D30 @ =gUnknown_2021CD0 + ldr r4, _08117D30 @ =gStringVar1 ldrb r1, [r5, 0x13] lsls r1, 5 ldr r0, [r5] @@ -4290,7 +4290,7 @@ _08117CB2: lsrs r1, 28 adds r0, r4, 0 bl ConvertInternationalString - ldr r0, _08117D34 @ =gUnknown_2021D18 + ldr r0, _08117D34 @ =gStringVar4 ldr r1, _08117D38 @ =gUnknown_8457554 bl StringExpandPlaceholders movs r0, 0x9 @@ -4298,8 +4298,8 @@ _08117CB2: bl sub_80F8F5C b _08117D7C .align 2, 0 -_08117D30: .4byte gUnknown_2021CD0 -_08117D34: .4byte gUnknown_2021D18 +_08117D30: .4byte gStringVar1 +_08117D34: .4byte gStringVar4 _08117D38: .4byte gUnknown_8457554 _08117D3C: ldrb r1, [r5, 0x13] @@ -4345,13 +4345,13 @@ _08117D88: strb r4, [r5, 0xC] b _08117ECA _08117D94: - ldr r0, _08117DA0 @ =gUnknown_2021D18 + ldr r0, _08117DA0 @ =gStringVar4 bl sub_8142504 movs r0, 0xA strb r0, [r5, 0xC] b _08117ECA .align 2, 0 -_08117DA0: .4byte gUnknown_2021D18 +_08117DA0: .4byte gStringVar4 _08117DA4: ldrb r0, [r5, 0xE] adds r0, 0x1 @@ -4670,7 +4670,7 @@ _08118070: cmp r2, 0x1 bne _08118086 movs r0, 0x2 - bl sub_80722CC + bl PlaySE _08118086: ldrb r0, [r5, 0xE] bl sub_8107180 @@ -4708,7 +4708,7 @@ _0811808E: bl sub_80FCD74 ldrb r0, [r5, 0xE] bl sub_8107180 - ldr r4, _0811812C @ =gUnknown_2021CD0 + ldr r4, _0811812C @ =gStringVar1 ldrb r0, [r5, 0xF] lsls r0, 5 ldr r1, [r5] @@ -4739,16 +4739,16 @@ _0811808E: adds r0, r4, 0 bl sub_80FBF54 movs r0, 0x67 - bl sub_80722CC + bl PlaySE movs r0, 0x4 strb r0, [r5, 0x8] b _08118288 .align 2, 0 _08118128: .4byte gMain -_0811812C: .4byte gUnknown_2021CD0 +_0811812C: .4byte gStringVar1 _08118130: movs r0, 0x7 - bl sub_80722CC + bl PlaySE b _08118288 _08118138: ldr r0, _0811814C @ =gMain @@ -4767,7 +4767,7 @@ _0811814C: .4byte gMain _08118150: ldr r0, _08118184 @ =gUnknown_8459238 bl sub_8142504 - ldr r4, _08118188 @ =gUnknown_2021CD0 + ldr r4, _08118188 @ =gStringVar1 ldrb r0, [r5, 0xF] lsls r0, 5 ldr r1, [r5] @@ -4789,7 +4789,7 @@ _08118150: b _08118288 .align 2, 0 _08118184: .4byte gUnknown_8459238 -_08118188: .4byte gUnknown_2021CD0 +_08118188: .4byte gStringVar1 _0811818C: ldr r0, _081181C4 @ =gUnknown_3003F64 ldrb r0, [r0] @@ -5077,7 +5077,7 @@ _08118408: cmp r0, 0x1 bne _0811841E movs r0, 0x2 - bl sub_80722CC + bl PlaySE _0811841E: ldrb r0, [r5, 0x13] cmp r0, 0 @@ -5133,13 +5133,13 @@ _0811843A: adds r0, r4, 0 bl sub_80FBF54 movs r0, 0x67 - bl sub_80722CC + bl PlaySE movs r0, 0x4 strb r0, [r5, 0x8] b _081184BC _0811849C: movs r0, 0x16 - bl sub_80722CC + bl PlaySE movs r0, 0xA strb r0, [r5, 0x8] b _081184BC @@ -5164,7 +5164,7 @@ _081184C4: .4byte gMain _081184C8: ldr r0, _081184FC @ =gUnknown_845928C bl sub_8142504 - ldr r4, _08118500 @ =gUnknown_2021CD0 + ldr r4, _08118500 @ =gStringVar1 ldrb r0, [r5, 0xF] lsls r0, 5 ldr r1, [r5] @@ -5186,7 +5186,7 @@ _081184C8: b _08118604 .align 2, 0 _081184FC: .4byte gUnknown_845928C -_08118500: .4byte gUnknown_2021CD0 +_08118500: .4byte gStringVar1 _08118504: ldr r0, _0811853C @ =gUnknown_3003F64 ldrb r0, [r0] @@ -5367,7 +5367,7 @@ sub_8118664: @ 8118664 movs r1, 0x8 strb r1, [r2, 0x14] strb r0, [r2, 0x15] - ldr r0, _08118688 @ =gUnknown_2021D18 + ldr r0, _08118688 @ =gStringVar4 cmp r3, r0 beq _0811867E adds r1, r3, 0 @@ -5377,7 +5377,7 @@ _0811867E: bx r0 .align 2, 0 _08118684: .4byte gUnknown_203B05C -_08118688: .4byte gUnknown_2021D18 +_08118688: .4byte gStringVar4 thumb_func_end sub_8118664 thumb_func_start sub_811868C @@ -5388,7 +5388,7 @@ sub_811868C: @ 811868C ldr r1, [r0] movs r0, 0x1A strb r0, [r1, 0x14] - ldr r0, _081186AC @ =gUnknown_2021D18 + ldr r0, _081186AC @ =gStringVar4 cmp r2, r0 beq _081186A4 adds r1, r2, 0 @@ -5398,7 +5398,7 @@ _081186A4: bx r0 .align 2, 0 _081186A8: .4byte gUnknown_203B05C -_081186AC: .4byte gUnknown_2021D18 +_081186AC: .4byte gStringVar4 thumb_func_end sub_811868C thumb_func_start sub_81186B0 @@ -5714,8 +5714,8 @@ _081189AA: movs r2, 0x1 bl sub_80FB008 movs r0, 0x2 - bl sub_80722CC - ldr r0, _081189DC @ =gUnknown_2021CD0 + bl PlaySE + ldr r0, _081189DC @ =gStringVar1 ldr r1, _081189E0 @ =gSaveBlock2Ptr ldr r1, [r1] bl StringCopy @@ -5724,7 +5724,7 @@ _081189AA: b _08118A06 .align 2, 0 _081189D8: .4byte gUnknown_20370D0 -_081189DC: .4byte gUnknown_2021CD0 +_081189DC: .4byte gStringVar1 _081189E0: .4byte gSaveBlock2Ptr _081189E4: cmp r0, 0xB @@ -5771,7 +5771,7 @@ _08118A1E: cmp r0, 0 beq _08118A50 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_811B298 movs r0, 0x18 bl _081198DA @@ -5786,16 +5786,16 @@ _08118A50: movs r2, 0x1 bl sub_80FB008 movs r0, 0x2 - bl sub_80722CC + bl PlaySE bl sub_811B298 - ldr r0, _08118A7C @ =gUnknown_2021CD0 + ldr r0, _08118A7C @ =gStringVar1 ldr r1, _08118A80 @ =gSaveBlock2Ptr ldr r1, [r1] bl StringCopy movs r0, 0x2D bl _081198DA .align 2, 0 -_08118A7C: .4byte gUnknown_2021CD0 +_08118A7C: .4byte gStringVar1 _08118A80: .4byte gSaveBlock2Ptr _08118A84: bl sub_8119B94 @@ -5814,7 +5814,7 @@ _08118A9A: b _08118AD4 _08118AA0: movs r0, 0x37 - bl sub_80722CC + bl PlaySE _08118AA6: adds r0, r6, 0 bl sub_811BECC @@ -5902,12 +5902,12 @@ _08118B48: .align 2, 0 _08118B68: .4byte gUnknown_203B058 _08118B6C: - ldr r1, _08118B78 @ =gUnknown_2021D18 + ldr r1, _08118B78 @ =gStringVar4 movs r0, 0x13 bl sub_8118664 bl _081198DC .align 2, 0 -_08118B78: .4byte gUnknown_2021D18 +_08118B78: .4byte gStringVar4 _08118B7C: bl sub_811A0E0 bl sub_80FB9F4 @@ -6052,7 +6052,7 @@ _08118CB6: movs r1, 0x40 strh r1, [r0] bl sub_80F9E2C - ldr r0, _08118CDC @ =gUnknown_2021D18 + ldr r0, _08118CDC @ =gStringVar4 ldr r2, _08118CE0 @ =gUnknown_845842C ldr r1, _08118CE4 @ =gUnknown_202273C ldrb r1, [r1, 0x13] @@ -6063,7 +6063,7 @@ _08118CB6: movs r0, 0x20 bl _081198DA .align 2, 0 -_08118CDC: .4byte gUnknown_2021D18 +_08118CDC: .4byte gStringVar4 _08118CE0: .4byte gUnknown_845842C _08118CE4: .4byte gUnknown_202273C _08118CE8: @@ -6101,13 +6101,13 @@ _08118D1C: .align 2, 0 _08118D34: .4byte gUnknown_203B058 _08118D38: - ldr r0, _08118D48 @ =gUnknown_2021D18 + ldr r0, _08118D48 @ =gStringVar4 ldr r1, _08118D4C @ =gUnknown_8458434 bl StringCopy movs r0, 0x24 bl _081198DA .align 2, 0 -_08118D48: .4byte gUnknown_2021D18 +_08118D48: .4byte gStringVar4 _08118D4C: .4byte gUnknown_8458434 _08118D50: adds r0, r6, 0 @@ -6172,14 +6172,14 @@ _08118DD4: ldrb r0, [r0] cmp r0, 0 bne _08118DF8 - ldr r0, _08118DF0 @ =gUnknown_2021D18 + ldr r0, _08118DF0 @ =gStringVar4 ldr r1, _08118DF4 @ =gUnknown_8458434 bl StringCopy movs r0, 0x1C bl _081198DA .align 2, 0 _08118DEC: .4byte gUnknown_3003F64 -_08118DF0: .4byte gUnknown_2021D18 +_08118DF0: .4byte gStringVar4 _08118DF4: .4byte gUnknown_8458434 _08118DF8: adds r0, r6, 0 @@ -6193,7 +6193,7 @@ _08118DF8: ldrb r0, [r0] cmp r0, 0x8 bne _08118E28 - ldr r0, _08118E24 @ =gUnknown_2021D18 + ldr r0, _08118E24 @ =gStringVar4 adds r1, r6, 0 movs r2, 0 bl sub_811B31C @@ -6201,7 +6201,7 @@ _08118DF8: bl _081198DA .align 2, 0 _08118E20: .4byte gUnknown_203B058 -_08118E24: .4byte gUnknown_2021D18 +_08118E24: .4byte gStringVar4 _08118E28: movs r0, 0xD bl _081198DA @@ -6213,7 +6213,7 @@ _08118E36: movs r5, 0 movs r0, 0x20 strb r0, [r6, 0x14] - ldr r0, _08118E54 @ =gUnknown_2021D18 + ldr r0, _08118E54 @ =gStringVar4 ldr r4, _08118E58 @ =gUnknown_203B058 ldrb r2, [r4] movs r1, 0x40 @@ -6224,7 +6224,7 @@ _08118E36: strb r5, [r4] bl _081198DC .align 2, 0 -_08118E54: .4byte gUnknown_2021D18 +_08118E54: .4byte gStringVar4 _08118E58: .4byte gUnknown_203B058 _08118E5C: .4byte gUnknown_202273C _08118E60: @@ -6254,7 +6254,7 @@ _08118E94: .4byte gUnknown_8457B04 _08118E98: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08118EC4 @ =gUnknown_2021D18 + ldr r1, _08118EC4 @ =gStringVar4 bl sub_811A0F8 lsls r0, 24 cmp r0, 0 @@ -6272,7 +6272,7 @@ _08118EAC: strh r4, [r0] bl _081198DC .align 2, 0 -_08118EC4: .4byte gUnknown_2021D18 +_08118EC4: .4byte gStringVar4 _08118EC8: bl sub_800A4BC lsls r0, 24 @@ -6284,7 +6284,7 @@ _08118ED6: lsls r0, 24 cmp r0, 0 bne _08118F30 - ldr r5, _08118F20 @ =gUnknown_2021CD0 + ldr r5, _08118F20 @ =gStringVar1 bl GetMultiplayerId movs r1, 0x1 eors r0, r1 @@ -6302,7 +6302,7 @@ _08118ED6: adds r1, r4, 0 bl sub_80FD338 adds r5, r0, 0 - ldr r0, _08118F28 @ =gUnknown_2021D18 + ldr r0, _08118F28 @ =gStringVar4 ldr r2, _08118F2C @ =gUnknown_8457C20 lsls r1, r5, 2 adds r1, r2 @@ -6311,9 +6311,9 @@ _08118ED6: movs r0, 0x21 bl _081198DA .align 2, 0 -_08118F20: .4byte gUnknown_2021CD0 +_08118F20: .4byte gStringVar1 _08118F24: .4byte gUnknown_2022744 -_08118F28: .4byte gUnknown_2021D18 +_08118F28: .4byte gStringVar4 _08118F2C: .4byte gUnknown_8457C20 _08118F30: movs r0, 0x7 @@ -6494,7 +6494,7 @@ _081190A8: .4byte gUnknown_84585E8 _081190AC: .4byte gUnknown_3003F64 _081190B0: movs r0, 0x42 - bl sub_80722CC + bl PlaySE bl sub_80F8FA0 movs r0, 0 movs r1, 0xC @@ -6542,7 +6542,7 @@ _0811910C: _08119122: movs r0, 0x21 strb r0, [r6, 0x14] - ldr r0, _08119154 @ =gUnknown_2021CD0 + ldr r0, _08119154 @ =gStringVar1 ldr r4, _08119158 @ =gUnknown_2022760 adds r1, r4, 0 bl StringCopy @@ -6552,7 +6552,7 @@ _08119122: adds r1, r4, 0 bl sub_80FD338 adds r5, r0, 0 - ldr r0, _0811915C @ =gUnknown_2021D18 + ldr r0, _0811915C @ =gStringVar4 ldr r2, _08119160 @ =gUnknown_8457BCC lsls r1, r5, 2 adds r1, r2 @@ -6561,16 +6561,16 @@ _08119122: b _081198DC .align 2, 0 _08119150: .4byte sub_8117280 -_08119154: .4byte gUnknown_2021CD0 +_08119154: .4byte gStringVar1 _08119158: .4byte gUnknown_2022760 -_0811915C: .4byte gUnknown_2021D18 +_0811915C: .4byte gStringVar4 _08119160: .4byte gUnknown_8457BCC _08119164: adds r0, r6, 0 bl sub_8119904 adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08119180 @ =gUnknown_2021D18 + ldr r1, _08119180 @ =gStringVar4 bl sub_811A0F8 lsls r0, 24 cmp r0, 0 @@ -6580,7 +6580,7 @@ _0811917C: movs r0, 0x22 b _081198DA .align 2, 0 -_08119180: .4byte gUnknown_2021D18 +_08119180: .4byte gStringVar4 _08119184: adds r0, r6, 0 bl sub_8119904 @@ -6600,22 +6600,22 @@ _08119196: _081191A4: movs r0, 0x1 bl sub_80FBD6C - ldr r0, _081191BC @ =gUnknown_2021D18 + ldr r0, _081191BC @ =gStringVar4 ldr r1, _081191C0 @ =gUnknown_8457E60 bl StringCopy movs r0, 0x24 b _081198DA .align 2, 0 _081191B8: .4byte gMain -_081191BC: .4byte gUnknown_2021D18 +_081191BC: .4byte gStringVar4 _081191C0: .4byte gUnknown_8457E60 _081191C4: - ldr r1, _081191D0 @ =gUnknown_2021D18 + ldr r1, _081191D0 @ =gStringVar4 movs r0, 0x9 bl sub_8118664 b _081198DC .align 2, 0 -_081191D0: .4byte gUnknown_2021D18 +_081191D0: .4byte gStringVar4 _081191D4: adds r0, r6, 0 adds r0, 0x16 @@ -6691,13 +6691,13 @@ _0811924A: bl sub_80F9E2C movs r0, 0xA strb r0, [r6, 0x14] - ldr r0, _08119280 @ =gUnknown_2021D18 + ldr r0, _08119280 @ =gStringVar4 ldr r1, _08119284 @ =gUnknown_84584C0 bl StringCopy b _081198DC .align 2, 0 _0811927C: .4byte gUnknown_203B058 -_08119280: .4byte gUnknown_2021D18 +_08119280: .4byte gStringVar4 _08119284: .4byte gUnknown_84584C0 _08119288: adds r0, r5, 0 @@ -6709,14 +6709,14 @@ _08119292: bne _081192B0 adds r0, r5, 0 bl sub_80F9E2C - ldr r0, _081192AC @ =gUnknown_2021D18 + ldr r0, _081192AC @ =gStringVar4 adds r1, r6, 0 movs r2, 0x1 bl sub_811B31C movs r0, 0x28 b _081198DA .align 2, 0 -_081192AC: .4byte gUnknown_2021D18 +_081192AC: .4byte gStringVar4 _081192B0: adds r0, r5, 0 bl sub_80F9E2C @@ -6730,13 +6730,13 @@ _081192BA: bl sub_80F9E2C movs r0, 0xA strb r0, [r6, 0x14] - ldr r0, _081192D8 @ =gUnknown_2021D18 + ldr r0, _081192D8 @ =gStringVar4 ldr r1, _081192DC @ =gUnknown_203B058 ldrb r1, [r1] bl sub_81162E0 b _081198DC .align 2, 0 -_081192D8: .4byte gUnknown_2021D18 +_081192D8: .4byte gStringVar4 _081192DC: .4byte gUnknown_203B058 _081192E0: bl sub_800AAC0 @@ -6752,7 +6752,7 @@ _081192F2: ldr r1, _0811931C @ =gUnknown_203B058 movs r0, 0x40 strb r0, [r1] - ldr r1, _08119320 @ =gUnknown_2021D18 + ldr r1, _08119320 @ =gStringVar4 movs r0, 0x25 bl sub_8118664 adds r0, r6, 0 @@ -6769,7 +6769,7 @@ _081192F2: .align 2, 0 _08119318: .4byte gUnknown_3003F64 _0811931C: .4byte gUnknown_203B058 -_08119320: .4byte gUnknown_2021D18 +_08119320: .4byte gStringVar4 _08119324: movs r0, 0x2 strb r0, [r6, 0x14] @@ -6777,7 +6777,7 @@ _08119324: bl sub_811B258 b _081198DC _08119330: - ldr r4, _0811934C @ =gUnknown_2021D18 + ldr r4, _0811934C @ =gStringVar4 ldr r0, _08119350 @ =gUnknown_203B058 ldrb r0, [r0] movs r1, 0x40 @@ -6789,7 +6789,7 @@ _08119330: bl sub_8118664 b _081198DC .align 2, 0 -_0811934C: .4byte gUnknown_2021D18 +_0811934C: .4byte gStringVar4 _08119350: .4byte gUnknown_203B058 _08119354: bl sub_800AB9C @@ -6870,15 +6870,15 @@ _081193F0: lsls r1, 1 cmp r0, r1 bne _08119414 - ldr r0, _0811940C @ =gUnknown_2021D18 + ldr r0, _0811940C @ =gStringVar4 ldr r1, _08119410 @ =gUnknown_8458DE8 bl StringCopy b _0811944A .align 2, 0 -_0811940C: .4byte gUnknown_2021D18 +_0811940C: .4byte gStringVar4 _08119410: .4byte gUnknown_8458DE8 _08119414: - ldr r4, _08119454 @ =gUnknown_2021CD0 + ldr r4, _08119454 @ =gStringVar1 bl sub_80F9800 ldrh r0, [r0, 0x8] lsls r0, 22 @@ -6889,7 +6889,7 @@ _08119414: adds r1, r0 adds r0, r4, 0 bl StringCopy - ldr r4, _0811945C @ =gUnknown_2021CF0 + ldr r4, _0811945C @ =gStringVar2 bl sub_80F9800 ldrb r1, [r0, 0xB] lsrs r1, 1 @@ -6897,19 +6897,19 @@ _08119414: movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r0, _08119460 @ =gUnknown_2021D18 + ldr r0, _08119460 @ =gStringVar4 ldr r1, _08119464 @ =gUnknown_8458DBC bl StringExpandPlaceholders _0811944A: - ldr r1, _08119460 @ =gUnknown_2021D18 + ldr r1, _08119460 @ =gStringVar4 movs r0, 0x2C bl sub_8118664 b _081198DC .align 2, 0 -_08119454: .4byte gUnknown_2021CD0 +_08119454: .4byte gStringVar1 _08119458: .4byte gUnknown_8245EE0 -_0811945C: .4byte gUnknown_2021CF0 -_08119460: .4byte gUnknown_2021D18 +_0811945C: .4byte gStringVar2 +_08119460: .4byte gStringVar4 _08119464: .4byte gUnknown_8458DBC _08119468: adds r0, r6, 0 @@ -7200,7 +7200,7 @@ _081196B4: beq _08119734 b _081198DC _081196BA: - ldr r4, _081196E4 @ =gUnknown_2021CD0 + ldr r4, _081196E4 @ =gStringVar1 ldr r1, [r6] add r1, r8 adds r1, 0x10 @@ -7219,10 +7219,10 @@ _081196BA: strh r5, [r7, 0x2] b _081198DC .align 2, 0 -_081196E4: .4byte gUnknown_2021CD0 +_081196E4: .4byte gStringVar1 _081196E8: .4byte gUnknown_8458E70 _081196EC: - ldr r4, _08119724 @ =gUnknown_2021CD0 + ldr r4, _08119724 @ =gStringVar1 ldr r1, [r6] add r1, r8 adds r1, 0x10 @@ -7235,7 +7235,7 @@ _081196EC: lsrs r1, 28 adds r0, r4, 0 bl ConvertInternationalString - ldr r0, _08119728 @ =gUnknown_2021CF0 + ldr r0, _08119728 @ =gStringVar2 ldr r1, [r6] add r1, r8 ldrb r2, [r1, 0x9] @@ -7248,12 +7248,12 @@ _081196EC: ldr r1, _08119730 @ =gUnknown_8458ED0 b _0811976A .align 2, 0 -_08119724: .4byte gUnknown_2021CD0 -_08119728: .4byte gUnknown_2021CF0 +_08119724: .4byte gStringVar1 +_08119728: .4byte gStringVar2 _0811972C: .4byte gUnknown_824F1A0 _08119730: .4byte gUnknown_8458ED0 _08119734: - ldr r4, _08119774 @ =gUnknown_2021CD0 + ldr r4, _08119774 @ =gStringVar1 ldr r1, [r6] add r1, r8 adds r1, 0x10 @@ -7266,7 +7266,7 @@ _08119734: lsrs r1, 28 adds r0, r4, 0 bl ConvertInternationalString - ldr r0, _08119778 @ =gUnknown_2021CF0 + ldr r0, _08119778 @ =gStringVar2 ldr r1, [r6] add r1, r8 ldrb r2, [r1, 0x9] @@ -7282,8 +7282,8 @@ _0811976A: bl sub_8118664 b _081198DC .align 2, 0 -_08119774: .4byte gUnknown_2021CD0 -_08119778: .4byte gUnknown_2021CF0 +_08119774: .4byte gStringVar1 +_08119778: .4byte gStringVar2 _0811977C: .4byte gUnknown_824F1A0 _08119780: .4byte gUnknown_8458F04 _08119784: @@ -7387,7 +7387,7 @@ _08119840: adds r0, 0x10 movs r2, 0x44 bl sub_80FC114 - ldr r4, _08119894 @ =gUnknown_2021CD0 + ldr r4, _08119894 @ =gStringVar1 movs r2, 0x2 ldrsh r0, [r7, r2] lsls r0, 5 @@ -7413,12 +7413,12 @@ _08119840: b _081198DA .align 2, 0 _08119890: .4byte gUnknown_203B058 -_08119894: .4byte gUnknown_2021CD0 +_08119894: .4byte gStringVar1 _08119898: .4byte gUnknown_8457A34 _0811989C: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _081198C4 @ =gUnknown_2021D18 + ldr r1, _081198C4 @ =gStringVar4 bl sub_811A0F8 lsls r0, 24 cmp r0, 0 @@ -7434,11 +7434,11 @@ _0811989C: movs r0, 0x4 b _081198DA .align 2, 0 -_081198C4: .4byte gUnknown_2021D18 +_081198C4: .4byte gStringVar4 _081198C8: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _081198E8 @ =gUnknown_2021D18 + ldr r1, _081198E8 @ =gStringVar4 bl sub_811A0F8 lsls r0, 24 cmp r0, 0 @@ -7454,7 +7454,7 @@ _081198DC: pop {r0} bx r0 .align 2, 0 -_081198E8: .4byte gUnknown_2021D18 +_081198E8: .4byte gStringVar4 thumb_func_end sub_81186E0 thumb_func_start var_800D_set_xB @@ -7518,7 +7518,7 @@ sub_8119944: @ 8119944 ldrh r0, [r5] cmp r0, 0 beq _08119994 - ldr r0, _08119978 @ =gUnknown_2021D18 + ldr r0, _08119978 @ =gStringVar4 ldr r1, _0811997C @ =gUnknown_202273C adds r1, 0x2F ldrb r1, [r1] @@ -7537,7 +7537,7 @@ sub_8119944: @ 8119944 movs r0, 0 b _08119996 .align 2, 0 -_08119978: .4byte gUnknown_2021D18 +_08119978: .4byte gStringVar4 _0811997C: .4byte gUnknown_202273C _08119980: .4byte gUnknown_203B058 _08119984: @@ -7775,7 +7775,7 @@ sp182_move_string: @ 8119B68 .align 2, 0 _08119B78: .4byte gUnknown_203B04C _08119B7C: - ldr r0, _08119B90 @ =gUnknown_2021CD0 + ldr r0, _08119B90 @ =gStringVar1 adds r1, r4, 0 bl StringCopy movs r0, 0xFF @@ -7786,7 +7786,7 @@ _08119B8A: pop {r1} bx r1 .align 2, 0 -_08119B90: .4byte gUnknown_2021CD0 +_08119B90: .4byte gStringVar1 thumb_func_end sp182_move_string thumb_func_start sub_8119B94 @@ -8486,7 +8486,7 @@ sub_811A0B4: @ 811A0B4 movs r0, 0 movs r1, 0x1 bl sub_80F6EE4 - ldr r0, _0811A0DC @ =gUnknown_2021D18 + ldr r0, _0811A0DC @ =gStringVar4 adds r1, r4, 0 bl StringExpandPlaceholders movs r0, 0 @@ -8497,7 +8497,7 @@ sub_811A0B4: @ 811A0B4 pop {r1} bx r1 .align 2, 0 -_0811A0DC: .4byte gUnknown_2021D18 +_0811A0DC: .4byte gStringVar4 thumb_func_end sub_811A0B4 thumb_func_start sub_811A0E0 @@ -8532,7 +8532,7 @@ _0811A10A: movs r0, 0 movs r1, 0x1 bl sub_80F6EE4 - ldr r0, _0811A12C @ =gUnknown_2021D18 + ldr r0, _0811A12C @ =gStringVar4 adds r1, r5, 0 bl StringExpandPlaceholders movs r0, 0x1 @@ -8542,7 +8542,7 @@ _0811A10A: strb r0, [r4] b _0811A142 .align 2, 0 -_0811A12C: .4byte gUnknown_2021D18 +_0811A12C: .4byte gStringVar4 _0811A130: bl sub_80F6CBC lsls r0, 16 @@ -8882,7 +8882,7 @@ _0811A3AC: b _0811A3EA _0811A3E0: movs r0, 0x7 - bl sub_80722CC + bl PlaySE _0811A3E6: movs r0, 0x1 negs r0, r0 @@ -8962,7 +8962,7 @@ sub_811A444: @ 811A444 negs r0, r0 ands r0, r1 strb r0, [r2, 0xC] - ldr r2, _0811A490 @ =gUnknown_3003E50 + ldr r2, _0811A490 @ =gTextFlags ldrb r1, [r2] movs r0, 0x3 negs r0, r0 @@ -8978,7 +8978,7 @@ _0811A486: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811A490: .4byte gUnknown_3003E50 +_0811A490: .4byte gTextFlags _0811A494: .4byte _0811A498 .align 2, 0 _0811A498: @@ -9495,7 +9495,7 @@ sub_811A81C: @ 811A81C mov r10, r3 lsls r1, 24 lsrs r1, 24 - ldr r0, _0811A904 @ =gUnknown_2021D18 + ldr r0, _0811A904 @ =gStringVar4 mov r8, r0 adds r1, 0x1 movs r2, 0x2 @@ -9581,7 +9581,7 @@ _0811A8F2: pop {r0} bx r0 .align 2, 0 -_0811A904: .4byte gUnknown_2021D18 +_0811A904: .4byte gStringVar4 _0811A908: .4byte gUnknown_84571B0 _0811A90C: .4byte gUnknown_84571B4 thumb_func_end sub_811A81C @@ -9636,7 +9636,7 @@ sub_811A910: @ 811A910 movs r2, 0x2 movs r3, 0x5 bl ConvertIntToDecimalStringN - ldr r4, _0811A9B0 @ =gUnknown_2021D18 + ldr r4, _0811A9B0 @ =gStringVar4 ldr r1, _0811A9B4 @ =gUnknown_84571B4 adds r0, r4, 0 bl StringCopy @@ -9663,7 +9663,7 @@ _0811A9A2: pop {r0} bx r0 .align 2, 0 -_0811A9B0: .4byte gUnknown_2021D18 +_0811A9B0: .4byte gStringVar4 _0811A9B4: .4byte gUnknown_84571B4 thumb_func_end sub_811A910 @@ -9776,7 +9776,7 @@ sub_811AA5C: @ 811AA5C bne _0811AAE4 cmp r6, 0 bne _0811AAE4 - ldr r4, _0811AAC4 @ =gUnknown_2021CD0 + ldr r4, _0811AAC4 @ =gStringVar1 adds r1, r5, 0 adds r1, 0x10 adds r0, r4, 0 @@ -9798,7 +9798,7 @@ sub_811AA5C: @ 811AA5C ands r0, r1 cmp r0, 0x45 bne _0811AAD0 - ldr r0, _0811AAC8 @ =gUnknown_2021D18 + ldr r0, _0811AAC8 @ =gStringVar4 ldr r3, _0811AACC @ =gUnknown_8457F80 lsls r1, r7, 2 lsls r2, 3 @@ -9809,8 +9809,8 @@ sub_811AA5C: @ 811AA5C movs r0, 0x2 b _0811ABD2 .align 2, 0 -_0811AAC4: .4byte gUnknown_2021CD0 -_0811AAC8: .4byte gUnknown_2021D18 +_0811AAC4: .4byte gStringVar1 +_0811AAC8: .4byte gStringVar4 _0811AACC: .4byte gUnknown_8457F80 _0811AAD0: ldr r0, _0811AAE0 @ =gUnknown_8457A34 @@ -9823,7 +9823,7 @@ _0811AAD0: .align 2, 0 _0811AAE0: .4byte gUnknown_8457A34 _0811AAE4: - ldr r4, _0811AB24 @ =gUnknown_2021CD0 + ldr r4, _0811AB24 @ =gStringVar1 adds r1, r5, 0 adds r1, 0x10 adds r0, r4, 0 @@ -9854,7 +9854,7 @@ _0811AB0A: beq _0811AB32 b _0811ABC8 .align 2, 0 -_0811AB24: .4byte gUnknown_2021CD0 +_0811AB24: .4byte gStringVar1 _0811AB28: cmp r1, 0x5 beq _0811AB78 @@ -9862,7 +9862,7 @@ _0811AB28: beq _0811AB9C b _0811ABC8 _0811AB32: - ldr r5, _0811AB50 @ =gUnknown_2021D18 + ldr r5, _0811AB50 @ =gStringVar4 ldr r4, _0811AB54 @ =gUnknown_8458758 bl Random lsls r0, 16 @@ -9876,10 +9876,10 @@ _0811AB32: ldr r1, [r1] b _0811ABB6 .align 2, 0 -_0811AB50: .4byte gUnknown_2021D18 +_0811AB50: .4byte gStringVar4 _0811AB54: .4byte gUnknown_8458758 _0811AB58: - ldr r5, _0811AB70 @ =gUnknown_2021D18 + ldr r5, _0811AB70 @ =gStringVar4 ldr r4, _0811AB74 @ =gUnknown_8458A78 bl Random lsls r0, 16 @@ -9890,10 +9890,10 @@ _0811AB58: lsls r1, r7, 4 b _0811ABB0 .align 2, 0 -_0811AB70: .4byte gUnknown_2021D18 +_0811AB70: .4byte gStringVar4 _0811AB74: .4byte gUnknown_8458A78 _0811AB78: - ldr r5, _0811AB94 @ =gUnknown_2021D18 + ldr r5, _0811AB94 @ =gStringVar4 ldr r4, _0811AB98 @ =gUnknown_84588BC bl Random lsls r0, 16 @@ -9907,10 +9907,10 @@ _0811AB78: ldr r1, [r1] b _0811ABB6 .align 2, 0 -_0811AB94: .4byte gUnknown_2021D18 +_0811AB94: .4byte gStringVar4 _0811AB98: .4byte gUnknown_84588BC _0811AB9C: - ldr r5, _0811ABC0 @ =gUnknown_2021D18 + ldr r5, _0811ABC0 @ =gStringVar4 ldr r4, _0811ABC4 @ =gUnknown_84589AC bl Random lsls r0, 16 @@ -9928,10 +9928,10 @@ _0811ABB6: bl StringExpandPlaceholders b _0811ABD0 .align 2, 0 -_0811ABC0: .4byte gUnknown_2021D18 +_0811ABC0: .4byte gStringVar4 _0811ABC4: .4byte gUnknown_84589AC _0811ABC8: - ldr r0, _0811ABD8 @ =gUnknown_2021D18 + ldr r0, _0811ABD8 @ =gStringVar4 ldr r1, _0811ABDC @ =gUnknown_8457F90 bl StringExpandPlaceholders _0811ABD0: @@ -9941,7 +9941,7 @@ _0811ABD2: pop {r1} bx r1 .align 2, 0 -_0811ABD8: .4byte gUnknown_2021D18 +_0811ABD8: .4byte gStringVar4 _0811ABDC: .4byte gUnknown_8457F90 thumb_func_end sub_811AA5C @@ -10019,7 +10019,7 @@ _0811AC3C: movs r0, 0x2 add r1, sp, 0x8 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth lsls r0, 16 lsrs r0, 16 movs r3, 0xDA @@ -11025,7 +11025,7 @@ sub_811B31C: @ 811B31C ldr r1, _0811B4BC @ =gUnknown_84594C4 adds r0, r4, 0 bl UnkTextUtil_StringExpandPlaceholders - ldr r0, _0811B4C0 @ =gUnknown_2021D18 + ldr r0, _0811B4C0 @ =gStringVar4 adds r1, r4, 0 bl StringCopy mov r0, r8 @@ -11093,7 +11093,7 @@ _0811B45E: ldr r1, _0811B4C8 @ =gUnknown_8459504 adds r0, r4, 0 bl UnkTextUtil_StringExpandPlaceholders - ldr r5, _0811B4C0 @ =gUnknown_2021D18 + ldr r5, _0811B4C0 @ =gStringVar4 adds r0, r5, 0 adds r1, r4, 0 bl StringAppend @@ -11112,7 +11112,7 @@ _0811B4B0: .4byte gUnknown_2039624 _0811B4B4: .4byte gUnknown_823E558 _0811B4B8: .4byte gUnknown_84594B0 _0811B4BC: .4byte gUnknown_84594C4 -_0811B4C0: .4byte gUnknown_2021D18 +_0811B4C0: .4byte gStringVar4 _0811B4C4: .4byte 0x0000270f _0811B4C8: .4byte gUnknown_8459504 _0811B4CC: .4byte gUnknown_8459588 diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s index 2b3b13400..2723ad418 100644 --- a/asm/link_rfu_4.s +++ b/asm/link_rfu_4.s @@ -144,7 +144,7 @@ sub_8142504: @ 8142504 push {r4,lr} sub sp, 0x14 adds r1, r0, 0 - ldr r4, _08142558 @ =gUnknown_2021D18 + ldr r4, _08142558 @ =gStringVar4 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x1 @@ -177,7 +177,7 @@ sub_8142504: @ 8142504 pop {r0} bx r0 .align 2, 0 -_08142558: .4byte gUnknown_2021D18 +_08142558: .4byte gStringVar4 _0814255C: .4byte gUnknown_8466EF0 thumb_func_end sub_8142504 @@ -432,7 +432,7 @@ _08142718: lsls r2, 29 lsrs r2, 29 movs r0, 0x2 - bl sub_8005ED4 + bl GetStringWidth cmp r0, r6 bls _08142732 adds r6, r0, 0 @@ -517,14 +517,14 @@ _081427BE: _081427C8: b _081428E6 _081427CA: - ldr r0, _081427D8 @ =gUnknown_2021D18 + ldr r0, _081427D8 @ =gStringVar4 bl StringExpandPlaceholders cmp r6, 0 bne _081427E0 ldr r0, _081427DC @ =gUnknown_8466D90 b _081427E2 .align 2, 0 -_081427D8: .4byte gUnknown_2021D18 +_081427D8: .4byte gStringVar4 _081427DC: .4byte gUnknown_8466D90 _081427E0: ldr r0, _08142828 @ =gUnknown_8466D98 @@ -542,7 +542,7 @@ _081427E2: ldr r1, _0814282C @ =gUnknown_8466EF0 str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _08142830 @ =gUnknown_2021D18 + ldr r1, _08142830 @ =gStringVar4 str r1, [sp, 0x10] movs r1, 0x2 movs r3, 0x2 @@ -560,7 +560,7 @@ _081427E2: .align 2, 0 _08142828: .4byte gUnknown_8466D98 _0814282C: .4byte gUnknown_8466EF0 -_08142830: .4byte gUnknown_2021D18 +_08142830: .4byte gStringVar4 _08142834: ldr r0, _08142850 @ =gUnknown_8466DB0 ldr r1, [r0, 0x4] @@ -676,15 +676,15 @@ _08142912: _08142914: cmp r2, 0 bne _0814292C - ldr r0, _08142924 @ =gUnknown_2021D18 + ldr r0, _08142924 @ =gStringVar4 ldr r1, _08142928 @ =gUnknown_841EA86 bl StringExpandPlaceholders b _08142934 .align 2, 0 -_08142924: .4byte gUnknown_2021D18 +_08142924: .4byte gStringVar4 _08142928: .4byte gUnknown_841EA86 _0814292C: - ldr r0, _08142984 @ =gUnknown_2021D18 + ldr r0, _08142984 @ =gStringVar4 ldr r1, _08142988 @ =gUnknown_841EAB7 bl StringExpandPlaceholders _08142934: @@ -703,7 +703,7 @@ _08142934: ldr r1, _08142990 @ =gUnknown_8466EF0 str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _08142984 @ =gUnknown_2021D18 + ldr r1, _08142984 @ =gStringVar4 str r1, [sp, 0x10] movs r1, 0x2 movs r3, 0x2 @@ -722,7 +722,7 @@ _08142934: strb r0, [r6] b _08142A38 .align 2, 0 -_08142984: .4byte gUnknown_2021D18 +_08142984: .4byte gStringVar4 _08142988: .4byte gUnknown_841EAB7 _0814298C: .4byte gUnknown_8466DA0 _08142990: .4byte gUnknown_8466EF0 @@ -1602,12 +1602,12 @@ _08143052: movs r0, 0 b _0814359E _08143058: - ldr r0, _08143074 @ =gUnknown_2021CD0 + ldr r0, _08143074 @ =gStringVar1 movs r1, 0xFF strb r1, [r0] - ldr r0, _08143078 @ =gUnknown_2021CF0 + ldr r0, _08143078 @ =gStringVar2 strb r1, [r0] - ldr r0, _0814307C @ =gUnknown_2021D04 + ldr r0, _0814307C @ =gStringVar3 strb r1, [r0] ldrb r0, [r5, 0xC] cmp r0, 0 @@ -1616,9 +1616,9 @@ _08143058: beq _0814309A b _081430B2 .align 2, 0 -_08143074: .4byte gUnknown_2021CD0 -_08143078: .4byte gUnknown_2021CF0 -_0814307C: .4byte gUnknown_2021D04 +_08143074: .4byte gStringVar1 +_08143078: .4byte gStringVar2 +_0814307C: .4byte gStringVar3 _08143080: ldrb r0, [r5, 0xD] cmp r0, 0x1 @@ -1730,12 +1730,12 @@ _08143156: _0814315C: movs r0, 0xB strb r0, [r5, 0x8] - ldr r0, _0814316C @ =gUnknown_2021CD0 + ldr r0, _0814316C @ =gStringVar1 ldr r1, _08143170 @ =gUnknown_2022744 bl StringCopy b _081435C6 .align 2, 0 -_0814316C: .4byte gUnknown_2021CD0 +_0814316C: .4byte gStringVar1 _08143170: .4byte gUnknown_2022744 _08143174: adds r4, r5, 0 @@ -1846,7 +1846,7 @@ _08143242: ldrb r0, [r5, 0xD] cmp r0, 0x1 bne _08143250 - ldr r0, _0814325C @ =gUnknown_2021CD0 + ldr r0, _0814325C @ =gStringVar1 ldr r1, _08143260 @ =gUnknown_2022744 bl StringCopy _08143250: @@ -1855,7 +1855,7 @@ _08143250: b _081435C6 .align 2, 0 _08143258: .4byte gUnknown_841E7A3 -_0814325C: .4byte gUnknown_2021CD0 +_0814325C: .4byte gStringVar1 _08143260: .4byte gUnknown_2022744 _08143264: ldrb r1, [r5, 0xC] @@ -2187,12 +2187,12 @@ _081434C4: .align 2, 0 _081434CC: .4byte gUnknown_20370D0 _081434D0: - ldr r0, _081434F0 @ =gUnknown_2021CD0 + ldr r0, _081434F0 @ =gStringVar1 movs r1, 0xFF strb r1, [r0] - ldr r0, _081434F4 @ =gUnknown_2021CF0 + ldr r0, _081434F4 @ =gStringVar2 strb r1, [r0] - ldr r0, _081434F8 @ =gUnknown_2021D04 + ldr r0, _081434F8 @ =gStringVar3 strb r1, [r0] ldrb r0, [r5, 0xC] cmp r0, 0 @@ -2202,9 +2202,9 @@ _081434D0: bl sub_8144F40 b _0814350A .align 2, 0 -_081434F0: .4byte gUnknown_2021CD0 -_081434F4: .4byte gUnknown_2021CF0 -_081434F8: .4byte gUnknown_2021D04 +_081434F0: .4byte gStringVar1 +_081434F4: .4byte gStringVar2 +_081434F8: .4byte gStringVar3 _081434FC: .4byte gUnknown_841EAE7 _08143500: ldr r0, _08143510 @ =gUnknown_841EB01 @@ -2228,14 +2228,14 @@ _08143514: b _081435C6 _08143528: bl task_add_05_task_del_08FA224_when_no_RfuFunc - ldr r0, _0814353C @ =gUnknown_2021CD0 + ldr r0, _0814353C @ =gStringVar1 ldr r1, _08143540 @ =gUnknown_2022760 bl StringCopy movs r0, 0x22 strb r0, [r5, 0x8] b _081435C6 .align 2, 0 -_0814353C: .4byte gUnknown_2021CD0 +_0814353C: .4byte gStringVar1 _08143540: .4byte gUnknown_2022760 _08143544: bl sub_80FA4F8 diff --git a/asm/list_menu.s b/asm/list_menu.s index f72f1d81a..80c40423e 100644 --- a/asm/list_menu.s +++ b/asm/list_menu.s @@ -1642,7 +1642,7 @@ sub_8107AEC: @ 8107AEC cmp r1, 0 bne _08107AFA movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08107AFA: pop {r0} bx r0 diff --git a/asm/mail.s b/asm/mail.s index 0944f93d2..86681e330 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -838,7 +838,7 @@ _080BF2CE: movs r0, 0x1 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth mov r9, r0 ldr r5, _080BF348 @ =gUnknown_20399C4 ldr r0, [r5] diff --git a/asm/mailbox_pc.s b/asm/mailbox_pc.s index 09fbd313b..d2933aa8b 100644 --- a/asm/mailbox_pc.s +++ b/asm/mailbox_pc.s @@ -278,7 +278,7 @@ sub_810ED6C: @ 810ED6C cmp r1, 0x1 beq _0810ED7C movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0810ED7C: pop {r0} bx r0 diff --git a/asm/main_menu.s b/asm/main_menu.s index b772ffe88..9bcf07957 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -1110,7 +1110,7 @@ _0800CC34: cmp r1, 0 beq _0800CC58 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -1226,7 +1226,7 @@ sub_800CCF8: @ 800CCF8 cmp r5, 0 beq _0800CD44 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_8009480 movs r0, 0x1 negs r0, r0 @@ -1253,7 +1253,7 @@ _0800CD44: cmp r0, 0 beq _0800CD8C movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 str r5, [sp] diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s index 64836a40e..ea2b2bc59 100644 --- a/asm/map_name_popup.s +++ b/asm/map_name_popup.s @@ -408,7 +408,7 @@ _08098434: negs r2, r2 movs r0, 0x2 add r1, sp, 0xC - bl sub_8005ED4 + bl GetStringWidth adds r4, r0, 0 subs r4, r5, r4 lsrs r4, 1 diff --git a/asm/map_preview_screen.s b/asm/map_preview_screen.s index 345118304..7a619348b 100644 --- a/asm/map_preview_screen.s +++ b/asm/map_preview_screen.s @@ -319,7 +319,7 @@ sub_80F8318: @ 80F8318 strb r0, [r1, 0x1] movs r0, 0x3 strb r0, [r1, 0x2] - ldr r5, _080F83AC @ =gUnknown_2021D18 + ldr r5, _080F83AC @ =gStringVar4 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0 @@ -327,7 +327,7 @@ sub_80F8318: @ 80F8318 movs r0, 0x2 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0x68 subs r2, r0 lsrs r2, 1 @@ -356,7 +356,7 @@ sub_80F8318: @ 80F8318 bx r1 .align 2, 0 _080F83A8: .4byte gUnknown_843EBA8 -_080F83AC: .4byte gUnknown_2021D18 +_080F83AC: .4byte gStringVar4 thumb_func_end sub_80F8318 thumb_func_start sub_80F83B0 diff --git a/asm/menu.s b/asm/menu.s index e2e8fd6ea..9408278bd 100644 --- a/asm/menu.s +++ b/asm/menu.s @@ -1025,7 +1025,7 @@ sub_810F5E8: @ 810F5E8 movs r0, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth ldrb r1, [r4] movs r3, 0x14 negs r3, r3 @@ -1102,7 +1102,7 @@ _0810F684: movs r0, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth ldrb r1, [r4] movs r3, 0x14 negs r3, r3 @@ -1519,7 +1519,7 @@ ProcessMenuInput: @ 810F998 cmp r0, 0 bne _0810F9B4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0810F9B4: movs r0, 0x2 ldrsb r0, [r4, r0] @@ -1541,7 +1541,7 @@ _0810F9D2: cmp r0, 0 beq _0810F9E6 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 b _0810F9F6 @@ -1551,7 +1551,7 @@ _0810F9E6: cmp r0, 0 beq _0810F9FA movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 _0810F9F6: bl MoveMenuCursor @@ -1580,7 +1580,7 @@ ProcessMenuInputNoWrapAround: @ 810FA04 cmp r0, 0 bne _0810FA24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0810FA24: movs r0, 0x2 ldrsb r0, [r4, r0] @@ -1622,7 +1622,7 @@ _0810FA5C: beq _0810FA78 _0810FA72: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0810FA78: movs r0, 0x2 negs r0, r0 @@ -1646,7 +1646,7 @@ ProcessMenuInput_other: @ 810FA84 cmp r0, 0 bne _0810FAA0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0810FAA0: movs r0, 0x2 ldrsb r0, [r4, r0] @@ -1669,7 +1669,7 @@ _0810FABE: cmp r1, 0x40 bne _0810FAD4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 b _0810FAE0 @@ -1677,7 +1677,7 @@ _0810FAD4: cmp r1, 0x80 bne _0810FAE4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 _0810FAE0: bl MoveMenuCursor @@ -1706,7 +1706,7 @@ ProcessMenuInputNoWrapAround_other: @ 810FAF0 cmp r0, 0 bne _0810FB10 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0810FB10: movs r0, 0x2 ldrsb r0, [r4, r0] @@ -1747,7 +1747,7 @@ _0810FB4A: beq _0810FB62 _0810FB5C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0810FB62: movs r0, 0x2 negs r0, r0 @@ -3102,7 +3102,7 @@ sub_81105A0: @ 81105A0 cmp r0, 0 beq _081105C8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _081105C4 @ =gUnknown_203ADE4 ldrb r0, [r0, 0x2] lsls r0, 24 @@ -3125,7 +3125,7 @@ _081105D6: cmp r0, 0 beq _081105EC movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -3136,7 +3136,7 @@ _081105EC: cmp r0, 0 beq _08110600 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 movs r1, 0x1 b _08110640 @@ -3152,7 +3152,7 @@ _08110600: bne _08110620 _08110614: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 b _0811063E @@ -3169,7 +3169,7 @@ _08110620: bne _08110644 _08110636: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 _0811063E: movs r1, 0 @@ -3196,7 +3196,7 @@ sub_8110650: @ 8110650 cmp r0, 0 beq _08110678 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x2 ldrsb r0, [r5, r0] b _081106EE @@ -3264,7 +3264,7 @@ _081106D8: cmp r4, r0 beq _081106EA movs r0, 0x5 - bl sub_80722CC + bl PlaySE _081106EA: movs r0, 0x2 negs r0, r0 @@ -3284,7 +3284,7 @@ sub_81106F4: @ 81106F4 cmp r0, 0 beq _0811071C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08110718 @ =gUnknown_203ADE4 ldrb r0, [r0, 0x2] lsls r0, 24 @@ -3309,7 +3309,7 @@ _0811072A: cmp r1, 0x40 bne _08110744 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -3318,7 +3318,7 @@ _08110744: cmp r1, 0x80 bne _08110754 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 movs r1, 0x1 b _08110790 @@ -3332,7 +3332,7 @@ _08110754: bne _08110770 _08110764: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 b _0811078E @@ -3349,7 +3349,7 @@ _08110770: bne _08110794 _08110786: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 _0811078E: movs r1, 0 @@ -3376,7 +3376,7 @@ sub_81107A0: @ 81107A0 cmp r0, 0 beq _081107C8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x2 ldrsb r0, [r6, r0] b _0811083A @@ -3442,7 +3442,7 @@ _08110824: cmp r4, r0 beq _08110836 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08110836: movs r0, 0x2 negs r0, r0 diff --git a/asm/menu2.s b/asm/menu2.s index d74f48ea2..7a68a7cff 100644 --- a/asm/menu2.s +++ b/asm/menu2.s @@ -249,7 +249,7 @@ sub_812E6DC: @ 812E6DC ldr r0, _0812E734 @ =gSaveBlock2Ptr ldr r2, [r0] ldrb r0, [r2] - ldr r7, _0812E738 @ =gUnknown_2021D18 + ldr r7, _0812E738 @ =gStringVar4 cmp r0, 0xFF beq _0812E70A _0812E700: @@ -279,7 +279,7 @@ _0812E70A: b _0812E75C .align 2, 0 _0812E734: .4byte gSaveBlock2Ptr -_0812E738: .4byte gUnknown_2021D18 +_0812E738: .4byte gStringVar4 _0812E73C: lsls r3, r5, 24 lsrs r3, 24 diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 4fc93136e..a1ff12456 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -32,7 +32,7 @@ DisplayMessageAndContinueTask: @ 80BF474 adds r0, r6, 0 movs r1, 0x1 bl sub_810EDC4 - ldr r4, _080BF504 @ =gUnknown_2021D18 + ldr r4, _080BF504 @ =gStringVar4 ldr r0, [sp, 0x30] cmp r0, r4 beq _080BF4B8 @@ -40,7 +40,7 @@ DisplayMessageAndContinueTask: @ 80BF474 ldr r1, [sp, 0x30] bl StringExpandPlaceholders _080BF4B8: - ldr r2, _080BF508 @ =gUnknown_3003E50 + ldr r2, _080BF508 @ =gTextFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -77,8 +77,8 @@ _080BF4B8: bx r0 .align 2, 0 _080BF500: .4byte gUnknown_20399D0 -_080BF504: .4byte gUnknown_2021D18 -_080BF508: .4byte gUnknown_3003E50 +_080BF504: .4byte gStringVar4 +_080BF508: .4byte gTextFlags _080BF50C: .4byte gUnknown_20399CC _080BF510: .4byte gUnknown_3005090 _080BF514: .4byte Task_ContinueTaskAfterMessagePrints @@ -147,7 +147,7 @@ _080BF580: b _080BF5C0 _080BF586: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _080BF5A0 @ =gUnknown_3005090 lsls r0, r4, 2 adds r0, r4 @@ -162,7 +162,7 @@ _080BF5A0: .4byte gUnknown_3005090 _080BF5A4: .4byte gUnknown_20399C8 _080BF5A8: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _080BF5C8 @ =gUnknown_3005090 lsls r0, r4, 2 adds r0, r4 @@ -598,7 +598,7 @@ _080BF8CA: cmp r1, r0 beq _080BF8DA movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 b _080BF8DC _080BF8DA: diff --git a/asm/mevent.s b/asm/mevent.s index e4601686e..b1d7166fd 100644 --- a/asm/mevent.s +++ b/asm/mevent.s @@ -286,7 +286,7 @@ _081437F8: cmp r0, 0x2 bne _08143814 movs r0, 0x42 - bl sub_80722CC + bl PlaySE bl sub_800A5BC movs r0, 0 strh r0, [r5] @@ -566,7 +566,7 @@ _08143A48: adds r0, r4, 0 bl sub_81438E8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE b _08143BE6 .align 2, 0 _08143A58: .4byte gMain @@ -578,7 +578,7 @@ _08143A5C: cmp r0, 0 beq _08143A80 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_80098B8 adds r0, r4, 0 bl sub_81438E8 @@ -602,7 +602,7 @@ _08143A9C: cmp r0, 0 beq _08143ABA movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_80098B8 adds r0, r4, 0 bl sub_81438E8 @@ -744,7 +744,7 @@ _08143BCC: _08143BD8: .4byte gUnknown_841DE95 _08143BDC: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_80098B8 _08143BE6: movs r0, 0x17 diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index 12ddb1f2c..d54d9ecac 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -934,7 +934,7 @@ _08145D70: lsrs r2, 24 movs r0, 0x3 adds r1, r4, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0xA0 subs r1, r0 cmp r1, 0 @@ -1187,7 +1187,7 @@ _08145F6E: adds r1, 0x1 movs r0, 0x3 mov r2, r10 - bl sub_8005ED4 + bl GetStringWidth add r8, r0 mov r0, r8 lsls r2, r0, 24 @@ -1219,7 +1219,7 @@ _08145F6E: adds r1, 0x2A movs r0, 0x3 mov r2, r10 - bl sub_8005ED4 + bl GetStringWidth ldr r1, [r7] adds r1, r5 movs r2, 0xB7 @@ -2517,7 +2517,7 @@ sub_8146A30: @ 8146A30 lsrs r2, 24 movs r0, 0x3 adds r1, r4, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0xE0 subs r1, r0 lsrs r0, r1, 31 diff --git a/asm/mon_markings.s b/asm/mon_markings.s index 3fda2b00a..ecc50195a 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -350,7 +350,7 @@ sub_80BE6F0: @ 80BE6F0 cmp r5, 0 beq _080BE728 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _080BE724 @ =gUnknown_20399C0 ldr r1, [r2] ldrb r0, [r1, 0x5] @@ -374,7 +374,7 @@ _080BE728: cmp r4, 0 beq _080BE758 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _080BE754 @ =gUnknown_20399C0 ldr r1, [r2] ldrb r0, [r1, 0x5] @@ -395,7 +395,7 @@ _080BE758: cmp r0, 0 beq _080BE7B4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _080BE788 @ =gUnknown_20399C0 ldr r0, [r2] movs r1, 0x5 @@ -444,7 +444,7 @@ _080BE7B4: cmp r0, 0 beq _080BE7B0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _080BE7C2: movs r0, 0 _080BE7C4: diff --git a/asm/money.s b/asm/money.s index b841870e8..05ef6ac98 100644 --- a/asm/money.s +++ b/asm/money.s @@ -148,7 +148,7 @@ sub_809FE40: @ 809FE40 lsrs r6, r0, 24 lsls r2, 24 lsrs r5, r2, 24 - ldr r4, _0809FEB8 @ =gUnknown_2021CD0 + ldr r4, _0809FEB8 @ =gStringVar1 adds r0, r4, 0 movs r2, 0 movs r3, 0x6 @@ -159,7 +159,7 @@ sub_809FE40: @ 809FE40 lsrs r0, 16 movs r1, 0x6 subs r1, r0 - ldr r2, _0809FEBC @ =gUnknown_2021D18 + ldr r2, _0809FEBC @ =gStringVar4 adds r0, r1, 0 subs r1, 0x1 cmp r0, 0 @@ -176,11 +176,11 @@ _0809FE7E: ldr r1, _0809FEC0 @ =gUnknown_841697A adds r0, r2, 0 bl StringExpandPlaceholders - ldr r4, _0809FEBC @ =gUnknown_2021D18 + ldr r4, _0809FEBC @ =gStringVar4 movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r3, 0x40 subs r3, r0 lsls r3, 24 @@ -199,8 +199,8 @@ _0809FE7E: pop {r0} bx r0 .align 2, 0 -_0809FEB8: .4byte gUnknown_2021CD0 -_0809FEBC: .4byte gUnknown_2021D18 +_0809FEB8: .4byte gStringVar1 +_0809FEBC: .4byte gStringVar4 _0809FEC0: .4byte gUnknown_841697A thumb_func_end sub_809FE40 @@ -220,7 +220,7 @@ sub_809FEC4: @ 809FEC4 lsrs r6, r2, 24 lsls r4, 24 lsrs r5, r4, 24 - ldr r4, _0809FF3C @ =gUnknown_2021CD0 + ldr r4, _0809FF3C @ =gStringVar1 adds r0, r4, 0 adds r1, r3, 0 movs r2, 0 @@ -232,7 +232,7 @@ sub_809FEC4: @ 809FEC4 lsrs r0, 16 movs r1, 0x6 subs r1, r0 - ldr r2, _0809FF40 @ =gUnknown_2021D18 + ldr r2, _0809FF40 @ =gStringVar4 adds r0, r1, 0 subs r1, 0x1 cmp r0, 0 @@ -249,7 +249,7 @@ _0809FF14: ldr r1, _0809FF44 @ =gUnknown_841697A adds r0, r2, 0 bl StringExpandPlaceholders - ldr r2, _0809FF40 @ =gUnknown_2021D18 + ldr r2, _0809FF40 @ =gStringVar4 str r6, [sp] str r5, [sp, 0x4] movs r0, 0 @@ -265,8 +265,8 @@ _0809FF14: pop {r0} bx r0 .align 2, 0 -_0809FF3C: .4byte gUnknown_2021CD0 -_0809FF40: .4byte gUnknown_2021D18 +_0809FF3C: .4byte gStringVar1 +_0809FF40: .4byte gStringVar4 _0809FF44: .4byte gUnknown_841697A thumb_func_end sub_809FEC4 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index bce444d9b..f22b818e8 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -38,7 +38,7 @@ _080DA82A: thumb_func_start SetIncompatible SetIncompatible: @ 80DA830 push {lr} - ldr r0, _080DA844 @ =gUnknown_2021D18 + ldr r0, _080DA844 @ =gStringVar4 ldr r1, _080DA848 @ =gUnknown_8488DFD bl StringExpandPlaceholders movs r0, 0x3 @@ -46,7 +46,7 @@ SetIncompatible: @ 80DA830 pop {r0} bx r0 .align 2, 0 -_080DA844: .4byte gUnknown_2021D18 +_080DA844: .4byte gStringVar4 _080DA848: .4byte gUnknown_8488DFD thumb_func_end SetIncompatible @@ -233,7 +233,7 @@ MEScrCmd_setmsg: @ 80DA964 cmp r5, r0 bne _080DA98E _080DA988: - ldr r0, _080DA998 @ =gUnknown_2021D18 + ldr r0, _080DA998 @ =gStringVar4 bl StringExpandPlaceholders _080DA98E: movs r0, 0 @@ -241,7 +241,7 @@ _080DA98E: pop {r1} bx r1 .align 2, 0 -_080DA998: .4byte gUnknown_2021D18 +_080DA998: .4byte gStringVar4 thumb_func_end MEScrCmd_setmsg thumb_func_start MEScrCmd_runscript @@ -276,7 +276,7 @@ MEScrCmd_setenigmaberry: @ 80DA9B8 subs r4, r0 ldr r0, [r7, 0x64] adds r4, r0 - ldr r0, _080DAA0C @ =gUnknown_2021CD0 + ldr r0, _080DAA0C @ =gStringVar1 mov r9, r0 ldr r6, _080DAA10 @ =gSaveBlock1Ptr ldr r1, [r6] @@ -286,7 +286,7 @@ MEScrCmd_setenigmaberry: @ 80DA9B8 bl StringCopyN adds r0, r4, 0 bl sub_809C7C4 - ldr r4, _080DAA18 @ =gUnknown_2021CF0 + ldr r4, _080DAA18 @ =gStringVar2 ldr r1, [r6] adds r1, r5 adds r0, r4, 0 @@ -295,15 +295,15 @@ MEScrCmd_setenigmaberry: @ 80DA9B8 mov r0, r8 cmp r0, 0 bne _080DAA24 - ldr r0, _080DAA1C @ =gUnknown_2021D18 + ldr r0, _080DAA1C @ =gStringVar4 ldr r1, _080DAA20 @ =gUnknown_8488C70 b _080DAA44 .align 2, 0 -_080DAA0C: .4byte gUnknown_2021CD0 +_080DAA0C: .4byte gStringVar1 _080DAA10: .4byte gSaveBlock1Ptr _080DAA14: .4byte 0x000030ec -_080DAA18: .4byte gUnknown_2021CF0 -_080DAA1C: .4byte gUnknown_2021D18 +_080DAA18: .4byte gStringVar2 +_080DAA1C: .4byte gStringVar4 _080DAA20: .4byte gUnknown_8488C70 _080DAA24: mov r0, r9 @@ -311,14 +311,14 @@ _080DAA24: bl StringCompare cmp r0, 0 beq _080DAA40 - ldr r0, _080DAA38 @ =gUnknown_2021D18 + ldr r0, _080DAA38 @ =gStringVar4 ldr r1, _080DAA3C @ =gUnknown_8488CA2 b _080DAA44 .align 2, 0 -_080DAA38: .4byte gUnknown_2021D18 +_080DAA38: .4byte gStringVar4 _080DAA3C: .4byte gUnknown_8488CA2 _080DAA40: - ldr r0, _080DAA60 @ =gUnknown_2021D18 + ldr r0, _080DAA60 @ =gStringVar4 ldr r1, _080DAA64 @ =gUnknown_8488CCE _080DAA44: bl StringExpandPlaceholders @@ -332,7 +332,7 @@ _080DAA44: bl VarSet b _080DAA70 .align 2, 0 -_080DAA60: .4byte gUnknown_2021D18 +_080DAA60: .4byte gStringVar4 _080DAA64: .4byte gUnknown_8488CCE _080DAA68: .4byte 0x00004033 _080DAA6C: @@ -360,7 +360,7 @@ MEScrCmd_giveribbon: @ 80DAA80 adds r2, 0x1 str r2, [r4, 0x8] bl GiveGiftRibbonToParty - ldr r0, _080DAAAC @ =gUnknown_2021D18 + ldr r0, _080DAAAC @ =gStringVar4 ldr r1, _080DAAB0 @ =gUnknown_8488CF6 bl StringExpandPlaceholders movs r0, 0x2 @@ -370,7 +370,7 @@ MEScrCmd_giveribbon: @ 80DAA80 pop {r1} bx r1 .align 2, 0 -_080DAAAC: .4byte gUnknown_2021D18 +_080DAAAC: .4byte gStringVar4 _080DAAB0: .4byte gUnknown_8488CF6 thumb_func_end MEScrCmd_giveribbon @@ -431,7 +431,7 @@ sub_80DAB1C: @ 80DAB1C push {r4,lr} adds r4, r0, 0 bl sub_806E22C - ldr r0, _080DAB38 @ =gUnknown_2021D18 + ldr r0, _080DAB38 @ =gStringVar4 ldr r1, _080DAB3C @ =gUnknown_8488D2A bl StringExpandPlaceholders movs r0, 0x2 @@ -441,7 +441,7 @@ sub_80DAB1C: @ 80DAB1C pop {r1} bx r1 .align 2, 0 -_080DAB38: .4byte gUnknown_2021D18 +_080DAB38: .4byte gStringVar4 _080DAB3C: .4byte gUnknown_8488D2A thumb_func_end sub_80DAB1C @@ -454,7 +454,7 @@ MEScrCmd_addrareword: @ 80DAB40 adds r1, 0x1 str r1, [r4, 0x8] bl sub_80BDB70 - ldr r0, _080DAB64 @ =gUnknown_2021D18 + ldr r0, _080DAB64 @ =gStringVar4 ldr r1, _080DAB68 @ =gUnknown_8488D60 bl StringExpandPlaceholders movs r0, 0x2 @@ -464,7 +464,7 @@ MEScrCmd_addrareword: @ 80DAB40 pop {r1} bx r1 .align 2, 0 -_080DAB64: .4byte gUnknown_2021D18 +_080DAB64: .4byte gStringVar4 _080DAB68: .4byte gUnknown_8488D60 thumb_func_end MEScrCmd_addrareword @@ -510,16 +510,16 @@ sub_80DAB80: @ 80DAB80 lsls r0, 1 cmp r4, r0 bne _080DABD0 - ldr r0, _080DABC8 @ =gUnknown_2021CD0 + ldr r0, _080DABC8 @ =gStringVar1 ldr r1, _080DABCC @ =gUnknown_8415A62 movs r2, 0xB bl StringCopyN b _080DABDA .align 2, 0 -_080DABC8: .4byte gUnknown_2021CD0 +_080DABC8: .4byte gStringVar1 _080DABCC: .4byte gUnknown_8415A62 _080DABD0: - ldr r0, _080DABF0 @ =gUnknown_2021CD0 + ldr r0, _080DABF0 @ =gStringVar1 ldr r1, _080DABF4 @ =gUnknown_8415A66 movs r2, 0xB bl StringCopyN @@ -528,16 +528,16 @@ _080DABDA: ldrb r0, [r0] cmp r0, 0x6 bne _080DAC04 - ldr r0, _080DABFC @ =gUnknown_2021D18 + ldr r0, _080DABFC @ =gStringVar4 ldr r1, _080DAC00 @ =gUnknown_8488D8E bl StringExpandPlaceholders movs r0, 0x3 b _080DAC6E .align 2, 0 -_080DABF0: .4byte gUnknown_2021CD0 +_080DABF0: .4byte gStringVar1 _080DABF4: .4byte gUnknown_8415A66 _080DABF8: .4byte gUnknown_2024029 -_080DABFC: .4byte gUnknown_2021D18 +_080DABFC: .4byte gStringVar4 _080DAC00: .4byte gUnknown_8488D8E _080DAC04: ldr r7, _080DAC80 @ =gUnknown_2024478 @@ -580,7 +580,7 @@ _080DAC3E: _080DAC5C: bl CompactPartySlots bl CalculatePlayerPartyCount - ldr r0, _080DAC84 @ =gUnknown_2021D18 + ldr r0, _080DAC84 @ =gStringVar4 ldr r1, _080DAC88 @ =gUnknown_8488D7C bl StringExpandPlaceholders movs r0, 0x2 @@ -595,7 +595,7 @@ _080DAC6E: bx r1 .align 2, 0 _080DAC80: .4byte gUnknown_2024478 -_080DAC84: .4byte gUnknown_2021D18 +_080DAC84: .4byte gStringVar4 _080DAC88: .4byte gUnknown_8488D7C thumb_func_end sub_80DAB80 @@ -617,7 +617,7 @@ sub_80DAC8C: @ 80DAC8C movs r2, 0xBC bl memcpy bl sub_80E7490 - ldr r0, _080DACCC @ =gUnknown_2021D18 + ldr r0, _080DACCC @ =gStringVar4 ldr r1, _080DACD0 @ =gUnknown_8488DBD bl StringExpandPlaceholders movs r0, 0x2 @@ -628,7 +628,7 @@ sub_80DAC8C: @ 80DAC8C bx r1 .align 2, 0 _080DACC8: .4byte gSaveBlock2Ptr -_080DACCC: .4byte gUnknown_2021D18 +_080DACCC: .4byte gStringVar4 _080DACD0: .4byte gUnknown_8488DBD thumb_func_end sub_80DAC8C diff --git a/asm/mystery_gift_menu.s b/asm/mystery_gift_menu.s index 2844c7e59..790c3c0b2 100644 --- a/asm/mystery_gift_menu.s +++ b/asm/mystery_gift_menu.s @@ -346,7 +346,7 @@ _08142362: movs r0, 0 adds r1, r6, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0xDE subs r2, r0 lsls r2, 24 diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 0132c1c03..ed081285c 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -891,7 +891,7 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4 lsls r0, 24 cmp r0, 0 bne _0809E104 - ldr r4, _0809E0F0 @ =gUnknown_2021CD0 + ldr r4, _0809E0F0 @ =gStringVar1 ldr r0, _0809E0F4 @ =0x00004037 bl VarGet lsls r0, 24 @@ -900,7 +900,7 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4 adds r1, r0, 0 adds r0, r4, 0 bl StringCopy - ldr r0, _0809E0F8 @ =gUnknown_2021CF0 + ldr r0, _0809E0F8 @ =gStringVar2 ldr r1, _0809E0FC @ =gUnknown_203998C ldr r1, [r1] ldr r2, _0809E100 @ =0x00001e30 @@ -909,13 +909,13 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4 bl StringCopy b _0809E144 .align 2, 0 -_0809E0F0: .4byte gUnknown_2021CD0 +_0809E0F0: .4byte gStringVar1 _0809E0F4: .4byte 0x00004037 -_0809E0F8: .4byte gUnknown_2021CF0 +_0809E0F8: .4byte gStringVar2 _0809E0FC: .4byte gUnknown_203998C _0809E100: .4byte 0x00001e30 _0809E104: - ldr r4, _0809E1AC @ =gUnknown_2021CD0 + ldr r4, _0809E1AC @ =gStringVar1 ldr r0, _0809E1B0 @ =0x00004037 bl VarGet lsls r0, 24 @@ -924,14 +924,14 @@ _0809E104: adds r1, r0, 0 adds r0, r4, 0 bl StringCopy - ldr r0, _0809E1B4 @ =gUnknown_2021CF0 + ldr r0, _0809E1B4 @ =gStringVar2 ldr r1, _0809E1B8 @ =gUnknown_203998C ldr r1, [r1] ldr r2, _0809E1BC @ =0x00001e30 adds r1, r2 ldr r1, [r1] bl StringCopy - ldr r4, _0809E1C0 @ =gUnknown_2021D04 + ldr r4, _0809E1C0 @ =gStringVar3 bl get_unknown_box_id lsls r0, 24 lsrs r0, 24 @@ -950,7 +950,7 @@ _0809E144: lsls r0, 24 lsrs r5, r0, 24 _0809E156: - ldr r4, _0809E1C8 @ =gUnknown_2021D18 + ldr r4, _0809E1C8 @ =gStringVar4 ldr r1, _0809E1CC @ =gUnknown_83E2280 lsls r0, r5, 2 adds r0, r1 @@ -960,7 +960,7 @@ _0809E156: movs r0, 0 movs r1, 0 bl sub_80F6EE4 - ldr r2, _0809E1D0 @ =gUnknown_3003E50 + ldr r2, _0809E1D0 @ =gTextFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -989,16 +989,16 @@ _0809E156: pop {r0} bx r0 .align 2, 0 -_0809E1AC: .4byte gUnknown_2021CD0 +_0809E1AC: .4byte gStringVar1 _0809E1B0: .4byte 0x00004037 -_0809E1B4: .4byte gUnknown_2021CF0 +_0809E1B4: .4byte gStringVar2 _0809E1B8: .4byte gUnknown_203998C _0809E1BC: .4byte 0x00001e30 -_0809E1C0: .4byte gUnknown_2021D04 +_0809E1C0: .4byte gStringVar3 _0809E1C4: .4byte 0x00000834 -_0809E1C8: .4byte gUnknown_2021D18 +_0809E1C8: .4byte gStringVar4 _0809E1CC: .4byte gUnknown_83E2280 -_0809E1D0: .4byte gUnknown_3003E50 +_0809E1D0: .4byte gTextFlags thumb_func_end pokemon_transfer_to_pc_with_message thumb_func_start sub_809E1D4 @@ -1046,7 +1046,7 @@ sub_809E210: @ 809E210 movs r2, 0x1 bl sub_809E518 movs r0, 0x6 - bl sub_80722CC + bl PlaySE ldr r0, _0809E248 @ =gUnknown_203998C ldr r0, [r0] ldr r1, _0809E24C @ =0x00001e10 @@ -3089,7 +3089,7 @@ KeyboardKeyHandler_OK: @ 809F1B4 b _0809F1E2 _0809F1CE: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0809F1E8 @ =gUnknown_203998C ldr r0, [r0] ldr r1, _0809F1EC @ =0x00001e10 @@ -3825,7 +3825,7 @@ _0809F740: bl sub_809E518 _0809F74A: movs r0, 0x17 - bl sub_80722CC + bl PlaySE pop {r4-r6} pop {r0} bx r0 @@ -3855,7 +3855,7 @@ sub_809F75C: @ 809F75C movs r0, 0x3 bl CopyBgTilemapBufferToVram movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_809F6BC lsls r0, 24 lsrs r0, 24 @@ -4291,7 +4291,7 @@ sub_809FAE4: @ 809FAE4 movs r0, 0 mov r1, r8 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r6, r0, 0 ldr r5, _0809FB68 @ =gUnknown_203998C ldr r0, [r5] diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s index c2ac56bd2..036da9237 100644 --- a/asm/new_menu_helpers.s +++ b/asm/new_menu_helpers.s @@ -776,7 +776,7 @@ AddTextPrinterParametrized: @ 80F6CD0 ands r1, r4 orrs r1, r6 strb r1, [r0, 0xD] - ldr r2, _080F6D58 @ =gUnknown_3003E50 + ldr r2, _080F6D58 @ =gTextFlags ldrb r1, [r2] movs r0, 0x3 negs r0, r0 @@ -795,7 +795,7 @@ AddTextPrinterParametrized: @ 80F6CD0 pop {r1} bx r1 .align 2, 0 -_080F6D58: .4byte gUnknown_3003E50 +_080F6D58: .4byte gTextFlags thumb_func_end AddTextPrinterParametrized thumb_func_start sub_80F6D5C @@ -805,7 +805,7 @@ sub_80F6D5C: @ 80F6D5C lsls r0, 24 lsrs r0, 24 movs r5, 0 - ldr r3, _080F6DA8 @ =gUnknown_3003E50 + ldr r3, _080F6DA8 @ =gTextFlags movs r4, 0x1 ands r0, r4 ldrb r2, [r3] @@ -823,7 +823,7 @@ sub_80F6D5C: @ 80F6D5C adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r2, _080F6DAC @ =gUnknown_2021D18 + ldr r2, _080F6DAC @ =gStringVar4 str r5, [sp] movs r0, 0x8 str r0, [sp, 0x4] @@ -835,8 +835,8 @@ sub_80F6D5C: @ 80F6D5C bl AddTextPrinterParametrized b _080F6DFC .align 2, 0 -_080F6DA8: .4byte gUnknown_3003E50 -_080F6DAC: .4byte gUnknown_2021D18 +_080F6DA8: .4byte gTextFlags +_080F6DAC: .4byte gStringVar4 _080F6DB0: cmp r0, 0x1 bne _080F6DDC @@ -844,7 +844,7 @@ _080F6DB0: adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r2, _080F6DD8 @ =gUnknown_2021D18 + ldr r2, _080F6DD8 @ =gStringVar4 str r5, [sp] movs r0, 0x4 str r0, [sp, 0x4] @@ -856,13 +856,13 @@ _080F6DB0: bl AddTextPrinterParametrized b _080F6DFC .align 2, 0 -_080F6DD8: .4byte gUnknown_2021D18 +_080F6DD8: .4byte gStringVar4 _080F6DDC: bl sub_80F78A8 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r2, _080F6E04 @ =gUnknown_2021D18 + ldr r2, _080F6E04 @ =gStringVar4 str r5, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -878,7 +878,7 @@ _080F6DFC: pop {r0} bx r0 .align 2, 0 -_080F6E04: .4byte gUnknown_2021D18 +_080F6E04: .4byte gStringVar4 thumb_func_end sub_80F6D5C thumb_func_start sub_80F6E08 @@ -887,7 +887,7 @@ sub_80F6E08: @ 80F6E08 sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r3, _080F6E4C @ =gUnknown_3003E50 + ldr r3, _080F6E4C @ =gTextFlags movs r4, 0x1 ands r0, r4 ldrb r2, [r3] @@ -900,7 +900,7 @@ sub_80F6E08: @ 80F6E08 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r2, _080F6E50 @ =gUnknown_2021D18 + ldr r2, _080F6E50 @ =gStringVar4 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -916,8 +916,8 @@ sub_80F6E08: @ 80F6E08 pop {r0} bx r0 .align 2, 0 -_080F6E4C: .4byte gUnknown_3003E50 -_080F6E50: .4byte gUnknown_2021D18 +_080F6E4C: .4byte gTextFlags +_080F6E50: .4byte gStringVar4 thumb_func_end sub_80F6E08 thumb_func_start sub_80F6E54 @@ -929,7 +929,7 @@ sub_80F6E54: @ 80F6E54 lsrs r0, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _080F6E94 @ =gUnknown_3003E50 + ldr r4, _080F6E94 @ =gTextFlags movs r5, 0x1 ands r0, r5 ldrb r2, [r4] @@ -938,7 +938,7 @@ sub_80F6E54: @ 80F6E54 ands r1, r2 orrs r1, r0 strb r1, [r4] - ldr r2, _080F6E98 @ =gUnknown_2021D18 + ldr r2, _080F6E98 @ =gStringVar4 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -954,8 +954,8 @@ sub_80F6E54: @ 80F6E54 pop {r0} bx r0 .align 2, 0 -_080F6E94: .4byte gUnknown_3003E50 -_080F6E98: .4byte gUnknown_2021D18 +_080F6E94: .4byte gTextFlags +_080F6E98: .4byte gStringVar4 thumb_func_end sub_80F6E54 thumb_func_start sub_80F6E9C @@ -965,7 +965,7 @@ sub_80F6E9C: @ 80F6E9C ldrb r0, [r0] cmp r0, 0x2 bne _080F6EC4 - ldr r2, _080F6EC0 @ =gUnknown_3003E50 + ldr r2, _080F6EC0 @ =gTextFlags ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 @@ -977,7 +977,7 @@ sub_80F6E9C: @ 80F6E9C b _080F6ED4 .align 2, 0 _080F6EBC: .4byte gUnknown_203ADFA -_080F6EC0: .4byte gUnknown_3003E50 +_080F6EC0: .4byte gTextFlags _080F6EC4: bl sub_80F77B8 movs r1, 0x80 @@ -2015,7 +2015,7 @@ sub_80F7768: @ 80F7768 ldrb r0, [r0] cmp r0, 0x2 bne _080F7798 - ldr r2, _080F7794 @ =gUnknown_3003E50 + ldr r2, _080F7794 @ =gTextFlags ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 @@ -2027,7 +2027,7 @@ sub_80F7768: @ 80F7768 b _080F77A4 .align 2, 0 _080F7790: .4byte gUnknown_203ADFA -_080F7794: .4byte gUnknown_3003E50 +_080F7794: .4byte gTextFlags _080F7798: movs r1, 0x80 lsls r1, 2 diff --git a/asm/oak_speech.s b/asm/oak_speech.s index a3d63741c..ddd07be67 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -491,7 +491,7 @@ _0812ED3C: ldr r1, [r1] movs r3, 0 strb r0, [r1, 0x1F] - ldr r2, _0812ED64 @ =gUnknown_3003E50 + ldr r2, _0812ED64 @ =gTextFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -504,7 +504,7 @@ _0812ED3C: b _0812EE94 .align 2, 0 _0812ED60: .4byte gUnknown_203B108 -_0812ED64: .4byte gUnknown_3003E50 +_0812ED64: .4byte gTextFlags _0812ED68: .4byte gUnknown_84605E8 _0812ED6C: bl free_temp_tile_data_buffers_if_possible @@ -961,7 +961,7 @@ _0812F120: bl BeginNormalPaletteFade _0812F150: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0812F170 @ =gUnknown_3005090 adds r1, r4, r5 lsls r1, 3 @@ -1461,7 +1461,7 @@ _0812F568: _0812F56A: strh r0, [r1, 0x12] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0812F58C @ =gUnknown_203B108 ldr r0, [r0] ldrh r0, [r0, 0x12] @@ -1856,7 +1856,7 @@ _0812F8B8: movs r1, 0 bl sub_80F6EE4 ldr r2, _0812F8F0 @ =gUnknown_81C5C78 - ldr r5, _0812F8F4 @ =gUnknown_2021D18 + ldr r5, _0812F8F4 @ =gStringVar4 cmp r2, r5 beq _0812F8FC adds r0, r5, 0 @@ -1879,7 +1879,7 @@ _0812F8B8: b _0812F918 .align 2, 0 _0812F8F0: .4byte gUnknown_81C5C78 -_0812F8F4: .4byte gUnknown_2021D18 +_0812F8F4: .4byte gStringVar4 _0812F8F8: .4byte gUnknown_203B108 _0812F8FC: ldr r0, _0812F938 @ =gUnknown_203B108 @@ -1933,7 +1933,7 @@ sub_812F944: @ 812F944 movs r1, 0 bl sub_80F6EE4 ldr r2, _0812F994 @ =gUnknown_81C5D06 - ldr r5, _0812F998 @ =gUnknown_2021D18 + ldr r5, _0812F998 @ =gStringVar4 cmp r2, r5 beq _0812F9A0 adds r0, r5, 0 @@ -1956,7 +1956,7 @@ sub_812F944: @ 812F944 b _0812F9BC .align 2, 0 _0812F994: .4byte gUnknown_81C5D06 -_0812F998: .4byte gUnknown_2021D18 +_0812F998: .4byte gStringVar4 _0812F99C: .4byte gUnknown_203B108 _0812F9A0: ldr r0, _0812F9E0 @ =gUnknown_203B108 @@ -2110,7 +2110,7 @@ _0812FAA0: movs r1, 0 bl sub_80F6EE4 ldr r2, _0812FB08 @ =gUnknown_81C5D12 - ldr r4, _0812FB0C @ =gUnknown_2021D18 + ldr r4, _0812FB0C @ =gStringVar4 cmp r2, r4 beq _0812FB14 adds r0, r4, 0 @@ -2136,7 +2136,7 @@ _0812FAFC: .4byte gUnknown_3005090 _0812FB00: .4byte sub_812FB4C _0812FB04: .4byte 0x00003fff _0812FB08: .4byte gUnknown_81C5D12 -_0812FB0C: .4byte gUnknown_2021D18 +_0812FB0C: .4byte gStringVar4 _0812FB10: .4byte gUnknown_203B108 _0812FB14: ldr r0, _0812FB48 @ =gUnknown_203B108 @@ -2184,7 +2184,7 @@ sub_812FB4C: @ 812FB4C movs r1, 0 bl sub_80F6EE4 ldr r2, _0812FB9C @ =gUnknown_81C5D4B - ldr r5, _0812FBA0 @ =gUnknown_2021D18 + ldr r5, _0812FBA0 @ =gStringVar4 cmp r2, r5 beq _0812FBA8 adds r0, r5, 0 @@ -2207,7 +2207,7 @@ sub_812FB4C: @ 812FB4C b _0812FBC4 .align 2, 0 _0812FB9C: .4byte gUnknown_81C5D4B -_0812FBA0: .4byte gUnknown_2021D18 +_0812FBA0: .4byte gStringVar4 _0812FBA4: .4byte gUnknown_203B108 _0812FBA8: ldr r0, _0812FBE4 @ =gUnknown_203B108 @@ -2374,7 +2374,7 @@ _0812FCEC: movs r1, 0 bl sub_80F6EE4 ldr r2, _0812FD24 @ =gUnknown_81C5DBD - ldr r5, _0812FD28 @ =gUnknown_2021D18 + ldr r5, _0812FD28 @ =gStringVar4 cmp r2, r5 beq _0812FD30 adds r0, r5, 0 @@ -2397,7 +2397,7 @@ _0812FCEC: b _0812FD4C .align 2, 0 _0812FD24: .4byte gUnknown_81C5DBD -_0812FD28: .4byte gUnknown_2021D18 +_0812FD28: .4byte gStringVar4 _0812FD2C: .4byte gUnknown_203B108 _0812FD30: ldr r0, _0812FD6C @ =gUnknown_203B108 @@ -2507,7 +2507,7 @@ _0812FDF0: movs r1, 0 bl sub_80F6EE4 ldr r2, _0812FE34 @ =gUnknown_81C59D5 - ldr r5, _0812FE38 @ =gUnknown_2021D18 + ldr r5, _0812FE38 @ =gStringVar4 cmp r2, r5 beq _0812FE40 adds r0, r5, 0 @@ -2530,7 +2530,7 @@ _0812FDF0: b _0812FE5C .align 2, 0 _0812FE34: .4byte gUnknown_81C59D5 -_0812FE38: .4byte gUnknown_2021D18 +_0812FE38: .4byte gStringVar4 _0812FE3C: .4byte gUnknown_203B108 _0812FE40: ldr r0, _0812FE7C @ =gUnknown_203B108 @@ -2858,7 +2858,7 @@ _081300D0: movs r1, 0 bl sub_80F6EE4 ldr r2, _0813010C @ =gUnknown_81C5DEA - ldr r5, _08130110 @ =gUnknown_2021D18 + ldr r5, _08130110 @ =gStringVar4 cmp r2, r5 beq _08130118 adds r0, r5, 0 @@ -2881,7 +2881,7 @@ _081300D0: b _08130134 .align 2, 0 _0813010C: .4byte gUnknown_81C5DEA -_08130110: .4byte gUnknown_2021D18 +_08130110: .4byte gStringVar4 _08130114: .4byte gUnknown_203B108 _08130118: ldr r0, _08130154 @ =gUnknown_203B108 @@ -3037,7 +3037,7 @@ sub_8130228: @ 8130228 movs r1, 0 bl sub_80F6EE4 ldr r2, _0813027C @ =gUnknown_81C5DEA - ldr r5, _08130280 @ =gUnknown_2021D18 + ldr r5, _08130280 @ =gStringVar4 cmp r2, r5 beq _08130284 adds r0, r5, 0 @@ -3059,7 +3059,7 @@ sub_8130228: @ 8130228 .align 2, 0 _08130278: .4byte gUnknown_203B108 _0813027C: .4byte gUnknown_81C5DEA -_08130280: .4byte gUnknown_2021D18 +_08130280: .4byte gStringVar4 _08130284: str r4, [sp] movs r0, 0x2 @@ -3082,7 +3082,7 @@ _081302A6: movs r1, 0 bl sub_80F6EE4 ldr r2, _081302DC @ =gUnknown_81C5E91 - ldr r4, _081302E0 @ =gUnknown_2021D18 + ldr r4, _081302E0 @ =gStringVar4 cmp r2, r4 beq _081302E4 adds r0, r4, 0 @@ -3104,7 +3104,7 @@ _081302A6: b _081302FE .align 2, 0 _081302DC: .4byte gUnknown_81C5E91 -_081302E0: .4byte gUnknown_2021D18 +_081302E0: .4byte gStringVar4 _081302E4: movs r0, 0 str r0, [sp] @@ -3160,7 +3160,7 @@ sub_8130324: @ 8130324 cmp r4, 0x4 bgt _081303A8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r5, 0x1A] movs r1, 0x1 bl sub_810F4D8 @@ -3186,7 +3186,7 @@ _08130380: .4byte gUnknown_203B108 _08130384: .4byte sub_8130464 _08130388: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 str r4, [sp] @@ -3316,7 +3316,7 @@ sub_8130464: @ 8130464 ldrh r0, [r0, 0x10] cmp r0, 0 bne _081304B4 - ldr r0, _081304AC @ =gUnknown_2021D18 + ldr r0, _081304AC @ =gStringVar4 ldr r1, _081304B0 @ =gUnknown_81C5E13 bl StringExpandPlaceholders b _081304BC @@ -3324,17 +3324,17 @@ sub_8130464: @ 8130464 _081304A0: .4byte gUnknown_3005098 _081304A4: .4byte gUnknown_2037AB8 _081304A8: .4byte gUnknown_203B108 -_081304AC: .4byte gUnknown_2021D18 +_081304AC: .4byte gStringVar4 _081304B0: .4byte gUnknown_81C5E13 _081304B4: - ldr r0, _081304F4 @ =gUnknown_2021D18 + ldr r0, _081304F4 @ =gStringVar4 ldr r1, _081304F8 @ =gUnknown_81C5EB5 bl StringExpandPlaceholders _081304BC: movs r0, 0 movs r1, 0 bl sub_80F6EE4 - ldr r2, _081304F4 @ =gUnknown_2021D18 + ldr r2, _081304F4 @ =gStringVar4 ldr r0, _081304FC @ =gUnknown_203B108 ldr r0, [r0] ldrb r3, [r0, 0x1F] @@ -3357,7 +3357,7 @@ _081304BC: strh r0, [r5, 0x6] b _08130544 .align 2, 0 -_081304F4: .4byte gUnknown_2021D18 +_081304F4: .4byte gStringVar4 _081304F8: .4byte gUnknown_81C5EB5 _081304FC: .4byte gUnknown_203B108 _08130500: @@ -3427,7 +3427,7 @@ _08130576: b _0813063E _0813057C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _081305B0 @ =gUnknown_3005090 lsls r0, r4, 2 adds r0, r4 @@ -3454,7 +3454,7 @@ _081305B0: .4byte gUnknown_3005090 _081305B4: .4byte gUnknown_203B108 _081305B8: .4byte sub_8130650 _081305BC: - ldr r4, _081305F8 @ =gUnknown_2021D18 + ldr r4, _081305F8 @ =gStringVar4 ldr r1, _081305FC @ =gUnknown_81C5EC5 adds r0, r4, 0 bl StringExpandPlaceholders @@ -3481,12 +3481,12 @@ _081305BC: str r0, [r6] b _0813063E .align 2, 0 -_081305F8: .4byte gUnknown_2021D18 +_081305F8: .4byte gStringVar4 _081305FC: .4byte gUnknown_81C5EC5 _08130600: .4byte sub_8130694 _08130604: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08130624 @ =gUnknown_203B108 ldr r0, [r0] ldrh r0, [r0, 0x10] @@ -3647,7 +3647,7 @@ sub_813071C: @ 813071C movs r1, 0 bl sub_80F6EE4 ldr r2, _08130774 @ =gUnknown_81C5E2E - ldr r4, _08130778 @ =gUnknown_2021D18 + ldr r4, _08130778 @ =gStringVar4 cmp r2, r4 beq _08130780 adds r0, r4, 0 @@ -3672,7 +3672,7 @@ sub_813071C: @ 813071C .align 2, 0 _08130770: .4byte gUnknown_3005098 _08130774: .4byte gUnknown_81C5E2E -_08130778: .4byte gUnknown_2021D18 +_08130778: .4byte gStringVar4 _0813077C: .4byte gUnknown_203B108 _08130780: ldr r0, _081307C4 @ =gUnknown_203B108 @@ -3799,7 +3799,7 @@ sub_8130858: @ 8130858 ldrsh r0, [r5, r1] cmp r0, 0 beq _081308B4 - ldr r4, _081308C0 @ =gUnknown_2021D18 + ldr r4, _081308C0 @ =gStringVar4 ldr r1, _081308C4 @ =gUnknown_81C5EF4 adds r0, r4, 0 bl StringExpandPlaceholders @@ -3835,7 +3835,7 @@ _081308B4: bx r0 .align 2, 0 _081308BC: .4byte gUnknown_3005090 -_081308C0: .4byte gUnknown_2021D18 +_081308C0: .4byte gStringVar4 _081308C4: .4byte gUnknown_81C5EF4 _081308C8: .4byte gUnknown_203B108 _081308CC: .4byte sub_81308D0 @@ -3966,7 +3966,7 @@ sub_8130980: @ 8130980 cmp r4, 0x28 bne _081309BE movs r0, 0x27 - bl sub_80722CC + bl PlaySE _081309BE: ldrh r0, [r5, 0x4] adds r1, r0, 0 @@ -4295,7 +4295,7 @@ sub_8130C20: @ 8130C20 bl Free movs r0, 0 str r0, [r5] - ldr r2, _08130C5C @ =gUnknown_3003E50 + ldr r2, _08130C5C @ =gTextFlags ldrb r1, [r2] subs r0, 0x2 ands r0, r1 @@ -4309,7 +4309,7 @@ sub_8130C20: @ 8130C20 bx r0 .align 2, 0 _08130C58: .4byte gUnknown_203B108 -_08130C5C: .4byte gUnknown_3003E50 +_08130C5C: .4byte gTextFlags _08130C60: .4byte CB2_NewGame thumb_func_end sub_8130C20 @@ -4590,7 +4590,7 @@ _08130EB8: bl EnableInterrupts ldr r0, _08130F04 @ =sub_812EAFC bl SetVBlankCallback - ldr r2, _08130F08 @ =gUnknown_3003E50 + ldr r2, _08130F08 @ =gTextFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -4600,7 +4600,7 @@ _08130EB8: b _08130F1E .align 2, 0 _08130F04: .4byte sub_812EAFC -_08130F08: .4byte gUnknown_3003E50 +_08130F08: .4byte gTextFlags _08130F0C: .4byte sub_812EB10 _08130F10: ldr r1, _08130F28 @ =gMain diff --git a/asm/option_menu.s b/asm/option_menu.s index df5d187bc..780b5046e 100644 --- a/asm/option_menu.s +++ b/asm/option_menu.s @@ -392,7 +392,7 @@ sub_8088680: @ 8088680 movs r0, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r4, 0xE4 subs r4, r0 movs r0, 0x2 diff --git a/asm/overworld.s b/asm/overworld.s index f9422d297..7d984529f 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -71,7 +71,7 @@ sub_8054C48: @ 8054C48 push {r4,r5,lr} bl sub_8054C04 adds r4, r0, 0 - ldr r5, _08054C6C @ =gUnknown_2021CD0 + ldr r5, _08054C6C @ =gStringVar1 bl sub_80CBF04 adds r3, r0, 0 lsls r3, 24 @@ -84,7 +84,7 @@ sub_8054C48: @ 8054C48 pop {r0} bx r0 .align 2, 0 -_08054C6C: .4byte gUnknown_2021CD0 +_08054C6C: .4byte gStringVar1 thumb_func_end sub_8054C48 thumb_func_start sub_8054C70 @@ -6912,7 +6912,7 @@ sub_80581BC: @ 80581BC sub_80581C8: @ 80581C8 push {lr} movs r0, 0x6 - bl sub_80722CC + bl PlaySE bl sub_806F258 bl ScriptContext2_Enable pop {r0} @@ -6924,7 +6924,7 @@ sub_80581DC: @ 80581DC push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl ScriptContext1_SetupScript bl ScriptContext2_Enable @@ -6937,7 +6937,7 @@ sub_80581DC: @ 80581DC sub_80581F8: @ 80581F8 push {lr} movs r0, 0x6 - bl sub_80722CC + bl PlaySE ldr r0, _08058210 @ =gUnknown_81BB9D4 bl ScriptContext1_SetupScript bl ScriptContext2_Enable @@ -6952,7 +6952,7 @@ sub_8058214: @ 8058214 push {r4,lr} adds r4, r0, 0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl ScriptContext1_SetupScript bl ScriptContext2_Enable diff --git a/asm/party_menu.s b/asm/party_menu.s index 6bef97b0c..83df6029f 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -158,7 +158,7 @@ _0811EB66: _0811EB68: strb r0, [r7, 0x9] _0811EB6A: - ldr r2, _0811EB98 @ =gUnknown_3003E50 + ldr r2, _0811EB98 @ =gTextFlags ldrb r1, [r2] movs r0, 0x5 negs r0, r0 @@ -179,7 +179,7 @@ _0811EB80: .align 2, 0 _0811EB90: .4byte gUnknown_203B09C _0811EB94: .4byte gUnknown_2024284 -_0811EB98: .4byte gUnknown_3003E50 +_0811EB98: .4byte gTextFlags _0811EB9C: .4byte sub_811EBD0 thumb_func_end sub_811EA44 @@ -1400,7 +1400,7 @@ _0811F560: movs r2, 0 movs r3, 0 bl _call_via_r4 - ldr r4, _0811F5E8 @ =gUnknown_2021CD0 + ldr r4, _0811F5E8 @ =gStringVar1 mov r0, r8 adds r0, 0x4 adds r7, r0 @@ -1451,7 +1451,7 @@ _0811F5DC: pop {r0} bx r0 .align 2, 0 -_0811F5E8: .4byte gUnknown_2021CD0 +_0811F5E8: .4byte gStringVar1 thumb_func_end sub_811F528 thumb_func_start sub_811F5EC @@ -2203,7 +2203,7 @@ _0811FB82: cmp r0, 0 beq _0811FB98 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_8124258 _0811FB98: pop {r4-r6} @@ -2329,7 +2329,7 @@ _0811FC8C: cmp r0, 0 beq _0811FD56 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r6, 0 bl sub_8126DC8 b _0811FD56 @@ -2340,7 +2340,7 @@ _0811FCA6: cmp r0, 0 beq _0811FD56 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r6, 0 bl sub_8127404 b _0811FD56 @@ -2351,19 +2351,19 @@ _0811FCC0: cmp r0, 0 beq _0811FD56 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r6, 0 bl sub_8126F40 b _0811FD56 _0811FCDA: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r6, 0 bl sub_8122E5C b _0811FD56 _0811FCE8: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0811FD24 @ =gUnknown_20370C0 movs r0, 0 ldrsb r0, [r5, r0] @@ -2406,7 +2406,7 @@ _0811FD34: b _0811FD56 _0811FD4A: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r6, 0 bl sub_8122C30 _0811FD56: @@ -2433,7 +2433,7 @@ sub_811FD5C: @ 811FD5C _0811FD78: .4byte gUnknown_2024284 _0811FD7C: movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0 _0811FD84: pop {r1} @@ -2465,23 +2465,23 @@ _0811FDA8: b _0811FDD6 _0811FDB2: movs r0, 0x1A - bl sub_80722CC + bl PlaySE b _0811FE14 _0811FDBA: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_81235E8 b _0811FE14 _0811FDC8: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_8120A58 b _0811FE14 _0811FDD6: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0811FDF0 @ =gUnknown_203B0A0 ldrb r1, [r0, 0x8] movs r0, 0xF @@ -2528,7 +2528,7 @@ sub_811FE24: @ 811FE24 ldr r0, [r0] adds r0, 0xD bl sub_8121CE4 - ldr r5, _0811FE60 @ =gUnknown_2021D18 + ldr r5, _0811FE60 @ =gStringVar4 ldr r1, _0811FE64 @ =gUnknown_84176CF adds r0, r5, 0 bl StringExpandPlaceholders @@ -2547,7 +2547,7 @@ sub_811FE24: @ 811FE24 bx r0 .align 2, 0 _0811FE5C: .4byte gUnknown_203B09C -_0811FE60: .4byte gUnknown_2021D18 +_0811FE60: .4byte gStringVar4 _0811FE64: .4byte gUnknown_84176CF _0811FE68: .4byte gUnknown_3005090 _0811FE6C: .4byte sub_811FE70 @@ -2616,7 +2616,7 @@ _0811FEE0: .4byte gUnknown_203B0C0 _0811FEE4: .4byte gUnknown_203B0A0 _0811FEE8: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0811FEEE: adds r0, r4, 0 bl sub_81203B8 @@ -2750,7 +2750,7 @@ _0811FFC6: cmp r1, r0 beq _0811FFE8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE lsrs r0, r4, 24 movs r1, 0 bl sub_811F818 @@ -3378,13 +3378,13 @@ _0812045C: adds r2, r4, 0 bl sub_80A2294 _08120468: - ldr r1, _0812049C @ =gUnknown_2021CD0 + ldr r1, _0812049C @ =gStringVar1 adds r0, r5, 0 bl GetMonNickname - ldr r1, _081204A0 @ =gUnknown_2021CF0 + ldr r1, _081204A0 @ =gStringVar2 adds r0, r4, 0 bl sub_8099E90 - ldr r4, _081204A4 @ =gUnknown_2021D18 + ldr r4, _081204A4 @ =gStringVar4 ldr r1, _081204A8 @ =gUnknown_8416C2A adds r0, r4, 0 bl StringExpandPlaceholders @@ -3398,9 +3398,9 @@ _08120468: bx r0 .align 2, 0 _08120498: .4byte 0x0000ffff -_0812049C: .4byte gUnknown_2021CD0 -_081204A0: .4byte gUnknown_2021CF0 -_081204A4: .4byte gUnknown_2021D18 +_0812049C: .4byte gStringVar1 +_081204A0: .4byte gStringVar2 +_081204A4: .4byte gStringVar4 _081204A8: .4byte gUnknown_8416C2A thumb_func_end sub_8120420 @@ -3419,13 +3419,13 @@ sub_81204AC: @ 81204AC adds r1, r6, 0 adds r2, r4, 0 bl sub_80A2294 - ldr r1, _081204FC @ =gUnknown_2021CD0 + ldr r1, _081204FC @ =gStringVar1 adds r0, r6, 0 bl GetMonNickname - ldr r1, _08120500 @ =gUnknown_2021CF0 + ldr r1, _08120500 @ =gStringVar2 adds r0, r4, 0 bl sub_8099E90 - ldr r4, _08120504 @ =gUnknown_2021D18 + ldr r4, _08120504 @ =gStringVar4 ldr r1, _08120508 @ =gUnknown_8416CAC adds r0, r4, 0 bl StringExpandPlaceholders @@ -3439,9 +3439,9 @@ sub_81204AC: @ 81204AC bx r0 .align 2, 0 _081204F8: .4byte 0x0000ffff -_081204FC: .4byte gUnknown_2021CD0 -_08120500: .4byte gUnknown_2021CF0 -_08120504: .4byte gUnknown_2021D18 +_081204FC: .4byte gStringVar1 +_08120500: .4byte gStringVar2 +_08120504: .4byte gStringVar4 _08120508: .4byte gUnknown_8416CAC thumb_func_end sub_81204AC @@ -3454,12 +3454,12 @@ sub_812050C: @ 812050C lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r1, _08120548 @ =gUnknown_2021CD0 + ldr r1, _08120548 @ =gStringVar1 bl GetMonNickname - ldr r1, _0812054C @ =gUnknown_2021CF0 + ldr r1, _0812054C @ =gStringVar2 adds r0, r4, 0 bl sub_8099E90 - ldr r4, _08120550 @ =gUnknown_2021D18 + ldr r4, _08120550 @ =gStringVar4 ldr r1, _08120554 @ =gUnknown_8416C49 adds r0, r4, 0 bl StringExpandPlaceholders @@ -3472,9 +3472,9 @@ sub_812050C: @ 812050C pop {r0} bx r0 .align 2, 0 -_08120548: .4byte gUnknown_2021CD0 -_0812054C: .4byte gUnknown_2021CF0 -_08120550: .4byte gUnknown_2021D18 +_08120548: .4byte gStringVar1 +_0812054C: .4byte gStringVar2 +_08120550: .4byte gStringVar4 _08120554: .4byte gUnknown_8416C49 thumb_func_end sub_812050C @@ -3500,13 +3500,13 @@ sub_8120558: @ 8120558 adds r1, r5, 0 adds r2, r4, 0 bl sub_8124B60 - ldr r1, _081205B8 @ =gUnknown_2021CD0 + ldr r1, _081205B8 @ =gStringVar1 adds r0, r4, 0 bl sub_8099E90 - ldr r1, _081205BC @ =gUnknown_2021CF0 + ldr r1, _081205BC @ =gStringVar2 adds r0, r5, 0 bl sub_8099E90 - ldr r4, _081205C0 @ =gUnknown_2021D18 + ldr r4, _081205C0 @ =gStringVar4 ldr r1, _081205C4 @ =gUnknown_8416CEA adds r0, r4, 0 bl StringExpandPlaceholders @@ -3521,9 +3521,9 @@ sub_8120558: @ 8120558 .align 2, 0 _081205B0: .4byte gUnknown_203B0A0 _081205B4: .4byte gUnknown_2024284 -_081205B8: .4byte gUnknown_2021CD0 -_081205BC: .4byte gUnknown_2021CF0 -_081205C0: .4byte gUnknown_2021D18 +_081205B8: .4byte gStringVar1 +_081205BC: .4byte gStringVar2 +_081205C0: .4byte gStringVar4 _081205C4: .4byte gUnknown_8416CEA thumb_func_end sub_8120558 @@ -3630,17 +3630,17 @@ _08120680: bl ItemId_GetItem adds r1, r0, 0 _08120686: - ldr r0, _0812069C @ =gUnknown_2021CD0 + ldr r0, _0812069C @ =gStringVar1 bl StringCopy - ldr r0, _081206A0 @ =gUnknown_2021D18 + ldr r0, _081206A0 @ =gStringVar4 ldr r1, _081206A4 @ =gUnknown_8416D78 bl StringExpandPlaceholders pop {r0} bx r0 .align 2, 0 _08120698: .4byte 0x0000016d -_0812069C: .4byte gUnknown_2021CD0 -_081206A0: .4byte gUnknown_2021D18 +_0812069C: .4byte gStringVar1 +_081206A0: .4byte gStringVar4 _081206A4: .4byte gUnknown_8416D78 thumb_func_end sub_8120658 @@ -3712,7 +3712,7 @@ _08120724: ldrsh r0, [r7, r2] cmp r1, r0 ble _08120740 - ldr r0, _0812075C @ =gUnknown_2021CF0 + ldr r0, _0812075C @ =gStringVar2 movs r3, 0xA ldrsh r2, [r7, r3] subs r1, r2 @@ -3732,7 +3732,7 @@ _08120746: _08120750: .4byte gUnknown_3005098 _08120754: .4byte gUnknown_2024284 _08120758: .4byte gUnknown_203B0B4 -_0812075C: .4byte gUnknown_2021CF0 +_0812075C: .4byte gStringVar2 thumb_func_end sub_81206A8 thumb_func_start sub_8120760 @@ -4106,7 +4106,7 @@ sub_81209F4: @ 81209F4 cmp r0, 0x1 bne _08120A24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08120A20 @ =gUnknown_20370C0 strh r5, [r0] adds r0, r4, 0 @@ -4116,7 +4116,7 @@ sub_81209F4: @ 81209F4 _08120A20: .4byte gUnknown_20370C0 _08120A24: movs r0, 0x1A - bl sub_80722CC + bl PlaySE ldr r0, _08120A4C @ =gUnknown_8417696 movs r1, 0 bl sub_81202F8 @@ -4225,7 +4225,7 @@ _08120AEA: _08120AF8: .4byte gUnknown_20370C0 _08120AFC: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08120B02: ldr r0, _08120B18 @ =gUnknown_3005090 lsls r1, r4, 2 @@ -4812,7 +4812,7 @@ _08120F2A: _08120F34: .4byte gUnknown_203B0A9 _08120F38: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_8122BD4 b _08120F62 _08120F44: @@ -5066,7 +5066,7 @@ _0812110E: movs r0, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0x30 subs r2, r0 lsrs r2, 1 @@ -5122,7 +5122,7 @@ _08121194: movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0x30 subs r1, r0 lsrs r0, r1, 31 @@ -5153,7 +5153,7 @@ _081211F0: movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0x30 subs r1, r0 lsrs r0, r1, 31 @@ -5902,13 +5902,13 @@ sub_8121808: @ 8121808 adds r6, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r5, _08121848 @ =gUnknown_2021CF0 + ldr r5, _08121848 @ =gStringVar2 adds r0, r5, 0 adds r1, r2, 0 movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _0812184C @ =gUnknown_2021CD0 + ldr r4, _0812184C @ =gStringVar1 ldr r1, _08121850 @ =gUnknown_8416223 adds r0, r4, 0 bl StringCopy @@ -5925,8 +5925,8 @@ sub_8121808: @ 8121808 pop {r0} bx r0 .align 2, 0 -_08121848: .4byte gUnknown_2021CF0 -_0812184C: .4byte gUnknown_2021CD0 +_08121848: .4byte gStringVar2 +_0812184C: .4byte gStringVar1 _08121850: .4byte gUnknown_8416223 thumb_func_end sub_8121808 @@ -6145,7 +6145,7 @@ sub_8121A04: @ 8121A04 adds r4, r1, 0 lsls r2, 16 lsrs r2, 16 - ldr r5, _08121A38 @ =gUnknown_2021CD0 + ldr r5, _08121A38 @ =gStringVar1 adds r0, r5, 0 adds r1, r2, 0 movs r2, 0x1 @@ -6165,7 +6165,7 @@ sub_8121A04: @ 8121A04 pop {r0} bx r0 .align 2, 0 -_08121A38: .4byte gUnknown_2021CD0 +_08121A38: .4byte gStringVar1 thumb_func_end sub_8121A04 thumb_func_start sub_8121A3C @@ -6229,13 +6229,13 @@ sub_8121AA4: @ 8121AA4 adds r6, r1, 0 lsls r2, 16 lsrs r2, 16 - ldr r5, _08121AE4 @ =gUnknown_2021CF0 + ldr r5, _08121AE4 @ =gStringVar2 adds r0, r5, 0 adds r1, r2, 0 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _08121AE8 @ =gUnknown_2021CD0 + ldr r4, _08121AE8 @ =gStringVar1 ldr r1, _08121AEC @ =gUnknown_841620C adds r0, r4, 0 bl StringCopy @@ -6252,8 +6252,8 @@ sub_8121AA4: @ 8121AA4 pop {r0} bx r0 .align 2, 0 -_08121AE4: .4byte gUnknown_2021CF0 -_08121AE8: .4byte gUnknown_2021CD0 +_08121AE4: .4byte gStringVar2 +_08121AE8: .4byte gStringVar1 _08121AEC: .4byte gUnknown_841620C thumb_func_end sub_8121AA4 @@ -6609,7 +6609,7 @@ _08121DB0: movs r2, 0x58 movs r3, 0xF bl SetWindowBorderStyle - ldr r4, _08121DF0 @ =gUnknown_2021D18 + ldr r4, _08121DF0 @ =gStringVar4 ldr r1, _08121DF4 @ =gUnknown_845A2E8 lsls r0, r6, 2 adds r0, r1 @@ -6634,7 +6634,7 @@ _08121DE8: pop {r0} bx r0 .align 2, 0 -_08121DF0: .4byte gUnknown_2021D18 +_08121DF0: .4byte gStringVar4 _08121DF4: .4byte gUnknown_845A2E8 thumb_func_end sub_8121D0C @@ -6883,7 +6883,7 @@ sub_8121FC0: @ 8121FC0 movs r2, 0x4F movs r3, 0xD bl SetWindowBorderStyle - ldr r2, _08122008 @ =gUnknown_3003E50 + ldr r2, _08122008 @ =gTextFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -6909,7 +6909,7 @@ sub_8121FC0: @ 8121FC0 pop {r0} bx r0 .align 2, 0 -_08122008: .4byte gUnknown_3003E50 +_08122008: .4byte gTextFlags thumb_func_end sub_8121FC0 thumb_func_start sub_812200C @@ -6982,10 +6982,10 @@ sub_8122084: @ 8122084 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _081220CC @ =gUnknown_2021D18 + ldr r5, _081220CC @ =gStringVar4 adds r0, r5, 0 bl StringExpandPlaceholders - ldr r2, _081220D0 @ =gUnknown_3003E50 + ldr r2, _081220D0 @ =gTextFlags ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -7011,8 +7011,8 @@ sub_8122084: @ 8122084 pop {r0} bx r0 .align 2, 0 -_081220CC: .4byte gUnknown_2021D18 -_081220D0: .4byte gUnknown_3003E50 +_081220CC: .4byte gStringVar4 +_081220D0: .4byte gTextFlags thumb_func_end sub_8122084 thumb_func_start sub_81220D4 @@ -8470,7 +8470,7 @@ sub_8122BD4: @ 8122BD4 muls r4, r0 ldr r6, _08122C24 @ =gUnknown_2024284 adds r4, r6 - ldr r1, _08122C28 @ =gUnknown_2021CD0 + ldr r1, _08122C28 @ =gStringVar1 adds r0, r4, 0 bl GetMonNickname ldr r0, _08122C2C @ =gUnknown_203B09C @@ -8496,7 +8496,7 @@ sub_8122BD4: @ 8122BD4 .align 2, 0 _08122C20: .4byte gUnknown_203B0A0 _08122C24: .4byte gUnknown_2024284 -_08122C28: .4byte gUnknown_2021CD0 +_08122C28: .4byte gStringVar1 _08122C2C: .4byte gUnknown_203B09C thumb_func_end sub_8122BD4 @@ -8592,7 +8592,7 @@ _08122CCE: cmp r5, r0 bne _08122D1C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _08122D14 @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xE @@ -8644,7 +8644,7 @@ sub_8122D4C: @ 8122D4C lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08122D70 @ =gUnknown_203B09C ldr r1, [r0] ldr r0, _08122D74 @ =sub_8122D78 @@ -8734,7 +8734,7 @@ brm_switch: @ 8122E00 lsls r6, 24 lsrs r6, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r5, _08122E4C @ =gUnknown_203B0A0 movs r0, 0x8 strb r0, [r5, 0xB] @@ -9754,7 +9754,7 @@ brm_cancel_1: @ 8123640 lsls r0, 24 lsrs r5, r0, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _08123674 @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xC @@ -9800,7 +9800,7 @@ sub_81236A0: @ 81236A0 lsls r5, 24 lsrs r5, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _081236F0 @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xC @@ -9844,7 +9844,7 @@ sub_8123704: @ 8123704 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08123728 @ =gUnknown_203B09C ldr r1, [r0] ldr r0, _0812372C @ =sub_8123730 @@ -10146,7 +10146,7 @@ _08123956: bl sub_809A084 ldrh r0, [r6] bl sub_8120658 - ldr r0, _081239A0 @ =gUnknown_2021D18 + ldr r0, _081239A0 @ =gStringVar4 movs r1, 0 bl sub_81202F8 ldr r1, _081239A4 @ =gUnknown_3005090 @@ -10160,7 +10160,7 @@ _08123956: .align 2, 0 _08123998: .4byte gUnknown_203AD30 _0812399C: .4byte gUnknown_203B0D8 -_081239A0: .4byte gUnknown_2021D18 +_081239A0: .4byte gStringVar4 _081239A4: .4byte gUnknown_3005090 _081239A8: .4byte sub_81203B8 _081239AC: @@ -10220,7 +10220,7 @@ _08123A24: .4byte gUnknown_3005090 _08123A28: .4byte sub_8123BF0 _08123A2C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08123A32: ldr r0, _08123A48 @ =gUnknown_3005090 lsls r1, r4, 2 @@ -10489,7 +10489,7 @@ sub_8123C38: @ 8123C38 lsls r0, 16 lsrs r6, r0, 16 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _08123C98 @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xC @@ -10515,23 +10515,23 @@ _08123C90: .4byte gUnknown_203B0A0 _08123C94: .4byte gUnknown_2024284 _08123C98: .4byte gUnknown_203B09C _08123C9C: - ldr r1, _08123CB4 @ =gUnknown_2021CD0 + ldr r1, _08123CB4 @ =gStringVar1 adds r0, r5, 0 bl GetMonNickname - ldr r4, _08123CB8 @ =gUnknown_2021D18 + ldr r4, _08123CB8 @ =gStringVar4 ldr r1, _08123CBC @ =gUnknown_8416C8F adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 b _08123CC8 .align 2, 0 -_08123CB4: .4byte gUnknown_2021CD0 -_08123CB8: .4byte gUnknown_2021D18 +_08123CB4: .4byte gStringVar1 +_08123CB8: .4byte gStringVar4 _08123CBC: .4byte gUnknown_8416C8F _08123CC0: adds r0, r6, 0 bl sub_8120658 - ldr r0, _08123CE8 @ =gUnknown_2021D18 + ldr r0, _08123CE8 @ =gStringVar4 _08123CC8: movs r1, 0x1 bl sub_81202F8 @@ -10549,7 +10549,7 @@ _08123CCE: pop {r0} bx r0 .align 2, 0 -_08123CE8: .4byte gUnknown_2021D18 +_08123CE8: .4byte gStringVar4 _08123CEC: .4byte gUnknown_3005090 _08123CF0: .4byte sub_8123BF0 thumb_func_end sub_8123C38 @@ -10561,7 +10561,7 @@ sub_8123CF4: @ 8123CF4 lsls r5, 24 lsrs r5, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _08123D44 @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xC @@ -10605,7 +10605,7 @@ sub_8123D58: @ 8123D58 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08123D7C @ =gUnknown_203B09C ldr r1, [r0] ldr r0, _08123D80 @ =sub_8123D84 @@ -10692,7 +10692,7 @@ brm_take_2: @ 8123E0C lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r5, _08123E48 @ =gUnknown_203B09C ldr r0, [r5] adds r0, 0xD @@ -10814,7 +10814,7 @@ _08123F14: .4byte gUnknown_3005090 _08123F18: .4byte sub_81203B8 _08123F1C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08123F22: ldr r0, _08123F40 @ =gUnknown_8416BC3 movs r1, 0x1 @@ -10934,7 +10934,7 @@ _0812400C: .4byte sub_8123BF0 _08124010: adds r0, r4, 0 bl sub_8120658 - ldr r0, _08124030 @ =gUnknown_2021D18 + ldr r0, _08124030 @ =gStringVar4 movs r1, 0 bl sub_81202F8 ldr r1, _08124034 @ =gUnknown_3005090 @@ -10946,12 +10946,12 @@ _08124010: str r1, [r0] b _08124050 .align 2, 0 -_08124030: .4byte gUnknown_2021D18 +_08124030: .4byte gStringVar4 _08124034: .4byte gUnknown_3005090 _08124038: .4byte sub_81203B8 _0812403C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08124042: ldr r0, _0812405C @ =gUnknown_3005090 lsls r1, r5, 2 @@ -10991,7 +10991,7 @@ sub_8124064: @ 8124064 mov r9, r0 add r5, r9 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _081240E8 @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xC @@ -11042,7 +11042,7 @@ sub_81240F4: @ 81240F4 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r5, _08124120 @ =gUnknown_203B09C ldr r0, [r5] adds r0, 0xC @@ -11061,7 +11061,7 @@ _08124124: ldr r0, [r5] adds r0, 0xD bl sub_8121CE4 - ldr r0, _08124148 @ =gUnknown_2021D18 + ldr r0, _08124148 @ =gStringVar4 movs r1, 0x1 bl sub_81202F8 ldr r1, _0812414C @ =gUnknown_3005090 @@ -11076,7 +11076,7 @@ _08124142: pop {r0} bx r0 .align 2, 0 -_08124148: .4byte gUnknown_2021D18 +_08124148: .4byte gStringVar4 _0812414C: .4byte gUnknown_3005090 _08124150: .4byte sub_81203B8 thumb_func_end sub_81240F4 @@ -11137,7 +11137,7 @@ _081241B6: cmp r0, 0 bne _08124218 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r6, 0x9] adds r0, 0x1 strb r0, [r4] @@ -11179,7 +11179,7 @@ _08124218: bcc _081241B6 _08124222: movs r0, 0x1A - bl sub_80722CC + bl PlaySE ldr r0, [sp] movs r1, 0x1 bl sub_81202F8 @@ -11228,7 +11228,7 @@ sub_8124278: @ 8124278 lsls r0, 24 lsrs r7, r0, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _081242BC @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xC @@ -11336,7 +11336,7 @@ sub_8124354: @ 8124354 lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0812437C @ =gUnknown_20370C0 ldr r0, _08124380 @ =gUnknown_203B0A0 ldrb r0, [r0, 0x9] @@ -11413,7 +11413,7 @@ sub_8124384: @ 8124384 cmp r0, 0x2 beq _0812442C movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r7, 0 bl sub_811FA78 b _0812446C @@ -11421,20 +11421,20 @@ sub_8124384: @ 8124384 _08124410: .4byte gUnknown_203B0A0 _08124414: .4byte gUnknown_2024284 _08124418: - ldr r0, _08124424 @ =gUnknown_2021D18 + ldr r0, _08124424 @ =gStringVar4 ldr r1, _08124428 @ =gUnknown_84170BC bl StringExpandPlaceholders b _08124434 .align 2, 0 -_08124424: .4byte gUnknown_2021D18 +_08124424: .4byte gStringVar4 _08124428: .4byte gUnknown_84170BC _0812442C: - ldr r0, _08124478 @ =gUnknown_2021D18 + ldr r0, _08124478 @ =gStringVar4 ldr r1, _0812447C @ =gUnknown_84170E0 bl StringExpandPlaceholders _08124434: movs r0, 0x1A - bl sub_80722CC + bl PlaySE ldr r4, _08124480 @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xC @@ -11442,7 +11442,7 @@ _08124434: ldr r0, [r4] adds r0, 0xD bl sub_8121CE4 - ldr r4, _08124478 @ =gUnknown_2021D18 + ldr r4, _08124478 @ =gStringVar4 ldr r1, _08124484 @ =gUnknown_84169D9 adds r0, r4, 0 bl StringAppend @@ -11464,7 +11464,7 @@ _0812446C: pop {r0} bx r0 .align 2, 0 -_08124478: .4byte gUnknown_2021D18 +_08124478: .4byte gStringVar4 _0812447C: .4byte gUnknown_84170E0 _08124480: .4byte gUnknown_203B09C _08124484: .4byte gUnknown_84169D9 @@ -11532,7 +11532,7 @@ brm_trade_1: @ 8124490 bl sub_804FBEC cmp r0, 0 beq _08124584 - ldr r5, _0812456C @ =gUnknown_2021D18 + ldr r5, _0812456C @ =gStringVar4 ldr r1, _08124570 @ =gUnknown_845A7E8 subs r0, 0x1 lsls r0, 2 @@ -11541,7 +11541,7 @@ brm_trade_1: @ 8124490 adds r0, r5, 0 bl StringExpandPlaceholders movs r0, 0x1A - bl sub_80722CC + bl PlaySE ldr r4, _08124574 @ =gUnknown_203B09C ldr r0, [r4] adds r0, 0xC @@ -11569,7 +11569,7 @@ _0812455C: .4byte gUnknown_2024284 _08124560: .4byte gUnknown_203B064 _08124564: .4byte gUnknown_203B068 _08124568: .4byte gUnknown_203B06A -_0812456C: .4byte gUnknown_2021D18 +_0812456C: .4byte gStringVar4 _08124570: .4byte gUnknown_845A7E8 _08124574: .4byte gUnknown_203B09C _08124578: .4byte gUnknown_84169D9 @@ -11577,7 +11577,7 @@ _0812457C: .4byte gUnknown_3005090 _08124580: .4byte sub_81203B8 _08124584: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r7, 0 bl sub_811FA78 _08124590: @@ -11612,7 +11612,7 @@ sub_81245A4: @ 81245A4 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _08124614 @ =gUnknown_845A788 lsls r0, r4, 3 adds r7, r0, r1 @@ -11729,16 +11729,16 @@ _081246B4: lsrs r1, 16 bl get_mapheader_by_bank_and_number adds r1, r0, 0 - ldr r0, _081246E4 @ =gUnknown_2021CD0 + ldr r0, _081246E4 @ =gStringVar1 ldrb r1, [r1, 0x14] bl sub_80C4DF8 - ldr r0, _081246E8 @ =gUnknown_2021D18 + ldr r0, _081246E8 @ =gStringVar4 ldr r1, _081246EC @ =gUnknown_8417640 b _08124720 .align 2, 0 _081246E0: .4byte gSaveBlock1Ptr -_081246E4: .4byte gUnknown_2021CD0 -_081246E8: .4byte gUnknown_2021D18 +_081246E4: .4byte gStringVar1 +_081246E8: .4byte gStringVar4 _081246EC: .4byte gUnknown_8417640 _081246F0: ldr r0, _08124738 @ =gSaveBlock1Ptr @@ -11758,10 +11758,10 @@ _081246F0: lsrs r1, 16 bl get_mapheader_by_bank_and_number adds r1, r0, 0 - ldr r0, _0812473C @ =gUnknown_2021CD0 + ldr r0, _0812473C @ =gStringVar1 ldrb r1, [r1, 0x14] bl sub_80C4DF8 - ldr r0, _08124740 @ =gUnknown_2021D18 + ldr r0, _08124740 @ =gStringVar4 ldr r1, _08124744 @ =gUnknown_8417615 _08124720: bl StringExpandPlaceholders @@ -11776,8 +11776,8 @@ _08124720: b _081247B4 .align 2, 0 _08124738: .4byte gSaveBlock1Ptr -_0812473C: .4byte gUnknown_2021CD0 -_08124740: .4byte gUnknown_2021D18 +_0812473C: .4byte gStringVar1 +_08124740: .4byte gStringVar4 _08124744: .4byte gUnknown_8417615 _08124748: .4byte gUnknown_203B09C _0812474C: @@ -11846,7 +11846,7 @@ sub_81247C4: @ 81247C4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081247E8 @ =gUnknown_2021D18 + ldr r0, _081247E8 @ =gStringVar4 movs r1, 0x1 bl sub_81202F8 ldr r1, _081247EC @ =gUnknown_3005090 @@ -11860,7 +11860,7 @@ sub_81247C4: @ 81247C4 pop {r0} bx r0 .align 2, 0 -_081247E8: .4byte gUnknown_2021D18 +_081247E8: .4byte gStringVar4 _081247EC: .4byte gUnknown_3005090 _081247F0: .4byte sub_81247F4 thumb_func_end sub_81247C4 @@ -11941,7 +11941,7 @@ _08124884: .4byte gUnknown_2024284 _08124888: .4byte gUnknown_203B09C _0812488C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08124892: ldr r0, _081248A8 @ =gUnknown_3005024 movs r1, 0 @@ -12984,143 +12984,143 @@ _0812507C: .4byte _081251DC .4byte _081251F0 _081250C8: - ldr r0, _081250D4 @ =gUnknown_2021D18 + ldr r0, _081250D4 @ =gStringVar4 ldr r1, _081250D8 @ =gUnknown_8416F4E bl StringExpandPlaceholders b _0812520C .align 2, 0 -_081250D4: .4byte gUnknown_2021D18 +_081250D4: .4byte gStringVar4 _081250D8: .4byte gUnknown_8416F4E _081250DC: - ldr r0, _081250E8 @ =gUnknown_2021D18 + ldr r0, _081250E8 @ =gStringVar4 ldr r1, _081250EC @ =gUnknown_8416F8C bl StringExpandPlaceholders b _0812520C .align 2, 0 -_081250E8: .4byte gUnknown_2021D18 +_081250E8: .4byte gStringVar4 _081250EC: .4byte gUnknown_8416F8C _081250F0: - ldr r0, _081250FC @ =gUnknown_2021D18 + ldr r0, _081250FC @ =gStringVar4 ldr r1, _08125100 @ =gUnknown_8416F9A bl StringExpandPlaceholders b _0812520C .align 2, 0 -_081250FC: .4byte gUnknown_2021D18 +_081250FC: .4byte gStringVar4 _08125100: .4byte gUnknown_8416F9A _08125104: - ldr r0, _08125110 @ =gUnknown_2021D18 + ldr r0, _08125110 @ =gStringVar4 ldr r1, _08125114 @ =gUnknown_8416FB2 bl StringExpandPlaceholders b _0812520C .align 2, 0 -_08125110: .4byte gUnknown_2021D18 +_08125110: .4byte gStringVar4 _08125114: .4byte gUnknown_8416FB2 _08125118: - ldr r0, _08125124 @ =gUnknown_2021D18 + ldr r0, _08125124 @ =gStringVar4 ldr r1, _08125128 @ =gUnknown_8416F6F bl StringExpandPlaceholders b _0812520C .align 2, 0 -_08125124: .4byte gUnknown_2021D18 +_08125124: .4byte gStringVar4 _08125128: .4byte gUnknown_8416F6F _0812512C: - ldr r0, _08125138 @ =gUnknown_2021D18 + ldr r0, _08125138 @ =gStringVar4 ldr r1, _0812513C @ =gUnknown_8417052 bl StringExpandPlaceholders b _0812520C .align 2, 0 -_08125138: .4byte gUnknown_2021D18 +_08125138: .4byte gStringVar4 _0812513C: .4byte gUnknown_8417052 _08125140: - ldr r0, _0812514C @ =gUnknown_2021D18 + ldr r0, _0812514C @ =gStringVar4 ldr r1, _08125150 @ =gUnknown_8417075 bl StringExpandPlaceholders b _0812520C .align 2, 0 -_0812514C: .4byte gUnknown_2021D18 +_0812514C: .4byte gStringVar4 _08125150: .4byte gUnknown_8417075 _08125154: - ldr r0, _08125160 @ =gUnknown_2021D18 + ldr r0, _08125160 @ =gStringVar4 ldr r1, _08125164 @ =gUnknown_8416FED bl StringExpandPlaceholders b _0812520C .align 2, 0 -_08125160: .4byte gUnknown_2021D18 +_08125160: .4byte gStringVar4 _08125164: .4byte gUnknown_8416FED _08125168: - ldr r0, _08125170 @ =gUnknown_2021CF0 + ldr r0, _08125170 @ =gStringVar2 ldr r1, _08125174 @ =gUnknown_84169C2 b _081251BC .align 2, 0 -_08125170: .4byte gUnknown_2021CF0 +_08125170: .4byte gStringVar2 _08125174: .4byte gUnknown_84169C2 _08125178: - ldr r0, _08125180 @ =gUnknown_2021CF0 + ldr r0, _08125180 @ =gStringVar2 ldr r1, _08125184 @ =gUnknown_8417674 b _081251BC .align 2, 0 -_08125180: .4byte gUnknown_2021CF0 +_08125180: .4byte gStringVar2 _08125184: .4byte gUnknown_8417674 _08125188: - ldr r0, _08125190 @ =gUnknown_2021CF0 + ldr r0, _08125190 @ =gStringVar2 ldr r1, _08125194 @ =gUnknown_841767B b _081251BC .align 2, 0 -_08125190: .4byte gUnknown_2021CF0 +_08125190: .4byte gStringVar2 _08125194: .4byte gUnknown_841767B _08125198: - ldr r0, _081251A0 @ =gUnknown_2021CF0 + ldr r0, _081251A0 @ =gStringVar2 ldr r1, _081251A4 @ =gUnknown_841768D b _081251BC .align 2, 0 -_081251A0: .4byte gUnknown_2021CF0 +_081251A0: .4byte gStringVar2 _081251A4: .4byte gUnknown_841768D _081251A8: - ldr r0, _081251B0 @ =gUnknown_2021CF0 + ldr r0, _081251B0 @ =gStringVar2 ldr r1, _081251B4 @ =gUnknown_84169C5 b _081251BC .align 2, 0 -_081251B0: .4byte gUnknown_2021CF0 +_081251B0: .4byte gStringVar2 _081251B4: .4byte gUnknown_84169C5 _081251B8: - ldr r0, _081251CC @ =gUnknown_2021CF0 + ldr r0, _081251CC @ =gStringVar2 ldr r1, _081251D0 @ =gUnknown_84169CD _081251BC: bl StringCopy - ldr r0, _081251D4 @ =gUnknown_2021D18 + ldr r0, _081251D4 @ =gStringVar4 ldr r1, _081251D8 @ =gUnknown_8417032 bl StringExpandPlaceholders b _0812520C .align 2, 0 -_081251CC: .4byte gUnknown_2021CF0 +_081251CC: .4byte gStringVar2 _081251D0: .4byte gUnknown_84169CD -_081251D4: .4byte gUnknown_2021D18 +_081251D4: .4byte gStringVar4 _081251D8: .4byte gUnknown_8417032 _081251DC: - ldr r0, _081251E8 @ =gUnknown_2021D18 + ldr r0, _081251E8 @ =gStringVar4 ldr r1, _081251EC @ =gUnknown_8417002 bl StringExpandPlaceholders b _0812520C .align 2, 0 -_081251E8: .4byte gUnknown_2021D18 +_081251E8: .4byte gStringVar4 _081251EC: .4byte gUnknown_8417002 _081251F0: - ldr r0, _081251FC @ =gUnknown_2021D18 + ldr r0, _081251FC @ =gStringVar4 ldr r1, _08125200 @ =gUnknown_8416FC7 bl StringExpandPlaceholders b _0812520C .align 2, 0 -_081251FC: .4byte gUnknown_2021D18 +_081251FC: .4byte gStringVar4 _08125200: .4byte gUnknown_8416FC7 _08125204: - ldr r0, _08125210 @ =gUnknown_2021D18 + ldr r0, _08125210 @ =gStringVar4 ldr r1, _08125214 @ =gUnknown_84169DC bl StringExpandPlaceholders _0812520C: pop {r0} bx r0 .align 2, 0 -_08125210: .4byte gUnknown_2021D18 +_08125210: .4byte gStringVar4 _08125214: .4byte gUnknown_84169DC thumb_func_end GetMedicineItemEffectMessage @@ -13283,7 +13283,7 @@ _08125330: lsrs r4, r0, 24 _08125342: movs r0, 0x5 - bl sub_80722CC + bl PlaySE cmp r4, 0 beq _08125380 ldr r1, _08125374 @ =gUnknown_203B0C0 @@ -13393,7 +13393,7 @@ _08125428: movs r0, 0 strb r0, [r1] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08125448 @ =gUnknown_84169DC b _0812551C .align 2, 0 @@ -13412,7 +13412,7 @@ _0812544C: cmp r0, 0 bne _08125478 movs r0, 0x1 - bl sub_80722CC + bl PlaySE ldrb r0, [r4, 0xB] cmp r0, 0xE beq _0812547E @@ -13424,7 +13424,7 @@ _0812544C: _08125474: .4byte gUnknown_203B0C0 _08125478: movs r0, 0x6E - bl sub_80722CC + bl PlaySE _0812547E: ldr r4, _081254FC @ =gUnknown_203B0B4 ldr r7, _08125500 @ =gUnknown_203B0A0 @@ -13491,12 +13491,12 @@ _08125500: .4byte gUnknown_203B0A0 _08125504: .4byte gUnknown_202063C _08125508: .4byte sub_8125554 _0812550C: - ldr r1, _08125548 @ =gUnknown_2021CD0 + ldr r1, _08125548 @ =gStringVar1 adds r0, r5, 0 bl GetMonNickname adds r0, r6, 0 bl GetMedicineItemEffectMessage - ldr r0, _0812554C @ =gUnknown_2021D18 + ldr r0, _0812554C @ =gStringVar4 _0812551C: movs r1, 0x1 bl sub_81202F8 @@ -13520,8 +13520,8 @@ _08125538: pop {r0} bx r0 .align 2, 0 -_08125548: .4byte gUnknown_2021CD0 -_0812554C: .4byte gUnknown_2021D18 +_08125548: .4byte gStringVar1 +_0812554C: .4byte gStringVar4 _08125550: .4byte gUnknown_3005090 thumb_func_end ItemUseCB_Medicine @@ -13538,9 +13538,9 @@ sub_8125554: @ 8125554 muls r0, r1 ldr r1, _081255A4 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _081255A8 @ =gUnknown_2021CD0 + ldr r1, _081255A8 @ =gStringVar1 bl GetMonNickname - ldr r4, _081255AC @ =gUnknown_2021D18 + ldr r4, _081255AC @ =gStringVar4 ldr r1, _081255B0 @ =gUnknown_8416F27 adds r0, r4, 0 bl StringExpandPlaceholders @@ -13563,8 +13563,8 @@ sub_8125554: @ 8125554 .align 2, 0 _081255A0: .4byte gUnknown_203B0A0 _081255A4: .4byte gUnknown_2024284 -_081255A8: .4byte gUnknown_2021CD0 -_081255AC: .4byte gUnknown_2021D18 +_081255A8: .4byte gStringVar1 +_081255AC: .4byte gStringVar4 _081255B0: .4byte gUnknown_8416F27 _081255B4: .4byte gUnknown_3005090 _081255B8: .4byte sub_81255BC @@ -13717,7 +13717,7 @@ sub_81256C0: @ 81256C0 cmp r1, r0 bne _081256EC movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_81257D4 b _081256F2 @@ -13781,7 +13781,7 @@ _08125754: b _0812577E _0812575C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x17 bl sub_8121D0C ldr r0, _08125784 @ =gUnknown_203B0A0 @@ -13887,7 +13887,7 @@ sub_812580C: @ 812580C lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE cmp r4, 0 beq _0812587C ldr r1, _0812586C @ =gUnknown_203B0C0 @@ -13960,7 +13960,7 @@ sub_8125898: @ 8125898 adds r1, r4, 0 bl sub_80A2294 movs r0, 0x1 - bl sub_80722CC + bl PlaySE ldrh r0, [r6] movs r1, 0x1 bl sub_809A1D8 @@ -13971,7 +13971,7 @@ sub_8125898: @ 8125898 bl GetMonData lsls r0, 16 lsrs r0, 16 - ldr r2, _08125944 @ =gUnknown_2021CD0 + ldr r2, _08125944 @ =gStringVar1 movs r1, 0xD muls r1, r0 ldr r0, _08125948 @ =gUnknown_8247094 @@ -13980,7 +13980,7 @@ sub_8125898: @ 8125898 bl StringCopy ldrh r0, [r6] bl GetMedicineItemEffectMessage - ldr r0, _0812594C @ =gUnknown_2021D18 + ldr r0, _0812594C @ =gStringVar4 movs r1, 0x1 bl sub_81202F8 movs r0, 0x2 @@ -14004,9 +14004,9 @@ _08125934: .4byte gUnknown_2024284 _08125938: .4byte gUnknown_203AD30 _0812593C: .4byte gUnknown_203B0C0 _08125940: .4byte 0x0000ffff -_08125944: .4byte gUnknown_2021CD0 +_08125944: .4byte gStringVar1 _08125948: .4byte gUnknown_8247094 -_0812594C: .4byte gUnknown_2021D18 +_0812594C: .4byte gStringVar4 _08125950: .4byte gUnknown_3005090 _08125954: .4byte sub_81255BC thumb_func_end sub_8125898 @@ -14036,7 +14036,7 @@ sub_8125958: @ 8125958 ldr r0, _08125998 @ =gUnknown_203B0C0 strb r4, [r0] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0812599C @ =gUnknown_84169DC b _081259F6 .align 2, 0 @@ -14062,7 +14062,7 @@ _081259A0: adds r2, r5, 0 bl sub_80A2294 movs r0, 0x1 - bl sub_80722CC + bl PlaySE adds r0, r5, 0 movs r1, 0x1 bl sub_809A1D8 @@ -14073,7 +14073,7 @@ _081259A0: bl GetMonData lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08125A28 @ =gUnknown_2021CD0 + ldr r0, _08125A28 @ =gStringVar1 movs r1, 0xD muls r1, r4 ldr r2, _08125A2C @ =gUnknown_8247094 @@ -14081,7 +14081,7 @@ _081259A0: bl StringCopy adds r0, r5, 0 bl GetMedicineItemEffectMessage - ldr r0, _08125A30 @ =gUnknown_2021D18 + ldr r0, _08125A30 @ =gStringVar4 _081259F6: movs r1, 0x1 bl sub_81202F8 @@ -14103,9 +14103,9 @@ _081259F6: _08125A1C: .4byte gUnknown_203B0C0 _08125A20: .4byte gUnknown_2024284 _08125A24: .4byte 0x0000ffff -_08125A28: .4byte gUnknown_2021CD0 +_08125A28: .4byte gStringVar1 _08125A2C: .4byte gUnknown_8247094 -_08125A30: .4byte gUnknown_2021D18 +_08125A30: .4byte gStringVar4 _08125A34: .4byte gUnknown_3005090 _08125A38: .4byte sub_81255BC thumb_func_end sub_8125958 @@ -14117,7 +14117,7 @@ dp05_pp_up: @ 8125A3C lsls r4, 24 lsrs r4, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x18 bl sub_8121D0C ldr r0, _08125A6C @ =gUnknown_203B0A0 @@ -14218,7 +14218,7 @@ _08125AE8: sub_8125AF0: @ 8125AF0 push {r4,lr} adds r1, r0, 0 - ldr r4, _08125B10 @ =gUnknown_2021D18 + ldr r4, _08125B10 @ =gStringVar4 adds r0, r4, 0 bl StringExpandPlaceholders adds r0, r4, 0 @@ -14230,7 +14230,7 @@ sub_8125AF0: @ 8125AF0 pop {r0} bx r0 .align 2, 0 -_08125B10: .4byte gUnknown_2021D18 +_08125B10: .4byte gStringVar4 thumb_func_end sub_8125AF0 thumb_func_start sub_8125B14 @@ -14264,7 +14264,7 @@ sub_8125B40: @ 8125B40 lsls r0, 24 lsrs r6, r0, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r7, _08125BD0 @ =gUnknown_203B0A0 movs r1, 0x9 ldrsb r1, [r7, r1] @@ -14277,13 +14277,13 @@ sub_8125B40: @ 8125B40 mov r8, r0 ldr r0, _08125BD8 @ =gUnknown_203AD30 ldrh r5, [r0] - ldr r1, _08125BDC @ =gUnknown_2021CD0 + ldr r1, _08125BDC @ =gStringVar1 adds r0, r4, 0 bl GetMonNickname adds r0, r5, 0 bl ItemIdToBattleMoveId strh r0, [r7, 0xE] - ldr r0, _08125BE0 @ =gUnknown_2021CF0 + ldr r0, _08125BE0 @ =gStringVar2 movs r1, 0xE ldrsh r2, [r7, r1] movs r1, 0xD @@ -14326,8 +14326,8 @@ sub_8125B40: @ 8125B40 _08125BD0: .4byte gUnknown_203B0A0 _08125BD4: .4byte gUnknown_2024284 _08125BD8: .4byte gUnknown_203AD30 -_08125BDC: .4byte gUnknown_2021CD0 -_08125BE0: .4byte gUnknown_2021CF0 +_08125BDC: .4byte gStringVar1 +_08125BE0: .4byte gStringVar2 _08125BE4: .4byte gUnknown_8247094 _08125BE8: .4byte 0x0000ffff _08125BEC: .4byte gUnknown_3005E98 @@ -14408,10 +14408,10 @@ sub_8125C48: @ 8125C48 movs r1, 0x1 bl sub_809A1D8 _08125C84: - ldr r1, _08125CD8 @ =gUnknown_2021CD0 + ldr r1, _08125CD8 @ =gStringVar1 adds r0, r5, 0 bl GetMonNickname - ldr r0, _08125CDC @ =gUnknown_2021CF0 + ldr r0, _08125CDC @ =gStringVar2 movs r1, 0 ldrsh r2, [r6, r1] movs r1, 0xD @@ -14419,7 +14419,7 @@ _08125C84: ldr r2, _08125CE0 @ =gUnknown_8247094 adds r1, r2 bl StringCopy - ldr r4, _08125CE4 @ =gUnknown_2021D18 + ldr r4, _08125CE4 @ =gStringVar4 ldr r1, _08125CE8 @ =gUnknown_8416DB3 adds r0, r4, 0 bl StringExpandPlaceholders @@ -14442,10 +14442,10 @@ _08125C84: _08125CCC: .4byte gUnknown_203B0A0 _08125CD0: .4byte gUnknown_2024284 _08125CD4: .4byte gUnknown_203AD30 -_08125CD8: .4byte gUnknown_2021CD0 -_08125CDC: .4byte gUnknown_2021CF0 +_08125CD8: .4byte gStringVar1 +_08125CDC: .4byte gStringVar2 _08125CE0: .4byte gUnknown_8247094 -_08125CE4: .4byte gUnknown_2021D18 +_08125CE4: .4byte gStringVar4 _08125CE8: .4byte gUnknown_8416DB3 _08125CEC: .4byte gUnknown_3005090 _08125CF0: .4byte sub_8125CF4 @@ -14595,7 +14595,7 @@ _08125E00: .4byte gUnknown_3005090 _08125E04: .4byte sub_8125E1C _08125E08: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08125E0E: adds r0, r4, 0 bl sub_81260D8 @@ -14800,10 +14800,10 @@ sub_8125F5C: @ 8125F5C adds r1, r6, 0 adds r3, r4, 0 bl sub_80A2294 - ldr r1, _08125FF0 @ =gUnknown_2021CD0 + ldr r1, _08125FF0 @ =gStringVar1 adds r0, r6, 0 bl GetMonNickname - ldr r0, _08125FF4 @ =gUnknown_2021CF0 + ldr r0, _08125FF4 @ =gStringVar2 movs r1, 0xD muls r1, r4 ldr r2, _08125FF8 @ =gUnknown_8247094 @@ -14829,8 +14829,8 @@ sub_8125F5C: @ 8125F5C _08125FE4: .4byte gUnknown_203B0A0 _08125FE8: .4byte gUnknown_2024284 _08125FEC: .4byte gUnknown_203AD30 -_08125FF0: .4byte gUnknown_2021CD0 -_08125FF4: .4byte gUnknown_2021CF0 +_08125FF0: .4byte gStringVar1 +_08125FF4: .4byte gStringVar2 _08125FF8: .4byte gUnknown_8247094 thumb_func_end sub_8125F5C @@ -14858,10 +14858,10 @@ sub_8125FFC: @ 8125FFC adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r1, _08126064 @ =gUnknown_2021CD0 + ldr r1, _08126064 @ =gStringVar1 adds r0, r5, 0 bl GetMonNickname - ldr r0, _08126068 @ =gUnknown_2021CF0 + ldr r0, _08126068 @ =gStringVar2 movs r1, 0xD muls r1, r4 ldr r2, _0812606C @ =gUnknown_8247094 @@ -14882,8 +14882,8 @@ sub_8125FFC: @ 8125FFC .align 2, 0 _0812605C: .4byte gUnknown_203B0A0 _08126060: .4byte gUnknown_2024284 -_08126064: .4byte gUnknown_2021CD0 -_08126068: .4byte gUnknown_2021CF0 +_08126064: .4byte gStringVar1 +_08126068: .4byte gStringVar2 _0812606C: .4byte gUnknown_8247094 _08126070: .4byte gUnknown_8416EC6 _08126074: .4byte gUnknown_3005090 @@ -14939,7 +14939,7 @@ sub_81260D8: @ 81260D8 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08126120 @ =gUnknown_2021CF0 + ldr r0, _08126120 @ =gStringVar2 ldr r1, _08126124 @ =gUnknown_203B0A0 movs r3, 0xE ldrsh r2, [r1, r3] @@ -14948,7 +14948,7 @@ sub_81260D8: @ 81260D8 ldr r2, _08126128 @ =gUnknown_8247094 adds r1, r2 bl StringCopy - ldr r4, _0812612C @ =gUnknown_2021D18 + ldr r4, _0812612C @ =gStringVar4 ldr r1, _08126130 @ =gUnknown_8416E6B adds r0, r4, 0 bl StringExpandPlaceholders @@ -14968,10 +14968,10 @@ sub_81260D8: @ 81260D8 pop {r0} bx r0 .align 2, 0 -_08126120: .4byte gUnknown_2021CF0 +_08126120: .4byte gStringVar2 _08126124: .4byte gUnknown_203B0A0 _08126128: .4byte gUnknown_8247094 -_0812612C: .4byte gUnknown_2021D18 +_0812612C: .4byte gStringVar4 _08126130: .4byte gUnknown_8416E6B _08126134: .4byte gUnknown_3005090 _08126138: .4byte sub_812613C @@ -15036,10 +15036,10 @@ _081261A8: beq _0812623A b _0812626A _081261AE: - ldr r1, _081261F4 @ =gUnknown_2021CD0 + ldr r1, _081261F4 @ =gStringVar1 adds r0, r4, 0 bl GetMonNickname - ldr r0, _081261F8 @ =gUnknown_2021CF0 + ldr r0, _081261F8 @ =gStringVar2 movs r1, 0xE ldrsh r2, [r7, r1] movs r1, 0xD @@ -15047,7 +15047,7 @@ _081261AE: ldr r2, _081261FC @ =gUnknown_8247094 adds r1, r2 bl StringCopy - ldr r4, _08126200 @ =gUnknown_2021D18 + ldr r4, _08126200 @ =gStringVar4 ldr r1, _08126204 @ =gUnknown_8416E84 adds r0, r4, 0 bl StringExpandPlaceholders @@ -15067,10 +15067,10 @@ _081261AE: str r0, [r1] b _0812626A .align 2, 0 -_081261F4: .4byte gUnknown_2021CD0 -_081261F8: .4byte gUnknown_2021CF0 +_081261F4: .4byte gStringVar1 +_081261F8: .4byte gStringVar2 _081261FC: .4byte gUnknown_8247094 -_08126200: .4byte gUnknown_2021D18 +_08126200: .4byte gStringVar4 _08126204: .4byte gUnknown_8416E84 _08126208: .4byte gUnknown_3005090 _0812620C: .4byte sub_812628C @@ -15094,12 +15094,12 @@ _0812622C: .4byte gUnknown_3005090 _08126230: .4byte sub_81255BC _08126234: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0812623A: - ldr r1, _08126270 @ =gUnknown_2021CD0 + ldr r1, _08126270 @ =gStringVar1 adds r0, r4, 0 bl GetMonNickname - ldr r0, _08126274 @ =gUnknown_2021CF0 + ldr r0, _08126274 @ =gStringVar2 ldr r1, _08126278 @ =gUnknown_203B0A0 movs r3, 0xE ldrsh r2, [r1, r3] @@ -15122,8 +15122,8 @@ _0812626A: pop {r0} bx r0 .align 2, 0 -_08126270: .4byte gUnknown_2021CD0 -_08126274: .4byte gUnknown_2021CF0 +_08126270: .4byte gStringVar1 +_08126274: .4byte gStringVar2 _08126278: .4byte gUnknown_203B0A0 _0812627C: .4byte gUnknown_8247094 _08126280: .4byte gUnknown_8416DF7 @@ -15187,7 +15187,7 @@ _081262F4: movs r4, 0x1 _081262F6: movs r0, 0x5 - bl sub_80722CC + bl PlaySE cmp r4, 0 beq _08126330 ldr r1, _08126324 @ =gUnknown_203B0C0 @@ -15277,7 +15277,7 @@ sub_8126350: @ 8126350 ldrh r0, [r5] movs r1, 0x1 bl sub_809A1D8 - ldr r1, _08126428 @ =gUnknown_2021CD0 + ldr r1, _08126428 @ =gStringVar1 adds r0, r4, 0 bl GetMonNickname adds r0, r4, 0 @@ -15286,11 +15286,11 @@ sub_8126350: @ 8126350 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0812642C @ =gUnknown_2021CF0 + ldr r0, _0812642C @ =gStringVar2 movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _08126430 @ =gUnknown_2021D18 + ldr r4, _08126430 @ =gStringVar4 ldr r1, _08126434 @ =gUnknown_8417017 adds r0, r4, 0 bl StringExpandPlaceholders @@ -15319,9 +15319,9 @@ _08126418: .4byte gUnknown_203B09C _0812641C: .4byte gUnknown_203AD30 _08126420: .4byte gUnknown_203B0C0 _08126424: .4byte 0x0000ffff -_08126428: .4byte gUnknown_2021CD0 -_0812642C: .4byte gUnknown_2021CF0 -_08126430: .4byte gUnknown_2021D18 +_08126428: .4byte gStringVar1 +_0812642C: .4byte gStringVar2 +_08126430: .4byte gStringVar4 _08126434: .4byte gUnknown_8417017 _08126438: .4byte gUnknown_3005090 _0812643C: .4byte sub_81264C8 @@ -15417,7 +15417,7 @@ sub_81264C8: @ 81264C8 beq _08126514 _081264FA: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_8126570 ldr r0, _08126520 @ =gUnknown_3005090 @@ -15454,7 +15454,7 @@ sub_8126528: @ 8126528 beq _0812655C _08126542: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_81265BC ldr r0, _08126568 @ =gUnknown_3005090 @@ -15747,9 +15747,9 @@ sub_8126770: @ 8126770 muls r0, r1 ldr r1, _081267E0 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _081267E4 @ =gUnknown_2021CD0 + ldr r1, _081267E4 @ =gStringVar1 bl GetMonNickname - ldr r0, _081267E8 @ =gUnknown_2021CF0 + ldr r0, _081267E8 @ =gStringVar2 ldr r6, _081267EC @ =gUnknown_2024022 ldrh r2, [r6] movs r1, 0xD @@ -15757,7 +15757,7 @@ sub_8126770: @ 8126770 ldr r2, _081267F0 @ =gUnknown_8247094 adds r1, r2 bl StringCopy - ldr r4, _081267F4 @ =gUnknown_2021D18 + ldr r4, _081267F4 @ =gStringVar4 ldr r1, _081267F8 @ =gUnknown_8416DF7 adds r0, r4, 0 bl StringExpandPlaceholders @@ -15784,11 +15784,11 @@ sub_8126770: @ 8126770 .align 2, 0 _081267DC: .4byte gUnknown_203B0A0 _081267E0: .4byte gUnknown_2024284 -_081267E4: .4byte gUnknown_2021CD0 -_081267E8: .4byte gUnknown_2021CF0 +_081267E4: .4byte gStringVar1 +_081267E8: .4byte gStringVar2 _081267EC: .4byte gUnknown_2024022 _081267F0: .4byte gUnknown_8247094 -_081267F4: .4byte gUnknown_2021D18 +_081267F4: .4byte gStringVar4 _081267F8: .4byte gUnknown_8416DF7 _081267FC: .4byte gUnknown_3005090 _08126800: .4byte sub_8125D88 @@ -15813,15 +15813,15 @@ sub_8126804: @ 8126804 muls r0, r1 ldr r1, _08126874 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _08126878 @ =gUnknown_2021CD0 + ldr r1, _08126878 @ =gStringVar1 bl GetMonNickname - ldr r0, _0812687C @ =gUnknown_2021CF0 + ldr r0, _0812687C @ =gStringVar2 movs r1, 0xD muls r1, r5 ldr r2, _08126880 @ =gUnknown_8247094 adds r1, r2 bl StringCopy - ldr r4, _08126884 @ =gUnknown_2021D18 + ldr r4, _08126884 @ =gStringVar4 ldr r1, _08126888 @ =gUnknown_8416DB3 adds r0, r4, 0 bl StringExpandPlaceholders @@ -15847,10 +15847,10 @@ sub_8126804: @ 8126804 .align 2, 0 _08126870: .4byte gUnknown_203B0A0 _08126874: .4byte gUnknown_2024284 -_08126878: .4byte gUnknown_2021CD0 -_0812687C: .4byte gUnknown_2021CF0 +_08126878: .4byte gStringVar1 +_0812687C: .4byte gStringVar2 _08126880: .4byte gUnknown_8247094 -_08126884: .4byte gUnknown_2021D18 +_08126884: .4byte gStringVar4 _08126888: .4byte gUnknown_8416DB3 _0812688C: .4byte gUnknown_3005090 _08126890: .4byte sub_8125CF4 @@ -15943,7 +15943,7 @@ _0812693C: .4byte gUnknown_3005090 _08126940: .4byte sub_8126A18 _08126944: movs r0, 0x1 - bl sub_80722CC + bl PlaySE ldr r7, _08126A00 @ =gUnknown_203B09C ldr r0, [r7] ldr r1, _08126A04 @ =0x0000021a @@ -16160,9 +16160,9 @@ sub_8126AFC: @ 8126AFC muls r0, r1 ldr r1, _08126B48 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _08126B4C @ =gUnknown_2021CD0 + ldr r1, _08126B4C @ =gStringVar1 bl GetMonNickname - ldr r4, _08126B50 @ =gUnknown_2021D18 + ldr r4, _08126B50 @ =gStringVar4 ldr r1, _08126B54 @ =gUnknown_8416F27 adds r0, r4, 0 bl StringExpandPlaceholders @@ -16184,8 +16184,8 @@ sub_8126AFC: @ 8126AFC .align 2, 0 _08126B44: .4byte gUnknown_203B0A0 _08126B48: .4byte gUnknown_2024284 -_08126B4C: .4byte gUnknown_2021CD0 -_08126B50: .4byte gUnknown_2021D18 +_08126B4C: .4byte gStringVar1 +_08126B50: .4byte gStringVar4 _08126B54: .4byte gUnknown_8416F27 _08126B58: .4byte gUnknown_3005090 _08126B5C: .4byte sub_8126A18 @@ -16198,7 +16198,7 @@ sub_8126B60: @ 8126B60 lsls r0, 24 lsrs r4, r0, 24 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _08126BB0 @ =gUnknown_203B0A0 movs r1, 0x9 ldrsb r1, [r2, r1] @@ -16544,14 +16544,14 @@ sub_8126DC8: @ 8126DC8 movs r0, 0xE adds r0, r7 mov r8, r0 - ldr r1, _08126E58 @ =gUnknown_2021CD0 + ldr r1, _08126E58 @ =gStringVar1 adds r0, r5, 0 bl GetMonNickname ldr r4, _08126E5C @ =gUnknown_20370C2 ldrb r0, [r4] bl sub_8120BA8 strh r0, [r7, 0xE] - ldr r0, _08126E60 @ =gUnknown_2021CF0 + ldr r0, _08126E60 @ =gStringVar2 movs r1, 0xE ldrsh r2, [r7, r1] movs r1, 0xD @@ -16586,9 +16586,9 @@ sub_8126DC8: @ 8126DC8 _08126E4C: .4byte gUnknown_2037AB8 _08126E50: .4byte gUnknown_203B0A0 _08126E54: .4byte gUnknown_2024284 -_08126E58: .4byte gUnknown_2021CD0 +_08126E58: .4byte gStringVar1 _08126E5C: .4byte gUnknown_20370C2 -_08126E60: .4byte gUnknown_2021CF0 +_08126E60: .4byte gStringVar2 _08126E64: .4byte gUnknown_8247094 _08126E68: .4byte 0xffff0000 _08126E6C: @@ -17125,14 +17125,14 @@ _0812728E: bl sub_81273AC ldrh r0, [r6] bl sub_8120658 - ldr r0, _081272C8 @ =gUnknown_2021D18 + ldr r0, _081272C8 @ =gStringVar4 movs r1, 0 bl sub_81202F8 b _0812730C .align 2, 0 _081272C0: .4byte gUnknown_203B0A0 _081272C4: .4byte gUnknown_203B0D8 -_081272C8: .4byte gUnknown_2021D18 +_081272C8: .4byte gStringVar4 _081272CC: adds r0, r4, 0 bl itemid_is_mail @@ -17177,7 +17177,7 @@ _08127320: .4byte gUnknown_3005090 _08127324: .4byte sub_8127098 _08127328: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0812732E: ldr r0, _08127344 @ =gUnknown_3005090 lsls r1, r5, 2 @@ -17730,7 +17730,7 @@ sub_812773C: @ 812773C cmp r4, 0xFF beq _08127768 movs r0, 0x1A - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_8121D0C ldr r0, _08127764 @ =gUnknown_3005090 @@ -17745,7 +17745,7 @@ _08127768: cmp r0, 0 beq _08127784 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r5, 0 bl sub_811FA78 b _0812779E @@ -17753,7 +17753,7 @@ _08127768: _08127780: .4byte gUnknown_203B0D4 _08127784: movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0xE bl sub_8121D0C ldr r0, _081277A4 @ =gUnknown_3005090 @@ -17790,7 +17790,7 @@ sub_81277AC: @ 81277AC beq _081277E0 _081277C6: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl sub_8121D0C ldr r0, _081277EC @ =gUnknown_3005090 @@ -18181,17 +18181,17 @@ sub_8127AC0: @ 8127AC0 cmp r5, 0x5 bne _08127B08 _08127AE6: - ldr r4, _08127AFC @ =gUnknown_2021CD0 + ldr r4, _08127AFC @ =gStringVar1 bl sub_80444C4 adds r1, r0, 0 adds r0, r4, 0 bl StringCopy - ldr r0, _08127B00 @ =gUnknown_2021D18 + ldr r0, _08127B00 @ =gStringVar4 ldr r1, _08127B04 @ =gUnknown_8416A98 b _08127C86 .align 2, 0 -_08127AFC: .4byte gUnknown_2021CD0 -_08127B00: .4byte gUnknown_2021D18 +_08127AFC: .4byte gStringVar1 +_08127B00: .4byte gStringVar4 _08127B04: .4byte gUnknown_8416A98 _08127B08: movs r0, 0x64 @@ -18204,16 +18204,16 @@ _08127B08: bl GetMonData cmp r0, 0 bne _08127B3C - ldr r1, _08127B30 @ =gUnknown_2021CD0 + ldr r1, _08127B30 @ =gStringVar1 adds r0, r4, 0 bl GetMonNickname - ldr r0, _08127B34 @ =gUnknown_2021D18 + ldr r0, _08127B34 @ =gStringVar4 ldr r1, _08127B38 @ =gUnknown_8416A75 b _08127C86 .align 2, 0 _08127B2C: .4byte gUnknown_2024284 -_08127B30: .4byte gUnknown_2021CD0 -_08127B34: .4byte gUnknown_2021D18 +_08127B30: .4byte gStringVar1 +_08127B34: .4byte gStringVar4 _08127B38: .4byte gUnknown_8416A75 _08127B3C: movs r4, 0 @@ -18254,14 +18254,14 @@ _08127B68: bl GetMonData cmp r0, 0 beq _08127BA4 - ldr r0, _08127B9C @ =gUnknown_2021D18 + ldr r0, _08127B9C @ =gStringVar4 ldr r1, _08127BA0 @ =gUnknown_8416ACB b _08127C86 .align 2, 0 _08127B90: .4byte gUnknown_2023BCE _08127B94: .4byte gUnknown_2023BCC _08127B98: .4byte gUnknown_2024284 -_08127B9C: .4byte gUnknown_2021D18 +_08127B9C: .4byte gStringVar4 _08127BA0: .4byte gUnknown_8416ACB _08127BA4: adds r0, r5, 0 @@ -18274,16 +18274,16 @@ _08127BA4: ldrb r1, [r1] cmp r0, r1 bne _08127BD8 - ldr r1, _08127BCC @ =gUnknown_2021CD0 + ldr r1, _08127BCC @ =gStringVar1 adds r0, r6, 0 bl GetMonNickname - ldr r0, _08127BD0 @ =gUnknown_2021D18 + ldr r0, _08127BD0 @ =gStringVar4 ldr r1, _08127BD4 @ =gUnknown_8416A55 b _08127C86 .align 2, 0 _08127BC8: .4byte gUnknown_2023FE8 -_08127BCC: .4byte gUnknown_2021CD0 -_08127BD0: .4byte gUnknown_2021D18 +_08127BCC: .4byte gStringVar1 +_08127BD0: .4byte gStringVar4 _08127BD4: .4byte gUnknown_8416A55 _08127BD8: ldr r0, _08127BE8 @ =gUnknown_203B0A0 @@ -18334,15 +18334,15 @@ _08127C40: muls r0, r5 ldr r1, _08127C54 @ =gUnknown_2024284 adds r0, r1 - ldr r1, _08127C58 @ =gUnknown_2021CD0 + ldr r1, _08127C58 @ =gStringVar1 bl GetMonNickname - ldr r0, _08127C5C @ =gUnknown_2021D18 + ldr r0, _08127C5C @ =gStringVar4 ldr r1, _08127C60 @ =gUnknown_8416A3A b _08127C86 .align 2, 0 _08127C54: .4byte gUnknown_2024284 -_08127C58: .4byte gUnknown_2021CD0 -_08127C5C: .4byte gUnknown_2021D18 +_08127C58: .4byte gStringVar1 +_08127C5C: .4byte gStringVar4 _08127C60: .4byte gUnknown_8416A3A _08127C64: ldr r0, _08127C98 @ =gUnknown_2024004 @@ -18356,9 +18356,9 @@ _08127C64: lsrs r0, 24 muls r0, r7 add r0, r8 - ldr r1, _08127CA0 @ =gUnknown_2021CD0 + ldr r1, _08127CA0 @ =gStringVar1 bl GetMonNickname - ldr r0, _08127CA4 @ =gUnknown_2021D18 + ldr r0, _08127CA4 @ =gStringVar4 ldr r1, _08127CA8 @ =gUnknown_8416A1E _08127C86: bl StringExpandPlaceholders @@ -18373,8 +18373,8 @@ _08127C8C: .align 2, 0 _08127C98: .4byte gUnknown_2024004 _08127C9C: .4byte gUnknown_2023BCE -_08127CA0: .4byte gUnknown_2021CD0 -_08127CA4: .4byte gUnknown_2021D18 +_08127CA0: .4byte gStringVar1 +_08127CA4: .4byte gStringVar4 _08127CA8: .4byte gUnknown_8416A1E thumb_func_end sub_8127AC0 @@ -19155,7 +19155,7 @@ _0812824C: cmp r4, 0x5 bls _08128230 movs r0, 0x71 - bl sub_80722CC + bl PlaySE ldr r0, _08128280 @ =gUnknown_3005090 adds r1, r6, r5 lsls r1, 3 diff --git a/asm/player_pc.s b/asm/player_pc.s index 8de67a2d8..f16d191cb 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -234,7 +234,7 @@ sub_80EB81C: @ 80EB81C cmp r5, r0 bne _080EB878 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r0, [r4, 0x14] movs r1, 0 bl sub_810F4D8 @@ -546,7 +546,7 @@ sub_80EBAB8: @ 80EBAB8 cmp r0, 0 beq _080EBB64 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 b _080EBB04 @@ -563,7 +563,7 @@ _080EBAE8: cmp r0, 0x2 beq _080EBB64 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 _080EBB04: bl MoveMenuCursor @@ -584,7 +584,7 @@ _080EBB20: cmp r0, 0 beq _080EBB4C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _080EBB48 @ =gUnknown_8402208 bl GetMenuCursorPos lsls r0, 24 @@ -603,7 +603,7 @@ _080EBB4C: cmp r0, 0 beq _080EBB64 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _080EBB6C @ =gUnknown_8402208 ldr r1, [r0, 0x14] adds r0, r4, 0 @@ -1063,7 +1063,7 @@ sub_80EBEB0: @ 80EBEB0 movs r0, 0x2 mov r1, r8 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r5, r0, 0 movs r0, 0x1 bl sub_810EBAC @@ -1157,7 +1157,7 @@ _080EBF98: .4byte gUnknown_2037AB8 _080EBF9C: .4byte gUnknown_203AAC6 _080EBFA0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE mov r1, r8 ldrb r0, [r1, 0xA] bl RemoveScrollIndicatorArrowPair @@ -1166,7 +1166,7 @@ _080EBFA0: b _080EBFEA _080EBFB6: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl sub_810EBE0 movs r0, 0x1 @@ -1202,7 +1202,7 @@ sub_80EBFFC: @ 80EBFFC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080EC054 @ =gUnknown_2021CD0 + ldr r4, _080EC054 @ =gStringVar1 ldr r2, _080EC058 @ =gSaveBlock1Ptr ldr r1, _080EC05C @ =gUnknown_203AAC4 ldrh r0, [r1] @@ -1243,7 +1243,7 @@ _080EC044: beq _080EC044 b _080EC06C .align 2, 0 -_080EC054: .4byte gUnknown_2021CD0 +_080EC054: .4byte gStringVar1 _080EC058: .4byte gSaveBlock1Ptr _080EC05C: .4byte gUnknown_203AAC4 _080EC060: .4byte 0x00002ce2 @@ -1252,7 +1252,7 @@ _080EC064: movs r1, 0x1 bl ConvertInternationalString _080EC06C: - ldr r4, _080EC088 @ =gUnknown_2021D18 + ldr r4, _080EC088 @ =gStringVar4 ldr r1, _080EC08C @ =gUnknown_8417806 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1265,7 +1265,7 @@ _080EC06C: pop {r0} bx r0 .align 2, 0 -_080EC088: .4byte gUnknown_2021D18 +_080EC088: .4byte gStringVar4 _080EC08C: .4byte gUnknown_8417806 _080EC090: .4byte sub_80EC0D8 thumb_func_end sub_80EBFFC @@ -1380,13 +1380,13 @@ sub_80EC15C: @ 80EC15C cmp r4, r0 bne _080EC188 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r5, 0 bl sub_80EC574 b _080EC19E _080EC188: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _080EC1A4 @ =gUnknown_8402228 lsls r1, r4, 3 adds r0, 0x4 @@ -1619,7 +1619,7 @@ _080EC348: b _080EC35C _080EC350: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _080EC356: adds r0, r4, 0 bl sub_80EC3F8 diff --git a/asm/pokeball.s b/asm/pokeball.s index ac9ddff68..d9af96f92 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -305,7 +305,7 @@ _0804AB6C: ldr r1, _0804ABD0 @ =nullsub_43 str r1, [r0] movs r0, 0x36 - bl sub_80722CC + bl PlaySE _0804ABB8: add sp, 0x8 pop {r3-r5} @@ -484,7 +484,7 @@ sub_804AD00: @ 804AD00 cmp r0, 0xB bne _0804AD18 movs r0, 0x35 - bl sub_80722CC + bl PlaySE _0804AD18: ldr r6, _0804AD64 @ =gUnknown_202063C ldr r5, _0804AD68 @ =gUnknown_2023D44 @@ -653,19 +653,19 @@ _0804AE50: b _0804AE6E _0804AE56: movs r0, 0x31 - bl sub_80722CC + bl PlaySE b _0804AEA2 _0804AE5E: movs r0, 0x32 - bl sub_80722CC + bl PlaySE b _0804AEA2 _0804AE66: movs r0, 0x33 - bl sub_80722CC + bl PlaySE b _0804AEA2 _0804AE6E: movs r0, 0x34 - bl sub_80722CC + bl PlaySE b _0804AEA2 _0804AE76: movs r2, 0x38 @@ -750,7 +750,7 @@ sub_804AEE4: @ 804AEE4 ldr r0, _0804AF20 @ =sub_804AF24 str r0, [r4, 0x1C] movs r0, 0x17 - bl sub_80722CC + bl PlaySE _0804AF18: pop {r4} pop {r0} @@ -924,7 +924,7 @@ _0804B05C: bl StartSpriteAffineAnim _0804B064: movs r0, 0x17 - bl sub_80722CC + bl PlaySE _0804B06A: pop {r4} pop {r0} @@ -1597,7 +1597,7 @@ sub_804B5C8: @ 804B5C8 strb r1, [r0] bl m4aMPlayAllStop ldr r0, _0804B5FC @ =0x0000013f - bl sub_80722CC + bl PlaySE b _0804B666 .align 2, 0 _0804B5F8: .4byte gUnknown_2024005 @@ -2513,7 +2513,7 @@ sub_804BCF8: @ 804BCF8 cmp r0, 0xB bne _0804BD10 movs r0, 0x35 - bl sub_80722CC + bl PlaySE _0804BD10: ldrh r1, [r5, 0x2E] lsls r1, 24 diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 347f7cd9c..12e43f222 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -1164,7 +1164,7 @@ sub_8102EC0: @ 8102EC0 cmp r1, 0 bne _08102ED0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08102ED0: movs r0, 0x2 negs r0, r0 @@ -2898,7 +2898,7 @@ _08103D32: strb r0, [r2] _08103D60: movs r0, 0x5 - bl sub_80722CC + bl PlaySE b _08104228 .align 2, 0 _08103D68: .4byte gUnknown_203ACF0 @@ -3138,7 +3138,7 @@ _08103F20: adds r0, 0x5A strh r1, [r0] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, [r5] movs r0, 0xE b _08104226 @@ -4775,7 +4775,7 @@ sub_8104C2C: @ 8104C2C movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0x14 negs r1, r1 adds r3, r1, 0 @@ -5825,7 +5825,7 @@ _081054DC: adds r0, 0x1 strb r0, [r1, 0x2] movs r0, 0x6B - bl sub_80722CC + bl PlaySE b _0810557C .align 2, 0 _081054EC: .4byte gUnknown_203ACF0 @@ -6290,7 +6290,7 @@ _08105878: movs r0, 0 add r1, sp, 0x8 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r0, r6, r0 lsls r0, 24 lsrs r6, r0, 24 @@ -6861,7 +6861,7 @@ sub_8105CB0: @ 8105CB0 strb r0, [r2, 0xD] movs r0, 0x2 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth lsls r0, 16 lsrs r0, 16 movs r1, 0xF0 @@ -7590,7 +7590,7 @@ _081062B4: movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth ldr r1, [r7] adds r1, 0x53 ldrb r1, [r1] @@ -7627,7 +7627,7 @@ _081062B4: movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth ldr r1, [r7] adds r1, 0x54 ldrb r1, [r1] @@ -8029,7 +8029,7 @@ _081066E2: movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth ldr r1, [r5] adds r1, 0x4A ldrb r1, [r1] @@ -8983,7 +8983,7 @@ _08106E8E: movs r0, 0x2 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0xF0 subs r1, r0 lsrs r1, 1 @@ -8992,7 +8992,7 @@ _08106EA0: movs r0, 0x2 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0xE8 subs r1, r0 _08106EAE: diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index 79621efa3..33bfdcaea 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -2364,7 +2364,7 @@ EvolutionRenameMon: @ 804356C lsls r2, 16 lsrs r2, 16 mov r8, r2 - ldr r0, _080435D8 @ =gUnknown_2021CD0 + ldr r0, _080435D8 @ =gStringVar1 mov r9, r0 adds r0, r5, 0 movs r1, 0x2 @@ -2404,7 +2404,7 @@ _080435C8: pop {r0} bx r0 .align 2, 0 -_080435D8: .4byte gUnknown_2021CD0 +_080435D8: .4byte gStringVar1 _080435DC: .4byte gUnknown_8245EE0 thumb_func_end EvolutionRenameMon @@ -4323,7 +4323,7 @@ _080443AA: movs r0, 0xFF strb r0, [r4, 0x4] ldr r0, _080443EC @ =gUnknown_83FCA2C - ldr r1, _080443F0 @ =gUnknown_2021D18 + ldr r1, _080443F0 @ =gStringVar4 bl sub_80D7868 pop {r4,r5} pop {r0} @@ -4333,7 +4333,7 @@ _080443E0: .4byte gUnknown_2023BCE _080443E4: .4byte gUnknown_2022AC8 _080443E8: .4byte gUnknown_2024004 _080443EC: .4byte gUnknown_83FCA2C -_080443F0: .4byte gUnknown_2021D18 +_080443F0: .4byte gStringVar4 thumb_func_end sub_8044348 thumb_func_start SetWildMonHeldItem diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s index c407807d0..5c10eb282 100644 --- a/asm/pokemon_size_record.s +++ b/asm/pokemon_size_record.s @@ -254,10 +254,10 @@ _080A0874: adds r0, r6, 0 bl GetMonSize adds r4, r0, 0 - ldr r0, _080A08AC @ =gUnknown_2021D04 + ldr r0, _080A08AC @ =gStringVar3 adds r1, r4, 0 bl sub_80A07E4 - ldr r0, _080A08B0 @ =gUnknown_2021CF0 + ldr r0, _080A08B0 @ =gStringVar2 adds r1, r5, 0 bl sub_80A07E4 cmp r5, r4 @@ -265,8 +265,8 @@ _080A0874: movs r0, 0x4 b _080A08C4 .align 2, 0 -_080A08AC: .4byte gUnknown_2021D04 -_080A08B0: .4byte gUnknown_2021CF0 +_080A08AC: .4byte gStringVar3 +_080A08B0: .4byte gStringVar2 _080A08B4: cmp r5, r4 bcc _080A08C2 @@ -294,9 +294,9 @@ sub_80A08CC: @ 80A08CC adds r0, r4, 0 bl GetMonSize adds r1, r0, 0 - ldr r0, _080A08F8 @ =gUnknown_2021D04 + ldr r0, _080A08F8 @ =gStringVar3 bl sub_80A07E4 - ldr r0, _080A08FC @ =gUnknown_2021CD0 + ldr r0, _080A08FC @ =gStringVar1 movs r1, 0xB muls r1, r4 ldr r2, _080A0900 @ =gUnknown_8245EE0 @@ -306,8 +306,8 @@ sub_80A08CC: @ 80A08CC pop {r0} bx r0 .align 2, 0 -_080A08F8: .4byte gUnknown_2021D04 -_080A08FC: .4byte gUnknown_2021CD0 +_080A08F8: .4byte gStringVar3 +_080A08FC: .4byte gStringVar1 _080A0900: .4byte gUnknown_8245EE0 thumb_func_end sub_80A08CC diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index e62122ee8..bb68ad871 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -763,7 +763,7 @@ _0811CB5A: cmp r0, 0x1E bls _0811CBD6 movs r0, 0xE1 - bl sub_80722CC + bl PlaySE movs r0, 0x4 bl sub_811D2EC bl sub_811D4FC @@ -1834,7 +1834,7 @@ _0811D404: movs r2, 0x1 negs r2, r2 movs r0, 0x2 - bl sub_8005ED4 + bl GetStringWidth add r0, r8 lsls r0, 16 lsrs r0, 16 @@ -1844,7 +1844,7 @@ _0811D418: movs r2, 0x1 negs r2, r2 movs r0, 0x2 - bl sub_8005ED4 + bl GetStringWidth add r0, r8 lsls r0, 16 lsrs r0, 16 @@ -2127,7 +2127,7 @@ _0811D63E: movs r0, 0 strh r0, [r4, 0x4] movs r0, 0x85 - bl sub_80722CC + bl PlaySE ldr r0, _0811D66C @ =0x00007da8 str r0, [sp] movs r0, 0x1 @@ -2186,7 +2186,7 @@ _0811D6BA: b _0811D6D6 _0811D6CA: movs r0, 0x54 - bl sub_80722CC + bl PlaySE ldr r0, [r4, 0x10] bl DestroySprite _0811D6D6: @@ -2230,7 +2230,7 @@ sub_811D6FC: @ 811D6FC _0811D710: bl sub_811E10C movs r0, 0x1D - bl sub_80722CC + bl PlaySE ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -2635,7 +2635,7 @@ _0811DA26: cmp r7, 0 bne _0811DA90 movs r0, 0x6D - bl sub_80722CC + bl PlaySE ldrb r1, [r4, 0x2] adds r0, r5, 0 bl sub_811DB14 @@ -3155,7 +3155,7 @@ _0811DE00: movs r0, 0 strh r0, [r4, 0x2] movs r0, 0xBB - bl sub_80722CC + bl PlaySE adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -3205,7 +3205,7 @@ _0811DE2A: movs r0, 0x2 strh r0, [r4] movs r0, 0xDA - bl sub_80722CC + bl PlaySE b _0811DF0C .align 2, 0 _0811DE78: .4byte gUnknown_8459AA8 @@ -3254,7 +3254,7 @@ _0811DEC8: cmp r0, 0 bne _0811DED6 movs r0, 0xD2 - bl sub_80722CC + bl PlaySE _0811DED6: ldrh r0, [r4, 0xE] adds r0, 0x1 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 7bc405b91..8af5c5faa 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -2102,7 +2102,7 @@ sub_808C95C: @ 808C95C cmp r0, 0 beq _0808C978 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0xC9 b _0808C9C0 .align 2, 0 @@ -2113,7 +2113,7 @@ _0808C978: cmp r0, 0 beq _0808C998 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808C994 @ =gUnknown_20397AC ldr r0, [r0] movs r1, 0x91 @@ -2129,7 +2129,7 @@ _0808C998: cmp r0, 0 beq _0808C9AC movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808CC44 b _0808C9BE _0808C9AC: @@ -2138,7 +2138,7 @@ _0808C9AC: cmp r0, 0 beq _0808C9BE movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808CC10 _0808C9BE: movs r0, 0xC8 @@ -3185,7 +3185,7 @@ sub_808D220: @ 808D220 _0808D234: .4byte gUnknown_20397B0 _0808D238: movs r0, 0x2 - bl sub_80722CC + bl PlaySE movs r0, 0x14 movs r1, 0 movs r2, 0x1 @@ -3331,7 +3331,7 @@ _0808D32C: .4byte _0808D608 _0808D394: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D3A4 @ =gUnknown_20397B0 ldr r1, [r0] movs r0, 0x1 @@ -3411,7 +3411,7 @@ _0808D430: _0808D438: .4byte sub_808ECE4 _0808D43C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D44C @ =box_related bl add_to_c3_somehow b _0808D7B2 @@ -3425,7 +3425,7 @@ _0808D450: _0808D458: .4byte sub_808D878 _0808D45C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl StorageGetCurrentBox ldr r4, _0808D48C @ =gUnknown_20397B0 ldr r1, [r4] @@ -3451,7 +3451,7 @@ _0808D48C: .4byte gUnknown_20397B0 _0808D490: .4byte 0x000002ca _0808D494: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl StorageGetCurrentBox ldr r4, _0808D4C4 @ =gUnknown_20397B0 ldr r1, [r4] @@ -3505,7 +3505,7 @@ _0808D500: .4byte gUnknown_20397B0 _0808D504: .4byte 0x00000ce2 _0808D508: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D518 @ =sub_808DD88 bl add_to_c3_somehow b _0808D7B2 @@ -3517,7 +3517,7 @@ _0808D51C: cmp r0, 0 bne _0808D538 movs r0, 0x5 - bl sub_80722CC + bl PlaySE b _0808D740 _0808D52E: bl sub_809393C @@ -3534,7 +3534,7 @@ _0808D538: _0808D544: .4byte gUnknown_20397B0 _0808D548: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D558 @ =sub_808DC50 bl add_to_c3_somehow b _0808D7B2 @@ -3542,7 +3542,7 @@ _0808D548: _0808D558: .4byte sub_808DC50 _0808D55C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D56C @ =sub_808DC9C bl add_to_c3_somehow b _0808D7B2 @@ -3550,7 +3550,7 @@ _0808D55C: _0808D56C: .4byte sub_808DC9C _0808D570: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D580 @ =sub_808DBF0 bl add_to_c3_somehow b _0808D7B2 @@ -3558,7 +3558,7 @@ _0808D570: _0808D580: .4byte sub_808DBF0 _0808D584: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D594 @ =sub_808E140 bl add_to_c3_somehow b _0808D7B2 @@ -3566,7 +3566,7 @@ _0808D584: _0808D594: .4byte sub_808E140 _0808D598: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D5A8 @ =sub_808E1F4 bl add_to_c3_somehow b _0808D7B2 @@ -3574,7 +3574,7 @@ _0808D598: _0808D5A8: .4byte sub_808E1F4 _0808D5AC: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808D5BC @ =sub_808E3C8 bl add_to_c3_somehow b _0808D7B2 @@ -3582,7 +3582,7 @@ _0808D5AC: _0808D5BC: .4byte sub_808E3C8 _0808D5C0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 b _0808D616 _0808D5CA: @@ -3597,7 +3597,7 @@ _0808D5CA: _0808D5DC: .4byte gUnknown_20397B0 _0808D5E0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x2 b _0808D5F6 _0808D5EA: @@ -3605,7 +3605,7 @@ _0808D5EA: b _0808D616 _0808D5EE: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x4 _0808D5F6: bl sub_80950BC @@ -3618,7 +3618,7 @@ _0808D5F6: _0808D604: .4byte gUnknown_20397B0 _0808D608: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x3 bl sub_808FE54 movs r0, 0x5 @@ -3633,7 +3633,7 @@ _0808D616: _0808D624: .4byte gUnknown_20397B0 _0808D628: movs r0, 0x1A - bl sub_80722CC + bl PlaySE b _0808D7B2 _0808D630: bl sub_80924A8 @@ -3722,12 +3722,12 @@ _0808D6E4: .4byte gMain _0808D6E8: .4byte gUnknown_20397B0 _0808D6EC: movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0xD b _0808D6FE _0808D6F6: movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0x16 _0808D6FE: bl sub_808FBA4 @@ -3880,7 +3880,7 @@ _0808D818: b _0808D86A _0808D81E: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808F810 b _0808D840 _0808D82A: @@ -3957,7 +3957,7 @@ _0808D8B4: b _0808DB86 _0808D8C0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _0808D8D8 @ =gUnknown_20397B0 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -4061,7 +4061,7 @@ _0808D9B0: cmp r0, 0 bne _0808DA66 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808FD20 ldr r0, _0808D9CC @ =sub_808DB94 bl add_to_c3_somehow @@ -4070,7 +4070,7 @@ _0808D9B0: _0808D9CC: .4byte sub_808DB94 _0808D9D0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808FD20 ldr r0, _0808D9E4 @ =sub_808DBF0 bl add_to_c3_somehow @@ -4083,7 +4083,7 @@ _0808D9E8: cmp r0, 0 beq _0808DA66 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808FD20 ldr r0, _0808DA04 @ =sub_808DC50 bl add_to_c3_somehow @@ -4092,7 +4092,7 @@ _0808D9E8: _0808DA04: .4byte sub_808DC50 _0808DA08: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808FD20 ldr r0, _0808DA1C @ =sub_808DC9C bl add_to_c3_somehow @@ -4114,7 +4114,7 @@ _0808DA20: cmp r0, 0 bne _0808DAA0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808FD20 ldr r0, _0808DA58 @ =sub_808DD88 bl add_to_c3_somehow @@ -4167,7 +4167,7 @@ _0808DAA0: _0808DAA8: .4byte 0x00000ce2 _0808DAAC: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808DABC @ =sub_808DECC bl add_to_c3_somehow b _0808DB86 @@ -4175,7 +4175,7 @@ _0808DAAC: _0808DABC: .4byte sub_808DECC _0808DAC0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808DAD0 @ =sub_808EAF0 bl add_to_c3_somehow b _0808DB86 @@ -4183,7 +4183,7 @@ _0808DAC0: _0808DAD0: .4byte sub_808EAF0 _0808DAD4: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808DAE4 @ =sub_808E0BC bl add_to_c3_somehow b _0808DB86 @@ -4191,7 +4191,7 @@ _0808DAD4: _0808DAE4: .4byte sub_808E0BC _0808DAE8: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808DAF8 @ =sub_808E140 bl add_to_c3_somehow b _0808DB86 @@ -4199,7 +4199,7 @@ _0808DAE8: _0808DAF8: .4byte sub_808E140 _0808DAFC: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808DB0C @ =sub_808E1F4 bl add_to_c3_somehow b _0808DB86 @@ -4231,17 +4231,17 @@ _0808DB34: _0808DB3C: .4byte sub_808E4B0 _0808DB40: movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0xD b _0808DB5C _0808DB4A: movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0x11 b _0808DB5C _0808DB54: movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0x16 _0808DB5C: bl sub_808FBA4 @@ -5156,7 +5156,7 @@ _0808E2E8: cmp r0, 0 bne _0808E314 movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0x1A bl sub_808FBA4 ldr r1, [r5] @@ -5167,7 +5167,7 @@ _0808E2E8: _0808E310: .4byte 0x00000ce2 _0808E314: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808E33C @ =gUnknown_20397B4 ldrb r0, [r0] negs r4, r0 @@ -5387,7 +5387,7 @@ _0808E4F2: cmp r0, 0 bne _0808E55C movs r0, 0x6 - bl sub_80722CC + bl PlaySE bl sub_8096694 bl sub_80966F4 b _0808E53A @@ -5405,7 +5405,7 @@ _0808E518: cmp r0, 0 beq _0808E55C movs r0, 0x6 - bl sub_80722CC + bl PlaySE b _0808E53A .align 2, 0 _0808E52C: .4byte gMain @@ -5466,7 +5466,7 @@ _0808E584: .4byte _0808E66C _0808E59C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1B bl sub_808FBA4 movs r0, 0 @@ -5753,7 +5753,7 @@ _0808E7DC: _0808E7F0: .4byte sub_808D2BC _0808E7F4: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _0808E804 @ =sub_808EA90 bl add_to_c3_somehow b _0808E830 @@ -5761,7 +5761,7 @@ _0808E7F4: _0808E804: .4byte sub_808EA90 _0808E808: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808FD20 ldr r0, _0808E81C @ =sub_808E83C bl add_to_c3_somehow @@ -5770,7 +5770,7 @@ _0808E808: _0808E81C: .4byte sub_808E83C _0808E820: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808FD20 ldr r0, _0808E838 @ =sub_808E9A0 bl add_to_c3_somehow @@ -5860,7 +5860,7 @@ _0808E8D8: cmp r0, 0x12 blt _0808E994 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_8095024 ldr r1, [r5] adds r2, r1, r4 @@ -5911,7 +5911,7 @@ _0808E924: _0808E954: .4byte gUnknown_20397B0 _0808E958: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_808FD20 ldr r1, [r4] adds r1, r5 @@ -6239,7 +6239,7 @@ _0808EBE4: cmp r0, 0 beq _0808EC08 movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0xF bl sub_808FBA4 ldr r0, _0808EC04 @ =gUnknown_20397B0 @@ -6261,7 +6261,7 @@ _0808EC08: _0808EC1C: .4byte sub_808E564 _0808EC20: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl sub_808FBA4 movs r0, 0 @@ -6308,7 +6308,7 @@ _0808EC72: _0808EC80: .4byte sub_808D2BC _0808EC84: movs r0, 0x3 - bl sub_80722CC + bl PlaySE bl sub_808FD20 b _0808EC9A _0808EC90: @@ -6381,7 +6381,7 @@ _0808ED18: cmp r0, 0 beq _0808ED3C movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0xF bl sub_808FBA4 ldr r0, _0808ED38 @ =gUnknown_20397B0 @@ -6403,7 +6403,7 @@ _0808ED3C: _0808ED50: .4byte sub_808E564 _0808ED54: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x12 bl sub_808FBA4 movs r0, 0 @@ -6451,7 +6451,7 @@ _0808EDA8: _0808EDB4: .4byte sub_808D2BC _0808EDB8: movs r0, 0x3 - bl sub_80722CC + bl PlaySE bl sub_808FD20 b _0808EDCE _0808EDC4: @@ -8084,7 +8084,7 @@ sub_808FAD4: @ 808FAD4 movs r1, 0 strb r1, [r0] movs r0, 0x6 - bl sub_80722CC + bl PlaySE bl sub_808F75C pop {r0} bx r0 @@ -12822,7 +12822,7 @@ sub_8091F60: @ 8091F60 adds r1, r0, 0 movs r0, 0x1 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 lsrs r0, r1, 31 adds r1, r0 @@ -19011,7 +19011,7 @@ sub_8094F94: @ 8094F94 cmp r0, 0 beq _08094FB6 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r5, 0x1 _08094FB6: ldrh r1, [r4, 0x2E] @@ -19020,7 +19020,7 @@ _08094FB6: cmp r0, 0 beq _08094FD4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -19033,7 +19033,7 @@ _08094FD4: cmp r0, 0 beq _08094FF2 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _08094FF2 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 28244b569..c4ac6757e 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -547,7 +547,7 @@ _08134950: b _08134B9A _0813495C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl HideBg ldr r0, [r5] @@ -595,7 +595,7 @@ _081349B4: b _08134B9A _081349C0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl HideBg ldr r0, [r5] @@ -668,7 +668,7 @@ _08134A4A: cmp r0, 0 bne _08134A7C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, [r4] ldr r2, _08134A78 @ =0x00003270 adds r0, r2 @@ -683,7 +683,7 @@ _08134A7C: b _08134B9A _08134A82: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, [r4] ldr r1, _08134AB4 @ =0x00003224 adds r0, r1 @@ -4837,7 +4837,7 @@ sub_8136DF0: @ 8136DF0 movs r0, 0 adds r1, r6, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth ldr r1, [r5] adds r1, r4 ldrb r1, [r1] @@ -8717,7 +8717,7 @@ _08138D2A: movs r1, 0x2 strb r1, [r0] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r4, [r4] cmp r4, 0 bne _08138D5A @@ -8752,7 +8752,7 @@ _08138D84: movs r1, 0x2 strb r1, [r0] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, [r6] ldr r3, _08138DC8 @ =0x00003268 adds r0, r1, r3 @@ -8852,7 +8852,7 @@ _08138E3C: b _08139024 _08138E4A: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _08138E64 @ =gUnknown_203B16D movs r0, 0 strb r0, [r1] @@ -8874,7 +8874,7 @@ _08138E6E: strb r1, [r0] _08138E78: movs r0, 0x5 - bl sub_80722CC + bl PlaySE b _08139094 _08138E80: movs r0, 0x1 @@ -8884,7 +8884,7 @@ _08138E80: cmp r5, 0 beq _08138F6C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r3, _08138EB8 @ =gUnknown_203B16D ldrb r5, [r3] cmp r5, 0x4 @@ -9073,7 +9073,7 @@ _08139010: b _08139092 _08139024: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08139030 @ =gUnknown_203B16D strb r4, [r0] b _08139094 @@ -9603,7 +9603,7 @@ _0813946C: movs r1, 0x3 strb r1, [r0] movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldrb r4, [r4] cmp r4, 0 bne _0813949C @@ -9709,7 +9709,7 @@ _08139556: movs r1, 0x3 strb r1, [r0] movs r0, 0x5 - bl sub_80722CC + bl PlaySE b _0813975A .align 2, 0 _08139564: .4byte 0x00003288 @@ -9729,7 +9729,7 @@ _08139568: bne _081395B8 _08139584: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _081395A8 @ =gUnknown_203B16E ldr r0, _081395A4 @ =gUnknown_203B16D ldrb r0, [r0] @@ -9750,7 +9750,7 @@ _081395B0: .4byte gUnknown_203B140 _081395B4: .4byte 0x00003288 _081395B8: movs r0, 0x1A - bl sub_80722CC + bl PlaySE ldr r0, _081395CC @ =gUnknown_203B140 ldr r0, [r0] ldr r4, _081395D0 @ =0x00003288 @@ -9919,7 +9919,7 @@ _08139730: .4byte gUnknown_203B140 _08139734: .4byte 0x00003288 _08139738: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08139744 @ =gUnknown_203B16D strb r4, [r0] b _0813975A diff --git a/asm/quest_log.s b/asm/quest_log.s index 60cbf7350..7769f2811 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -1108,13 +1108,13 @@ _0811107A: lsrs r5, r0, 24 cmp r5, 0x2 bls _0811107A - ldr r5, _08111124 @ =gUnknown_2021D18 + ldr r5, _08111124 @ =gStringVar4 ldr r1, _08111128 @ =gUnknown_841A155 adds r0, r5, 0 bl StringExpandPlaceholders cmp r7, 0 beq _081110D2 - ldr r4, _0811112C @ =gUnknown_2021CD0 + ldr r4, _0811112C @ =gStringVar1 adds r0, r4, 0 adds r1, r7, 0 movs r2, 0 @@ -1158,9 +1158,9 @@ _081110D2: .align 2, 0 _0811111C: .4byte gUnknown_845661C _08111120: .4byte gUnknown_203ADFE -_08111124: .4byte gUnknown_2021D18 +_08111124: .4byte gStringVar4 _08111128: .4byte gUnknown_841A155 -_0811112C: .4byte gUnknown_2021CD0 +_0811112C: .4byte gStringVar1 _08111130: .4byte gUnknown_8456634 thumb_func_end sub_8111070 @@ -2493,7 +2493,7 @@ sub_8111BD4: @ 8111BD4 push {r4,lr} movs r2, 0 movs r1, 0 - ldr r3, _08111C0C @ =gUnknown_2021D18 + ldr r3, _08111C0C @ =gStringVar4 ldrb r0, [r3] cmp r0, 0xFF beq _08111C04 @@ -2522,7 +2522,7 @@ _08111C04: movs r0, 0x5F b _08111C26 .align 2, 0 -_08111C0C: .4byte gUnknown_2021D18 +_08111C0C: .4byte gStringVar4 _08111C10: .4byte 0x000003ff _08111C14: cmp r2, 0x23 @@ -2672,7 +2672,7 @@ sub_8111D10: @ 8111D10 sub sp, 0x14 movs r4, 0 movs r1, 0 - ldr r2, _08111D80 @ =gUnknown_2021D18 + ldr r2, _08111D80 @ =gStringVar4 ldrb r0, [r2] ldr r5, _08111D84 @ =gUnknown_203ADFE cmp r0, 0xFF @@ -2711,7 +2711,7 @@ _08111D42: ldr r1, _08111D8C @ =gUnknown_8456634 str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _08111D80 @ =gUnknown_2021D18 + ldr r1, _08111D80 @ =gStringVar4 str r1, [sp, 0x10] movs r1, 0x2 movs r2, 0x2 @@ -2723,7 +2723,7 @@ _08111D42: pop {r0} bx r0 .align 2, 0 -_08111D80: .4byte gUnknown_2021D18 +_08111D80: .4byte gStringVar4 _08111D84: .4byte gUnknown_203ADFE _08111D88: .4byte gUnknown_8456698 _08111D8C: .4byte gUnknown_8456634 @@ -3045,11 +3045,11 @@ sub_8111FCC: @ 8111FCC ands r0, r1 cmp r0, 0x40 beq _0811200E - ldr r0, _08112030 @ =gUnknown_2021CD0 + ldr r0, _08112030 @ =gStringVar1 ldr r1, _08112034 @ =gUnknown_2036DFC ldrb r1, [r1, 0x14] bl sub_80C4DF8 - ldr r0, _08112038 @ =gUnknown_2021D18 + ldr r0, _08112038 @ =gStringVar4 ldr r1, _0811203C @ =gUnknown_841B073 bl StringExpandPlaceholders bl sub_8111D10 @@ -3068,9 +3068,9 @@ _0811201E: _08112024: .4byte gUnknown_3005090 _08112028: .4byte gUnknown_2037AB8 _0811202C: .4byte gUnknown_203AE94 -_08112030: .4byte gUnknown_2021CD0 +_08112030: .4byte gStringVar1 _08112034: .4byte gUnknown_2036DFC -_08112038: .4byte gUnknown_2021D18 +_08112038: .4byte gStringVar4 _0811203C: .4byte gUnknown_841B073 _08112040: .4byte sub_8112044 thumb_func_end sub_8111FCC @@ -3239,7 +3239,7 @@ _08112176: str r4, [r6] bl sub_80696C0 bl ScriptContext2_Disable - ldr r2, _081121CC @ =gUnknown_3003E50 + ldr r2, _081121CC @ =gTextFlags ldrb r1, [r2] movs r0, 0x5 negs r0, r0 @@ -3263,7 +3263,7 @@ _081121B8: _081121C0: .4byte gUnknown_203AE94 _081121C4: .4byte gUnknown_203AE90 _081121C8: .4byte gUnknown_20371F8 -_081121CC: .4byte gUnknown_3003E50 +_081121CC: .4byte gTextFlags _081121D0: .4byte gUnknown_2036E28 _081121D4: .4byte gUnknown_3005ECC thumb_func_end sub_81120AC @@ -5692,23 +5692,23 @@ sub_8113414: @ 8113414 beq _08113448 b _0811345C _08113436: - ldr r0, _08113440 @ =gUnknown_2021CD0 + ldr r0, _08113440 @ =gStringVar1 ldr r1, _08113444 @ =gUnknown_84178D0 bl StringCopy b _081134B2 .align 2, 0 -_08113440: .4byte gUnknown_2021CD0 +_08113440: .4byte gStringVar1 _08113444: .4byte gUnknown_84178D0 _08113448: - ldr r0, _08113454 @ =gUnknown_2021CD0 + ldr r0, _08113454 @ =gStringVar1 ldr r1, _08113458 @ =gUnknown_84178DA bl StringCopy b _081134B2 .align 2, 0 -_08113454: .4byte gUnknown_2021CD0 +_08113454: .4byte gStringVar1 _08113458: .4byte gUnknown_84178DA _0811345C: - ldr r0, _0811346C @ =gUnknown_2021CD0 + ldr r0, _0811346C @ =gStringVar1 ldr r1, _08113470 @ =gSaveBlock1Ptr ldr r1, [r1] ldr r2, _08113474 @ =0x00003a4c @@ -5716,11 +5716,11 @@ _0811345C: bl StringCopy b _081134B2 .align 2, 0 -_0811346C: .4byte gUnknown_2021CD0 +_0811346C: .4byte gStringVar1 _08113470: .4byte gSaveBlock1Ptr _08113474: .4byte 0x00003a4c _08113478: - ldr r4, _08113498 @ =gUnknown_2021CD0 + ldr r4, _08113498 @ =gStringVar1 adds r0, r4, 0 movs r2, 0x7 bl StringCopyN @@ -5735,7 +5735,7 @@ _08113478: adds r4, 0x2 b _0811349E .align 2, 0 -_08113498: .4byte gUnknown_2021CD0 +_08113498: .4byte gStringVar1 _0811349C: adds r4, 0x1 _0811349E: @@ -7223,14 +7223,14 @@ sub_8113F3C: @ 8113F3C bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4] - ldr r1, _08113F70 @ =gUnknown_2021CD0 + ldr r1, _08113F70 @ =gStringVar1 movs r2, 0 bl sub_8113EAC ldrh r0, [r4, 0x2] - ldr r1, _08113F74 @ =gUnknown_2021CF0 + ldr r1, _08113F74 @ =gStringVar2 movs r2, 0 bl sub_8113EAC - ldr r0, _08113F78 @ =gUnknown_2021D18 + ldr r0, _08113F78 @ =gStringVar4 ldr r1, _08113F7C @ =gUnknown_841A16F bl StringExpandPlaceholders adds r4, 0x4 @@ -7239,9 +7239,9 @@ sub_8113F3C: @ 8113F3C pop {r1} bx r1 .align 2, 0 -_08113F70: .4byte gUnknown_2021CD0 -_08113F74: .4byte gUnknown_2021CF0 -_08113F78: .4byte gUnknown_2021D18 +_08113F70: .4byte gStringVar1 +_08113F74: .4byte gStringVar2 +_08113F78: .4byte gStringVar4 _08113F7C: .4byte gUnknown_841A16F thumb_func_end sub_8113F3C @@ -7312,7 +7312,7 @@ _08113FE8: .4byte _0811409C .4byte _08113FFC _08113FFC: - ldr r4, _08114024 @ =gUnknown_2021CD0 + ldr r4, _08114024 @ =gStringVar1 ldrh r0, [r5] bl ItemId_GetItem adds r1, r0, 0 @@ -7321,17 +7321,17 @@ _08113FFC: ldrh r0, [r5] cmp r0, 0x55 bne _08114034 - ldr r0, _08114028 @ =gUnknown_2021CF0 + ldr r0, _08114028 @ =gStringVar2 ldrb r1, [r5, 0x4] bl sub_80C4DF8 - ldr r0, _0811402C @ =gUnknown_2021D18 + ldr r0, _0811402C @ =gStringVar4 ldr r1, _08114030 @ =gUnknown_841AFA6 bl StringExpandPlaceholders b _0811413C .align 2, 0 -_08114024: .4byte gUnknown_2021CD0 -_08114028: .4byte gUnknown_2021CF0 -_0811402C: .4byte gUnknown_2021D18 +_08114024: .4byte gStringVar1 +_08114028: .4byte gStringVar2 +_0811402C: .4byte gStringVar4 _08114030: .4byte gUnknown_841AFA6 _08114034: ldrh r1, [r5, 0x2] @@ -7339,47 +7339,47 @@ _08114034: cmp r1, r0 beq _08114060 adds r0, r1, 0 - ldr r1, _08114054 @ =gUnknown_2021CF0 + ldr r1, _08114054 @ =gStringVar2 movs r2, 0 bl sub_8113EAC - ldr r0, _08114058 @ =gUnknown_2021D18 + ldr r0, _08114058 @ =gStringVar4 ldr r1, _0811405C @ =gUnknown_841A1E7 bl StringExpandPlaceholders b _0811413C .align 2, 0 _08114050: .4byte 0x0000ffff -_08114054: .4byte gUnknown_2021CF0 -_08114058: .4byte gUnknown_2021D18 +_08114054: .4byte gStringVar2 +_08114058: .4byte gStringVar4 _0811405C: .4byte gUnknown_841A1E7 _08114060: - ldr r0, _0811406C @ =gUnknown_2021D18 + ldr r0, _0811406C @ =gStringVar4 ldr r1, _08114070 @ =gUnknown_841A210 bl StringExpandPlaceholders b _0811413C .align 2, 0 -_0811406C: .4byte gUnknown_2021D18 +_0811406C: .4byte gStringVar4 _08114070: .4byte gUnknown_841A210 _08114074: - ldr r4, _08114090 @ =gUnknown_2021CD0 + ldr r4, _08114090 @ =gStringVar1 ldrh r0, [r5] bl ItemId_GetItem adds r1, r0, 0 adds r0, r4, 0 bl StringCopy - ldr r0, _08114094 @ =gUnknown_2021D18 + ldr r0, _08114094 @ =gStringVar4 ldr r1, _08114098 @ =gUnknown_841A220 bl StringExpandPlaceholders b _0811413C .align 2, 0 -_08114090: .4byte gUnknown_2021CD0 -_08114094: .4byte gUnknown_2021D18 +_08114090: .4byte gStringVar1 +_08114094: .4byte gStringVar4 _08114098: .4byte gUnknown_841A220 _0811409C: ldrh r0, [r5, 0x2] - ldr r1, _081140E8 @ =gUnknown_2021CD0 + ldr r1, _081140E8 @ =gStringVar1 movs r2, 0 bl sub_8113EAC - ldr r4, _081140EC @ =gUnknown_2021CF0 + ldr r4, _081140EC @ =gStringVar2 ldrh r0, [r5] bl ItemIdToBattleMoveId lsls r0, 16 @@ -7395,7 +7395,7 @@ _0811409C: ldr r0, _081140F4 @ =0x0000ffff cmp r1, r0 beq _08114118 - ldr r0, _081140F8 @ =gUnknown_2021D04 + ldr r0, _081140F8 @ =gStringVar3 muls r1, r7 adds r1, r6 bl StringCopy @@ -7404,25 +7404,25 @@ _0811409C: lsls r0, 1 cmp r1, r0 bls _08114104 - ldr r0, _081140FC @ =gUnknown_2021D18 + ldr r0, _081140FC @ =gStringVar4 ldr r1, _08114100 @ =gUnknown_841A965 bl StringExpandPlaceholders b _0811413C .align 2, 0 -_081140E8: .4byte gUnknown_2021CD0 -_081140EC: .4byte gUnknown_2021CF0 +_081140E8: .4byte gStringVar1 +_081140EC: .4byte gStringVar2 _081140F0: .4byte gUnknown_8247094 _081140F4: .4byte 0x0000ffff -_081140F8: .4byte gUnknown_2021D04 -_081140FC: .4byte gUnknown_2021D18 +_081140F8: .4byte gStringVar3 +_081140FC: .4byte gStringVar4 _08114100: .4byte gUnknown_841A965 _08114104: - ldr r0, _08114110 @ =gUnknown_2021D18 + ldr r0, _08114110 @ =gStringVar4 ldr r1, _08114114 @ =gUnknown_841A277 bl StringExpandPlaceholders b _0811413C .align 2, 0 -_08114110: .4byte gUnknown_2021D18 +_08114110: .4byte gStringVar4 _08114114: .4byte gUnknown_841A277 _08114118: ldrh r1, [r5] @@ -7430,15 +7430,15 @@ _08114118: lsls r0, 1 cmp r1, r0 bls _08114134 - ldr r0, _0811412C @ =gUnknown_2021D18 + ldr r0, _0811412C @ =gStringVar4 ldr r1, _08114130 @ =gUnknown_841A938 bl StringExpandPlaceholders b _0811413C .align 2, 0 -_0811412C: .4byte gUnknown_2021D18 +_0811412C: .4byte gStringVar4 _08114130: .4byte gUnknown_841A938 _08114134: - ldr r0, _08114144 @ =gUnknown_2021D18 + ldr r0, _08114144 @ =gStringVar4 ldr r1, _08114148 @ =gUnknown_841A255 bl StringExpandPlaceholders _0811413C: @@ -7447,7 +7447,7 @@ _0811413C: pop {r1} bx r1 .align 2, 0 -_08114144: .4byte gUnknown_2021D18 +_08114144: .4byte gStringVar4 _08114148: .4byte gUnknown_841A255 thumb_func_end sub_8113FBC @@ -7495,16 +7495,16 @@ sub_8114188: @ 8114188 bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4, 0x2] - ldr r1, _081141C0 @ =gUnknown_2021CD0 + ldr r1, _081141C0 @ =gStringVar1 movs r2, 0 bl sub_8113EAC - ldr r5, _081141C4 @ =gUnknown_2021CF0 + ldr r5, _081141C4 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem adds r1, r0, 0 adds r0, r5, 0 bl StringCopy - ldr r0, _081141C8 @ =gUnknown_2021D18 + ldr r0, _081141C8 @ =gStringVar4 ldr r1, _081141CC @ =gUnknown_841AB74 bl StringExpandPlaceholders adds r4, 0x4 @@ -7513,9 +7513,9 @@ sub_8114188: @ 8114188 pop {r1} bx r1 .align 2, 0 -_081141C0: .4byte gUnknown_2021CD0 -_081141C4: .4byte gUnknown_2021CF0 -_081141C8: .4byte gUnknown_2021D18 +_081141C0: .4byte gStringVar1 +_081141C4: .4byte gStringVar2 +_081141C8: .4byte gStringVar4 _081141CC: .4byte gUnknown_841AB74 thumb_func_end sub_8114188 @@ -7539,16 +7539,16 @@ sub_81141E4: @ 81141E4 bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4, 0x2] - ldr r1, _0811421C @ =gUnknown_2021CD0 + ldr r1, _0811421C @ =gStringVar1 movs r2, 0 bl sub_8113EAC - ldr r5, _08114220 @ =gUnknown_2021CF0 + ldr r5, _08114220 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem adds r1, r0, 0 adds r0, r5, 0 bl StringCopy - ldr r0, _08114224 @ =gUnknown_2021D18 + ldr r0, _08114224 @ =gStringVar4 ldr r1, _08114228 @ =gUnknown_841AB8E bl StringExpandPlaceholders adds r4, 0x4 @@ -7557,9 +7557,9 @@ sub_81141E4: @ 81141E4 pop {r1} bx r1 .align 2, 0 -_0811421C: .4byte gUnknown_2021CD0 -_08114220: .4byte gUnknown_2021CF0 -_08114224: .4byte gUnknown_2021D18 +_0811421C: .4byte gStringVar1 +_08114220: .4byte gStringVar2 +_08114224: .4byte gStringVar4 _08114228: .4byte gUnknown_841AB8E thumb_func_end sub_81141E4 @@ -7583,16 +7583,16 @@ sub_8114240: @ 8114240 bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4, 0x2] - ldr r1, _08114278 @ =gUnknown_2021CF0 + ldr r1, _08114278 @ =gStringVar2 movs r2, 0 bl sub_8113EAC - ldr r5, _0811427C @ =gUnknown_2021CD0 + ldr r5, _0811427C @ =gStringVar1 ldrh r0, [r4] bl ItemId_GetItem adds r1, r0, 0 adds r0, r5, 0 bl StringCopy - ldr r0, _08114280 @ =gUnknown_2021D18 + ldr r0, _08114280 @ =gStringVar4 ldr r1, _08114284 @ =gUnknown_841A6A5 bl StringExpandPlaceholders adds r4, 0x4 @@ -7601,9 +7601,9 @@ sub_8114240: @ 8114240 pop {r1} bx r1 .align 2, 0 -_08114278: .4byte gUnknown_2021CF0 -_0811427C: .4byte gUnknown_2021CD0 -_08114280: .4byte gUnknown_2021D18 +_08114278: .4byte gStringVar2 +_0811427C: .4byte gStringVar1 +_08114280: .4byte gStringVar4 _08114284: .4byte gUnknown_841A6A5 thumb_func_end sub_8114240 @@ -7627,16 +7627,16 @@ sub_811429C: @ 811429C bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4, 0x2] - ldr r1, _081142D4 @ =gUnknown_2021CD0 + ldr r1, _081142D4 @ =gStringVar1 movs r2, 0 bl sub_8113EAC - ldr r5, _081142D8 @ =gUnknown_2021CF0 + ldr r5, _081142D8 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem adds r1, r0, 0 adds r0, r5, 0 bl StringCopy - ldr r0, _081142DC @ =gUnknown_2021D18 + ldr r0, _081142DC @ =gStringVar4 ldr r1, _081142E0 @ =gUnknown_841A1CD bl StringExpandPlaceholders adds r4, 0x4 @@ -7645,9 +7645,9 @@ sub_811429C: @ 811429C pop {r1} bx r1 .align 2, 0 -_081142D4: .4byte gUnknown_2021CD0 -_081142D8: .4byte gUnknown_2021CF0 -_081142DC: .4byte gUnknown_2021D18 +_081142D4: .4byte gStringVar1 +_081142D8: .4byte gStringVar2 +_081142DC: .4byte gStringVar4 _081142E0: .4byte gUnknown_841A1CD thumb_func_end sub_811429C @@ -7697,22 +7697,22 @@ sub_8114324: @ 8114324 bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4, 0x4] - ldr r1, _0811436C @ =gUnknown_2021CD0 + ldr r1, _0811436C @ =gStringVar1 movs r2, 0 bl sub_8113EAC - ldr r5, _08114370 @ =gUnknown_2021CF0 + ldr r5, _08114370 @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem adds r1, r0, 0 adds r0, r5, 0 bl StringCopy - ldr r5, _08114374 @ =gUnknown_2021D04 + ldr r5, _08114374 @ =gStringVar3 ldrh r0, [r4, 0x2] bl ItemId_GetItem adds r1, r0, 0 adds r0, r5, 0 bl StringCopy - ldr r0, _08114378 @ =gUnknown_2021D18 + ldr r0, _08114378 @ =gStringVar4 ldr r1, _0811437C @ =gUnknown_841A193 bl StringExpandPlaceholders adds r4, 0x6 @@ -7721,10 +7721,10 @@ sub_8114324: @ 8114324 pop {r1} bx r1 .align 2, 0 -_0811436C: .4byte gUnknown_2021CD0 -_08114370: .4byte gUnknown_2021CF0 -_08114374: .4byte gUnknown_2021D04 -_08114378: .4byte gUnknown_2021D18 +_0811436C: .4byte gStringVar1 +_08114370: .4byte gStringVar2 +_08114374: .4byte gStringVar3 +_08114378: .4byte gStringVar4 _0811437C: .4byte gUnknown_841A193 thumb_func_end sub_8114324 @@ -7748,22 +7748,22 @@ sub_8114394: @ 8114394 bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4, 0x4] - ldr r1, _081143DC @ =gUnknown_2021CF0 + ldr r1, _081143DC @ =gStringVar2 movs r2, 0 bl sub_8113EAC - ldr r5, _081143E0 @ =gUnknown_2021D04 + ldr r5, _081143E0 @ =gStringVar3 ldrh r0, [r4] bl ItemId_GetItem adds r1, r0, 0 adds r0, r5, 0 bl StringCopy - ldr r5, _081143E4 @ =gUnknown_2021CD0 + ldr r5, _081143E4 @ =gStringVar1 ldrh r0, [r4, 0x2] bl ItemId_GetItem adds r1, r0, 0 adds r0, r5, 0 bl StringCopy - ldr r0, _081143E8 @ =gUnknown_2021D18 + ldr r0, _081143E8 @ =gStringVar4 ldr r1, _081143EC @ =gUnknown_841A6E1 bl StringExpandPlaceholders adds r4, 0x6 @@ -7772,10 +7772,10 @@ sub_8114394: @ 8114394 pop {r1} bx r1 .align 2, 0 -_081143DC: .4byte gUnknown_2021CF0 -_081143E0: .4byte gUnknown_2021D04 -_081143E4: .4byte gUnknown_2021CD0 -_081143E8: .4byte gUnknown_2021D18 +_081143DC: .4byte gStringVar2 +_081143E0: .4byte gStringVar3 +_081143E4: .4byte gStringVar1 +_081143E8: .4byte gStringVar4 _081143EC: .4byte gUnknown_841A6E1 thumb_func_end sub_8114394 @@ -7825,7 +7825,7 @@ _08114436: sub_811443C: @ 811443C push {r4,lr} adds r4, r0, 0 - ldr r0, _08114454 @ =gUnknown_2021D18 + ldr r0, _08114454 @ =gStringVar4 ldr r1, _08114458 @ =gUnknown_841A2B0 bl StringExpandPlaceholders adds r4, 0x4 @@ -7834,7 +7834,7 @@ sub_811443C: @ 811443C pop {r1} bx r1 .align 2, 0 -_08114454: .4byte gUnknown_2021D18 +_08114454: .4byte gStringVar4 _08114458: .4byte gUnknown_841A2B0 thumb_func_end sub_811443C @@ -7871,7 +7871,7 @@ sub_811448C: @ 811448C adds r5, r0, 0 adds r6, r5, 0 adds r6, 0x8 - ldr r4, _081144D8 @ =gUnknown_2021CD0 + ldr r4, _081144D8 @ =gStringVar1 adds r0, r4, 0 movs r1, 0xFF movs r2, 0x8 @@ -7883,14 +7883,14 @@ sub_811448C: @ 811448C adds r0, r4, 0 bl sub_8115834 ldrh r0, [r5, 0x6] - ldr r1, _081144DC @ =gUnknown_2021CF0 + ldr r1, _081144DC @ =gStringVar2 movs r2, 0 bl sub_8113EAC ldrh r0, [r5, 0x4] - ldr r1, _081144E0 @ =gUnknown_2021D04 + ldr r1, _081144E0 @ =gStringVar3 movs r2, 0 bl sub_8113EAC - ldr r0, _081144E4 @ =gUnknown_2021D18 + ldr r0, _081144E4 @ =gStringVar4 ldr r1, _081144E8 @ =gUnknown_841A3FF bl StringExpandPlaceholders adds r6, 0x8 @@ -7899,10 +7899,10 @@ sub_811448C: @ 811448C pop {r1} bx r1 .align 2, 0 -_081144D8: .4byte gUnknown_2021CD0 -_081144DC: .4byte gUnknown_2021CF0 -_081144E0: .4byte gUnknown_2021D04 -_081144E4: .4byte gUnknown_2021D18 +_081144D8: .4byte gStringVar1 +_081144DC: .4byte gStringVar2 +_081144E0: .4byte gStringVar3 +_081144E4: .4byte gStringVar4 _081144E8: .4byte gUnknown_841A3FF thumb_func_end sub_811448C @@ -7935,7 +7935,7 @@ sub_8114518: @ 8114518 push {r4,r5,lr} adds r5, r0, 0 bl UnkTextUtil_Reset - ldr r4, _08114568 @ =gUnknown_2021CD0 + ldr r4, _08114568 @ =gStringVar1 adds r0, r4, 0 movs r1, 0xFF movs r2, 0x8 @@ -7956,7 +7956,7 @@ sub_8114518: @ 8114518 ldr r1, [r0] movs r0, 0x1 bl UnkTextUtil_SetPtrI - ldr r0, _08114570 @ =gUnknown_2021D18 + ldr r0, _08114570 @ =gStringVar4 ldr r1, _08114574 @ =gUnknown_841A422 bl UnkTextUtil_StringExpandPlaceholders adds r5, 0xC @@ -7965,9 +7965,9 @@ sub_8114518: @ 8114518 pop {r1} bx r1 .align 2, 0 -_08114568: .4byte gUnknown_2021CD0 +_08114568: .4byte gStringVar1 _0811456C: .4byte gUnknown_8456AE4 -_08114570: .4byte gUnknown_2021D18 +_08114570: .4byte gStringVar4 _08114574: .4byte gUnknown_841A422 thumb_func_end sub_8114518 @@ -8000,7 +8000,7 @@ sub_81145A4: @ 81145A4 push {r4,r5,lr} adds r5, r0, 0 bl UnkTextUtil_Reset - ldr r4, _081145F4 @ =gUnknown_2021CD0 + ldr r4, _081145F4 @ =gStringVar1 adds r0, r4, 0 movs r1, 0xFF movs r2, 0x8 @@ -8021,7 +8021,7 @@ sub_81145A4: @ 81145A4 ldr r1, [r0] movs r0, 0x1 bl UnkTextUtil_SetPtrI - ldr r0, _081145FC @ =gUnknown_2021D18 + ldr r0, _081145FC @ =gStringVar4 ldr r1, _08114600 @ =gUnknown_841A477 bl UnkTextUtil_StringExpandPlaceholders adds r5, 0xC @@ -8030,9 +8030,9 @@ sub_81145A4: @ 81145A4 pop {r1} bx r1 .align 2, 0 -_081145F4: .4byte gUnknown_2021CD0 +_081145F4: .4byte gStringVar1 _081145F8: .4byte gUnknown_8456AE4 -_081145FC: .4byte gUnknown_2021D18 +_081145FC: .4byte gStringVar4 _08114600: .4byte gUnknown_841A477 thumb_func_end sub_81145A4 @@ -8080,17 +8080,17 @@ sub_811464C: @ 811464C push {r6} adds r4, r0, 0 bl UnkTextUtil_Reset - ldr r0, _081146F4 @ =gUnknown_2021CD0 + ldr r0, _081146F4 @ =gStringVar1 mov r8, r0 movs r1, 0xFF movs r2, 0x8 bl memset - ldr r6, _081146F8 @ =gUnknown_2021CF0 + ldr r6, _081146F8 @ =gStringVar2 adds r0, r6, 0 movs r1, 0xFF movs r2, 0x8 bl memset - ldr r5, _081146FC @ =gUnknown_2021D04 + ldr r5, _081146FC @ =gStringVar3 adds r0, r5, 0 movs r1, 0xFF movs r2, 0x8 @@ -8132,7 +8132,7 @@ sub_811464C: @ 811464C ldr r1, [r0] movs r0, 0x4 bl UnkTextUtil_SetPtrI - ldr r0, _08114708 @ =gUnknown_2021D18 + ldr r0, _08114708 @ =gStringVar4 ldr r1, _0811470C @ =gUnknown_841A4C6 bl UnkTextUtil_StringExpandPlaceholders adds r4, 0x1A @@ -8143,12 +8143,12 @@ sub_811464C: @ 811464C pop {r1} bx r1 .align 2, 0 -_081146F4: .4byte gUnknown_2021CD0 -_081146F8: .4byte gUnknown_2021CF0 -_081146FC: .4byte gUnknown_2021D04 +_081146F4: .4byte gStringVar1 +_081146F8: .4byte gStringVar2 +_081146FC: .4byte gStringVar3 _08114700: .4byte gSaveBlock2Ptr _08114704: .4byte gUnknown_8456AE4 -_08114708: .4byte gUnknown_2021D18 +_08114708: .4byte gStringVar4 _0811470C: .4byte gUnknown_841A4C6 thumb_func_end sub_811464C @@ -8169,7 +8169,7 @@ _08114720: .4byte gUnknown_203AF98 sub_8114724: @ 8114724 push {r4,lr} adds r4, r0, 0 - ldr r0, _0811473C @ =gUnknown_2021D18 + ldr r0, _0811473C @ =gStringVar4 ldr r1, _08114740 @ =gUnknown_841A50B bl StringExpandPlaceholders adds r4, 0x4 @@ -8178,7 +8178,7 @@ sub_8114724: @ 8114724 pop {r1} bx r1 .align 2, 0 -_0811473C: .4byte gUnknown_2021D18 +_0811473C: .4byte gStringVar4 _08114740: .4byte gUnknown_841A50B thumb_func_end sub_8114724 @@ -8199,7 +8199,7 @@ _08114754: .4byte gUnknown_203AF98 sub_8114758: @ 8114758 push {r4,lr} adds r4, r0, 0 - ldr r0, _08114770 @ =gUnknown_2021D18 + ldr r0, _08114770 @ =gStringVar4 ldr r1, _08114774 @ =gUnknown_841A732 bl StringExpandPlaceholders adds r4, 0x4 @@ -8208,7 +8208,7 @@ sub_8114758: @ 8114758 pop {r1} bx r1 .align 2, 0 -_08114770: .4byte gUnknown_2021D18 +_08114770: .4byte gStringVar4 _08114774: .4byte gUnknown_841A732 thumb_func_end sub_8114758 @@ -8245,7 +8245,7 @@ sub_81147A8: @ 81147A8 adds r5, r0, 0 adds r6, r5, 0 adds r6, 0x8 - ldr r4, _081147F4 @ =gUnknown_2021CD0 + ldr r4, _081147F4 @ =gStringVar1 adds r0, r4, 0 movs r1, 0xFF movs r2, 0x8 @@ -8257,14 +8257,14 @@ sub_81147A8: @ 81147A8 adds r0, r4, 0 bl sub_8115834 ldrh r0, [r5, 0x6] - ldr r1, _081147F8 @ =gUnknown_2021CF0 + ldr r1, _081147F8 @ =gStringVar2 movs r2, 0 bl sub_8113EAC ldrh r0, [r5, 0x4] - ldr r1, _081147FC @ =gUnknown_2021D04 + ldr r1, _081147FC @ =gStringVar3 movs r2, 0 bl sub_8113EAC - ldr r0, _08114800 @ =gUnknown_2021D18 + ldr r0, _08114800 @ =gStringVar4 ldr r1, _08114804 @ =gUnknown_841A76A bl StringExpandPlaceholders adds r6, 0x8 @@ -8273,10 +8273,10 @@ sub_81147A8: @ 81147A8 pop {r1} bx r1 .align 2, 0 -_081147F4: .4byte gUnknown_2021CD0 -_081147F8: .4byte gUnknown_2021CF0 -_081147FC: .4byte gUnknown_2021D04 -_08114800: .4byte gUnknown_2021D18 +_081147F4: .4byte gStringVar1 +_081147F8: .4byte gStringVar2 +_081147FC: .4byte gStringVar3 +_08114800: .4byte gStringVar4 _08114804: .4byte gUnknown_841A76A thumb_func_end sub_81147A8 @@ -8308,7 +8308,7 @@ _08114830: .4byte gUnknown_203AF98 sub_8114834: @ 8114834 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08114878 @ =gUnknown_2021CD0 + ldr r4, _08114878 @ =gStringVar1 adds r0, r4, 0 movs r1, 0xFF movs r2, 0x8 @@ -8319,14 +8319,14 @@ sub_8114834: @ 8114834 bl memcpy adds r0, r4, 0 bl sub_8115834 - ldr r0, _0811487C @ =gUnknown_2021CF0 + ldr r0, _0811487C @ =gStringVar2 ldr r2, _08114880 @ =gUnknown_8456AE4 ldrb r1, [r5, 0x4] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl StringCopy - ldr r0, _08114884 @ =gUnknown_2021D18 + ldr r0, _08114884 @ =gStringVar4 ldr r1, _08114888 @ =gUnknown_841A7B0 bl StringExpandPlaceholders adds r5, 0xC @@ -8335,10 +8335,10 @@ sub_8114834: @ 8114834 pop {r1} bx r1 .align 2, 0 -_08114878: .4byte gUnknown_2021CD0 -_0811487C: .4byte gUnknown_2021CF0 +_08114878: .4byte gStringVar1 +_0811487C: .4byte gStringVar2 _08114880: .4byte gUnknown_8456AE4 -_08114884: .4byte gUnknown_2021D18 +_08114884: .4byte gStringVar4 _08114888: .4byte gUnknown_841A7B0 thumb_func_end sub_8114834 @@ -8398,7 +8398,7 @@ sub_81148BC: @ 81148BC movs r1, 0 movs r2, 0x3 bl sub_8113EAC - ldr r0, _08114910 @ =gUnknown_2021D18 + ldr r0, _08114910 @ =gStringVar4 ldr r1, _08114914 @ =gUnknown_841A566 bl UnkTextUtil_StringExpandPlaceholders adds r4, 0x6 @@ -8407,7 +8407,7 @@ sub_81148BC: @ 81148BC pop {r1} bx r1 .align 2, 0 -_08114910: .4byte gUnknown_2021D18 +_08114910: .4byte gStringVar4 _08114914: .4byte gUnknown_841A566 thumb_func_end sub_81148BC @@ -8459,7 +8459,7 @@ sub_8114944: @ 8114944 movs r1, 0 movs r2, 0x2 bl sub_8113EAC - ldr r0, _08114988 @ =gUnknown_2021D18 + ldr r0, _08114988 @ =gStringVar4 ldr r1, _0811498C @ =gUnknown_841A5D9 bl UnkTextUtil_StringExpandPlaceholders adds r4, 0x6 @@ -8468,7 +8468,7 @@ sub_8114944: @ 8114944 pop {r1} bx r1 .align 2, 0 -_08114988: .4byte gUnknown_2021D18 +_08114988: .4byte gStringVar4 _0811498C: .4byte gUnknown_841A5D9 thumb_func_end sub_8114944 @@ -8532,7 +8532,7 @@ sub_81149D0: @ 81149D0 movs r1, 0 movs r2, 0x2 bl sub_8113EAC - ldr r0, _08114A14 @ =gUnknown_2021D18 + ldr r0, _08114A14 @ =gStringVar4 ldr r1, _08114A18 @ =gUnknown_841A60A bl UnkTextUtil_StringExpandPlaceholders adds r4, 0x6 @@ -8541,7 +8541,7 @@ sub_81149D0: @ 81149D0 pop {r1} bx r1 .align 2, 0 -_08114A14: .4byte gUnknown_2021D18 +_08114A14: .4byte gStringVar4 _08114A18: .4byte gUnknown_841A60A thumb_func_end sub_81149D0 @@ -8596,7 +8596,7 @@ sub_8114A4C: @ 8114A4C adds r1, r0, 0 movs r0, 0x2 bl UnkTextUtil_SetPtrI - ldr r0, _08114A98 @ =gUnknown_2021D18 + ldr r0, _08114A98 @ =gStringVar4 ldr r1, _08114A9C @ =gUnknown_841A59C bl UnkTextUtil_StringExpandPlaceholders adds r5, 0x2 @@ -8605,7 +8605,7 @@ sub_8114A4C: @ 8114A4C pop {r1} bx r1 .align 2, 0 -_08114A98: .4byte gUnknown_2021D18 +_08114A98: .4byte gStringVar4 _08114A9C: .4byte gUnknown_841A59C thumb_func_end sub_8114A4C @@ -8652,7 +8652,7 @@ sub_8114AC8: @ 8114AC8 movs r1, 0 movs r2, 0x1 bl sub_8113EAC - ldr r0, _08114B04 @ =gUnknown_2021D18 + ldr r0, _08114B04 @ =gStringVar4 ldr r1, _08114B08 @ =gUnknown_841A5FA bl UnkTextUtil_StringExpandPlaceholders adds r5, 0x2 @@ -8661,7 +8661,7 @@ sub_8114AC8: @ 8114AC8 pop {r1} bx r1 .align 2, 0 -_08114B04: .4byte gUnknown_2021D18 +_08114B04: .4byte gStringVar4 _08114B08: .4byte gUnknown_841A5FA thumb_func_end sub_8114AC8 @@ -8708,7 +8708,7 @@ sub_8114B34: @ 8114B34 movs r1, 0 movs r2, 0x1 bl sub_8113EAC - ldr r0, _08114B70 @ =gUnknown_2021D18 + ldr r0, _08114B70 @ =gStringVar4 ldr r1, _08114B74 @ =gUnknown_841A632 bl UnkTextUtil_StringExpandPlaceholders adds r5, 0x2 @@ -8717,7 +8717,7 @@ sub_8114B34: @ 8114B34 pop {r1} bx r1 .align 2, 0 -_08114B70: .4byte gUnknown_2021D18 +_08114B70: .4byte gStringVar4 _08114B74: .4byte gUnknown_841A632 thumb_func_end sub_8114B34 @@ -8764,7 +8764,7 @@ sub_8114BA0: @ 8114BA0 adds r1, r0, 0 movs r0, 0x1 bl UnkTextUtil_SetPtrI - ldr r0, _08114BDC @ =gUnknown_2021D18 + ldr r0, _08114BDC @ =gStringVar4 ldr r1, _08114BE0 @ =gUnknown_841A64F bl UnkTextUtil_StringExpandPlaceholders adds r5, 0x2 @@ -8773,7 +8773,7 @@ sub_8114BA0: @ 8114BA0 pop {r1} bx r1 .align 2, 0 -_08114BDC: .4byte gUnknown_2021D18 +_08114BDC: .4byte gStringVar4 _08114BE0: .4byte gUnknown_841A64F thumb_func_end sub_8114BA0 @@ -8832,7 +8832,7 @@ _08114C40: movs r0, 0x1 bl UnkTextUtil_SetPtrI _08114C4E: - ldr r0, _08114C60 @ =gUnknown_2021D18 + ldr r0, _08114C60 @ =gStringVar4 ldr r1, _08114C64 @ =gUnknown_841A66E bl UnkTextUtil_StringExpandPlaceholders adds r0, r4, 0x2 @@ -8840,7 +8840,7 @@ _08114C4E: pop {r1} bx r1 .align 2, 0 -_08114C60: .4byte gUnknown_2021D18 +_08114C60: .4byte gStringVar4 _08114C64: .4byte gUnknown_841A66E thumb_func_end sub_8114C0C @@ -8875,9 +8875,9 @@ sub_8114C8C: @ 8114C8C bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4] - ldr r1, _08114CB4 @ =gUnknown_2021CD0 + ldr r1, _08114CB4 @ =gStringVar1 bl sub_8099E90 - ldr r0, _08114CB8 @ =gUnknown_2021D18 + ldr r0, _08114CB8 @ =gStringVar4 ldr r1, _08114CBC @ =gUnknown_841A391 bl StringExpandPlaceholders adds r4, 0x2 @@ -8886,8 +8886,8 @@ sub_8114C8C: @ 8114C8C pop {r1} bx r1 .align 2, 0 -_08114CB4: .4byte gUnknown_2021CD0 -_08114CB8: .4byte gUnknown_2021D18 +_08114CB4: .4byte gStringVar1 +_08114CB8: .4byte gStringVar4 _08114CBC: .4byte gUnknown_841A391 thumb_func_end sub_8114C8C @@ -8922,9 +8922,9 @@ sub_8114CE4: @ 8114CE4 bl sub_8113E88 adds r4, r0, 0 ldrh r0, [r4] - ldr r1, _08114D0C @ =gUnknown_2021CD0 + ldr r1, _08114D0C @ =gStringVar1 bl sub_8099E90 - ldr r0, _08114D10 @ =gUnknown_2021D18 + ldr r0, _08114D10 @ =gStringVar4 ldr r1, _08114D14 @ =gUnknown_841A3DA bl StringExpandPlaceholders adds r4, 0x2 @@ -8933,8 +8933,8 @@ sub_8114CE4: @ 8114CE4 pop {r1} bx r1 .align 2, 0 -_08114D0C: .4byte gUnknown_2021CD0 -_08114D10: .4byte gUnknown_2021D18 +_08114D0C: .4byte gStringVar1 +_08114D10: .4byte gStringVar4 _08114D14: .4byte gUnknown_841A3DA thumb_func_end sub_8114CE4 @@ -8995,7 +8995,7 @@ sub_8114D68: @ 8114D68 adds r4, r0, 0 adds r6, r4, 0x6 bl UnkTextUtil_Reset - ldr r5, _08114DD4 @ =gUnknown_2021CD0 + ldr r5, _08114DD4 @ =gStringVar1 ldrb r1, [r4, 0x6] adds r0, r5, 0 bl sub_80C4DF8 @@ -9025,7 +9025,7 @@ sub_8114D68: @ 8114D68 ldr r1, [r0] movs r0, 0x4 bl UnkTextUtil_SetPtrI - ldr r0, _08114DE0 @ =gUnknown_2021D18 + ldr r0, _08114DE0 @ =gStringVar4 ldr r1, _08114DE4 @ =gUnknown_841AF0C bl UnkTextUtil_StringExpandPlaceholders adds r4, 0x8 @@ -9034,10 +9034,10 @@ sub_8114D68: @ 8114D68 pop {r1} bx r1 .align 2, 0 -_08114DD4: .4byte gUnknown_2021CD0 +_08114DD4: .4byte gStringVar1 _08114DD8: .4byte gUnknown_823EACC _08114DDC: .4byte gUnknown_8456ACC -_08114DE0: .4byte gUnknown_2021D18 +_08114DE0: .4byte gStringVar4 _08114DE4: .4byte gUnknown_841AF0C thumb_func_end sub_8114D68 @@ -9133,7 +9133,7 @@ _08114E84: adds r6, r5, 0 adds r6, 0x8 bl UnkTextUtil_Reset - ldr r4, _08114F00 @ =gUnknown_2021CD0 + ldr r4, _08114F00 @ =gStringVar1 ldrb r1, [r6, 0x2] adds r0, r4, 0 bl sub_80C4DF8 @@ -9144,7 +9144,7 @@ _08114E84: movs r1, 0 movs r2, 0x1 bl sub_8113EAC - ldr r4, _08114F04 @ =gUnknown_2021CF0 + ldr r4, _08114F04 @ =gStringVar2 ldrb r1, [r5, 0x8] adds r0, r4, 0 movs r2, 0 @@ -9157,7 +9157,7 @@ _08114E84: movs r1, 0 movs r2, 0x3 bl sub_8113EAC - ldr r4, _08114F08 @ =gUnknown_2021D04 + ldr r4, _08114F08 @ =gStringVar3 ldrb r1, [r6, 0x1] adds r0, r4, 0 movs r2, 0 @@ -9176,24 +9176,24 @@ _08114E84: ldrb r0, [r6, 0x1] cmp r0, 0x1 bne _08114F18 - ldr r0, _08114F10 @ =gUnknown_2021D18 + ldr r0, _08114F10 @ =gStringVar4 ldr r1, _08114F14 @ =gUnknown_841AA01 bl UnkTextUtil_StringExpandPlaceholders b _08114FAC .align 2, 0 -_08114F00: .4byte gUnknown_2021CD0 -_08114F04: .4byte gUnknown_2021CF0 -_08114F08: .4byte gUnknown_2021D04 +_08114F00: .4byte gStringVar1 +_08114F04: .4byte gStringVar2 +_08114F08: .4byte gStringVar3 _08114F0C: .4byte gSaveBlock2Ptr -_08114F10: .4byte gUnknown_2021D18 +_08114F10: .4byte gStringVar4 _08114F14: .4byte gUnknown_841AA01 _08114F18: - ldr r0, _08114F24 @ =gUnknown_2021D18 + ldr r0, _08114F24 @ =gStringVar4 ldr r1, _08114F28 @ =gUnknown_841AA2B bl UnkTextUtil_StringExpandPlaceholders b _08114FAC .align 2, 0 -_08114F24: .4byte gUnknown_2021D18 +_08114F24: .4byte gStringVar4 _08114F28: .4byte gUnknown_841AA2B _08114F2C: ldrb r1, [r6, 0x1] @@ -9201,53 +9201,53 @@ _08114F2C: bne _08114F5C cmp r0, 0x1 bne _08114F48 - ldr r0, _08114F40 @ =gUnknown_2021D18 + ldr r0, _08114F40 @ =gStringVar4 ldr r1, _08114F44 @ =gUnknown_841A9A9 bl UnkTextUtil_StringExpandPlaceholders b _08114FAC .align 2, 0 -_08114F40: .4byte gUnknown_2021D18 +_08114F40: .4byte gStringVar4 _08114F44: .4byte gUnknown_841A9A9 _08114F48: - ldr r0, _08114F54 @ =gUnknown_2021D18 + ldr r0, _08114F54 @ =gStringVar4 ldr r1, _08114F58 @ =gUnknown_841A9D4 bl UnkTextUtil_StringExpandPlaceholders b _08114FAC .align 2, 0 -_08114F54: .4byte gUnknown_2021D18 +_08114F54: .4byte gStringVar4 _08114F58: .4byte gUnknown_841A9D4 _08114F5C: cmp r0, 0x1 bne _08114F8C cmp r1, 0x1 bne _08114F78 - ldr r0, _08114F70 @ =gUnknown_2021D18 + ldr r0, _08114F70 @ =gStringVar4 ldr r1, _08114F74 @ =gUnknown_841AA76 bl UnkTextUtil_StringExpandPlaceholders b _08114FAC .align 2, 0 -_08114F70: .4byte gUnknown_2021D18 +_08114F70: .4byte gStringVar4 _08114F74: .4byte gUnknown_841AA76 _08114F78: - ldr r0, _08114F84 @ =gUnknown_2021D18 + ldr r0, _08114F84 @ =gStringVar4 ldr r1, _08114F88 @ =gUnknown_841AAAA bl UnkTextUtil_StringExpandPlaceholders b _08114FAC .align 2, 0 -_08114F84: .4byte gUnknown_2021D18 +_08114F84: .4byte gStringVar4 _08114F88: .4byte gUnknown_841AAAA _08114F8C: cmp r1, 0x1 bne _08114FA4 - ldr r0, _08114F9C @ =gUnknown_2021D18 + ldr r0, _08114F9C @ =gStringVar4 ldr r1, _08114FA0 @ =gUnknown_841AAEC bl UnkTextUtil_StringExpandPlaceholders b _08114FAC .align 2, 0 -_08114F9C: .4byte gUnknown_2021D18 +_08114F9C: .4byte gStringVar4 _08114FA0: .4byte gUnknown_841AAEC _08114FA4: - ldr r0, _08114FB4 @ =gUnknown_2021D18 + ldr r0, _08114FB4 @ =gStringVar4 ldr r1, _08114FB8 @ =gUnknown_841AB29 bl UnkTextUtil_StringExpandPlaceholders _08114FAC: @@ -9257,7 +9257,7 @@ _08114FAE: pop {r1} bx r1 .align 2, 0 -_08114FB4: .4byte gUnknown_2021D18 +_08114FB4: .4byte gStringVar4 _08114FB8: .4byte gUnknown_841AB29 thumb_func_end sub_8114E68 @@ -9344,7 +9344,7 @@ sub_811500C: @ 811500C ldr r1, [r0] movs r0, 0x3 bl UnkTextUtil_SetPtrI - ldr r0, _08115070 @ =gUnknown_2021D18 + ldr r0, _08115070 @ =gStringVar4 ldr r1, _08115074 @ =gUnknown_841AF3E bl UnkTextUtil_StringExpandPlaceholders adds r4, 0x8 @@ -9355,7 +9355,7 @@ sub_811500C: @ 811500C .align 2, 0 _08115068: .4byte gUnknown_823EACC _0811506C: .4byte gUnknown_8456ACC -_08115070: .4byte gUnknown_2021D18 +_08115070: .4byte gStringVar4 _08115074: .4byte gUnknown_841AF3E thumb_func_end sub_811500C @@ -9449,7 +9449,7 @@ _08115112: adds r1, r0 movs r0, 0x1 bl UnkTextUtil_SetPtrI - ldr r0, _08115140 @ =gUnknown_2021D18 + ldr r0, _08115140 @ =gStringVar4 ldr r1, _08115144 @ =gUnknown_841A2E1 bl UnkTextUtil_StringExpandPlaceholders b _081151AC @@ -9457,7 +9457,7 @@ _08115112: _08115134: .4byte gSaveBlock2Ptr _08115138: .4byte gSaveBlock1Ptr _0811513C: .4byte 0x00003a4c -_08115140: .4byte gUnknown_2021D18 +_08115140: .4byte gStringVar4 _08115144: .4byte gUnknown_841A2E1 _08115148: ldr r0, _08115180 @ =gSaveBlock1Ptr @@ -9478,7 +9478,7 @@ _08115148: movs r1, 0 movs r2, 0x3 bl sub_8113EAC - ldr r0, _0811518C @ =gUnknown_2021D18 + ldr r0, _0811518C @ =gStringVar4 ldr r1, _08115190 @ =gUnknown_841A312 bl UnkTextUtil_StringExpandPlaceholders b _081151AC @@ -9486,7 +9486,7 @@ _08115148: _08115180: .4byte gSaveBlock1Ptr _08115184: .4byte 0x00003a4c _08115188: .4byte gSaveBlock2Ptr -_0811518C: .4byte gUnknown_2021D18 +_0811518C: .4byte gStringVar4 _08115190: .4byte gUnknown_841A312 _08115194: ldr r1, _081151B4 @ =gUnknown_8456AD8 @@ -9496,7 +9496,7 @@ _08115194: ldr r1, [r0] movs r0, 0 bl UnkTextUtil_SetPtrI - ldr r0, _081151B8 @ =gUnknown_2021D18 + ldr r0, _081151B8 @ =gStringVar4 ldr r1, _081151BC @ =gUnknown_841A349 bl UnkTextUtil_StringExpandPlaceholders _081151AC: @@ -9507,7 +9507,7 @@ _081151AE: bx r1 .align 2, 0 _081151B4: .4byte gUnknown_8456AD8 -_081151B8: .4byte gUnknown_2021D18 +_081151B8: .4byte gStringVar4 _081151BC: .4byte gUnknown_841A349 thumb_func_end sub_81150CC @@ -9537,7 +9537,7 @@ sub_81151DC: @ 81151DC adds r5, r0, 0 adds r6, r5, 0x6 bl UnkTextUtil_Reset - ldr r4, _0811522C @ =gUnknown_2021CD0 + ldr r4, _0811522C @ =gStringVar1 ldrb r1, [r5, 0x6] adds r0, r4, 0 bl sub_80C4DF8 @@ -9565,7 +9565,7 @@ _0811521A: bl UnkTextUtil_SetPtrI b _0811523E .align 2, 0 -_0811522C: .4byte gUnknown_2021CD0 +_0811522C: .4byte gStringVar1 _08115230: .4byte gUnknown_823EAC8 _08115234: adds r1, r3, 0x4 @@ -9588,7 +9588,7 @@ _0811523E: ldr r1, [r0] movs r0, 0x4 bl UnkTextUtil_SetPtrI - ldr r0, _08115278 @ =gUnknown_2021D18 + ldr r0, _08115278 @ =gStringVar4 ldr r1, _0811527C @ =gUnknown_841AF6D bl UnkTextUtil_StringExpandPlaceholders adds r0, r6, 0x2 @@ -9597,7 +9597,7 @@ _0811523E: bx r1 .align 2, 0 _08115274: .4byte gUnknown_8456ACC -_08115278: .4byte gUnknown_2021D18 +_08115278: .4byte gStringVar4 _0811527C: .4byte gUnknown_841AF6D thumb_func_end sub_81151DC @@ -9644,10 +9644,10 @@ sub_81152BC: @ 81152BC bl sub_8113E88 adds r5, r0, 0 ldrb r6, [r5, 0x1] - ldr r0, _08115318 @ =gUnknown_2021CD0 + ldr r0, _08115318 @ =gStringVar1 ldrb r1, [r5] bl sub_80C4DF8 - ldr r0, _0811531C @ =gUnknown_2021CF0 + ldr r0, _0811531C @ =gStringVar2 ldr r2, _08115320 @ =gUnknown_8456AF0 lsls r1, r6, 2 adds r1, r2 @@ -9675,17 +9675,17 @@ _081152F2: lsrs r0, 24 cmp r0, 0x1 beq _08115364 - ldr r0, _0811532C @ =gUnknown_2021D18 + ldr r0, _0811532C @ =gStringVar4 ldr r1, _08115330 @ =gUnknown_841AE48 bl StringExpandPlaceholders b _0811533E .align 2, 0 -_08115318: .4byte gUnknown_2021CD0 -_0811531C: .4byte gUnknown_2021CF0 +_08115318: .4byte gStringVar1 +_0811531C: .4byte gStringVar2 _08115320: .4byte gUnknown_8456AF0 _08115324: .4byte gUnknown_8456BE4 _08115328: .4byte gUnknown_8456C17 -_0811532C: .4byte gUnknown_2021D18 +_0811532C: .4byte gStringVar4 _08115330: .4byte gUnknown_841AE48 _08115334: adds r0, r4, 0x1 @@ -9696,7 +9696,7 @@ _08115334: _0811533E: cmp r4, 0x8 bne _0811538A - ldr r0, _08115358 @ =gUnknown_2021D18 + ldr r0, _08115358 @ =gStringVar4 ldr r2, _0811535C @ =gUnknown_8456BBC ldr r1, _08115360 @ =gUnknown_8456BE4 adds r1, r6, r1 @@ -9707,19 +9707,19 @@ _0811533E: bl StringExpandPlaceholders b _0811538A .align 2, 0 -_08115358: .4byte gUnknown_2021D18 +_08115358: .4byte gStringVar4 _0811535C: .4byte gUnknown_8456BBC _08115360: .4byte gUnknown_8456BE4 _08115364: - ldr r0, _08115370 @ =gUnknown_2021D18 + ldr r0, _08115370 @ =gStringVar4 ldr r1, _08115374 @ =gUnknown_841AE8F bl StringExpandPlaceholders b _0811533E .align 2, 0 -_08115370: .4byte gUnknown_2021D18 +_08115370: .4byte gStringVar4 _08115374: .4byte gUnknown_841AE8F _08115378: - ldr r0, _08115394 @ =gUnknown_2021D18 + ldr r0, _08115394 @ =gStringVar4 ldr r2, _08115398 @ =gUnknown_8456BBC ldrb r1, [r1] lsls r1, 2 @@ -9733,7 +9733,7 @@ _0811538A: pop {r1} bx r1 .align 2, 0 -_08115394: .4byte gUnknown_2021D18 +_08115394: .4byte gStringVar4 _08115398: .4byte gUnknown_8456BBC thumb_func_end sub_81152BC @@ -9864,13 +9864,13 @@ sub_8115460: @ 8115460 adds r4, r0, 0 adds r5, r4, 0x2 ldrh r0, [r4] - ldr r1, _0811549C @ =gUnknown_2021CD0 + ldr r1, _0811549C @ =gStringVar1 movs r2, 0 bl sub_8113EAC ldrb r0, [r5, 0x1] cmp r0, 0xFF beq _08115486 - ldr r0, _081154A0 @ =gUnknown_2021CF0 + ldr r0, _081154A0 @ =gStringVar2 ldrb r1, [r5, 0x1] bl sub_80C4DF8 _08115486: @@ -9880,21 +9880,21 @@ _08115486: ldrb r0, [r5, 0x1] cmp r0, 0x58 bne _081154AC - ldr r0, _081154A4 @ =gUnknown_2021D04 + ldr r0, _081154A4 @ =gStringVar3 ldr r1, _081154A8 @ =gUnknown_841B09F bl StringCopy b _081154B4 .align 2, 0 -_0811549C: .4byte gUnknown_2021CD0 -_081154A0: .4byte gUnknown_2021CF0 -_081154A4: .4byte gUnknown_2021D04 +_0811549C: .4byte gStringVar1 +_081154A0: .4byte gStringVar2 +_081154A4: .4byte gStringVar3 _081154A8: .4byte gUnknown_841B09F _081154AC: - ldr r0, _081154CC @ =gUnknown_2021D04 + ldr r0, _081154CC @ =gStringVar3 ldr r1, _081154D0 @ =gUnknown_8418C1B bl StringCopy _081154B4: - ldr r0, _081154D4 @ =gUnknown_2021D18 + ldr r0, _081154D4 @ =gStringVar4 ldr r2, _081154D8 @ =gUnknown_8456C20 ldrb r1, [r5] lsls r1, 2 @@ -9906,9 +9906,9 @@ _081154B4: pop {r1} bx r1 .align 2, 0 -_081154CC: .4byte gUnknown_2021D04 +_081154CC: .4byte gStringVar3 _081154D0: .4byte gUnknown_8418C1B -_081154D4: .4byte gUnknown_2021D18 +_081154D4: .4byte gStringVar4 _081154D8: .4byte gUnknown_8456C20 thumb_func_end sub_8115460 @@ -9960,7 +9960,7 @@ sub_8115518: @ 8115518 ldrh r1, [r4, 0x6] adds r6, r0, r1 bl UnkTextUtil_Reset - ldr r5, _08115564 @ =gUnknown_2021CD0 + ldr r5, _08115564 @ =gStringVar1 ldrb r1, [r4, 0x8] adds r0, r5, 0 bl sub_80C4DF8 @@ -9975,16 +9975,16 @@ sub_8115518: @ 8115518 ldrh r0, [r4, 0x2] cmp r0, 0x1 bhi _08115570 - ldr r0, _08115568 @ =gUnknown_2021D18 + ldr r0, _08115568 @ =gStringVar4 ldr r1, _0811556C @ =gUnknown_841A7DD bl UnkTextUtil_StringExpandPlaceholders b _0811558E .align 2, 0 -_08115564: .4byte gUnknown_2021CD0 -_08115568: .4byte gUnknown_2021D18 +_08115564: .4byte gStringVar1 +_08115568: .4byte gStringVar4 _0811556C: .4byte gUnknown_841A7DD _08115570: - ldr r4, _08115598 @ =gUnknown_2021CF0 + ldr r4, _08115598 @ =gStringVar2 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 @@ -9993,7 +9993,7 @@ _08115570: movs r0, 0x2 adds r1, r4, 0 bl UnkTextUtil_SetPtrI - ldr r0, _0811559C @ =gUnknown_2021D18 + ldr r0, _0811559C @ =gStringVar4 ldr r1, _081155A0 @ =gUnknown_841A810 bl UnkTextUtil_StringExpandPlaceholders _0811558E: @@ -10002,8 +10002,8 @@ _0811558E: pop {r1} bx r1 .align 2, 0 -_08115598: .4byte gUnknown_2021CF0 -_0811559C: .4byte gUnknown_2021D18 +_08115598: .4byte gStringVar2 +_0811559C: .4byte gStringVar4 _081155A0: .4byte gUnknown_841A810 thumb_func_end sub_8115518 @@ -10055,7 +10055,7 @@ sub_81155E0: @ 81155E0 ldrh r1, [r5, 0x6] adds r6, r0, r1 bl UnkTextUtil_Reset - ldr r4, _0811563C @ =gUnknown_2021CD0 + ldr r4, _0811563C @ =gStringVar1 ldrb r1, [r5, 0x8] adds r0, r4, 0 bl sub_80C4DF8 @@ -10082,11 +10082,11 @@ sub_81155E0: @ 81155E0 bl UnkTextUtil_SetPtrI b _08115670 .align 2, 0 -_0811563C: .4byte gUnknown_2021CD0 +_0811563C: .4byte gStringVar1 _08115640: .4byte gSaveBlock2Ptr _08115644: .4byte gUnknown_841A8D4 _08115648: - ldr r4, _0811567C @ =gUnknown_2021CF0 + ldr r4, _0811567C @ =gStringVar2 ldrh r1, [r5, 0x2] adds r0, r4, 0 movs r2, 0 @@ -10095,7 +10095,7 @@ _08115648: movs r0, 0x4 adds r1, r4, 0 bl UnkTextUtil_SetPtrI - ldr r4, _08115680 @ =gUnknown_2021D04 + ldr r4, _08115680 @ =gStringVar3 ldr r1, _08115684 @ =gUnknown_841A8DD adds r0, r4, 0 bl UnkTextUtil_StringExpandPlaceholders @@ -10103,15 +10103,15 @@ _08115648: adds r1, r4, 0 bl UnkTextUtil_SetPtrI _08115670: - ldr r0, _08115688 @ =gUnknown_2021D18 + ldr r0, _08115688 @ =gStringVar4 ldr r1, _0811568C @ =gUnknown_841A858 bl UnkTextUtil_StringExpandPlaceholders b _081156C4 .align 2, 0 -_0811567C: .4byte gUnknown_2021CF0 -_08115680: .4byte gUnknown_2021D04 +_0811567C: .4byte gStringVar2 +_08115680: .4byte gStringVar3 _08115684: .4byte gUnknown_841A8DD -_08115688: .4byte gUnknown_2021D18 +_08115688: .4byte gStringVar4 _0811568C: .4byte gUnknown_841A858 _08115690: movs r0, 0 @@ -10122,7 +10122,7 @@ _08115690: adds r1, r0, 0 movs r0, 0x1 bl UnkTextUtil_SetPtrI - ldr r4, _081156CC @ =gUnknown_2021CF0 + ldr r4, _081156CC @ =gStringVar2 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 @@ -10131,7 +10131,7 @@ _08115690: movs r0, 0x2 adds r1, r4, 0 bl UnkTextUtil_SetPtrI - ldr r0, _081156D0 @ =gUnknown_2021D18 + ldr r0, _081156D0 @ =gStringVar4 ldr r1, _081156D4 @ =gUnknown_841A896 bl UnkTextUtil_StringExpandPlaceholders _081156C4: @@ -10140,8 +10140,8 @@ _081156C4: pop {r1} bx r1 .align 2, 0 -_081156CC: .4byte gUnknown_2021CF0 -_081156D0: .4byte gUnknown_2021D18 +_081156CC: .4byte gStringVar2 +_081156D0: .4byte gStringVar4 _081156D4: .4byte gUnknown_841A896 thumb_func_end sub_81155E0 @@ -10178,16 +10178,16 @@ sub_8115700: @ 8115700 bl sub_8113E88 adds r4, r0, 0 adds r5, r4, 0x2 - ldr r0, _08115738 @ =gUnknown_2021CD0 + ldr r0, _08115738 @ =gStringVar1 ldrb r1, [r4, 0x2] bl sub_80C4DF8 - ldr r6, _0811573C @ =gUnknown_2021CF0 + ldr r6, _0811573C @ =gStringVar2 ldrh r0, [r4] bl ItemId_GetItem adds r1, r0, 0 adds r0, r6, 0 bl StringCopy - ldr r0, _08115740 @ =gUnknown_2021D18 + ldr r0, _08115740 @ =gStringVar4 ldr r1, _08115744 @ =gUnknown_841B03F bl StringExpandPlaceholders adds r5, 0x2 @@ -10196,9 +10196,9 @@ sub_8115700: @ 8115700 pop {r1} bx r1 .align 2, 0 -_08115738: .4byte gUnknown_2021CD0 -_0811573C: .4byte gUnknown_2021CF0 -_08115740: .4byte gUnknown_2021D18 +_08115738: .4byte gStringVar1 +_0811573C: .4byte gStringVar2 +_08115740: .4byte gStringVar4 _08115744: .4byte gUnknown_841B03F thumb_func_end sub_8115700 @@ -10313,10 +10313,10 @@ sub_8115800: @ 8115800 movs r0, 0x2A bl sub_8113E88 adds r4, r0, 0 - ldr r0, _08115828 @ =gUnknown_2021CD0 + ldr r0, _08115828 @ =gStringVar1 ldrb r1, [r4] bl sub_80C4DF8 - ldr r0, _0811582C @ =gUnknown_2021D18 + ldr r0, _0811582C @ =gStringVar4 ldr r1, _08115830 @ =gUnknown_841B064 bl StringExpandPlaceholders adds r4, 0x2 @@ -10325,8 +10325,8 @@ sub_8115800: @ 8115800 pop {r1} bx r1 .align 2, 0 -_08115828: .4byte gUnknown_2021CD0 -_0811582C: .4byte gUnknown_2021D18 +_08115828: .4byte gStringVar1 +_0811582C: .4byte gStringVar4 _08115830: .4byte gUnknown_841B064 thumb_func_end sub_8115800 diff --git a/asm/region_map.s b/asm/region_map.s index fba9869de..f21b27bbe 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -788,7 +788,7 @@ _080C0474: beq _080C0494 _080C048E: movs r0, 0x65 - bl sub_80722CC + bl PlaySE _080C0494: bl sub_80C3508 lsls r0, 16 @@ -807,7 +807,7 @@ _080C0494: cmp r0, 0x1 bne _080C04C2 movs r0, 0xE1 - bl sub_80722CC + bl PlaySE b _080C04E0 _080C04C2: bl sub_80C3508 @@ -821,7 +821,7 @@ _080C04C2: cmp r0, 0xD bne _080C04E0 movs r0, 0xE1 - bl sub_80722CC + bl PlaySE _080C04E0: pop {r0} bx r0 @@ -2777,7 +2777,7 @@ sub_80C1478: @ 80C1478 cmp r0, 0 beq _080C150E movs r0, 0xF5 - bl sub_80722CC + bl PlaySE mov r2, r8 ldr r1, [r2] adds r1, r7 @@ -2803,7 +2803,7 @@ _080C150E: cmp r1, r0 bcs _080C1542 movs r0, 0xF5 - bl sub_80722CC + bl PlaySE ldr r1, [r4] ldr r3, _080C1584 @ =0x00001cca adds r1, r3 @@ -2826,7 +2826,7 @@ _080C1542: cmp r0, 0x6 bne _080C15A8 movs r0, 0xC7 - bl sub_80722CC + bl PlaySE ldr r0, [r4] ldr r2, _080C1584 @ =0x00001cca adds r1, r0, r2 @@ -5034,7 +5034,7 @@ _080C2796: adds r0, 0x1 strb r0, [r1] movs r0, 0xF4 - bl sub_80722CC + bl PlaySE b _080C299A .align 2, 0 _080C27AC: .4byte gUnknown_2037AB8 @@ -5189,7 +5189,7 @@ _080C28A4: movs r0, 0xF4 bl m4aSongNumStop movs r0, 0x2A - bl sub_80722CC + bl PlaySE ldr r0, _080C2920 @ =gUnknown_20399E0 ldr r1, [r0] ldr r0, _080C2924 @ =0x00000ccc @@ -5768,7 +5768,7 @@ _080C2DB8: bl sub_80C2B9C bl sub_80C2B48 movs r0, 0xF3 - bl sub_80722CC + bl PlaySE ldr r0, _080C2DD0 @ =gUnknown_20399E0 ldr r1, [r0] ldr r0, _080C2DD4 @ =0x00000ccf @@ -6365,7 +6365,7 @@ _080C3236: cmp r1, r0 bne _080C3254 movs r0, 0xF0 - bl sub_80722CC + bl PlaySE movs r5, 0x6 _080C3254: ldr r0, [r6] @@ -6380,7 +6380,7 @@ _080C3254: cmp r0, 0x1 bne _080C331A movs r0, 0xF0 - bl sub_80722CC + bl PlaySE movs r5, 0x5 b _080C331A .align 2, 0 @@ -10063,7 +10063,7 @@ _080C5070: cmp r0, 0x2 bne _080C5086 movs r0, 0x66 - bl sub_80722CC + bl PlaySE b _080C508A _080C5086: bl sub_80C0450 @@ -10083,7 +10083,7 @@ _080C508A: cmp r0, 0xD bne _080C50C4 movs r0, 0xE1 - bl sub_80722CC + bl PlaySE ldr r0, _080C50C0 @ =gUnknown_8418E95 bl sub_80C4E74 b _080C51DC @@ -10160,7 +10160,7 @@ _080C514C: .4byte gSaveBlock1Ptr _080C5150: .4byte gUnknown_20399FC _080C5154: movs r0, 0x1 - bl sub_80722CC + bl PlaySE ldr r1, _080C5164 @ =gUnknown_20399FC ldr r0, [r1] strb r4, [r0, 0x2] diff --git a/asm/rom6.s b/asm/rom6.s index 2d64361ff..1b0582ade 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -354,7 +354,7 @@ _080C9A5C: .4byte sub_80C9A60 sub_80C9A60: @ 80C9A60 push {lr} movs r0, 0x7C - bl sub_80722CC + bl PlaySE movs r0, 0x25 bl FieldEffectActiveListRemove bl EnableBothScriptContexts diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 36f6d4797..c58a4485c 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -2363,7 +2363,7 @@ ScrCmd_playse: @ 806B068 bl ScriptReadHalfword lsls r0, 16 lsrs r0, 16 - bl sub_80722CC + bl PlaySE movs r0, 0 pop {r1} bx r1 @@ -3978,7 +3978,7 @@ _0806BC50: movs r2, 0x1 negs r2, r2 movs r0, 0x6 - bl sub_8005ED4 + bl GetStringWidth strh r0, [r4] movs r0, 0 pop {r4} @@ -4351,14 +4351,14 @@ ScrCmd_vloadword: @ 806BF3C ldr r0, _0806BF58 @ =gUnknown_20370A8 ldr r0, [r0] subs r1, r0 - ldr r0, _0806BF5C @ =gUnknown_2021D18 + ldr r0, _0806BF5C @ =gStringVar4 bl StringExpandPlaceholders movs r0, 0 pop {r1} bx r1 .align 2, 0 _0806BF58: .4byte gUnknown_20370A8 -_0806BF5C: .4byte gUnknown_2021D18 +_0806BF5C: .4byte gStringVar4 thumb_func_end ScrCmd_vloadword thumb_func_start ScrCmd_vbufferstring @@ -5273,7 +5273,7 @@ ScrCmd_opendoor: @ 806C5D4 bl sub_805B364 lsls r0, 16 lsrs r0, 16 - bl sub_80722CC + bl PlaySE adds r0, r5, 0 adds r1, r4, 0 bl sub_805B310 diff --git a/asm/script_menu.s b/asm/script_menu.s index 09ec135fb..531dff840 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -11,7 +11,7 @@ sub_809C954: @ 809C954 adds r1, r0, 0 movs r0, 0x1 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 adds r0, r1, 0x7 cmp r0, 0 @@ -206,7 +206,7 @@ _0809CAC6: ldr r1, [r5] movs r0, 0x2 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth cmp r0, r6 ble _0809CAD6 adds r6, r0, 0 @@ -505,7 +505,7 @@ _0809CCF8: cmp r0, 0 bne _0809CD3C movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0809CD24 @ =gUnknown_20370D0 movs r0, 0x7F strh r0, [r1] @@ -710,7 +710,7 @@ _0809CE94: bne _0809CEB2 _0809CE9C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0809CEA8 @ =gUnknown_20370D0 movs r0, 0 b _0809CEB0 @@ -889,7 +889,7 @@ sub_809CFDC: @ 809CFDC cmp r0, 0 bne _0809D034 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _0809D01C @ =gUnknown_20370D0 movs r0, 0x7F strh r0, [r1] @@ -1119,7 +1119,7 @@ _0809D1E4: adds r3, r7, 0 bl PrintTextOnWindow _0809D1FA: - ldr r4, _0809D24C @ =gUnknown_2021D18 + ldr r4, _0809D24C @ =gStringVar4 ldr r1, _0809D250 @ =gUnknown_8417BB6 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1155,7 +1155,7 @@ _0809D1FA: bx r0 .align 2, 0 _0809D248: .4byte gUnknown_8417B9F -_0809D24C: .4byte gUnknown_2021D18 +_0809D24C: .4byte gStringVar4 _0809D250: .4byte gUnknown_8417BB6 thumb_func_end sub_809D070 diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index ec76cd2b0..78aecb3c0 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -287,7 +287,7 @@ GetNameOfEnigmaBerryInPlayerParty: @ 80A026C bl ItemIdToBerryType lsls r0, 24 lsrs r0, 24 - ldr r1, _080A0298 @ =gUnknown_2021CD0 + ldr r1, _080A0298 @ =gStringVar1 bl GetBerryNameByBerryType _080A028E: adds r0, r4, 0 @@ -295,7 +295,7 @@ _080A028E: pop {r1} bx r1 .align 2, 0 -_080A0298: .4byte gUnknown_2021CD0 +_080A0298: .4byte gStringVar1 thumb_func_end GetNameOfEnigmaBerryInPlayerParty thumb_func_start CreateScriptedWildMon diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s index d13320223..4a35815e0 100644 --- a/asm/script_pokemon_util_80BF8FC.s +++ b/asm/script_pokemon_util_80BF8FC.s @@ -190,10 +190,10 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r1, _080BFA9C @ =gUnknown_2021CD0 + ldr r1, _080BFA9C @ =gStringVar1 adds r0, r5, 0 bl GetMonNickname - ldr r0, _080BFAA0 @ =gUnknown_2021CF0 + ldr r0, _080BFAA0 @ =gStringVar2 movs r1, 0xD muls r1, r4 ldr r2, _080BFAA4 @ =gUnknown_8247094 @@ -206,8 +206,8 @@ ScrSpecial_GetPokemonNicknameAndMoveName: @ 80BFA50 _080BFA90: .4byte gUnknown_20370C0 _080BFA94: .4byte gUnknown_2024284 _080BFA98: .4byte gUnknown_20370C2 -_080BFA9C: .4byte gUnknown_2021CD0 -_080BFAA0: .4byte gUnknown_2021CF0 +_080BFA9C: .4byte gStringVar1 +_080BFAA0: .4byte gStringVar2 _080BFAA4: .4byte gUnknown_8247094 thumb_func_end ScrSpecial_GetPokemonNicknameAndMoveName diff --git a/asm/seagallop.s b/asm/seagallop.s index ea7bd3536..660f732d4 100644 --- a/asm/seagallop.s +++ b/asm/seagallop.s @@ -170,7 +170,7 @@ _08146FE4: ldr r0, _08147044 @ =sub_8147058 bl SetVBlankCallback movs r0, 0x13 - bl sub_80722CC + bl PlaySE bl sub_81473C4 movs r1, 0x80 lsls r1, 6 @@ -364,7 +364,7 @@ _08147150: bl Overworld_SetWarpDestination bl play_some_sound movs r0, 0x9 - bl sub_80722CC + bl PlaySE ldr r1, _081471B4 @ =gUnknown_3005020 ldr r0, _081471B8 @ =sub_807DF64 str r0, [r1] diff --git a/asm/shop.s b/asm/shop.s index a9e4ba047..2b9738c94 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -205,7 +205,7 @@ sub_809AC10: @ 809AC10 cmp r1, r0 bne _0809AC3C movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_809ACF8 b _0809AC52 @@ -1041,7 +1041,7 @@ sub_809B320: @ 809B320 cmp r1, 0x1 beq _0809B334 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0809B334: movs r0, 0x2 negs r0, r0 @@ -1158,7 +1158,7 @@ sub_809B408: @ 809B408 negs r0, r0 cmp r1, r0 beq _0809B480 - ldr r4, _0809B488 @ =gUnknown_2021CD0 + ldr r4, _0809B488 @ =gStringVar1 lsls r0, r1, 16 lsrs r0, 16 bl itemid_get_market_price @@ -1175,7 +1175,7 @@ sub_809B408: @ 809B408 lsrs r0, 16 movs r1, 0x4 subs r1, r0 - ldr r2, _0809B48C @ =gUnknown_2021D18 + ldr r2, _0809B48C @ =gStringVar4 adds r0, r1, 0 subs r1, 0x1 cmp r0, 0 @@ -1192,7 +1192,7 @@ _0809B45C: ldr r1, _0809B490 @ =gUnknown_841697A adds r0, r2, 0 bl StringExpandPlaceholders - ldr r2, _0809B48C @ =gUnknown_2021D18 + ldr r2, _0809B48C @ =gStringVar4 str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -1211,8 +1211,8 @@ _0809B480: pop {r0} bx r0 .align 2, 0 -_0809B488: .4byte gUnknown_2021CD0 -_0809B48C: .4byte gUnknown_2021D18 +_0809B488: .4byte gStringVar1 +_0809B48C: .4byte gStringVar4 _0809B490: .4byte gUnknown_841697A thumb_func_end sub_809B408 @@ -1225,14 +1225,14 @@ sub_809B494: @ 809B494 negs r0, r0 cmp r7, r0 beq _0809B528 - ldr r4, _0809B514 @ =gUnknown_2021CD0 + ldr r4, _0809B514 @ =gStringVar1 ldr r0, _0809B518 @ =0xfffffee0 adds r1, r7, r0 adds r0, r4, 0 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r5, _0809B51C @ =gUnknown_2021D18 + ldr r5, _0809B51C @ =gStringVar4 ldr r1, _0809B520 @ =gUnknown_8416226 adds r0, r5, 0 bl StringCopy @@ -1276,9 +1276,9 @@ sub_809B494: @ 809B494 bl sub_813F6F4 b _0809B55C .align 2, 0 -_0809B514: .4byte gUnknown_2021CD0 +_0809B514: .4byte gStringVar1 _0809B518: .4byte 0xfffffee0 -_0809B51C: .4byte gUnknown_2021D18 +_0809B51C: .4byte gStringVar4 _0809B520: .4byte gUnknown_8416226 _0809B524: .4byte gUnknown_8247094 _0809B528: @@ -2112,13 +2112,13 @@ sub_809BB44: @ 809BB44 movs r1, 0x36 movs r2, 0xA bl sub_809FEC4 - ldr r0, _0809BBB4 @ =gUnknown_2021CD0 + ldr r0, _0809BBB4 @ =gStringVar1 movs r2, 0x2 ldrsh r1, [r4, r2] movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r4, _0809BBB8 @ =gUnknown_2021D18 + ldr r4, _0809BBB8 @ =gStringVar4 ldr r1, _0809BBBC @ =gUnknown_84162B9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2142,8 +2142,8 @@ sub_809BB44: @ 809BB44 .align 2, 0 _0809BBAC: .4byte gUnknown_3005098 _0809BBB0: .4byte gUnknown_2039934 -_0809BBB4: .4byte gUnknown_2021CD0 -_0809BBB8: .4byte gUnknown_2021D18 +_0809BBB4: .4byte gStringVar1 +_0809BBB8: .4byte gStringVar4 _0809BBBC: .4byte gUnknown_84162B9 thumb_func_end sub_809BB44 @@ -2185,13 +2185,13 @@ _0809BC04: .4byte gUnknown_2037AB8 _0809BC08: .4byte gUnknown_2039942 _0809BC0C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r6, 0 bl sub_809C004 b _0809BC8E _0809BC1A: movs r0, 0x5 - bl sub_80722CC + bl PlaySE strh r4, [r5, 0xA] movs r0, 0x5 bl ClearWindowTilemap @@ -2230,7 +2230,7 @@ _0809BC70: .4byte gSaveBlock1Ptr _0809BC74: .4byte gUnknown_8416842 _0809BC78: .4byte sub_809BF98 _0809BC7C: - ldr r1, _0809BC94 @ =gUnknown_2021CD0 + ldr r1, _0809BC94 @ =gStringVar1 adds r0, r4, 0 bl sub_8099E90 ldr r1, _0809BC98 @ =gUnknown_8416766 @@ -2242,7 +2242,7 @@ _0809BC8E: pop {r0} bx r0 .align 2, 0 -_0809BC94: .4byte gUnknown_2021CD0 +_0809BC94: .4byte gStringVar1 _0809BC98: .4byte gUnknown_8416766 _0809BC9C: .4byte sub_809BCA0 thumb_func_end sub_809BBC0 @@ -2266,12 +2266,12 @@ sub_809BCA0: @ 809BCA0 movs r0, 0x1 movs r1, 0 bl sub_813F7C0 - ldr r0, _0809BD44 @ =gUnknown_2021CD0 + ldr r0, _0809BD44 @ =gStringVar1 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r6, _0809BD48 @ =gUnknown_2021D18 + ldr r6, _0809BD48 @ =gStringVar4 ldr r1, _0809BD4C @ =gUnknown_8416749 adds r0, r6, 0 bl StringExpandPlaceholders @@ -2319,8 +2319,8 @@ sub_809BCA0: @ 809BCA0 b _0809BD5E .align 2, 0 _0809BD40: .4byte gUnknown_3005098 -_0809BD44: .4byte gUnknown_2021CD0 -_0809BD48: .4byte gUnknown_2021D18 +_0809BD44: .4byte gStringVar1 +_0809BD48: .4byte gStringVar4 _0809BD4C: .4byte gUnknown_8416749 _0809BD50: .4byte gSaveBlock1Ptr _0809BD54: .4byte gUnknown_2039934 @@ -2392,7 +2392,7 @@ _0809BDD4: cmp r0, 0 beq _0809BE54 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_809B73C movs r0, 0x3 movs r1, 0 @@ -2407,15 +2407,15 @@ _0809BDD4: movs r0, 0x4 bl PutWindowTilemap ldrh r0, [r4, 0xA] - ldr r1, _0809BE40 @ =gUnknown_2021CD0 + ldr r1, _0809BE40 @ =gStringVar1 bl sub_8099E90 - ldr r0, _0809BE44 @ =gUnknown_2021CF0 + ldr r0, _0809BE44 @ =gStringVar2 movs r2, 0x2 ldrsh r1, [r4, r2] movs r2, 0 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0809BE48 @ =gUnknown_2021D04 + ldr r0, _0809BE48 @ =gStringVar3 ldr r1, [r6, 0x8] movs r2, 0 movs r3, 0x8 @@ -2427,9 +2427,9 @@ _0809BDD4: b _0809BE88 .align 2, 0 _0809BE3C: .4byte gMain -_0809BE40: .4byte gUnknown_2021CD0 -_0809BE44: .4byte gUnknown_2021CF0 -_0809BE48: .4byte gUnknown_2021D04 +_0809BE40: .4byte gStringVar1 +_0809BE44: .4byte gStringVar2 +_0809BE48: .4byte gStringVar3 _0809BE4C: .4byte gUnknown_841678E _0809BE50: .4byte sub_809BE90 _0809BE54: @@ -2438,7 +2438,7 @@ _0809BE54: cmp r0, 0 beq _0809BE88 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_809B73C movs r0, 0x3 movs r1, 0 @@ -2536,7 +2536,7 @@ sub_809BF0C: @ 809BF0C ldr r1, [r1, 0x8] bl RemoveMoney movs r0, 0xF8 - bl sub_80722CC + bl PlaySE ldr r0, [r6] adds r0, r5 bl sub_809FD58 @@ -2578,7 +2578,7 @@ sub_809BF68: @ 809BF68 beq _0809BF8E _0809BF82: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_809BF98 _0809BF8E: diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 489ddeee4..30ee2d428 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -236,7 +236,7 @@ _0813F9BC: movs r0, 0x1 bl sub_80D05E4 movs r0, 0x58 - bl sub_80722CC + bl PlaySE movs r0, 0x8 movs r1, 0 bl sub_8141148 @@ -282,7 +282,7 @@ _0813FA30: bl sub_80D057C _0813FA42: movs r0, 0x58 - bl sub_80722CC + bl PlaySE movs r0, 0x8 movs r1, 0 bl sub_8141148 @@ -385,7 +385,7 @@ _0813FB08: cmp r0, 0 beq _0813FBB8 movs r0, 0x18 - bl sub_80722CC + bl PlaySE ldr r4, _0813FB44 @ =gUnknown_203F3A0 ldr r0, [r4] ldrh r1, [r0, 0x6] @@ -891,7 +891,7 @@ _0813FF0C: cmp r0, 0 beq _0813FF28 movs r0, 0x15 - bl sub_80722CC + bl PlaySE _0813FF28: ldr r4, _0813FF70 @ =gUnknown_203F3A0 ldr r0, [r4] @@ -3586,7 +3586,7 @@ _081411D0: movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0xEC subs r2, r0 add r1, sp, 0x10 @@ -4089,7 +4089,7 @@ _081416E4: movs r0, 0x1 bl ShowBg movs r0, 0x6 - bl sub_80722CC + bl PlaySE str r4, [r5, 0x24] ldrb r0, [r6] adds r0, 0x1 @@ -4152,7 +4152,7 @@ _0814177A: b _081417DC _08141784: movs r0, 0x6 - bl sub_80722CC + bl PlaySE ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] diff --git a/asm/sound.s b/asm/sound.s index 7b826bf94..3fc955b3a 100644 --- a/asm/sound.s +++ b/asm/sound.s @@ -1276,8 +1276,8 @@ _080722C4: .4byte gUnknown_3005080 _080722C8: .4byte 0x0000ffff thumb_func_end PlayBGM - thumb_func_start sub_80722CC -sub_80722CC: @ 80722CC + thumb_func_start PlaySE +PlaySE: @ 80722CC push {lr} lsls r0, 16 lsrs r1, r0, 16 @@ -1297,7 +1297,7 @@ _080722E8: .align 2, 0 _080722EC: .4byte gUnknown_2031DD8 _080722F0: .4byte gUnknown_203ADFA - thumb_func_end sub_80722CC + thumb_func_end PlaySE thumb_func_start PlaySE12WithPanning PlaySE12WithPanning: @ 80722F4 diff --git a/asm/ss_anne.s b/asm/ss_anne.s index 85b08dd7a..5fdbe9600 100644 --- a/asm/ss_anne.s +++ b/asm/ss_anne.s @@ -9,7 +9,7 @@ sub_815D334: @ 815D334 push {lr} movs r0, 0xF9 - bl sub_80722CC + bl PlaySE ldr r0, _0815D35C @ =sub_815D364 movs r1, 0x8 bl CreateTask @@ -118,7 +118,7 @@ _0815D3D6: cmp r0, r1 bge _0815D438 movs r0, 0xF9 - bl sub_80722CC + bl PlaySE adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 diff --git a/asm/start_menu.s b/asm/start_menu.s index fc3dea0a9..be76f5ae8 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -159,25 +159,25 @@ sub_806EE7C: @ 806EE7C ldrb r0, [r4] movs r1, 0 bl sub_80F6F1C - ldr r0, _0806EEFC @ =gUnknown_2021CD0 + ldr r0, _0806EEFC @ =gStringVar1 ldr r1, _0806EF00 @ =gUnknown_2039996 ldrh r1, [r1] movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r0, _0806EF04 @ =gUnknown_2021CF0 + ldr r0, _0806EF04 @ =gStringVar2 movs r1, 0x96 lsls r1, 2 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r0, _0806EF08 @ =gUnknown_2021D04 + ldr r0, _0806EF08 @ =gStringVar3 ldr r1, _0806EF0C @ =gUnknown_2039994 ldrb r1, [r1] movs r2, 0x1 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r5, _0806EF10 @ =gUnknown_2021D18 + ldr r5, _0806EF10 @ =gStringVar4 ldr r1, _0806EF14 @ =gUnknown_84162A9 adds r0, r5, 0 bl StringExpandPlaceholders @@ -202,12 +202,12 @@ sub_806EE7C: @ 806EE7C .align 2, 0 _0806EEF4: .4byte gUnknown_2037101 _0806EEF8: .4byte gUnknown_83A738C -_0806EEFC: .4byte gUnknown_2021CD0 +_0806EEFC: .4byte gStringVar1 _0806EF00: .4byte gUnknown_2039996 -_0806EF04: .4byte gUnknown_2021CF0 -_0806EF08: .4byte gUnknown_2021D04 +_0806EF04: .4byte gStringVar2 +_0806EF08: .4byte gStringVar3 _0806EF0C: .4byte gUnknown_2039994 -_0806EF10: .4byte gUnknown_2021D18 +_0806EF10: .4byte gStringVar4 _0806EF14: .4byte gUnknown_84162A9 thumb_func_end sub_806EE7C @@ -252,7 +252,7 @@ sub_806EF44: @ 806EF44 lsrs r2, r0, 16 ldr r0, _0806EF9C @ =gUnknown_83A7344 mov r10, r0 - ldr r1, _0806EFA0 @ =gUnknown_2021D18 + ldr r1, _0806EFA0 @ =gStringVar4 mov r9, r1 _0806EF68: ldr r1, _0806EFA4 @ =gUnknown_20370F6 @@ -282,7 +282,7 @@ _0806EF7C: b _0806EFDA .align 2, 0 _0806EF9C: .4byte gUnknown_83A7344 -_0806EFA0: .4byte gUnknown_2021D18 +_0806EFA0: .4byte gStringVar4 _0806EFA4: .4byte gUnknown_20370F6 _0806EFA8: ldrb r0, [r4] @@ -660,7 +660,7 @@ sub_806F280: @ 806F280 cmp r0, 0 beq _0806F2D2 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 bl MoveMenuCursor @@ -696,7 +696,7 @@ _0806F2D2: cmp r0, 0 beq _0806F320 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl MoveMenuCursor ldr r4, _0806F360 @ =gUnknown_20370F4 @@ -731,7 +731,7 @@ _0806F320: cmp r0, 0 beq _0806F378 movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_806F3CC lsls r0, 24 cmp r0, 0 @@ -1172,7 +1172,7 @@ sub_806F69C: @ 806F69C push {r4,lr} adds r2, r0, 0 adds r4, r1, 0 - ldr r0, _0806F6C8 @ =gUnknown_2021D18 + ldr r0, _0806F6C8 @ =gStringVar4 adds r1, r2, 0 bl StringExpandPlaceholders movs r0, 0 @@ -1189,7 +1189,7 @@ sub_806F69C: @ 806F69C pop {r0} bx r0 .align 2, 0 -_0806F6C8: .4byte gUnknown_2021D18 +_0806F6C8: .4byte gStringVar4 _0806F6CC: .4byte gUnknown_3000FA9 _0806F6D0: .4byte gUnknown_3000FA4 thumb_func_end sub_806F69C @@ -1285,7 +1285,7 @@ _0806F764: .4byte gUnknown_3000FA8 _0806F768: .4byte gMain _0806F76C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0806F772: movs r0, 0x1 _0806F774: @@ -1601,7 +1601,7 @@ sub_806F9B8: @ 806F9B8 cmp r0, 0 bne _0806F9D0 movs r0, 0x30 - bl sub_80722CC + bl PlaySE ldr r1, _0806F9D8 @ =gUnknown_3000FA4 ldr r0, _0806F9DC @ =SaveDialogCB_ReturnSuccess str r0, [r1] @@ -1643,7 +1643,7 @@ sub_806FA04: @ 806FA04 cmp r0, 0 bne _0806FA1C movs r0, 0x16 - bl sub_80722CC + bl PlaySE ldr r1, _0806FA24 @ =gUnknown_3000FA4 ldr r0, _0806FA28 @ =SaveDialogCB_ReturnError str r0, [r1] @@ -2020,7 +2020,7 @@ sub_806FCF4: @ 806FCF4 adds r2, r4, 0 movs r3, 0xD bl SetWindowBorderStyle - ldr r4, _0806FE60 @ =gUnknown_2021D18 + ldr r4, _0806FE60 @ =gStringVar4 movs r0, 0x3 adds r1, r4, 0 movs r2, 0x8 @@ -2030,7 +2030,7 @@ sub_806FCF4: @ 806FCF4 movs r0, 0x2 adds r1, r4, 0 adds r2, r6, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0x70 subs r2, r0 lsrs r2, 1 @@ -2047,7 +2047,7 @@ sub_806FCF4: @ 806FCF4 movs r0, 0x2 adds r1, r4, 0 adds r2, r6, 0 - bl sub_8005ED4 + bl GetStringWidth ldrb r0, [r5] ldr r1, _0806FE68 @ =gUnknown_83A73D4 mov r9, r1 @@ -2161,7 +2161,7 @@ _0806FE0A: _0806FE54: .4byte gUnknown_2037104 _0806FE58: .4byte gUnknown_83A73CC _0806FE5C: .4byte 0x0000021d -_0806FE60: .4byte gUnknown_2021D18 +_0806FE60: .4byte gStringVar4 _0806FE64: .4byte gUnknown_83A73DC _0806FE68: .4byte gUnknown_83A73D4 _0806FE6C: .4byte gUnknown_841617A @@ -2192,7 +2192,7 @@ _0806FE9C: .4byte gUnknown_2037104 sub_806FEA0: @ 806FEA0 push {lr} movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl GetStartMenuWindowId lsls r0, 24 lsrs r0, 24 diff --git a/asm/string_util.s b/asm/string_util.s index 784f47490..abc11cfb4 100644 --- a/asm/string_util.s +++ b/asm/string_util.s @@ -629,26 +629,26 @@ _08009128: .4byte gSaveBlock2Ptr thumb_func_start sub_800912C sub_800912C: @ 800912C - ldr r0, _08009130 @ =gUnknown_2021CD0 + ldr r0, _08009130 @ =gStringVar1 bx lr .align 2, 0 -_08009130: .4byte gUnknown_2021CD0 +_08009130: .4byte gStringVar1 thumb_func_end sub_800912C thumb_func_start sub_8009134 sub_8009134: @ 8009134 - ldr r0, _08009138 @ =gUnknown_2021CF0 + ldr r0, _08009138 @ =gStringVar2 bx lr .align 2, 0 -_08009138: .4byte gUnknown_2021CF0 +_08009138: .4byte gStringVar2 thumb_func_end sub_8009134 thumb_func_start sub_800913C sub_800913C: @ 800913C - ldr r0, _08009140 @ =gUnknown_2021D04 + ldr r0, _08009140 @ =gStringVar3 bx lr .align 2, 0 -_08009140: .4byte gUnknown_2021D04 +_08009140: .4byte gStringVar3 thumb_func_end sub_800913C thumb_func_start sub_8009144 diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 9a6f9c115..9430d764b 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -509,7 +509,7 @@ sub_815AFD8: @ 815AFD8 cmp r1, 0x1 beq _0815AFE8 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0815AFE8: pop {r0} bx r0 @@ -768,7 +768,7 @@ sub_815B1DC: @ 815B1DC push {r4,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r2, _0815B21C @ =gUnknown_3003E50 + ldr r2, _0815B21C @ =gTextFlags ldrb r1, [r2] movs r0, 0x5 negs r0, r0 @@ -795,7 +795,7 @@ sub_815B1DC: @ 815B1DC pop {r0} bx r0 .align 2, 0 -_0815B21C: .4byte gUnknown_3003E50 +_0815B21C: .4byte gTextFlags thumb_func_end sub_815B1DC thumb_func_start sub_815B220 @@ -935,13 +935,13 @@ _0815B328: .4byte gMain _0815B32C: .4byte sub_8107EB8 _0815B330: movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r7, 0 bl sub_815B23C b _0815B37A _0815B33E: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _0815B380 @ =gUnknown_203F444 movs r4, 0 strb r5, [r2, 0x5] diff --git a/asm/text.s b/asm/text.s index 46277701a..31643b204 100644 --- a/asm/text.s +++ b/asm/text.s @@ -5,1989 +5,6 @@ .text - thumb_func_start Font0Func -Font0Func: @ 800537C - push {lr} - adds r2, r0, 0 - adds r3, r2, 0 - adds r3, 0x14 - ldrb r1, [r3, 0x1] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080053A0 - ldrb r1, [r2, 0x14] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x14] - ldrb r0, [r3, 0x1] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r3, 0x1] -_080053A0: - adds r0, r2, 0 - bl sub_8005790 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end Font0Func - - thumb_func_start Font1Func -Font1Func: @ 80053B0 - push {lr} - adds r2, r0, 0 - adds r3, r2, 0 - adds r3, 0x14 - ldrb r1, [r3, 0x1] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080053D8 - ldrb r1, [r2, 0x14] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2, 0x14] - ldrb r0, [r3, 0x1] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r3, 0x1] -_080053D8: - adds r0, r2, 0 - bl sub_8005790 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end Font1Func - - thumb_func_start Font2Func -Font2Func: @ 80053E8 - push {lr} - adds r2, r0, 0 - adds r3, r2, 0 - adds r3, 0x14 - ldrb r1, [r3, 0x1] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08005410 - ldrb r1, [r2, 0x14] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2, 0x14] - ldrb r0, [r3, 0x1] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r3, 0x1] -_08005410: - adds r0, r2, 0 - bl sub_8005790 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end Font2Func - - thumb_func_start Font3Func -Font3Func: @ 8005420 - push {lr} - adds r2, r0, 0 - adds r3, r2, 0 - adds r3, 0x14 - ldrb r1, [r3, 0x1] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08005448 - ldrb r1, [r2, 0x14] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x3 - orrs r0, r1 - strb r0, [r2, 0x14] - ldrb r0, [r3, 0x1] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r3, 0x1] -_08005448: - adds r0, r2, 0 - bl sub_8005790 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end Font3Func - - thumb_func_start Font4Func -Font4Func: @ 8005458 - push {lr} - adds r2, r0, 0 - adds r3, r2, 0 - adds r3, 0x14 - ldrb r1, [r3, 0x1] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08005480 - ldrb r1, [r2, 0x14] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x4 - orrs r0, r1 - strb r0, [r2, 0x14] - ldrb r0, [r3, 0x1] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r3, 0x1] -_08005480: - adds r0, r2, 0 - bl sub_8005790 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end Font4Func - - thumb_func_start Font5Func -Font5Func: @ 8005490 - push {lr} - adds r2, r0, 0 - adds r3, r2, 0 - adds r3, 0x14 - ldrb r1, [r3, 0x1] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080054B8 - ldrb r1, [r2, 0x14] - movs r0, 0x10 - negs r0, r0 - ands r0, r1 - movs r1, 0x5 - orrs r0, r1 - strb r0, [r2, 0x14] - ldrb r0, [r3, 0x1] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r3, 0x1] -_080054B8: - adds r0, r2, 0 - bl sub_8005790 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end Font5Func - - thumb_func_start TextPrinterInitDownArrowCounters -TextPrinterInitDownArrowCounters: @ 80054C8 - push {lr} - adds r2, r0, 0 - adds r2, 0x14 - ldr r0, _080054E0 @ =gUnknown_3003E50 - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080054E4 - movs r0, 0 - strb r0, [r2, 0x2] - b _080054F4 - .align 2, 0 -_080054E0: .4byte gUnknown_3003E50 -_080054E4: - ldrb r0, [r2, 0x1] - movs r1, 0x61 - negs r1, r1 - ands r1, r0 - movs r0, 0x20 - negs r0, r0 - ands r1, r0 - strb r1, [r2, 0x1] -_080054F4: - pop {r0} - bx r0 - thumb_func_end TextPrinterInitDownArrowCounters - - thumb_func_start TextPrinterDrawDownArrow -TextPrinterDrawDownArrow: @ 80054F8 - push {r4-r7,lr} - sub sp, 0x18 - adds r5, r0, 0 - adds r6, r5, 0 - adds r6, 0x14 - ldr r7, _0800552C @ =gUnknown_3003E50 - ldrb r1, [r7] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - bne _080055C2 - ldrb r2, [r6, 0x1] - movs r0, 0x1F - ands r0, r2 - cmp r0, 0 - beq _08005530 - ldr r0, [r5, 0x14] - lsls r0, 19 - lsrs r0, 27 - subs r0, 0x1 - movs r1, 0x1F - ands r0, r1 - movs r1, 0x20 - negs r1, r1 - b _080055BC - .align 2, 0 -_0800552C: .4byte gUnknown_3003E50 -_08005530: - ldrb r0, [r5, 0x4] - ldrb r2, [r5, 0xD] - lsls r2, 28 - lsrs r1, r2, 4 - orrs r1, r2 - lsrs r1, 24 - ldrb r2, [r5, 0x8] - ldrb r3, [r5, 0x9] - movs r4, 0xA - str r4, [sp] - movs r4, 0xC - str r4, [sp, 0x4] - bl FillWindowPixelRect - ldr r0, [r7] - lsls r0, 30 - lsrs r0, 31 - cmp r0, 0 - beq _0800555A - cmp r0, 0x1 - beq _08005564 -_0800555A: - ldr r3, _08005560 @ =gUnknown_81EA14C - b _08005566 - .align 2, 0 -_08005560: .4byte gUnknown_81EA14C -_08005564: - ldr r3, _080055CC @ =gUnknown_81EA24C -_08005566: - ldrb r0, [r5, 0x4] - ldr r2, _080055D0 @ =gUnknown_81EA64C - ldr r1, [r6] - lsls r1, 17 - lsrs r1, 30 - adds r1, r2 - ldrb r2, [r1] - movs r1, 0x80 - str r1, [sp] - movs r1, 0x10 - str r1, [sp, 0x4] - ldrb r1, [r5, 0x8] - str r1, [sp, 0x8] - ldrb r1, [r5, 0x9] - str r1, [sp, 0xC] - movs r1, 0xA - str r1, [sp, 0x10] - movs r1, 0xC - str r1, [sp, 0x14] - adds r1, r3, 0 - movs r3, 0 - bl BlitBitmapRectToWindow - ldrb r0, [r5, 0x4] - movs r1, 0x2 - bl CopyWindowToVram - ldrb r0, [r6, 0x1] - movs r1, 0x20 - negs r1, r1 - ands r1, r0 - movs r0, 0x8 - orrs r1, r0 - strb r1, [r6, 0x1] - ldr r0, [r6] - lsls r0, 17 - lsrs r0, 30 - adds r0, 0x1 - movs r2, 0x3 - ands r0, r2 - lsls r0, 5 - movs r2, 0x61 - negs r2, r2 -_080055BC: - ands r1, r2 - orrs r1, r0 - strb r1, [r6, 0x1] -_080055C2: - add sp, 0x18 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080055CC: .4byte gUnknown_81EA24C -_080055D0: .4byte gUnknown_81EA64C - thumb_func_end TextPrinterDrawDownArrow - - thumb_func_start sub_80055D4 -sub_80055D4: @ 80055D4 - push {r4,r5,lr} - sub sp, 0x8 - adds r5, r0, 0 - ldrb r0, [r5, 0x4] - ldrb r2, [r5, 0xD] - lsls r2, 28 - lsrs r1, r2, 4 - orrs r1, r2 - lsrs r1, 24 - ldrb r2, [r5, 0x8] - ldrb r3, [r5, 0x9] - movs r4, 0xA - str r4, [sp] - movs r4, 0xC - str r4, [sp, 0x4] - bl FillWindowPixelRect - ldrb r0, [r5, 0x4] - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80055D4 - - thumb_func_start sub_8005608 -sub_8005608: @ 8005608 - push {lr} - adds r1, r0, 0 - adds r1, 0x14 - ldr r0, _08005628 @ =gUnknown_203ADFA - ldrb r0, [r0] - movs r2, 0x78 - cmp r0, 0x2 - bne _0800561A - movs r2, 0x32 -_0800561A: - ldrb r0, [r1, 0x2] - cmp r0, r2 - beq _0800562C - adds r0, 0x1 - strb r0, [r1, 0x2] - movs r0, 0 - b _0800562E - .align 2, 0 -_08005628: .4byte gUnknown_203ADFA -_0800562C: - movs r0, 0x1 -_0800562E: - pop {r1} - bx r1 - thumb_func_end sub_8005608 - - thumb_func_start TextPrinterWaitWithDownArrow -TextPrinterWaitWithDownArrow: @ 8005634 - push {r4,lr} - adds r2, r0, 0 - movs r4, 0 - ldr r0, _08005654 @ =gUnknown_3003E50 - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _08005658 - adds r0, r2, 0 - bl sub_8005608 - lsls r0, 24 - lsrs r4, r0, 24 - b _08005672 - .align 2, 0 -_08005654: .4byte gUnknown_3003E50 -_08005658: - adds r0, r2, 0 - bl TextPrinterDrawDownArrow - ldr r0, _0800567C @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _08005672 - movs r4, 0x1 - movs r0, 0x5 - bl sub_80722CC -_08005672: - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0800567C: .4byte gMain - thumb_func_end TextPrinterWaitWithDownArrow - - thumb_func_start TextPrinterWait -TextPrinterWait: @ 8005680 - push {r4,lr} - adds r2, r0, 0 - movs r4, 0 - ldr r0, _080056A0 @ =gUnknown_3003E50 - ldrb r1, [r0] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _080056A4 - adds r0, r2, 0 - bl sub_8005608 - lsls r0, 24 - lsrs r4, r0, 24 - b _080056B8 - .align 2, 0 -_080056A0: .4byte gUnknown_3003E50 -_080056A4: - ldr r0, _080056C0 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _080056B8 - movs r4, 0x1 - movs r0, 0x5 - bl sub_80722CC -_080056B8: - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080056C0: .4byte gMain - thumb_func_end TextPrinterWait - - thumb_func_start DrawDownArrow -DrawDownArrow: @ 80056C4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x18 - ldr r4, [sp, 0x34] - ldr r5, [sp, 0x38] - mov r8, r5 - ldr r5, [sp, 0x3C] - mov r9, r5 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r1, 16 - lsrs r7, r1, 16 - lsls r2, 16 - lsrs r6, r2, 16 - lsls r3, 24 - lsrs r3, 24 - lsls r4, 24 - lsrs r4, 24 - mov r1, r8 - ldrb r0, [r1] - cmp r0, 0 - beq _080056FA - subs r0, 0x1 - strb r0, [r1] - b _08005778 -_080056FA: - lsls r1, r3, 4 - orrs r1, r3 - lsls r1, 24 - lsrs r1, 24 - movs r0, 0xA - str r0, [sp] - movs r0, 0xC - str r0, [sp, 0x4] - adds r0, r5, 0 - adds r2, r7, 0 - adds r3, r6, 0 - bl FillWindowPixelRect - cmp r4, 0 - bne _08005778 - ldr r0, _0800572C @ =gUnknown_3003E50 - ldr r0, [r0] - lsls r0, 30 - lsrs r0, 31 - cmp r0, 0 - beq _08005728 - cmp r0, 0x1 - beq _08005734 -_08005728: - ldr r3, _08005730 @ =gUnknown_81EA14C - b _08005736 - .align 2, 0 -_0800572C: .4byte gUnknown_3003E50 -_08005730: .4byte gUnknown_81EA14C -_08005734: - ldr r3, _08005788 @ =gUnknown_81EA24C -_08005736: - ldr r2, _0800578C @ =gUnknown_81EA64C - mov r0, r9 - ldrb r1, [r0] - movs r0, 0x3 - ands r0, r1 - adds r0, r2 - ldrb r2, [r0] - movs r0, 0x80 - str r0, [sp] - movs r0, 0x10 - str r0, [sp, 0x4] - str r7, [sp, 0x8] - str r6, [sp, 0xC] - movs r0, 0xA - str r0, [sp, 0x10] - movs r0, 0xC - str r0, [sp, 0x14] - adds r0, r5, 0 - adds r1, r3, 0 - movs r3, 0 - bl BlitBitmapRectToWindow - adds r0, r5, 0 - movs r1, 0x2 - bl CopyWindowToVram - movs r0, 0x8 - mov r1, r8 - strb r0, [r1] - mov r5, r9 - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] -_08005778: - add sp, 0x18 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08005788: .4byte gUnknown_81EA24C -_0800578C: .4byte gUnknown_81EA64C - thumb_func_end DrawDownArrow - - thumb_func_start sub_8005790 -sub_8005790: @ 8005790 - push {r4-r6,lr} - adds r6, r0, 0 - adds r4, r6, 0 - adds r4, 0x14 - ldrb r0, [r6, 0x1C] - cmp r0, 0x6 - bls _080057A0 - b _08005D68 -_080057A0: - lsls r0, 2 - ldr r1, _080057AC @ =_080057B0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080057AC: .4byte _080057B0 - .align 2, 0 -_080057B0: - .4byte _080057CC - .4byte _08005C58 - .4byte _08005C6C - .4byte _08005C98 - .4byte _08005CD0 - .4byte _08005D44 - .4byte _08005D56 -_080057CC: - ldr r2, _08005820 @ =gMain - ldrh r1, [r2, 0x2C] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _080057E6 - ldrb r1, [r4] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080057E6 - movs r0, 0 - strb r0, [r6, 0x1E] -_080057E6: - ldrb r1, [r6, 0x1E] - cmp r1, 0 - beq _08005828 - ldrb r0, [r6, 0x1D] - cmp r0, 0 - beq _08005828 - subs r0, r1, 0x1 - strb r0, [r6, 0x1E] - ldr r0, _08005824 @ =gUnknown_3003E50 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08005804 - b _08005B30 -_08005804: - ldrh r1, [r2, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - bne _08005810 - b _08005B30 -_08005810: - ldrb r0, [r4] - movs r1, 0x10 - orrs r0, r1 - strb r0, [r4] - movs r0, 0 - strb r0, [r6, 0x1E] - b _08005B30 - .align 2, 0 -_08005820: .4byte gMain -_08005824: .4byte gUnknown_3003E50 -_08005828: - ldr r2, _08005838 @ =gUnknown_3003E50 - ldrb r1, [r2] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0800583C - movs r0, 0x1 - b _0800583E - .align 2, 0 -_08005838: .4byte gUnknown_3003E50 -_0800583C: - ldrb r0, [r6, 0x1D] -_0800583E: - strb r0, [r6, 0x1E] - ldr r0, [r6] - ldrb r3, [r0] - adds r0, 0x1 - str r0, [r6] - adds r0, r3, 0 - subs r0, 0xF8 - cmp r0, 0x7 - bls _08005852 - b _08005B6C -_08005852: - lsls r0, 2 - ldr r1, _0800585C @ =_08005860 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_0800585C: .4byte _08005860 - .align 2, 0 -_08005860: - .4byte _08005B46 - .4byte _08005B34 - .4byte _08005B26 - .4byte _08005B22 - .4byte _080058AC - .4byte _080058A8 - .4byte _08005880 - .4byte _08005D68 -_08005880: - ldrb r0, [r6, 0x6] - strb r0, [r6, 0x8] - ldrb r1, [r6, 0x5] - ldr r0, _080058A4 @ =gFonts - ldr r2, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r6, 0xB] - ldrb r0, [r0, 0x5] - adds r1, r0 - ldrb r0, [r6, 0x9] - adds r0, r1 - strb r0, [r6, 0x9] -_0800589E: - movs r0, 0x2 - b _08005D6A - .align 2, 0 -_080058A4: .4byte gFonts -_080058A8: - ldr r0, [r6] - b _08005B0A -_080058AC: - ldr r0, [r6] - ldrb r3, [r0] - adds r0, 0x1 - str r0, [r6] - subs r0, r3, 0x1 - cmp r0, 0x17 - bls _080058BC - b _08005B6C -_080058BC: - lsls r0, 2 - ldr r1, _080058C8 @ =_080058CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080058C8: .4byte _080058CC - .align 2, 0 -_080058CC: - .4byte _0800592C - .4byte _0800594E - .4byte _08005972 - .4byte _0800598C - .4byte _080059D8 - .4byte _080059DC - .4byte _0800589E - .4byte _080059F4 - .4byte _08005A04 - .4byte _08005A1A - .4byte _08005A1E - .4byte _08005A66 - .4byte _08005A70 - .4byte _08005A78 - .4byte _08005A84 - .4byte _08005A4C - .4byte _08005AB0 - .4byte _08005ACC - .4byte _08005ADC - .4byte _08005B00 - .4byte _08005B10 - .4byte _08005B18 - .4byte _08005A96 - .4byte _08005AA4 -_0800592C: - ldr r2, [r6] - ldrb r1, [r2] - lsls r1, 4 - ldrb r3, [r6, 0xC] - movs r0, 0xF - ands r0, r3 - orrs r0, r1 - strb r0, [r6, 0xC] - adds r2, 0x1 - str r2, [r6] - lsls r0, 24 - lsrs r0, 28 - ldrb r2, [r6, 0xD] - lsls r1, r2, 28 - lsrs r1, 28 - lsrs r2, 4 - b _080059D2 -_0800594E: - ldr r1, [r6] - ldrb r2, [r1] - movs r0, 0xF - ands r0, r2 - ldrb r3, [r6, 0xD] - movs r2, 0x10 - negs r2, r2 - ands r2, r3 - orrs r2, r0 - strb r2, [r6, 0xD] - adds r1, 0x1 - str r1, [r6] - ldrb r0, [r6, 0xC] - lsrs r0, 4 - lsls r1, r2, 28 - lsrs r1, 28 - lsrs r2, 4 - b _080059D2 -_08005972: - ldr r1, [r6] - ldrb r0, [r1] - lsls r0, 4 - ldrb r3, [r6, 0xD] - movs r2, 0xF - ands r2, r3 - orrs r2, r0 - strb r2, [r6, 0xD] - adds r1, 0x1 - str r1, [r6] - ldrb r0, [r6, 0xC] - lsrs r0, 4 - b _080059CA -_0800598C: - ldr r3, [r6] - ldrb r1, [r3] - lsls r1, 4 - ldrb r4, [r6, 0xC] - movs r2, 0xF - adds r0, r2, 0 - ands r0, r4 - orrs r0, r1 - strb r0, [r6, 0xC] - adds r5, r3, 0x1 - str r5, [r6] - ldrb r3, [r3, 0x1] - adds r1, r2, 0 - ands r1, r3 - ldrb r4, [r6, 0xD] - movs r3, 0x10 - negs r3, r3 - ands r3, r4 - orrs r3, r1 - strb r3, [r6, 0xD] - adds r4, r5, 0x1 - str r4, [r6] - ldrb r1, [r5, 0x1] - lsls r1, 4 - ands r2, r3 - orrs r2, r1 - strb r2, [r6, 0xD] - adds r4, 0x1 - str r4, [r6] - lsls r0, 24 - lsrs r0, 28 -_080059CA: - lsls r1, r2, 28 - lsrs r1, 28 - lsls r2, 24 - lsrs r2, 28 -_080059D2: - bl GenerateFontHalfRowLookupTable - b _0800589E -_080059D8: - ldr r0, [r6] - b _08005B0A -_080059DC: - ldr r0, [r6] - ldrb r0, [r0] - movs r1, 0xF - ands r1, r0 - ldrb r2, [r4] - movs r0, 0x10 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4] - ldr r0, [r6] - b _08005B0A -_080059F4: - ldr r0, [r6] - ldrb r1, [r0] - strb r1, [r6, 0x1E] - adds r0, 0x1 - str r0, [r6] - movs r0, 0x6 - strb r0, [r6, 0x1C] - b _0800589E -_08005A04: - movs r0, 0x1 - strb r0, [r6, 0x1C] - ldrb r1, [r2] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - bne _08005A14 - b _08005B30 -_08005A14: - movs r0, 0 - strb r0, [r4, 0x2] - b _08005B30 -_08005A1A: - movs r0, 0x5 - b _08005D52 -_08005A1E: - ldr r0, [r6] - ldrb r3, [r0] - adds r1, r0, 0x1 - str r1, [r6] - ldrb r0, [r0, 0x1] - lsls r0, 8 - orrs r3, r0 - adds r1, 0x1 - str r1, [r6] - ldr r0, _08005A48 @ =gUnknown_203ADFA - ldrb r0, [r0] - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _08005A40 - b _0800589E -_08005A40: - adds r0, r3, 0 - bl PlayBGM - b _0800589E - .align 2, 0 -_08005A48: .4byte gUnknown_203ADFA -_08005A4C: - ldr r0, [r6] - ldrb r3, [r0] - adds r1, r0, 0x1 - str r1, [r6] - ldrb r0, [r0, 0x1] - lsls r0, 8 - orrs r3, r0 - adds r1, 0x1 - str r1, [r6] - adds r0, r3, 0 - bl sub_80722CC - b _0800589E -_08005A66: - ldr r1, [r6] - adds r0, r1, 0x1 - str r0, [r6] - ldrb r3, [r1, 0x1] - b _08005B6C -_08005A70: - ldr r1, [r6] - ldrb r0, [r1] - ldrb r2, [r6, 0x6] - b _08005AD2 -_08005A78: - ldr r1, [r6] - ldrb r0, [r1] - ldrb r3, [r6, 0x7] - adds r0, r3 - strb r0, [r6, 0x9] - b _08005AD6 -_08005A84: - ldrb r0, [r6, 0x4] - ldrb r2, [r6, 0xD] - lsls r2, 28 - lsrs r1, r2, 4 - orrs r1, r2 - lsrs r1, 24 - bl FillWindowPixelBuffer - b _0800589E -_08005A96: - ldr r0, _08005AA0 @ =gMPlay_BGM - bl m4aMPlayStop - b _0800589E - .align 2, 0 -_08005AA0: .4byte gMPlay_BGM -_08005AA4: - ldr r0, _08005AAC @ =gMPlay_BGM - bl m4aMPlayContinue - b _0800589E - .align 2, 0 -_08005AAC: .4byte gMPlay_BGM -_08005AB0: - ldr r0, [r6] - ldrb r4, [r0] - adds r0, 0x1 - str r0, [r6] - cmp r4, 0 - bgt _08005ABE - b _0800589E -_08005ABE: - adds r0, r6, 0 - adds r1, r4, 0 - bl ClearTextSpan - ldrb r0, [r6, 0x8] - adds r0, r4 - b _08005C4E -_08005ACC: - ldr r1, [r6] - ldrb r0, [r6, 0x6] - ldrb r2, [r1] -_08005AD2: - adds r0, r2 - strb r0, [r6, 0x8] -_08005AD6: - adds r1, 0x1 - str r1, [r6] - b _0800589E -_08005ADC: - ldr r0, [r6] - ldrb r2, [r0] - ldrb r1, [r6, 0x6] - adds r2, r1 - adds r0, 0x1 - str r0, [r6] - ldrb r0, [r6, 0x8] - subs r4, r2, r0 - cmp r4, 0 - bgt _08005AF2 - b _0800589E -_08005AF2: - adds r0, r6, 0 - adds r1, r4, 0 - bl ClearTextSpan - ldrb r0, [r6, 0x8] - adds r0, r4 - b _08005C4E -_08005B00: - ldr r0, [r6] - ldrb r2, [r0] - adds r1, r6, 0 - adds r1, 0x20 - strb r2, [r1] -_08005B0A: - adds r0, 0x1 - str r0, [r6] - b _0800589E -_08005B10: - adds r1, r6, 0 - adds r1, 0x21 - movs r0, 0x1 - b _08005B1E -_08005B18: - adds r1, r6, 0 - adds r1, 0x21 - movs r0, 0 -_08005B1E: - strb r0, [r1] - b _0800589E -_08005B22: - movs r0, 0x2 - b _08005B28 -_08005B26: - movs r0, 0x3 -_08005B28: - strb r0, [r6, 0x1C] - adds r0, r6, 0 - bl TextPrinterInitDownArrowCounters -_08005B30: - movs r0, 0x3 - b _08005D6A -_08005B34: - ldr r0, [r6] - ldrb r3, [r0] - movs r2, 0x80 - lsls r2, 1 - adds r1, r2, 0 - orrs r3, r1 - adds r0, 0x1 - str r0, [r6] - b _08005B6C -_08005B46: - ldr r0, [r6] - ldrb r3, [r0] - adds r0, 0x1 - str r0, [r6] - ldrb r0, [r6, 0x4] - adds r1, r3, 0 - ldrb r2, [r6, 0x8] - ldrb r3, [r6, 0x9] - bl DrawKeypadIcon - ldr r1, _08005B68 @ =gGlyphBuffer1 - adds r1, 0x80 - strb r0, [r1] - ldrb r3, [r6, 0xA] - adds r0, r3 - b _08005C4A - .align 2, 0 -_08005B68: .4byte gGlyphBuffer1 -_08005B6C: - ldr r0, [r4] - lsls r0, 28 - lsrs r0, 28 - cmp r0, 0x5 - bhi _08005BEE - lsls r0, 2 - ldr r1, _08005B80 @ =_08005B84 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08005B80: .4byte _08005B84 - .align 2, 0 -_08005B84: - .4byte _08005B9C - .4byte _08005BAA - .4byte _08005BB8 - .4byte _08005BC6 - .4byte _08005BD4 - .4byte _08005BE2 -_08005B9C: - adds r0, r6, 0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r3, 0 - bl sub_8006448 - b _08005BEE -_08005BAA: - adds r0, r6, 0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r3, 0 - bl sub_80064F0 - b _08005BEE -_08005BB8: - adds r0, r6, 0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r3, 0 - bl sub_80065B8 - b _08005BEE -_08005BC6: - adds r0, r6, 0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r3, 0 - bl sub_8006724 - b _08005BEE -_08005BD4: - adds r0, r6, 0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r3, 0 - bl sub_80067EC - b _08005BEE -_08005BE2: - adds r0, r6, 0 - adds r0, 0x21 - ldrb r1, [r0] - adds r0, r3, 0 - bl sub_8006958 -_08005BEE: - adds r0, r6, 0 - bl CopyGlyphToWindow - adds r2, r6, 0 - adds r2, 0x20 - ldrb r0, [r2] - cmp r0, 0 - beq _08005C28 - ldr r1, _08005C24 @ =gGlyphBuffer1 - adds r1, 0x80 - ldrb r0, [r1] - ldrb r3, [r6, 0x8] - adds r0, r3 - strb r0, [r6, 0x8] - ldrb r2, [r2] - ldrb r0, [r1] - subs r4, r2, r0 - cmp r4, 0 - ble _08005C50 - adds r0, r6, 0 - adds r1, r4, 0 - bl ClearTextSpan - ldrb r0, [r6, 0x8] - adds r0, r4 - b _08005C4E - .align 2, 0 -_08005C24: .4byte gGlyphBuffer1 -_08005C28: - adds r0, r6, 0 - adds r0, 0x21 - ldrb r0, [r0] - cmp r0, 0 - beq _08005C44 - ldr r0, _08005C40 @ =gGlyphBuffer1 - adds r0, 0x80 - ldrb r1, [r6, 0xA] - ldrb r0, [r0] - adds r1, r0 - ldrb r0, [r6, 0x8] - b _08005C4C - .align 2, 0 -_08005C40: .4byte gGlyphBuffer1 -_08005C44: - ldr r0, _08005C54 @ =gGlyphBuffer1 - adds r0, 0x80 - ldrb r0, [r0] -_08005C4A: - ldrb r1, [r6, 0x8] -_08005C4C: - adds r0, r1 -_08005C4E: - strb r0, [r6, 0x8] -_08005C50: - movs r0, 0 - b _08005D6A - .align 2, 0 -_08005C54: .4byte gGlyphBuffer1 -_08005C58: - adds r0, r6, 0 - bl TextPrinterWait - lsls r0, 16 - cmp r0, 0 - bne _08005C66 - b _08005B30 -_08005C66: - movs r0, 0 - strb r0, [r6, 0x1C] - b _08005B30 -_08005C6C: - adds r0, r6, 0 - bl TextPrinterWaitWithDownArrow - lsls r0, 16 - cmp r0, 0 - bne _08005C7A - b _08005B30 -_08005C7A: - ldrb r0, [r6, 0x4] - ldrb r2, [r6, 0xD] - lsls r2, 28 - lsrs r1, r2, 4 - orrs r1, r2 - lsrs r1, 24 - bl FillWindowPixelBuffer - ldrb r0, [r6, 0x6] - movs r1, 0 - strb r0, [r6, 0x8] - ldrb r0, [r6, 0x7] - strb r0, [r6, 0x9] - strb r1, [r6, 0x1C] - b _08005B30 -_08005C98: - adds r0, r6, 0 - bl TextPrinterWaitWithDownArrow - lsls r0, 16 - cmp r0, 0 - bne _08005CA6 - b _08005B30 -_08005CA6: - adds r0, r6, 0 - bl sub_80055D4 - ldrb r1, [r6, 0x5] - ldr r0, _08005CCC @ =gFonts - ldr r2, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r6, 0xB] - ldrb r0, [r0, 0x5] - adds r1, r0 - strb r1, [r6, 0x1F] - ldrb r0, [r6, 0x6] - strb r0, [r6, 0x8] - movs r0, 0x4 - strb r0, [r6, 0x1C] - b _08005B30 - .align 2, 0 -_08005CCC: .4byte gFonts -_08005CD0: - ldrb r2, [r6, 0x1F] - cmp r2, 0 - beq _08005D40 - ldr r4, _08005D04 @ =gUnknown_81EA650 - ldr r5, _08005D08 @ =gSaveBlock2Ptr - ldr r0, [r5] - ldrb r0, [r0, 0x14] - lsls r1, r0, 29 - lsrs r0, r1, 29 - adds r0, r4 - ldrb r0, [r0] - cmp r2, r0 - bcs _08005D0C - ldrb r0, [r6, 0x4] - ldrb r1, [r6, 0xD] - lsls r1, 28 - lsrs r3, r1, 4 - orrs r3, r1 - lsrs r3, 24 - movs r1, 0 - bl ScrollWindow - movs r0, 0 - strb r0, [r6, 0x1F] - b _08005D36 - .align 2, 0 -_08005D04: .4byte gUnknown_81EA650 -_08005D08: .4byte gSaveBlock2Ptr -_08005D0C: - ldrb r0, [r6, 0x4] - lsrs r1, 29 - adds r1, r4 - ldrb r2, [r1] - ldrb r1, [r6, 0xD] - lsls r1, 28 - lsrs r3, r1, 4 - orrs r3, r1 - lsrs r3, 24 - movs r1, 0 - bl ScrollWindow - ldr r0, [r5] - ldrb r0, [r0, 0x14] - lsls r0, 29 - lsrs r0, 29 - adds r0, r4 - ldrb r1, [r6, 0x1F] - ldrb r0, [r0] - subs r1, r0 - strb r1, [r6, 0x1F] -_08005D36: - ldrb r0, [r6, 0x4] - movs r1, 0x2 - bl CopyWindowToVram - b _08005B30 -_08005D40: - strb r2, [r6, 0x1C] - b _08005B30 -_08005D44: - bl IsSEPlaying - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _08005D52 - b _08005B30 -_08005D52: - strb r0, [r6, 0x1C] - b _08005B30 -_08005D56: - ldrb r0, [r6, 0x1E] - adds r1, r0, 0 - cmp r1, 0 - beq _08005D64 - subs r0, 0x1 - strb r0, [r6, 0x1E] - b _08005B30 -_08005D64: - strb r1, [r6, 0x1C] - b _08005B30 -_08005D68: - movs r0, 0x1 -_08005D6A: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8005790 - - thumb_func_start GetStringWidthFixedWidthFont -GetStringWidthFixedWidthFont: @ 8005D70 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - lsls r1, 24 - lsrs r7, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - movs r2, 0 - mov r1, sp - adds r1, 0x7 -_08005D88: - strb r2, [r1] - subs r1, 0x1 - cmp r1, sp - bge _08005D88 - movs r5, 0 - movs r6, 0 - adds r4, r0, 0 - movs r2, 0 -_08005D98: - adds r0, r4, r2 - ldrb r3, [r0] - adds r2, 0x1 - adds r0, r3, 0 - subs r0, 0xF7 - cmp r0, 0x8 - bhi _08005E66 - lsls r0, 2 - ldr r1, _08005DB0 @ =_08005DB4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08005DB0: .4byte _08005DB4 - .align 2, 0 -_08005DB4: - .4byte _08005E60 - .4byte _08005E64 - .4byte _08005E64 - .4byte _08005E6C - .4byte _08005E6C - .4byte _08005DE8 - .4byte _08005E60 - .4byte _08005DD8 - .4byte _08005DD8 -_08005DD8: - mov r1, sp - adds r0, r1, r6 - strb r5, [r0] - movs r5, 0 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - b _08005E6C -_08005DE8: - adds r0, r4, r2 - ldrb r0, [r0] - adds r2, 0x1 - subs r0, 0x1 - cmp r0, 0x15 - bhi _08005E6C - lsls r0, 2 - ldr r1, _08005E00 @ =_08005E04 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08005E00: .4byte _08005E04 - .align 2, 0 -_08005E04: - .4byte _08005E60 - .4byte _08005E60 - .4byte _08005E60 - .4byte _08005E5C - .4byte _08005E60 - .4byte _08005E60 - .4byte _08005E6C - .4byte _08005E60 - .4byte _08005E6C - .4byte _08005E6C - .4byte _08005E5E - .4byte _08005E60 - .4byte _08005E60 - .4byte _08005E60 - .4byte _08005E6C - .4byte _08005E5E - .4byte _08005E60 - .4byte _08005E60 - .4byte _08005E60 - .4byte _08005E60 - .4byte _08005E6C - .4byte _08005E6C -_08005E5C: - adds r2, 0x1 -_08005E5E: - adds r2, 0x1 -_08005E60: - adds r2, 0x1 - b _08005E6C -_08005E64: - adds r2, 0x1 -_08005E66: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_08005E6C: - cmp r3, 0xFF - bne _08005D98 - movs r5, 0 - movs r2, 0 -_08005E74: - mov r1, sp - adds r0, r1, r2 - ldrb r1, [r0] - cmp r5, r1 - bcs _08005E80 - ldrb r5, [r0] -_08005E80: - adds r2, 0x1 - cmp r2, 0x7 - ble _08005E74 - adds r0, r7, 0 - movs r1, 0 - bl GetFontAttribute - add r0, r8 - lsls r0, 24 - lsrs r0, 24 - muls r0, r5 - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end GetStringWidthFixedWidthFont - - thumb_func_start GetFontWidthFunc -GetFontWidthFunc: @ 8005EA4 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r3, 0 - ldr r0, _08005EBC @ =gUnknown_81EA654 - adds r2, r0, 0x4 - adds r1, r0, 0 -_08005EB2: - ldr r0, [r1] - cmp r4, r0 - bne _08005EC0 - ldr r0, [r2] - b _08005ECC - .align 2, 0 -_08005EBC: .4byte gUnknown_81EA654 -_08005EC0: - adds r2, 0x8 - adds r1, 0x8 - adds r3, 0x1 - cmp r3, 0x6 - bls _08005EB2 - movs r0, 0 -_08005ECC: - pop {r4} - pop {r1} - bx r1 - thumb_func_end GetFontWidthFunc - - thumb_func_start sub_8005ED4 -sub_8005ED4: @ 8005ED4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - adds r4, r1, 0 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - lsls r2, 16 - lsrs r5, r2, 16 - movs r0, 0 - mov r9, r0 - movs r7, 0 - ldr r0, [sp] - bl GetFontWidthFunc - mov r8, r0 - cmp r0, 0 - bne _08005F02 -_08005EFE: - movs r0, 0 - b _08006112 -_08005F02: - lsls r0, r5, 16 - asrs r2, r0, 16 - movs r1, 0x1 - negs r1, r1 - str r0, [sp, 0x8] - cmp r2, r1 - bne _08005F20 - ldr r0, [sp] - movs r1, 0x2 - bl GetFontAttribute - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - b _08005F22 -_08005F20: - mov r10, r2 -_08005F22: - movs r1, 0 - str r1, [sp, 0x4] - movs r5, 0 - movs r6, 0 - b _080060FE -_08005F2C: - ldrb r1, [r4] - adds r0, r1, 0 - subs r0, 0xF7 - cmp r0, 0x7 - bls _08005F38 - b _080060E0 -_08005F38: - lsls r0, 2 - ldr r1, _08005F44 @ =_08005F48 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08005F44: .4byte _08005F48 - .align 2, 0 -_08005F48: - .4byte _08005F9E - .4byte _080060AE - .4byte _080060AE - .4byte _080060FC - .4byte _080060FC - .4byte _08005FDE - .4byte _08005F74 - .4byte _08005F68 -_08005F68: - ldr r2, [sp, 0x4] - cmp r5, r2 - bls _08005F70 - str r5, [sp, 0x4] -_08005F70: - movs r5, 0 - b _080060FC -_08005F74: - adds r4, 0x1 - ldrb r0, [r4] - cmp r0, 0x3 - beq _08005F94 - cmp r0, 0x3 - bgt _08005F86 - cmp r0, 0x2 - beq _08005F8C - b _08005EFE -_08005F86: - cmp r0, 0x4 - beq _08005F9C - b _08005EFE -_08005F8C: - ldr r6, _08005F90 @ =gUnknown_2021CD0 - b _08005F9E - .align 2, 0 -_08005F90: .4byte gUnknown_2021CD0 -_08005F94: - ldr r6, _08005F98 @ =gUnknown_2021CF0 - b _08005F9E - .align 2, 0 -_08005F98: .4byte gUnknown_2021CF0 -_08005F9C: - ldr r6, _08005FB0 @ =gUnknown_2021D04 -_08005F9E: - cmp r6, 0 - bne _08005FD4 - adds r4, 0x1 - ldrb r0, [r4] - bl UnkTextUtil_GetPtrI - adds r6, r0, 0 - b _08005FD4 - .align 2, 0 -_08005FB0: .4byte gUnknown_2021D04 -_08005FB4: - ldrb r0, [r6] - adds r6, 0x1 - mov r1, r9 - bl _call_via_r8 - cmp r7, 0 - ble _08005FCA - cmp r0, r7 - bge _08005FD2 - adds r0, r7, 0 - b _08005FD2 -_08005FCA: - mov r1, r9 - cmp r1, 0 - beq _08005FD2 - add r0, r10 -_08005FD2: - adds r5, r0 -_08005FD4: - ldrb r0, [r6] - cmp r0, 0xFF - bne _08005FB4 - movs r6, 0 - b _080060FC -_08005FDE: - adds r4, 0x1 - ldrb r0, [r4] - subs r0, 0x1 - cmp r0, 0x15 - bls _08005FEA - b _080060FC -_08005FEA: - lsls r0, 2 - ldr r1, _08005FF4 @ =_08005FF8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08005FF4: .4byte _08005FF8 - .align 2, 0 -_08005FF8: - .4byte _08006054 - .4byte _08006054 - .4byte _08006054 - .4byte _08006050 - .4byte _08006054 - .4byte _08006058 - .4byte _080060FC - .4byte _08006054 - .4byte _080060FC - .4byte _080060FC - .4byte _08006052 - .4byte _08006054 - .4byte _08006054 - .4byte _08006054 - .4byte _080060FC - .4byte _08006052 - .4byte _08006084 - .4byte _0800608A - .4byte _08006090 - .4byte _0800609C - .4byte _080060A2 - .4byte _080060A8 -_08006050: - adds r4, 0x1 -_08006052: - adds r4, 0x1 -_08006054: - adds r4, 0x1 - b _080060FC -_08006058: - adds r4, 0x1 - ldrb r0, [r4] - bl GetFontWidthFunc - mov r8, r0 - cmp r0, 0 - bne _08006068 - b _08005EFE -_08006068: - ldr r2, [sp, 0x8] - asrs r1, r2, 16 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _080060FC - ldrb r0, [r4] - movs r1, 0x2 - bl GetFontAttribute - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - b _080060FC -_08006084: - adds r4, 0x1 - ldrb r0, [r4] - b _080060FA -_0800608A: - adds r4, 0x1 - ldrb r5, [r4] - b _080060FC -_08006090: - adds r4, 0x1 - ldrb r0, [r4] - cmp r0, r5 - bls _080060FC - adds r5, r0, 0 - b _080060FC -_0800609C: - adds r4, 0x1 - ldrb r7, [r4] - b _080060FC -_080060A2: - movs r0, 0x1 - mov r9, r0 - b _080060FC -_080060A8: - movs r1, 0 - mov r9, r1 - b _080060FC -_080060AE: - ldrb r0, [r4] - cmp r0, 0xF9 - bne _080060C8 - adds r4, 0x1 - ldrb r0, [r4] - movs r2, 0x80 - lsls r2, 1 - adds r1, r2, 0 - orrs r0, r1 - mov r1, r9 - bl _call_via_r8 - b _080060D4 -_080060C8: - adds r4, 0x1 - ldrb r0, [r4] - bl GetKeypadIconWidth - lsls r0, 24 - lsrs r0, 24 -_080060D4: - cmp r7, 0 - ble _080060F2 -_080060D8: - cmp r0, r7 - bge _080060FA - adds r0, r7, 0 - b _080060FA -_080060E0: - adds r0, r1, 0 - mov r1, r9 - bl _call_via_r8 - cmp r7, 0 - bgt _080060D8 - ldr r2, [sp] - cmp r2, 0x6 - beq _080060FA -_080060F2: - mov r1, r9 - cmp r1, 0 - beq _080060FA - add r0, r10 -_080060FA: - adds r5, r0 -_080060FC: - adds r4, 0x1 -_080060FE: - ldrb r0, [r4] - cmp r0, 0xFF - beq _08006106 - b _08005F2C -_08006106: - ldr r2, [sp, 0x4] - cmp r5, r2 - bhi _08006110 - adds r0, r2, 0 - b _08006112 -_08006110: - adds r0, r5, 0 -_08006112: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8005ED4 - - thumb_func_start sub_8006124 -sub_8006124: @ 8006124 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - mov r9, r0 - adds r4, r2, 0 - mov r5, sp - adds r5, 0x1 - mov r6, sp - adds r6, 0x2 - mov r0, sp - adds r1, r5, 0 - adds r2, r6, 0 - bl SaveTextColors - movs r0, 0x1 - str r0, [sp, 0x4] - movs r1, 0 - str r1, [sp, 0x8] - movs r0, 0x3 - mov r10, r0 - movs r0, 0x1 - movs r2, 0x3 - bl GenerateFontHalfRowLookupTable - mov r8, r4 - movs r7, 0 -_0800615E: - mov r1, r8 - adds r0, r1, r7 - ldrb r6, [r0] - adds r7, 0x1 - adds r0, r6, 0 - subs r0, 0xF7 - cmp r0, 0x8 - bhi _0800625A - lsls r0, 2 - ldr r1, _08006178 @ =_0800617C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08006178: .4byte _0800617C - .align 2, 0 -_0800617C: - .4byte _08006256 - .4byte _08006256 - .4byte _08006256 - .4byte _08006280 - .4byte _08006280 - .4byte _080061A0 - .4byte _08006256 - .4byte _08006280 - .4byte _08006280 -_080061A0: - mov r1, r8 - adds r0, r1, r7 - ldrb r0, [r0] - adds r7, 0x1 - subs r0, 0x1 - cmp r0, 0x15 - bhi _08006280 - lsls r0, 2 - ldr r1, _080061B8 @ =_080061BC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080061B8: .4byte _080061BC - .align 2, 0 -_080061BC: - .4byte _08006228 - .4byte _08006234 - .4byte _0800623E - .4byte _08006214 - .4byte _08006256 - .4byte _08006256 - .4byte _08006280 - .4byte _08006256 - .4byte _08006280 - .4byte _08006280 - .4byte _08006254 - .4byte _08006256 - .4byte _08006256 - .4byte _08006256 - .4byte _08006280 - .4byte _08006254 - .4byte _08006256 - .4byte _08006256 - .4byte _08006256 - .4byte _08006256 - .4byte _08006280 - .4byte _08006280 -_08006214: - mov r1, r8 - adds r0, r1, r7 - ldrb r0, [r0] - str r0, [sp, 0x4] - adds r7, 0x1 - adds r0, r1, r7 - ldrb r0, [r0] - str r0, [sp, 0x8] - adds r7, 0x1 - b _08006240 -_08006228: - mov r1, r8 - adds r0, r1, r7 - ldrb r0, [r0] - str r0, [sp, 0x4] - adds r7, 0x1 - b _0800624A -_08006234: - mov r1, r8 - adds r0, r1, r7 - ldrb r0, [r0] - str r0, [sp, 0x8] - b _08006246 -_0800623E: - mov r1, r8 -_08006240: - adds r0, r1, r7 - ldrb r0, [r0] - mov r10, r0 -_08006246: - adds r7, 0x1 - ldr r0, [sp, 0x4] -_0800624A: - ldr r1, [sp, 0x8] - mov r2, r10 - bl GenerateFontHalfRowLookupTable - b _08006280 -_08006254: - adds r7, 0x1 -_08006256: - adds r7, 0x1 - b _08006280 -_0800625A: - adds r0, r6, 0 - bl DecompressGlyphFont9 - ldr r4, _080062A8 @ =gGlyphBuffer1 - ldr r5, _080062AC @ =0x04000008 - adds r0, r4, 0 - mov r1, r9 - adds r2, r5, 0 - bl CpuSet - adds r4, 0x40 - mov r1, r9 - adds r1, 0x20 - adds r0, r4, 0 - adds r2, r5, 0 - bl CpuSet - movs r0, 0x40 - add r9, r0 -_08006280: - cmp r6, 0xFF - beq _08006286 - b _0800615E -_08006286: - mov r0, sp - mov r1, sp - adds r1, 0x1 - mov r2, sp - adds r2, 0x2 - bl RestoreTextColors - movs r0, 0x1 - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080062A8: .4byte gGlyphBuffer1 -_080062AC: .4byte 0x04000008 - thumb_func_end sub_8006124 - thumb_func_start sub_80062B0 sub_80062B0: @ 80062B0 push {lr} @@ -2213,8 +230,8 @@ GetKeypadIconHeight: @ 8006438 _08006444: .4byte gUnknown_81EA6CC thumb_func_end GetKeypadIconHeight - thumb_func_start sub_8006448 -sub_8006448: @ 8006448 + thumb_func_start DecompressGlyphFont0 +DecompressGlyphFont0: @ 8006448 push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -2228,7 +245,7 @@ sub_8006448: @ 8006448 ldr r1, _08006488 @ =gUnknown_81EF100 adds r0, r1 adds r5, r2, r0 - ldr r4, _0800648C @ =gGlyphBuffer1 + ldr r4, _0800648C @ =gGlyphInfo adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -2247,12 +264,12 @@ sub_8006448: @ 8006448 b _080064BC .align 2, 0 _08006488: .4byte gUnknown_81EF100 -_0800648C: .4byte gGlyphBuffer1 +_0800648C: .4byte gGlyphInfo _08006490: lsls r1, r6, 5 ldr r0, _080064C4 @ =gUnknown_81EAF00 adds r5, r1, r0 - ldr r4, _080064C8 @ =gGlyphBuffer1 + ldr r4, _080064C8 @ =gGlyphInfo adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -2276,12 +293,12 @@ _080064BC: bx r0 .align 2, 0 _080064C4: .4byte gUnknown_81EAF00 -_080064C8: .4byte gGlyphBuffer1 +_080064C8: .4byte gGlyphInfo _080064CC: .4byte gUnknown_81EEF00 - thumb_func_end sub_8006448 + thumb_func_end DecompressGlyphFont0 - thumb_func_start sub_80064D0 -sub_80064D0: @ 80064D0 + thumb_func_start GetGlyphWidthFont0 +GetGlyphWidthFont0: @ 80064D0 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -2298,10 +315,10 @@ _080064E8: _080064EA: pop {r1} bx r1 - thumb_func_end sub_80064D0 + thumb_func_end GetGlyphWidthFont0 - thumb_func_start sub_80064F0 -sub_80064F0: @ 80064F0 + thumb_func_start DecompressGlyphFont1 +DecompressGlyphFont1: @ 80064F0 push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -2315,7 +332,7 @@ sub_80064F0: @ 80064F0 ldr r1, _08006534 @ =gUnknown_81FB300 adds r0, r1 adds r5, r2, r0 - ldr r4, _08006538 @ =gGlyphBuffer1 + ldr r4, _08006538 @ =gGlyphInfo adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -2335,12 +352,12 @@ sub_80064F0: @ 80064F0 b _08006584 .align 2, 0 _08006534: .4byte gUnknown_81FB300 -_08006538: .4byte gGlyphBuffer1 +_08006538: .4byte gGlyphInfo _0800653C: lsls r1, r6, 6 ldr r0, _0800658C @ =gUnknown_81F3100 adds r5, r1, r0 - ldr r4, _08006590 @ =gGlyphBuffer1 + ldr r4, _08006590 @ =gGlyphInfo adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -2375,12 +392,12 @@ _08006584: bx r0 .align 2, 0 _0800658C: .4byte gUnknown_81F3100 -_08006590: .4byte gGlyphBuffer1 +_08006590: .4byte gGlyphInfo _08006594: .4byte gUnknown_81FB100 - thumb_func_end sub_80064F0 + thumb_func_end DecompressGlyphFont1 - thumb_func_start sub_8006598 -sub_8006598: @ 8006598 + thumb_func_start GetGlyphWidthFont1 +GetGlyphWidthFont1: @ 8006598 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -2397,10 +414,10 @@ _080065B0: _080065B2: pop {r1} bx r1 - thumb_func_end sub_8006598 + thumb_func_end GetGlyphWidthFont1 - thumb_func_start sub_80065B8 -sub_80065B8: @ 80065B8 + thumb_func_start DecompressGlyphFont2 +DecompressGlyphFont2: @ 80065B8 push {r4-r7,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -2413,7 +430,7 @@ sub_80065B8: @ 80065B8 lsls r0, 24 lsrs r0, 24 movs r1, 0 - ldr r3, _080065F4 @ =gGlyphBuffer1 + ldr r3, _080065F4 @ =gGlyphInfo lsls r2, r0, 4 orrs r2, r0 adds r7, r3, 0 @@ -2432,7 +449,7 @@ _080065E4: ble _080065E4 b _080066E4 .align 2, 0 -_080065F4: .4byte gGlyphBuffer1 +_080065F4: .4byte gGlyphInfo _080065F8: lsrs r2, r0, 19 lsls r2, 9 @@ -2442,7 +459,7 @@ _080065F8: ldr r1, _08006650 @ =gUnknown_8207500 adds r0, r1 adds r4, r2, r0 - ldr r5, _08006654 @ =gGlyphBuffer1 + ldr r5, _08006654 @ =gGlyphInfo adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -2475,7 +492,7 @@ _080065F8: b _080066E2 .align 2, 0 _08006650: .4byte gUnknown_8207500 -_08006654: .4byte gGlyphBuffer1 +_08006654: .4byte gGlyphInfo _08006658: .4byte gUnknown_820F500 _0800665C: cmp r6, 0 @@ -2485,7 +502,7 @@ _0800665C: lsls r0, 24 lsrs r0, 24 movs r1, 0 - ldr r3, _08006694 @ =gGlyphBuffer1 + ldr r3, _08006694 @ =gGlyphInfo lsls r2, r0, 4 orrs r2, r0 ldr r0, _08006698 @ =gUnknown_8207300 @@ -2507,13 +524,13 @@ _08006682: ble _08006682 b _080066E4 .align 2, 0 -_08006694: .4byte gGlyphBuffer1 +_08006694: .4byte gGlyphInfo _08006698: .4byte gUnknown_8207300 _0800669C: lsls r1, r6, 6 ldr r0, _080066EC @ =gUnknown_81FF300 adds r4, r1, r0 - ldr r5, _080066F0 @ =gGlyphBuffer1 + ldr r5, _080066F0 @ =gGlyphInfo adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -2549,12 +566,12 @@ _080066E4: bx r0 .align 2, 0 _080066EC: .4byte gUnknown_81FF300 -_080066F0: .4byte gGlyphBuffer1 +_080066F0: .4byte gGlyphInfo _080066F4: .4byte gUnknown_8207300 - thumb_func_end sub_80065B8 + thumb_func_end DecompressGlyphFont2 - thumb_func_start sub_80066F8 -sub_80066F8: @ 80066F8 + thumb_func_start GetGlyphWidthFont2 +GetGlyphWidthFont2: @ 80066F8 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -2579,10 +596,10 @@ _0800671A: bx r1 .align 2, 0 _08006720: .4byte gUnknown_8207300 - thumb_func_end sub_80066F8 + thumb_func_end GetGlyphWidthFont2 - thumb_func_start sub_8006724 -sub_8006724: @ 8006724 + thumb_func_start DecompressGlyphFont3 +DecompressGlyphFont3: @ 8006724 push {r4-r7,lr} lsls r0, 16 lsrs r3, r0, 16 @@ -2595,7 +612,7 @@ sub_8006724: @ 8006724 lsls r0, 24 lsrs r0, 24 movs r1, 0 - ldr r3, _08006760 @ =gGlyphBuffer1 + ldr r3, _08006760 @ =gGlyphInfo lsls r2, r0, 4 orrs r2, r0 adds r7, r3, 0 @@ -2614,7 +631,7 @@ _08006750: ble _08006750 b _080067C6 .align 2, 0 -_08006760: .4byte gGlyphBuffer1 +_08006760: .4byte gGlyphInfo _08006764: lsrs r2, r0, 19 lsls r2, 9 @@ -2624,7 +641,7 @@ _08006764: ldr r1, _080067B8 @ =gUnknown_8207500 adds r0, r1 adds r5, r2, r0 - ldr r4, _080067BC @ =gGlyphBuffer1 + ldr r4, _080067BC @ =gGlyphInfo adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -2655,18 +672,18 @@ _08006764: b _080067C6 .align 2, 0 _080067B8: .4byte gUnknown_8207500 -_080067BC: .4byte gGlyphBuffer1 +_080067BC: .4byte gGlyphInfo _080067C0: adds r0, r3, 0 - bl sub_80065B8 + bl DecompressGlyphFont2 _080067C6: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8006724 + thumb_func_end DecompressGlyphFont3 - thumb_func_start sub_80067CC -sub_80067CC: @ 80067CC + thumb_func_start GetGlyphWidthFont3 +GetGlyphWidthFont3: @ 80067CC push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -2683,10 +700,10 @@ _080067E4: _080067E6: pop {r1} bx r1 - thumb_func_end sub_80067CC + thumb_func_end GetGlyphWidthFont3 - thumb_func_start sub_80067EC -sub_80067EC: @ 80067EC + thumb_func_start DecompressGlyphFont4 +DecompressGlyphFont4: @ 80067EC push {r4-r7,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -2699,7 +716,7 @@ sub_80067EC: @ 80067EC lsls r0, 24 lsrs r0, 24 movs r1, 0 - ldr r3, _08006828 @ =gGlyphBuffer1 + ldr r3, _08006828 @ =gGlyphInfo lsls r2, r0, 4 orrs r2, r0 adds r7, r3, 0 @@ -2718,7 +735,7 @@ _08006818: ble _08006818 b _08006918 .align 2, 0 -_08006828: .4byte gGlyphBuffer1 +_08006828: .4byte gGlyphInfo _0800682C: lsrs r2, r0, 19 lsls r2, 9 @@ -2728,7 +745,7 @@ _0800682C: ldr r1, _08006884 @ =gUnknown_8217818 adds r0, r1 adds r4, r2, r0 - ldr r5, _08006888 @ =gGlyphBuffer1 + ldr r5, _08006888 @ =gGlyphInfo adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -2761,7 +778,7 @@ _0800682C: b _08006916 .align 2, 0 _08006884: .4byte gUnknown_8217818 -_08006888: .4byte gGlyphBuffer1 +_08006888: .4byte gGlyphInfo _0800688C: .4byte gUnknown_821F818 _08006890: cmp r6, 0 @@ -2771,7 +788,7 @@ _08006890: lsls r0, 24 lsrs r0, 24 movs r1, 0 - ldr r3, _080068C8 @ =gGlyphBuffer1 + ldr r3, _080068C8 @ =gGlyphInfo lsls r2, r0, 4 orrs r2, r0 ldr r0, _080068CC @ =gUnknown_8217618 @@ -2793,13 +810,13 @@ _080068B6: ble _080068B6 b _08006918 .align 2, 0 -_080068C8: .4byte gGlyphBuffer1 +_080068C8: .4byte gGlyphInfo _080068CC: .4byte gUnknown_8217618 _080068D0: lsls r1, r6, 6 ldr r0, _08006920 @ =gUnknown_820F618 adds r4, r1, r0 - ldr r5, _08006924 @ =gGlyphBuffer1 + ldr r5, _08006924 @ =gGlyphInfo adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -2835,12 +852,12 @@ _08006918: bx r0 .align 2, 0 _08006920: .4byte gUnknown_820F618 -_08006924: .4byte gGlyphBuffer1 +_08006924: .4byte gGlyphInfo _08006928: .4byte gUnknown_8217618 - thumb_func_end sub_80067EC + thumb_func_end DecompressGlyphFont4 - thumb_func_start sub_800692C -sub_800692C: @ 800692C + thumb_func_start GetGlyphWidthFont4 +GetGlyphWidthFont4: @ 800692C push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -2865,10 +882,10 @@ _0800694E: bx r1 .align 2, 0 _08006954: .4byte gUnknown_8217618 - thumb_func_end sub_800692C + thumb_func_end GetGlyphWidthFont4 - thumb_func_start sub_8006958 -sub_8006958: @ 8006958 + thumb_func_start DecompressGlyphFont5 +DecompressGlyphFont5: @ 8006958 push {r4-r7,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -2881,7 +898,7 @@ sub_8006958: @ 8006958 lsls r0, 24 lsrs r0, 24 movs r1, 0 - ldr r3, _08006994 @ =gGlyphBuffer1 + ldr r3, _08006994 @ =gGlyphInfo lsls r2, r0, 4 orrs r2, r0 adds r7, r3, 0 @@ -2900,7 +917,7 @@ _08006984: ble _08006984 b _08006A84 .align 2, 0 -_08006994: .4byte gGlyphBuffer1 +_08006994: .4byte gGlyphInfo _08006998: lsrs r2, r0, 19 lsls r2, 9 @@ -2910,7 +927,7 @@ _08006998: ldr r1, _080069F0 @ =gUnknown_8227B30 adds r0, r1 adds r4, r2, r0 - ldr r5, _080069F4 @ =gGlyphBuffer1 + ldr r5, _080069F4 @ =gGlyphInfo adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -2943,7 +960,7 @@ _08006998: b _08006A82 .align 2, 0 _080069F0: .4byte gUnknown_8227B30 -_080069F4: .4byte gGlyphBuffer1 +_080069F4: .4byte gGlyphInfo _080069F8: .4byte gUnknown_822FB30 _080069FC: cmp r6, 0 @@ -2953,7 +970,7 @@ _080069FC: lsls r0, 24 lsrs r0, 24 movs r1, 0 - ldr r3, _08006A34 @ =gGlyphBuffer1 + ldr r3, _08006A34 @ =gGlyphInfo lsls r2, r0, 4 orrs r2, r0 ldr r0, _08006A38 @ =gUnknown_8227930 @@ -2975,13 +992,13 @@ _08006A22: ble _08006A22 b _08006A84 .align 2, 0 -_08006A34: .4byte gGlyphBuffer1 +_08006A34: .4byte gGlyphInfo _08006A38: .4byte gUnknown_8227930 _08006A3C: lsls r1, r6, 6 ldr r0, _08006A8C @ =gUnknown_821F930 adds r4, r1, r0 - ldr r5, _08006A90 @ =gGlyphBuffer1 + ldr r5, _08006A90 @ =gGlyphInfo adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -3017,12 +1034,12 @@ _08006A84: bx r0 .align 2, 0 _08006A8C: .4byte gUnknown_821F930 -_08006A90: .4byte gGlyphBuffer1 +_08006A90: .4byte gGlyphInfo _08006A94: .4byte gUnknown_8227930 - thumb_func_end sub_8006958 + thumb_func_end DecompressGlyphFont5 - thumb_func_start sub_8006A98 -sub_8006A98: @ 8006A98 + thumb_func_start GetGlyphWidthFont5 +GetGlyphWidthFont5: @ 8006A98 push {lr} lsls r0, 16 lsrs r2, r0, 16 @@ -3047,7 +1064,7 @@ _08006ABA: bx r1 .align 2, 0 _08006AC0: .4byte gUnknown_8227930 - thumb_func_end sub_8006A98 + thumb_func_end GetGlyphWidthFont5 thumb_func_start DecompressGlyphFont9 DecompressGlyphFont9: @ 8006AC4 @@ -3062,7 +1079,7 @@ DecompressGlyphFont9: @ 8006AC4 ldr r0, _08006B08 @ =gUnknown_822FC48 adds r1, r0 adds r4, r1 - ldr r5, _08006B0C @ =gGlyphBuffer1 + ldr r5, _08006B0C @ =gGlyphInfo adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -3085,7 +1102,7 @@ DecompressGlyphFont9: @ 8006AC4 bx r0 .align 2, 0 _08006B08: .4byte gUnknown_822FC48 -_08006B0C: .4byte gGlyphBuffer1 +_08006B0C: .4byte gGlyphInfo thumb_func_end DecompressGlyphFont9 .align 2, 0 @ Don't pad with nop. diff --git a/asm/text_printer.s b/asm/text_printer.s index 504cc57b4..531ce3da7 100644 --- a/asm/text_printer.s +++ b/asm/text_printer.s @@ -26,7 +26,7 @@ CopyGlyphToWindow: @ 8003014 lsls r0, 3 ldrb r1, [r6, 0x8] subs r1, r0, r1 - ldr r3, _08003088 @ =gGlyphBuffer1 + ldr r3, _08003088 @ =gGlyphInfo mov r8, r3 mov r0, r8 adds r0, 0x80 @@ -68,7 +68,7 @@ _08003074: b _080035FC .align 2, 0 _08003084: .4byte gWindows -_08003088: .4byte gGlyphBuffer1 +_08003088: .4byte gGlyphInfo _0800308C: cmp r1, 0x2 bne _08003092 @@ -235,7 +235,7 @@ _080031AC: cmp r2, r10 blt _0800313C _080031BE: - ldr r3, _08003264 @ =gGlyphBuffer2 + ldr r3, _08003264 @ =gGlyphInfo + 0x20 movs r2, 0 ldrb r1, [r6, 0x9] cmp r2, r10 @@ -323,7 +323,7 @@ _08003254: b _080035FC .align 2, 0 _08003260: .4byte gWindows -_08003264: .4byte gGlyphBuffer2 +_08003264: .4byte gGlyphInfo + 0x20 _08003268: adds r1, r3, 0 movs r2, 0 @@ -403,7 +403,7 @@ _080032F2: ldr r0, [sp, 0x5C] cmp r2, 0x7 ble _08003274 - ldr r2, _0800339C @ =gGlyphBuffer3 + ldr r2, _0800339C @ =gGlyphInfo + 0x40 movs r1, 0 ldrb r0, [r6, 0x9] adds r0, 0x8 @@ -487,7 +487,7 @@ _0800338A: b _080035FC .align 2, 0 _08003398: .4byte gWindows -_0800339C: .4byte gGlyphBuffer3 +_0800339C: .4byte gGlyphInfo + 0x40 _080033A0: mov r2, r8 movs r3, 0 @@ -563,7 +563,7 @@ _0800341C: mov r1, r12 cmp r3, 0x7 ble _080033B0 - ldr r3, _080034D4 @ =gGlyphBuffer2 + ldr r3, _080034D4 @ =gGlyphInfo + 0x20 movs r2, 0 ldrb r1, [r6, 0x9] ldr r0, [sp, 0x64] @@ -641,7 +641,7 @@ _080034B8: ldr r1, [sp, 0x40] cmp r2, 0x7 ble _08003438 - ldr r3, _080034D8 @ =gGlyphBuffer3 + ldr r3, _080034D8 @ =gGlyphInfo + 0x40 movs r2, 0 ldrb r0, [r6, 0x9] adds r1, r0, 0 @@ -649,8 +649,8 @@ _080034B8: b _08003556 .align 2, 0 _080034D0: .4byte gWindows -_080034D4: .4byte gGlyphBuffer2 -_080034D8: .4byte gGlyphBuffer3 +_080034D4: .4byte gGlyphInfo + 0x20 +_080034D8: .4byte gGlyphInfo + 0x40 _080034DC: ldm r3!, {r0} mov r9, r0 @@ -719,7 +719,7 @@ _08003556: ldr r0, [sp, 0x68] cmp r2, r0 blt _080034DC - ldr r3, _08003610 @ =gGlyphBuffer4 + ldr r3, _08003610 @ =gGlyphInfo + 0x60 movs r2, 0 ldrb r0, [r6, 0x9] adds r1, r0, 0 @@ -814,7 +814,7 @@ _080035FC: bx r0 .align 2, 0 _0800360C: .4byte gWindows -_08003610: .4byte gGlyphBuffer4 +_08003610: .4byte gGlyphInfo + 0x60 thumb_func_end CopyGlyphToWindow thumb_func_start sub_8003614 @@ -838,7 +838,7 @@ sub_8003614: @ 8003614 lsls r0, 16 lsrs r4, r0, 16 subs r1, r3, r1 - ldr r5, _08003688 @ =gGlyphBuffer1 + ldr r5, _08003688 @ =gGlyphInfo adds r0, r5, 0 adds r0, 0x80 ldrb r7, [r0] @@ -881,7 +881,7 @@ _08003678: beq _0800369A b _08003B00 .align 2, 0 -_08003688: .4byte gGlyphBuffer1 +_08003688: .4byte gGlyphInfo _0800368C: cmp r1, 0x2 bne _08003692 @@ -1024,7 +1024,7 @@ _0800377A: cmp r4, r1 blt _08003724 _0800378E: - ldr r1, _08003818 @ =gGlyphBuffer2 + ldr r1, _08003818 @ =gGlyphInfo + 0x20 movs r0, 0 ldr r2, [sp, 0x8] ldr r3, [sp, 0xC] @@ -1098,7 +1098,7 @@ _08003808: blt _080037A2 b _08003B00 .align 2, 0 -_08003818: .4byte gGlyphBuffer2 +_08003818: .4byte gGlyphInfo + 0x20 _0800381C: adds r0, r2, 0 movs r1, 0 @@ -1167,7 +1167,7 @@ _08003890: mov r2, r10 cmp r1, 0x7 ble _0800382E - ldr r2, _08003918 @ =gGlyphBuffer3 + ldr r2, _08003918 @ =gGlyphInfo + 0x40 movs r0, 0 ldr r1, [sp, 0x1C] ldr r3, [sp, 0x20] @@ -1235,7 +1235,7 @@ _0800390A: blt _080038A8 b _08003B00 .align 2, 0 -_08003918: .4byte gGlyphBuffer3 +_08003918: .4byte gGlyphInfo + 0x40 _0800391C: movs r2, 0 ldr r4, [sp, 0x8] @@ -1304,7 +1304,7 @@ _0800398A: mov r4, r9 cmp r2, 0x7 ble _08003936 - ldr r1, _08003B10 @ =gGlyphBuffer2 + ldr r1, _08003B10 @ =gGlyphInfo + 0x20 movs r0, 0 ldr r2, [sp, 0x8] ldr r3, [sp, 0x18] @@ -1366,7 +1366,7 @@ _08003A06: mov r2, r10 cmp r0, 0x7 ble _080039A6 - ldr r6, _08003B14 @ =gGlyphBuffer3 + ldr r6, _08003B14 @ =gGlyphInfo + 0x40 movs r4, 0 ldr r2, [sp, 0x1C] ldr r3, [sp, 0x20] @@ -1428,7 +1428,7 @@ _08003A70: cmp r4, r1 blt _08003A1C _08003A84: - ldr r2, _08003B18 @ =gGlyphBuffer4 + ldr r2, _08003B18 @ =gGlyphInfo + 0x60 movs r0, 0 ldr r1, [sp, 0x1C] ldr r3, [sp, 0x20] @@ -1504,9 +1504,9 @@ _08003B00: pop {r0} bx r0 .align 2, 0 -_08003B10: .4byte gGlyphBuffer2 -_08003B14: .4byte gGlyphBuffer3 -_08003B18: .4byte gGlyphBuffer4 +_08003B10: .4byte gGlyphInfo + 0x20 +_08003B14: .4byte gGlyphInfo + 0x40 +_08003B18: .4byte gGlyphInfo + 0x60 thumb_func_end sub_8003614 thumb_func_start ClearTextSpan diff --git a/asm/tm_case.s b/asm/tm_case.s index 68c44384e..c551cfddf 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -41,7 +41,7 @@ _08131832: ldr r0, _08131858 @ =gUnknown_203B10C strb r6, [r0, 0x5] _0813183A: - ldr r2, _0813185C @ =gUnknown_3003E50 + ldr r2, _0813185C @ =gTextFlags ldrb r1, [r2] movs r0, 0x5 negs r0, r0 @@ -55,7 +55,7 @@ _0813183A: .align 2, 0 _08131854: .4byte gUnknown_203B118 _08131858: .4byte gUnknown_203B10C -_0813185C: .4byte gUnknown_3003E50 +_0813185C: .4byte gTextFlags _08131860: .4byte sub_8131894 thumb_func_end sub_81317F8 @@ -644,7 +644,7 @@ sub_8131D48: @ 8131D48 adds r7, r0, 0 lsls r1, 16 lsrs r6, r1, 16 - ldr r5, _08131D8C @ =gUnknown_2021D18 + ldr r5, _08131D8C @ =gStringVar4 ldr r1, _08131D90 @ =gUnknown_84166FF adds r0, r5, 0 bl StringCopy @@ -658,7 +658,7 @@ sub_8131D48: @ 8131D48 ldr r1, _08131D98 @ =gUnknown_8416226 adds r0, r5, 0 bl StringAppend - ldr r4, _08131D9C @ =gUnknown_2021CD0 + ldr r4, _08131D9C @ =gStringVar1 ldr r0, _08131DA0 @ =0xfffffeae adds r1, r6, r0 adds r0, r4, 0 @@ -670,17 +670,17 @@ sub_8131D48: @ 8131D48 bl StringAppend b _08131DC4 .align 2, 0 -_08131D8C: .4byte gUnknown_2021D18 +_08131D8C: .4byte gStringVar4 _08131D90: .4byte gUnknown_84166FF _08131D94: .4byte gUnknown_8463178 _08131D98: .4byte gUnknown_8416226 -_08131D9C: .4byte gUnknown_2021CD0 +_08131D9C: .4byte gStringVar1 _08131DA0: .4byte 0xfffffeae _08131DA4: ldr r1, _08131DFC @ =gUnknown_8416226 adds r0, r5, 0 bl StringAppend - ldr r4, _08131E00 @ =gUnknown_2021CD0 + ldr r4, _08131E00 @ =gStringVar1 ldr r0, _08131E04 @ =0xfffffee0 adds r1, r6, r0 adds r0, r4, 0 @@ -691,7 +691,7 @@ _08131DA4: adds r1, r4, 0 bl StringAppend _08131DC4: - ldr r4, _08131E08 @ =gUnknown_2021D18 + ldr r4, _08131E08 @ =gStringVar4 ldr r1, _08131E0C @ =gUnknown_846317C adds r0, r4, 0 bl StringAppend @@ -716,9 +716,9 @@ _08131DC4: bx r0 .align 2, 0 _08131DFC: .4byte gUnknown_8416226 -_08131E00: .4byte gUnknown_2021CD0 +_08131E00: .4byte gStringVar1 _08131E04: .4byte 0xfffffee0 -_08131E08: .4byte gUnknown_2021D18 +_08131E08: .4byte gStringVar4 _08131E0C: .4byte gUnknown_846317C _08131E10: .4byte gUnknown_8416703 _08131E14: .4byte gUnknown_8247094 @@ -747,7 +747,7 @@ _08131E3A: cmp r6, 0x1 beq _08131E50 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08131E64 @ =gUnknown_203B118 ldr r0, [r0] ldrb r0, [r0, 0x4] @@ -796,7 +796,7 @@ sub_8131E68: @ 8131E68 lsrs r5, r0, 24 cmp r5, 0 bne _08131EF4 - ldr r4, _08131EE8 @ =gUnknown_2021CD0 + ldr r4, _08131EE8 @ =gStringVar1 movs r0, 0x4 adds r1, r6, 0 bl sub_809A7B4 @@ -807,7 +807,7 @@ sub_8131E68: @ 8131E68 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _08131EEC @ =gUnknown_2021D18 + ldr r4, _08131EEC @ =gStringVar4 ldr r1, _08131EF0 @ =gUnknown_84162B9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -826,8 +826,8 @@ sub_8131E68: @ 8131E68 bl sub_81332EC b _08131EFE .align 2, 0 -_08131EE8: .4byte gUnknown_2021CD0 -_08131EEC: .4byte gUnknown_2021D18 +_08131EE8: .4byte gStringVar1 +_08131EEC: .4byte gStringVar4 _08131EF0: .4byte gUnknown_84162B9 _08131EF4: adds r0, r7, 0 @@ -1399,7 +1399,7 @@ sub_81322D4: @ 81322D4 cmp r0, 0x1 bne _08132354 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, _08132350 @ =gUnknown_203AD30 mov r1, r8 strh r1, [r0] @@ -1421,7 +1421,7 @@ _08132354: b _081323C8 _08132364: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _08132378 @ =gUnknown_203AD30 movs r0, 0 strh r0, [r1] @@ -1433,7 +1433,7 @@ _08132370: _08132378: .4byte gUnknown_203AD30 _0813237C: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl sub_8131F64 bl sub_813208C @@ -1671,7 +1671,7 @@ sub_8132568: @ 8132568 cmp r4, r0 bne _081325C0 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _081325B8 @ =gUnknown_8463150 ldr r0, _081325BC @ =gUnknown_203B118 ldr r1, [r0] @@ -1692,7 +1692,7 @@ _081325B8: .4byte gUnknown_8463150 _081325BC: .4byte gUnknown_203B118 _081325C0: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r1, _081325E8 @ =gUnknown_8463150 ldr r0, _081325EC @ =gUnknown_203B118 ldr r0, [r0] @@ -1854,9 +1854,9 @@ sub_8132714: @ 8132714 lsrs r4, 24 ldr r0, _08132744 @ =gUnknown_203AD30 ldrh r0, [r0] - ldr r1, _08132748 @ =gUnknown_2021CD0 + ldr r1, _08132748 @ =gStringVar1 bl sub_8099E90 - ldr r5, _0813274C @ =gUnknown_2021D18 + ldr r5, _0813274C @ =gStringVar4 ldr r1, _08132750 @ =gUnknown_841635E adds r0, r5, 0 bl StringExpandPlaceholders @@ -1870,8 +1870,8 @@ sub_8132714: @ 8132714 bx r0 .align 2, 0 _08132744: .4byte gUnknown_203AD30 -_08132748: .4byte gUnknown_2021CD0 -_0813274C: .4byte gUnknown_2021D18 +_08132748: .4byte gStringVar1 +_0813274C: .4byte gStringVar4 _08132750: .4byte gUnknown_841635E _08132754: .4byte sub_8132758 thumb_func_end sub_8132714 @@ -1888,7 +1888,7 @@ sub_8132758: @ 8132758 cmp r0, 0 beq _08132776 movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r4, 0 bl sub_8132780 _08132776: @@ -2092,9 +2092,9 @@ sub_8132908: @ 8132908 cmp r0, 0 bne _08132968 ldrh r0, [r6] - ldr r1, _08132958 @ =gUnknown_2021CD0 + ldr r1, _08132958 @ =gStringVar1 bl sub_8099E90 - ldr r4, _0813295C @ =gUnknown_2021D18 + ldr r4, _0813295C @ =gStringVar4 ldr r1, _08132960 @ =gUnknown_84168F1 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2110,8 +2110,8 @@ sub_8132908: @ 8132908 .align 2, 0 _08132950: .4byte gUnknown_3005098 _08132954: .4byte gUnknown_203AD30 -_08132958: .4byte gUnknown_2021CD0 -_0813295C: .4byte gUnknown_2021D18 +_08132958: .4byte gStringVar1 +_0813295C: .4byte gStringVar4 _08132960: .4byte gUnknown_84168F1 _08132964: .4byte sub_8132780 _08132968: @@ -2132,9 +2132,9 @@ _08132980: strh r0, [r4, 0x4] _08132988: ldrh r0, [r6] - ldr r1, _081329B4 @ =gUnknown_2021CD0 + ldr r1, _081329B4 @ =gStringVar1 bl sub_8099E90 - ldr r4, _081329B8 @ =gUnknown_2021D18 + ldr r4, _081329B8 @ =gStringVar4 ldr r1, _081329BC @ =gUnknown_8416911 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2151,8 +2151,8 @@ _081329AE: pop {r0} bx r0 .align 2, 0 -_081329B4: .4byte gUnknown_2021CD0 -_081329B8: .4byte gUnknown_2021D18 +_081329B4: .4byte gStringVar1 +_081329B8: .4byte gStringVar4 _081329BC: .4byte gUnknown_8416911 _081329C0: .4byte sub_8132AAC thumb_func_end sub_8132908 @@ -2168,7 +2168,7 @@ sub_81329C4: @ 81329C4 lsls r4, 3 ldr r0, _08132A20 @ =gUnknown_3005098 adds r4, r0 - ldr r6, _08132A24 @ =gUnknown_2021D04 + ldr r6, _08132A24 @ =gStringVar3 ldrh r1, [r4, 0x2] movs r0, 0x4 bl sub_809A798 @@ -2184,7 +2184,7 @@ sub_81329C4: @ 81329C4 movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r4, _08132A28 @ =gUnknown_2021D18 + ldr r4, _08132A28 @ =gStringVar4 ldr r1, _08132A2C @ =gUnknown_8416936 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2201,8 +2201,8 @@ sub_81329C4: @ 81329C4 bx r0 .align 2, 0 _08132A20: .4byte gUnknown_3005098 -_08132A24: .4byte gUnknown_2021D04 -_08132A28: .4byte gUnknown_2021D18 +_08132A24: .4byte gStringVar3 +_08132A28: .4byte gStringVar4 _08132A2C: .4byte gUnknown_8416936 _08132A30: .4byte sub_8132A34 thumb_func_end sub_81329C4 @@ -2279,12 +2279,12 @@ sub_8132AAC: @ 8132AAC mov r8, r0 movs r0, 0x7 bl sub_8133354 - ldr r0, _08132B4C @ =gUnknown_2021CD0 + ldr r0, _08132B4C @ =gStringVar1 movs r1, 0x1 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r5, _08132B50 @ =gUnknown_2021D18 + ldr r5, _08132B50 @ =gStringVar4 ldr r1, _08132B54 @ =gUnknown_84162B9 adds r0, r5, 0 bl StringExpandPlaceholders @@ -2334,8 +2334,8 @@ sub_8132AAC: @ 8132AAC bx r0 .align 2, 0 _08132B48: .4byte gUnknown_3005098 -_08132B4C: .4byte gUnknown_2021CD0 -_08132B50: .4byte gUnknown_2021D18 +_08132B4C: .4byte gStringVar1 +_08132B50: .4byte gStringVar4 _08132B54: .4byte gUnknown_84162B9 _08132B58: .4byte sub_8132BC8 thumb_func_end sub_8132AAC @@ -2351,14 +2351,14 @@ sub_8132B5C: @ 8132B5C movs r0, 0x7 movs r1, 0x11 bl FillWindowPixelBuffer - ldr r0, _08132BBC @ =gUnknown_2021CD0 + ldr r0, _08132BBC @ =gStringVar1 lsls r4, 16 asrs r4, 16 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r5, _08132BC0 @ =gUnknown_2021D18 + ldr r5, _08132BC0 @ =gStringVar4 ldr r1, _08132BC4 @ =gUnknown_84162B9 adds r0, r5, 0 bl StringExpandPlaceholders @@ -2386,8 +2386,8 @@ sub_8132B5C: @ 8132B5C pop {r0} bx r0 .align 2, 0 -_08132BBC: .4byte gUnknown_2021CD0 -_08132BC0: .4byte gUnknown_2021D18 +_08132BBC: .4byte gStringVar1 +_08132BC0: .4byte gStringVar4 _08132BC4: .4byte gUnknown_84162B9 thumb_func_end sub_8132B5C @@ -2436,7 +2436,7 @@ _08132C18: cmp r0, 0 beq _08132C50 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x7 movs r1, 0 bl sub_810F4D8 @@ -2456,7 +2456,7 @@ _08132C50: cmp r0, 0 beq _08132CA6 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x7 movs r1, 0 bl sub_810F4D8 @@ -2505,9 +2505,9 @@ sub_8132CAC: @ 8132CAC bl schedule_bg_copy_tilemap_to_vram ldr r0, _08132D1C @ =gUnknown_203AD30 ldrh r0, [r0] - ldr r1, _08132D20 @ =gUnknown_2021CD0 + ldr r1, _08132D20 @ =gStringVar1 bl sub_8099E90 - ldr r6, _08132D24 @ =gUnknown_2021D04 + ldr r6, _08132D24 @ =gStringVar3 ldrh r1, [r4, 0x2] movs r0, 0x4 bl sub_809A798 @@ -2523,7 +2523,7 @@ sub_8132CAC: @ 8132CAC movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r4, _08132D28 @ =gUnknown_2021D18 + ldr r4, _08132D28 @ =gStringVar4 ldr r1, _08132D2C @ =gUnknown_8416959 adds r0, r4, 0 bl StringExpandPlaceholders @@ -2538,9 +2538,9 @@ sub_8132CAC: @ 8132CAC .align 2, 0 _08132D18: .4byte gUnknown_3005098 _08132D1C: .4byte gUnknown_203AD30 -_08132D20: .4byte gUnknown_2021CD0 -_08132D24: .4byte gUnknown_2021D04 -_08132D28: .4byte gUnknown_2021D18 +_08132D20: .4byte gStringVar1 +_08132D24: .4byte gStringVar3 +_08132D28: .4byte gStringVar4 _08132D2C: .4byte gUnknown_8416959 _08132D30: .4byte sub_8132D34 thumb_func_end sub_8132CAC @@ -2563,7 +2563,7 @@ sub_8132D34: @ 8132D34 add r1, r9 mov r8, r1 movs r0, 0xF8 - bl sub_80722CC + bl PlaySE ldr r5, _08132DF8 @ =gUnknown_203AD30 ldrh r0, [r5] mov r2, r8 @@ -2656,7 +2656,7 @@ sub_8132E0C: @ 8132E0C beq _08132E5A _08132E26: movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x8 movs r1, 0 bl sub_810F4D8 @@ -3322,7 +3322,7 @@ sub_81333C4: @ 81333C4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0x48 subs r2, r0 lsrs r2, 1 @@ -3453,7 +3453,7 @@ _081334A8: _081334D8: .4byte gUnknown_8250C04 _081334DC: .4byte gUnknown_8416213 _081334E0: - ldr r4, _08133524 @ =gUnknown_2021CD0 + ldr r4, _08133524 @ =gStringVar1 ldrb r1, [r5, 0x1] adds r0, r4, 0 movs r2, 0x1 @@ -3486,11 +3486,11 @@ _081334F0: ldr r2, _0813352C @ =gUnknown_8416213 b _08133540 .align 2, 0 -_08133524: .4byte gUnknown_2021CD0 +_08133524: .4byte gStringVar1 _08133528: .4byte gUnknown_8250C04 _0813352C: .4byte gUnknown_8416213 _08133530: - ldr r4, _081335A8 @ =gUnknown_2021CD0 + ldr r4, _081335A8 @ =gStringVar1 ldrb r1, [r2, 0x3] adds r0, r4, 0 movs r2, 0x1 @@ -3513,7 +3513,7 @@ _08133540: movs r1, 0x3 movs r3, 0x7 bl sub_81332EC - ldr r5, _081335A8 @ =gUnknown_2021CD0 + ldr r5, _081335A8 @ =gStringVar1 ldr r1, _081335AC @ =gUnknown_8250C04 adds r0, r6, r7 lsls r0, 2 @@ -3548,7 +3548,7 @@ _0813359A: pop {r0} bx r0 .align 2, 0 -_081335A8: .4byte gUnknown_2021CD0 +_081335A8: .4byte gStringVar1 _081335AC: .4byte gUnknown_8250C04 thumb_func_end sub_8133444 diff --git a/asm/trade.s b/asm/trade.s index dbdac5eac..8f33fa26a 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -719,7 +719,7 @@ _0804CC3E: ldr r1, [r0] movs r0, 0x1 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 movs r0, 0x38 subs r0, r1 @@ -766,7 +766,7 @@ _0804CC62: adds r1, r0, r1 movs r0, 0x1 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 movs r0, 0x38 subs r0, r1 @@ -1416,7 +1416,7 @@ _0804D24C: ldr r1, [r0] movs r0, 0x1 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 movs r0, 0x38 subs r0, r1 @@ -1463,7 +1463,7 @@ _0804D270: adds r1, r0, r1 movs r0, 0x1 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 movs r0, 0x38 subs r0, r1 @@ -3236,7 +3236,7 @@ _0804E114: cmp r0, r6 beq _0804E120 movs r0, 0x5 - bl sub_80722CC + bl PlaySE _0804E120: strb r6, [r7] pop {r4-r7} @@ -3359,7 +3359,7 @@ _0804E208: cmp r0, 0 beq _0804E2DE movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r4, _0804E27C @ =gUnknown_2031DA8 ldr r0, [r4] adds r0, 0x35 @@ -3549,7 +3549,7 @@ sub_804E388: @ 804E388 b _0804E462 _0804E3AA: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_804E330 b _0804E462 _0804E3B6: @@ -3656,7 +3656,7 @@ sub_804E46C: @ 804E46C beq _0804E48C _0804E482: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_804E330 _0804E48C: pop {r0} @@ -4074,7 +4074,7 @@ _0804E7B0: .4byte 0x0000eeaa _0804E7B4: .4byte gUnknown_202063C _0804E7B8: movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_804E330 _0804E7C2: pop {r4,r5} @@ -4190,7 +4190,7 @@ sub_804E880: @ 804E880 cmp r0, 0 beq _0804E8F4 movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0 bl rbox_fill_rectangle movs r0, 0x1 @@ -4950,7 +4950,7 @@ _0804EEA4: lsrs r2, 24 movs r0, 0 adds r1, r4, 0 - bl sub_8005ED4 + bl GetStringWidth lsls r0, 24 lsrs r0, 24 add sp, 0xC @@ -5097,7 +5097,7 @@ sub_804EFB4: @ 804EFB4 lsrs r2, 24 movs r0, 0 adds r1, r6, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0x40 subs r2, r0 lsrs r2, 1 @@ -6861,7 +6861,7 @@ sub_804FD24: @ 804FD24 cmp r0, 0xA bne _0804FD40 movs r0, 0x17 - bl sub_80722CC + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] _0804FD40: @@ -6890,7 +6890,7 @@ sub_804FD48: @ 804FD48 cmp r0, 0xA bne _0804FD72 movs r0, 0xBB - bl sub_80722CC + bl PlaySE strh r5, [r4, 0x2E] _0804FD72: pop {r4,r5} @@ -6988,7 +6988,7 @@ sub_804FE00: @ 804FE00 cmp r0, 0xF bne _0804FE1C movs r0, 0xC5 - bl sub_80722CC + bl PlaySE movs r0, 0 strh r0, [r4, 0x2E] _0804FE1C: @@ -8863,7 +8863,7 @@ sub_8050E24: @ 8050E24 beq _08050EB4 bl GetMultiplayerId lsls r0, 24 - ldr r3, _08050E98 @ =gUnknown_2021CD0 + ldr r3, _08050E98 @ =gStringVar1 movs r2, 0x80 lsls r2, 17 eors r2, r0 @@ -8888,7 +8888,7 @@ sub_8050E24: @ 8050E24 movs r1, 0x2 mov r2, sp bl GetMonData - ldr r0, _08050EA8 @ =gUnknown_2021D04 + ldr r0, _08050EA8 @ =gStringVar3 mov r1, sp bl StringCopy10 ldrb r0, [r5] @@ -8898,19 +8898,19 @@ sub_8050E24: @ 8050E24 movs r1, 0x2 mov r2, sp bl GetMonData - ldr r0, _08050EB0 @ =gUnknown_2021CF0 + ldr r0, _08050EB0 @ =gStringVar2 mov r1, sp bl StringCopy10 b _08050EF0 .align 2, 0 _08050E94: .4byte gUnknown_2031DAC -_08050E98: .4byte gUnknown_2021CD0 +_08050E98: .4byte gStringVar1 _08050E9C: .4byte gUnknown_2022744 _08050EA0: .4byte gUnknown_2031DA4 _08050EA4: .4byte gUnknown_202402C -_08050EA8: .4byte gUnknown_2021D04 +_08050EA8: .4byte gStringVar3 _08050EAC: .4byte gUnknown_2024284 -_08050EB0: .4byte gUnknown_2021CF0 +_08050EB0: .4byte gStringVar2 _08050EB4: ldr r0, _08050EF8 @ =gUnknown_20370C0 ldrh r0, [r0] @@ -8919,11 +8919,11 @@ _08050EB4: lsls r4, 2 ldr r0, _08050EFC @ =gUnknown_826CF8C adds r4, r0 - ldr r0, _08050F00 @ =gUnknown_2021CD0 + ldr r0, _08050F00 @ =gStringVar1 adds r1, r4, 0 adds r1, 0x2B bl StringCopy - ldr r0, _08050F04 @ =gUnknown_2021D04 + ldr r0, _08050F04 @ =gStringVar3 adds r1, r4, 0 bl StringCopy10 ldr r0, _08050F08 @ =gUnknown_20370C2 @@ -8935,7 +8935,7 @@ _08050EB4: movs r1, 0x2 mov r2, sp bl GetMonData - ldr r0, _08050F10 @ =gUnknown_2021CF0 + ldr r0, _08050F10 @ =gStringVar2 mov r1, sp bl StringCopy10 _08050EF0: @@ -8946,11 +8946,11 @@ _08050EF0: .align 2, 0 _08050EF8: .4byte gUnknown_20370C0 _08050EFC: .4byte gUnknown_826CF8C -_08050F00: .4byte gUnknown_2021CD0 -_08050F04: .4byte gUnknown_2021D04 +_08050F00: .4byte gStringVar1 +_08050F04: .4byte gStringVar3 _08050F08: .4byte gUnknown_20370C2 _08050F0C: .4byte gUnknown_2024284 -_08050F10: .4byte gUnknown_2021CF0 +_08050F10: .4byte gStringVar2 thumb_func_end sub_8050E24 thumb_func_start sub_8050F14 @@ -9370,7 +9370,7 @@ _08051448: .align 2, 0 _0805146C: .4byte gUnknown_202063C _08051470: - ldr r4, _080514AC @ =gUnknown_2021D18 + ldr r4, _080514AC @ =gStringVar4 ldr r1, _080514B0 @ =gUnknown_841E1E9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -9398,7 +9398,7 @@ _0805149E: movs r0, 0xB bl _0805218E .align 2, 0 -_080514AC: .4byte gUnknown_2021D18 +_080514AC: .4byte gStringVar4 _080514B0: .4byte gUnknown_841E1E9 _080514B4: .4byte gUnknown_2031DAC _080514B8: @@ -9439,7 +9439,7 @@ _080514C8: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r4, _08051524 @ =gUnknown_2021D18 + ldr r4, _08051524 @ =gStringVar4 ldr r1, _08051528 @ =gUnknown_841E200 adds r0, r4, 0 bl StringExpandPlaceholders @@ -9451,7 +9451,7 @@ _080514C8: .align 2, 0 _0805151C: .4byte gUnknown_202063C _08051520: .4byte 0x000fffff -_08051524: .4byte gUnknown_2021D18 +_08051524: .4byte gStringVar4 _08051528: .4byte gUnknown_841E200 _0805152C: ldr r5, _08051588 @ =gUnknown_202063C @@ -9881,7 +9881,7 @@ _080518C4: cmp r0, 0 bne _080518E2 movs r0, 0x28 - bl sub_80722CC + bl PlaySE ldr r0, _08051918 @ =gUnknown_2031DAC ldr r1, [r0] adds r1, 0x94 @@ -10162,7 +10162,7 @@ _08051AE4: cmp r0, 0x2 bhi _08051B2C movs r0, 0x27 - bl sub_80722CC + bl PlaySE _08051B2C: ldr r2, [r7] adds r3, r2, 0 @@ -10580,7 +10580,7 @@ _08051E62: adds r0, 0x1 strh r0, [r1] movs r0, 0x98 - bl sub_80722CC + bl PlaySE b _08052318 .align 2, 0 _08051E80: .4byte gUnknown_202063C @@ -10913,7 +10913,7 @@ _08052128: lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r4, _08052154 @ =gUnknown_2021D18 + ldr r4, _08052154 @ =gStringVar4 ldr r1, _08052158 @ =gUnknown_841E20D adds r0, r4, 0 bl StringExpandPlaceholders @@ -10929,7 +10929,7 @@ _08052128: movs r0, 0xA7 b _0805218E .align 2, 0 -_08052154: .4byte gUnknown_2021D18 +_08052154: .4byte gStringVar4 _08052158: .4byte gUnknown_841E20D _0805215C: .4byte gUnknown_2031DAC _08052160: @@ -10999,7 +10999,7 @@ _080521D0: adds r0, 0x1 movs r5, 0 strh r0, [r1] - ldr r4, _080521F8 @ =gUnknown_2021D18 + ldr r4, _080521F8 @ =gStringVar4 ldr r1, _080521FC @ =gUnknown_841E21E adds r0, r4, 0 bl StringExpandPlaceholders @@ -11012,7 +11012,7 @@ _080521D0: b _08052318 .align 2, 0 _080521F4: .4byte 0x00000103 -_080521F8: .4byte gUnknown_2021D18 +_080521F8: .4byte gStringVar4 _080521FC: .4byte gUnknown_841E21E _08052200: ldr r1, [r7] @@ -11546,7 +11546,7 @@ _08052838: .align 2, 0 _0805285C: .4byte gUnknown_202063C _08052860: - ldr r4, _0805289C @ =gUnknown_2021D18 + ldr r4, _0805289C @ =gStringVar4 ldr r1, _080528A0 @ =gUnknown_841E1E9 adds r0, r4, 0 bl StringExpandPlaceholders @@ -11574,7 +11574,7 @@ _0805288E: movs r0, 0xB bl _080535EA .align 2, 0 -_0805289C: .4byte gUnknown_2021D18 +_0805289C: .4byte gStringVar4 _080528A0: .4byte gUnknown_841E1E9 _080528A4: .4byte gUnknown_2031DAC _080528A8: @@ -11615,7 +11615,7 @@ _080528B8: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r4, _08052914 @ =gUnknown_2021D18 + ldr r4, _08052914 @ =gStringVar4 ldr r1, _08052918 @ =gUnknown_841E200 adds r0, r4, 0 bl StringExpandPlaceholders @@ -11627,7 +11627,7 @@ _080528B8: .align 2, 0 _0805290C: .4byte gUnknown_202063C _08052910: .4byte 0x000fffff -_08052914: .4byte gUnknown_2021D18 +_08052914: .4byte gStringVar4 _08052918: .4byte gUnknown_841E200 _0805291C: ldr r5, _08052978 @ =gUnknown_202063C @@ -12067,7 +12067,7 @@ _08052CD4: cmp r0, 0 bne _08052CF2 movs r0, 0x28 - bl sub_80722CC + bl PlaySE ldr r0, _08052D28 @ =gUnknown_2031DAC ldr r1, [r0] adds r1, 0x94 @@ -12354,7 +12354,7 @@ _08052F00: cmp r0, 0x2 bhi _08052F48 movs r0, 0x27 - bl sub_80722CC + bl PlaySE _08052F48: ldr r2, [r7] adds r3, r2, 0 @@ -12805,7 +12805,7 @@ _080532BE: adds r0, 0x1 strh r0, [r1] movs r0, 0x98 - bl sub_80722CC + bl PlaySE b _08053774 .align 2, 0 _080532DC: .4byte gUnknown_202063C @@ -13138,7 +13138,7 @@ _08053584: lsls r1, 5 movs r0, 0 bl SetGpuReg - ldr r4, _080535B0 @ =gUnknown_2021D18 + ldr r4, _080535B0 @ =gStringVar4 ldr r1, _080535B4 @ =gUnknown_841E20D adds r0, r4, 0 bl StringExpandPlaceholders @@ -13154,7 +13154,7 @@ _08053584: movs r0, 0xA7 b _080535EA .align 2, 0 -_080535B0: .4byte gUnknown_2021D18 +_080535B0: .4byte gStringVar4 _080535B4: .4byte gUnknown_841E20D _080535B8: .4byte gUnknown_2031DAC _080535BC: @@ -13224,7 +13224,7 @@ _0805362C: adds r0, 0x1 movs r5, 0 strh r0, [r1] - ldr r4, _08053654 @ =gUnknown_2021D18 + ldr r4, _08053654 @ =gStringVar4 ldr r1, _08053658 @ =gUnknown_841E21E adds r0, r4, 0 bl StringExpandPlaceholders @@ -13237,7 +13237,7 @@ _0805362C: b _08053774 .align 2, 0 _08053650: .4byte 0x00000103 -_08053654: .4byte gUnknown_2021D18 +_08053654: .4byte gStringVar4 _08053658: .4byte gUnknown_841E21E _0805365C: ldr r1, [r7] @@ -13615,7 +13615,7 @@ sub_8053938: @ 8053938 cmp r0, 0x16 bne _08053960 movs r0, 0x31 - bl sub_80722CC + bl PlaySE _08053960: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -13625,7 +13625,7 @@ _08053960: cmp r0, 0x2C bne _08053996 movs r0, 0x85 - bl sub_80722CC + bl PlaySE ldr r0, _080539A4 @ =sub_80539AC str r0, [r4, 0x1C] movs r0, 0 @@ -13727,7 +13727,7 @@ sub_8053A0C: @ 8053A0C movs r0, 0x16 strh r0, [r4, 0x2E] movs r0, 0x31 - bl sub_80722CC + bl PlaySE b _08053A8C _08053A3C: movs r1, 0x2E @@ -13735,21 +13735,21 @@ _08053A3C: cmp r0, 0x42 bne _08053A4A movs r0, 0x32 - bl sub_80722CC + bl PlaySE _08053A4A: movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x5C bne _08053A58 movs r0, 0x33 - bl sub_80722CC + bl PlaySE _08053A58: movs r3, 0x2E ldrsh r0, [r4, r3] cmp r0, 0x6B bne _08053A66 movs r0, 0x34 - bl sub_80722CC + bl PlaySE _08053A66: ldr r1, _08053A94 @ =gUnknown_826D1E4 movs r2, 0x2E @@ -13789,14 +13789,14 @@ sub_8053A9C: @ 8053A9C lsls r4, 2 ldr r0, _08053AD4 @ =gUnknown_826CF8C adds r4, r0 - ldr r0, _08053AD8 @ =gUnknown_2021CD0 + ldr r0, _08053AD8 @ =gStringVar1 ldrh r1, [r4, 0x38] movs r6, 0xB muls r1, r6 ldr r5, _08053ADC @ =gUnknown_8245EE0 adds r1, r5 bl StringCopy - ldr r0, _08053AE0 @ =gUnknown_2021CF0 + ldr r0, _08053AE0 @ =gStringVar2 ldrh r1, [r4, 0xC] muls r1, r6 adds r1, r5 @@ -13808,9 +13808,9 @@ sub_8053A9C: @ 8053A9C .align 2, 0 _08053AD0: .4byte gUnknown_20370C0 _08053AD4: .4byte gUnknown_826CF8C -_08053AD8: .4byte gUnknown_2021CD0 +_08053AD8: .4byte gStringVar1 _08053ADC: .4byte gUnknown_8245EE0 -_08053AE0: .4byte gUnknown_2021CF0 +_08053AE0: .4byte gStringVar2 thumb_func_end sub_8053A9C thumb_func_start sub_8053AE4 @@ -13833,10 +13833,10 @@ sub_8053AE4: @ 8053AE4 movs r1, 0x2 mov r2, sp bl GetMonData - ldr r0, _08053B3C @ =gUnknown_2021CD0 + ldr r0, _08053B3C @ =gStringVar1 mov r1, sp bl StringCopy10 - ldr r0, _08053B40 @ =gUnknown_2021CF0 + ldr r0, _08053B40 @ =gStringVar2 ldrh r2, [r4, 0xC] movs r1, 0xB muls r1, r2 @@ -13852,8 +13852,8 @@ _08053B2C: .4byte gUnknown_20370C0 _08053B30: .4byte gUnknown_826CF8C _08053B34: .4byte gUnknown_20370C2 _08053B38: .4byte gUnknown_2024284 -_08053B3C: .4byte gUnknown_2021CD0 -_08053B40: .4byte gUnknown_2021CF0 +_08053B3C: .4byte gStringVar1 +_08053B40: .4byte gStringVar2 _08053B44: .4byte gUnknown_8245EE0 thumb_func_end sub_8053AE4 @@ -14372,11 +14372,11 @@ _0805404C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r4, _08054060 @ =gUnknown_2021D18 + ldr r4, _08054060 @ =gStringVar4 ldr r1, _08054064 @ =gUnknown_841E325 b _080540EA .align 2, 0 -_08054060: .4byte gUnknown_2021D18 +_08054060: .4byte gStringVar4 _08054064: .4byte gUnknown_841E325 _08054068: bl sub_800AB9C @@ -14442,7 +14442,7 @@ _080540DC: adds r1, r2, r0 movs r0, 0x32 strb r0, [r1] - ldr r4, _080540FC @ =gUnknown_2021D18 + ldr r4, _080540FC @ =gStringVar4 ldr r1, _08054100 @ =gUnknown_8419F54 _080540EA: adds r0, r4, 0 @@ -14453,7 +14453,7 @@ _080540EA: bl sub_8054508 b _08054396 .align 2, 0 -_080540FC: .4byte gUnknown_2021D18 +_080540FC: .4byte gStringVar4 _08054100: .4byte gUnknown_8419F54 _08054104: bl InUnionRoom @@ -15073,7 +15073,7 @@ _080545F2: cmp r0, 0 bne _08054610 movs r0, 0xBC - bl sub_80722CC + bl PlaySE _08054610: movs r0, 0x2 ldrsh r2, [r4, r0] diff --git a/asm/trainer_card.s b/asm/trainer_card.s index b60bba1a5..f0647f9eb 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -241,7 +241,7 @@ _080891E8: b _08089416 _080891F4: movs r0, 0xF4 - bl sub_80722CC + bl PlaySE ldr r0, _08089204 @ =gUnknown_20397A4 ldr r1, [r0] movs r0, 0xA @@ -294,7 +294,7 @@ _0808924A: bl sub_812B1F0 bl sub_808B1D4 movs r0, 0xF2 - bl sub_80722CC + bl PlaySE ldr r0, _0808927C @ =gUnknown_20397A4 ldr r1, [r0] movs r0, 0xC @@ -346,7 +346,7 @@ _080892C4: b _08089416 _080892CE: movs r0, 0xF4 - bl sub_80722CC + bl PlaySE ldr r0, _080892E0 @ =gUnknown_20397A4 ldr r1, [r0] movs r0, 0xB @@ -394,7 +394,7 @@ _08089324: movs r0, 0xD strb r0, [r1] movs r0, 0xF2 - bl sub_80722CC + bl PlaySE b _08089416 .align 2, 0 _08089340: .4byte gUnknown_20397A4 @@ -495,7 +495,7 @@ _080893F6: movs r0, 0xA strb r0, [r1] movs r0, 0xF4 - bl sub_80722CC + bl PlaySE _08089416: add sp, 0xC pop {r4,r5} @@ -2417,7 +2417,7 @@ sub_808A3D0: @ 808A3D0 adds r1, 0x19 movs r0, 0x2 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r2, r0, 0 adds r2, 0x10 lsls r2, 24 @@ -2453,7 +2453,7 @@ sub_808A3D0: @ 808A3D0 adds r1, 0x33 movs r0, 0x2 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r2, r0, 0 adds r2, 0x10 lsls r2, 24 @@ -2574,7 +2574,7 @@ _0808A550: lsrs r2, 24 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8005ED4 + bl GetStringWidth ldr r2, _0808A5A8 @ =gUnknown_83CD93C ldr r4, [r6] ldr r3, _0808A5AC @ =0x00000457 @@ -4535,7 +4535,7 @@ _0808B50A: movs r0, 0x1 strb r0, [r1, 0x9] movs r0, 0xF3 - bl sub_80722CC + bl PlaySE movs r0, 0 pop {r4,r5} pop {r1} diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s index e43215794..3382cc7cc 100644 --- a/asm/trainer_tower.s +++ b/asm/trainer_tower.s @@ -977,7 +977,7 @@ sub_815DEFC: @ 815DEFC negs r2, r2 movs r0, 0x2 adds r1, r4, 0 - bl sub_8005ED4 + bl GetStringWidth cmp r0, 0xC4 bls _0815DF4E adds r0, r4, 0 @@ -1119,12 +1119,12 @@ _0815E000: adds r0, r1 adds r0, 0x26 _0815E026: - ldr r1, _0815E034 @ =gUnknown_2021D18 + ldr r1, _0815E034 @ =gStringVar4 bl sub_815DEFC b _0815E05C .align 2, 0 _0815E030: .4byte gUnknown_203F458 -_0815E034: .4byte gUnknown_2021D18 +_0815E034: .4byte gStringVar4 _0815E038: ldr r0, [r2] ldrb r2, [r0] @@ -1141,14 +1141,14 @@ _0815E038: adds r1, 0x4 adds r0, r1 adds r0, 0x32 - ldr r1, _0815E064 @ =gUnknown_2021D18 + ldr r1, _0815E064 @ =gStringVar4 bl sub_815DEFC _0815E05C: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815E064: .4byte gUnknown_2021D18 +_0815E064: .4byte gStringVar4 thumb_func_end sub_815DF54 thumb_func_start sub_815E068 @@ -1669,7 +1669,7 @@ _0815E45C: lsrs r0, 24 cmp r0, 0x1 bne _0815E49C - ldr r1, _0815E494 @ =gUnknown_2021CF0 + ldr r1, _0815E494 @ =gStringVar2 adds r0, r4, 0 bl sub_8099E90 mov r0, r8 @@ -1689,7 +1689,7 @@ _0815E45C: strh r5, [r0] b _0815E4A2 .align 2, 0 -_0815E494: .4byte gUnknown_2021CF0 +_0815E494: .4byte gStringVar2 _0815E498: .4byte gUnknown_20370D0 _0815E49C: ldr r1, _0815E4AC @ =gUnknown_20370D0 @@ -1979,17 +1979,17 @@ _0815E690: movs r1, 0x64 bl __divsi3 adds r4, r0, 0 - ldr r0, _0815E714 @ =gUnknown_2021CD0 + ldr r0, _0815E714 @ =gStringVar1 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0815E718 @ =gUnknown_2021CF0 + ldr r0, _0815E718 @ =gStringVar2 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0815E71C @ =gUnknown_2021D04 + ldr r0, _0815E71C @ =gStringVar3 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 @@ -2003,9 +2003,9 @@ _0815E704: .4byte 0x00003d34 _0815E708: .4byte 0x00003d38 _0815E70C: .4byte 0x00034bbe _0815E710: .4byte 0x00034bbf -_0815E714: .4byte gUnknown_2021CD0 -_0815E718: .4byte gUnknown_2021CF0 -_0815E71C: .4byte gUnknown_2021D04 +_0815E714: .4byte gStringVar1 +_0815E718: .4byte gStringVar2 +_0815E71C: .4byte gStringVar3 thumb_func_end sub_815E658 thumb_func_start sub_815E720 @@ -2077,22 +2077,22 @@ _0815E76C: movs r1, 0x64 bl __divsi3 adds r4, r0, 0 - ldr r0, _0815E870 @ =gUnknown_2021CD0 + ldr r0, _0815E870 @ =gStringVar1 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0815E874 @ =gUnknown_2021CF0 + ldr r0, _0815E874 @ =gStringVar2 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0815E878 @ =gUnknown_2021D04 + ldr r0, _0815E878 @ =gStringVar3 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0815E87C @ =gUnknown_2021D18 + ldr r0, _0815E87C @ =gStringVar4 ldr r1, _0815E880 @ =gUnknown_83FE998 bl StringExpandPlaceholders ldr r1, _0815E884 @ =gUnknown_83FE9C4 @@ -2121,7 +2121,7 @@ _0815E76C: str r1, [sp, 0x8] adds r0, r7, 0 movs r1, 0x2 - ldr r2, _0815E87C @ =gUnknown_2021D18 + ldr r2, _0815E87C @ =gStringVar4 movs r3, 0x60 bl PrintTextOnWindow movs r0, 0xA0 @@ -2155,10 +2155,10 @@ _0815E860: .4byte gUnknown_83FE982 _0815E864: .4byte gSaveBlock1Ptr _0815E868: .4byte 0x00003d34 _0815E86C: .4byte 0x00003d3c -_0815E870: .4byte gUnknown_2021CD0 -_0815E874: .4byte gUnknown_2021CF0 -_0815E878: .4byte gUnknown_2021D04 -_0815E87C: .4byte gUnknown_2021D18 +_0815E870: .4byte gStringVar1 +_0815E874: .4byte gStringVar2 +_0815E878: .4byte gStringVar3 +_0815E87C: .4byte gStringVar4 _0815E880: .4byte gUnknown_83FE998 _0815E884: .4byte gUnknown_83FE9C4 _0815E888: .4byte 0x00004001 @@ -2208,7 +2208,7 @@ sub_815E8CC: @ 815E8CC ldrb r2, [r1, 0xD] cmp r0, r2 beq _0815E8F8 - ldr r0, _0815E8F0 @ =gUnknown_2021CD0 + ldr r0, _0815E8F0 @ =gStringVar1 ldrb r1, [r1, 0x4] movs r2, 0 movs r3, 0x1 @@ -2218,7 +2218,7 @@ sub_815E8CC: @ 815E8CC b _0815E8FC .align 2, 0 _0815E8EC: .4byte gUnknown_203F458 -_0815E8F0: .4byte gUnknown_2021CD0 +_0815E8F0: .4byte gStringVar1 _0815E8F4: .4byte gUnknown_20370D0 _0815E8F8: ldr r1, _0815E904 @ =gUnknown_20370D0 @@ -2742,22 +2742,22 @@ _0815ECDC: movs r1, 0x64 bl __divsi3 adds r4, r0, 0 - ldr r0, _0815EDC4 @ =gUnknown_2021CD0 + ldr r0, _0815EDC4 @ =gStringVar1 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0815EDC8 @ =gUnknown_2021CF0 + ldr r0, _0815EDC8 @ =gStringVar2 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0815EDCC @ =gUnknown_2021D04 + ldr r0, _0815EDCC @ =gStringVar3 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0815EDD0 @ =gUnknown_2021D18 + ldr r0, _0815EDD0 @ =gStringVar4 ldr r1, _0815EDD4 @ =gUnknown_83FE998 bl StringExpandPlaceholders lsls r1, r7, 2 @@ -2780,7 +2780,7 @@ _0815ECDC: str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, _0815EDD0 @ =gUnknown_2021D18 + ldr r0, _0815EDD0 @ =gStringVar4 str r0, [sp, 0x8] mov r0, r8 movs r1, 0x2 @@ -2814,10 +2814,10 @@ _0815EDB4: .4byte gUnknown_847A22C _0815EDB8: .4byte gUnknown_83FE982 _0815EDBC: .4byte 0x00003d38 _0815EDC0: .4byte gSaveBlock1Ptr -_0815EDC4: .4byte gUnknown_2021CD0 -_0815EDC8: .4byte gUnknown_2021CF0 -_0815EDCC: .4byte gUnknown_2021D04 -_0815EDD0: .4byte gUnknown_2021D18 +_0815EDC4: .4byte gStringVar1 +_0815EDC8: .4byte gStringVar2 +_0815EDCC: .4byte gStringVar3 +_0815EDD0: .4byte gStringVar4 _0815EDD4: .4byte gUnknown_83FE998 _0815EDD8: .4byte gUnknown_83FE9C4 thumb_func_end sub_815EC8C diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index f463953c4..750563930 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -532,7 +532,7 @@ _08128848: cmp r0, 0 beq _081288CE movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl MoveMenuCursor b _081288CE @@ -1664,7 +1664,7 @@ _08129180: cmp r0, 0 bne _08129206 movs r0, 0x30 - bl sub_80722CC + bl PlaySE bl sav2_gender2_inplace_and_xFE ldr r0, _081291A0 @ =gUnknown_203B0E0 ldr r1, [r0] @@ -4791,7 +4791,7 @@ _0812A8A8: movs r0, 0 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth cmp r0, 0x28 bgt _0812A8E6 lsls r3, r6, 24 @@ -4841,7 +4841,7 @@ _0812A90C: movs r0, 0 adds r1, r6, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth cmp r0, 0x23 bgt _0812A90C mov r1, r8 diff --git a/asm/unk_8147500.s b/asm/unk_8147500.s index 7ee9c167e..19ad99da2 100644 --- a/asm/unk_8147500.s +++ b/asm/unk_8147500.s @@ -560,7 +560,7 @@ _0814791C: strb r0, [r2] _0814792A: movs r0, 0x31 - bl sub_80722CC + bl PlaySE ldrh r1, [r6, 0x32] lsls r1, 24 lsrs r1, 24 @@ -569,7 +569,7 @@ _0814792A: b _081479C8 _0814793E: movs r0, 0x15 - bl sub_80722CC + bl PlaySE ldrh r1, [r6, 0x32] lsls r1, 24 lsrs r1, 24 @@ -656,7 +656,7 @@ sub_81479D4: @ 81479D4 ldr r5, _08147A28 @ =gUnknown_3005098 adds r6, r4, r5 movs r0, 0x31 - bl sub_80722CC + bl PlaySE ldr r2, _08147A2C @ =gUnknown_202063C movs r0, 0x1A ldrsh r1, [r6, r0] diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index cd77e0c7d..c624b31f4 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -3244,7 +3244,7 @@ sub_81492D8: @ 81492D8 lsls r0, 1 adds r0, r1 ldrh r0, [r0] - bl sub_80722CC + bl PlaySE ldr r0, [r4] adds r0, 0x4D strb r5, [r0] @@ -3429,7 +3429,7 @@ _0814945C: cmp r0, 0 beq _08149470 movs r0, 0xFF - bl sub_80722CC + bl PlaySE b _0814947E .align 2, 0 _0814946C: .4byte 0x000082f6 @@ -3439,7 +3439,7 @@ _08149470: cmp r6, 0 beq _0814947E movs r0, 0xA - bl sub_80722CC + bl PlaySE _0814947E: add sp, 0x4 pop {r3-r5} @@ -6561,7 +6561,7 @@ sub_814AB98: @ 814AB98 negs r2, r2 mov r9, r2 movs r0, 0 - bl sub_8005ED4 + bl GetStringWidth movs r4, 0x40 subs r4, r0 lsrs r4, 1 @@ -7377,7 +7377,7 @@ sub_814B1CC: @ 814B1CC b _0814B234 _0814B1DE: movs r0, 0x1C - bl sub_80722CC + bl PlaySE strh r4, [r5, 0x30] ldrh r0, [r5, 0x2E] adds r0, 0x1 @@ -7993,7 +7993,7 @@ _0814B63E: movs r0, 0x2 adds r1, r5, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r3, 0xDE subs r3, r0 lsls r3, 24 diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s index d1e10916b..bb11cca7f 100644 --- a/asm/unk_814BB4C.s +++ b/asm/unk_814BB4C.s @@ -210,7 +210,7 @@ _0814BCA2: lsrs r4, r0, 24 cmp r4, 0 beq _0814BCF0 - ldr r4, _0814BCE8 @ =gUnknown_2021D18 + ldr r4, _0814BCE8 @ =gStringVar4 ldr r1, _0814BCEC @ =gUnknown_846E328 ldrb r0, [r5] lsls r0, 2 @@ -232,7 +232,7 @@ _0814BCA2: bl AddTextPrinterParametrized b _0814BD12 .align 2, 0 -_0814BCE8: .4byte gUnknown_2021D18 +_0814BCE8: .4byte gStringVar4 _0814BCEC: .4byte gUnknown_846E328 _0814BCF0: ldr r1, _0814BD1C @ =gUnknown_846E328 @@ -697,7 +697,7 @@ _0814C048: ands r0, r2 strb r0, [r1] movs r0, 0x36 - bl sub_80722CC + bl PlaySE b _0814C108 .align 2, 0 _0814C07C: .4byte sub_814DB84 @@ -756,7 +756,7 @@ _0814C0E4: cmp r0, 0 beq _0814C10E movs r0, 0x25 - bl sub_80722CC + bl PlaySE movs r0, 0xB movs r1, 0x1 movs r2, 0 @@ -826,7 +826,7 @@ _0814C144: adds r1, r4, r2 strb r0, [r1] movs r0, 0xCF - bl sub_80722CC + bl PlaySE b _0814C23C .align 2, 0 _0814C174: .4byte 0x00000139 @@ -1930,7 +1930,7 @@ _0814C9C4: movs r0, 0x8 strh r0, [r4, 0x12] movs r0, 0xCF - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 ldr r2, _0814C9E8 @ =0x000003ff @@ -2119,7 +2119,7 @@ _0814CB42: movs r0, 0x9 strh r0, [r5, 0x12] movs r0, 0x1A - bl sub_80722CC + bl PlaySE movs r0, 0x1 negs r0, r0 movs r1, 0x8 @@ -2176,7 +2176,7 @@ _0814CBBC: lsls r0, 24 cmp r0, 0 beq _0814CC02 - ldr r0, _0814CBF8 @ =gUnknown_2021CD0 + ldr r0, _0814CBF8 @ =gStringVar1 ldr r1, [r5, 0x1C] movs r2, 0 movs r3, 0x6 @@ -2198,7 +2198,7 @@ _0814CBBC: strh r4, [r5, 0x10] b _0814CC00 .align 2, 0 -_0814CBF8: .4byte gUnknown_2021CD0 +_0814CBF8: .4byte gStringVar1 _0814CBFC: ldrb r0, [r5, 0xC] adds r0, 0x1 @@ -2736,7 +2736,7 @@ _0814D00E: cmp r0, 0 beq _0814D08A movs r0, 0x5 - bl sub_80722CC + bl PlaySE adds r0, r5, 0 bl sub_814E80C b _0814D084 @@ -2752,12 +2752,12 @@ _0814D02C: strb r1, [r5, 0xC] b _0814D08A _0814D03C: - ldr r0, _0814D07C @ =gUnknown_2021CD0 + ldr r0, _0814D07C @ =gStringVar1 ldr r1, [r5, 0x1C] movs r2, 0 movs r3, 0x6 bl ConvertIntToDecimalStringN - ldr r4, _0814D080 @ =gUnknown_2021CF0 + ldr r4, _0814D080 @ =gStringVar2 bl sub_815EFA0 adds r1, r0, 0 adds r0, r4, 0 @@ -2780,8 +2780,8 @@ _0814D03C: strb r4, [r5, 0xC] b _0814D08A .align 2, 0 -_0814D07C: .4byte gUnknown_2021CD0 -_0814D080: .4byte gUnknown_2021CF0 +_0814D07C: .4byte gStringVar1 +_0814D080: .4byte gStringVar2 _0814D084: ldrb r0, [r5, 0xC] adds r0, 0x1 diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index dc4f5ab52..c4c73f3bc 100644 --- a/asm/unk_814D5C8.s +++ b/asm/unk_814D5C8.s @@ -1020,11 +1020,11 @@ _0814DE22: cmp r3, 0x1 bne _0814DE30 movs r0, 0x47 - bl sub_80722CC + bl PlaySE b _0814DE36 _0814DE30: movs r0, 0x46 - bl sub_80722CC + bl PlaySE _0814DE36: ldr r4, [sp, 0xC] ldrb r0, [r4] @@ -1193,7 +1193,7 @@ sub_814DF44: @ 814DF44 negs r2, r2 movs r0, 0x2 mov r1, r8 - bl sub_8005ED4 + bl GetStringWidth lsls r4, 2 lsrs r0, 1 subs r4, r0 @@ -1319,7 +1319,7 @@ _0814E048: adds r0, r3, r0 adds r0, r2, r0 ldrh r1, [r0] - ldr r0, _0814E0D8 @ =gUnknown_2021CD0 + ldr r0, _0814E0D8 @ =gStringVar1 movs r2, 0x1 movs r3, 0x4 bl ConvertIntToDecimalStringN @@ -1331,7 +1331,7 @@ _0814E048: adds r1, r5, 0 movs r2, 0x1 negs r2, r2 - bl sub_8005ED4 + bl GetStringWidth ldr r2, [sp, 0x14] subs r0, r2, r0 subs r0, 0x4 @@ -1366,7 +1366,7 @@ _0814E048: str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, _0814E0D8 @ =gUnknown_2021CD0 + ldr r1, _0814E0D8 @ =gStringVar1 str r1, [sp, 0x8] movs r1, 0x2 adds r3, r4, 0 @@ -1382,7 +1382,7 @@ _0814E0C8: mov r10, r4 b _0814E27E .align 2, 0 -_0814E0D8: .4byte gUnknown_2021CD0 +_0814E0D8: .4byte gStringVar1 _0814E0DC: .4byte gUnknown_846F4B8 _0814E0E0: .4byte gUnknown_846E3DC _0814E0E4: @@ -1420,7 +1420,7 @@ _0814E116: adds r4, r2, r4 ldrh r1, [r4] lsrs r1, 4 - ldr r0, _0814E1E4 @ =gUnknown_2021CD0 + ldr r0, _0814E1E4 @ =gStringVar1 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN @@ -1472,7 +1472,7 @@ _0814E178: bl __udivsi3 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0814E1F0 @ =gUnknown_2021CF0 + ldr r0, _0814E1F0 @ =gStringVar2 adds r1, r7, 0 movs r2, 0x2 movs r3, 0x2 @@ -1481,12 +1481,12 @@ _0814E178: ldr r2, [sp, 0x34] adds r0, r2, r0 ldr r1, [r0] - ldr r0, _0814E1F8 @ =gUnknown_2021D18 + ldr r0, _0814E1F8 @ =gStringVar4 bl StringExpandPlaceholders movs r0, 0x2 - ldr r1, _0814E1F8 @ =gUnknown_2021D18 + ldr r1, _0814E1F8 @ =gStringVar4 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth adds r2, r0, 0 ldr r4, [sp, 0x30] subs r2, r4, r2 @@ -1506,18 +1506,18 @@ _0814E178: str r1, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r1, _0814E1F8 @ =gUnknown_2021D18 + ldr r1, _0814E1F8 @ =gStringVar4 str r1, [sp, 0x8] movs r1, 0x2 bl box_print b _0814E27E .align 2, 0 -_0814E1E4: .4byte gUnknown_2021CD0 +_0814E1E4: .4byte gStringVar1 _0814E1E8: .4byte gUnknown_846E450 _0814E1EC: .4byte 0x000f4240 -_0814E1F0: .4byte gUnknown_2021CF0 +_0814E1F0: .4byte gStringVar2 _0814E1F4: .4byte gUnknown_846F4B8 -_0814E1F8: .4byte gUnknown_2021D18 +_0814E1F8: .4byte gStringVar4 _0814E1FC: .4byte gUnknown_846E3DC _0814E200: mov r2, r8 @@ -1539,17 +1539,17 @@ _0814E21A: lsls r1, 2 ldr r0, _0814E294 @ =gUnknown_83DF7E8 adds r1, r0 - ldr r0, _0814E298 @ =gUnknown_2021CD0 + ldr r0, _0814E298 @ =gStringVar1 bl StringCopy ldr r0, _0814E29C @ =gUnknown_846F4B8 ldr r1, [r0, 0x8] - ldr r0, _0814E2A0 @ =gUnknown_2021D18 + ldr r0, _0814E2A0 @ =gStringVar4 bl StringExpandPlaceholders movs r0, 0x2 - ldr r1, _0814E2A0 @ =gUnknown_2021D18 + ldr r1, _0814E2A0 @ =gStringVar4 movs r2, 0x1 negs r2, r2 - bl sub_8005ED4 + bl GetStringWidth adds r2, r0, 0 ldr r4, [sp, 0x14] subs r2, r4, r2 @@ -1570,7 +1570,7 @@ _0814E21A: str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, _0814E2A0 @ =gUnknown_2021D18 + ldr r1, _0814E2A0 @ =gStringVar4 str r1, [sp, 0x8] movs r1, 0x2 bl box_print @@ -1586,24 +1586,24 @@ _0814E27E: ldrb r4, [r4, 0x8] cmp r0, r4 bne _0814E2B0 - ldr r0, _0814E2A8 @ =gUnknown_2021D04 + ldr r0, _0814E2A8 @ =gStringVar3 ldr r1, _0814E2AC @ =gUnknown_841D020 bl StringCopy b _0814E2B8 .align 2, 0 _0814E294: .4byte gUnknown_83DF7E8 -_0814E298: .4byte gUnknown_2021CD0 +_0814E298: .4byte gStringVar1 _0814E29C: .4byte gUnknown_846F4B8 -_0814E2A0: .4byte gUnknown_2021D18 +_0814E2A0: .4byte gStringVar4 _0814E2A4: .4byte gUnknown_846E3DC -_0814E2A8: .4byte gUnknown_2021D04 +_0814E2A8: .4byte gStringVar3 _0814E2AC: .4byte gUnknown_841D020 _0814E2B0: - ldr r0, _0814E31C @ =gUnknown_2021D04 + ldr r0, _0814E31C @ =gStringVar3 ldr r1, _0814E320 @ =gUnknown_841D02C bl StringCopy _0814E2B8: - ldr r4, _0814E31C @ =gUnknown_2021D04 + ldr r4, _0814E31C @ =gStringVar3 strb r6, [r4] adds r1, r5, 0 adds r1, 0x98 @@ -1611,7 +1611,7 @@ _0814E2B8: adds r1, r0, r1 movs r0, 0 bl UnkTextUtil_SetPtrI - ldr r0, _0814E324 @ =gUnknown_2021D18 + ldr r0, _0814E324 @ =gStringVar4 adds r1, r4, 0 bl UnkTextUtil_StringExpandPlaceholders ldr r1, [sp, 0x2C] @@ -1628,7 +1628,7 @@ _0814E2B8: str r2, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r1, _0814E324 @ =gUnknown_2021D18 + ldr r1, _0814E324 @ =gStringVar4 str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0x4 @@ -1652,9 +1652,9 @@ _0814E30C: pop {r0} bx r0 .align 2, 0 -_0814E31C: .4byte gUnknown_2021D04 +_0814E31C: .4byte gStringVar3 _0814E320: .4byte gUnknown_841D02C -_0814E324: .4byte gUnknown_2021D18 +_0814E324: .4byte gStringVar4 _0814E328: .4byte gUnknown_846E3DC thumb_func_end sub_814DFA4 @@ -1707,7 +1707,7 @@ sub_814E32C: @ 814E32C movs r0, 0x2 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0xBE subs r0, r1, r0 lsls r0, 24 @@ -1732,11 +1732,11 @@ sub_814E32C: @ 814E32C add r0, r8 movs r4, 0 ldrsh r1, [r0, r4] - ldr r0, _0814E56C @ =gUnknown_2021CD0 + ldr r0, _0814E56C @ =gStringVar1 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r0, _0814E570 @ =gUnknown_2021CF0 + ldr r0, _0814E570 @ =gStringVar2 movs r1, 0xA0 lsls r1, 1 add r1, r8 @@ -1745,7 +1745,7 @@ sub_814E32C: @ 814E32C movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r5, _0814E574 @ =gUnknown_2021D18 + ldr r5, _0814E574 @ =gStringVar4 ldr r1, _0814E578 @ =gUnknown_841D080 adds r0, r5, 0 bl StringExpandPlaceholders @@ -1764,7 +1764,7 @@ sub_814E32C: @ 814E32C movs r0, 0x2 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth subs r1, r6, 0x3 subs r1, r0 lsls r1, 24 @@ -1789,7 +1789,7 @@ sub_814E32C: @ 814E32C add r0, r8 movs r2, 0 ldrsh r1, [r0, r2] - ldr r0, _0814E56C @ =gUnknown_2021CD0 + ldr r0, _0814E56C @ =gStringVar1 movs r2, 0x2 movs r3, 0x1 bl ConvertIntToDecimalStringN @@ -1826,7 +1826,7 @@ sub_814E32C: @ 814E32C movs r0, 0x2 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r2, 0xBE subs r0, r2, r0 lsls r0, 24 @@ -1875,13 +1875,13 @@ _0814E4EA: mov r10, r0 cmp r0, 0x7 bls _0814E4CC - ldr r0, _0814E56C @ =gUnknown_2021CD0 + ldr r0, _0814E56C @ =gStringVar1 mov r2, r12 lsrs r1, r2, 8 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _0814E570 @ =gUnknown_2021CF0 + ldr r4, _0814E570 @ =gStringVar2 ldr r1, _0814E590 @ =0x000f4240 ldr r0, [sp, 0xC] bl __udivsi3 @@ -1890,7 +1890,7 @@ _0814E4EA: movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN - ldr r4, _0814E574 @ =gUnknown_2021D18 + ldr r4, _0814E574 @ =gStringVar4 ldr r1, _0814E594 @ =gUnknown_841D090 adds r0, r4, 0 bl StringExpandPlaceholders @@ -1925,9 +1925,9 @@ _0814E4EA: _0814E560: .4byte gUnknown_846E3DC _0814E564: .4byte gUnknown_841D050 _0814E568: .4byte gUnknown_841D088 -_0814E56C: .4byte gUnknown_2021CD0 -_0814E570: .4byte gUnknown_2021CF0 -_0814E574: .4byte gUnknown_2021D18 +_0814E56C: .4byte gStringVar1 +_0814E570: .4byte gStringVar2 +_0814E574: .4byte gStringVar4 _0814E578: .4byte gUnknown_841D080 _0814E57C: .4byte gUnknown_841D078 _0814E580: .4byte gUnknown_841D074 @@ -1971,20 +1971,20 @@ _0814E5B6: movs r2, 0x2 adds r3, r7, 0 bl box_print - ldr r0, _0814E638 @ =gUnknown_2021CD0 + ldr r0, _0814E638 @ =gStringVar1 ldr r4, [sp, 0x10] ldrh r1, [r4, 0x8] movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN - ldr r4, _0814E63C @ =gUnknown_2021D18 + ldr r4, _0814E63C @ =gStringVar4 ldr r1, _0814E640 @ =gUnknown_841D0A4 adds r0, r4, 0 bl StringExpandPlaceholders movs r0, 0x2 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0xBE subs r1, r0 lsls r1, 24 @@ -2010,8 +2010,8 @@ _0814E5B6: .align 2, 0 _0814E630: .4byte gUnknown_846E3DC _0814E634: .4byte gUnknown_841D068 -_0814E638: .4byte gUnknown_2021CD0 -_0814E63C: .4byte gUnknown_2021D18 +_0814E638: .4byte gStringVar1 +_0814E63C: .4byte gStringVar4 _0814E640: .4byte gUnknown_841D0A4 thumb_func_end sub_814E32C @@ -2327,7 +2327,7 @@ _0814E8B0: movs r0, 0x2 adds r1, r5, 0 mov r2, r8 - bl sub_8005ED4 + bl GetStringWidth lsrs r0, 1 movs r4, 0x60 subs r0, r4, r0 @@ -2346,7 +2346,7 @@ _0814E8B0: movs r0, 0x2 adds r1, r5, 0 mov r2, r8 - bl sub_8005ED4 + bl GetStringWidth lsrs r0, 1 subs r4, r0 lsls r4, 24 @@ -2361,12 +2361,12 @@ _0814E8B0: bl box_print movs r0, 0x2A str r0, [sp, 0xC] - ldr r1, _0814EA08 @ =gUnknown_2021D18 + ldr r1, _0814EA08 @ =gStringVar4 mov r8, r1 _0814E90E: mov r1, r9 adds r1, 0x2 - ldr r0, _0814EA0C @ =gUnknown_2021CD0 + ldr r0, _0814EA0C @ =gStringVar1 movs r2, 0 movs r3, 0x1 bl ConvertIntToDecimalStringN @@ -2419,7 +2419,7 @@ _0814E96E: adds r0, r4, r7 ldrh r1, [r0, 0x4] lsrs r1, 8 - ldr r0, _0814EA0C @ =gUnknown_2021CD0 + ldr r0, _0814EA0C @ =gStringVar1 movs r2, 0x1 movs r3, 0x3 bl ConvertIntToDecimalStringN @@ -2427,7 +2427,7 @@ _0814E96E: ldr r1, _0814EA1C @ =0x000f4240 bl __udivsi3 adds r1, r0, 0 - ldr r0, _0814EA20 @ =gUnknown_2021CF0 + ldr r0, _0814EA20 @ =gStringVar2 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalStringN @@ -2442,7 +2442,7 @@ _0814E96E: movs r0, 0x3 mov r1, r8 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0xC0 subs r1, r0 lsls r1, 24 @@ -2477,13 +2477,13 @@ _0814E96E: _0814E9FC: .4byte gUnknown_841D118 _0814EA00: .4byte gUnknown_846E3E5 _0814EA04: .4byte gUnknown_841D124 -_0814EA08: .4byte gUnknown_2021D18 -_0814EA0C: .4byte gUnknown_2021CD0 +_0814EA08: .4byte gStringVar4 +_0814EA0C: .4byte gStringVar1 _0814EA10: .4byte gUnknown_841D13C _0814EA14: .4byte gUnknown_846E3DC _0814EA18: .4byte gUnknown_846E450 _0814EA1C: .4byte 0x000f4240 -_0814EA20: .4byte gUnknown_2021CF0 +_0814EA20: .4byte gStringVar2 _0814EA24: .4byte gUnknown_841D090 _0814EA28: .4byte gUnknown_841D098 _0814EA2C: @@ -2706,7 +2706,7 @@ _0814EBC6: movs r0, 0x2 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth lsrs r0, 1 movs r2, 0x24 subs r2, r0 @@ -2735,7 +2735,7 @@ _0814EC18: movs r0, 0x2 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth lsrs r0, 1 movs r2, 0x24 subs r2, r0 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index a46ac1ef6..c8a5c5373 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -2795,7 +2795,7 @@ _08151DD8: movs r0, 0x19 bl m4aSongNumStop movs r0, 0x19 - bl sub_80722CC + bl PlaySE ldr r0, [r6] movs r2, 0xA2 lsls r2, 1 @@ -2820,7 +2820,7 @@ _08151E08: cmp r0, 0 bne _08151E3A movs r0, 0x16 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl sub_8153BC0 ldr r0, [r6] @@ -2932,7 +2932,7 @@ _08151EEC: movs r0, 0x19 bl m4aSongNumStop movs r0, 0x19 - bl sub_80722CC + bl PlaySE ldr r0, [r6] movs r3, 0xA2 lsls r3, 1 @@ -2957,7 +2957,7 @@ _08151F1C: cmp r0, 0 bne _08151F4E movs r0, 0x16 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl sub_8153BC0 ldr r0, [r6] @@ -2997,7 +2997,7 @@ _08151F56: adds r0, r1, r4 ldrb r0, [r0] adds r0, 0x43 - bl sub_80722CC + bl PlaySE ldr r0, [r5] movs r1, 0xA4 lsls r1, 1 @@ -3855,7 +3855,7 @@ _081525B2: adds r0, r5 ldrb r0, [r0] adds r0, 0x43 - bl sub_80722CC + bl PlaySE _081525FC: mov r0, r8 ldr r1, [r0] @@ -5661,7 +5661,7 @@ _0815332E: movs r1, 0x6 strb r1, [r0] movs r0, 0xCD - bl sub_80722CC + bl PlaySE b _08153364 .align 2, 0 _08153348: .4byte 0x000031cc @@ -6517,7 +6517,7 @@ _08153946: mov r1, r8 movs r2, 0x1 negs r2, r2 - bl sub_8005ED4 + bl GetStringWidth adds r5, r0, 0 ldr r1, _081539DC @ =gUnknown_84755E8 adds r6, r4, 0x1 @@ -6966,7 +6966,7 @@ _08153CC0: cmp r4, 0 beq _08153CE4 movs r0, 0xCD - bl sub_80722CC + bl PlaySE _08153CE4: movs r1, 0x30 ldrsh r0, [r5, r1] @@ -7329,7 +7329,7 @@ _08153F64: strh r1, [r0] movs r0, 0x1E str r3, [sp] - bl sub_80722CC + bl PlaySE ldr r3, [sp] _08153F8A: mov r7, r9 @@ -8946,7 +8946,7 @@ _08154BD0: movs r0, 0 movs r2, 0x1 negs r2, r2 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0x38 subs r1, r0 lsrs r1, 1 @@ -9239,7 +9239,7 @@ _08154E48: movs r0, 0 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r1, 0xD8 subs r1, r0 str r1, [sp, 0x64] @@ -9328,7 +9328,7 @@ _08154EC8: movs r0, 0 add r1, sp, 0xC adds r2, r4, 0 - bl sub_8005ED4 + bl GetStringWidth ldr r1, _08154F70 @ =gUnknown_203F440 ldr r0, [r1] add r0, r10 @@ -9494,7 +9494,7 @@ _08155060: negs r2, r2 movs r0, 0 mov r1, r8 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 movs r0, 0xE0 subs r0, r1 @@ -9597,7 +9597,7 @@ _0815512E: add r1, sp, 0xC movs r2, 0x1 negs r2, r2 - bl sub_8005ED4 + bl GetStringWidth adds r5, r0, 0 cmp r6, r4 bne _081551D0 @@ -9751,7 +9751,7 @@ _081552BE: movs r0, 0 strh r0, [r2] movs r0, 0x5 - bl sub_80722CC + bl PlaySE movs r0, 0x1 bl sub_8154324 b _08155658 @@ -9778,7 +9778,7 @@ _081552DC: negs r2, r2 movs r0, 0 adds r1, r6, 0 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 movs r0, 0xE0 subs r0, r1 @@ -9881,7 +9881,7 @@ _081553E6: movs r0, 0 strh r0, [r2] movs r0, 0x5 - bl sub_80722CC + bl PlaySE bl sub_81534AC ldr r1, _08155414 @ =0x00000bb7 cmp r0, r1 @@ -9962,7 +9962,7 @@ _08155480: negs r2, r2 movs r0, 0 adds r1, r5, 0 - bl sub_8005ED4 + bl GetStringWidth adds r1, r0, 0 movs r0, 0xE0 subs r0, r1 @@ -10139,7 +10139,7 @@ _0815562C: movs r0, 0 strh r0, [r2] movs r0, 0x5 - bl sub_80722CC + bl PlaySE _08155658: ldr r1, [r4] _0815565A: @@ -10491,7 +10491,7 @@ _08155922: cmp r0, 0 beq _08155984 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, [r4] ldr r2, _0815597C @ =0x00003020 adds r1, r0, r2 @@ -10516,7 +10516,7 @@ _08155984: cmp r0, 0 beq _081559BC movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, [r4] ldr r2, _081559A8 @ =0x00003020 adds r1, r0, r2 @@ -10547,7 +10547,7 @@ _081559BC: cmp r0, 0 beq _08155A58 movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r0, [r4] ldr r3, _081559E4 @ =0x00003020 adds r0, r3 diff --git a/asm/unk_815EDDC.s b/asm/unk_815EDDC.s index f12d6cc9d..1f56f8820 100644 --- a/asm/unk_815EDDC.s +++ b/asm/unk_815EDDC.s @@ -290,7 +290,7 @@ sub_815EFBC: @ 815EFBC lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _0815F010 @ =gUnknown_2021CD0 + ldr r0, _0815F010 @ =gStringVar1 mov r9, r0 movs r2, 0x1 movs r3, 0x5 @@ -312,7 +312,7 @@ sub_815EFBC: @ 815EFBC pop {r0} bx r0 .align 2, 0 -_0815F010: .4byte gUnknown_2021CD0 +_0815F010: .4byte gStringVar1 thumb_func_end sub_815EFBC thumb_func_start sub_815F014 diff --git a/asm/unk_815F138.s b/asm/unk_815F138.s index a89378d02..677da0341 100644 --- a/asm/unk_815F138.s +++ b/asm/unk_815F138.s @@ -240,7 +240,7 @@ _0815F30A: cmp r0, 0 bne _0815F318 movs r0, 0x32 - bl sub_80722CC + bl PlaySE _0815F318: ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -477,7 +477,7 @@ _0815F4B4: cmp r0, 0 blt _0815F55A movs r0, 0x32 - bl sub_80722CC + bl PlaySE movs r0, 0 strh r0, [r5, 0x26] ldrh r0, [r4] @@ -493,7 +493,7 @@ _0815F4DC: cmp r0, 0x7F ble _0815F4FA movs r0, 0x32 - bl sub_80722CC + bl PlaySE movs r0, 0 strh r0, [r4, 0x2] ldrh r0, [r4] @@ -520,7 +520,7 @@ _0815F510: cmp r0, 0x7F ble _0815F52E movs r0, 0x32 - bl sub_80722CC + bl PlaySE movs r0, 0 strh r0, [r4, 0x2] ldrh r0, [r4] diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s index 19ca8031c..425062c28 100644 --- a/asm/vs_seeker.s +++ b/asm/vs_seeker.s @@ -142,7 +142,7 @@ sub_810C760: @ 810C760 cmp r0, 0 bne _0810C794 movs r0, 0x5E - bl sub_80722CC + bl PlaySE movs r0, 0xB strh r0, [r4, 0x2] ldrh r0, [r4, 0x4] @@ -609,7 +609,7 @@ _0810CB2C: cmp r0, 0 beq _0810CB70 movs r0, 0x15 - bl sub_80722CC + bl PlaySE ldr r0, _0810CB6C @ =0x00000801 bl FlagSet bl sub_810C640 diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s index 299555201..d5f6ef747 100644 --- a/asm/wireless_communication_status_screen.s +++ b/asm/wireless_communication_status_screen.s @@ -250,7 +250,7 @@ sub_814F3A8: @ 814F3A8 movs r0, 0x3 adds r1, r4, 0 movs r2, 0 - bl sub_8005ED4 + bl GetStringWidth movs r3, 0xC0 subs r3, r0 lsrs r3, 1 @@ -422,7 +422,7 @@ _0814F514: movs r1, 0 bl FillWindowPixelBuffer movs r4, 0 - ldr r6, _0814F574 @ =gUnknown_2021D18 + ldr r6, _0814F574 @ =gStringVar4 movs r7, 0xA0 lsls r7, 20 _0814F542: @@ -449,7 +449,7 @@ _0814F542: b _0814F58A .align 2, 0 _0814F570: .4byte gUnknown_3002040 -_0814F574: .4byte gUnknown_2021D18 +_0814F574: .4byte gStringVar4 _0814F578: movs r0, 0x64 str r0, [sp] @@ -484,7 +484,7 @@ _0814F5A4: beq _0814F5E2 _0814F5B8: movs r0, 0x5 - bl sub_80722CC + bl PlaySE ldr r2, _0814F5FC @ =gUnknown_3005090 ldr r0, _0814F600 @ =gUnknown_3002040 ldr r0, [r0] |