ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-29 01:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finish renaming strings in strings.s

Browse Source
This commit is contained in:
Diegoisawesome 2017-09-20 14:38:05 -05:00
parent 4ec2fe8f37
commit 9ed9f7de94
64 changed files with 1600 additions and 1528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
asm/battle_frontier_2.s
View File

@ -2398,7 +2398,7 @@ sub_819B9B4: @ 819B9B4
movs r0, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EEBB2
ldr r2, =gText_RentalPkmn2
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -2481,20 +2481,20 @@ sub_819BA64: @ 819BA64
ldrb r0, [r0, 0x5]
cmp r0, 0x1
bne _0819BA88
ldr r2, =gUnknown_085EEBC1
ldr r2, =gText_SelectFirstPkmn
b _0819BA9C
.pool
_0819BA88:
cmp r0, 0x2
bne _0819BA94
ldr r2, =gUnknown_085EEBDB
ldr r2, =gText_SelectSecondPkmn
b _0819BA9C
.pool
_0819BA94:
ldr r2, =gUnknown_085EEC2D
ldr r2, =gText_TheseThreePkmnOkay
cmp r0, 0x3
bne _0819BA9C
ldr r2, =gUnknown_085EEBF6
ldr r2, =gText_SelectThirdPkmn
_0819BA9C:
movs r0, 0x5
str r0, [sp]
@ -2521,7 +2521,7 @@ sub_819BAC8: @ 819BAC8
movs r0, 0x2
movs r1, 0
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EEC50
ldr r2, =gText_CantSelectSamePkmn
movs r0, 0x5
str r0, [sp]
movs r0, 0
@ -2560,7 +2560,7 @@ sub_819BAFC: @ 819BAFC
str r4, [sp]
movs r6, 0
str r6, [sp, 0x4]
ldr r0, =gUnknown_085EEC15
ldr r0, =gText_Summary
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -2571,7 +2571,7 @@ sub_819BAFC: @ 819BAFC
beq _0819BB60
str r4, [sp]
str r6, [sp, 0x4]
ldr r0, =gUnknown_085EEC24
ldr r0, =gText_Deselect
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -2583,7 +2583,7 @@ sub_819BAFC: @ 819BAFC
_0819BB60:
str r4, [sp]
str r5, [sp, 0x4]
ldr r0, =gUnknown_085EEC10
ldr r0, =gText_Rent
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -2595,7 +2595,7 @@ _0819BB74:
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085EEC1D
ldr r0, =gText_Others2
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -2625,7 +2625,7 @@ sub_819BBA8: @ 819BBA8
str r5, [sp]
movs r4, 0
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EEC49
ldr r0, =gText_Yes2
str r0, [sp, 0x8]
movs r0, 0x4
movs r1, 0x1
@ -2634,7 +2634,7 @@ sub_819BBA8: @ 819BBA8
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EEC4D
ldr r0, =gText_No2
str r0, [sp, 0x8]
movs r0, 0x4
movs r1, 0x1
@ -4584,7 +4584,7 @@ sub_819CC24: @ 819CC24
ldrsh r5, [r4, r0]
cmp r5, 0
bne _0819CC5A
ldr r0, =gUnknown_085EECBB
ldr r0, =gText_QuitSwapping
bl sub_819EBEC
ldr r0, =gUnknown_03001284
ldr r0, [r0]
@ -4670,7 +4670,7 @@ sub_819CCD4: @ 819CCD4
adds r1, 0x30
movs r2, 0x1
bl sub_819F2B4
ldr r0, =gUnknown_085EECF0
ldr r0, =gText_AcceptThisPkmn
bl sub_819EBEC
ldr r0, [r4]
adds r0, 0x20
@ -6176,12 +6176,12 @@ _0819D948:
ldrb r0, [r0, 0x14]
cmp r0, 0
bne _0819D964
ldr r0, =gUnknown_085EEC73
ldr r0, =gText_SelectPkmnToSwap
bl sub_819EBEC
b _0819D96A
.pool
_0819D964:
ldr r0, =gUnknown_085EEC8B
ldr r0, =gText_SelectPkmnToAccept
bl sub_819EBEC
_0819D96A:
ldr r0, =gUnknown_03001284
@ -6765,7 +6765,7 @@ _0819DF02:
b _0819E006
.pool
_0819DF10:
ldr r0, =gUnknown_085EEC73
ldr r0, =gText_SelectPkmnToSwap
bl sub_819EBEC
movs r0, 0x2
bl PutWindowTilemap
@ -8272,7 +8272,7 @@ sub_819EB18: @ 819EB18
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EEC66
ldr r2, =gText_PkmnSwap
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -8402,7 +8402,7 @@ sub_819EC20: @ 819EC20
str r5, [sp]
movs r4, 0
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EECAA
ldr r0, =gText_Summary2
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -8411,7 +8411,7 @@ sub_819EC20: @ 819EC20
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EECA5
ldr r0, =gText_Swap
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -8420,7 +8420,7 @@ sub_819EC20: @ 819EC20
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EECB2
ldr r0, =gText_Rechoose
str r0, [sp, 0x8]
movs r0, 0x3
movs r1, 0x1
@ -8450,7 +8450,7 @@ sub_819EC94: @ 819EC94
str r5, [sp]
movs r4, 0
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EECCA
ldr r0, =gText_Yes3
str r0, [sp, 0x8]
movs r0, 0x4
movs r1, 0x1
@ -8459,7 +8459,7 @@ sub_819EC94: @ 819EC94
bl box_print
str r5, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EECCE
ldr r0, =gText_No3
str r0, [sp, 0x8]
movs r0, 0x4
movs r1, 0x1
@ -8523,12 +8523,12 @@ sub_819ED34: @ 819ED34
beq _0819ED56
cmp r0, 0x1
bne _0819ED60
ldr r0, =gUnknown_085EECD1
ldr r0, =gText_PkmnForSwap
movs r1, 0
movs r2, 0x5
bl sub_819ECF0
_0819ED56:
ldr r0, =gUnknown_085EECDD
ldr r0, =gText_Cancel3
movs r1, 0x18
movs r2, 0x5
bl sub_819ECF0
@ -8554,12 +8554,12 @@ sub_819ED78: @ 819ED78
beq _0819ED9A
cmp r0, 0x1
bne _0819EDA4
ldr r0, =gUnknown_085EECD1
ldr r0, =gText_PkmnForSwap
movs r1, 0x8
movs r2, 0x3
bl sub_819ECF0
_0819ED9A:
ldr r0, =gUnknown_085EECDD
ldr r0, =gText_Cancel3
movs r1, 0x20
movs r2, 0x3
bl sub_819ECF0
@ -8588,14 +8588,14 @@ _0819EDCC:
ldrb r0, [r0, 0x14]
cmp r0, 0x1
bne _0819EDF6
ldr r0, =gUnknown_085EECD1
ldr r0, =gText_PkmnForSwap
movs r1, 0x8
movs r2, 0x3
bl sub_819ECF0
b _0819EDF6
.pool
_0819EDEC:
ldr r0, =gUnknown_085EECDD
ldr r0, =gText_Cancel3
movs r1, 0x20
movs r2, 0x3
bl sub_819ECF0
@ -9401,7 +9401,7 @@ _0819F4C8:
.4byte _0819F548
.4byte _0819F568
_0819F4DC:
ldr r0, =gUnknown_085EED0A
ldr r0, =gText_SamePkmnInPartyAlready
bl sub_819EBEC
ldr r0, =gUnknown_03001284
ldr r0, [r0]
@ -9446,7 +9446,7 @@ _0819F52C:
bl CopyWindowToVram
b _0819F54E
_0819F548:
ldr r0, =gUnknown_085EEC8B
ldr r0, =gText_SelectPkmnToAccept
bl sub_819EBEC
_0819F54E:
ldr r0, =gTasks
@ -11469,9 +11469,9 @@ _081A0528:
movs r0, 0x12
mov r10, r0
movs r6, 0x8
ldr r0, =gUnknown_085EAEB1
ldr r0, =gText_Lv50
str r0, [sp, 0xC]
ldr r0, =gUnknown_085EAEB8
ldr r0, =gText_OpenLevel
str r0, [sp, 0x10]
b _081A0652
.pool
@ -11580,9 +11580,9 @@ _081A061C:
movs r0, 0x12
mov r10, r0
movs r6, 0x8
ldr r0, =gUnknown_085ED193
ldr r0, =gText_Give
str r0, [sp, 0xC]
ldr r0, =gUnknown_085ED198
ldr r0, =gText_NoNeed
str r0, [sp, 0x10]
b _081A0652
.pool
@ -11590,9 +11590,9 @@ _081A0634:
movs r1, 0x14
mov r10, r1
movs r6, 0x8
ldr r0, =gUnknown_085EAE62
ldr r0, =gText_Yes
str r0, [sp, 0xC]
ldr r0, =gUnknown_085EAE66
ldr r0, =gText_No
str r0, [sp, 0x10]
b _081A0652
.pool
@ -12950,11 +12950,11 @@ _081A1140:
ands r0, r1
cmp r0, 0x1
bne _081A115C
ldr r1, =gUnknown_085EAEB1
ldr r1, =gText_Lv50
b _081A1174
.pool
_081A115C:
ldr r1, =gUnknown_085EAEB8
ldr r1, =gText_OpenLevel
b _081A1174
.pool
_081A1164:
@ -14386,7 +14386,7 @@ _081A1D24:
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE302
ldr r1, =gText_WinStreak
adds r0, r4, 0
bl StringExpandPlaceholders
mov r1, r10
@ -14434,7 +14434,7 @@ sub_81A1D78: @ 81A1D78
adds r4, r0
adds r4, r1
ldrh r1, [r4]
ldr r0, =gUnknown_085EE319
ldr r0, =gText_Record
str r5, [sp]
bl sub_81A1CD8
add sp, 0x4
@ -14545,7 +14545,7 @@ _081A1E66:
lsrs r0, 24
cmp r0, 0x1
bne _081A1E88
ldr r0, =gUnknown_085EE311
ldr r0, =gText_Current
str r7, [sp]
adds r1, r4, 0
mov r2, r8
@ -14554,7 +14554,7 @@ _081A1E66:
b _081A1E96
.pool
_081A1E88:
ldr r0, =gUnknown_085EE320
ldr r0, =gText_Prev
str r7, [sp]
adds r1, r4, 0
mov r2, r8
@ -14593,7 +14593,7 @@ sub_81A1EA8: @ 81A1EA8
cmp r7, 0
bne _081A1EF0
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE158
ldr r1, =gText_SingleBattleRoomResults
bl StringExpandPlaceholders
b _081A1F28
.pool
@ -14601,7 +14601,7 @@ _081A1EF0:
cmp r7, 0x1
bne _081A1F08
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE178
ldr r1, =gText_DoubleBattleRoomResults
bl StringExpandPlaceholders
b _081A1F28
.pool
@ -14609,13 +14609,13 @@ _081A1F08:
cmp r7, 0x2
bne _081A1F20
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE198
ldr r1, =gText_MultiBattleRoomResults
bl StringExpandPlaceholders
b _081A1F28
.pool
_081A1F20:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE1B7
ldr r1, =gText_LinkMultiBattleRoomResults
bl StringExpandPlaceholders
_081A1F28:
ldr r0, =gStringVar4
@ -14623,7 +14623,7 @@ _081A1F28:
bl sub_81A1C4C
ldr r6, =gUnknown_0203AB74
ldrb r0, [r6]
ldr r2, =gUnknown_085EE2F2
ldr r2, =gText_Lv502
movs r1, 0x31
mov r8, r1
str r1, [sp]
@ -14635,7 +14635,7 @@ _081A1F28:
movs r3, 0x10
bl PrintTextOnWindow
ldrb r0, [r6]
ldr r2, =gUnknown_085EE2F9
ldr r2, =gText_OpenLv
movs r1, 0x61
mov r9, r1
str r1, [sp]
@ -14830,8 +14830,8 @@ _081A20E6:
lsrs r0, 24
cmp r0, 0x1
bne _081A210C
ldr r0, =gUnknown_085EE311
ldr r1, =gUnknown_085EE338
ldr r0, =gText_Current
ldr r1, =gText_ClearStreak
str r7, [sp]
str r4, [sp, 0x4]
mov r2, r8
@ -14840,8 +14840,8 @@ _081A20E6:
b _081A211C
.pool
_081A210C:
ldr r0, =gUnknown_085EE320
ldr r1, =gUnknown_085EE338
ldr r0, =gText_Prev
ldr r1, =gText_ClearStreak
str r7, [sp]
str r4, [sp, 0x4]
mov r2, r8
@ -14881,13 +14881,13 @@ sub_81A2134: @ 81A2134
cmp r7, 0
bne _081A217C
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE1DB
ldr r1, =gText_SingleBattleTourneyResults
bl StringExpandPlaceholders
b _081A2184
.pool
_081A217C:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE1FE
ldr r1, =gText_DoubleBattleTourneyResults
bl StringExpandPlaceholders
_081A2184:
ldr r0, =gStringVar4
@ -14895,7 +14895,7 @@ _081A2184:
bl sub_81A1C4C
ldr r1, =gUnknown_0203AB74
ldrb r0, [r1]
ldr r2, =gUnknown_085EE2F2
ldr r2, =gText_Lv502
movs r6, 0x21
str r6, [sp]
movs r5, 0xFF
@ -14907,7 +14907,7 @@ _081A2184:
bl PrintTextOnWindow
ldr r1, =gUnknown_0203AB74
ldrb r0, [r1]
ldr r2, =gUnknown_085EE2F9
ldr r2, =gText_OpenLv
movs r1, 0x61
str r1, [sp]
str r5, [sp, 0x4]
@ -14935,13 +14935,13 @@ _081A2184:
str r0, [sp]
movs r0, 0x31
str r0, [sp, 0x4]
ldr r0, =gUnknown_085EE319
ldr r1, =gUnknown_085EE338
ldr r0, =gText_Record
ldr r1, =gText_ClearStreak
movs r3, 0x40
bl sub_81A2008
ldr r1, =gUnknown_085EE332
ldr r1, =gText_Total
mov r10, r1
ldr r0, =gUnknown_085EE349
ldr r0, =gText_Championships
mov r8, r0
ldr r0, [r4]
ldr r1, =0x00000d1c
@ -14972,8 +14972,8 @@ _081A2184:
str r0, [sp]
movs r0, 0x71
str r0, [sp, 0x4]
ldr r0, =gUnknown_085EE319
ldr r1, =gUnknown_085EE338
ldr r0, =gText_Record
ldr r1, =gText_ClearStreak
movs r3, 0x40
bl sub_81A2008
ldr r0, [r4]
@ -15052,7 +15052,7 @@ _081A2304:
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE302
ldr r1, =gText_WinStreak
adds r0, r4, 0
bl StringExpandPlaceholders
mov r1, r10
@ -15100,7 +15100,7 @@ sub_81A2358: @ 81A2358
adds r4, r0
adds r4, r1
ldrh r1, [r4]
ldr r0, =gUnknown_085EE319
ldr r0, =gText_Record
str r5, [sp]
bl sub_81A22B8
add sp, 0x4
@ -15186,7 +15186,7 @@ _081A241E:
lsrs r0, 24
cmp r0, 0x1
bne _081A2440
ldr r0, =gUnknown_085EE311
ldr r0, =gText_Current
str r7, [sp]
adds r1, r4, 0
mov r2, r8
@ -15195,7 +15195,7 @@ _081A241E:
b _081A244E
.pool
_081A2440:
ldr r0, =gUnknown_085EE320
ldr r0, =gText_Prev
str r7, [sp]
adds r1, r4, 0
mov r2, r8
@ -15234,13 +15234,13 @@ sub_81A2460: @ 81A2460
cmp r7, 0
bne _081A24A8
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE221
ldr r1, =gText_SingleBattleHallResults
bl StringExpandPlaceholders
b _081A24B0
.pool
_081A24A8:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE241
ldr r1, =gText_DoubleBattleHallResults
bl StringExpandPlaceholders
_081A24B0:
ldr r0, =gStringVar4
@ -15248,7 +15248,7 @@ _081A24B0:
bl sub_81A1C4C
ldr r6, =gUnknown_0203AB74
ldrb r0, [r6]
ldr r2, =gUnknown_085EE2F2
ldr r2, =gText_Lv502
movs r1, 0x31
mov r8, r1
str r1, [sp]
@ -15260,7 +15260,7 @@ _081A24B0:
movs r3, 0x10
bl PrintTextOnWindow
ldrb r0, [r6]
ldr r2, =gUnknown_085EE2F9
ldr r2, =gText_OpenLv
movs r1, 0x61
mov r9, r1
str r1, [sp]
@ -15434,8 +15434,8 @@ _081A264C:
lsrs r0, 24
cmp r0, 0x1
bne _081A2674
ldr r0, =gUnknown_085EE311
ldr r1, =gUnknown_085EE35B
ldr r0, =gText_Current
ldr r1, =gText_RoomsCleared
str r5, [sp]
str r6, [sp, 0x4]
adds r2, r7, 0
@ -15444,8 +15444,8 @@ _081A264C:
b _081A2684
.pool
_081A2674:
ldr r0, =gUnknown_085EE320
ldr r1, =gUnknown_085EE35B
ldr r0, =gText_Prev
ldr r1, =gText_RoomsCleared
str r5, [sp]
str r6, [sp, 0x4]
adds r2, r7, 0
@ -15480,14 +15480,14 @@ sub_81A2698: @ 81A2698
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE261
ldr r1, =gText_BattleChoiceResults
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0
bl sub_81A1C4C
ldrb r0, [r6]
ldr r2, =gUnknown_085EE2F2
ldr r2, =gText_Lv502
movs r1, 0x21
str r1, [sp]
movs r5, 0xFF
@ -15498,7 +15498,7 @@ sub_81A2698: @ 81A2698
movs r3, 0x8
bl PrintTextOnWindow
ldrb r0, [r6]
ldr r2, =gUnknown_085EE2F9
ldr r2, =gText_OpenLv
movs r1, 0x61
str r1, [sp]
str r5, [sp, 0x4]
@ -15513,9 +15513,9 @@ sub_81A2698: @ 81A2698
movs r2, 0x72
movs r3, 0x21
bl sub_81A2618
ldr r0, =gUnknown_085EE319
ldr r0, =gText_Record
mov r10, r0
ldr r7, =gUnknown_085EE35B
ldr r7, =gText_RoomsCleared
ldr r5, =gSaveBlock2Ptr
ldr r0, [r5]
ldr r1, =0x00000e08
@ -15529,9 +15529,9 @@ sub_81A2698: @ 81A2698
adds r1, r7, 0
movs r3, 0x40
bl sub_81A258C
ldr r0, =gUnknown_085EE332
ldr r0, =gText_Total
mov r8, r0
ldr r1, =gUnknown_085EE36D
ldr r1, =gText_TimesCleared
mov r9, r1
ldr r0, [r5]
ldr r1, =0x00000e0c
@ -15633,7 +15633,7 @@ _081A2834:
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE381
ldr r1, =gText_KOsInARow
adds r0, r4, 0
bl StringExpandPlaceholders
mov r1, r10
@ -15678,7 +15678,7 @@ sub_81A2888: @ 81A2888
adds r1, r2
adds r1, r0
ldrh r1, [r1]
ldr r0, =gUnknown_085EE319
ldr r0, =gText_Record
str r3, [sp]
adds r2, r4, 0
adds r3, r5, 0
@ -15743,7 +15743,7 @@ _081A2928:
lsrs r0, 24
cmp r0, 0x1
bne _081A2948
ldr r0, =gUnknown_085EE311
ldr r0, =gText_Current
str r6, [sp]
adds r1, r5, 0
adds r2, r7, 0
@ -15752,7 +15752,7 @@ _081A2928:
b _081A2956
.pool
_081A2948:
ldr r0, =gUnknown_085EE320
ldr r0, =gText_Prev
str r6, [sp]
adds r1, r5, 0
adds r2, r7, 0
@ -15785,14 +15785,14 @@ sub_81A2968: @ 81A2968
movs r0, 0xA
bl sub_81A1C90
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE27C
ldr r1, =gText_SetKOTourneyResults
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0x2
bl sub_81A1C4C
ldrb r0, [r5]
ldr r2, =gUnknown_085EE2F2
ldr r2, =gText_Lv502
movs r1, 0x31
str r1, [sp]
movs r6, 0xFF
@ -15803,7 +15803,7 @@ sub_81A2968: @ 81A2968
movs r3, 0x10
bl PrintTextOnWindow
ldrb r0, [r5]
ldr r2, =gUnknown_085EE2F9
ldr r2, =gText_OpenLv
movs r1, 0x61
str r1, [sp]
str r6, [sp, 0x4]
@ -15896,7 +15896,7 @@ _081A2A80:
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE302
ldr r1, =gText_WinStreak
adds r0, r4, 0
bl StringExpandPlaceholders
mov r1, r10
@ -15915,7 +15915,7 @@ _081A2A80:
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085EE392
ldr r1, =gText_TimesVar1
adds r0, r4, 0
bl StringExpandPlaceholders
mov r1, r10
@ -15973,7 +15973,7 @@ sub_81A2B04: @ 81A2B04
adds r2, r0
adds r2, r1
ldrh r2, [r2]
ldr r0, =gUnknown_085EE319
ldr r0, =gText_Record
str r3, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@ -16102,7 +16102,7 @@ _081A2C3E:
lsrs r0, 24
cmp r0, 0x1
bne _081A2C68
ldr r0, =gUnknown_085EE311
ldr r0, =gText_Current
mov r1, r8
str r1, [sp]
mov r1, r9
@ -16116,7 +16116,7 @@ _081A2C3E:
b _081A2C80
.pool
_081A2C68:
ldr r0, =gUnknown_085EE320
ldr r0, =gText_Prev
mov r1, r8
str r1, [sp]
mov r1, r9
@ -16160,13 +16160,13 @@ sub_81A2C94: @ 81A2C94
cmp r7, 0
bne _081A2CD8
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE298
ldr r1, =gText_BattleSwapSingleResults
bl StringExpandPlaceholders
b _081A2CE0
.pool
_081A2CD8:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EE2B8
ldr r1, =gText_BattleSwapDoubleResults
bl StringExpandPlaceholders
_081A2CE0:
ldr r0, =gStringVar4
@ -16175,7 +16175,7 @@ _081A2CE0:
ldr r0, =gUnknown_0203AB74
mov r8, r0
ldrb r0, [r0]
ldr r2, =gUnknown_085EE2F2
ldr r2, =gText_Lv502
movs r6, 0x21
str r6, [sp]
movs r5, 0xFF
@ -16187,7 +16187,7 @@ _081A2CE0:
bl PrintTextOnWindow
mov r1, r8
ldrb r0, [r1]
ldr r2, =gUnknown_085EE326
ldr r2, =gText_RentalSwap
str r6, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
@ -16196,7 +16196,7 @@ _081A2CE0:
bl PrintTextOnWindow
mov r1, r8
ldrb r0, [r1]
ldr r2, =gUnknown_085EE2F9
ldr r2, =gText_OpenLv
movs r1, 0x61
str r1, [sp]
str r5, [sp, 0x4]
@ -16301,7 +16301,7 @@ _081A2E00:
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE39C
ldr r1, =gText_FloorsCleared
adds r0, r4, 0
bl StringExpandPlaceholders
mov r1, r10
@ -16346,7 +16346,7 @@ sub_81A2E54: @ 81A2E54
adds r1, r2
adds r1, r0
ldrh r1, [r1]
ldr r0, =gUnknown_085EE319
ldr r0, =gText_Record
str r3, [sp]
adds r2, r4, 0
adds r3, r5, 0
@ -16413,7 +16413,7 @@ _081A2EF8:
lsrs r0, 24
cmp r0, 0x1
bne _081A2F18
ldr r0, =gUnknown_085EE311
ldr r0, =gText_Current
str r6, [sp]
adds r1, r5, 0
adds r2, r7, 0
@ -16422,7 +16422,7 @@ _081A2EF8:
b _081A2F26
.pool
_081A2F18:
ldr r0, =gUnknown_085EE320
ldr r0, =gText_Prev
str r6, [sp]
adds r1, r5, 0
adds r2, r7, 0
@ -16453,14 +16453,14 @@ sub_81A2F38: @ 81A2F38
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE2D8
ldr r1, =gText_BattleQuestResults
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
movs r1, 0x2
bl sub_81A1C4C
ldrb r0, [r5]
ldr r2, =gUnknown_085EE2F2
ldr r2, =gText_Lv502
movs r1, 0x31
str r1, [sp]
movs r6, 0xFF
@ -16471,7 +16471,7 @@ sub_81A2F38: @ 81A2F38
movs r3, 0x8
bl PrintTextOnWindow
ldrb r0, [r5]
ldr r2, =gUnknown_085EE2F9
ldr r2, =gText_OpenLv
movs r1, 0x61
str r1, [sp]
str r6, [sp, 0x4]
@ -16532,7 +16532,7 @@ sub_81A2FF8: @ 81A2FF8
bl FillWindowPixelBuffer
ldr r0, =gStringVar4
mov r9, r0
ldr r1, =gUnknown_085EDF86
ldr r1, =gText_LinkContestResults
bl StringExpandPlaceholders
movs r0, 0x1
mov r1, r9
@ -16550,7 +16550,7 @@ sub_81A2FF8: @ 81A2FF8
str r5, [sp, 0x8]
mov r2, r9
bl PrintTextOnWindow
ldr r7, =gUnknown_085EDFA0
ldr r7, =gText_1st
movs r0, 0x1
adds r1, r7, 0
movs r2, 0x26
@ -16568,7 +16568,7 @@ sub_81A2FF8: @ 81A2FF8
movs r1, 0x1
adds r2, r7, 0
bl PrintTextOnWindow
ldr r7, =gUnknown_085EDFA4
ldr r7, =gText_2nd
movs r0, 0x1
adds r1, r7, 0
movs r2, 0x26
@ -16585,7 +16585,7 @@ sub_81A2FF8: @ 81A2FF8
movs r1, 0x1
adds r2, r7, 0
bl PrintTextOnWindow
ldr r7, =gUnknown_085EDFA8
ldr r7, =gText_3rd
movs r0, 0x1
adds r1, r7, 0
movs r2, 0x26
@ -16602,7 +16602,7 @@ sub_81A2FF8: @ 81A2FF8
movs r1, 0x1
adds r2, r7, 0
bl PrintTextOnWindow
ldr r7, =gUnknown_085EDFAC
ldr r7, =gText_4th
movs r0, 0x1
adds r1, r7, 0
movs r2, 0x26
@ -16620,7 +16620,7 @@ sub_81A2FF8: @ 81A2FF8
adds r2, r7, 0
bl PrintTextOnWindow
ldrb r0, [r4]
ldr r2, =gUnknown_085EB0E8
ldr r2, =gText_Cool
movs r1, 0x29
str r1, [sp]
str r6, [sp, 0x4]
@ -16629,7 +16629,7 @@ sub_81A2FF8: @ 81A2FF8
movs r3, 0x6
bl PrintTextOnWindow
ldrb r0, [r4]
ldr r2, =gUnknown_085EB0ED
ldr r2, =gText_Beauty
movs r1, 0x39
str r1, [sp]
str r6, [sp, 0x4]
@ -16638,7 +16638,7 @@ sub_81A2FF8: @ 81A2FF8
movs r3, 0x6
bl PrintTextOnWindow
ldrb r0, [r4]
ldr r2, =gUnknown_085EB0F4
ldr r2, =gText_Cute
movs r1, 0x49
str r1, [sp]
str r6, [sp, 0x4]
@ -16647,7 +16647,7 @@ sub_81A2FF8: @ 81A2FF8
movs r3, 0x6
bl PrintTextOnWindow
ldrb r0, [r4]
ldr r2, =gUnknown_085EB0F9
ldr r2, =gText_Smart
movs r1, 0x59
str r1, [sp]
str r6, [sp, 0x4]
@ -16656,7 +16656,7 @@ sub_81A2FF8: @ 81A2FF8
movs r3, 0x6
bl PrintTextOnWindow
ldrb r0, [r4]
ldr r2, =gUnknown_085EB0FF
ldr r2, =gText_Tough
movs r1, 0x69
str r1, [sp]
str r6, [sp, 0x4]
@ -18966,7 +18966,7 @@ sub_81A4594: @ 81A4594
ldrb r5, [r1]
lsls r4, r0, 1
adds r4, r0
ldr r1, =gUnknown_085EE424
ldr r1, =gText_1Dot
adds r4, r1
mov r1, r8
lsls r3, r1, 27
@ -19076,7 +19076,7 @@ sub_81A4684: @ 81A4684
ldrb r0, [r1]
lsls r2, r6, 1
adds r2, r6
ldr r1, =gUnknown_085EE424
ldr r1, =gText_1Dot
adds r2, r1
lsls r3, r7, 27
lsrs r3, 24

8
asm/battle_interface.s
View File

@ -3760,7 +3760,7 @@ sub_80741E8: @ 80741E8
lsls r0, 24
lsrs r7, r0, 24
ldr r5, =gDisplayedStringBattle
ldr r1, =gUnknown_085ED228
ldr r1, =gText_HighlightDarkGrey
adds r0, r5, 0
bl StringCopy
adds r0, r4, 0
@ -3802,15 +3802,15 @@ _0807424A:
beq _08074268
cmp r6, 0xFE
beq _08074270
ldr r1, =gUnknown_085ED238
ldr r1, =gText_DynColor2
b _08074272
.pool
_08074268:
ldr r1, =gUnknown_085ED22E
ldr r1, =gText_DynColor2Male
b _08074272
.pool
_08074270:
ldr r1, =gUnknown_085ED233
ldr r1, =gText_DynColor1Female
_08074272:
adds r0, r5, 0
bl StringCopy

4
asm/battle_message.s
View File

@ -2051,12 +2051,12 @@ _0814F3C4:
ldr r0, =0x000008ab
bl FlagGet
lsls r0, 24
ldr r4, =gText_SomeonesPC
ldr r4, =gText_Someones
cmp r0, 0
bne _0814F3D4
b _0814F5C0
_0814F3D4:
ldr r4, =gText_LanettesPC
ldr r4, =gText_Lanettes
b _0814F5C0
.pool
_0814F3E4:

6
asm/battle_records.s
View File

@ -488,7 +488,7 @@ sub_813C2F4: @ 813C2F4
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF6A1
ldr r1, =gText_TotalRecordWLD
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -672,7 +672,7 @@ sub_813C4BC: @ 813C4BC
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r5, =gStringVar4
ldr r1, =gUnknown_085EF68D
ldr r1, =gText_PlayersBattleResults
adds r0, r5, 0
bl StringExpandPlaceholders
movs r0, 0x1
@ -697,7 +697,7 @@ sub_813C4BC: @ 813C4BC
mov r9, r1
add r0, r9
bl sub_813C2F4
ldr r1, =gUnknown_085EF6BD
ldr r1, =gText_WinLoseDraw
adds r0, r5, 0
bl StringExpandPlaceholders
ldrb r0, [r6]

6
asm/berry_blender.s
View File

@ -5627,7 +5627,7 @@ _080827AA:
ldr r0, [r6]
ldr r1, =0x000011b8
adds r0, r1
ldr r1, =gUnknown_085EE42D
ldr r1, =gText_SavingDontTurnOff2
movs r2, 0
bl sub_808417C
bl sub_800ADF8
@ -8350,7 +8350,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24
ldrb r0, [r5]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r6, =gUnknown_085EE44F
ldr r6, =gText_BlenderMaxSpeedRecord
movs r0, 0x1
adds r1, r6, 0
movs r2, 0x90
@ -8367,7 +8367,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24
adds r2, r6, 0
bl PrintTextOnWindow
ldrb r0, [r5]
ldr r2, =gUnknown_085EE473
ldr r2, =gText_234Players
movs r1, 0x29
str r1, [sp]
str r4, [sp, 0x4]

10
asm/berry_tag_screen.s
View File

@ -511,7 +511,7 @@ sub_8178090: @ 8178090
movs r0, 0x3
movs r1, 0xFF
bl FillWindowPixelBuffer
ldr r4, =gUnknown_085E926B
ldr r4, =gText_BerryTag
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x40
@ -573,7 +573,7 @@ sub_8178110: @ 8178110
adds r1, r6, 0
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9263
ldr r1, =gText_UnkF908Var1Var2
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -602,7 +602,7 @@ sub_8178174: @ 8178174
ldrb r0, [r0]
bl GetBerryInfo
adds r4, r0, 0
ldr r2, =gUnknown_085E9225
ldr r2, =gText_SizeSlash
movs r7, 0x1
str r7, [sp]
movs r0, 0xFF
@ -652,7 +652,7 @@ _081781C8:
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9233
ldr r1, =gText_Var1DotVar2
adds r0, r4, 0
bl StringExpandPlaceholders
str r7, [sp]
@ -694,7 +694,7 @@ itemid_copy_name: @ 8178250
ldrb r0, [r0]
bl GetBerryInfo
adds r6, r0, 0
ldr r2, =gUnknown_085E922C
ldr r2, =gText_FirmSlash
movs r5, 0x11
str r5, [sp]
movs r0, 0xFF

2
asm/cable_club.s
View File

@ -55,7 +55,7 @@ sub_80B23B0: @ 80B23B0
movs r1, 0
bl SetStandardWindowBorderStyle
ldr r5, =gStringVar4
ldr r1, =gUnknown_085EE667
ldr r1, =gText_XPLink
adds r0, r5, 0
bl StringExpandPlaceholders
movs r0, 0x1

4
asm/clear_save_data_screen.s
View File

@ -33,7 +33,7 @@ sub_817ACE4: @ 817ACE4
movs r2, 0x2
movs r3, 0xE
bl SetWindowBorderStyle
ldr r2, =gUnknown_085EFA8F
ldr r2, =gText_ClearAllSaveData
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -87,7 +87,7 @@ _0817AD68:
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EFAAA
ldr r2, =gText_ClearingData
movs r0, 0x1
str r0, [sp]
str r4, [sp, 0x4]

10
asm/contest.s
View File

@ -1579,7 +1579,7 @@ _080D84B8:
cmp r0, 0
beq _080D853C
add r0, sp, 0x4
ldr r1, =gUnknown_085ED1A0
ldr r1, =gText_ColorLightShadowDarkGrey
b _080D8566
.pool
_080D853C:
@ -1603,7 +1603,7 @@ _080D853C:
cmp r0, 0x3
beq _080D856C
add r0, sp, 0x4
ldr r1, =gUnknown_085ED1A7
ldr r1, =gText_ColorBlue
_080D8566:
bl StringCopy
adds r5, r0, 0
@ -6407,7 +6407,7 @@ sub_80DAED4: @ 80DAED4
lsls r4, r1, 24
lsrs r4, 24
ldr r0, =gDisplayedStringBattle
ldr r1, =gUnknown_085ED1AB
ldr r1, =gText_ColorTransparent
bl StringCopy
adds r1, r0, 0
subs r0, r1, 0x1
@ -15507,7 +15507,7 @@ _080DF784:
mov r9, r0
_080DF7AE:
add r0, sp, 0x4
ldr r1, =gUnknown_085ED1B2
ldr r1, =gText_CDot
bl StringCopy
adds r5, r0, 0
ldr r0, =gUnknown_02039F26
@ -15604,7 +15604,7 @@ _080DF874:
mov r10, r1
_080DF884:
add r0, sp, 0x4
ldr r1, =gUnknown_085ED1B5
ldr r1, =gText_BDot
bl StringCopy
ldr r0, =gUnknown_02039F34
ldr r0, [r0]

14
asm/contest_link_80F57C4.s
View File

@ -283,7 +283,7 @@ sub_80F5A74: @ 80F5A74
ldrb r0, [r0]
cmp r5, r0
bne _080F5A96
ldr r1, =gUnknown_085ED21E
ldr r1, =gText_ColorDarkGrey
adds r0, r6, 0
bl StringCopy
adds r6, r0, 0
@ -655,7 +655,7 @@ _080F5E2E:
ands r0, r1
cmp r0, 0
beq _080F5E78
ldr r0, =gUnknown_085ED207
ldr r0, =gText_CommunicationStandby
bl sub_80F707C
ldr r0, =sub_80F5ED8
b _080F5EB8
@ -784,7 +784,7 @@ sub_80F5F74: @ 80F5F74
ldr r0, =sub_80F68F0
movs r1, 0x14
bl CreateTask
ldr r0, =gUnknown_085ED1B8
ldr r0, =gText_AnnouncingResults
ldr r1, =gUnknown_0203A034
ldr r1, [r1]
ldr r1, [r1]
@ -828,7 +828,7 @@ _080F5FF0:
_080F5FF8:
cmp r0, 0x3
bne _080F6030
ldr r0, =gUnknown_085ED1D0
ldr r0, =gText_PreliminaryResults
ldr r1, =gUnknown_0203A034
ldr r1, [r1]
ldr r1, [r1]
@ -970,7 +970,7 @@ sub_80F60F0: @ 80F60F0
cmp r0, 0x15
bne _080F615E
strh r3, [r1, 0xA]
ldr r0, =gUnknown_085ED1E9
ldr r0, =gText_Round2Results
ldr r1, [r5]
ldrb r1, [r1]
bl sub_80F6B78
@ -1265,7 +1265,7 @@ _080F636E:
adds r4, r1
adds r1, r4, 0
bl StringCopy
ldr r1, =gUnknown_085ED1FA
ldr r1, =gText_Var1sVar2Won
mov r0, sp
bl StringExpandPlaceholders
ldr r0, =gUnknown_0203A034
@ -1679,7 +1679,7 @@ sub_80F671C: @ 80F671C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080F676E
ldr r0, =gUnknown_085ED207
ldr r0, =gText_CommunicationStandby
bl sub_80F707C
bl sub_800AC34
ldr r0, =sub_80F677C

10
asm/daycare.s
View File

@ -2800,7 +2800,7 @@ _08070FCC:
adds r0, r7, 0
mov r1, sp
bl StringCopy
ldr r4, =gUnknown_085EF881
ldr r4, =gText_NewLine2
adds r0, r7, 0
adds r1, r4, 0
bl StringAppend
@ -2810,7 +2810,7 @@ _08070FCC:
adds r0, r7, 0
adds r1, r4, 0
bl StringAppend
ldr r1, =gUnknown_085EF883
ldr r1, =gText_Exit4
adds r0, r7, 0
bl StringAppend
add sp, 0x28
@ -2834,7 +2834,7 @@ sub_8071038: @ 8071038
movs r5, 0
_08071046:
adds r0, r4, 0
ldr r1, =gUnknown_085EF888
ldr r1, =gText_Lv
bl StringAppend
movs r0, 0x8C
adds r2, r5, 0
@ -2856,7 +2856,7 @@ _08071046:
mov r1, sp
bl StringAppend
adds r0, r4, 0
ldr r1, =gUnknown_085EF881
ldr r1, =gText_NewLine2
bl StringAppend
adds r0, r5, 0x1
lsls r0, 24
@ -2971,7 +2971,7 @@ sub_8071148: @ 8071148
mov r8, r3
lsls r5, 24
lsrs r5, 24
ldr r1, =gUnknown_085EF888
ldr r1, =gText_Lv
mov r0, sp
bl StringCopy
movs r0, 0x8C

42
asm/decoration.s
View File

@ -336,7 +336,7 @@ sub_8126C48: @ 8126C48
cmp r0, 0
bne _08126C7C
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA83D
ldr r1, =gText_NoDecorations
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8126DA4
@ -376,7 +376,7 @@ sub_8126CA4: @ 8126CA4
cmp r0, 0
bne _08126CD8
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAAEC
ldr r1, =gText_NoDecorationsInUse
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8126DA4
@ -420,7 +420,7 @@ sub_8126D10: @ 8126D10
cmp r0, 0
bne _08126D44
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA83D
ldr r1, =gText_NoDecorations
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8126DA4
@ -656,7 +656,7 @@ _08126F0C:
ldr r2, =gText_Cancel
cmp r0, 0x2
bne _08126F2C
ldr r2, =gUnknown_085EB7EA
ldr r2, =gText_Exit
_08126F2C:
lsls r0, r4, 4
adds r0, 0x1
@ -798,7 +798,7 @@ sub_8127058: @ 8127058
adds r5, r0, 0
lsls r4, r1, 24
lsrs r4, 24
ldr r1, =gUnknown_085EA7C8
ldr r1, =gText_Color161Shadow161
bl StringCopy
cmp r4, 0x1
bne _08127078
@ -909,7 +909,7 @@ _08127154:
movs r0, 0x1
bl sub_8126A58
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA83D
ldr r1, =gText_NoDecorations
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8127180
@ -2637,7 +2637,7 @@ sub_8127F68: @ 8127F68
cmp r0, 0x7
beq _08127FAC
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA9AE
ldr r1, =gText_CantPlaceInRoom
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8127A5C
@ -2682,13 +2682,13 @@ _08127FE8:
cmp r0, 0
bne _08128018
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA8EA
ldr r1, =gText_NoMoreDecorations
bl StringExpandPlaceholders
b _08128020
.pool
_08128018:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA931
ldr r1, =gText_NoMoreDecorations2
bl StringExpandPlaceholders
_08128020:
ldr r1, =gStringVar4
@ -2699,7 +2699,7 @@ _08128020:
.pool
_08128038:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA8D2
ldr r1, =gText_InUseAlready
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8127A5C
@ -3169,7 +3169,7 @@ sub_8128414: @ 8128414
strh r2, [r0, 0x3C]
bl sub_8128DE0
ldr r5, =gStringVar4
ldr r1, =gUnknown_085EA8BF
ldr r1, =gText_CancelDecorating
adds r0, r5, 0
bl StringExpandPlaceholders
ldr r2, =sub_8128B80
@ -3835,7 +3835,7 @@ sub_8128950: @ 8128950
cmp r0, 0x1
bne _081289A4
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA897
ldr r1, =gText_PlaceItHere
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_81289D0
@ -3848,7 +3848,7 @@ _081289A4:
movs r0, 0x20
bl PlaySE
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA8A6
ldr r1, =gText_CantBePlacedHere
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8129020
@ -5810,7 +5810,7 @@ _08129968:
cmp r0, 0x1
bne _08129994
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAAC5
ldr r1, =gText_DecorationReturnedToPC
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8129D64
@ -6137,7 +6137,7 @@ sub_8129BF8: @ 8129BF8
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldr r5, =gStringVar4
ldr r1, =gUnknown_085EAA62
ldr r1, =gText_StopPuttingAwayDecorations
adds r0, r5, 0
bl StringExpandPlaceholders
ldr r2, =sub_812A1F0
@ -6162,7 +6162,7 @@ sub_8129C74: @ 8129C74
cmp r0, 0
beq _08129CA8
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAAA3
ldr r1, =gText_ReturnDecorationToPC
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_812A1A0
@ -6216,7 +6216,7 @@ _08129CDE:
ldr r1, =SpriteCallbackDummy
str r1, [r0]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAA62
ldr r1, =gText_StopPuttingAwayDecorations
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_812A1F0
@ -6228,7 +6228,7 @@ _08129D14:
.pool
_08129D3C:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAA81
ldr r1, =gText_NoDecorationHere
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8129D64
@ -7087,7 +7087,7 @@ sub_812A3D4: @ 812A3D4
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EAA14
ldr r1, =gText_DecorationWillBeDiscarded
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_812A458
@ -7098,7 +7098,7 @@ sub_812A3D4: @ 812A3D4
.pool
_0812A430:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA9E0
ldr r1, =gText_CantThrowAwayInUse
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_8127A5C
@ -7151,7 +7151,7 @@ sub_812A478: @ 812A478
adds r0, r4, 0
bl sub_8127814
ldr r5, =gStringVar4
ldr r1, =gUnknown_085EAA3D
ldr r1, =gText_DecorationThrownAway
adds r0, r5, 0
bl StringExpandPlaceholders
ldr r2, =sub_8127A5C

6
asm/diploma.s
View File

@ -262,7 +262,7 @@ pokedex_diploma_something: @ 8177AD4
movs r0, 0x14
bl SetGpuReg
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EE855
ldr r1, =gText_DexNational
bl StringCopy
b _08177B0C
.pool
@ -271,11 +271,11 @@ _08177AFC:
movs r1, 0
bl SetGpuReg
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EE84F
ldr r1, =gText_DexHoenn
bl StringCopy
_08177B0C:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE85E
ldr r1, =gText_PokedexDiploma
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0

36
asm/easy_chat.s
View File

@ -3296,7 +3296,7 @@ sub_811BB40: @ 811BB40
ldrb r0, [r0]
cmp r0, 0x4
bne _0811BB5C
ldr r0, =gUnknown_085EC3B4
ldr r0, =gText_StopGivingPkmnMail
b _0811BB7A
.pool
_0811BB5C:
@ -3306,13 +3306,13 @@ _0811BB5C:
bgt _0811BB78
cmp r0, 0xF
blt _0811BB78
ldr r0, =gUnknown_085EC706
ldr r0, =gText_LikeToQuitQuiz
str r0, [r2]
ldr r0, =gUnknown_085EC727
ldr r0, =gText_ChallengeQuestionMark
b _0811BB7E
.pool
_0811BB78:
ldr r0, =gUnknown_085EC3A6
ldr r0, =gText_QuitEditing
_0811BB7A:
str r0, [r2]
movs r0, 0
@ -3325,9 +3325,9 @@ _0811BB7E:
thumb_func_start sub_811BB88
sub_811BB88: @ 811BB88
ldr r2, =gUnknown_085EC410
ldr r2, =gText_AllTextBeingEditedWill
str r2, [r0]
ldr r0, =gUnknown_085EC42F
ldr r0, =gText_BeDeletedThatOkay
str r0, [r1]
bx lr
.pool
@ -3711,11 +3711,11 @@ sub_811BDF0: @ 811BDF0
b _0811BE3C
.pool
_0811BE34:
ldr r1, =gUnknown_085EC6B2
ldr r1, =gText_Lady
movs r0, 0
bl sub_81AFC0C
_0811BE3C:
ldr r1, =gUnknown_085EC6A8
ldr r1, =gText_F700sQuiz
adds r0, r6, 0
bl sub_81AFC28
add sp, 0x20
@ -6054,35 +6054,35 @@ _0811D16A:
bl sub_811BB88
b _0811D1BC
_0811D174:
ldr r0, =gUnknown_085EC743
ldr r0, =gText_CreateAQuiz
str r0, [sp, 0xC]
b _0811D1BC
.pool
_0811D180:
ldr r0, =gUnknown_085EC752
ldr r0, =gText_SelectTheAnswer
str r0, [sp, 0xC]
b _0811D1BC
.pool
_0811D18C:
ldr r0, =gUnknown_085EC4C9
ldr r0, =gText_OnlyOnePhrase
str r0, [sp, 0xC]
ldr r0, =gUnknown_085EC4E9
ldr r0, =gText_OriginalSongWillBeUsed
b _0811D1BA
.pool
_0811D19C:
ldr r0, =gUnknown_085EC765
ldr r0, =gText_LyricsCantBeDeleted
str r0, [sp, 0xC]
b _0811D1BC
.pool
_0811D1A8:
ldr r0, =gUnknown_085EC520
ldr r0, =gText_CombineTwoWordsOrPhrases
str r0, [sp, 0xC]
b _0811D1BC
.pool
_0811D1B4:
ldr r0, =gUnknown_085EC672
ldr r0, =gText_YouCannotQuitHere
str r0, [sp, 0xC]
ldr r0, =gUnknown_085EC688
ldr r0, =gText_SectionMustBeCompleted
_0811D1BA:
str r0, [sp, 0x10]
_0811D1BC:
@ -9442,7 +9442,7 @@ CopyEasyChatWord: @ 811EBBC
lsls r0, 24
cmp r0, 0
beq _0811EBD8
ldr r1, =gUnknown_085EEA42
ldr r1, =gText_ThreeQuestionMarks
b _0811EBEA
.pool
_0811EBD8:
@ -9693,7 +9693,7 @@ _0811ED94:
b _0811EDB2
.pool
_0811EDB0:
ldr r0, =gUnknown_085EEA42
ldr r0, =gText_ThreeQuestionMarks
_0811EDB2:
bl StringLength
lsls r0, 16

4
asm/egg_hatch.s
View File

@ -971,7 +971,7 @@ _08071C24:
ldr r1, =gStringVar1
bl pokemon_get_nick
ldr r4, =gStringVar4
ldr r1, =gUnknown_085ED5A5
ldr r1, =gText_PkmnHatchedFromEgg
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r0, [r5]
@ -1023,7 +1023,7 @@ _08071CA4:
ldr r1, =gStringVar1
bl pokemon_get_nick
ldr r4, =gStringVar4
ldr r1, =gUnknown_085ED5BE
ldr r1, =gText_NameHatchedPkmn
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r0, [r5]

2
asm/evolution_scene.s
View File

@ -2913,7 +2913,7 @@ _0813F5F0:
_0813F5FC:
ldr r0, =0x00000179
bl PlayBGM
ldr r1, =gUnknown_085EF6D2
ldr r1, =gText_CommunicationStandby5
movs r0, 0
movs r2, 0x1
bl sub_807F1A8

8
asm/field_player_avatar.s
View File

@ -4396,7 +4396,7 @@ fish6: @ 808CB6C
sub sp, 0xC
adds r5, r0, 0
bl sub_808CF78
ldr r2, =gUnknown_085EE8F7
ldr r2, =gText_OhABite
movs r0, 0x11
str r0, [sp]
movs r4, 0
@ -4526,7 +4526,7 @@ fish9: @ 808CC64
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EE903
ldr r2, =gText_PokemonOnHook
movs r5, 0
str r5, [sp]
movs r0, 0x2
@ -4683,7 +4683,7 @@ fishB: @ 808CD94
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EE91E
ldr r2, =gText_NotEvenANibble
movs r0, 0
str r0, [sp]
movs r0, 0x2
@ -4731,7 +4731,7 @@ fishC: @ 808CE04
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EE933
ldr r2, =gText_ItGotAway
movs r0, 0
str r0, [sp]
movs r0, 0x2

2
asm/field_poison.s
View File

@ -216,7 +216,7 @@ _080F96F0:
_080F96FC:
ldrb r0, [r4, 0x2]
bl sub_80F95C0
ldr r0, =gUnknown_085ECF5D
ldr r0, =gText_PkmnFainted3
bl box_related_two__2
ldrh r0, [r4]
adds r0, 0x1

2
asm/field_region_map.s
View File

@ -157,7 +157,7 @@ _08170300:
movs r2, 0x27
movs r3, 0xD
bl SetWindowBorderStyle
ldr r5, =gUnknown_085EE8F1
ldr r5, =gText_Hoenn
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38

4
asm/fldeff_80F9BCC.s
View File

@ -2061,7 +2061,7 @@ _080FACC2:
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA88B
ldr r1, =gText_Gold
bl StringCopy
ldr r1, =gScriptResult
movs r0, 0
@ -2085,7 +2085,7 @@ _080FAD14:
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA890
ldr r1, =gText_Silver
bl StringCopy
ldr r1, =gScriptResult
movs r0, 0

4
asm/fldeff_softboiled.s
View File

@ -221,7 +221,7 @@ sub_81616C0: @ 81616C0
ldr r1, =gStringVar1
bl GetMonNickname
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9C17
ldr r1, =gText_PkmnHPRestoredByVar2
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -318,7 +318,7 @@ sub_81617B8: @ 81617B8
lsrs r4, 24
movs r0, 0x5
bl PlaySE
ldr r0, =gUnknown_085E9712
ldr r0, =gText_CantBeUsedOnPkmn
movs r1, 0
bl sub_81B1B5C
movs r0, 0x2

20
asm/item_menu.s
View File

@ -437,7 +437,7 @@ _081AAF0C:
b _081AB012
.pool
_081AAF1C:
ldr r1, =gPocketNames
ldr r1, =gPocketNamesStringsTable
ldr r4, =gUnknown_0203CE58
ldrb r0, [r4, 0x5]
lsls r0, 2
@ -972,7 +972,7 @@ _081AB3C0:
movs r2, 0x2
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085E921A
ldr r1, =gText_ClearTo11Var1Clear5Var2
b _081AB438
.pool
_081AB408:
@ -995,7 +995,7 @@ _081AB420:
adds r0, r5, 0
bl CopyItemName
_081AB436:
ldr r1, =gUnknown_085E9210
ldr r1, =gText_UnkF908Var1Clear7Var2
_081AB438:
adds r0, r6, 0
bl StringExpandPlaceholders
@ -1297,7 +1297,7 @@ bag_menu_print_description_box_text: @ 81AB6B0
.pool
_081AB6E0:
ldr r0, =gStringVar1
ldr r2, =gUnknown_085E9180
ldr r2, =gReturnToXStringsTable
ldr r1, =gUnknown_0203CE58
ldrb r1, [r1, 0x4]
lsls r1, 2
@ -2423,7 +2423,7 @@ _081AC026:
adds r5, r0, 0
cmp r1, 0x1
bne _081AC07C
ldr r2, =gPocketNames
ldr r2, =gPocketNamesStringsTable
ldrb r0, [r4, 0x5]
lsls r0, 2
adds r0, r2
@ -2439,7 +2439,7 @@ _081AC026:
b _081AC09A
.pool
_081AC07C:
ldr r2, =gPocketNames
ldr r2, =gPocketNamesStringsTable
add r0, sp, 0x8
ldrb r0, [r0]
lsls r0, 2
@ -4808,7 +4808,7 @@ display_sell_item_ask_str: @ 81AD5DC
ldr r1, =gStringVar2
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E960F
ldr r1, =gText_CantBuyKeyItem
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r3, =bag_menu_inits_lists_menu
@ -4834,7 +4834,7 @@ _081AD64C:
ldr r1, =gStringVar2
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E962F
ldr r1, =gText_HowManyToSell
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r3, =sub_81AD730
@ -4874,7 +4874,7 @@ sub_81AD680: @ 81AD680
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9654
ldr r1, =gText_ICanPayVar1
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r3, =sub_81AD6E4
@ -5079,7 +5079,7 @@ sub_81AD84C: @ 81AD84C
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9677
ldr r1, =gText_TurnedOverVar1ForVar2
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r3, =sub_81AD8C8

4
asm/item_use.s
View File

@ -2510,7 +2510,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
lsls r0, 24
cmp r0, 0
bne _080FE518
ldr r2, =gUnknown_085E96F6
ldr r2, =gText_WontHaveEffect
ldr r3, =bag_menu_inits_lists_menu
adds r0, r4, 0
movs r1, 0x1
@ -2518,7 +2518,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
b _080FE53C
.pool
_080FE518:
ldr r1, =gUnknown_085E96F6
ldr r1, =gText_WontHaveEffect
ldr r2, =sub_81C6714
adds r0, r4, 0
bl DisplayItemMessageInBattlePyramid

20
asm/learn_move.s
View File

@ -377,7 +377,7 @@ _081609A8:
ldr r1, =0xffff0000
cmp r0, r1
beq _08160A04
ldr r0, =gUnknown_085EF8E4
ldr r0, =gText_PkmnLearnedMove4
bl sub_816084C
ldr r1, =gSpecialVar_0x8004
movs r0, 0x1
@ -471,7 +471,7 @@ _08160AAA:
b _08160E88
.pool
_08160AB8:
ldr r0, =gUnknown_085EF8F3
ldr r0, =gText_PkmnTryingToLearnMove
bl sub_816084C
ldr r0, =gUnknown_0203BC34
ldr r1, [r0]
@ -498,7 +498,7 @@ _08160AEC:
asrs r1, r0, 24
cmp r1, 0
bne _08160B10
ldr r0, =gUnknown_085EFA10
ldr r0, =gText_WhichMoveToForget2
bl sub_816084C
ldr r0, =gUnknown_0203BC34
ldr r1, [r0]
@ -528,7 +528,7 @@ _08160B2C:
adds r1, r0
adds r0, r4, 0
bl StringCopy
ldr r0, =gUnknown_085EF960
ldr r0, =gText_StopTryingToTeachMove
bl sub_816084C
ldr r0, =gUnknown_0203BC34
ldr r1, [r0]
@ -819,7 +819,7 @@ _08160D6C:
adds r1, r6
adds r0, r4, 0
bl StringCopy
ldr r0, =gUnknown_085EF979
ldr r0, =gText_12AndPoof
bl sub_816084C
ldr r1, [r7]
movs r0, 0x1E
@ -834,7 +834,7 @@ _08160E0C:
lsls r0, 16
cmp r0, 0
bne _08160E8A
ldr r0, =gUnknown_085EF9A6
ldr r0, =gText_PkmnForgotMoveAndLearnedNew
bl sub_816084C
ldr r0, =gUnknown_0203BC34
ldr r1, [r0]
@ -946,7 +946,7 @@ _08160EF0:
cmp r5, 0
bne _08160F38
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF8C2
ldr r1, =gText_TeachWhichMoveToPkmn
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x3
@ -1042,7 +1042,7 @@ _08160FE4:
movs r0, 0xC
strb r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF9E6
ldr r1, =gText_GiveUpTeachingNewMove
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -1063,7 +1063,7 @@ _08161010:
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF8DA
ldr r1, =gText_TeachX
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -1100,7 +1100,7 @@ sub_8161074: @ 8161074
cmp r5, 0
bne _081610A6
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF8C2
ldr r1, =gText_TeachWhichMoveToPkmn
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x3

2
asm/lilycove_lady.s
View File

@ -940,7 +940,7 @@ sub_818E13C: @ 818E13C
cmp r0, 0xFF
bne _0818E174
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EEB7E
ldr r1, =gText_Lady2
bl StringCopy7
movs r7, 0
b _0818E1DC

250
asm/link.s
View File

@ -3482,7 +3482,7 @@ sub_800B080: @ 800B080
ldr r4, =gUnknown_082ED224
str r4, [sp]
str r5, [sp, 0x4]
ldr r0, =gUnknown_085EE4F7
ldr r0, =gText_CommErrorEllipsis
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x3
@ -3491,7 +3491,7 @@ sub_800B080: @ 800B080
bl box_print
str r4, [sp]
str r5, [sp, 0x4]
ldr r0, =gUnknown_085EE50C
ldr r0, =gText_MoveCloserToLinkPartner
str r0, [sp, 0x8]
movs r0, 0x2
movs r1, 0x3
@ -3534,7 +3534,7 @@ sub_800B138: @ 800B138
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085EE4A4
ldr r0, =gText_CommErrorCheckConnections
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x3
@ -3623,7 +3623,7 @@ _0800B214:
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085EE572
ldr r0, =gText_ABtnTitleScreen
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x3
@ -3639,7 +3639,7 @@ _0800B244:
str r0, [sp]
movs r0, 0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085EE553
ldr r0, =gText_ABtnRegistrationCounter
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0x3
@ -28887,16 +28887,16 @@ sub_80186EC: @ 80186EC
bl FillWindowPixelBuffer
cmp r4, 0
bne _0801871C
ldr r0, =gUnknown_085EF654
ldr r7, =gUnknown_085EF678
ldr r0, =gText_MysteryGift
ldr r7, =gText_PickOKCancel
cmp r5, 0
bne _08018720
ldr r7, =gUnknown_085EF664
ldr r7, =gText_PickOKExit
b _08018720
.pool
_0801871C:
ldr r0, =gUnknown_085EDFBF
ldr r7, =gUnknown_085EDFC9
ldr r0, =gJPText_MysteryGift
ldr r7, =gJPText_DecideStop
_08018720:
movs r4, 0
str r4, [sp]
@ -29571,13 +29571,13 @@ _08018C6C:
cmp r2, 0
bne _08018C84
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EF2FC
ldr r1, =gText_WhatToDoWithCards
bl StringExpandPlaceholders
b _08018C8C
.pool
_08018C84:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EF330
ldr r1, =gText_WhatToDoWithNews
bl StringExpandPlaceholders
_08018C8C:
ldr r0, =gUnknown_082F05D8
@ -29801,11 +29801,11 @@ sub_8018E50: @ 8018E50
push {lr}
cmp r2, 0
beq _08018E60
ldr r3, =gUnknown_085EF55C
ldr r3, =gText_OkayToDiscardNews
b _08018E62
.pool
_08018E60:
ldr r3, =gUnknown_085EF520
ldr r3, =gText_IfThrowAwayCardEventWontHappen
_08018E62:
movs r2, 0x1
bl sub_8018B08
@ -29821,11 +29821,11 @@ mevent_message_was_thrown_away: @ 8018E74
push {lr}
cmp r1, 0
beq _08018E84
ldr r1, =gUnknown_085EF630
ldr r1, =gText_WonderNewsThrownAway
b _08018E86
.pool
_08018E84:
ldr r1, =gUnknown_085EF60C
ldr r1, =gText_WonderCardThrownAway
_08018E86:
bl mevent_0814257C
pop {r1}
@ -29854,7 +29854,7 @@ _08018EAC:
.4byte _08018EE0
.4byte _08018EF8
_08018EC0:
ldr r0, =gUnknown_085EF5BC
ldr r0, =gText_DataWillBeSaved
bl sub_8018884
b _08018EEC
.pool
@ -29863,7 +29863,7 @@ _08018ECC:
bl TrySavingData
b _08018EEC
_08018ED4:
ldr r0, =gUnknown_085EF5E0
ldr r0, =gText_SaveCompletedPressA
bl sub_8018884
b _08018EEC
.pool
@ -29934,88 +29934,88 @@ _08018F30:
_08018F6C:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF2E4
ldr r2, =gText_NothingSentOver
b _08019034
.pool
_08018F78:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF244
ldr r2, =gText_RecordUploadedViaWireless
b _08019034
.pool
_08018F84:
movs r0, 0x1
str r0, [r4]
ldr r2, =gUnknown_085EF0C8
ldr r2, =gText_WonderCardReceivedFrom
cmp r5, 0
bne _08019034
ldr r2, =gUnknown_085EF124
ldr r2, =gText_WonderCardReceived
b _08019034
.pool
_08018F9C:
movs r0, 0x1
str r0, [r4]
ldr r2, =gUnknown_085EF0F4
ldr r2, =gText_WonderNewsReceivedFrom
cmp r5, 0
bne _08019034
ldr r2, =gUnknown_085EF14C
ldr r2, =gText_WonderNewsReceived
b _08019034
.pool
_08018FB4:
movs r0, 0x1
str r0, [r4]
ldr r2, =gUnknown_085EF178
ldr r2, =gText_NewStampReceived
b _08019034
.pool
_08018FC0:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF1B4
ldr r2, =gText_AlreadyHadCard
b _08019034
.pool
_08018FCC:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF200
ldr r2, =gText_AlreadyHadStamp
b _08019034
.pool
_08018FD8:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF1D8
ldr r2, =gText_AlreadyHadNews
b _08019034
.pool
_08018FE4:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF21C
ldr r2, =gText_NoMoreRoomForStamps
b _08019034
.pool
_08018FF0:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF02C
ldr r2, =gText_CommunicationCanceled
b _08019034
.pool
_08018FFC:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF2B4
ldr r2, =gText_CantAcceptNewsFromTrainer
cmp r6, 0
bne _08019034
ldr r2, =gUnknown_085EF280
ldr r2, =gText_CantAcceptCardFromTrainer
b _08019034
.pool
_08019014:
movs r0, 0
str r0, [r4]
ldr r2, =gUnknown_085EF014
ldr r2, =gText_CommunicationError
b _08019034
.pool
_08019020:
movs r0, 0x1
str r0, [r4]
ldr r2, =gUnknown_085EF198
ldr r2, =gText_NewTrainerReceived
b _08019034
.pool
_0801902C:
@ -30095,7 +30095,7 @@ _0801909C:
mevent_message_stamp_card_etc_send_status: @ 80190A4
push {r4,lr}
adds r3, r0, 0
ldr r1, =gUnknown_085EF014
ldr r1, =gText_CommunicationError
movs r0, 0
str r0, [r3]
adds r4, r1, 0
@ -30125,57 +30125,57 @@ _080190C8:
.4byte _0801915C
.4byte _08019164
_08019104:
ldr r1, =gUnknown_085EF2E4
ldr r1, =gText_NothingSentOver
b _08019166
.pool
_0801910C:
ldr r1, =gUnknown_085EF244
ldr r1, =gText_RecordUploadedViaWireless
b _08019166
.pool
_08019114:
ldr r1, =gUnknown_085EF39C
ldr r1, =gText_WonderCardSentTo
b _0801911E
.pool
_0801911C:
ldr r1, =gUnknown_085EF3C4
ldr r1, =gText_WonderNewsSentTo
_0801911E:
movs r0, 0x1
str r0, [r3]
b _08019166
.pool
_08019128:
ldr r1, =gUnknown_085EF3F0
ldr r1, =gText_StampSentTo
b _08019166
.pool
_08019130:
ldr r1, =gUnknown_085EF42C
ldr r1, =gText_OtherTrainerHasCard
b _08019166
.pool
_08019138:
ldr r1, =gUnknown_085EF494
ldr r1, =gText_OtherTrainerHasStamp
b _08019166
.pool
_08019140:
ldr r1, =gUnknown_085EF460
ldr r1, =gText_OtherTrainerHasNews
b _08019166
.pool
_08019148:
ldr r1, =gUnknown_085EF21C
ldr r1, =gText_NoMoreRoomForStamps
b _08019166
.pool
_08019150:
ldr r1, =gUnknown_085EF4C4
ldr r1, =gText_OtherTrainerCanceled
b _08019166
.pool
_08019158:
adds r1, r4, 0
b _08019166
_0801915C:
ldr r1, =gUnknown_085EF410
ldr r1, =gText_GiftSentTo
b _08019166
.pool
_08019164:
ldr r1, =gUnknown_085EF4F0
ldr r1, =gText_CantSendGiftToTrainer
_08019166:
adds r0, r1, 0
pop {r4}
@ -30357,13 +30357,13 @@ _08019300:
bne _08019314
adds r0, r5, 0
adds r0, 0x9
ldr r1, =gUnknown_085EEEF0
ldr r1, =gText_DontHaveCardNewOneInput
b _0801931A
.pool
_08019314:
adds r0, r5, 0
adds r0, 0x9
ldr r1, =gUnknown_085EEF2C
ldr r1, =gText_DontHaveNewsNewOneInput
_0801931A:
bl mevent_0814257C
cmp r0, 0
@ -30381,12 +30381,12 @@ _08019338:
ldrb r0, [r5, 0xC]
cmp r0, 0
bne _0801934C
ldr r0, =gUnknown_085EEF68
ldr r0, =gText_WhereShouldCardBeAccessed
bl sub_8018884
b _08019352
.pool
_0801934C:
ldr r0, =gUnknown_085EEF94
ldr r0, =gText_WhereShouldNewsBeAccessed
bl sub_8018884
_08019352:
movs r0, 0x4
@ -30502,7 +30502,7 @@ _08019436:
b _080197C0
.pool
_08019444:
ldr r0, =gUnknown_085EEFE8
ldr r0, =gText_Communicating
bl sub_8018884
movs r0, 0x8
strb r0, [r5, 0x8]
@ -30593,7 +30593,7 @@ _08019506:
_08019508:
adds r0, r5, 0
adds r0, 0x9
ldr r3, =gUnknown_085EF050
ldr r3, =gText_ThrowAwayWonderCard
adds r1, r5, 0
movs r2, 0
bl sub_8018B08
@ -30616,7 +30616,7 @@ _08019534:
_08019538:
adds r0, r5, 0
adds r0, 0x9
ldr r3, =gUnknown_085EF084
ldr r3, =gText_HaventReceivedCardsGift
adds r1, r5, 0
movs r2, 0
bl sub_8018B08
@ -30660,7 +30660,7 @@ _0801957E:
_0801958C:
adds r0, r5, 0
adds r0, 0x9
ldr r1, =gUnknown_085EEFF8
ldr r1, =gText_CommunicationCompleted
bl sub_8018A1C
cmp r0, 0
bne _0801959C
@ -30876,7 +30876,7 @@ _0801971A:
_0801972E:
adds r0, r5, 0
adds r0, 0x9
ldr r3, =gUnknown_085EF584
ldr r3, =gText_HaventReceivedGiftOkayToDiscard
adds r1, r5, 0
movs r2, 0x1
bl sub_8018B08
@ -31016,13 +31016,13 @@ _0801982C:
ldrb r0, [r5, 0xC]
cmp r0, 0
bne _0801985C
ldr r0, =gUnknown_085EF360
ldr r0, =gText_SendingWonderCard
bl sub_8018884
bl mevent_srv_new_wcard
b _08019866
.pool
_0801985C:
ldr r0, =gUnknown_085EF37C
ldr r0, =gText_SendingWonderNews
bl sub_8018884
bl mevent_srv_init_wnews
_08019866:
@ -31084,7 +31084,7 @@ _080198DC:
_080198EC:
adds r0, r5, 0
adds r0, 0x9
ldr r1, =gUnknown_085EF014
ldr r1, =gText_CommunicationError
bl mevent_0814257C
_080198F6:
cmp r0, 0
@ -33685,7 +33685,7 @@ _0801AD8C:
_0801ADFC:
ldr r0, =gUnknown_02022C6C
ldr r0, [r0]
ldr r1, =gUnknown_085EFBD2
ldr r1, =gText_CommStandbyAwaitingOtherPlayer
movs r2, 0
bl sub_801ABDC
cmp r0, 0
@ -33832,7 +33832,7 @@ _0801AF40:
_0801AF58:
ldr r0, =gUnknown_02022C6C
ldr r0, [r0]
ldr r1, =gUnknown_085EFC27
ldr r1, =gText_RefusedBattle
movs r2, 0x1
bl sub_801ABDC
cmp r0, 0
@ -33858,7 +33858,7 @@ _0801AF8A:
_0801AF98:
ldr r0, =gUnknown_02022C6C
ldr r0, [r0]
ldr r1, =gUnknown_085EFC0C
ldr r1, =gText_BattleWasRefused
movs r2, 0x1
bl sub_801ABDC
cmp r0, 0
@ -41940,7 +41940,7 @@ _0801F020:
movs r0, 0
adds r1, r4, 0
bl sub_81AFC0C
ldr r1, =gUnknown_085ED2A9
ldr r1, =gText_F700JoinedChat
b _0801F094
.pool
_0801F044:
@ -41980,7 +41980,7 @@ _0801F07A:
movs r0, 0
adds r1, r4, 0
bl sub_81AFC0C
ldr r1, =gUnknown_085ED2BD
ldr r1, =gText_F700LeftChat
_0801F094:
adds r0, r6, 0
bl sub_81AFC28
@ -42190,52 +42190,52 @@ copy_strings_to_sav1: @ 801F1DC
ldr r0, [r4]
ldr r1, =0x00003c88
adds r0, r1
ldr r1, =gUnknown_085ED40F
ldr r1, =gText_Hello
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003c9d
adds r0, r1
ldr r1, =gUnknown_085ED415
ldr r1, =gText_Pokemon2
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003cb2
adds r0, r1
ldr r1, =gUnknown_085ED41D
ldr r1, =gText_Trade
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003cc7
adds r0, r1
ldr r1, =gUnknown_085ED423
ldr r1, =gText_Battle
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003cdc
adds r0, r1
ldr r1, =gUnknown_085ED42A
ldr r1, =gText_Lets
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003cf1
adds r0, r1
ldr r1, =gUnknown_085ED430
ldr r1, =gText_Ok
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003d06
adds r0, r1
ldr r1, =gUnknown_085ED434
ldr r1, =gText_Sorry
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003d1b
adds r0, r1
ldr r1, =gUnknown_085ED43A
ldr r1, =gText_YayUnkF9F9
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003d30
adds r0, r1
ldr r1, =gUnknown_085ED440
ldr r1, =gText_ThankYou
bl StringCopy
ldr r0, [r4]
ldr r1, =0x00003d45
adds r0, r1
ldr r1, =gUnknown_085ED44A
ldr r1, =gText_ByeBye
bl StringCopy
pop {r4}
pop {r0}
@ -43754,7 +43754,7 @@ sub_801FDDC: @ 801FDDC
bl PutWindowTilemap
ldr r0, [r5]
ldrb r0, [r0, 0x18]
ldr r2, =gUnknown_085EAE62
ldr r2, =gText_Yes
movs r1, 0x1
str r1, [sp]
movs r4, 0xFF
@ -43764,7 +43764,7 @@ sub_801FDDC: @ 801FDDC
bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x18]
ldr r2, =gUnknown_085EAE66
ldr r2, =gText_No
movs r1, 0x11
str r1, [sp]
str r4, [sp, 0x4]
@ -47446,13 +47446,13 @@ _08021C5E:
cmp r3, r2
bne _08021CC0
ldr r0, =gStringVar3
ldr r1, =gUnknown_085ED7D4
ldr r1, =gText_1DotBlueF700
bl StringCopy
b _08021CC8
.pool
_08021CC0:
ldr r0, =gStringVar3
ldr r1, =gUnknown_085ED7E0
ldr r1, =gText_1DotF700
bl StringCopy
_08021CC8:
ldr r4, =gStringVar3
@ -47541,13 +47541,13 @@ sub_8021D34: @ 8021D34
ldr r4, =gUnknown_082F32D8
str r4, [sp]
str r6, [sp, 0x4]
ldr r1, =gUnknown_085ED808
ldr r1, =gText_TimeColon
str r1, [sp, 0x8]
movs r1, 0x2
movs r2, 0
adds r3, r7, 0
bl box_print
ldr r4, =gUnknown_085ED840
ldr r4, =gText_SpaceSec
movs r0, 0x2
adds r1, r4, 0
movs r2, 0x1
@ -47587,7 +47587,7 @@ sub_8021D34: @ 8021D34
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r5, =gStringVar4
ldr r1, =gUnknown_085ED838
ldr r1, =gText_XDotY2
adds r0, r5, 0
bl StringExpandPlaceholders
movs r0, 0x2
@ -47609,7 +47609,7 @@ sub_8021D34: @ 8021D34
adds r2, r6, 0
adds r3, r7, 0
bl box_print
ldr r4, =gUnknown_085ED830
ldr r4, =gText_SpaceMin
movs r0, 0x2
adds r1, r4, 0
movs r2, 0x1
@ -47638,7 +47638,7 @@ sub_8021D34: @ 8021D34
movs r2, 0x2
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085ED82C
ldr r1, =gText_StrVar1
adds r0, r5, 0
bl StringExpandPlaceholders
movs r0, 0x2
@ -47669,13 +47669,13 @@ sub_8021D34: @ 8021D34
str r4, [sp]
mov r1, r10
str r1, [sp, 0x4]
ldr r1, =gUnknown_085ED810
ldr r1, =gText_PressingSpeed
str r1, [sp, 0x8]
movs r1, 0x2
movs r2, 0
adds r3, r7, 0
bl box_print
ldr r4, =gUnknown_085ED850
ldr r4, =gText_TimesPerSec
movs r0, 0x2
adds r1, r4, 0
movs r2, 0x1
@ -47745,7 +47745,7 @@ _08021F0A:
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085ED848
ldr r1, =gText_XDotY3
adds r0, r4, 0
bl StringExpandPlaceholders
movs r2, 0x1
@ -47808,7 +47808,7 @@ _08021FDE:
str r2, [sp]
movs r5, 0
str r5, [sp, 0x4]
ldr r1, =gUnknown_085ED820
ldr r1, =gText_Silkiness
str r1, [sp, 0x8]
movs r1, 0x2
movs r2, 0
@ -47821,7 +47821,7 @@ _08021FDE:
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085ED85C
ldr r1, =gText_Var1Percent
adds r0, r4, 0
bl StringExpandPlaceholders
movs r2, 0x1
@ -47961,7 +47961,7 @@ _0802214E:
adds r0, r6, 0
adds r0, 0x82
ldrb r0, [r0]
ldr r3, =gUnknown_085ED860
ldr r3, =gText_PressesRankings
movs r1, 0x14
movs r2, 0x3
bl sub_80219C8
@ -48012,7 +48012,7 @@ _080221C8:
adds r0, r6, 0
adds r0, 0x82
ldrb r0, [r0]
ldr r3, =gUnknown_085ED878
ldr r3, =gText_CrushingResults
movs r1, 0x16
movs r2, 0x3
bl sub_80219C8
@ -48140,7 +48140,7 @@ _08022296:
b _080224BA
.pool
_080222D0:
ldr r0, =gUnknown_085ED8D0
ldr r0, =gText_BerryCrush2
mov r10, r0
movs r1, 0x1
negs r1, r1
@ -48165,7 +48165,7 @@ _080222D0:
adds r2, r7, 0
movs r3, 0x1
bl box_print
ldr r0, =gUnknown_085ED8DC
ldr r0, =gText_PressingSpeedRankings
mov r10, r0
movs r0, 0x1
mov r1, r10
@ -48195,7 +48195,7 @@ _08022336:
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r0, =gStringVar4
ldr r1, =gUnknown_085ED8F4
ldr r1, =gText_Var1Players
bl StringExpandPlaceholders
ldrb r0, [r6, 0x2]
ldr r1, =gUnknown_082F32D8
@ -48209,7 +48209,7 @@ _08022336:
mov r3, r10
bl box_print
movs r0, 0x1
ldr r1, =gUnknown_085ED850
ldr r1, =gText_TimesPerSec
movs r2, 0x1
negs r2, r2
bl GetStringWidth
@ -48222,7 +48222,7 @@ _08022336:
str r1, [sp]
movs r1, 0
str r1, [sp, 0x4]
ldr r1, =gUnknown_085ED850
ldr r1, =gText_TimesPerSec
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r7, 0
@ -48280,7 +48280,7 @@ _080223CA:
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r0, =gStringVar4
ldr r1, =gUnknown_085ED848
ldr r1, =gText_XDotY3
bl StringExpandPlaceholders
movs r0, 0x1
ldr r1, =gStringVar4
@ -52907,7 +52907,7 @@ sub_802482C: @ 802482C
adds r2, r4, 0
adds r3, r5, 0
bl SetWindowBorderStyle
ldr r2, =gUnknown_085EDCDE
ldr r2, =gText_Powder
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
@ -59274,7 +59274,7 @@ _08027AFE:
ldr r0, [r0]
str r0, [sp]
str r1, [sp, 0x4]
ldr r1, =gUnknown_085EDCE5
ldr r1, =gText_BerryPickingRecords
movs r0, 0x1
movs r2, 0
bl GetStringWidth
@ -59414,7 +59414,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r4, =gUnknown_085EDCE5
ldr r4, =gText_BerryPickingRecords
ldr r0, [sp, 0x18]
lsls r2, r0, 3
movs r0, 0x1
@ -62799,7 +62799,7 @@ _08029728:
bcc _08029700
_0802972E:
movs r5, 0
ldr r4, =gUnknown_085EDE5D
ldr r4, =gText_SpacePoints
cmp r5, r7
bcs _08029754
add r1, sp, 0x34
@ -62939,7 +62939,7 @@ _080297CC:
movs r1, 0
str r1, [sp, 0x8]
movs r1, 0x1
ldr r2, =gUnknown_085EDE5D
ldr r2, =gText_SpacePoints
lsrs r3, 24
bl PrintTextOnWindow
adds r0, r5, 0x1
@ -63057,7 +63057,7 @@ _0802996C:
ldrb r0, [r0]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EDD49
ldr r2, =gText_BerryPickingResults
mov r8, r2
movs r2, 0x1
negs r2, r2
@ -63084,7 +63084,7 @@ _0802996C:
ldr r0, [r4]
add r0, r9
ldrb r0, [r0]
ldr r2, =gUnknown_085EDD6B
ldr r2, =gText_10P30P50P50P
movs r1, 0x11
str r1, [sp]
str r6, [sp, 0x4]
@ -63324,7 +63324,7 @@ _08029BFC:
ldrb r0, [r0]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r6, =gUnknown_085EDD86
ldr r6, =gText_AnnouncingRankings
movs r2, 0x1
negs r2, r2
movs r0, 0x1
@ -63488,7 +63488,7 @@ _08029DA0:
ldrb r0, [r0]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EDD9B
ldr r5, =gText_AnnouncingPrizes
movs r2, 0x1
negs r2, r2
movs r0, 0x1
@ -63525,7 +63525,7 @@ _08029DA0:
adds r1, r5, 0
bl sub_81AFC0C
ldr r7, =gStringVar4
ldr r1, =gUnknown_085EDDBD
ldr r1, =gText_FirstPlacePrize
adds r0, r7, 0
bl sub_81AFC28
ldr r0, [r4]
@ -63559,7 +63559,7 @@ _08029DA0:
bl sub_81AFC0C
cmp r4, 0x2
bne _08029E9C
ldr r1, =gUnknown_085EDDE2
ldr r1, =gText_CantHoldAnyMore
adds r0, r7, 0
bl sub_81AFC28
b _08029EA8
@ -63567,7 +63567,7 @@ _08029DA0:
_08029E9C:
cmp r6, 0x1
bne _08029EA8
ldr r1, =gUnknown_085EDDFB
ldr r1, =gText_FilledStorageSpace
adds r0, r7, 0
bl sub_81AFC28
_08029EA8:
@ -63809,7 +63809,7 @@ _0802A0CC:
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
ldr r2, =gUnknown_085EDE18
ldr r2, =gText_WantToPlayAgain
movs r1, 0x5
str r1, [sp]
movs r3, 0xFF
@ -63823,7 +63823,7 @@ _0802A0CC:
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
ldr r2, =gUnknown_085EAE62
ldr r2, =gText_Yes
str r6, [sp]
mov r3, r9
str r3, [sp, 0x4]
@ -63835,7 +63835,7 @@ _0802A0CC:
ldr r0, [r7]
add r0, r10
ldrb r0, [r0]
ldr r2, =gUnknown_085EAE66
ldr r2, =gText_No
movs r1, 0x11
str r1, [sp]
mov r3, r9
@ -63912,7 +63912,7 @@ _0802A1DC:
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
ldr r2, =gUnknown_085EAE62
ldr r2, =gText_Yes
movs r1, 0x1
str r1, [sp]
movs r3, 0xFF
@ -63927,7 +63927,7 @@ _0802A1DC:
ldr r0, [r7]
add r0, r8
ldrb r0, [r0]
ldr r2, =gUnknown_085EAE66
ldr r2, =gText_No
movs r1, 0x11
str r1, [sp]
mov r3, r10
@ -64234,7 +64234,7 @@ _0802A4AC:
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
ldr r2, =gUnknown_085EDE65
ldr r2, =gText_CommunicationStandby3
movs r1, 0x5
str r1, [sp]
movs r1, 0xFF
@ -64394,7 +64394,7 @@ _0802A610:
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
ldr r2, =gUnknown_085EDE2C
ldr r2, =gText_SomeoneDroppedOut
movs r1, 0x5
str r1, [sp]
movs r1, 0xFF
@ -70271,7 +70271,7 @@ _0802D46A:
strh r0, [r1, 0x12]
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_085EDF2A
ldr r2, =gText_WantToPlayAgain2
movs r1, 0x1
str r1, [sp]
movs r1, 0xFF
@ -70473,7 +70473,7 @@ _0802D606:
strh r0, [r1, 0x12]
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_085EDF3E
ldr r2, =gText_SomeoneDroppedOut2
movs r1, 0x1
str r1, [sp]
movs r1, 0xFF
@ -70553,7 +70553,7 @@ _0802D6AA:
strh r0, [r1, 0x12]
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_085EDF6F
ldr r2, =gText_CommunicationStandby4
movs r1, 0x1
str r1, [sp]
movs r1, 0xFF
@ -70740,7 +70740,7 @@ sub_802D7E8: @ 802D7E8
bl sub_81AFC0C
ldr r0, [r5]
adds r0, 0xA6
ldr r1, =gUnknown_085EDED3
ldr r1, =gText_AwesomeWonF701F700
bl sub_81AFC28
movs r0, 0x4
movs r1, 0x8
@ -70793,7 +70793,7 @@ sub_802D884: @ 802D884
bl sub_81AFC0C
ldr r0, [r4]
adds r0, 0xA6
ldr r1, =gUnknown_085EDEF4
ldr r1, =gText_FilledStorageSpace2
bl sub_81AFC28
movs r0, 0x4
movs r1, 0x8
@ -70846,7 +70846,7 @@ sub_802D8FC: @ 802D8FC
bl sub_81AFC0C
ldr r0, [r4]
adds r0, 0xA6
ldr r1, =gUnknown_085EDF11
ldr r1, =gText_CantHoldMore
bl sub_81AFC28
movs r0, 0x4
movs r1, 0x9
@ -71167,7 +71167,7 @@ sub_802DB8C: @ 802DB8C
str r0, [sp]
movs r4, 0
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EDE7C
ldr r0, =gText_SpacePoints2
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0
@ -71177,7 +71177,7 @@ sub_802DB8C: @ 802DB8C
add r0, sp, 0xC
str r0, [sp]
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EDE84
ldr r0, =gText_SpaceTimes3
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0
@ -72272,7 +72272,7 @@ _0802E416:
ldr r0, [r0]
str r0, [sp]
str r1, [sp, 0x4]
ldr r1, =gUnknown_085EDE8D
ldr r1, =gText_PkmnJumpRecords
movs r0, 0x1
movs r2, 0
bl GetStringWidth
@ -72407,7 +72407,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EDE8D
ldr r5, =gText_PkmnJumpRecords
ldr r1, [sp, 0x1C]
lsls r2, r1, 3
movs r0, 0x1

4
asm/mail.s
View File

@ -691,7 +691,7 @@ _08121A8A:
ldrb r0, [r0]
cmp r0, 0
bne _08121AF0
ldr r1, =gUnknown_085EEA78
ldr r1, =gText_FromSpace
adds r0, r2, 0
bl StringCopy
ldr r0, [r4]
@ -825,7 +825,7 @@ _08121BB8:
cmp r6, r0
bcc _08121B60
_08121BCC:
ldr r1, =gUnknown_085EEA78
ldr r1, =gText_FromSpace
add r0, sp, 0xC
bl StringCopy
ldr r4, =gUnknown_0203A134

8
asm/main_menu.s
View File

@ -4547,7 +4547,7 @@ fmt_time: @ 8031E94
push {r4-r6,lr}
sub sp, 0xC
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCC3
ldr r1, =gText_ContinueMenuPlayer
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3
@ -4589,7 +4589,7 @@ fmt_player: @ 8031EF8
push {r4-r6,lr}
sub sp, 0x2C
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCCA
ldr r1, =gText_ContinueMenuTime
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3
@ -4664,7 +4664,7 @@ _08031FAA:
lsls r0, 16
lsrs r7, r0, 16
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCCF
ldr r1, =gText_ContinueMenuPokedex
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3
@ -4728,7 +4728,7 @@ _08032030:
cmp r4, r0
bls _0803201C
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EDCD7
ldr r1, =gText_ContinueMenuBadges
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r6, =gUnknown_082FF0E3

6
asm/mauville_old_man.s
View File

@ -1400,7 +1400,7 @@ _08120BB0:
movs r2, 0x8
bl memset
mov r0, sp
ldr r1, =gUnknown_085EDFB0
ldr r1, =gText_Friend
bl StringCopy
adds r0, r5, 0
mov r1, sp
@ -2218,7 +2218,7 @@ sub_8121178: @ 8121178
sub_81211EC: @ 81211EC
push {r4,r5,lr}
sub sp, 0xC
ldr r1, =gUnknown_085EB7EA
ldr r1, =gText_Exit
movs r0, 0x1
movs r2, 0
bl GetStringWidth
@ -2309,7 +2309,7 @@ _08121272:
_081212AA:
ldr r5, =gUnknown_0203A130
ldrb r0, [r5]
ldr r2, =gUnknown_085EB7EA
ldr r2, =gText_Exit
lsls r1, r4, 4
adds r1, 0x1
lsls r1, 24

8
asm/menu.s
View File

@ -1250,7 +1250,7 @@ RedrawMenuCursor: @ 8198448
bl FillWindowPixelRect
ldrb r0, [r5, 0x5]
ldrb r1, [r5, 0x6]
ldr r2, =gUnknown_085EE498
ldr r2, =gText_SelectorArrow3
ldrb r3, [r5]
ldrb r4, [r5, 0x8]
mov r6, r8
@ -2139,7 +2139,7 @@ sub_8198AF8: @ 8198AF8
adds r2, r4, 0
adds r3, r5, 0
bl SetWindowBorderStyle
ldr r0, =gUnknown_085EE491
ldr r0, =gText_YesNo
str r0, [sp, 0xC]
add r1, sp, 0xC
ldrb r0, [r7]
@ -2877,7 +2877,7 @@ sub_8199060: @ 8199060
lsrs r3, 24
ldrb r0, [r5, 0x5]
ldrb r1, [r5, 0x6]
ldr r2, =gUnknown_085EE498
ldr r2, =gText_SelectorArrow3
str r3, [sp]
movs r3, 0
str r3, [sp, 0x4]
@ -3668,7 +3668,7 @@ CreateYesNoMenu: @ 81996C0
adds r2, r4, 0
adds r3, r5, 0
bl SetWindowBorderStyle
ldr r0, =gUnknown_085EE491
ldr r0, =gText_YesNo
str r0, [sp]
mov r1, sp
mov r2, r8

2
asm/money.s
View File

@ -105,7 +105,7 @@ _080E5258:
cmp r0, 0
bgt _080E5258
_080E5264:
ldr r1, =gUnknown_085E969C
ldr r1, =gText_PokedollarVar1
adds r0, r2, 0
bl StringExpandPlaceholders
ldr r2, =gStringVar4

12
asm/mystery_event_menu.s
View File

@ -115,7 +115,7 @@ sub_8178A40: @ 8178A40
movs r5, 0x1
cmp r4, 0
bne _08178A54
ldr r1, =gUnknown_085EE80A
ldr r1, =gText_EventSafelyLoaded
bl StringCopy
movs r5, 0
_08178A54:
@ -125,7 +125,7 @@ _08178A54:
_08178A5A:
cmp r4, 0x1
bne _08178A66
ldr r1, =gUnknown_085EE827
ldr r1, =gText_LoadErrorEndingSession
adds r0, r6, 0
bl StringCopy
_08178A66:
@ -204,7 +204,7 @@ _08178B12:
beq _08178B20
b _08178E58
_08178B20:
ldr r1, =gUnknown_085EE765
ldr r1, =gText_LinkStandby2
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -256,7 +256,7 @@ _08178B8E:
_08178B98:
movs r0, 0x15
bl PlaySE
ldr r1, =gUnknown_085EE788
ldr r1, =gText_PressAToLoadEvent
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -301,7 +301,7 @@ _08178BDC:
movs r2, 0x1
movs r3, 0xD
bl SetWindowBorderStyle
ldr r1, =gUnknown_085EE7BF
ldr r1, =gText_LoadingEvent
movs r0, 0
str r0, [sp]
movs r0, 0x1
@ -373,7 +373,7 @@ _08178CAC:
lsls r0, 24
cmp r0, 0
beq _08178CCC
ldr r1, =gUnknown_085EE7CE
ldr r1, =gText_DontRemoveCableTurnOff
movs r0, 0x1
str r0, [sp]
movs r0, 0

2
asm/mystery_event_script.s
View File

@ -782,7 +782,7 @@ sub_8153E1C: @ 8153E1C
adds r4, r0, 0
bl EnableResetRTC
ldr r0, =gStringVar4
ldr r1, =gUnknown_085ECAD8
ldr r1, =gText_InGameClockUsable
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r4, 0x6C]

2
asm/naming_screen.s
View File

@ -4033,7 +4033,7 @@ sub_80E4EF0: @ 80E4EF0
str r1, [sp]
movs r1, 0
str r1, [sp, 0x4]
ldr r1, =gUnknown_085EEAF6
ldr r1, =gText_MoveOkBack
str r1, [sp, 0x8]
movs r1, 0
movs r2, 0x2

30
asm/option_menu.s
View File

@ -906,7 +906,7 @@ sub_80BAC38: @ 80BAC38
adds r1, r0
movs r0, 0x1
strb r0, [r1]
ldr r4, =gUnknown_085EE5D4
ldr r4, =gText_TextSpeedSlow
mov r0, sp
ldrb r3, [r0]
adds r0, r4, 0
@ -917,14 +917,14 @@ sub_80BAC38: @ 80BAC38
movs r2, 0
bl GetStringWidth
adds r4, r0, 0
ldr r0, =gUnknown_085EE5DF
ldr r0, =gText_TextSpeedMid
mov r8, r0
movs r0, 0x1
mov r1, r8
movs r2, 0
bl GetStringWidth
adds r5, r0, 0
ldr r6, =gUnknown_085EE5E9
ldr r6, =gText_TextSpeedFast
movs r0, 0x1
adds r1, r6, 0
movs r2, 0
@ -1000,13 +1000,13 @@ sub_80BAD08: @ 80BAD08
adds r1, r0
movs r0, 0x1
strb r0, [r1]
ldr r0, =gUnknown_085EE5F4
ldr r0, =gText_BattleSceneOn
mov r1, sp
ldrb r3, [r1]
movs r1, 0x68
movs r2, 0x10
bl sub_80BAB68
ldr r4, =gUnknown_085EE5FD
ldr r4, =gText_BattleSceneOff
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xC6
@ -1061,13 +1061,13 @@ sub_80BAD84: @ 80BAD84
adds r1, r0
movs r0, 0x1
strb r0, [r1]
ldr r0, =gUnknown_085EE607
ldr r0, =gText_BattleStyleShift
mov r1, sp
ldrb r3, [r1]
movs r1, 0x68
movs r2, 0x20
bl sub_80BAB68
ldr r4, =gUnknown_085EE613
ldr r4, =gText_BattleStyleSet
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xC6
@ -1125,13 +1125,13 @@ sub_80BAE08: @ 80BAE08
adds r1, r0
movs r0, 0x1
strb r0, [r1]
ldr r0, =gUnknown_085EE61D
ldr r0, =gText_SoundMono
mov r1, sp
ldrb r3, [r1]
movs r1, 0x68
movs r2, 0x30
bl sub_80BAB68
ldr r4, =gUnknown_085EE628
ldr r4, =gText_SoundStereo
movs r0, 0x1
adds r1, r4, 0
movs r2, 0xC6
@ -1243,9 +1243,9 @@ sub_80BAF0C: @ 80BAF0C
adds r0, r1
lsrs r6, r0, 24
movs r5, 0
ldr r1, =gUnknown_085EE640
ldr r1, =gText_FrameTypeNumber
ldrb r0, [r1]
ldr r7, =gUnknown_085EE635
ldr r7, =gText_FrameType
cmp r0, 0xFF
beq _080BAF44
adds r2, r1, 0
@ -1394,7 +1394,7 @@ sub_80BB028: @ 80BB028
adds r1, r0
movs r0, 0x1
strb r0, [r1]
ldr r4, =gUnknown_085EE647
ldr r4, =gText_ButtonTypeNormal
mov r0, sp
ldrb r3, [r0]
adds r0, r4, 0
@ -1406,14 +1406,14 @@ sub_80BB028: @ 80BB028
movs r2, 0
bl GetStringWidth
adds r4, r0, 0
ldr r0, =gUnknown_085EE654
ldr r0, =gText_ButtonTypeLR
mov r8, r0
movs r0, 0x1
mov r1, r8
movs r2, 0
bl GetStringWidth
adds r5, r0, 0
ldr r6, =gUnknown_085EE65D
ldr r6, =gText_ButtonTypeLEqualsA
movs r0, 0x1
adds r1, r6, 0
movs r2, 0
@ -1461,7 +1461,7 @@ sub_80BB0D0: @ 80BB0D0
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EE589
ldr r2, =gText_Option
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF

186
asm/party_menu.s
View File

@ -2484,7 +2484,7 @@ sub_81B1660: @ 81B1660
ands r1, r0
cmp r1, 0x2
bne _081B1680
ldr r5, =gUnknown_085EA110
ldr r5, =gText_CancelParticipation
b _081B168A
.pool
_081B1680:
@ -3290,7 +3290,7 @@ sub_81B1C84: @ 81B1C84
adds r0, r4, 0
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E991B
ldr r1, =gText_PkmnWasGivenItem
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -3319,7 +3319,7 @@ sub_81B1CD0: @ 81B1CD0
adds r0, r4, 0
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E999D
ldr r1, =gText_RecievedItemFromPkmn
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -3348,7 +3348,7 @@ sub_81B1D1C: @ 81B1D1C
adds r0, r4, 0
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E993A
ldr r1, =gText_SwitchPkmnItem
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -3379,7 +3379,7 @@ sub_81B1D68: @ 81B1D68
adds r0, r4, 0
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E99DB
ldr r1, =gText_SwitchedPkmnItem
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -3474,7 +3474,7 @@ _081B1E3E:
pokemon_item_not_removed: @ 81B1E48
push {lr}
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9A69
ldr r1, =gText_BagFullCouldNotRemoveItem
bl StringExpandPlaceholders
pop {r0}
bx r0
@ -3937,7 +3937,7 @@ sub_81B21AC: @ 81B21AC
_081B21DC:
movs r0, 0x20
bl PlaySE
ldr r0, =gUnknown_085EA0EE
ldr r0, =gText_PkmnCantParticipate
movs r1, 0
bl sub_81B1B5C
movs r0, 0x2
@ -3962,7 +3962,7 @@ sub_81B2210: @ 81B2210
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_085EA110
ldr r0, =gText_CancelParticipation
movs r1, 0x1
bl sub_81B1B5C
movs r0, 0x2
@ -6407,7 +6407,7 @@ _081B3674:
cmp r6, 0
bne _081B36C0
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9980
ldr r1, =gText_PkmnNotHolding
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -8348,7 +8348,7 @@ _081B4788:
adds r0, r5, 0
bl GetMonNickname
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9980
ldr r1, =gText_PkmnNotHolding
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -8409,7 +8409,7 @@ sub_81B47E0: @ 81B47E0
adds r0, r7, 0
bl GetMonNickname
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9980
ldr r1, =gText_PkmnNotHolding
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -8428,7 +8428,7 @@ _081B4864:
adds r0, r5, 0
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9E00
ldr r1, =gText_ThrowAwayItem
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -8511,7 +8511,7 @@ _081B491A:
ldr r1, =gStringVar1
bl CopyItemName
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9E14
ldr r1, =gText_ItemThrownAway
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -8731,7 +8731,7 @@ brm_take_2: @ 81B4B20
ldr r0, [r5]
adds r0, 0xC
bl sub_81B302C
ldr r0, =gUnknown_085E9855
ldr r0, =gText_SendMailToPC
movs r1, 0x1
bl sub_81B1B5C
ldr r1, =gTasks
@ -8806,7 +8806,7 @@ _081B4BC6:
lsrs r0, 24
cmp r0, 0xFF
beq _081B4C0C
ldr r0, =gUnknown_085E9877
ldr r0, =gText_MailSentToPC
movs r1, 0
bl sub_81B1B5C
ldr r1, =gTasks
@ -8818,7 +8818,7 @@ _081B4BC6:
b _081B4C4A
.pool
_081B4C0C:
ldr r0, =gUnknown_085E9897
ldr r0, =gText_PCMailboxFull
movs r1, 0
bl sub_81B1B5C
ldr r1, =gTasks
@ -8833,7 +8833,7 @@ _081B4C30:
movs r0, 0x5
bl PlaySE
_081B4C36:
ldr r0, =gUnknown_085E98B4
ldr r0, =gText_MailMessageWillBeLost
movs r1, 0x1
bl sub_81B1B5C
ldr r1, =gTasks
@ -8926,7 +8926,7 @@ _081B4CBE:
muls r0, r7
adds r0, r6
bl sub_80D4680
ldr r0, =gUnknown_085E99B8
ldr r0, =gText_MailTakenFromPkmn
movs r1, 0
bl sub_81B1B5C
ldr r1, =gTasks
@ -9167,7 +9167,7 @@ _081B4F36:
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9830
ldr r1, =gText_NoMoreThanVar1Pkmn
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x20
@ -9411,13 +9411,13 @@ sub_81B50C8: @ 81B50C8
.pool
_081B515C:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA210
ldr r1, =gText_PkmnCantBeTradedNow
bl StringExpandPlaceholders
b _081B5178
.pool
_081B5170:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA234
ldr r1, =gText_EggCantBeTradedNow
bl StringExpandPlaceholders
_081B5178:
movs r0, 0x20
@ -9430,7 +9430,7 @@ _081B5178:
adds r0, 0xD
bl sub_81B302C
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA1CA
ldr r1, =gText_PauseUntilPress
adds r0, r4, 0
bl StringAppend
adds r0, r4, 0
@ -9530,7 +9530,7 @@ brm_trade_1: @ 81B51D4
ldr r0, [r4]
adds r0, 0xD
bl sub_81B302C
ldr r1, =gUnknown_085EA1CA
ldr r1, =gText_PauseUntilPress
adds r0, r5, 0
bl StringAppend
adds r0, r5, 0
@ -9594,19 +9594,19 @@ _081B5328:
b _081B5368
_081B532E:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA1E8
ldr r1, =gText_OnlyPkmnForBattle
bl StringExpandPlaceholders
b _081B53C0
.pool
_081B5340:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA210
ldr r1, =gText_PkmnCantBeTradedNow
bl StringExpandPlaceholders
b _081B53C0
.pool
_081B5354:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA234
ldr r1, =gText_EggCantBeTradedNow
bl StringExpandPlaceholders
b _081B53C0
.pool
@ -9623,7 +9623,7 @@ _081B5368:
ldr r1, =gStringVar1
bl GetMonNickname
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA1CD
ldr r1, =gJPText_PutVar1IntoSpinner
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -9641,7 +9641,7 @@ _081B53C0:
movs r0, 0x20
bl PlaySE
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA1CA
ldr r1, =gText_PauseUntilPress
adds r0, r4, 0
bl StringAppend
adds r0, r4, 0
@ -9787,7 +9787,7 @@ _081B54E8:
lsrs r0, 24
cmp r0, 0x1
beq _081B5524
ldr r0, =gUnknown_085E97FC
ldr r0, =gText_CantUseUntilNewBadge
movs r1, 0x1
bl sub_81B1B5C
ldr r1, =gTasks
@ -9852,7 +9852,7 @@ _081B557C:
ldrb r1, [r1, 0x14]
bl sub_81245DC
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA196
ldr r1, =gText_ReturnToHealingSpot
b _081B55E8
.pool
_081B55B8:
@ -9877,7 +9877,7 @@ _081B55B8:
ldrb r1, [r1, 0x14]
bl sub_81245DC
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA16B
ldr r1, =gText_EscapeFromHere
_081B55E8:
bl StringExpandPlaceholders
adds r0, r6, 0
@ -11562,102 +11562,102 @@ _081B6334:
.4byte _081B64A8
_081B6380:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9C3E
ldr r1, =gText_PkmnCuredOfPoison
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B6394:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9C7C
ldr r1, =gText_PkmnWokeUp2
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B63A8:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9C8A
ldr r1, =gText_PkmnBurnHealed
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B63BC:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9CA2
ldr r1, =gText_PkmnThawedOut
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B63D0:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9C5F
ldr r1, =gText_PkmnCuredOfParalysis
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B63E4:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9DBE
ldr r1, =gText_PkmnSnappedOutOfConfusion
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B63F8:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9DE1
ldr r1, =gText_PkmnGotOverInfatuation
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B640C:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9CE0
ldr r1, =gText_PkmnBecameHealthy
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B6420:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085E96E3
ldr r1, =gText_HP3
b _081B6474
.pool
_081B6430:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA33C
ldr r1, =gText_Attack3
b _081B6474
.pool
_081B6440:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA343
ldr r1, =gText_Defense3
b _081B6474
.pool
_081B6450:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085EA35B
ldr r1, =gText_Speed2
b _081B6474
.pool
_081B6460:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085E96E6
ldr r1, =gText_SpAtk3
b _081B6474
.pool
_081B6470:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085E96EE
ldr r1, =gText_SpDef3
_081B6474:
bl StringCopy
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9D25
ldr r1, =gText_PkmnBaseVar2StatIncreased
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B6494:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9CF5
ldr r1, =gText_MovesPPIncreased
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B64A8:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9CB7
ldr r1, =gText_PPWasRestored
bl StringExpandPlaceholders
b _081B64C4
.pool
_081B64BC:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E96F6
ldr r1, =gText_WontHaveEffect
bl StringExpandPlaceholders
_081B64C4:
pop {r0}
@ -11830,7 +11830,7 @@ _081B6600:
strb r0, [r1]
movs r0, 0x5
bl PlaySE
ldr r0, =gUnknown_085E96F6
ldr r0, =gText_WontHaveEffect
b _081B66F4
.pool
_081B6624:
@ -11964,7 +11964,7 @@ sub_81B672C: @ 81B672C
ldr r1, =gStringVar1
bl GetMonNickname
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9C17
ldr r1, =gText_PkmnHPRestoredByVar2
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -12083,7 +12083,7 @@ _081B6850:
strb r0, [r1]
movs r0, 0x5
bl PlaySE
ldr r0, =gUnknown_085E96F6
ldr r0, =gText_WontHaveEffect
b _081B68E2
.pool
_081B6874:
@ -12108,19 +12108,19 @@ _081B6874:
cmp r0, r8
beq _081B68C4
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9D45
ldr r1, =gText_PkmnFriendlyBaseVar2Fell
bl StringExpandPlaceholders
b _081B68E0
.pool
_081B68C4:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9D90
ldr r1, =gText_PkmnFriendlyBaseVar2CantFall
bl StringExpandPlaceholders
b _081B68E0
.pool
_081B68D8:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9D6D
ldr r1, =gText_PkmnAdoresBaseVar2Fell
bl StringExpandPlaceholders
_081B68E0:
ldr r0, =gStringVar4
@ -12239,30 +12239,30 @@ _081B69B8:
.4byte _081B69E8
.4byte _081B69E0
_081B69D0:
ldr r1, =gUnknown_085E96E3
ldr r1, =gText_HP3
b _081B69F2
.pool
_081B69D8:
ldr r1, =gUnknown_085EA33C
ldr r1, =gText_Attack3
b _081B69F2
.pool
_081B69E0:
ldr r1, =gUnknown_085EA343
ldr r1, =gText_Defense3
b _081B69F2
.pool
_081B69E8:
ldr r1, =gUnknown_085EA35B
ldr r1, =gText_Speed2
b _081B69F2
.pool
_081B69F0:
ldr r1, =gUnknown_085E96E6
ldr r1, =gText_SpAtk3
_081B69F2:
adds r0, r2, 0
bl StringCopy
b _081B6A08
.pool
_081B6A00:
ldr r1, =gUnknown_085E96EE
ldr r1, =gText_SpDef3
adds r0, r2, 0
bl StringCopy
_081B6A08:
@ -12517,7 +12517,7 @@ ether_effect_related: @ 81B6BEC
strb r4, [r0]
movs r0, 0x5
bl PlaySE
ldr r0, =gUnknown_085E96F6
ldr r0, =gText_WontHaveEffect
b _081B6C7E
.pool
_081B6C34:
@ -12775,18 +12775,18 @@ sub_81B6DC4: @ 81B6DC4
b _081B6E9C
.pool
_081B6E70:
ldr r1, =gUnknown_085E9AB4
ldr r1, =gText_PkmnCantLearnMove
b _081B6E7A
.pool
_081B6E78:
ldr r1, =gUnknown_085E9C00
ldr r1, =gText_PkmnAlreadyKnows
_081B6E7A:
adds r0, r6, 0
bl sub_81B6D98
b _081B6E9C
.pool
_081B6E88:
ldr r0, =gUnknown_085E9AE9
ldr r0, =gText_PkmnNeedsToReplaceMove
bl sub_81B6D74
ldr r1, =gTasks
lsls r0, r6, 2
@ -12847,7 +12847,7 @@ _081B6EF0:
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9AA5
ldr r1, =gText_PkmnLearnedMove3
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -12987,7 +12987,7 @@ _081B7048:
beq _081B707A
b _081B7080
_081B704E:
ldr r0, =gUnknown_085E9B96
ldr r0, =gText_WhichMoveToForget
movs r1, 0x1
bl sub_81B1B5C
ldr r1, =gTasks
@ -13142,7 +13142,7 @@ sub_81B7154: @ 81B7154
ldr r2, =gMoveNames
adds r1, r2
bl StringCopy
ldr r0, =gUnknown_085E9BB8
ldr r0, =gText_12PoofForgotMove
bl sub_81B6D74
ldr r1, =gTasks
lsls r0, r6, 2
@ -13214,7 +13214,7 @@ sub_81B7230: @ 81B7230
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9B5D
ldr r1, =gText_StopLearningMove2
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -13302,7 +13302,7 @@ _081B7306:
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9B76
ldr r1, =gText_MoveNotLearned
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -13352,7 +13352,7 @@ _081B7392:
ldr r2, =gMoveNames
adds r1, r2
bl StringCopy
ldr r0, =gUnknown_085E9AE9
ldr r0, =gText_PkmnNeedsToReplaceMove
bl sub_81B6D74
ldr r1, =gTasks
lsls r0, r6, 2
@ -13444,7 +13444,7 @@ _081B747A:
ldr r1, =gUnknown_0203CEE8
movs r0, 0
strb r0, [r1]
ldr r0, =gUnknown_085E96F6
ldr r0, =gText_WontHaveEffect
movs r1, 0x1
bl sub_81B1B5C
movs r0, 0x2
@ -13484,7 +13484,7 @@ _081B74B4:
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9D0A
ldr r1, =gText_PkmnElevatedToLvVar2
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -13915,7 +13915,7 @@ sub_81B787C: @ 81B787C
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9AE9
ldr r1, =gText_PkmnNeedsToReplaceMove
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -13969,7 +13969,7 @@ sub_81B7910: @ 81B7910
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9AA5
ldr r1, =gText_PkmnLearnedMove3
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -14225,7 +14225,7 @@ _081B7B82:
bne _081B7BC8
ldr r0, =gUnknown_0203CEE8
strb r1, [r0]
ldr r0, =gUnknown_085E96F6
ldr r0, =gText_WontHaveEffect
movs r1, 0x1
bl sub_81B1B5C
movs r0, 0x2
@ -14278,7 +14278,7 @@ sub_81B7C10: @ 81B7C10
ldr r1, =gStringVar1
bl GetMonNickname
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9C17
ldr r1, =gText_PkmnHPRestoredByVar2
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
@ -14322,7 +14322,7 @@ sub_81B7C74: @ 81B7C74
ldr r1, =gUnknown_0203CEE8
movs r0, 0
strb r0, [r1]
ldr r0, =gUnknown_085E96F6
ldr r0, =gText_WontHaveEffect
movs r1, 0x1
bl sub_81B1B5C
movs r0, 0x2
@ -14613,18 +14613,18 @@ sub_81B7E4C: @ 81B7E4C
b _081B7F1C
.pool
_081B7EF0:
ldr r1, =gUnknown_085E9AB4
ldr r1, =gText_PkmnCantLearnMove
b _081B7EFA
.pool
_081B7EF8:
ldr r1, =gUnknown_085E9C00
ldr r1, =gText_PkmnAlreadyKnows
_081B7EFA:
adds r0, r6, 0
bl sub_81B6D98
b _081B7F1C
.pool
_081B7F08:
ldr r0, =gUnknown_085E9AE9
ldr r0, =gText_PkmnNeedsToReplaceMove
bl sub_81B6D74
ldr r1, =gTasks
lsls r0, r6, 2
@ -15152,7 +15152,7 @@ sub_81B83B8: @ 81B83B8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_085E98EC
ldr r0, =gText_RemoveMailBeforeItem
movs r1, 0x1
bl sub_81B1B5C
movs r0, 0x2
@ -15273,7 +15273,7 @@ sub_81B8474: @ 81B8474
bl GetMonData
cmp r0, 0
beq _081B84DC
ldr r0, =gUnknown_085E9A08
ldr r0, =gText_PkmnHoldingItemCantHoldMail
movs r1, 0x1
bl sub_81B1B5C
b _081B84F2
@ -15284,7 +15284,7 @@ _081B84DC:
bl sub_80D460C
adds r0, r4, 0
bl sub_80D439C
ldr r0, =gUnknown_085E9A40
ldr r0, =gText_MailTransferredFromMailbox
movs r1, 0x1
bl sub_81B1B5C
_081B84F2:
@ -15785,7 +15785,7 @@ sub_81B88BC: @ 81B88BC
lsrs r0, 24
cmp r0, 0x1
bhi _081B88E0
ldr r0, =gUnknown_085EA126
ldr r0, =gText_CancelBattle
b _081B88FA
.pool
_081B88E0:
@ -15795,11 +15795,11 @@ _081B88E0:
ldrh r0, [r0]
cmp r0, 0x2
bne _081B88F8
ldr r0, =gUnknown_085EA139
ldr r0, =gText_ReturnToWaitingRoom
b _081B88FA
.pool
_081B88F8:
ldr r0, =gUnknown_085EA155
ldr r0, =gText_CancelChallenge
_081B88FA:
pop {r1}
bx r1
@ -16015,7 +16015,7 @@ _081B8AA2:
adds r0, r4, 0
bl StringCopy
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E97B2
ldr r1, =gText_CantSwitchWithAlly
b _081B8C42
.pool
_081B8AC4:
@ -16033,7 +16033,7 @@ _081B8AC4:
adds r0, r4, 0
bl GetMonNickname
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E978F
ldr r1, =gText_PkmnHasNoEnergy
b _081B8C42
.pool
_081B8AF8:
@ -16076,7 +16076,7 @@ _081B8B24:
cmp r0, 0
beq _081B8B60
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E97E5
ldr r1, =gText_EggCantBattle
b _081B8C42
.pool
_081B8B60:
@ -16094,7 +16094,7 @@ _081B8B60:
adds r0, r6, 0
bl GetMonNickname
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E976F
ldr r1, =gText_PkmnAlreadySelected
b _081B8C42
.pool
_081B8B94:
@ -16144,7 +16144,7 @@ _081B8BFC:
ldr r1, =gStringVar1
bl GetMonNickname
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9754
ldr r1, =gText_PkmnAlreadyInBattle
b _081B8C42
.pool
_081B8C20:
@ -16162,7 +16162,7 @@ _081B8C20:
ldr r1, =gStringVar1
bl GetMonNickname
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9738
ldr r1, =gText_PkmnCantSwitchOut
_081B8C42:
bl StringExpandPlaceholders
_081B8C46:

28
asm/player_pc.s
View File

@ -309,7 +309,7 @@ sub_816B0A8: @ 816B0A8
lsls r0, 24
cmp r0, 0
bne _0816B0D8
ldr r1, =gUnknown_085EAC4B
ldr r1, =gText_NoMailHere
ldr r2, =sub_816B060
adds r0, r4, 0
bl DisplayItemMessageOnField
@ -344,7 +344,7 @@ _0816B0D8:
b _0816B12A
.pool
_0816B120:
ldr r1, =gUnknown_085EAC4B
ldr r1, =gText_NoMailHere
ldr r2, =sub_816B060
adds r0, r6, 0
bl DisplayItemMessageOnField
@ -661,7 +661,7 @@ sub_816B398: @ 816B398
_0816B3C4:
adds r0, r5, 0
bl sub_816B4DC
ldr r1, =gUnknown_085EABD1
ldr r1, =gText_NoItems
ldr r2, =task_pc_itemstorage
adds r0, r5, 0
bl DisplayItemMessageOnField
@ -696,7 +696,7 @@ sub_816B3E4: @ 816B3E4
_0816B410:
adds r0, r5, 0
bl sub_816B4DC
ldr r1, =gUnknown_085EABD1
ldr r1, =gText_NoItems
ldr r2, =task_pc_itemstorage
adds r0, r5, 0
bl DisplayItemMessageOnField
@ -950,7 +950,7 @@ sub_816B5F8: @ 816B5F8
lsrs r4, 24
movs r0, 0x1
bl sub_81D1C84
ldr r6, =gUnknown_085EAB4E
ldr r6, =gText_Mailbox
movs r0, 0x1
adds r1, r6, 0
movs r2, 0x40
@ -1098,7 +1098,7 @@ sub_816B730: @ 816B730
movs r1, 0
bl sub_81DB554
ldr r5, =gStringVar4
ldr r1, =gUnknown_085EAC63
ldr r1, =gText_WhatToDoWithVar1sMail
adds r0, r5, 0
bl StringExpandPlaceholders
ldr r2, =sub_816B7DC
@ -1345,7 +1345,7 @@ sub_816B994: @ 816B994
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085EAC8D
ldr r1, =gText_MessageWillBeLost
ldr r2, =sub_816B9B0
bl DisplayItemMessageOnField
pop {r0}
@ -1432,14 +1432,14 @@ sub_816BA18: @ 816BA18
lsls r0, 24
cmp r0, 0
bne _0816BA68
ldr r1, =gUnknown_085EACB5
ldr r1, =gText_BagIsFull
ldr r2, =sub_816BBD4
adds r0, r6, 0
bl DisplayItemMessageOnField
b _0816BA9C
.pool
_0816BA68:
ldr r1, =gUnknown_085EACC8
ldr r1, =gText_MailToBagMessageErased
ldr r2, =sub_816BBD4
adds r0, r6, 0
bl DisplayItemMessageOnField
@ -2293,10 +2293,10 @@ _0816C16C:
bls _0816C16C
movs r1, 0x6
ldrsh r0, [r7, r1]
ldr r5, =gUnknown_085EAB71
ldr r5, =gText_TossItem
cmp r0, 0
bne _0816C186
ldr r5, =gUnknown_085EAB63
ldr r5, =gText_WithdrawItem
_0816C186:
movs r0, 0x1
adds r1, r5, 0
@ -2383,11 +2383,11 @@ _0816C26C:
b _0816C2BA
.pool
_0816C274:
ldr r0, =gUnknown_085EAC09
ldr r0, =gText_WithdrawHowManyItems
b _0816C2BA
.pool
_0816C27C:
ldr r0, =gUnknown_085EAC22
ldr r0, =gText_WithdrawXItems
b _0816C2BA
.pool
_0816C284:
@ -2399,7 +2399,7 @@ _0816C28C:
b _0816C2BA
.pool
_0816C294:
ldr r0, =gUnknown_085EABE7
ldr r0, =gText_NoRoomInBag
b _0816C2BA
.pool
_0816C29C:

6
asm/pokeblock_feed.s
View File

@ -718,7 +718,7 @@ sub_817A1C4: @ 817A1C4
cmp r0, 0
bne _0817A248
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E937F
ldr r1, =gText_Var1AteTheVar2
bl StringExpandPlaceholders
b _0817A268
.pool
@ -726,13 +726,13 @@ _0817A248:
cmp r0, 0
ble _0817A260
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9390
ldr r1, =gText_Var1HappilyAteVar2
bl StringExpandPlaceholders
b _0817A268
.pool
_0817A260:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E93A9
ldr r1, =gText_Var1DisdainfullyAteVar2
bl StringExpandPlaceholders
_0817A268:
ldr r2, =gTextFlags

6
asm/pokemon_storage_system.s
View File

@ -586,7 +586,7 @@ _080C73F6:
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EBCAD
ldr r2, =gText_PartyFull
str r4, [sp]
movs r0, 0x2
str r0, [sp, 0x4]
@ -609,7 +609,7 @@ _080C7428:
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_085EBC89
ldr r2, =gText_JustOnePkmn
movs r0, 0
str r0, [sp]
movs r0, 0x2
@ -1020,7 +1020,7 @@ _080C779E:
lsls r0, r5, 24
lsrs r0, 24
bl sav3_get_box_name
ldr r1, =gUnknown_085EBCC1
ldr r1, =gText_Box
bl StringCopy
adds r4, r5, 0x1
adds r1, r4, 0

92
asm/pokemon_summary_screen.s
View File

@ -5413,7 +5413,7 @@ _081C284A:
sub_81C286C: @ 81C286C
push {r4-r7,lr}
sub sp, 0x8
ldr r1, =gUnknown_085EA3CF
ldr r1, =gText_PkmnInfo
movs r5, 0
str r5, [sp]
movs r6, 0x1
@ -5422,21 +5422,21 @@ sub_81C286C: @ 81C286C
movs r2, 0x2
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA3DC
ldr r1, =gText_PkmnSkills
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0x1
movs r2, 0x2
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA3EB
ldr r1, =gText_BattleMoves
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0x2
movs r2, 0x2
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA3F8
ldr r1, =gText_ContestMoves
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0x3
@ -5466,7 +5466,7 @@ _081C28CC:
adds r1, r7, 0
movs r3, 0x1
bl sub_81C25A4
ldr r7, =gUnknown_085EA406
ldr r7, =gText_Info
movs r0, 0x1
adds r1, r7, 0
movs r2, 0x3E
@ -5489,7 +5489,7 @@ _081C28FE:
adds r1, r7, 0
movs r3, 0x1
bl sub_81C25A4
ldr r7, =gUnknown_085EA3C8
ldr r7, =gText_Switch
movs r0, 0x1
adds r1, r7, 0
movs r2, 0x3E
@ -5512,21 +5512,21 @@ _081C2930:
adds r1, r7, 0
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA369
ldr r1, =gText_RentalPkmn
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0x8
movs r2, 0
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA378
ldr r1, =gText_TypeSlash
str r5, [sp]
str r5, [sp, 0x4]
movs r0, 0x9
movs r2, 0
movs r3, 0x1
bl sub_81C25A4
ldr r4, =gUnknown_085EA361
ldr r4, =gText_HP4
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x2A
@ -5540,7 +5540,7 @@ _081C2930:
adds r1, r4, 0
movs r3, 0x1
bl sub_81C25A4
ldr r4, =gUnknown_085EA33C
ldr r4, =gText_Attack3
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x2A
@ -5554,7 +5554,7 @@ _081C2930:
adds r1, r4, 0
movs r3, 0x11
bl sub_81C25A4
ldr r4, =gUnknown_085EA343
ldr r4, =gText_Defense3
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x2A
@ -5568,7 +5568,7 @@ _081C2930:
adds r1, r4, 0
movs r3, 0x21
bl sub_81C25A4
ldr r4, =gUnknown_085EA34B
ldr r4, =gText_SpAtk4
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x24
@ -5582,7 +5582,7 @@ _081C2930:
adds r1, r4, 0
movs r3, 0x1
bl sub_81C25A4
ldr r4, =gUnknown_085EA353
ldr r4, =gText_SpDef4
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x24
@ -5596,7 +5596,7 @@ _081C2930:
adds r1, r4, 0
movs r3, 0x11
bl sub_81C25A4
ldr r4, =gUnknown_085EA35B
ldr r4, =gText_Speed2
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x24
@ -5610,49 +5610,49 @@ _081C2930:
adds r1, r4, 0
movs r3, 0x21
bl sub_81C25A4
ldr r1, =gUnknown_085EA39F
ldr r1, =gText_ExpPoints
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0xC
movs r2, 0x6
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA3AB
ldr r1, =gText_NextLv
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0xC
movs r2, 0x6
movs r3, 0x11
bl sub_81C25A4
ldr r1, =gUnknown_085EA398
ldr r1, =gText_Status
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0xD
movs r2, 0x2
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA37E
ldr r1, =gText_Power
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0xE
movs r2, 0
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA384
ldr r1, =gText_Accuracy2
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0xE
movs r2, 0
movs r3, 0x11
bl sub_81C25A4
ldr r1, =gUnknown_085EA38D
ldr r1, =gText_Appeal
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0xF
movs r2, 0
movs r3, 0x1
bl sub_81C25A4
ldr r1, =gUnknown_085EA394
ldr r1, =gText_Jam
str r5, [sp]
str r6, [sp, 0x4]
movs r0, 0xF
@ -6126,7 +6126,7 @@ sub_81C2EC4: @ 81C2EC4
bl sub_81C2D2C
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gUnknown_085EA365
ldr r4, =gText_OTSlash
movs r6, 0
str r6, [sp]
movs r0, 0x1
@ -6335,7 +6335,7 @@ sub_81C307C: @ 81C307C
bne _081C30E0
_081C30C2:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085EA5DB
ldr r1, =gText_XNature
bl sub_81AFC28
b _081C3182
.pool
@ -6367,25 +6367,25 @@ _081C310C:
cmp r0, 0
bne _081C3134
ldrb r0, [r4, 0x9]
ldr r1, =gUnknown_085EA516
ldr r1, =gText_XNatureHatchedAtYZ
cmp r0, 0xD4
bls _081C3170
ldr r1, =gUnknown_085EA617
ldr r1, =gText_XNatureHatchedSomewhereAt
b _081C3170
.pool
_081C3134:
ldrb r0, [r4, 0x9]
ldr r1, =gUnknown_085EA4EC
ldr r1, =gText_XNatureMetAtYZ
cmp r0, 0xD4
bls _081C3170
ldr r1, =gUnknown_085EA5EB
ldr r1, =gText_XNatureMetSomewhereAt
b _081C3170
.pool
_081C3148:
ldrb r0, [r4, 0x9]
cmp r0, 0xFF
bne _081C3158
ldr r1, =gUnknown_085EA56A
ldr r1, =gText_XNatureFatefulEncounter
b _081C3170
.pool
_081C3158:
@ -6396,11 +6396,11 @@ _081C3158:
cmp r0, 0
beq _081C316E
ldrb r0, [r4, 0x9]
ldr r1, =gUnknown_085EA5A8
ldr r1, =gText_XNatureProbablyMetAt
cmp r0, 0xD4
bls _081C3170
_081C316E:
ldr r1, =gUnknown_085EA544
ldr r1, =gText_XNatureObtainedInTrade
_081C3170:
ldr r0, =gStringVar4
bl sub_81AFC28
@ -6449,7 +6449,7 @@ sub_81C31C0: @ 81C31C0
ldr r1, [r0]
movs r0, 0x2
bl sub_81AFC0C
ldr r1, =gUnknown_085EA3C0
ldr r1, =gText_EmptyString5
movs r0, 0x5
bl sub_81AFC0C
pop {r0}
@ -6649,7 +6649,7 @@ sub_81C335C: @ 81C335C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_085EA365
ldr r0, =gText_OTSlash
mov r8, r0
movs r0, 0x1
mov r1, r8
@ -6736,27 +6736,27 @@ sub_81C3428: @ 81C3428
ldrb r0, [r0]
cmp r0, 0x1
bne _081C3448
ldr r4, =gUnknown_085EA40B
ldr r4, =gText_EggWillTakeALongTime
b _081C346C
.pool
_081C3448:
ldrh r0, [r1, 0x30]
cmp r0, 0x5
bhi _081C3458
ldr r4, =gUnknown_085EA4A2
ldr r4, =gText_EggAboutToHatch
b _081C346C
.pool
_081C3458:
cmp r0, 0xA
bhi _081C3464
ldr r4, =gUnknown_085EA475
ldr r4, =gText_EggWillHatchSoon
b _081C346C
.pool
_081C3464:
ldr r4, =gUnknown_085EA40B
ldr r4, =gText_EggWillTakeALongTime
cmp r0, 0x28
bhi _081C346C
ldr r4, =gUnknown_085EA442
ldr r4, =gText_EggWillTakeSomeTime
_081C346C:
ldr r0, =gUnknown_0861CCCC
movs r1, 0x2
@ -6792,7 +6792,7 @@ sub_81C349C: @ 81C349C
ldrb r0, [r4, 0x9]
cmp r0, 0xFF
bne _081C34C4
ldr r4, =gUnknown_085EA678
ldr r4, =gText_PeculiarEggNicePlace
b _081C3502
.pool
_081C34C4:
@ -6805,7 +6805,7 @@ _081C34C4:
cmp r0, 0
bne _081C34E0
_081C34D8:
ldr r4, =gUnknown_085EA6AB
ldr r4, =gText_PeculiarEggTrade
b _081C3502
.pool
_081C34E0:
@ -6815,14 +6815,14 @@ _081C34E0:
bl sub_81C32E0
lsls r0, 24
lsrs r0, 24
ldr r4, =gUnknown_085EA702
ldr r4, =gText_EggFromTraveler
cmp r0, 0x1
bne _081C3502
ldr r4, =gUnknown_085EA6D7
ldr r4, =gText_EggFromHotSprings
b _081C3502
.pool
_081C3500:
ldr r4, =gUnknown_085EA647
ldr r4, =gText_OddEggFoundByCouple
_081C3502:
ldr r0, =gUnknown_0861CCCC
movs r1, 0x3
@ -7021,7 +7021,7 @@ _081C36B0:
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA3B4
ldr r1, =gText_RibbonsVar1
adds r0, r4, 0
bl StringExpandPlaceholders
adds r5, r4, 0
@ -8201,7 +8201,7 @@ sub_81C4154: @ 81C4154
adds r0, r4, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r1, =gUnknown_085EA4CB
ldr r1, =gText_HMMovesCantBeForgotten2
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@ -10430,7 +10430,7 @@ sub_81C540C: @ 81C540C
ldr r1, =gStringVar2
adds r0, r4, 0
bl CopyItemName
ldr r1, =gUnknown_085E9210
ldr r1, =gText_UnkF908Var1Clear7Var2
adds r0, r5, 0
bl StringExpandPlaceholders
b _081C5458
@ -10635,7 +10635,7 @@ sub_81C55D8: @ 81C55D8
.pool
_081C561C:
ldr r0, =gStringVar1
ldr r2, =gUnknown_085E91B0
ldr r2, =gReturnToXStringsTable2
ldr r1, =gUnknown_0203CF30
ldrb r1, [r1, 0x4]
lsls r1, 2

50
asm/pokenav.s
View File

@ -6860,7 +6860,7 @@ sub_81CA770: @ 81CA770
movs r0, 0x2
bl sub_81C763C
adds r5, r0, 0
ldr r6, =gUnknown_085EBD4A
ldr r6, =gText_NoRibbonWinners
movs r2, 0x1
negs r2, r2
movs r0, 0x1
@ -7928,7 +7928,7 @@ sub_81CAF78: @ 81CAF78
lsls r0, 24
cmp r0, 0
bne _081CAFA4
ldr r0, =gUnknown_085EEB0B
ldr r0, =gText_CallCantBeMadeHere
b _081CAFCE
.pool
_081CAFA4:
@ -9748,7 +9748,7 @@ sub_81CBDF4: @ 81CBDF4
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r1, =gUnknown_085EBE5F
ldr r1, =gText_NumberRegistered
movs r2, 0
bl sub_81CBE88
pop {r0}
@ -9784,7 +9784,7 @@ sub_81CBE38: @ 81CBE38
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r1, =gUnknown_085EBE6E
ldr r1, =gText_NumberOfBattles
movs r2, 0x2
bl sub_81CBE88
pop {r0}
@ -9900,7 +9900,7 @@ sub_81CBEF8: @ 81CBEF8
bl GetMapName
b _081CBF24
_081CBF1C:
ldr r1, =gUnknown_085EC00F
ldr r1, =gText_Unknown
add r0, sp, 0xC
bl StringCopy
_081CBF24:
@ -10168,7 +10168,7 @@ sub_81CC11C: @ 81CC11C
push {lr}
sub sp, 0xC
ldrb r0, [r0, 0x14]
ldr r2, =gUnknown_085EBF95
ldr r2, =gText_TrainerCloseBy
movs r1, 0x1
str r1, [sp]
str r1, [sp, 0x4]
@ -13128,7 +13128,7 @@ _081CD862:
adds r0, r4, r5
ldr r1, =0x00006325
adds r0, r1
ldr r1, =gUnknown_085EBFCE
ldr r1, =gText_InParty
b _081CD8F4
.pool
_081CD8E4:
@ -14829,7 +14829,7 @@ sub_81CE738: @ 81CE738
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085EBFD7
ldr r1, =gText_Number2
bl StringCopy
pop {r1}
bx r1
@ -14957,7 +14957,7 @@ _081CE80C:
strb r0, [r1, 0x4]
mov r5, sp
adds r5, 0x11
ldr r1, =gUnknown_085EBFD7
ldr r1, =gText_Number2
adds r0, r5, 0
bl StringCopy
ldr r0, =0x00001821
@ -16949,7 +16949,7 @@ sub_81CF7F4: @ 81CF7F4
movs r0, 0xFF
strb r0, [r4]
ldr r5, =gStringVar2
ldr r1, =gUnknown_085EC029
ldr r1, =gText_NumberF700
adds r0, r5, 0
bl sub_81AFC28
mov r1, r8
@ -19859,7 +19859,7 @@ sub_81D0E84: @ 81D0E84
adds r1, r4, 0
bl sub_81AFC0C
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EC030
ldr r1, =gText_RibbonsF700
adds r0, r4, 0
bl sub_81AFC28
ldrb r0, [r5, 0xA]
@ -23412,7 +23412,7 @@ sub_81D28FC: @ 81D28FC
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EFA31
ldr r5, =gText_BattleMoves2
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x80
@ -23431,7 +23431,7 @@ sub_81D28FC: @ 81D28FC
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
ldr r5, =gUnknown_085EFA52
ldr r5, =gText_PPSlash
movs r1, 0x29
mov r10, r1
str r1, [sp]
@ -23443,7 +23443,7 @@ sub_81D28FC: @ 81D28FC
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
ldr r5, =gUnknown_085EFA56
ldr r5, =gText_PowerSlash
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x6A
@ -23460,7 +23460,7 @@ sub_81D28FC: @ 81D28FC
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
ldr r5, =gUnknown_085EFA5D
ldr r5, =gText_AccuracySlash
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x6A
@ -23508,7 +23508,7 @@ _081D29C4:
adds r2, r5, 0
movs r3, 0x4
bl PrintTextOnWindow
ldr r1, =gUnknown_085EFA52
ldr r1, =gText_PPSlash
movs r0, 0x1
movs r2, 0
bl GetStringWidth
@ -23616,7 +23616,7 @@ sub_81D2ACC: @ 81D2ACC
movs r0, 0x1
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EFA3E
ldr r5, =gText_ContestMoves2
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x80
@ -23632,7 +23632,7 @@ sub_81D2ACC: @ 81D2ACC
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
ldr r5, =gUnknown_085EFA67
ldr r5, =gText_Appeal2
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x5C
@ -23648,7 +23648,7 @@ sub_81D2ACC: @ 81D2ACC
movs r1, 0x1
adds r2, r5, 0
bl PrintTextOnWindow
ldr r5, =gUnknown_085EFA6E
ldr r5, =gText_Jam2
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x5C
@ -24157,7 +24157,7 @@ _081D2EFC:
cmp r7, 0xE
bne _081D2F2C
adds r0, r5, 0x5
ldr r1, =gUnknown_085EBFCE
ldr r1, =gText_InParty
b _081D2F3A
.pool
_081D2F2C:
@ -25214,10 +25214,10 @@ _081D36CA:
adds r4, 0xC
movs r1, 0
ldrsh r0, [r4, r1]
ldr r1, =gUnknown_085EEA76
ldr r1, =gText_Dash
cmp r0, 0
blt _081D3704
ldr r1, =gUnknown_085EEA73
ldr r1, =gText_UnkCtrlF904
_081D3704:
adds r0, r6, 0
bl StringCopy
@ -29757,7 +29757,7 @@ sub_81D5C8C: @ 81D5C8C
movs r0, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r5, =gUnknown_085EF88A
ldr r5, =gText_TimeBoard
movs r0, 0x1
adds r1, r5, 0
movs r2, 0xD0
@ -29842,9 +29842,9 @@ _081D5CD6:
movs r3, 0x2
bl ConvertIntToDecimalStringN
mov r0, r9
ldr r1, =gUnknown_085EF895
ldr r1, =gText_TimeCleared
bl StringCopy
ldr r1, =gUnknown_085EF8A3
ldr r1, =gText_XMinYDotZSec
bl StringExpandPlaceholders
movs r0, 0x1
mov r1, r9

4
asm/record_mixing.s
View File

@ -630,7 +630,7 @@ _080E726C:
lsrs r0, 24
strh r0, [r5, 0x14]
_080E7296:
ldr r0, =gUnknown_085EEA8E
ldr r0, =gText_RecordMixingComplete
bl sub_80E70F4
strh r4, [r5, 0x10]
b _080E730A
@ -739,7 +739,7 @@ _080E7370:
b _080E7566
.pool
_080E7384:
ldr r0, =gUnknown_085EEA7E
ldr r0, =gText_MixingRecords
bl sub_80E70F4
movs r0, 0xE1
lsls r0, 3

6
asm/region_map.s
View File

@ -3212,12 +3212,12 @@ sub_81245DC: @ 81245DC
beq _081245F8
cmp r1, 0x57
bne _08124604
ldr r1, =gUnknown_085EC9D2
ldr r1, =gText_Ferry
bl StringCopy
b _0812460A
.pool
_081245F8:
ldr r1, =gUnknown_085EC9D8
ldr r1, =gText_SecretBase
bl StringCopy
b _0812460A
.pool
@ -3239,7 +3239,7 @@ sub_8124610: @ 8124610
bl sub_81245DC
b _08124626
_08124620:
ldr r1, =gUnknown_085EC9E4
ldr r1, =gText_Hideout
bl StringCopy
_08124626:
pop {r1}

22
asm/reset_rtc_screen.s
View File

@ -414,7 +414,7 @@ sub_809EBC4: @ 809EBC4
adds r1, r4, 0
bl StringCopy
adds r7, r0, 0
ldr r1, =gUnknown_085EE68A
ldr r1, =gText_Day
bl StringCopy
adds r7, r0, 0
adds r0, r4, 0
@ -426,7 +426,7 @@ sub_809EBC4: @ 809EBC4
adds r1, r4, 0
bl StringCopy
adds r7, r0, 0
ldr r5, =gUnknown_085EE68E
ldr r5, =gText_Colon3
adds r1, r5, 0
bl StringCopy
adds r7, r0, 0
@ -514,7 +514,7 @@ sub_809ECB4: @ 809ECB4
movs r2, 0x1
mov r3, r9
bl sub_809EBC4
ldr r2, =gUnknown_085EE690
ldr r2, =gText_Confirm2
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -1011,7 +1011,7 @@ _0809F11C:
movs r1, 0
movs r3, 0xE
bl SetWindowBorderStyle
ldr r2, =gUnknown_085ECA0D
ldr r2, =gText_PresentTime
movs r0, 0x1
str r0, [sp]
movs r4, 0xFF
@ -1033,7 +1033,7 @@ _0809F11C:
movs r1, 0
movs r2, 0x11
bl sub_809EBC4
ldr r2, =gUnknown_085ECA22
ldr r2, =gText_PreviousTime
movs r0, 0x21
str r0, [sp]
str r4, [sp, 0x4]
@ -1062,7 +1062,7 @@ _0809F11C:
movs r1, 0
movs r2, 0x31
bl sub_809EBC4
ldr r0, =gUnknown_085EC9EC
ldr r0, =gText_ResetRTCConfirmCancel
bl sub_809F0C0
movs r0, 0
movs r1, 0x2
@ -1161,7 +1161,7 @@ _0809F276:
cmp r0, 0x2
bne _0809F29C
_0809F282:
ldr r0, =gUnknown_085ECAA7
ldr r0, =gText_NoSaveFileCantSetTime
bl sub_809F0C0
movs r0, 0x5
strh r0, [r5]
@ -1193,7 +1193,7 @@ _0809F2CA:
movs r0, 0
movs r1, 0
bl sub_8198070
ldr r0, =gUnknown_085ECA38
ldr r0, =gText_PleaseResetTime
bl sub_809F0C0
ldr r2, =gLocalTime
ldr r0, =gSaveBlock2Ptr
@ -1261,7 +1261,7 @@ _0809F340:
ldrh r1, [r4]
bl VarSet
bl DisableResetRTC
ldr r0, =gUnknown_085ECA4F
ldr r0, =gText_ClockHasBeenReset
bl sub_809F0C0
movs r0, 0x4
strh r0, [r5]
@ -1274,14 +1274,14 @@ _0809F398:
lsrs r0, 24
cmp r0, 0x1
bne _0809F3B8
ldr r0, =gUnknown_085ECA8A
ldr r0, =gText_SaveCompleted
bl sub_809F0C0
movs r0, 0x49
bl PlaySE
b _0809F3C4
.pool
_0809F3B8:
ldr r0, =gUnknown_085ECA9A
ldr r0, =gText_SaveFailed
bl sub_809F0C0
movs r0, 0x16
bl PlaySE

50
asm/rom6.s
View File

@ -1064,23 +1064,23 @@ sub_8135DAC: @ 8135DAC
movs r0, 0
adds r1, r4, 0
bl sub_8135D7C
ldr r1, =gUnknown_085E931D
ldr r1, =gText_Spicy
movs r0, 0x2
movs r2, 0
bl sub_8135D7C
ldr r1, =gUnknown_085E9323
ldr r1, =gText_Dry
movs r0, 0x3
movs r2, 0
bl sub_8135D7C
ldr r1, =gUnknown_085E9327
ldr r1, =gText_Sweet
movs r0, 0x4
movs r2, 0
bl sub_8135D7C
ldr r1, =gUnknown_085E932D
ldr r1, =gText_Bitter
movs r0, 0x5
movs r2, 0
bl sub_8135D7C
ldr r1, =gUnknown_085E9334
ldr r1, =gText_Sour
movs r0, 0x6
movs r2, 0
bl sub_8135D7C
@ -1148,7 +1148,7 @@ _08135E7C:
adds r4, r7
ldr r0, [r5]
adds r0, r4
ldr r1, =gUnknown_085E9344
ldr r1, =gText_StowCase
bl StringCopy
ldr r1, [r5]
lsls r2, r6, 3
@ -1231,7 +1231,7 @@ sub_8135F04: @ 8135F04
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085E934F
ldr r1, =gText_LvVar1
adds r0, r4, 0
bl StringExpandPlaceholders
pop {r4-r6}
@ -2598,7 +2598,7 @@ sub_8136AB4: @ 8136AB4
ldr r1, [r1]
bl StringCopy
ldr r5, =gStringVar4
ldr r1, =gUnknown_085E9353
ldr r1, =gText_ThrowAwayVar1
adds r0, r5, 0
bl StringExpandPlaceholders
bl sav2_get_text_speed
@ -2654,7 +2654,7 @@ sub_8136B78: @ 8136B78
lsls r4, 24
lsrs r4, 24
ldr r5, =gStringVar4
ldr r1, =gUnknown_085E9367
ldr r1, =gText_Var1ThrownAway
adds r0, r5, 0
bl StringExpandPlaceholders
bl sav2_get_text_speed
@ -4796,14 +4796,14 @@ sub_8137D5C: @ 8137D5C
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085EB5EE
ldr r1, =gText_SpaceTimes
adds r0, r4, 0
bl StringAppend
b _08137D90
.pool
_08137D88:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB5CF
ldr r1, =gText_99TimesPlus
bl StringCopy
_08137D90:
ldr r0, =0x00000e0f
@ -4833,14 +4833,14 @@ _08137D90:
movs r2, 0x2
movs r3, 0x2
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085EB5E5
ldr r1, =gText_SpaceSeconds
adds r0, r4, 0
bl StringAppend
b _08137DF8
.pool
_08137DF0:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085EB5DA
ldr r1, =gText_1MinutePlus
bl StringCopy
_08137DF8:
movs r4, 0
@ -6425,13 +6425,13 @@ sub_8138B10: @ 8138B10
cmp r0, 0
bne _08138B34
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB5F9
ldr r1, =gText_BigGuy
bl StringCopy
b _08138B3C
.pool
_08138B34:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB601
ldr r1, =gText_BigGirl
bl StringCopy
_08138B3C:
pop {r0}
@ -6448,13 +6448,13 @@ sub_8138B48: @ 8138B48
cmp r0, 0
bne _08138B6C
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB60E
ldr r1, =gText_Daughter
bl StringCopy
b _08138B74
.pool
_08138B6C:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB60A
ldr r1, =gText_Son
bl StringCopy
_08138B74:
pop {r0}
@ -8511,7 +8511,7 @@ sub_8139B60: @ 8139B60
ldrb r0, [r5]
movs r1, 0
bl SetStandardWindowBorderStyle
ldr r4, =gUnknown_085EB6A5
ldr r4, =gText_ElevatorNowOn
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x40
@ -10131,7 +10131,7 @@ sub_813A8FC: @ 813A8FC
movs r2, 0x1
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085EB6AD
ldr r1, =gText_BP
bl StringCopy
movs r0, 0x1
add r1, sp, 0xC
@ -12650,37 +12650,37 @@ _0813BE58:
.4byte _0813BEC0
_0813BE70:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD14
ldr r1, =gText_Steven
bl StringCopy
b _0813BF04
.pool
_0813BE84:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD1B
ldr r1, =gText_Brawly
bl StringCopy
b _0813BF04
.pool
_0813BE98:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD22
ldr r1, =gText_Winona
bl StringCopy
b _0813BF04
.pool
_0813BEAC:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD29
ldr r1, =gText_Phoebe
bl StringCopy
b _0813BF04
.pool
_0813BEC0:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD30
ldr r1, =gText_Glacia
bl StringCopy
b _0813BF04
.pool
_0813BED4:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD0C
ldr r1, =gText_Wallace
bl StringCopy
b _0813BF04
.pool

16
asm/save_failed_screen.s
View File

@ -268,7 +268,7 @@ _08178FF8:
ldrb r0, [r4]
movs r1, 0x1
bl CopyWindowToVram
ldr r0, =gUnknown_085EC816
ldr r0, =gText_SaveFailedCheckingBackup
movs r1, 0x1
movs r2, 0
bl sub_8178F44
@ -340,7 +340,7 @@ _0817929C:
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC917
ldr r0, =gText_CheckCompleted
movs r1, 0x1
movs r2, 0
bl sub_8178F44
@ -353,7 +353,7 @@ _0817929C:
ldrb r0, [r4]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC816
ldr r0, =gText_SaveFailedCheckingBackup
movs r1, 0x1
movs r2, 0
bl sub_8178F44
@ -373,7 +373,7 @@ _081792EC:
ldrb r0, [r0]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC86F
ldr r0, =gText_BackupMemoryDamaged
b _08179330
.pool
_0817931C:
@ -385,7 +385,7 @@ _0817931C:
ldr r0, [r0]
cmp r0, 0
bne _08179370
ldr r0, =gUnknown_085EC94F
ldr r0, =gText_SaveCompleteGameCannotContinue
_08179330:
movs r1, 0x1
movs r2, 0
@ -397,7 +397,7 @@ _08179348:
ldrb r0, [r0]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC86F
ldr r0, =gText_BackupMemoryDamaged
movs r1, 0x1
movs r2, 0
bl sub_8178F44
@ -406,7 +406,7 @@ _08179348:
b _08179380
.pool
_08179370:
ldr r0, =gUnknown_085EC9A2
ldr r0, =gText_SaveCompletePressA
movs r1, 0x1
movs r2, 0
bl sub_8178F44
@ -436,7 +436,7 @@ sub_8179390: @ 8179390
ldrb r0, [r0]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, =gUnknown_085EC8D4
ldr r0, =gText_GamePlayCannotBeContinued
movs r1, 0x1
movs r2, 0
bl sub_8178F44

28
asm/script_menu.s
View File

@ -724,7 +724,7 @@ _080E23AC:
lsls r0, 24
cmp r0, 0
beq _080E23D4
ldr r0, =gUnknown_085EB18B
ldr r0, =gText_HallOfFame
adds r1, r5, 0
bl display_text_and_get_width
adds r5, r0, 0
@ -751,7 +751,7 @@ _080E23D4:
adds r0, r6, 0
movs r1, 0
bl SetStandardWindowBorderStyle
ldr r2, =gUnknown_085EB18B
ldr r2, =gText_HallOfFame
movs r0, 0x21
str r0, [sp]
movs r5, 0xFF
@ -762,7 +762,7 @@ _080E23D4:
movs r1, 0x1
adds r3, r7, 0
bl PrintTextOnWindow
ldr r2, =gUnknown_085EB198
ldr r2, =gText_LogOff
movs r0, 0x31
str r0, [sp]
str r5, [sp, 0x4]
@ -786,7 +786,7 @@ _080E2448:
adds r0, r6, 0
movs r1, 0
bl SetStandardWindowBorderStyle
ldr r2, =gUnknown_085EB198
ldr r2, =gText_LogOff
movs r0, 0x21
str r0, [sp]
movs r0, 0xFF
@ -803,7 +803,7 @@ _080E247A:
lsrs r1, r0, 24
cmp r1, 0
beq _080E24B0
ldr r2, =gUnknown_085EB176
ldr r2, =gText_LanettesPC
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
@ -817,7 +817,7 @@ _080E247A:
b _080E24C6
.pool
_080E24B0:
ldr r2, =gUnknown_085EB169
ldr r2, =gText_SomeonesPC
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
@ -829,7 +829,7 @@ _080E24B0:
bl PrintTextOnWindow
_080E24C6:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EB183
ldr r1, =gText_PlayersPC
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r6, 0
@ -1677,7 +1677,7 @@ CreateStartMenu: @ 80E2BAC
adds r0, r4, 0
movs r1, 0
bl SetStandardWindowBorderStyle
ldr r2, =gUnknown_085EB25C
ldr r2, =gText_MenuOptionPokedex
movs r0, 0x9
str r0, [sp]
movs r5, 0xFF
@ -1688,7 +1688,7 @@ CreateStartMenu: @ 80E2BAC
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
ldr r2, =gUnknown_085EB264
ldr r2, =gText_MenuOptionPokemon
movs r0, 0x19
str r0, [sp]
str r5, [sp, 0x4]
@ -1697,7 +1697,7 @@ CreateStartMenu: @ 80E2BAC
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
ldr r2, =gUnknown_085EB26C
ldr r2, =gText_MenuOptionBag
movs r0, 0x29
str r0, [sp]
str r5, [sp, 0x4]
@ -1706,7 +1706,7 @@ CreateStartMenu: @ 80E2BAC
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
ldr r2, =gUnknown_085EB270
ldr r2, =gText_MenuOptionPokenav
movs r0, 0x39
str r0, [sp]
str r5, [sp, 0x4]
@ -1725,7 +1725,7 @@ CreateStartMenu: @ 80E2BAC
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
ldr r2, =gUnknown_085EB279
ldr r2, =gText_MenuOptionSave
movs r0, 0x59
str r0, [sp]
str r5, [sp, 0x4]
@ -1734,7 +1734,7 @@ CreateStartMenu: @ 80E2BAC
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
ldr r2, =gUnknown_085EB27E
ldr r2, =gText_MenuOptionOption
movs r0, 0x69
str r0, [sp]
str r5, [sp, 0x4]
@ -1743,7 +1743,7 @@ CreateStartMenu: @ 80E2BAC
movs r1, 0x1
movs r3, 0x8
bl PrintTextOnWindow
ldr r2, =gUnknown_085EB285
ldr r2, =gText_MenuOptionExit
movs r0, 0x79
str r0, [sp]
str r5, [sp, 0x4]

8
asm/secret_base.s
View File

@ -1576,7 +1576,7 @@ sub_80E9780: @ 80E9780
ldrb r1, [r0]
adds r0, r6, 0
bl ConvertInternationalString
ldr r1, =gUnknown_085EA72F
ldr r1, =gText_ApostropheSBase
adds r0, r6, 0
bl StringAppend
pop {r3}
@ -2204,7 +2204,7 @@ sub_80E9C9C: @ 80E9C9C
b _080E9D1A
.pool
_080E9D10:
ldr r1, =gUnknown_085EA785
ldr r1, =gText_NoRegistry
ldr r2, =task_pc_turn_off
adds r0, r6, 0
bl DisplayItemMessageOnField
@ -2583,7 +2583,7 @@ sub_80E9FFC: @ 80E9FFC
ldrb r1, [r4, 0x8]
bl sub_80E9780
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EA737
ldr r1, =gText_OkayToDeleteFromRegistry
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r2, =sub_80EA06C
@ -2683,7 +2683,7 @@ sub_80EA120: @ 80EA120
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085EA762
ldr r1, =gText_RegisteredDataDeleted
ldr r2, =sub_80EA08C
bl DisplayItemMessageOnField
pop {r0}

34
asm/shop.s
View File

@ -325,14 +325,14 @@ Task_ExitSellMenu: @ 80DFCF8
ldrb r0, [r0, 0xF]
cmp r0, 0x2
bne _080DFD2C
ldr r1, =gUnknown_085E95C7
ldr r1, =gText_CanIHelpWithAnythingElse
ldr r2, =ReturnToShopMenuAfterExitingSellMenu
adds r0, r4, 0
bl DisplayItemMessageOnField
b _080DFD36
.pool
_080DFD2C:
ldr r1, =gUnknown_085E959B
ldr r1, =gText_AnythingElseICanHelp
ldr r2, =ReturnToShopMenuAfterExitingSellMenu
adds r0, r5, 0
bl DisplayItemMessageOnField
@ -748,7 +748,7 @@ _080E00D8:
b _080E00EA
.pool
_080E00E8:
ldr r4, =gUnknown_085E93E0
ldr r4, =gText_QuitShopping
_080E00EA:
movs r0, 0x2
movs r1, 0
@ -817,7 +817,7 @@ _080E0164:
bl ConvertIntToDecimalStringN
_080E0176:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E969C
ldr r1, =gText_PokedollarVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0x7
@ -2060,7 +2060,7 @@ _080E0B92:
lsls r0, 24
cmp r0, 0
bne _080E0BD0
ldr r1, =gUnknown_085E9539
ldr r1, =gText_YouDontHaveMoney
ldr r2, =BuyMenuReturnToItemList
b _080E0C28
.pool
@ -2091,11 +2091,11 @@ _080E0BD0:
adds r1, r0
adds r0, r4, 0
bl StringCopy
ldr r1, =gUnknown_085E9417
ldr r1, =gText_Var1CertainlyHowMany2
b _080E0C26
.pool
_080E0C24:
ldr r1, =gUnknown_085E93EF
ldr r1, =gText_Var1CertainlyHowMany
_080E0C26:
ldr r2, =Task_BuyHowManyDialogueInit
_080E0C28:
@ -2121,13 +2121,13 @@ _080E0C38:
cmp r0, 0x1
bne _080E0C7C
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9468
ldr r1, =gText_Var1IsItThatllBeVar2
bl StringExpandPlaceholders
b _080E0C84
.pool
_080E0C7C:
ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9493
ldr r1, =gText_YouWantedVar1ThatllBeVar2
bl StringExpandPlaceholders
_080E0C84:
ldr r1, =gStringVar4
@ -2171,7 +2171,7 @@ Task_BuyHowManyDialogueInit: @ 80E0CA4
movs r3, 0x4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4
ldr r1, =gUnknown_085E93D5
ldr r1, =gText_InBagVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -2319,7 +2319,7 @@ _080E0DF0:
movs r2, 0
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085E943F
ldr r1, =gText_Var1AndYouWantedVar2
ldr r2, =BuyMenuConfirmPurchase
adds r0, r6, 0
bl BuyMenuDisplayMessage
@ -2400,7 +2400,7 @@ BuyMenuTryMakePurchase: @ 80E0EDC
lsrs r0, 24
cmp r0, 0x1
bne _080E0F30
ldr r1, =gUnknown_085E94C5
ldr r1, =gText_HereYouGoThankYou
ldr r2, =BuyMenuSubtractMoney
adds r0, r5, 0
bl BuyMenuDisplayMessage
@ -2409,7 +2409,7 @@ BuyMenuTryMakePurchase: @ 80E0EDC
b _080E0F7A
.pool
_080E0F30:
ldr r1, =gUnknown_085E9558
ldr r1, =gText_NoMoreRoomForThis
ldr r2, =BuyMenuReturnToItemList
b _080E0F60
.pool
@ -2422,11 +2422,11 @@ _080E0F40:
ldrb r0, [r6, 0xF]
cmp r0, 0x1
bne _080E0F5C
ldr r1, =gUnknown_085E94E7
ldr r1, =gText_ThankYouIllSendItHome
b _080E0F5E
.pool
_080E0F5C:
ldr r1, =gUnknown_085E9510
ldr r1, =gText_ThanksIllSendItHome
_080E0F5E:
ldr r2, =BuyMenuSubtractMoney
_080E0F60:
@ -2435,7 +2435,7 @@ _080E0F60:
b _080E0F7A
.pool
_080E0F70:
ldr r1, =gUnknown_085E957F
ldr r1, =gText_SpaceForVar1Full
ldr r2, =BuyMenuReturnToItemList
adds r0, r7, 0
bl BuyMenuDisplayMessage
@ -2536,7 +2536,7 @@ Task_ReturnToItemListAfterItemPurchase: @ 80E100C
lsrs r0, 24
cmp r0, 0x1
bne _080E106C
ldr r1, =gUnknown_085E95EA
ldr r1, =gText_ThrowInPremierBall
ldr r2, =BuyMenuReturnToItemList
adds r0, r4, 0
bl BuyMenuDisplayMessage

10
asm/slot_machine.s
View File

@ -976,7 +976,7 @@ sub_812ACF4: @ 812ACF4
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_085EF734
ldr r2, =gText_YouDontHaveThreeCoins
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -1544,7 +1544,7 @@ sub_812B158: @ 812B158
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_085EF6E9
ldr r2, =gText_QuitTheGame
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -1634,7 +1634,7 @@ sub_812B214: @ 812B214
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_085EF6F8
ldr r2, =gText_YouveGot9999Coins
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -1687,7 +1687,7 @@ sub_812B280: @ 812B280
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_085EF710
ldr r2, =gText_YouveRunOutOfCoins
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -7209,7 +7209,7 @@ sub_812DD78: @ 812DD78
str r0, [sp]
movs r4, 0
str r4, [sp, 0x4]
ldr r0, =gUnknown_085EF750
ldr r0, =gText_ReelTimeHelp
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1

8
asm/start_menu.s
View File

@ -1862,7 +1862,7 @@ _080A0710:
bl PrintTextOnWindow
movs r4, 0x11
ldrb r0, [r6]
ldr r2, =gUnknown_085EED26
ldr r2, =gText_SavingPlayer
str r4, [sp]
mov r1, r8
str r1, [sp, 0x4]
@ -1887,7 +1887,7 @@ _080A0710:
bl sub_819A024
movs r4, 0x21
ldrb r0, [r6]
ldr r2, =gUnknown_085EED2D
ldr r2, =gText_SavingBadges
str r4, [sp]
mov r1, r8
str r1, [sp, 0x4]
@ -1922,7 +1922,7 @@ _080A0710:
bne _080A0802
movs r4, 0x31
ldrb r0, [r6]
ldr r2, =gUnknown_085EED34
ldr r2, =gText_SavingPokedex
str r4, [sp]
mov r1, r8
str r1, [sp, 0x4]
@ -1952,7 +1952,7 @@ _080A0710:
_080A0802:
adds r4, 0x10
ldrb r0, [r6]
ldr r2, =gUnknown_085EED3C
ldr r2, =gText_SavingTime
lsls r4, 24
lsrs r4, 24
str r4, [sp]

20
asm/trade.s
View File

@ -9004,7 +9004,7 @@ _0807C0F8:
.pool
_0807C120:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE942
ldr r1, =gText_XWillBeSentToY
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -9070,7 +9070,7 @@ _0807C178:
adds r0, 0x1
strh r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE959
ldr r1, =gText_ByeByeVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -10471,7 +10471,7 @@ _0807CDDC:
movs r0, 0
bl SetGpuReg
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE966
ldr r1, =gText_XSentOverY
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -10542,7 +10542,7 @@ _0807CE70:
movs r5, 0
strh r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE977
ldr r1, =gText_TakeGoodCareOfX
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -11066,7 +11066,7 @@ _0807D4D4:
.pool
_0807D4FC:
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE942
ldr r1, =gText_XWillBeSentToY
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -11132,7 +11132,7 @@ _0807D554:
adds r0, 0x1
strh r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE959
ldr r1, =gText_ByeByeVar1
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -12576,7 +12576,7 @@ _0807E228:
movs r0, 0
bl SetGpuReg
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE966
ldr r1, =gText_XSentOverY
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -12647,7 +12647,7 @@ _0807E2BC:
movs r5, 0
strh r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EE977
ldr r1, =gText_TakeGoodCareOfX
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0
@ -13751,7 +13751,7 @@ _0807ED10:
adds r0, 0x1
strb r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF6D2
ldr r1, =gText_CommunicationStandby5
b _0807EDA6
.pool
_0807ED2C:
@ -14634,7 +14634,7 @@ _0807F4C0:
movs r0, 0x1
strb r0, [r1]
ldr r4, =gStringVar4
ldr r1, =gUnknown_085EF6D2
ldr r1, =gText_CommunicationStandby5
adds r0, r4, 0
bl StringExpandPlaceholders
movs r0, 0

4
asm/trader.s
View File

@ -87,7 +87,7 @@ sub_8133A78: @ 8133A78
ldr r0, [r0]
str r0, [sp, 0xC]
str r1, [sp, 0x10]
ldr r1, =gUnknown_085EB7EA
ldr r1, =gText_Exit
movs r0, 0x1
movs r2, 0
bl GetStringWidth
@ -193,7 +193,7 @@ _08133B94:
cmp r5, 0x3
bls _08133B3C
ldrb r0, [r7, 0x6]
ldr r2, =gUnknown_085EB7EA
ldr r2, =gText_Exit
lsls r1, r5, 4
adds r1, 0x1
lsls r1, 24

58
asm/trainer_card.s
View File

@ -410,7 +410,7 @@ _080C2A2C:
movs r0, 0
movs r1, 0x1
bl sub_81973C4
ldr r2, =gUnknown_085ED042
ldr r2, =gText_WaitingTrainerFinishReading
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
@ -1714,7 +1714,7 @@ sub_80C3548: @ 80C3548
sub_80C3574: @ 80C3574
push {r4,r5,lr}
sub sp, 0x2C
ldr r1, =gUnknown_085ECF71
ldr r1, =gText_TrainerCardName
add r0, sp, 0xC
bl StringCopy
adds r5, r0, 0
@ -1775,7 +1775,7 @@ _080C35FA:
sub_80C3608: @ 80C3608
push {r4,lr}
sub sp, 0x2C
ldr r1, =gUnknown_085ECF78
ldr r1, =gText_TrainerCardIDNo
add r0, sp, 0xC
bl StringCopy
ldr r4, =gUnknown_02039CE8
@ -1842,7 +1842,7 @@ sub_80C3684: @ 80C3684
movs r0, 0x1
negs r0, r0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085ECF7E
ldr r0, =gText_TrainerCardMoney
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -1857,7 +1857,7 @@ _080C36C4:
movs r0, 0x1
negs r0, r0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085ECF7E
ldr r0, =gText_TrainerCardMoney
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -1876,7 +1876,7 @@ _080C36DE:
movs r3, 0x6
bl ConvertIntToDecimalStringN
ldr r5, =gStringVar4
ldr r1, =gUnknown_085E969C
ldr r1, =gText_PokedollarVar1
adds r0, r5, 0
bl StringExpandPlaceholders
ldr r0, [r4]
@ -1958,7 +1958,7 @@ sub_80C378C: @ 80C378C
movs r0, 0x1
negs r0, r0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085ECF86
ldr r0, =gText_TrainerCardPokedex
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -1973,7 +1973,7 @@ _080C37DC:
movs r0, 0x1
negs r0, r0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085ECF86
ldr r0, =gText_TrainerCardPokedex
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -1992,7 +1992,7 @@ _080C37F6:
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_085ECF8E
ldr r1, =gText_EmptyString6
bl StringCopy
ldr r0, [r4]
ldr r1, =0x0000052b
@ -2054,7 +2054,7 @@ sub_80C3880: @ 80C3880
movs r0, 0x1
negs r0, r0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085ECF99
ldr r0, =gText_TrainerCardTime
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -2069,7 +2069,7 @@ _080C38C8:
movs r0, 0x1
negs r0, r0
str r0, [sp, 0x4]
ldr r0, =gUnknown_085ECF99
ldr r0, =gText_TrainerCardTime
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -2105,7 +2105,7 @@ _080C391C:
bls _080C3922
movs r6, 0x3B
_080C3922:
ldr r1, =gUnknown_085ECF8F
ldr r1, =gText_Colon2
movs r0, 0x1
movs r2, 0
bl GetStringWidth
@ -2172,7 +2172,7 @@ _080C395C:
ldr r0, [r0]
str r0, [sp]
str r5, [sp, 0x4]
ldr r0, =gUnknown_085ECF8F
ldr r0, =gText_Colon2
str r0, [sp, 0x8]
movs r0, 0x1
movs r1, 0x1
@ -2331,7 +2331,7 @@ sub_80C3AF0: @ 80C3AF0
bl StringCopy
ldr r0, [r4]
adds r0, 0x4D
ldr r1, =gUnknown_085ECFA6
ldr r1, =gText_Var1sTrainerCard
bl StringExpandPlaceholders
_080C3B30:
pop {r4}
@ -2512,7 +2512,7 @@ sub_80C3CCC: @ 80C3CCC
ldrb r0, [r2, 0xB]
cmp r0, 0
beq _080C3CE4
ldr r1, =gUnknown_085ECFB8
ldr r1, =gText_HallOfFameDebut
adds r2, 0x93
ldr r3, =gUnknown_0856FB0F
movs r0, 0
@ -2585,7 +2585,7 @@ sub_80C3D60: @ 80C3D60
adds r1, r2
bl StringCopy
ldr r4, =gStringVar4
ldr r1, =gUnknown_085ECFED
ldr r1, =gText_WinsLosses
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r1, [r5]
@ -2631,7 +2631,7 @@ sub_80C3DF0: @ 80C3DF0
ldrb r0, [r2, 0x10]
cmp r0, 0
beq _080C3E0A
ldr r1, =gUnknown_085ED010
ldr r1, =gText_PokemonTrades
ldr r0, =0x00000237
adds r2, r0
ldr r3, =gUnknown_0856FB0F
@ -2685,7 +2685,7 @@ sub_80C3E58: @ 80C3E58
ldr r0, [r0]
cmp r0, 0
beq _080C3E80
ldr r1, =gUnknown_085ED036
ldr r1, =gText_BerryCrush
ldr r0, =0x000002c3
adds r2, r0
ldr r3, =gUnknown_0856FB0F
@ -2738,7 +2738,7 @@ sub_80C3ED4: @ 80C3ED4
ldr r0, [r0]
cmp r0, 0
beq _080C3EFC
ldr r1, =gUnknown_085ED01F
ldr r1, =gText_UnionTradesAndBattles
ldr r0, =0x0000034f
adds r2, r0
ldr r3, =gUnknown_0856FB0F
@ -2773,7 +2773,7 @@ sub_80C3F14: @ 80C3F14
ldr r0, [r4]
ldr r1, =0x00000395
adds r0, r1
ldr r1, =gUnknown_085ED096
ldr r1, =gText_Var1DarkGreyShadowLightGrey
bl StringExpandPlaceholders
_080C3F46:
pop {r4}
@ -2797,7 +2797,7 @@ sub_80C3F64: @ 80C3F64
ldrh r0, [r0]
cmp r0, 0
beq _080C3F8C
ldr r1, =gUnknown_085ED085
ldr r1, =gText_PokeblocksWithFriends
ldr r0, =0x00000395
adds r2, r0
ldr r3, =gUnknown_0856FB0F
@ -2852,7 +2852,7 @@ sub_80C3FE0: @ 80C3FE0
ldrh r0, [r0]
cmp r0, 0
beq _080C4008
ldr r1, =gUnknown_085ED09F
ldr r1, =gText_WonContestsWFriends
ldr r0, =0x000003db
adds r2, r0
ldr r3, =gUnknown_0856FB0F
@ -2902,7 +2902,7 @@ _080C4044:
ldr r0, [r4]
ldr r1, =0x00000421
adds r0, r1
ldr r1, =gUnknown_085ED0E0
ldr r1, =gText_WSlashStraightSlash
bl StringExpandPlaceholders
b _080C40B6
.pool
@ -2920,7 +2920,7 @@ _080C4094:
ldr r0, [r4]
ldr r1, =0x00000421
adds r0, r1
ldr r1, =gUnknown_085ED0C8
ldr r1, =gText_Var1DarkLightGreyBP
bl StringExpandPlaceholders
_080C40B6:
pop {r4}
@ -2949,7 +2949,7 @@ _080C40F0:
ldrb r0, [r2, 0xD]
cmp r0, 0
beq _080C412C
ldr r1, =gUnknown_085ED0D3
ldr r1, =gText_BattleTower
ldr r0, =0x00000421
adds r2, r0
ldr r3, =gUnknown_0856FB0C
@ -2963,7 +2963,7 @@ _080C4114:
ldrh r0, [r0]
cmp r0, 0
beq _080C412C
ldr r1, =gUnknown_085ED0B6
ldr r1, =gText_BattlePtsWon
ldr r0, =0x00000421
adds r2, r0
ldr r3, =gUnknown_0856FB0F
@ -6346,7 +6346,7 @@ _080C5DC2:
lsrs r4, r0, 24
cmp r4, 0x4
bls _080C5DC2
ldr r4, =gUnknown_085ED8FF
ldr r4, =gText_SymbolsEarned
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x60
@ -6362,7 +6362,7 @@ _080C5DC2:
movs r1, 0x1
movs r3, 0x5
bl box_print
ldr r4, =gUnknown_085ED90E
ldr r4, =gText_BattleRecord
movs r0, 0x1
adds r1, r4, 0
movs r2, 0x60
@ -6380,7 +6380,7 @@ _080C5DC2:
str r6, [sp]
mov r0, r8
str r0, [sp, 0x4]
ldr r0, =gUnknown_085ED91C
ldr r0, =gText_BattlePoints
str r0, [sp, 0x8]
movs r0, 0x2
movs r1, 0x8

86
asm/tv.s
View File

@ -7811,7 +7811,7 @@ GetMomOrDadStringForTVMessage: @ 80F00A4
cmp r0, 0
bne _080F0104
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD08
ldr r1, =gText_Mom
bl StringCopy
ldr r0, =0x00004003
movs r1, 0x1
@ -7824,7 +7824,7 @@ _080F00EC:
cmp r0, 0x2
bne _080F0104
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD08
ldr r1, =gText_Mom
bl StringCopy
ldr r0, =0x00004003
movs r1, 0x1
@ -7859,13 +7859,13 @@ _080F0104:
bne _080F0158
_080F0142:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD08
ldr r1, =gText_Mom
bl StringCopy
b _080F01A8
.pool
_080F0158:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD04
ldr r1, =gText_Dad
bl StringCopy
b _080F01A8
.pool
@ -7878,7 +7878,7 @@ _080F016C:
cmp r0, 0
beq _080F0198
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD08
ldr r1, =gText_Mom
bl StringCopy
adds r0, r4, 0
movs r1, 0x1
@ -7887,7 +7887,7 @@ _080F016C:
.pool
_080F0198:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAD04
ldr r1, =gText_Dad
bl StringCopy
adds r0, r4, 0
movs r1, 0x2
@ -10790,13 +10790,13 @@ _080F1A40:
cmp r0, 0x32
bne _080F1A58
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAEB1
ldr r1, =gText_Lv50
bl StringCopy
b _080F1A60
.pool
_080F1A58:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EAEB8
ldr r1, =gText_OpenLevel
bl StringCopy
_080F1A60:
ldrh r1, [r4, 0x16]
@ -12536,31 +12536,31 @@ _080F2C08:
.4byte _080F2C6C
_080F2C1C:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB0E8
ldr r1, =gText_Cool
bl StringCopy
b _080F2C74
.pool
_080F2C30:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB0ED
ldr r1, =gText_Beauty
bl StringCopy
b _080F2C74
.pool
_080F2C44:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB0F4
ldr r1, =gText_Cute
bl StringCopy
b _080F2C74
.pool
_080F2C58:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB0F9
ldr r1, =gText_Smart
bl StringCopy
b _080F2C74
.pool
_080F2C6C:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085EB0FF
ldr r1, =gText_Tough
bl StringCopy
_080F2C74:
ldr r0, =gStringVar2
@ -13154,13 +13154,13 @@ _080F31CA:
cmp r0, 0
bne _080F3200
ldr r0, =gStringVar3
ldr r1, =gUnknown_085ECB64
ldr r1, =gText_Single
bl StringCopy
b _080F3208
.pool
_080F3200:
ldr r0, =gStringVar3
ldr r1, =gUnknown_085ECB6B
ldr r1, =gText_Double
bl StringCopy
_080F3208:
ldr r1, =gUnknown_0203A030
@ -13369,38 +13369,38 @@ _080F3430:
.4byte _080F3494
_080F3444:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB48
ldr r1, =gText_Spicy2
bl StringCopy
b _080F349C
.pool
_080F3458:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB4E
ldr r1, =gText_Dry2
bl StringCopy
b _080F349C
.pool
_080F346C:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB52
ldr r1, =gText_Sweet2
bl StringCopy
b _080F349C
.pool
_080F3480:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB58
ldr r1, =gText_Bitter2
bl StringCopy
b _080F349C
.pool
_080F3494:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB5F
ldr r1, =gText_Sour2
bl StringCopy
_080F349C:
ldrb r0, [r4, 0x2]
cmp r0, 0x18
bls _080F34BC
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB2A
ldr r1, =gText_Excellent
bl StringCopy
b _080F34DC
.pool
@ -13408,13 +13408,13 @@ _080F34BC:
cmp r0, 0x16
bls _080F34D4
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB20
ldr r1, =gText_VeryGood
bl StringCopy
b _080F34DC
.pool
_080F34D4:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB1B
ldr r1, =gText_Good
bl StringCopy
_080F34DC:
ldr r0, =gStringVar3
@ -13454,38 +13454,38 @@ _080F3524:
.4byte _080F3588
_080F3538:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB48
ldr r1, =gText_Spicy2
bl StringCopy
b _080F3590
.pool
_080F354C:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB4E
ldr r1, =gText_Dry2
bl StringCopy
b _080F3590
.pool
_080F3560:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB52
ldr r1, =gText_Sweet2
bl StringCopy
b _080F3590
.pool
_080F3574:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB58
ldr r1, =gText_Bitter2
bl StringCopy
b _080F3590
.pool
_080F3588:
ldr r0, =gStringVar1
ldr r1, =gUnknown_085ECB5F
ldr r1, =gText_Sour2
bl StringCopy
_080F3590:
ldrb r0, [r4, 0x2]
cmp r0, 0x10
bls _080F35B0
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB34
ldr r1, =gText_SoSo
bl StringCopy
b _080F35D0
.pool
@ -13493,13 +13493,13 @@ _080F35B0:
cmp r0, 0xD
bls _080F35C8
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB3A
ldr r1, =gText_Bad
bl StringCopy
b _080F35D0
.pool
_080F35C8:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB3E
ldr r1, =gText_TheWorst
bl StringCopy
_080F35D0:
ldr r0, =gStringVar3
@ -14418,13 +14418,13 @@ _080F3ECC:
.pool
_080F3EE8:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB0C
ldr r1, =gText_Slots
bl StringCopy
b _080F3F04
.pool
_080F3EFC:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB12
ldr r1, =gText_Roulette
bl StringCopy
_080F3F04:
ldrb r1, [r4, 0x2]
@ -14455,13 +14455,13 @@ _080F3F28:
.pool
_080F3F44:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB0C
ldr r1, =gText_Slots
bl StringCopy
b _080F3F60
.pool
_080F3F58:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB12
ldr r1, =gText_Roulette
bl StringCopy
_080F3F60:
ldrh r1, [r4, 0x4]
@ -14485,13 +14485,13 @@ _080F3F78:
.pool
_080F3F94:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB0C
ldr r1, =gText_Slots
bl StringCopy
b _080F3FB0
.pool
_080F3FA8:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB12
ldr r1, =gText_Roulette
bl StringCopy
_080F3FB0:
ldrh r1, [r4, 0x4]
@ -14517,13 +14517,13 @@ _080F3FCC:
.pool
_080F3FE8:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB12
ldr r1, =gText_Roulette
bl StringCopy
b _080F4004
.pool
_080F3FFC:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB0C
ldr r1, =gText_Slots
bl StringCopy
_080F4004:
bl TVShowDone
@ -15097,7 +15097,7 @@ DoTVShowPokemonLotterWinnerFlashReport: @ 80F45A0
cmp r0, 0
bne _080F45FC
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB72
ldr r1, =gText_Jackpot
bl StringCopy
b _080F4634
.pool
@ -15105,7 +15105,7 @@ _080F45FC:
cmp r0, 0x1
bne _080F4614
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB7A
ldr r1, =gText_First
bl StringCopy
b _080F4634
.pool
@ -15113,13 +15113,13 @@ _080F4614:
cmp r0, 0x2
bne _080F462C
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB80
ldr r1, =gText_Second
bl StringCopy
b _080F4634
.pool
_080F462C:
ldr r0, =gStringVar2
ldr r1, =gUnknown_085ECB87
ldr r1, =gText_Third
bl StringCopy
_080F4634:
ldr r4, =gStringVar3

10
asm/use_pokeblock.s
View File

@ -1196,7 +1196,7 @@ sub_8166D44: @ 8166D44
bl GetMonData
add r0, sp, 0xC
bl StringGetEnd10
ldr r1, =gUnknown_085EC7A0
ldr r1, =gText_GetsAPokeBlockQuestion
add r0, sp, 0xC
bl StringAppend
ldr r4, =gStringVar4
@ -1426,7 +1426,7 @@ sub_8166F50: @ 8166F50
movs r1, 0x97
movs r2, 0xE
bl sub_8098858
ldr r2, =gUnknown_085EC800
ldr r2, =gText_WontEatAnymore
movs r0, 0x1
str r0, [sp]
movs r0, 0
@ -1503,13 +1503,13 @@ _08166FEC:
ldr r1, [r0]
adds r0, r4, 0
bl StringCopy
ldr r1, =gUnknown_085EC7E1
ldr r1, =gText_WasEnhanced
adds r0, r4, 0
bl StringAppend
b _08167018
.pool
_08167010:
ldr r1, =gUnknown_085EC7EF
ldr r1, =gText_NothingChanged
adds r0, r4, 0
bl StringCopy
_08167018:
@ -2895,7 +2895,7 @@ sub_8167BA0: @ 8167BA0
ldr r0, [r7]
ldr r6, =0x0000804a
adds r0, r6
ldr r1, =gUnknown_085EBF8D
ldr r1, =gText_NatureSlash
bl StringCopy
ldr r1, =gNatureNamePointers
lsls r4, 2

2
asm/walda_phrase.s
View File

@ -53,7 +53,7 @@ _081D9A44:
bl sub_80D2578
cmp r0, 0
beq _081D9A5C
ldr r0, =gUnknown_085EE49A
ldr r0, =gText_Peekaboo
bl sub_80D255C
b _081D9A68
.pool

6
asm/wallclock.s
View File

@ -353,7 +353,7 @@ Cb2_StartWallClock: @ 81349F4
movs r0, 0x5A
strh r0, [r1, 0x30]
bl sub_813498C
ldr r2, =gUnknown_085EFAE0
ldr r2, =gText_Confirm3
movs r0, 0x1
str r0, [sp]
mov r1, r8
@ -500,7 +500,7 @@ _08134BA4:
ldrh r0, [r0, 0xC]
strh r0, [r1, 0x30]
bl sub_813498C
ldr r2, =gUnknown_085EFAE8
ldr r2, =gText_Cancel4
movs r0, 0x1
str r0, [sp]
mov r1, r9
@ -683,7 +683,7 @@ sub_8134DC4: @ 8134DC4
adds r2, r5, 0
movs r3, 0xD
bl SetWindowBorderStyle
ldr r2, =gUnknown_085EFAC6
ldr r2, =gText_IsThisTheCorrectTime
movs r0, 0x1
str r0, [sp]
movs r0, 0

4
data/battle_message.s
View File

@ -1214,10 +1214,10 @@ gText_GiveNicknameCaptured:: @ 85CBFDB
gText_PkmnSentToPC:: @ 85CBFFF
.string "{RIVAL} was sent to\n{STRING 39} PC.$"
gText_SomeonesPC:: @ 85CC015
gText_Someones:: @ 85CC015
.string "someone’s$"
gText_LanettesPC:: @ 85CC01F
gText_Lanettes:: @ 85CC01F
.string "LANETTE’s$"
gText_PkmnDataAddedToDex:: @ 85CC029

130
data/link.s
View File

@ -1633,7 +1633,7 @@ gUnknown_082F025C:: @ 82F025C
window_template 0x00, 0x12, 0x07, 0x10, 0x06, 0x0f, 0x0001
gUnknown_082F0264:: @ 82F0264
.4byte gUnknown_085EA333, 0x00000001
.4byte gText_Register, 0x00000001
.4byte gUnknown_082EFD8C, 0x00000002
.4byte gUnknown_082EFD7C, 0x00000003
@ -1913,14 +1913,14 @@ gUnknown_082F0600:: @ 82F0600
.align 2
gUnknown_082F0608:: @ 82F0608
.4byte gUnknown_085EEDEC, 0x00000000
.4byte gUnknown_085EEDFC, 0x00000001
.4byte gUnknown_085EEE28, 0xfffffffe
.4byte gText_WonderCards, 0x00000000
.4byte gText_WonderNews, 0x00000001
.4byte gText_Exit3, 0xfffffffe
.align 2
gUnknown_082F0620:: @ 82F0620
.4byte gUnknown_085EEE08, 0x00000000
.4byte gUnknown_085EEE20, 0x00000001
.4byte gText_WirelessCommunication, 0x00000000
.4byte gText_Friend2, 0x00000001
.4byte gText_Cancel2, 0xfffffffe
.align 2
@ -1933,26 +1933,26 @@ gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate
.align 2
gUnknown_082F0650:: @ 82F0650
.4byte gUnknown_085EEE30, 0x00000000
.4byte gUnknown_085EEE38, 0x00000001
.4byte gUnknown_085EEE40, 0x00000002
.4byte gText_Receive, 0x00000000
.4byte gText_Send, 0x00000001
.4byte gText_Toss, 0x00000002
.4byte gText_Cancel2, 0xfffffffe
.align 2
gUnknown_082F0670:: @ 82F0670
.4byte gUnknown_085EEE30, 0x00000000
.4byte gUnknown_085EEE40, 0x00000002
.4byte gText_Receive, 0x00000000
.4byte gText_Toss, 0x00000002
.4byte gText_Cancel2, 0xfffffffe
.align 2
gUnknown_082F0688:: @ 82F0688
.4byte gUnknown_085EEE30, 0x00000000
.4byte gUnknown_085EEE38, 0x00000001
.4byte gText_Receive, 0x00000000
.4byte gText_Send, 0x00000001
.4byte gText_Cancel2, 0xfffffffe
.align 2
gUnknown_082F06A0:: @ 82F06A0
.4byte gUnknown_085EEE30, 0x00000000
.4byte gText_Receive, 0x00000000
.4byte gText_Cancel2, 0xfffffffe
.align 2
@ -1988,10 +1988,10 @@ gUnknown_082F06F8:: @ 82F06F8
.byte 0x21, 0x31, 0x00, 0x01
.align 2
.4byte gUnknown_085EEE48
.4byte gUnknown_085EEE8C
.4byte gUnknown_085EEEB8
.4byte gUnknown_085EEED4
.4byte gText_VarietyOfEventsImportedWireless
.4byte gText_WonderCardsInPossession
.4byte gText_ReadNewsThatArrived
.4byte gText_ReturnToTitle
.align 2
gUnknown_082F0720:: @ 82F0720 struct TextColor
@ -2065,11 +2065,11 @@ gUnknown_082F0D3C:: @ 82F0D3C
.align 2
gUnknown_082F0D5C:: @ 82F0D5C
.4byte gUnknown_085EED41
.4byte gUnknown_085EED5F
.4byte gUnknown_085EED6F
.4byte gUnknown_085EED80
.4byte gUnknown_085EED9A
.4byte gText_WirelessCommStatus
.4byte gText_PeopleTrading
.4byte gText_PeopleBattling
.4byte gText_PeopleInUnionRoom
.4byte gText_PeopleCommunicating
.align 2
gUnknown_082F0D70:: @ 82F0D70
@ -2780,37 +2780,37 @@ gUnknown_082F2C98:: @ 82F2C98
.align 2
gUnknown_082F2D40:: @ 82F2D40
.4byte gUnknown_085ED265
.4byte gText_QuitChatting
.byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_085ED274
.4byte gText_RegisterTextWhere
.byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_085ED289
.4byte gText_RegisterTextHere
.byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_085ED29D
.4byte gText_InputText
.byte 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_085ED2E8
.4byte gText_ExitingChat
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_085ED2FA
.4byte gText_LeaderLeftEndingChat
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00
.4byte gUnknown_085ED325
.4byte gText_RegisteredTextChanged
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gUnknown_085ED368
.4byte gText_AlreadySavedFile
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gUnknown_085ED3A3
.4byte gText_SavingDontTurnOff
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.4byte gUnknown_085ED3C5
.4byte gText_PlayerSavedGame
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00
.4byte gUnknown_085ED3D8
.4byte gText_IfLeaderLeavesChatEnds
.byte 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00
.align 2
@ -2819,11 +2819,11 @@ gText_Ellipsis:: @ 82F2DC4
.align 2
gUnknown_082F2DC8:: @ 82F2DC8
.4byte gUnknown_085ED23C, 0x00000000
.4byte gUnknown_085ED242, 0x00000000
.4byte gUnknown_085ED24F, 0x00000000
.4byte gUnknown_085ED257, 0x00000000
.4byte gUnknown_085ED260, 0x00000000
.4byte gText_Upper, 0x00000000
.4byte gText_Lower, 0x00000000
.4byte gText_Symbols, 0x00000000
.4byte gText_Register2, 0x00000000
.4byte gText_Exit2, 0x00000000
.align 2
gUnknown_082F2DF0:: @ 82F2DF0
@ -3002,15 +3002,15 @@ gUnknown_082F3290:: @ 82F3290
.align 2
gUnknown_082F32A4:: @ 82F32A4
.4byte gUnknown_085ED5F0
.4byte gUnknown_085ED62C
.4byte gUnknown_085ED65C
.4byte gUnknown_085ED6C8
.4byte gUnknown_085ED704
.4byte gUnknown_085ED724
.4byte gUnknown_085ED754
.4byte gUnknown_085ED788
.4byte gUnknown_085ED7BC
.4byte gText_ReadyToBerryCrush
.4byte gText_WaitForAllChooseBerry
.4byte gText_EndedWithXUnitsPowder
.4byte gText_RecordingGameResults
.4byte gText_PlayBerryCrushAgain
.4byte gText_YouHaveNoBerries
.4byte gText_MemberDroppedOut
.4byte gText_TimesUpNoGoodPowder
.4byte gText_CommunicationStandby2
.align 2
gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate
@ -3307,12 +3307,12 @@ gUnknown_082F4384:: @ 82F4384
.align 2
gUnknown_082F43B4:: @ 82F43B4
.4byte gUnknown_085ED7E8
.4byte gUnknown_085ED7F4
.4byte gUnknown_085ED7FC
.4byte gUnknown_085ED88C
.4byte gUnknown_085ED8A0
.4byte gUnknown_085ED8B8
.4byte gText_SpaceTimes2
.4byte gText_XDotY
.4byte gText_Var1Berry
.4byte gText_NeatnessRankings
.4byte gText_CoopRankings
.4byte gText_PressingPowerRankings
.align 2
gUnknown_082F43CC:: @ 82F43CC
@ -3575,9 +3575,9 @@ gUnknown_082F7B2C:: @ 82F7B2C
.align 2
gUnknown_082F7B34:: @ 82F7B34
.4byte gUnknown_085EDD02
.4byte gUnknown_085EDD12
.4byte gUnknown_085EDD1E
.4byte gText_BerriesPicked
.4byte gText_BestScore
.4byte gText_BerriesInRowFivePlayers
.align 2
gUnknown_082F7B40:: @ 82F7B40
@ -4040,11 +4040,11 @@ gUnknown_082FB3C8:: @ 82FB3C8
.align 2
gUnknown_082FB3DC:: @ 82FB3DC
.4byte gUnknown_085EDDAE
.4byte gUnknown_085EDDB1
.4byte gUnknown_085EDDB4
.4byte gUnknown_085EDDB7
.4byte gUnknown_085EDDBA
.4byte gText_1Colon
.4byte gText_2Colon
.4byte gText_3Colon
.4byte gText_4Colon
.4byte gText_5Colon
.align 2
gUnknown_082FB3F0:: @ 82FB3F0
@ -4632,9 +4632,9 @@ gUnknown_082FE270:: @ 82FE270
.align 2
gUnknown_082FE278:: @ 82FE278
.4byte gUnknown_085EDEA2
.4byte gUnknown_085EDEB2
.4byte gUnknown_085EDEBE
.4byte gText_JumpsInARow
.4byte gText_BestScore2
.4byte gText_ExcellentsInARow
.align 2
gPkmnJump321StartPal1:: @ 82FE284

1436
data/strings.s
View File

File diff suppressed because it is too large Load Diff

12
src/item.c
View File

@ -8,9 +8,9 @@
extern void ApplyNewEncyprtionKeyToHword(u16* hword, u32 newKey);
extern bool8 InBattlePyramid(void);
extern const u8 gOtherText_PokeBalls[];
extern const u8 gOtherText_Berries[];
extern const u8 gOtherText_Berry[];
extern const u8 gText_PokeBalls[];
extern const u8 gText_Berries[];
extern const u8 gText_Berry[];
extern const u8 gUnknown_085897E4[][28]; // not sure what this one is
bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
@ -92,7 +92,7 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity)
if (quantity < 2)
StringCopy(string, ItemId_GetItem(ITEM_POKE_BALL)->name);
else
StringCopy(string, gOtherText_PokeBalls);
StringCopy(string, gText_PokeBalls);
}
else
{
@ -109,9 +109,9 @@ void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity)
u8* txtPtr;
if (quantity < 2)
berryString = gOtherText_Berry;
berryString = gText_Berry;
else
berryString = gOtherText_Berries;
berryString = gText_Berries;
txtPtr = StringCopy(dst, berryName);
*txtPtr = CHAR_SPACE;
StringCopy(txtPtr + 1, berryString);

8
src/pokemon_size_record.c
View File

@ -45,8 +45,8 @@ static const u8 sGiftRibbonsMonDataIds[] =
MON_DATA_GIFT_RIBBON_7
};
extern const u8 gOtherText_DecimalPoint[];
extern const u8 gOtherText_Marco[];
extern const u8 gText_DecimalPoint[];
extern const u8 gText_Marco[];
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
#define CM_PER_INCH 2.54
@ -103,7 +103,7 @@ static void FormatMonSizeRecord(u8 *string, u32 size)
#endif
string = ConvertIntToDecimalStringN(string, size / 10, 0, 8);
string = StringAppend(string, gOtherText_DecimalPoint);
string = StringAppend(string, gText_DecimalPoint);
ConvertIntToDecimalStringN(string, size % 10, 0, 1);
}
@ -152,7 +152,7 @@ static void GetMonSizeRecordInfo(u16 species, u16 *sizeRecord)
FormatMonSizeRecord(gStringVar3, size);
StringCopy(gStringVar1, gSpeciesNames[species]);
if (*sizeRecord == DEFAULT_MAX_SIZE)
StringCopy(gStringVar2, gOtherText_Marco);
StringCopy(gStringVar2, gText_Marco);
else
StringCopy(gStringVar2, gSaveBlock2Ptr->playerName);
}

8
src/start_menu.c
View File

@ -151,7 +151,7 @@ static void BuildStartMenuActions_MultiBattleRoom(void)
extern const struct WindowTemplate gSafariBallsWindowTemplate;
extern const struct WindowTemplate gPyramidFloorWindowTemplate_1;
extern const struct WindowTemplate gPyramidFloorWindowTemplate_2;
extern const u8 gOtherText_SafariStock[];
extern const u8 gText_SafariBallStock[];
void DisplaySafariBallsWindow(void)
{
@ -159,13 +159,13 @@ void DisplaySafariBallsWindow(void)
PutWindowTilemap(sSafariBallsWindowId);
sub_81973FC(sSafariBallsWindowId, 0);
ConvertIntToDecimalStringN(gStringVar1, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2);
StringExpandPlaceholders(gStringVar4, gOtherText_SafariStock);
StringExpandPlaceholders(gStringVar4, gText_SafariBallStock);
PrintTextOnWindow(sSafariBallsWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
CopyWindowToVram(sSafariBallsWindowId, 2);
}
extern const u8* const gUnknown_08510510[];
extern const u8 gOtherText_BattlePyramid_X[];
extern const u8 gText_BattlePyramidFloor[];
void DisplayPyramidFloorWindow(void)
{
@ -177,7 +177,7 @@ void DisplayPyramidFloorWindow(void)
PutWindowTilemap(sBattlePyramidFloorWindowId);
sub_81973FC(sBattlePyramidFloorWindowId, 0);
StringCopy(gStringVar1, gUnknown_08510510[*(u16*)(&gSaveBlock2Ptr->field_CAA[8])]);
StringExpandPlaceholders(gStringVar4, gOtherText_BattlePyramid_X);
StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor);
PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
CopyWindowToVram(sBattlePyramidFloorWindowId, 2);
}