ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Begin renaming string.s unknowns

Browse Source
This commit is contained in:
Diegoisawesome 2017-09-12 01:23:34 -05:00
parent 04598f0749
commit a9f09ca051
31 changed files with 444 additions and 446 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/battle_setup.s
View File

@ -2590,7 +2590,7 @@ ReturnEmptyStringIfNull: @ 80B1C6C
push {lr} push {lr}
cmp r0, 0 cmp r0, 0
bne _080B1C74 bne _080B1C74
ldr r0, =gUnknown_085E8D03 ldr r0, =gText_EmptyString2
_080B1C74: _080B1C74:
pop {r1} pop {r1}
bx r1 bx r1

4
asm/berry_blender.s
View File

@ -7333,7 +7333,7 @@ _08083564:
bl StringAppend bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_085E8D5E ldr r1, =gText_Space
bl StringAppend bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
@ -8165,7 +8165,7 @@ _08083C84:
bl StringAppend bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F
ldr r1, =gUnknown_085E8D5E ldr r1, =gText_Space
bl StringAppend bl StringAppend
ldr r0, [r7] ldr r0, [r7]
adds r0, 0x9F adds r0, 0x9F

4
asm/berry_tag_screen.s
View File

@ -666,7 +666,7 @@ _081781C8:
b _08178242 b _08178242
.pool .pool
_08178230: _08178230:
ldr r2, =gUnknown_085E8D34 ldr r2, =gText_ThreeMarks
str r7, [sp] str r7, [sp]
str r0, [sp, 0x4] str r0, [sp, 0x4]
str r0, [sp, 0x8] str r0, [sp, 0x8]
@ -724,7 +724,7 @@ itemid_copy_name: @ 8178250
b _081782C2 b _081782C2
.pool .pool
_081782B0: _081782B0:
ldr r2, =gUnknown_085E8D34 ldr r2, =gText_ThreeMarks
str r5, [sp] str r5, [sp]
str r0, [sp, 0x4] str r0, [sp, 0x4]
str r0, [sp, 0x8] str r0, [sp, 0x8]

8
asm/contest.s
View File

@ -6447,7 +6447,7 @@ sub_80DAF1C: @ 80DAF1C
adds r5, r0, 0 adds r5, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r1, =gUnknown_085E8D3E ldr r1, =gText_Slash
add r0, sp, 0x4 add r0, sp, 0x4
bl StringCopy bl StringCopy
lsls r1, r5, 6 lsls r1, r5, 6
@ -7100,7 +7100,7 @@ _080DB472:
ldr r1, [r0] ldr r1, [r0]
movs r0, 0xA movs r0, 0xA
bl sub_80DEB70 bl sub_80DEB70
ldr r1, =gUnknown_085E8D3E ldr r1, =gText_Slash
movs r0, 0x9 movs r0, 0x9
bl sub_80DEB70 bl sub_80DEB70
add sp, 0x10 add sp, 0x10
@ -10296,7 +10296,7 @@ _080DCD92:
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r0, r2, 0 adds r0, r2, 0
ldr r1, =gUnknown_085E8D40 ldr r1, =gText_OneDash
bl StringCopy bl StringCopy
adds r2, r0, 0 adds r2, r0, 0
_080DCDBC: _080DCDBC:
@ -10339,7 +10339,7 @@ _080DCDEA:
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r0, r2, 0 adds r0, r2, 0
ldr r1, =gUnknown_085E8D40 ldr r1, =gText_OneDash
bl StringCopy bl StringCopy
adds r2, r0, 0 adds r2, r0, 0
_080DCE14: _080DCE14:

2
asm/contest_link_80F57C4.s
View File

@ -296,7 +296,7 @@ _080F5A96:
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0 movs r2, 0
bl sub_80F7ED0 bl sub_80F7ED0
ldr r1, =gUnknown_085E8D3E ldr r1, =gText_Slash
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
adds r1, r7, 0 adds r1, r7, 0

2
asm/contest_painting.s
View File

@ -383,7 +383,7 @@ sub_813010C: @ 813010C
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_818E868 bl sub_818E868
ldr r1, =gUnknown_085E8D5E ldr r1, =gText_Space
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
ldr r1, =gUnknown_085B07D4 ldr r1, =gUnknown_085B07D4

6
asm/decoration.s
View File

@ -653,7 +653,7 @@ _08126F0C:
adds r1, r0 adds r1, r0
movs r2, 0x1E movs r2, 0x1E
ldrsh r0, [r1, r2] ldrsh r0, [r1, r2]
ldr r2, =gUnknown_085E8CF0 ldr r2, =gText_Cancel
cmp r0, 0x2 cmp r0, 0x2
bne _08126F2C bne _08126F2C
ldr r2, =gUnknown_085EB7EA ldr r2, =gUnknown_085EB7EA
@ -1216,7 +1216,7 @@ _081273D6:
adds r4, r3 adds r4, r3
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_085E8CF0 ldr r1, =gText_Cancel
bl StringCopy bl StringCopy
ldr r0, [r5] ldr r0, [r5]
lsls r2, r6, 3 lsls r2, r6, 3
@ -1610,7 +1610,7 @@ sub_8127744: @ 8127744
ldrb r0, [r0] ldrb r0, [r0]
cmp r4, r0 cmp r4, r0
bcc _08127770 bcc _08127770
ldr r2, =gUnknown_085E8D62 ldr r2, =gText_GoBackPrevMenu
b _08127782 b _08127782
.pool .pool
_08127770: _08127770:

26
asm/hall_of_fame.s
View File

@ -1235,7 +1235,7 @@ _08173FD0:
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_81973C4 bl sub_81973C4
ldr r2, =gUnknown_085E8C14 ldr r2, =gText_LeagueChamp
str r5, [sp] str r5, [sp]
movs r0, 0x2 movs r0, 0x2
str r0, [sp, 0x4] str r0, [sp, 0x4]
@ -1858,14 +1858,14 @@ _0817454E:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r5, =gStringVar4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085E8C00 ldr r1, =gText_HOFNumber
adds r0, r5, 0 adds r0, r5, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r1, 0x8 movs r1, 0x8
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0 cmp r0, 0
bgt _081745C0 bgt _081745C0
ldr r1, =gUnknown_085E8574 ldr r1, =gText_PickCancel
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
adds r0, r5, 0 adds r0, r5, 0
@ -1875,7 +1875,7 @@ _0817454E:
b _081745D0 b _081745D0
.pool .pool
_081745C0: _081745C0:
ldr r1, =gUnknown_085E855C ldr r1, =gText_PickNextCancel
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
adds r0, r5, 0 adds r0, r5, 0
@ -2321,14 +2321,14 @@ sub_81749A0: @ 81749A0
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_085E8588 ldr r0, =gText_UnkCtrlF800Exit
movs r1, 0x8 movs r1, 0x8
movs r2, 0x1 movs r2, 0x1
bl sub_8198180 bl sub_8198180
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_81973C4 bl sub_81973C4
ldr r2, =gUnknown_085E8BDC ldr r2, =gText_HOFCorrupted
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
movs r0, 0x2 movs r0, 0x2
@ -2391,7 +2391,7 @@ sub_8174A38: @ 8174A38
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
movs r0, 0 movs r0, 0
bl PutWindowTilemap bl PutWindowTilemap
ldr r4, =gUnknown_085E8B3E ldr r4, =gText_WelcomeToHOF
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xD0 movs r2, 0xD0
@ -2434,7 +2434,7 @@ sub_8174A88: @ 8174A88
lsls r0, 1 lsls r0, 1
cmp r1, r0 cmp r1, r0
beq _08174B30 beq _08174B30
ldr r1, =gUnknown_085E8C36 ldr r1, =gText_Number
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
adds r6, r0, 0 adds r6, r0, 0
@ -2604,7 +2604,7 @@ _08174C0A:
movs r2, 0x80 movs r2, 0x80
movs r3, 0x1 movs r3, 0x1
bl box_print bl box_print
ldr r1, =gUnknown_085E8C3B ldr r1, =gText_Level
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
adds r6, r0, 0 adds r6, r0, 0
@ -2622,7 +2622,7 @@ _08174C0A:
movs r2, 0x24 movs r2, 0x24
movs r3, 0x11 movs r3, 0x11
bl box_print bl box_print
ldr r1, =gUnknown_085E8C4D ldr r1, =gText_IDNumber
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
adds r6, r0, 0 adds r6, r0, 0
@ -2675,7 +2675,7 @@ sub_8174C98: @ 8174C98
negs r1, r1 negs r1, r1
mov r9, r1 mov r9, r1
str r1, [sp, 0x4] str r1, [sp, 0x4]
ldr r0, =gUnknown_085E8C48 ldr r0, =gText_Name
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
@ -2711,7 +2711,7 @@ sub_8174C98: @ 8174C98
str r0, [sp] str r0, [sp]
movs r7, 0 movs r7, 0
str r7, [sp, 0x4] str r7, [sp, 0x4]
ldr r0, =gUnknown_085E8C4D ldr r0, =gText_IDNumber
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
@ -2787,7 +2787,7 @@ sub_8174C98: @ 8174C98
str r0, [sp] str r0, [sp]
mov r1, r9 mov r1, r9
str r1, [sp, 0x4] str r1, [sp, 0x4]
ldr r0, =gUnknown_085E84CE ldr r0, =gText_MainMenuTime
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1

36
asm/item_use.s
View File

@ -157,7 +157,7 @@ DisplayCannotUseItemMessage: @ 80FD164
b _080FD1BE b _080FD1BE
.pool .pool
_080FD1A0: _080FD1A0:
ldr r1, =gUnknown_085E8F31 ldr r1, =gText_DadsAdvice
ldr r2, =sub_81C6714 ldr r2, =sub_81C6714
adds r0, r5, 0 adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid
@ -183,7 +183,7 @@ DisplayDadsAdviceCannotUseItemMessage: @ 80FD1C8
lsrs r0, 24 lsrs r0, 24
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
ldr r2, =gUnknown_085E8F31 ldr r2, =gText_DadsAdvice
bl DisplayCannotUseItemMessage bl DisplayCannotUseItemMessage
pop {r0} pop {r0}
bx r0 bx r0
@ -198,7 +198,7 @@ DisplayCannotDismountBikeMessage: @ 80FD1E0
lsrs r0, 24 lsrs r0, 24
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
ldr r2, =gUnknown_085E8F6E ldr r2, =gText_CantDismountBike
bl DisplayCannotUseItemMessage bl DisplayCannotUseItemMessage
pop {r0} pop {r0}
bx r0 bx r0
@ -571,7 +571,7 @@ ItemUseOnFieldCB_Itemfinder: @ 80FD4B8
b _080FD4F6 b _080FD4F6
.pool .pool
_080FD4EC: _080FD4EC:
ldr r1, =gUnknown_085E9002 ldr r1, =gText_ItemFinderNothing
ldr r2, =sub_80FD5CC ldr r2, =sub_80FD5CC
adds r0, r4, 0 adds r0, r4, 0
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
@ -1363,7 +1363,7 @@ sub_80FDA94: @ 80FDA94
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _080FDACA bne _080FDACA
ldr r1, =gUnknown_085E8F93 ldr r1, =gText_ItemFinderNearby
ldr r2, =sub_80FD5CC ldr r2, =sub_80FD5CC
adds r0, r4, 0 adds r0, r4, 0
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
@ -1427,7 +1427,7 @@ _080FDB1C:
asrs r0, 16 asrs r0, 16
cmp r0, 0x4 cmp r0, 0x4
bne _080FDB50 bne _080FDB50
ldr r1, =gUnknown_085E8FDB ldr r1, =gText_ItemFinderOnTop
ldr r2, =sub_80FD5CC ldr r2, =sub_80FD5CC
adds r0, r5, 0 adds r0, r5, 0
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
@ -1542,7 +1542,7 @@ ItemUseOutOfBattle_CoinCase: @ 80FDC34
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9026 ldr r1, =gText_CoinCase
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r1, =gTasks ldr r1, =gTasks
@ -1586,7 +1586,7 @@ ItemUseOutOfBattle_PowderJar: @ 80FDCA4
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9138 ldr r1, =gText_PowderQty
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r1, =gTasks ldr r1, =gTasks
@ -1892,7 +1892,7 @@ ItemUseOutOfBattle_TMHM: @ 80FDF48
lsls r0, 1 lsls r0, 1
cmp r1, r0 cmp r1, r0
bls _080FDF74 bls _080FDF74
ldr r2, =gUnknown_085E9047 ldr r2, =gText_BootedUpHM
ldr r3, =sub_80FDF90 ldr r3, =sub_80FDF90
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@ -1900,7 +1900,7 @@ ItemUseOutOfBattle_TMHM: @ 80FDF48
b _080FDF80 b _080FDF80
.pool .pool
_080FDF74: _080FDF74:
ldr r2, =gUnknown_085E9037 ldr r2, =gText_BootedUpTM
ldr r3, =sub_80FDF90 ldr r3, =sub_80FDF90
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@ -1957,7 +1957,7 @@ task08_0809AD8C: @ 80FDFBC
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E9058 ldr r1, =gText_TMHMContainedVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r3, =sub_80FE024 ldr r3, =sub_80FE024
@ -2010,7 +2010,7 @@ sub_80FE058: @ 80FE058
ldr r1, =gStringVar2 ldr r1, =gStringVar2
bl CopyItemName bl CopyItemName
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E9080 ldr r1, =gText_PlayerUsedVar2
bl StringExpandPlaceholders bl StringExpandPlaceholders
bl InBattlePyramid bl InBattlePyramid
lsls r0, 24 lsls r0, 24
@ -2062,7 +2062,7 @@ _080FE0EC:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FE10C bne _080FE10C
ldr r2, =gUnknown_085E9092 ldr r2, =gText_RepelEffectsLingered
ldr r3, =bag_menu_inits_lists_menu ldr r3, =bag_menu_inits_lists_menu
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@ -2070,7 +2070,7 @@ _080FE0EC:
b _080FE116 b _080FE116
.pool .pool
_080FE10C: _080FE10C:
ldr r1, =gUnknown_085E9092 ldr r1, =gText_RepelEffectsLingered
ldr r2, =sub_81C6714 ldr r2, =sub_81C6714
adds r0, r5, 0 adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid
@ -2217,7 +2217,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
ldr r0, =0x000008ae ldr r0, =0x000008ae
bl FlagReset bl FlagReset
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E90C6 ldr r1, =gText_UsedVar2WildLured
bl StringExpandPlaceholders bl StringExpandPlaceholders
b _080FE28C b _080FE28C
.pool .pool
@ -2227,7 +2227,7 @@ _080FE278:
ldr r0, =0x000008ad ldr r0, =0x000008ad
bl FlagReset bl FlagReset
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E90F4 ldr r1, =gText_UsedVar2WildRepelled
bl StringExpandPlaceholders bl StringExpandPlaceholders
_080FE28C: _080FE28C:
ldr r1, =gTasks ldr r1, =gTasks
@ -2382,7 +2382,7 @@ _080FE3D0:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FE3F0 bne _080FE3F0
ldr r2, =gUnknown_085E9125 ldr r2, =gText_BoxFull
ldr r3, =bag_menu_inits_lists_menu ldr r3, =bag_menu_inits_lists_menu
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@ -2390,7 +2390,7 @@ _080FE3D0:
b _080FE3FA b _080FE3FA
.pool .pool
_080FE3F0: _080FE3F0:
ldr r1, =gUnknown_085E9125 ldr r1, =gText_BoxFull
ldr r2, =sub_81C6714 ldr r2, =sub_81C6714
adds r0, r5, 0 adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid

24
asm/link.s
View File

@ -17895,7 +17895,7 @@ sub_80125BC: @ 80125BC
movs r1, 0x1 movs r1, 0x1
movs r3, 0 movs r3, 0
bl sub_80173E0 bl sub_80173E0
ldr r1, =gUnknown_082ED8CC ldr r1, =gText_UnkCtrlCodeF907
add r0, sp, 0x8 add r0, sp, 0x8
bl StringCopy bl StringCopy
adds r5, r0, 0 adds r5, r0, 0
@ -17973,7 +17973,7 @@ _08012648:
.4byte _080126B8 .4byte _080126B8
_080126B8: _080126B8:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082ED960 ldr r1, =gText_AwaitingCommunication
bl StringExpandPlaceholders bl StringExpandPlaceholders
_080126C0: _080126C0:
pop {r0} pop {r0}
@ -18294,13 +18294,13 @@ _080129C8:
cmp r0, 0 cmp r0, 0
beq _08012A18 beq _08012A18
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082ED990 ldr r1, =gText_AwaitingLink
bl StringExpandPlaceholders bl StringExpandPlaceholders
b _08012A34 b _08012A34
.pool .pool
_08012A18: _08012A18:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_082ED960 ldr r1, =gText_AwaitingCommunication
bl StringExpandPlaceholders bl StringExpandPlaceholders
b _08012A34 b _08012A34
.pool .pool
@ -22289,7 +22289,7 @@ _08014E16:
_08014E4E: _08014E4E:
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0xD adds r0, 0xD
ldr r1, =gUnknown_082ED8D0 ldr r1, =gText_PleaseStartOver
bl mevent_0814257C bl mevent_0814257C
cmp r0, 0 cmp r0, 0
beq _08014EF2 beq _08014EF2
@ -22719,7 +22719,7 @@ _0801523A:
.pool .pool
_08015260: _08015260:
bl sub_800E084 bl sub_800E084
ldr r0, =gUnknown_082ED8D0 ldr r0, =gText_PleaseStartOver
bl sub_8018884 bl sub_8018884
_0801526A: _0801526A:
adds r0, r6, 0 adds r0, r6, 0
@ -23078,7 +23078,7 @@ _0801559A:
_080155A8: _080155A8:
adds r0, r5, 0 adds r0, r5, 0
adds r0, 0x9 adds r0, 0x9
ldr r1, =gUnknown_082ED8F8 ldr r1, =gText_WirelessSearchCanceled
b _080155C2 b _080155C2
.pool .pool
_080155B4: _080155B4:
@ -27066,7 +27066,7 @@ sub_80177B8: @ 80177B8
movs r2, 0x2 movs r2, 0x2
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_082ED8C8 ldr r1, =gText_Colon
adds r0, r5, 0 adds r0, r5, 0
bl StringAppend bl StringAppend
str r7, [sp] str r7, [sp]
@ -27111,7 +27111,7 @@ sub_80177B8: @ 80177B8
movs r2, 0x2 movs r2, 0x2
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_082ED8CC ldr r1, =gText_UnkCtrlCodeF907
adds r0, r5, 0 adds r0, r5, 0
bl StringCopy bl StringCopy
adds r0, r5, 0 adds r0, r5, 0
@ -27186,7 +27186,7 @@ sub_80178A0: @ 80178A0
movs r2, 0x2 movs r2, 0x2
movs r3, 0x5 movs r3, 0x5
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r1, =gUnknown_082ED8CC ldr r1, =gText_UnkCtrlCodeF907
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
@ -63848,7 +63848,7 @@ _0802A0CC:
ldr r0, [r7] ldr r0, [r7]
add r0, r10 add r0, r10
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, =gUnknown_085E8D60 ldr r2, =gText_SelectorArrow2
str r6, [sp] str r6, [sp]
mov r3, r9 mov r3, r9
str r3, [sp, 0x4] str r3, [sp, 0x4]
@ -63940,7 +63940,7 @@ _0802A1DC:
ldr r0, [r7] ldr r0, [r7]
add r0, r8 add r0, r8
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, =gUnknown_085E8D60 ldr r2, =gText_SelectorArrow2
subs r1, r5, 0x1 subs r1, r5, 0x1
lsls r1, 4 lsls r1, 4
adds r1, 0x1 adds r1, 0x1

44
asm/main_menu.s
View File

@ -312,7 +312,7 @@ _0802F982:
b _0802F9FC b _0802F9FC
.pool .pool
_0802F990: _0802F990:
ldr r0, =gUnknown_085E8405 ldr r0, =gText_SaveFileErased
bl CreateMainMenuErrorWindow bl CreateMainMenuErrorWindow
strh r5, [r4] strh r5, [r4]
mov r0, r8 mov r0, r8
@ -321,7 +321,7 @@ _0802F990:
b _0802F9FA b _0802F9FA
.pool .pool
_0802F9A4: _0802F9A4:
ldr r0, =gUnknown_085E83C2 ldr r0, =gText_SaveFileCorrupted
bl CreateMainMenuErrorWindow bl CreateMainMenuErrorWindow
mov r0, r8 mov r0, r8
subs r0, 0x8 subs r0, 0x8
@ -350,7 +350,7 @@ _0802F9D0:
b _0802F9FC b _0802F9FC
.pool .pool
_0802F9EC: _0802F9EC:
ldr r0, =gUnknown_085E8440 ldr r0, =gJPText_No1MSubCircuit
bl CreateMainMenuErrorWindow bl CreateMainMenuErrorWindow
mov r0, r8 mov r0, r8
subs r0, 0x8 subs r0, 0x8
@ -495,7 +495,7 @@ Task_MainMenuCheckBattery: @ 802FAB0
b _0802FB3C b _0802FB3C
.pool .pool
_0802FB28: _0802FB28:
ldr r0, =gUnknown_085E8453 ldr r0, =gText_BatteryRunDry
bl CreateMainMenuErrorWindow bl CreateMainMenuErrorWindow
ldr r1, =gTasks ldr r1, =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
@ -679,7 +679,7 @@ _0802FCBC:
movs r4, 0x1 movs r4, 0x1
negs r4, r4 negs r4, r4
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E827C ldr r0, =gText_MainMenuNewGame
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
@ -688,7 +688,7 @@ _0802FCBC:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E828E ldr r0, =gText_MainMenuOption
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x1 movs r0, 0x1
movs r1, 0x1 movs r1, 0x1
@ -728,7 +728,7 @@ _0802FD44:
movs r4, 0x1 movs r4, 0x1
negs r4, r4 negs r4, r4
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E8285 ldr r0, =gText_MainMenuContinue
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x2 movs r0, 0x2
movs r1, 0x1 movs r1, 0x1
@ -737,7 +737,7 @@ _0802FD44:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E827C ldr r0, =gText_MainMenuNewGame
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
@ -746,7 +746,7 @@ _0802FD44:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E828E ldr r0, =gText_MainMenuOption
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x4 movs r0, 0x4
movs r1, 0x1 movs r1, 0x1
@ -799,7 +799,7 @@ _0802FE00:
movs r4, 0x1 movs r4, 0x1
negs r4, r4 negs r4, r4
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E8285 ldr r0, =gText_MainMenuContinue
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x2 movs r0, 0x2
movs r1, 0x1 movs r1, 0x1
@ -808,7 +808,7 @@ _0802FE00:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E827C ldr r0, =gText_MainMenuNewGame
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
@ -817,7 +817,7 @@ _0802FE00:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E8295 ldr r0, =gText_MainMenuMysteryGift
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x4 movs r0, 0x4
movs r1, 0x1 movs r1, 0x1
@ -826,7 +826,7 @@ _0802FE00:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E828E ldr r0, =gText_MainMenuOption
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x5 movs r0, 0x5
movs r1, 0x1 movs r1, 0x1
@ -895,7 +895,7 @@ _0802FEFC:
movs r4, 0x1 movs r4, 0x1
negs r4, r4 negs r4, r4
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E8285 ldr r0, =gText_MainMenuContinue
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x2 movs r0, 0x2
movs r1, 0x1 movs r1, 0x1
@ -904,7 +904,7 @@ _0802FEFC:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E827C ldr r0, =gText_MainMenuNewGame
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
@ -913,7 +913,7 @@ _0802FEFC:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E82A2 ldr r0, =gText_MainMenuMysteryGift2
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x4 movs r0, 0x4
movs r1, 0x1 movs r1, 0x1
@ -922,7 +922,7 @@ _0802FEFC:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E82AF ldr r0, =gText_MainMenuMysteryEvents
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x5 movs r0, 0x5
movs r1, 0x1 movs r1, 0x1
@ -931,7 +931,7 @@ _0802FEFC:
bl box_print bl box_print
str r5, [sp] str r5, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
ldr r0, =gUnknown_085E828E ldr r0, =gText_MainMenuOption
str r0, [sp, 0x8] str r0, [sp, 0x8]
movs r0, 0x6 movs r0, 0x6
movs r1, 0x1 movs r1, 0x1
@ -1671,17 +1671,17 @@ _080305FC:
beq _0803061C beq _0803061C
b _08030622 b _08030622
_08030602: _08030602:
ldr r0, =gUnknown_085E82BE ldr r0, =gText_WirelessNotConnected
bl CreateMainMenuErrorWindow bl CreateMainMenuErrorWindow
b _08030622 b _08030622
.pool .pool
_08030610: _08030610:
ldr r0, =gUnknown_085E82E5 ldr r0, =gText_MysteryGiftCantUse
bl CreateMainMenuErrorWindow bl CreateMainMenuErrorWindow
b _08030622 b _08030622
.pool .pool
_0803061C: _0803061C:
ldr r0, =gUnknown_085E8328 ldr r0, =gText_MysteryEventsCantUse
bl CreateMainMenuErrorWindow bl CreateMainMenuErrorWindow
_08030622: _08030622:
ldr r0, =gTasks ldr r0, =gTasks
@ -2123,7 +2123,7 @@ task_new_game_prof_birch_speech_4: @ 80309CC
ldr r1, =task_new_game_prof_birch_speech_5 ldr r1, =task_new_game_prof_birch_speech_5
str r1, [r0] str r1, [r0]
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gUnknown_085E8692 ldr r1, =gText_ThisIsAPokemon
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r1, =sub_80323A0 ldr r1, =sub_80323A0
movs r0, 0x1 movs r0, 0x1

4
asm/mystery_event_script.s
View File

@ -669,14 +669,14 @@ sub_8153CC8: @ 8153CC8
cmp r4, r0 cmp r4, r0
bne _08153D18 bne _08153D18
ldr r0, =gStringVar1 ldr r0, =gStringVar1
ldr r1, =gUnknown_085E8264 ldr r1, =gText_Egg
movs r2, 0xB movs r2, 0xB
bl StringCopyN bl StringCopyN
b _08153D22 b _08153D22
.pool .pool
_08153D18: _08153D18:
ldr r0, =gStringVar1 ldr r0, =gStringVar1
ldr r1, =gUnknown_085E8268 ldr r1, =gText_Pokemon
movs r2, 0xB movs r2, 0xB
bl StringCopyN bl StringCopyN
_08153D22: _08153D22:

4
asm/naming_screen.s
View File

@ -3387,7 +3387,7 @@ sub_80E49BC: @ 80E49BC
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x10 sub sp, 0x10
movs r4, 0 movs r4, 0
ldr r1, =gUnknown_085E8D49 ldr r1, =gText_MaleSymbol
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
ldr r5, =gUnknown_02039F94 ldr r5, =gUnknown_02039F94
@ -3399,7 +3399,7 @@ sub_80E49BC: @ 80E49BC
beq _080E4A0C beq _080E4A0C
cmp r0, 0xFE cmp r0, 0xFE
bne _080E49E6 bne _080E49E6
ldr r1, =gUnknown_085E8D4B ldr r1, =gText_FemaleSymbol
add r0, sp, 0xC add r0, sp, 0xC
bl StringCopy bl StringCopy
movs r4, 0x1 movs r4, 0x1

28
asm/player_pc.s
View File

@ -69,7 +69,7 @@ sub_816AE58: @ 816AE58
bl CreateTask bl CreateTask
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_085E8D80 ldr r1, =gText_WhatWouldYouLike
ldr r2, =sub_816AED8 ldr r2, =sub_816AED8
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
pop {r0} pop {r0}
@ -91,7 +91,7 @@ sub_816AE98: @ 816AE98
bl CreateTask bl CreateTask
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_085E8D80 ldr r1, =gText_WhatWouldYouLike
ldr r2, =sub_816AED8 ldr r2, =sub_816AED8
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
pop {r0} pop {r0}
@ -266,7 +266,7 @@ sub_816B060: @ 816B060
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_085E8D80 ldr r1, =gText_WhatWouldYouLike
ldr r2, =sub_816AED8 ldr r2, =sub_816AED8
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
pop {r0} pop {r0}
@ -1601,7 +1601,7 @@ sub_816BBB8: @ 816BBB8
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r1, =gUnknown_085E8DE9 ldr r1, =gText_NoPokemon
ldr r2, =sub_816BBD4 ldr r2, =sub_816BBD4
bl DisplayItemMessageOnField bl DisplayItemMessageOnField
pop {r0} pop {r0}
@ -1808,7 +1808,7 @@ _0816BD58:
adds r4, r3 adds r4, r3
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_085E8CF7 ldr r1, =gText_Cancel2
bl StringCopy bl StringCopy
ldr r0, [r5] ldr r0, [r5]
lsls r2, r6, 3 lsls r2, r6, 3
@ -1950,7 +1950,7 @@ _0816BE8E:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x7 movs r0, 0x7
@ -2144,7 +2144,7 @@ _0816C030:
lsls r0, r2, 24 lsls r0, r2, 24
asrs r0, 24 asrs r0, 24
str r0, [sp, 0xC] str r0, [sp, 0xC]
ldr r0, =gUnknown_085E8D60 ldr r0, =gText_SelectorArrow2
str r0, [sp, 0x10] str r0, [sp, 0x10]
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
@ -2379,7 +2379,7 @@ _0816C248:
.4byte _0816C274 .4byte _0816C274
.4byte _0816C26C .4byte _0816C26C
_0816C26C: _0816C26C:
ldr r0, =gUnknown_085E8D62 ldr r0, =gText_GoBackPrevMenu
b _0816C2BA b _0816C2BA
.pool .pool
_0816C274: _0816C274:
@ -2391,11 +2391,11 @@ _0816C27C:
b _0816C2BA b _0816C2BA
.pool .pool
_0816C284: _0816C284:
ldr r0, =gUnknown_085E8EE0 ldr r0, =gText_TossHowManyVar1s
b _0816C2BA b _0816C2BA
.pool .pool
_0816C28C: _0816C28C:
ldr r0, =gUnknown_085E8EF9 ldr r0, =gText_ThrewAwayVar2Var1s
b _0816C2BA b _0816C2BA
.pool .pool
_0816C294: _0816C294:
@ -2403,15 +2403,15 @@ _0816C294:
b _0816C2BA b _0816C2BA
.pool .pool
_0816C29C: _0816C29C:
ldr r0, =gUnknown_085E8EB9 ldr r0, =gText_TooImportantToToss
b _0816C2BA b _0816C2BA
.pool .pool
_0816C2A4: _0816C2A4:
ldr r0, =gUnknown_085E8F0E ldr r0, =gText_ConfirmTossItems
b _0816C2BA b _0816C2BA
.pool .pool
_0816C2AC: _0816C2AC:
ldr r0, =gUnknown_085E8DFE ldr r0, =gText_MoveVar1Where
b _0816C2BA b _0816C2BA
.pool .pool
_0816C2B4: _0816C2B4:
@ -2892,7 +2892,7 @@ sub_816C6BC: @ 816C6BC
ldr r0, =gStringVar1 ldr r0, =gStringVar1
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1

24
asm/pokedex.s
View File

@ -7310,7 +7310,7 @@ _080BF38C:
b _080BF582 b _080BF582
.pool .pool
_080BF3A0: _080BF3A0:
ldr r0, =gUnknown_085E871B ldr r0, =gText_CryOf
movs r1, 0x52 movs r1, 0x52
movs r2, 0x21 movs r2, 0x21
bl sub_80BE8DC bl sub_80BE8DC
@ -7893,7 +7893,7 @@ _080BF910:
b _080BFB4E b _080BFB4E
.pool .pool
_080BF93C: _080BF93C:
ldr r1, =gUnknown_085E8723 ldr r1, =gText_SizeComparedTo
add r0, sp, 0x4 add r0, sp, 0x4
bl StringCopy bl StringCopy
ldr r0, =gSaveBlock2Ptr ldr r0, =gSaveBlock2Ptr
@ -8891,7 +8891,7 @@ sub_80C020C: @ 80C020C
adds r7, r2, 0 adds r7, r2, 0
cmp r3, 0 cmp r3, 0
beq _080C0234 beq _080C0234
ldr r4, =gUnknown_085E8735 ldr r4, =gText_PokedexRegistration
movs r0, 0x1 movs r0, 0x1
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0xF0 movs r2, 0xF0
@ -8916,7 +8916,7 @@ _080C024C:
adds r5, r6, 0 adds r5, r6, 0
lsls r4, r6, 16 lsls r4, r6, 16
_080C0250: _080C0250:
ldr r1, =gUnknown_085E8D4F ldr r1, =gText_UnkCtrlF908Clear01
mov r0, sp mov r0, sp
bl StringCopy bl StringCopy
adds r1, r5, 0 adds r1, r5, 0
@ -8955,16 +8955,16 @@ _080C028E:
b _080C02AE b _080C02AE
.pool .pool
_080C02AC: _080C02AC:
ldr r0, =gUnknown_085E86B8 ldr r0, =gText_5MarksPokemon
_080C02AE: _080C02AE:
movs r1, 0x64 movs r1, 0x64
movs r2, 0x29 movs r2, 0x29
bl sub_80BE8DC bl sub_80BE8DC
ldr r0, =gUnknown_085E8755 ldr r0, =gText_HTHeight
movs r1, 0x60 movs r1, 0x60
movs r2, 0x39 movs r2, 0x39
bl sub_80BE8DC bl sub_80BE8DC
ldr r0, =gUnknown_085E8758 ldr r0, =gText_WTWeight
movs r1, 0x60 movs r1, 0x60
movs r2, 0x49 movs r2, 0x49
bl sub_80BE8DC bl sub_80BE8DC
@ -8984,11 +8984,11 @@ _080C02AE:
b _080C0310 b _080C0310
.pool .pool
_080C02FC: _080C02FC:
ldr r0, =gUnknown_085E86C6 ldr r0, =gText_UnkHeight
movs r1, 0x81 movs r1, 0x81
movs r2, 0x39 movs r2, 0x39
bl sub_80BE8DC bl sub_80BE8DC
ldr r0, =gUnknown_085E86D0 ldr r0, =gText_UnkWeight
movs r1, 0x81 movs r1, 0x81
movs r2, 0x49 movs r2, 0x49
bl sub_80BE8DC bl sub_80BE8DC
@ -11626,7 +11626,7 @@ _080C17E8:
b _080C1994 b _080C1994
.pool .pool
_080C183C: _080C183C:
ldr r0, =gUnknown_085E875B ldr r0, =gText_SearchingPleaseWait
bl sub_80C2618 bl sub_80C2618
ldr r0, =sub_80C19A4 ldr r0, =sub_80C19A4
str r0, [r6] str r0, [r6]
@ -11880,7 +11880,7 @@ sub_80C1A4C: @ 80C1A4C
beq _080C1A84 beq _080C1A84
movs r0, 0x1F movs r0, 0x1F
bl PlaySE bl PlaySE
ldr r0, =gUnknown_085E8773 ldr r0, =gText_SearchCompleted
bl sub_80C2618 bl sub_80C2618
b _080C1A90 b _080C1A90
.pool .pool
@ -13334,7 +13334,7 @@ sub_80C2638: @ 80C2638
sub_80C2650: @ 80C2650 sub_80C2650: @ 80C2650
push {lr} push {lr}
adds r2, r0, 0 adds r2, r0, 0
ldr r0, =gUnknown_085E8B3A ldr r0, =gText_SelectorArrow
lsls r2, 4 lsls r2, 4
adds r2, 0x9 adds r2, 0x9
movs r1, 0x90 movs r1, 0x90

2
asm/pokemon_2.s
View File

@ -1338,7 +1338,7 @@ _0806A89C:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0806A8BC beq _0806A8BC
ldr r1, =gUnknown_085E8264 ldr r1, =gText_Egg
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
adds r0, r6, 0 adds r0, r6, 0

2
asm/region_map.s
View File

@ -3452,7 +3452,7 @@ _0812480C:
movs r0, 0x2 movs r0, 0x2
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r2, =gUnknown_085E8CB4 ldr r2, =gText_FlyToWhere
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0

2
asm/rom6.s
View File

@ -10753,7 +10753,7 @@ _0813AE1E:
ldrh r0, [r6, 0x22] ldrh r0, [r6, 0x22]
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gUnknown_085E8B3A ldr r2, =gText_SelectorArrow
mov r3, r9 mov r3, r9
ldrh r1, [r3] ldrh r1, [r3]
lsls r1, 28 lsls r1, 28

2
asm/rom_8072304.s
View File

@ -1533,7 +1533,7 @@ _08072F52:
mov r3, r8 mov r3, r8
cmp r3, 0 cmp r3, 0
bne _08072F82 bne _08072F82
ldr r1, =gUnknown_085E8D3E ldr r1, =gText_Slash
bl StringCopy bl StringCopy
_08072F82: _08072F82:
ldr r0, =gUnknown_020244D4 ldr r0, =gUnknown_020244D4

2
asm/rom_80C6FA0.s
View File

@ -14847,7 +14847,7 @@ _080CEE94:
_080CEEC0: _080CEEC0:
ldr r2, =0x00000cf9 ldr r2, =0x00000cf9
adds r0, r1, r2 adds r0, r1, r2
ldr r1, =gUnknown_085E8264 ldr r1, =gText_Egg
movs r2, 0 movs r2, 0
movs r3, 0x8 movs r3, 0x8
bl StringCopyPadded bl StringCopyPadded

2
asm/rom_815A0D4.s
View File

@ -13903,7 +13903,7 @@ _081612F6:
adds r1, r2, 0 adds r1, r2, 0
adds r1, 0x48 adds r1, 0x48
adds r1, r0 adds r1, r0
ldr r0, =gUnknown_085E8CF0 ldr r0, =gText_Cancel
str r0, [r1] str r0, [r1]
ldrb r0, [r3] ldrb r0, [r3]
lsls r0, 3 lsls r0, 3

72
asm/rom_818E9AC.s
View File

@ -54438,7 +54438,7 @@ _081AAF0C:
b _081AB012 b _081AB012
.pool .pool
_081AAF1C: _081AAF1C:
ldr r1, =gUnknown_085E91FC ldr r1, =gPocketNames
ldr r4, =gUnknown_0203CE58 ldr r4, =gUnknown_0203CE58
ldrb r0, [r4, 0x5] ldrb r0, [r4, 0x5]
lsls r0, 2 lsls r0, 2
@ -54848,7 +54848,7 @@ _081AB2B6:
lsls r4, 3 lsls r4, 3
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_085E8DB4 ldr r1, =gText_CloseBag
bl StringCopy bl StringCopy
ldr r0, =gUnknown_0203CE74 ldr r0, =gUnknown_0203CE74
ldr r0, [r0] ldr r0, [r0]
@ -55185,7 +55185,7 @@ _081AB5BE:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x7 movs r0, 0x7
@ -55218,7 +55218,7 @@ _081AB610:
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x7 movs r0, 0x7
@ -55306,7 +55306,7 @@ _081AB6E0:
ldr r1, [r1] ldr r1, [r1]
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E91C0 ldr r1, =gText_ReturnToVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
_081AB6FC: _081AB6FC:
@ -55380,7 +55380,7 @@ bag_menu_print_cursor: @ 81AB75C
bl FillWindowPixelRect bl FillWindowPixelRect
b _081AB7AE b _081AB7AE
_081AB798: _081AB798:
ldr r2, =gUnknown_085E8D60 ldr r2, =gText_SelectorArrow2
str r5, [sp] str r5, [sp]
movs r0, 0 movs r0, 0
str r0, [sp, 0x4] str r0, [sp, 0x4]
@ -55980,7 +55980,7 @@ _081ABC6C:
movs r2, 0x2 movs r2, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -56023,7 +56023,7 @@ _081ABCD4:
movs r2, 0x2 movs r2, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r6, =gStringVar4 ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r6, 0 adds r0, r6, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
lsls r4, 24 lsls r4, 24
@ -56424,7 +56424,7 @@ _081AC026:
adds r5, r0, 0 adds r5, r0, 0
cmp r1, 0x1 cmp r1, 0x1
bne _081AC07C bne _081AC07C
ldr r2, =gUnknown_085E91FC ldr r2, =gPocketNames
ldrb r0, [r4, 0x5] ldrb r0, [r4, 0x5]
lsls r0, 2 lsls r0, 2
adds r0, r2 adds r0, r2
@ -56440,7 +56440,7 @@ _081AC026:
b _081AC09A b _081AC09A
.pool .pool
_081AC07C: _081AC07C:
ldr r2, =gUnknown_085E91FC ldr r2, =gPocketNames
add r0, sp, 0x8 add r0, sp, 0x8
ldrb r0, [r0] ldrb r0, [r0]
lsls r0, 2 lsls r0, 2
@ -56775,7 +56775,7 @@ bag_menu_swap_items: @ 81AC2E8
bl CopyItemName bl CopyItemName
ldr r0, =gStringVar4 ldr r0, =gStringVar4
mov r8, r0 mov r8, r0
ldr r1, =gUnknown_085E8DFE ldr r1, =gText_MoveVar1Where
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
@ -57490,7 +57490,7 @@ _081ACA50:
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DBE ldr r1, =gText_Var1IsSelected
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -58061,7 +58061,7 @@ _081ACF24:
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8EE0 ldr r1, =gText_TossHowManyVar1s
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -58117,7 +58117,7 @@ BagMenuConfirmToss: @ 81ACF88
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8F0E ldr r1, =gText_ConfirmTossItems
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -58254,7 +58254,7 @@ BagMenuActuallyToss: @ 81AD0CC
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r6, =gStringVar4 ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8EF9 ldr r1, =gText_ThrewAwayVar2Var1s
adds r0, r6, 0 adds r0, r6, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -58419,7 +58419,7 @@ ItemMenu_Give: @ 81AD278
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081AD2AC bne _081AD2AC
ldr r2, =gUnknown_085E8DCE ldr r2, =gText_CantWriteMail
ldr r3, =sub_81AD350 ldr r3, =sub_81AD350
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@ -58462,7 +58462,7 @@ bag_menu_print_there_is_no_pokemon: @ 81AD2F0
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, =gUnknown_085E8DE9 ldr r2, =gText_NoPokemon
ldr r3, =sub_81AD350 ldr r3, =sub_81AD350
movs r1, 0x1 movs r1, 0x1
bl DisplayItemMessage bl DisplayItemMessage
@ -58482,7 +58482,7 @@ bag_menu_print_cant_be_held_msg: @ 81AD30C
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r5, =gStringVar4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085E8E11 ldr r1, =gText_Var1CantBeHeld
adds r0, r5, 0 adds r0, r5, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r3, =sub_81AD350 ldr r3, =sub_81AD350
@ -58608,7 +58608,7 @@ item_menu_type_2: @ 81AD41C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081AD44C bne _081AD44C
ldr r2, =gUnknown_085E8DCE ldr r2, =gText_CantWriteMail
ldr r3, =sub_81AD350 ldr r3, =sub_81AD350
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
@ -58625,7 +58625,7 @@ _081AD44C:
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8E27 ldr r1, =gText_Var1CantBeHeldHere
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r3, =sub_81AD350 ldr r3, =sub_81AD350
@ -58670,7 +58670,7 @@ item_menu_type_b: @ 81AD4B4
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _081AD4E4 bne _081AD4E4
ldr r2, =gUnknown_085E8DCE ldr r2, =gText_CantWriteMail
ldr r3, =sub_81AD350 ldr r3, =sub_81AD350
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
@ -59247,7 +59247,7 @@ _081ADA18:
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8E42 ldr r1, =gText_DepositHowManyVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -59374,7 +59374,7 @@ sub_81ADB14: @ 81ADB14
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0 cmp r5, 0
beq _081ADB6C beq _081ADB6C
ldr r2, =gUnknown_085E8E8E ldr r2, =gText_CantStoreImportantItems
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0
@ -59405,7 +59405,7 @@ _081ADB6C:
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8E5A ldr r1, =gText_DepositedVar2Var1s
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
str r6, [sp] str r6, [sp]
@ -59425,7 +59425,7 @@ _081ADB6C:
b _081ADBF2 b _081ADBF2
.pool .pool
_081ADBD4: _081ADBD4:
ldr r2, =gUnknown_085E8E6E ldr r2, =gText_NoRoomForItems
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
str r5, [sp, 0x4] str r5, [sp, 0x4]
@ -60320,7 +60320,7 @@ _081AE31A:
movs r0, 0x4 movs r0, 0x4
str r0, [sp, 0x10] str r0, [sp, 0x10]
movs r1, 0x1 movs r1, 0x1
ldr r2, =gUnknown_085E8D45 ldr r2, =gText_ThreeDashes
movs r3, 0x7 movs r3, 0x7
bl bag_menu_print bl bag_menu_print
adds r0, r4, 0x1 adds r0, r4, 0x1
@ -60354,7 +60354,7 @@ _081AE354:
ldrb r0, [r5, 0x1] ldrb r0, [r5, 0x1]
cmp r0, 0x1 cmp r0, 0x1
bhi _081AE38C bhi _081AE38C
ldr r2, =gUnknown_085E8D45 ldr r2, =gText_ThreeDashes
b _081AE39C b _081AE39C
.pool .pool
_081AE38C: _081AE38C:
@ -60387,7 +60387,7 @@ _081AE39C:
adds r6, r1, 0 adds r6, r1, 0
cmp r0, 0 cmp r0, 0
bne _081AE3D8 bne _081AE3D8
ldr r2, =gUnknown_085E8D45 ldr r2, =gText_ThreeDashes
b _081AE3E8 b _081AE3E8
.pool .pool
_081AE3D8: _081AE3D8:
@ -61406,7 +61406,7 @@ _081AEB66:
beq _081AEBCC beq _081AEBCC
b _081AEC0C b _081AEC0C
_081AEB70: _081AEB70:
ldr r1, =gUnknown_085E8D60 ldr r1, =gText_SelectorArrow2
adds r0, r6, 0 adds r0, r6, 0
mov r2, r8 mov r2, r8
adds r3, r7, 0 adds r3, r7, 0
@ -68511,7 +68511,7 @@ _081B243E:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0 movs r1, 0
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r5, =gUnknown_085E8CE3 ldr r5, =gText_Confirm
movs r0, 0 movs r0, 0
adds r1, r5, 0 adds r1, r5, 0
movs r2, 0x30 movs r2, 0x30
@ -68559,7 +68559,7 @@ _081B24C0:
ands r0, r1 ands r0, r1
cmp r0, 0xA cmp r0, 0xA
beq _081B2514 beq _081B2514
ldr r4, =gUnknown_085E8CF0 ldr r4, =gText_Cancel
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x30 movs r2, 0x30
@ -68582,7 +68582,7 @@ _081B24C0:
b _081B2540 b _081B2540
.pool .pool
_081B2514: _081B2514:
ldr r4, =gUnknown_085E8CF7 ldr r4, =gText_Cancel2
movs r0, 0 movs r0, 0
adds r1, r4, 0 adds r1, r4, 0
movs r2, 0x30 movs r2, 0x30
@ -69314,7 +69314,7 @@ sub_81B2B40: @ 81B2B40
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar1 ldr r4, =gStringVar1
ldr r1, =gUnknown_085E8D4D ldr r1, =gText_LevelSymbol
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
adds r0, r4, 0 adds r0, r4, 0
@ -69442,7 +69442,7 @@ _081B2C48:
movs r2, 0x2 movs r2, 0x2
bl LoadPalette bl LoadPalette
ldrb r0, [r7, 0x8] ldrb r0, [r7, 0x8]
ldr r1, =gUnknown_085E8D49 ldr r1, =gText_MaleSymbol
ldr r3, [r7] ldr r3, [r7]
adds r3, 0xC adds r3, 0xC
movs r2, 0x2 movs r2, 0x2
@ -69465,7 +69465,7 @@ _081B2C88:
movs r2, 0x2 movs r2, 0x2
bl LoadPalette bl LoadPalette
ldrb r0, [r7, 0x8] ldrb r0, [r7, 0x8]
ldr r1, =gUnknown_085E8D4B ldr r1, =gText_FemaleSymbol
ldr r3, [r7] ldr r3, [r7]
adds r3, 0xC adds r3, 0xC
movs r2, 0x2 movs r2, 0x2
@ -69630,7 +69630,7 @@ sub_81B2DDC: @ 81B2DDC
movs r3, 0x3 movs r3, 0x3
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar1 ldr r4, =gStringVar1
ldr r1, =gUnknown_085E8D3E ldr r1, =gText_Slash
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
adds r0, r4, 0 adds r0, r4, 0

74
asm/rom_81BE66C.s
View File

@ -7339,7 +7339,7 @@ sub_81C2628: @ 81C2628
cmp r5, r0 cmp r5, r0
beq _081C26CE beq _081C26CE
ldr r6, =gStringVar1 ldr r6, =gStringVar1
ldr r1, =gUnknown_085E8D4F ldr r1, =gText_UnkCtrlF908Clear01
adds r0, r6, 0 adds r0, r6, 0
bl StringCopy bl StringCopy
ldr r4, =gStringVar2 ldr r4, =gStringVar2
@ -7401,7 +7401,7 @@ _081C26E8:
bl sub_81C228C bl sub_81C228C
_081C26EE: _081C26EE:
ldr r4, =gStringVar1 ldr r4, =gStringVar1
ldr r1, =gUnknown_085E8D4D ldr r1, =gText_LevelSymbol
adds r0, r4, 0 adds r0, r4, 0
bl StringCopy bl StringCopy
ldr r5, =gStringVar2 ldr r5, =gStringVar2
@ -7517,7 +7517,7 @@ sub_81C27DC: @ 81C27DC
beq _081C2818 beq _081C2818
b _081C282C b _081C282C
_081C27FE: _081C27FE:
ldr r1, =gUnknown_085E8D49 ldr r1, =gText_MaleSymbol
str r0, [sp] str r0, [sp]
movs r0, 0x3 movs r0, 0x3
str r0, [sp, 0x4] str r0, [sp, 0x4]
@ -7528,7 +7528,7 @@ _081C27FE:
b _081C282C b _081C282C
.pool .pool
_081C2818: _081C2818:
ldr r1, =gUnknown_085E8D4B ldr r1, =gText_FemaleSymbol
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
movs r0, 0x4 movs r0, 0x4
@ -7606,7 +7606,7 @@ sub_81C286C: @ 81C286C
movs r2, 0x2 movs r2, 0x2
movs r3, 0x1 movs r3, 0x1
bl sub_81C25A4 bl sub_81C25A4
ldr r7, =gUnknown_085E8CF7 ldr r7, =gText_Cancel2
movs r0, 0x1 movs r0, 0x1
adds r1, r7, 0 adds r1, r7, 0
movs r2, 0x3E movs r2, 0x3E
@ -8354,7 +8354,7 @@ sub_81C2F5C: @ 81C2F5C
cmp r0, 0x1 cmp r0, 0x1
beq _081C2FC0 beq _081C2FC0
ldr r5, =gStringVar1 ldr r5, =gStringVar1
ldr r1, =gUnknown_085E8D59 ldr r1, =gText_UnkCtrlF907F908
adds r0, r5, 0 adds r0, r5, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_0203CF1C ldr r1, =gUnknown_0203CF1C
@ -8829,7 +8829,7 @@ sub_81C335C: @ 81C335C
movs r2, 0 movs r2, 0
movs r3, 0x1 movs r3, 0x1
bl sub_81C25A4 bl sub_81C25A4
ldr r1, =gUnknown_085E8D38 ldr r1, =gText_FiveMarks
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
mov r0, r9 mov r0, r9
@ -8854,10 +8854,10 @@ sub_81C33CC: @ 81C33CC
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
ldr r5, =gStringVar1 ldr r5, =gStringVar1
ldr r1, =gUnknown_085E8D59 ldr r1, =gText_UnkCtrlF907F908
adds r0, r5, 0 adds r0, r5, 0
bl StringCopy bl StringCopy
ldr r1, =gUnknown_085E8D38 ldr r1, =gText_FiveMarks
adds r0, r5, 0 adds r0, r5, 0
bl StringAppend bl StringAppend
movs r0, 0x1 movs r0, 0x1
@ -9126,7 +9126,7 @@ _081C3628:
ldrh r0, [r1] ldrh r0, [r1]
cmp r0, 0 cmp r0, 0
bne _081C3644 bne _081C3644
ldr r5, =gUnknown_085E8D26 ldr r5, =gText_None
b _081C3650 b _081C3650
.pool .pool
_081C3644: _081C3644:
@ -9174,7 +9174,7 @@ sub_81C3690: @ 81C3690
ldrb r0, [r1] ldrb r0, [r1]
cmp r0, 0 cmp r0, 0
bne _081C36B0 bne _081C36B0
ldr r5, =gUnknown_085E8D26 ldr r5, =gText_None
b _081C36C8 b _081C36C8
.pool .pool
_081C36B0: _081C36B0:
@ -9747,7 +9747,7 @@ sub_81C3B08: @ 81C3B08
b _081C3C26 b _081C3C26
.pool .pool
_081C3C00: _081C3C00:
ldr r1, =gUnknown_085E8D40 ldr r1, =gText_OneDash
lsls r4, r7, 4 lsls r4, r7, 4
adds r3, r4, 0x1 adds r3, r4, 0x1
lsls r3, 24 lsls r3, 24
@ -9758,7 +9758,7 @@ _081C3C00:
mov r0, r8 mov r0, r8
movs r2, 0 movs r2, 0
bl sub_81C25A4 bl sub_81C25A4
ldr r7, =gUnknown_085E8D42 ldr r7, =gText_TwoDashes
movs r5, 0xC movs r5, 0xC
movs r0, 0x1 movs r0, 0x1
adds r1, r7, 0 adds r1, r7, 0
@ -9815,7 +9815,7 @@ sub_81C3C5C: @ 81C3C5C
adds r6, r1, 0 adds r6, r1, 0
cmp r0, 0x1 cmp r0, 0x1
bhi _081C3C9C bhi _081C3C9C
ldr r1, =gUnknown_085E8D45 ldr r1, =gText_ThreeDashes
b _081C3CAC b _081C3CAC
.pool .pool
_081C3C9C: _081C3C9C:
@ -9841,7 +9841,7 @@ _081C3CAC:
ldrb r0, [r1, 0x3] ldrb r0, [r1, 0x3]
cmp r0, 0 cmp r0, 0
bne _081C3CDC bne _081C3CDC
ldr r1, =gUnknown_085E8D45 ldr r1, =gText_ThreeDashes
b _081C3CEC b _081C3CEC
.pool .pool
_081C3CDC: _081C3CDC:
@ -10143,7 +10143,7 @@ sub_81C3F44: @ 81C3F44
ldrh r2, [r0] ldrh r2, [r0]
cmp r2, 0 cmp r2, 0
bne _081C3F9C bne _081C3F9C
ldr r1, =gUnknown_085E8CF0 ldr r1, =gText_Cancel
str r2, [sp] str r2, [sp]
movs r0, 0x1 movs r0, 0x1
str r0, [sp, 0x4] str r0, [sp, 0x4]
@ -12533,7 +12533,7 @@ _081C5382:
adds r4, r1 adds r4, r1
ldr r0, [r5] ldr r0, [r5]
adds r0, r4 adds r0, r4
ldr r1, =gUnknown_085E8DB4 ldr r1, =gText_CloseBag
bl StringCopy bl StringCopy
ldr r1, [r5] ldr r1, [r5]
lsls r2, r6, 3 lsls r2, r6, 3
@ -12739,7 +12739,7 @@ _081C5560:
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x7 movs r0, 0x7
@ -12806,7 +12806,7 @@ _081C561C:
ldr r1, [r1] ldr r1, [r1]
bl StringCopy bl StringCopy
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E91C0 ldr r1, =gText_ReturnToVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
_081C5638: _081C5638:
@ -13393,7 +13393,7 @@ sub_81C5AB8: @ 81C5AB8
bl FillWindowPixelRect bl FillWindowPixelRect
b _081C5B08 b _081C5B08
_081C5AF4: _081C5AF4:
ldr r1, =gUnknown_085E8D60 ldr r1, =gText_SelectorArrow2
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
str r0, [sp, 0x4] str r0, [sp, 0x4]
@ -13716,7 +13716,7 @@ _081C5DDA:
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DBE ldr r1, =gText_Var1IsSelected
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -14203,7 +14203,7 @@ sub_81C61E0: @ 81C61E0
bne _081C6228 bne _081C6228
_081C620C: _081C620C:
bl sub_81C61A8 bl sub_81C61A8
ldr r1, =gUnknown_085E8F31 ldr r1, =gText_DadsAdvice
ldr r2, =sub_81C6714 ldr r2, =sub_81C6714
adds r0, r5, 0 adds r0, r5, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid
@ -14309,7 +14309,7 @@ _081C62F4:
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8EE0 ldr r1, =gText_TossHowManyVar1s
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -14362,7 +14362,7 @@ sub_81C6350: @ 81C6350
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8F0E ldr r1, =gText_ConfirmTossItems
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -14423,7 +14423,7 @@ sub_81C6404: @ 81C6404
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
@ -14463,7 +14463,7 @@ sub_81C645C: @ 81C645C
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -14577,7 +14577,7 @@ sub_81C654C: @ 81C654C
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r6, =gStringVar4 ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8EF9 ldr r1, =gText_ThrewAwayVar2Var1s
adds r0, r6, 0 adds r0, r6, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -14667,7 +14667,7 @@ sub_81C6648: @ 81C6648
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _081C667C bne _081C667C
ldr r1, =gUnknown_085E8DCE ldr r1, =gText_CantWriteMail
ldr r2, =sub_81C66EC ldr r2, =sub_81C66EC
adds r0, r4, 0 adds r0, r4, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid
@ -14707,7 +14707,7 @@ sub_81C66AC: @ 81C66AC
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r5, =gStringVar4 ldr r5, =gStringVar4
ldr r1, =gUnknown_085E8E11 ldr r1, =gText_Var1CantBeHeld
adds r0, r5, 0 adds r0, r5, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r2, =sub_81C66EC ldr r2, =sub_81C66EC
@ -14780,7 +14780,7 @@ sub_81C674C: @ 81C674C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081C677C bne _081C677C
ldr r1, =gUnknown_085E8DCE ldr r1, =gText_CantWriteMail
ldr r2, =sub_81C66EC ldr r2, =sub_81C66EC
adds r0, r4, 0 adds r0, r4, 0
bl DisplayItemMessageInBattlePyramid bl DisplayItemMessageInBattlePyramid
@ -14879,7 +14879,7 @@ sub_81C67CC: @ 81C67CC
ldr r1, =gStringVar1 ldr r1, =gStringVar1
bl CopyItemName bl CopyItemName
ldr r6, =gStringVar4 ldr r6, =gStringVar4
ldr r1, =gUnknown_085E8DFE ldr r1, =gText_MoveVar1Where
adds r0, r6, 0 adds r0, r6, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x1 movs r0, 0x1
@ -28902,7 +28902,7 @@ sub_81CD624: @ 81CD624
bl sub_81D2C68 bl sub_81D2C68
cmp r0, 0 cmp r0, 0
beq _081CD690 beq _081CD690
ldr r1, =gUnknown_085E8264 ldr r1, =gText_Egg
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0xC movs r3, 0xC
@ -37978,7 +37978,7 @@ sub_81D1DC0: @ 81D1DC0
adds r5, r0, 0 adds r5, r0, 0
movs r3, 0 movs r3, 0
ldr r7, =gUnknown_0203CF4C ldr r7, =gUnknown_0203CF4C
ldr r0, =gUnknown_085E8CF7 ldr r0, =gText_Cancel2
mov r12, r0 mov r12, r0
ldr r4, =gUnknown_03006310 ldr r4, =gUnknown_03006310
ldr r1, =gUnknown_0203CF48 ldr r1, =gUnknown_0203CF48
@ -39591,7 +39591,7 @@ _081D29C4:
ldrb r0, [r6, 0x1] ldrb r0, [r6, 0x1]
cmp r0, 0x1 cmp r0, 0x1
bhi _081D2A3C bhi _081D2A3C
ldr r5, =gUnknown_085E8D45 ldr r5, =gText_ThreeDashes
b _081D2A4A b _081D2A4A
.pool .pool
_081D2A3C: _081D2A3C:
@ -39615,7 +39615,7 @@ _081D2A4A:
ldrb r0, [r6, 0x3] ldrb r0, [r6, 0x3]
cmp r0, 0 cmp r0, 0
bne _081D2A70 bne _081D2A70
ldr r5, =gUnknown_085E8D45 ldr r5, =gText_ThreeDashes
b _081D2A7E b _081D2A7E
.pool .pool
_081D2A70: _081D2A70:
@ -39944,7 +39944,7 @@ sub_81D2CD0: @ 81D2CD0
bl sub_81D2C68 bl sub_81D2C68
cmp r0, 0 cmp r0, 0
beq _081D2D20 beq _081D2D20
ldr r1, =gUnknown_085E8264 ldr r1, =gText_Egg
adds r0, r5, 0 adds r0, r5, 0
movs r2, 0 movs r2, 0
movs r3, 0xC movs r3, 0xC
@ -56467,7 +56467,7 @@ sub_81DB468: @ 81DB468
movs r1, 0 movs r1, 0
strb r1, [r0] strb r1, [r0]
adds r0, 0x1 adds r0, 0x1
ldr r1, =gUnknown_085E8268 ldr r1, =gText_Pokemon
bl StringCopy bl StringCopy
pop {r0} pop {r0}
bx r0 bx r0

2
asm/secret_base.s
View File

@ -2268,7 +2268,7 @@ _080E9D7C:
ldr r1, [r4] ldr r1, [r4]
lsls r3, r6, 3 lsls r3, r6, 3
adds r2, r1, r3 adds r2, r1, r3
ldr r0, =gUnknown_085E8CF0 ldr r0, =gText_Cancel
str r0, [r2] str r0, [r2]
adds r1, 0x4 adds r1, 0x4
adds r1, r3 adds r1, r3

6
asm/shop.s
View File

@ -589,7 +589,7 @@ _080DFF78:
lsls r5, r6, 4 lsls r5, r6, 4
ldr r0, [r4] ldr r0, [r4]
adds r0, r5 adds r0, r5
ldr r1, =gUnknown_085E8CF7 ldr r1, =gText_Cancel2
bl StringCopy bl StringCopy
ldr r2, =gUnknown_02039F74 ldr r2, =gUnknown_02039F74
ldr r0, [r2] ldr r0, [r2]
@ -927,7 +927,7 @@ BuyMenuPrintCursor: @ 80E0250
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
ldr r1, =gUnknown_085E8D60 ldr r1, =gText_SelectorArrow2
movs r0, 0 movs r0, 0
str r0, [sp] str r0, [sp]
str r4, [sp, 0x4] str r4, [sp, 0x4]
@ -2642,7 +2642,7 @@ BuyMenuPrintItemQuantityAndPrice: @ 80E10EC
movs r3, 0x2 movs r3, 0x2
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r4, =gStringVar4 ldr r4, =gStringVar4
ldr r1, =gUnknown_085E8DA0 ldr r1, =gText_xVar1
adds r0, r4, 0 adds r0, r4, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0 movs r0, 0

4
asm/starter_choose.s
View File

@ -328,7 +328,7 @@ sub_81341FC: @ 81341FC
movs r1, 0 movs r1, 0
movs r3, 0xD movs r3, 0xD
bl SetWindowBorderStyle bl SetWindowBorderStyle
ldr r2, =gUnknown_085E8C53 ldr r2, =gText_BirchInTrouble
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0
@ -507,7 +507,7 @@ sub_8134390: @ 8134390
movs r0, 0 movs r0, 0
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer
ldr r2, =gUnknown_085E8C90 ldr r2, =gText_ConfirmStarterChoice
movs r0, 0x1 movs r0, 0x1
str r0, [sp] str r0, [sp]
movs r0, 0 movs r0, 0

4
asm/trader.s
View File

@ -92,7 +92,7 @@ sub_8133A78: @ 8133A78
movs r2, 0 movs r2, 0
bl GetStringWidth bl GetStringWidth
adds r6, r0, 0 adds r6, r0, 0
ldr r1, =gUnknown_085E8D38 ldr r1, =gText_FiveMarks
movs r0, 0x1 movs r0, 0x1
movs r2, 0 movs r2, 0
bl GetStringWidth bl GetStringWidth
@ -163,7 +163,7 @@ _08133B3C:
movs r1, 0 movs r1, 0
str r1, [sp, 0x8] str r1, [sp, 0x8]
movs r1, 0x1 movs r1, 0x1
ldr r2, =gUnknown_085E8D38 ldr r2, =gText_FiveMarks
movs r3, 0x8 movs r3, 0x8
bl PrintTextOnWindow bl PrintTextOnWindow
b _08133B94 b _08133B94

238
data/data2.s
View File

@ -357,152 +357,152 @@ gUnknown_082ED868:: @ 82ED868
.ascii "SEARCH" .ascii "SEARCH"
.align 2 .align 2
gUnknown_082ED8C4:: @ 82ED8C4 gText_EmptyString:: @ 82ED8C4
.string "$" .string "$"
.align 2 .align 2
gUnknown_082ED8C8:: @ 82ED8C8 gText_Colon:: @ 82ED8C8
.string ":$" .string ":$"
.align 2 .align 2
gUnknown_082ED8CC:: @ 82ED8CC gText_UnkCtrlCodeF907:: @ 82ED8CC
.string "{UNK_CTRL_F907}$" .string "{UNK_CTRL_F907}$"
.align 2 .align 2
gUnknown_082ED8D0:: @ 82ED8D0 gText_PleaseStartOver:: @ 82ED8D0
.string "Please start over from the beginning.$" .string "Please start over from the beginning.$"
.align 2 .align 2
gUnknown_082ED8F8:: @ 82ED8F8 gText_WirelessSearchCanceled:: @ 82ED8F8
.string "The WIRELESS COMMUNICATION\nSYSTEM search has been canceled.$" .string "The WIRELESS COMMUNICATION\nSYSTEM search has been canceled.$"
.align 2 .align 2
.string "Awaiting communication\nfrom another player.$" .string "Awaiting communication\nfrom another player.$"
.align 2 .align 2
gUnknown_082ED960:: @ 82ED960 gText_AwaitingCommunication:: @ 82ED960
.string "{STR_VAR_1}! Awaiting\ncommunication from another player.$" .string "{STR_VAR_1}! Awaiting\ncommunication from another player.$"
gUnknown_082ED990:: @ 82ED990 gText_AwaitingLink:: @ 82ED990
.string "{STR_VAR_1}! Awaiting link!\nPress START when everyone’s ready.$" .string "{STR_VAR_1}! Awaiting link!\nPress START when everyone’s ready.$"
.align 2 .align 2
gUnknown_082ED9C8:: @ 82ED9C8 gJPText_SingleBattle:: @ 82ED9C8
.string "シングルバトルを かいさいする$" @ "shingurubatoruwo kaisaisuru" ("hold a single battle" in Japanese) .string "シングルバトルを かいさいする$" @ "shingurubatoruwo kaisaisuru" ("hold a single battle" in Japanese)
.align 2 .align 2
gUnknown_082ED9D8:: @ 82ED9D8 gJPText_DoubleBattle:: @ 82ED9D8
.string "ダブルバトルを かいさいする$" @ "daburubatoruwo kaisaisuru" ("hold a double battle" in Japanese) .string "ダブルバトルを かいさいする$" @ "daburubatoruwo kaisaisuru" ("hold a double battle" in Japanese)
.align 2 .align 2
gUnknown_082ED9E8:: @ 82ED9E8 gJPText_MultiBattle:: @ 82ED9E8
.string "マルチバトルを かいさいする$" @ "maruchibatoruwo kaisaisuru" ("hold a multi battle" in Japanese) .string "マルチバトルを かいさいする$" @ "maruchibatoruwo kaisaisuru" ("hold a multi battle" in Japanese)
.align 2 .align 2
gUnknown_082ED9F8:: @ 82ED9F8 gJPText_TradePokemon:: @ 82ED9F8
.string "ポケモンこうかんを かいさいする$" @ "pokemonkoukanwo kaisaisuru" ("trade Pokémon" in Japanese) .string "ポケモンこうかんを かいさいする$" @ "pokemonkoukanwo kaisaisuru" ("trade Pokémon" in Japanese)
.align 2 .align 2
gUnknown_082EDA0C:: @ 82EDA0C gJPText_Chat:: @ 82EDA0C
.string "チャットを かいさいする$" @ "chattowo kaisaisuru" ("chat" in Japanese) .string "チャットを かいさいする$" @ "chattowo kaisaisuru" ("chat" in Japanese)
.align 2 .align 2
gUnknown_082EDA1C:: @ 82EDA1C gJPText_DistWonderCard:: @ 82EDA1C
.string "ふしぎなカードをくばる$" @ "fushiginakaadowokubaru" ("distribute Wonder Card" in Japanese) .string "ふしぎなカードをくばる$" @ "fushiginakaadowokubaru" ("distribute Wonder Card" in Japanese)
.align 2 .align 2
gUnknown_082EDA28:: @ 82EDA28 gJPText_DistWonderNews:: @ 82EDA28
.string "ふしぎなニュースをくばる$" @ "fushiginanyuusuwokubaru" ("distribute Mystery News" in Japanese) .string "ふしぎなニュースをくばる$" @ "fushiginanyuusuwokubaru" ("distribute Wonder News" in Japanese)
.align 2 .align 2
.string "ふしぎなできごとを かいさいする$" @ "fushiginadekigotowo kaisaisuru" ("hold a session of Mystery Event" in Japanese) .string "ふしぎなできごとを かいさいする$" @ "fushiginadekigotowo kaisaisuru" ("hold a session of Mystery Event" in Japanese)
.align 2 .align 2
gUnknown_082EDA4C:: @ 82EDA4C gJPText_HoldPokemonJump:: @ 82EDA4C
.string "なわとびを かいさいする$" @ "nawatobiwo kaisaisuru" ("hold a session of Jump" in Japanese) .string "なわとびを かいさいする$" @ "nawatobiwo kaisaisuru" ("hold a session of Jump" in Japanese)
.align 2 .align 2
gUnknown_082EDA5C:: @ 82EDA5C gJPText_HoldBerryCrush:: @ 82EDA5C
.string "きのみマッシャーを かいさいする$" @ "kinomimassha-wo kaisaisuru" ("hold a session of Berry Masher" in Japanese) .string "きのみマッシャーを かいさいする$" @ "kinomimassha-wo kaisaisuru" ("hold a session of Berry Masher" in Japanese)
.align 2 .align 2
gUnknown_082EDA70:: @ 82EDA70 gJPText_HoldBerryPicking:: @ 82EDA70
.string "きのみどりを かいさいする$" @ "kinomidoriwo kaisaisuru" ("hold a session of Berry Picking" in Japanese) .string "きのみどりを かいさいする$" @ "kinomidoriwo kaisaisuru" ("hold a session of Berry Picking" in Japanese)
.align 2 .align 2
gUnknown_082EDA80:: @ 82EDA80 gJPText_HoldSpinTrade:: @ 82EDA80
.string "ぐるぐるこうかんを かいさいする$" @ "gurugurukoukanwo kaisaisuru" ("hold a session of Spin Trade" in Japanese) .string "ぐるぐるこうかんを かいさいする$" @ "gurugurukoukanwo kaisaisuru" ("hold a session of Spin Trade" in Japanese)
.align 2 .align 2
gUnknown_082EDA94:: @ 82EDA94 gJPText_HoldSpinShop:: @ 82EDA94
.string "ぐるぐるショップを かいさいする$" @ "gurugurushoppuwo kaisaisuru" ("hold a session of Spin Shop" in Japanese) .string "ぐるぐるショップを かいさいする$" @ "gurugurushoppuwo kaisaisuru" ("hold a session of Spin Shop" in Japanese)
.align 2 .align 2
.4byte gUnknown_082ED9C8 .4byte gJPText_SingleBattle
.4byte gUnknown_082ED9D8 .4byte gJPText_DoubleBattle
.4byte gUnknown_082ED9E8 .4byte gJPText_MultiBattle
.4byte gUnknown_082ED9F8 .4byte gJPText_TradePokemon
.4byte gUnknown_082EDA0C .4byte gJPText_Chat
.4byte gUnknown_082EDA1C .4byte gJPText_DistWonderCard
.4byte gUnknown_082EDA28 .4byte gJPText_DistWonderNews
.4byte gUnknown_082EDA1C .4byte gJPText_DistWonderCard
.4byte gUnknown_082EDA4C .4byte gJPText_HoldPokemonJump
.4byte gUnknown_082EDA5C .4byte gJPText_HoldBerryCrush
.4byte gUnknown_082EDA70 .4byte gJPText_HoldBerryPicking
.4byte gUnknown_082EDA70 .4byte gJPText_HoldBerryPicking
.4byte gUnknown_082EDA80 .4byte gJPText_HoldSpinTrade
.4byte gUnknown_082EDA94 .4byte gJPText_HoldSpinShop
gUnknown_082EDAE0:: @ 82EDAE0 gText_1PlayerNeeded:: @ 82EDAE0
.string "1 player\nneeded.$" .string "1 player\nneeded.$"
gUnknown_082EDAF1:: @ 82EDAF1 gText_2PlayersNeeded:: @ 82EDAF1
.string "2 players\nneeded.$" .string "2 players\nneeded.$"
gUnknown_082EDB03:: @ 82EDB03 gText_3PlayersNeeded:: @ 82EDB03
.string "3 players\nneeded.$" .string "3 players\nneeded.$"
gUnknown_082EDB15:: @ 82EDB15 gText_4PlayersNeeded:: @ 82EDB15
.string "4 players\nneeded.$" .string "4 players\nneeded.$"
gUnknown_082EDB27:: @ 82EDB27 gText_2PlayerMode:: @ 82EDB27
.string "2-PLAYER\nMODE$" .string "2-PLAYER\nMODE$"
gUnknown_082EDB35:: @ 82EDB35 gText_3PlayerMode:: @ 82EDB35
.string "3-PLAYER\nMODE$" .string "3-PLAYER\nMODE$"
gUnknown_082EDB43:: @ 82EDB43 gText_4PlayerMode:: @ 82EDB43
.string "4-PLAYER\nMODE$" .string "4-PLAYER\nMODE$"
gUnknown_082EDB51:: @ 82EDB51 gText_5PlayerMode:: @ 82EDB51
.string "5-PLAYER\nMODE$" .string "5-PLAYER\nMODE$"
.align 2 .align 2
gUnknown_082EDB60:: @ 82EDB60 gUnknown_082EDB60:: @ 82EDB60
.4byte gUnknown_082EDAE0 .4byte gText_1PlayerNeeded
.4byte gUnknown_082EDB27 .4byte gText_2PlayerMode
.4byte NULL .4byte NULL
.4byte NULL .4byte NULL
.4byte NULL .4byte NULL
.4byte gUnknown_082EDB03 .4byte gText_3PlayersNeeded
.4byte gUnknown_082EDAF1 .4byte gText_2PlayersNeeded
.4byte gUnknown_082EDAE0 .4byte gText_1PlayerNeeded
.4byte gUnknown_082EDB43 .4byte gText_4PlayerMode
.4byte NULL .4byte NULL
.4byte gUnknown_082EDAE0 .4byte gText_1PlayerNeeded
.4byte gUnknown_082EDB27 .4byte gText_2PlayerMode
.4byte gUnknown_082EDB35 .4byte gText_3PlayerMode
.4byte gUnknown_082EDB43 .4byte gText_4PlayerMode
.4byte gUnknown_082EDB51 .4byte gText_5PlayerMode
.4byte gUnknown_082EDAF1 .4byte gText_2PlayersNeeded
.4byte gUnknown_082EDAE0 .4byte gText_1PlayerNeeded
.4byte gUnknown_082EDB35 .4byte gText_3PlayerMode
.4byte gUnknown_082EDB43 .4byte gText_4PlayerMode
.4byte gUnknown_082EDB51 .4byte gText_5PlayerMode
.4byte gUnknown_082EDAE0 .4byte gText_1PlayerNeeded
.4byte gUnknown_082EDB27 .4byte gText_2PlayerMode
.4byte gUnknown_082EDB35 .4byte gText_3PlayerMode
.4byte gUnknown_082EDB43 .4byte gText_4PlayerMode
.4byte NULL .4byte NULL
.align 2 .align 2
@ -1506,7 +1506,7 @@ gUnknown_082F0020:: @ 82F0020
.align 2 .align 2
gUnknown_082F0048:: @ 82F0048 gUnknown_082F0048:: @ 82F0048
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte gUnknown_082EFDB0 .4byte gUnknown_082EFDB0
.4byte gUnknown_082EFDC0 .4byte gUnknown_082EFDC0
.4byte gUnknown_082EFDD0 .4byte gUnknown_082EFDD0
@ -1519,14 +1519,14 @@ gUnknown_082F0048:: @ 82F0048
.4byte gUnknown_082EFE2C .4byte gUnknown_082EFE2C
.4byte gUnknown_082EFE38 .4byte gUnknown_082EFE38
.4byte gUnknown_082EFE48 .4byte gUnknown_082EFE48
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte gUnknown_082EFED4 .4byte gUnknown_082EFED4
.4byte gUnknown_082EFE60 .4byte gUnknown_082EFE60
.4byte gUnknown_082EFE50 .4byte gUnknown_082EFE50
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte gUnknown_082EFE00 .4byte gUnknown_082EFE00
.4byte gUnknown_082EFE10 .4byte gUnknown_082EFE10
.4byte gUnknown_082EFE70 .4byte gUnknown_082EFE70
@ -1579,15 +1579,15 @@ gUnknown_082F012C:: @ 82F012C
.align 2 .align 2
gUnknown_082F0134:: @ 82F0134 gUnknown_082F0134:: @ 82F0134
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte 0x00000000 .4byte 0x00000000
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte 0x00000001 .4byte 0x00000001
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte 0x00000002 .4byte 0x00000002
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte 0x00000003 .4byte 0x00000003
.4byte gUnknown_082ED8C4 .4byte gText_EmptyString
.4byte 0x00000004 .4byte 0x00000004
.align 2 .align 2
@ -1608,22 +1608,22 @@ gUnknown_082F017C:: @ 82F017C
.align 2 .align 2
gUnknown_082F0184:: @ 82F0184 gUnknown_082F0184:: @ 82F0184
.4byte gUnknown_082ED8C4, 0x00000000 .4byte gText_EmptyString, 0x00000000
.4byte gUnknown_082ED8C4, 0x00000001 .4byte gText_EmptyString, 0x00000001
.4byte gUnknown_082ED8C4, 0x00000002 .4byte gText_EmptyString, 0x00000002
.4byte gUnknown_082ED8C4, 0x00000003 .4byte gText_EmptyString, 0x00000003
.4byte gUnknown_082ED8C4, 0x00000004 .4byte gText_EmptyString, 0x00000004
.4byte gUnknown_082ED8C4, 0x00000005 .4byte gText_EmptyString, 0x00000005
.4byte gUnknown_082ED8C4, 0x00000006 .4byte gText_EmptyString, 0x00000006
.4byte gUnknown_082ED8C4, 0x00000007 .4byte gText_EmptyString, 0x00000007
.4byte gUnknown_082ED8C4, 0x00000008 .4byte gText_EmptyString, 0x00000008
.4byte gUnknown_082ED8C4, 0x00000009 .4byte gText_EmptyString, 0x00000009
.4byte gUnknown_082ED8C4, 0x0000000a .4byte gText_EmptyString, 0x0000000a
.4byte gUnknown_082ED8C4, 0x0000000b .4byte gText_EmptyString, 0x0000000b
.4byte gUnknown_082ED8C4, 0x0000000c .4byte gText_EmptyString, 0x0000000c
.4byte gUnknown_082ED8C4, 0x0000000d .4byte gText_EmptyString, 0x0000000d
.4byte gUnknown_082ED8C4, 0x0000000e .4byte gText_EmptyString, 0x0000000e
.4byte gUnknown_082ED8C4, 0x0000000f .4byte gText_EmptyString, 0x0000000f
.align 2 .align 2
gUnknown_082F0204:: @ 82F0204 struct ListMenuTemplate gUnknown_082F0204:: @ 82F0204 struct ListMenuTemplate
@ -1712,15 +1712,15 @@ gUnknown_082F034C:: @ 82F034C
.align 2 .align 2
gUnknown_082F0354:: @ 82F0354 gUnknown_082F0354:: @ 82F0354
.4byte gUnknown_082ED8C4, 0xfffffffd .4byte gText_EmptyString, 0xfffffffd
.4byte gUnknown_082ED8C4, 0x00000000 .4byte gText_EmptyString, 0x00000000
.4byte gUnknown_082ED8C4, 0x00000001 .4byte gText_EmptyString, 0x00000001
.4byte gUnknown_082ED8C4, 0x00000002 .4byte gText_EmptyString, 0x00000002
.4byte gUnknown_082ED8C4, 0x00000003 .4byte gText_EmptyString, 0x00000003
.4byte gUnknown_082ED8C4, 0x00000004 .4byte gText_EmptyString, 0x00000004
.4byte gUnknown_082ED8C4, 0x00000005 .4byte gText_EmptyString, 0x00000005
.4byte gUnknown_082ED8C4, 0x00000006 .4byte gText_EmptyString, 0x00000006
.4byte gUnknown_082ED8C4, 0x00000007 .4byte gText_EmptyString, 0x00000007
.4byte gUnknown_082EFD84, 0x00000008 .4byte gUnknown_082EFD84, 0x00000008
.align 2 .align 2
@ -1736,22 +1736,22 @@ gUnknown_082F03A4:: @ 82F03A4
.align 2 .align 2
gUnknown_082F03C4:: @ 82F03C4 gUnknown_082F03C4:: @ 82F03C4
.4byte gUnknown_082ED8C4, 0x00000000 .4byte gText_EmptyString, 0x00000000
.4byte gUnknown_082ED8C4, 0x00000001 .4byte gText_EmptyString, 0x00000001
.4byte gUnknown_082ED8C4, 0x00000002 .4byte gText_EmptyString, 0x00000002
.4byte gUnknown_082ED8C4, 0x00000003 .4byte gText_EmptyString, 0x00000003
.4byte gUnknown_082ED8C4, 0x00000004 .4byte gText_EmptyString, 0x00000004
.4byte gUnknown_082ED8C4, 0x00000005 .4byte gText_EmptyString, 0x00000005
.4byte gUnknown_082ED8C4, 0x00000006 .4byte gText_EmptyString, 0x00000006
.4byte gUnknown_082ED8C4, 0x00000007 .4byte gText_EmptyString, 0x00000007
.4byte gUnknown_082ED8C4, 0x00000008 .4byte gText_EmptyString, 0x00000008
.4byte gUnknown_082ED8C4, 0x00000009 .4byte gText_EmptyString, 0x00000009
.4byte gUnknown_082ED8C4, 0x0000000a .4byte gText_EmptyString, 0x0000000a
.4byte gUnknown_082ED8C4, 0x0000000b .4byte gText_EmptyString, 0x0000000b
.4byte gUnknown_082ED8C4, 0x0000000c .4byte gText_EmptyString, 0x0000000c
.4byte gUnknown_082ED8C4, 0x0000000d .4byte gText_EmptyString, 0x0000000d
.4byte gUnknown_082ED8C4, 0x0000000e .4byte gText_EmptyString, 0x0000000e
.4byte gUnknown_082ED8C4, 0x0000000f .4byte gText_EmptyString, 0x0000000f
.align 2 .align 2
.4byte gUnknown_082F03C4 .4byte gUnknown_082F03C4
@ -1945,7 +1945,7 @@ gUnknown_082F0608:: @ 82F0608
gUnknown_082F0620:: @ 82F0620 gUnknown_082F0620:: @ 82F0620
.4byte gUnknown_085EEE08, 0x00000000 .4byte gUnknown_085EEE08, 0x00000000
.4byte gUnknown_085EEE20, 0x00000001 .4byte gUnknown_085EEE20, 0x00000001
.4byte gUnknown_085E8CF7, 0xfffffffe .4byte gText_Cancel2, 0xfffffffe
.align 2 .align 2
gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate gUnknown_082F0638:: @ 82F0638 struct ListMenuTemplate
@ -1960,24 +1960,24 @@ gUnknown_082F0650:: @ 82F0650
.4byte gUnknown_085EEE30, 0x00000000 .4byte gUnknown_085EEE30, 0x00000000
.4byte gUnknown_085EEE38, 0x00000001 .4byte gUnknown_085EEE38, 0x00000001
.4byte gUnknown_085EEE40, 0x00000002 .4byte gUnknown_085EEE40, 0x00000002
.4byte gUnknown_085E8CF7, 0xfffffffe .4byte gText_Cancel2, 0xfffffffe
.align 2 .align 2
gUnknown_082F0670:: @ 82F0670 gUnknown_082F0670:: @ 82F0670
.4byte gUnknown_085EEE30, 0x00000000 .4byte gUnknown_085EEE30, 0x00000000
.4byte gUnknown_085EEE40, 0x00000002 .4byte gUnknown_085EEE40, 0x00000002
.4byte gUnknown_085E8CF7, 0xfffffffe .4byte gText_Cancel2, 0xfffffffe
.align 2 .align 2
gUnknown_082F0688:: @ 82F0688 gUnknown_082F0688:: @ 82F0688
.4byte gUnknown_085EEE30, 0x00000000 .4byte gUnknown_085EEE30, 0x00000000
.4byte gUnknown_085EEE38, 0x00000001 .4byte gUnknown_085EEE38, 0x00000001
.4byte gUnknown_085E8CF7, 0xfffffffe .4byte gText_Cancel2, 0xfffffffe
.align 2 .align 2
gUnknown_082F06A0:: @ 82F06A0 gUnknown_082F06A0:: @ 82F06A0
.4byte gUnknown_085EEE30, 0x00000000 .4byte gUnknown_085EEE30, 0x00000000
.4byte gUnknown_085E8CF7, 0xfffffffe .4byte gText_Cancel2, 0xfffffffe
.align 2 .align 2
gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate gUnknown_082F06B0:: @ 82F06B0 struct ListMenuTemplate

2
data/data_emerald2.s
View File

@ -933,5 +933,3 @@ gUnknown_0862B7E8:: @ 862B7E8
gUnknown_0862B7FC:: @ 862B7FC gUnknown_0862B7FC:: @ 862B7FC
.incbin "baserom.gba", 0x62b7fc, 0x2e8 .incbin "baserom.gba", 0x62b7fc, 0x2e8

254
data/strings.s
View File

@ -45,57 +45,57 @@ gExpandedPlaceholder_Brendan:: @ 85E8258
gExpandedPlaceholder_May:: @ 85E8260 gExpandedPlaceholder_May:: @ 85E8260
.string "MAY$" .string "MAY$"
gUnknown_085E8264:: @ 85E8264 gText_Egg:: @ 85E8264
.string "EGG$" .string "EGG$"
gUnknown_085E8268:: @ 85E8268 gText_Pokemon:: @ 85E8268
.string "POKéMON$" .string "POKéMON$"
.string "PROF. BIRCH$" .string "PROF. BIRCH$"
gUnknown_085E827C:: @ 85E827C gText_MainMenuNewGame:: @ 85E827C
.string "NEW GAME$" .string "NEW GAME$"
gUnknown_085E8285:: @ 85E8285 gText_MainMenuContinue:: @ 85E8285
.string "CONTINUE$" .string "CONTINUE$"
gUnknown_085E828E:: @ 85E828E gText_MainMenuOption:: @ 85E828E
.string "OPTION$" .string "OPTION$"
gUnknown_085E8295:: @ 85E8295 gText_MainMenuMysteryGift:: @ 85E8295
.string "MYSTERY GIFT$" .string "MYSTERY GIFT$"
gUnknown_085E82A2:: @ 85E82A2 gText_MainMenuMysteryGift2:: @ 85E82A2
.string "MYSTERY GIFT$" .string "MYSTERY GIFT$"
gUnknown_085E82AF:: @ 85E82AF gText_MainMenuMysteryEvents:: @ 85E82AF
.string "MYSTERY EVENTS$" .string "MYSTERY EVENTS$"
gUnknown_085E82BE:: @ 85E82BE gText_WirelessNotConnected:: @ 85E82BE
.string "The Wireless Adapter is not\nconnected.$" .string "The Wireless Adapter is not\nconnected.$"
gUnknown_085E82E5:: @ 85E82E5 gText_MysteryGiftCantUse:: @ 85E82E5
.string "MYSTERY GIFT can’t be used while\nthe Wireless Adapter is attached.$" .string "MYSTERY GIFT can’t be used while\nthe Wireless Adapter is attached.$"
gUnknown_085E8328:: @ 85E8328 gText_MysteryEventsCantUse:: @ 85E8328
.string "MYSTERY EVENTS can’t be used while\nthe Wireless Adapter is attached.$" .string "MYSTERY EVENTS can’t be used while\nthe Wireless Adapter is attached.$"
.string "Updating save file using external\ndata. Please wait.$" .string "Updating save file using external\ndata. Please wait.$"
.string "The save file has been updated.$" .string "The save file has been updated.$"
gUnknown_085E83C2:: @ 85E83C2 gText_SaveFileCorrupted:: @ 85E83C2
.string "The save file is corrupted. The\nprevious save file will be loaded.$" .string "The save file is corrupted. The\nprevious save file will be loaded.$"
gUnknown_085E8405:: @ 85E8405 gText_SaveFileErased:: @ 85E8405
.string "The save file has been erased\ndue to corruption or damage.$" .string "The save file has been erased\ndue to corruption or damage.$"
gUnknown_085E8440:: @ 85E8440 gJPText_No1MSubCircuit:: @ 85E8440
.string "1Mサブきばんが ささっていません！$" @ "1Msabukibanga sasatteimasen!" ("The 1M sub-circuit board is not installed!" in Japanese) .string "1Mサブきばんが ささっていません！$" @ "1Msabukibanga sasatteimasen!" ("The 1M sub-circuit board is not installed!" in Japanese)
gUnknown_085E8453:: @ 85E8453 gText_BatteryRunDry:: @ 85E8453
.string "The internal battery has run dry.\nThe game can be played.\pHowever, clock-based events will\nno longer occur.$" .string "The internal battery has run dry.\nThe game can be played.\pHowever, clock-based events will\nno longer occur.$"
.string "PLAYER$" .string "PLAYER$"
.string "POKéDEX$" .string "POKéDEX$"
gUnknown_085E84CE:: @ 85E84CE gText_MainMenuTime:: @ 85E84CE
.string "TIME$" .string "TIME$"
.string "BADGES$" .string "BADGES$"
.string "A Button$" .string "A Button$"
@ -118,15 +118,15 @@ gUnknown_085E84CE:: @ 85E84CE
.string "{UNK_CTRL_F800}NEXT {UNK_CTRL_F801}BACK$" .string "{UNK_CTRL_F800}NEXT {UNK_CTRL_F801}BACK$"
.align 2 .align 2
gUnknown_085E855C:: @ 85E855C gText_PickNextCancel:: @ 85E855C
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}NEXT {UNK_CTRL_F801}CANCEL$" .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}NEXT {UNK_CTRL_F801}CANCEL$"
.align 2 .align 2
gUnknown_085E8574:: @ 85E8574 gText_PickCancel:: @ 85E8574
.string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}{UNK_CTRL_F801}CANCEL$" .string "{UNK_CTRL_F80A}PICK {UNK_CTRL_F800}{UNK_CTRL_F801}CANCEL$"
.align 2 .align 2
gUnknown_085E8588:: @ 85E8588 gText_UnkCtrlF800Exit:: @ 85E8588
.string "{UNK_CTRL_F800}EXIT$" .string "{UNK_CTRL_F800}EXIT$"
.string "BOY$" .string "BOY$"
.string "GIRL$" .string "GIRL$"
@ -171,42 +171,42 @@ gUnknown_085E8588:: @ 85E8588
.string "LUCY$" .string "LUCY$"
.string "HALIE$" .string "HALIE$"
gUnknown_085E8692:: @ 85E8692 gText_ThisIsAPokemon:: @ 85E8692
.string "This is what we call a “POKéMON.”{PAUSE 96}\p$" .string "This is what we call a “POKéMON.”{PAUSE 96}\p$"
gUnknown_085E86B8:: @ 85E86B8 gText_5MarksPokemon:: @ 85E86B8
.string "????? POKéMON$" .string "????? POKéMON$"
gUnknown_085E86C6:: @ 85E86C6 gText_UnkHeight:: @ 85E86C6
.string "{CLEAR_TO 0x0C}??’??”$" .string "{CLEAR_TO 0x0C}??’??”$"
gUnknown_085E86D0:: @ 85E86D0 gText_UnkWeight:: @ 85E86D0
.string "????.? lbs.$" .string "????.? lbs.$"
.string " POKéMON$" .string " POKéMON$"
.string "{CLEAR_TO 0x0C} ’ ”$" .string "{CLEAR_TO 0x0C} ’ ”$"
.string " . lbs.$" .string " . lbs.$"
.string "$" .string "$"
gUnknown_085E871B:: @ 85E871B gText_CryOf:: @ 85E871B
.string "CRY OF$" .string "CRY OF$"
.string "$" .string "$"
gUnknown_085E8723:: @ 85E8723 gText_SizeComparedTo:: @ 85E8723
.string "SIZE COMPARED TO $" .string "SIZE COMPARED TO $"
gUnknown_085E8735:: @ 85E8735 gText_PokedexRegistration:: @ 85E8735
.string "POKéDEX registration completed.$" .string "POKéDEX registration completed.$"
gUnknown_085E8755:: @ 85E8755 gText_HTHeight:: @ 85E8755
.string "HT$" .string "HT$"
gUnknown_085E8758:: @ 85E8758 gText_WTWeight:: @ 85E8758
.string "WT$" .string "WT$"
gUnknown_085E875B:: @ 85E875B gText_SearchingPleaseWait:: @ 85E875B
.string "Searching…\nPlease wait.$" .string "Searching…\nPlease wait.$"
gUnknown_085E8773:: @ 85E8773 gText_SearchCompleted:: @ 85E8773
.string "Search completed.$" .string "Search completed.$"
gUnknown_085E8785:: @ 85E8785 gUnknown_085E8785:: @ 85E8785
@ -259,45 +259,45 @@ gUnknown_085E8785:: @ 85E8785
.string "DON’T SPECIFY.$" .string "DON’T SPECIFY.$"
.string "NONE$" .string "NONE$"
gUnknown_085E8B3A:: @ 85E8B3A gText_SelectorArrow:: @ 85E8B3A
.string "▶$" .string "▶$"
.string " $" .string " $"
gUnknown_085E8B3E:: @ 85E8B3E gText_WelcomeToHOF:: @ 85E8B3E
.string "Welcome to the HALL OF FAME!$" .string "Welcome to the HALL OF FAME!$"
.string "Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH’s POKéDEX rating!\pPROF. BIRCH: Let’s see…\p$" .string "Spotted POKéMON: {STR_VAR_1}!\nOwned POKéMON: {STR_VAR_2}!\pPROF. BIRCH’s POKéDEX rating!\pPROF. BIRCH: Let’s see…\p$"
.string "SAVING…\nDON’T TURN OFF THE POWER.$" .string "SAVING…\nDON’T TURN OFF THE POWER.$"
gUnknown_085E8BDC:: @ 85E8BDC gText_HOFCorrupted:: @ 85E8BDC
.string "The HALL OF FAME data is corrupted.$" .string "The HALL OF FAME data is corrupted.$"
gUnknown_085E8C00:: @ 85E8C00 gText_HOFNumber:: @ 85E8C00
.string "HALL OF FAME No. {STR_VAR_1}$" .string "HALL OF FAME No. {STR_VAR_1}$"
gUnknown_085E8C14:: @ 85E8C14 gText_LeagueChamp:: @ 85E8C14
.string "LEAGUE CHAMPION!\nCONGRATULATIONS!$" .string "LEAGUE CHAMPION!\nCONGRATULATIONS!$"
gUnknown_085E8C36:: @ 85E8C36 gText_Number:: @ 85E8C36
.string "No. $" .string "No. $"
gUnknown_085E8C3B:: @ 85E8C3B gText_Level:: @ 85E8C3B
.string "Lv. $" .string "Lv. $"
.string "IDNo. /$" .string "IDNo. /$"
gUnknown_085E8C48:: @ 85E8C48 gText_Name:: @ 85E8C48
.string "NAME$" .string "NAME$"
gUnknown_085E8C4D:: @ 85E8C4D gText_IDNumber:: @ 85E8C4D
.string "IDNo.$" .string "IDNo.$"
gUnknown_085E8C53:: @ 85E8C53 gText_BirchInTrouble:: @ 85E8C53
.string "PROF. BIRCH is in trouble!\nRelease a POKéMON and rescue him!$" .string "PROF. BIRCH is in trouble!\nRelease a POKéMON and rescue him!$"
gUnknown_085E8C90:: @ 85E8C90 gText_ConfirmStarterChoice:: @ 85E8C90
.string "Do you choose this POKéMON?$" .string "Do you choose this POKéMON?$"
.string "POKéMON$" .string "POKéMON$"
gUnknown_085E8CB4:: @ 85E8CB4 gText_FlyToWhere:: @ 85E8CB4
.string "FLY to where?$" .string "FLY to where?$"
.string "USE$" .string "USE$"
.string "TOSS$" .string "TOSS$"
@ -305,18 +305,18 @@ gUnknown_085E8CB4:: @ 85E8CB4
.string "GIVE$" .string "GIVE$"
.string "CHECK TAG$" .string "CHECK TAG$"
gUnknown_085E8CE3:: @ 85E8CE3 gText_Confirm:: @ 85E8CE3
.string "CONFIRM$" .string "CONFIRM$"
.string "WALK$" .string "WALK$"
gUnknown_085E8CF0:: @ 85E8CF0 gText_Cancel:: @ 85E8CF0
.string "CANCEL$" .string "CANCEL$"
gUnknown_085E8CF7:: @ 85E8CF7 gText_Cancel2:: @ 85E8CF7
.string "CANCEL$" .string "CANCEL$"
.string "SHOW$" .string "SHOW$"
gUnknown_085E8D03:: @ 85E8D03 gText_EmptyString2:: @ 85E8D03
.string "$" .string "$"
.string "CANCEL$" .string "CANCEL$"
.string "ITEM$" .string "ITEM$"
@ -325,218 +325,218 @@ gUnknown_085E8D03:: @ 85E8D03
.string "STORE$" .string "STORE$"
.string "CHECK$" .string "CHECK$"
gUnknown_085E8D26:: @ 85E8D26 gText_None:: @ 85E8D26
.string "NONE$" .string "NONE$"
.string "DESELECT$" .string "DESELECT$"
gUnknown_085E8D34:: @ 85E8D34 gText_ThreeMarks:: @ 85E8D34
.string "???$" .string "???$"
gUnknown_085E8D38:: @ 85E8D38 gText_FiveMarks:: @ 85E8D38
.string "?????$" .string "?????$"
gUnknown_085E8D3E:: @ 85E8D3E gText_Slash:: @ 85E8D3E
.string "/$" .string "/$"
gUnknown_085E8D40:: @ 85E8D40 gText_OneDash:: @ 85E8D40
.string "-$" .string "-$"
gUnknown_085E8D42:: @ 85E8D42 gText_TwoDashes:: @ 85E8D42
.string "--$" .string "--$"
gUnknown_085E8D45:: @ 85E8D45 gText_ThreeDashes:: @ 85E8D45
.string "---$" .string "---$"
gUnknown_085E8D49:: @ 85E8D49 gText_MaleSymbol:: @ 85E8D49
.string "♂$" .string "♂$"
gUnknown_085E8D4B:: @ 85E8D4B gText_FemaleSymbol:: @ 85E8D4B
.string "♀$" .string "♀$"
gUnknown_085E8D4D:: @ 85E8D4D gText_LevelSymbol:: @ 85E8D4D
.string "{LV}$" .string "{LV}$"
gUnknown_085E8D4F:: @ 85E8D4F gText_UnkCtrlF908Clear01:: @ 85E8D4F
.string "{UNK_CTRL_F908}{CLEAR 0x01}$" .string "{UNK_CTRL_F908}{CLEAR 0x01}$"
.string "+$" .string "+$"
.string "{RIGHT_ARROW}$" .string "{RIGHT_ARROW}$"
gUnknown_085E8D59:: @ 85E8D59 gText_UnkCtrlF907F908:: @ 85E8D59
.string "{UNK_CTRL_F907}{UNK_CTRL_F908}$" .string "{UNK_CTRL_F907}{UNK_CTRL_F908}$"
gUnknown_085E8D5E:: @ 85E8D5E gText_Space:: @ 85E8D5E
.string " $" .string " $"
gUnknown_085E8D60:: @ 85E8D60 gText_SelectorArrow2:: @ 85E8D60
.string "▶$" .string "▶$"
gUnknown_085E8D62:: @ 85E8D62 gText_GoBackPrevMenu:: @ 85E8D62
.string "Go back to the\nprevious menu.$" .string "Go back to the\nprevious menu.$"
gUnknown_085E8D80:: @ 85E8D80 gText_WhatWouldYouLike:: @ 85E8D80
.string "What would you like to do?$" .string "What would you like to do?$"
.string "GIVE$" .string "GIVE$"
gUnknown_085E8DA0:: @ 85E8DA0 gText_xVar1:: @ 85E8DA0
.string "×{STR_VAR_1}$" .string "×{STR_VAR_1}$"
.string " BERRY$" .string " BERRY$"
gOtherText_Coins2:: @ 85E8DAB gText_Coins:: @ 85E8DAB
.string "{STR_VAR_1} COINS$" .string "{STR_VAR_1} COINS$"
gUnknown_085E8DB4:: @ 85E8DB4 gText_CloseBag:: @ 85E8DB4
.string "CLOSE BAG$" .string "CLOSE BAG$"
gUnknown_085E8DBE:: @ 85E8DBE gText_Var1IsSelected:: @ 85E8DBE
.string "{STR_VAR_1} is\nselected.$" .string "{STR_VAR_1} is\nselected.$"
gUnknown_085E8DCE:: @ 85E8DCE gText_CantWriteMail:: @ 85E8DCE
.string "You can’t write\nMAIL here.$" .string "You can’t write\nMAIL here.$"
gUnknown_085E8DE9:: @ 85E8DE9 gText_NoPokemon:: @ 85E8DE9
.string "There is no\nPOKéMON.$" .string "There is no\nPOKéMON.$"
gUnknown_085E8DFE:: @ 85E8DFE gText_MoveVar1Where:: @ 85E8DFE
.string "Move the\n{STR_VAR_1}\nwhere?$" .string "Move the\n{STR_VAR_1}\nwhere?$"
gUnknown_085E8E11:: @ 85E8E11 gText_Var1CantBeHeld:: @ 85E8E11
.string "The {STR_VAR_1} can’t be held.$" .string "The {STR_VAR_1} can’t be held.$"
gUnknown_085E8E27:: @ 85E8E27 gText_Var1CantBeHeldHere:: @ 85E8E27
.string "The {STR_VAR_1} can’t be held\nhere.$" .string "The {STR_VAR_1} can’t be held\nhere.$"
gUnknown_085E8E42:: @ 85E8E42 gText_DepositHowManyVar1:: @ 85E8E42
.string "Deposit how many\n{STR_VAR_1}(s)?$" .string "Deposit how many\n{STR_VAR_1}(s)?$"
gUnknown_085E8E5A:: @ 85E8E5A gText_DepositedVar2Var1s:: @ 85E8E5A
.string "Deposited {STR_VAR_2}\n{STR_VAR_1}(s).$" .string "Deposited {STR_VAR_2}\n{STR_VAR_1}(s).$"
gUnknown_085E8E6E:: @ 85E8E6E gText_NoRoomForItems:: @ 85E8E6E
.string "There’s no room to\nstore items.$" .string "There’s no room to\nstore items.$"
gUnknown_085E8E8E:: @ 85E8E8E gText_CantStoreImportantItems:: @ 85E8E8E
.string "Important items\ncan’t be stored in\nthe PC!$" .string "Important items\ncan’t be stored in\nthe PC!$"
gUnknown_085E8EB9:: @ 85E8EB9 gText_TooImportantToToss:: @ 85E8EB9
.string "That’s much too\nimportant to toss\nout!$" .string "That’s much too\nimportant to toss\nout!$"
gUnknown_085E8EE0:: @ 85E8EE0 gText_TossHowManyVar1s:: @ 85E8EE0
.string "Toss out how many\n{STR_VAR_1}(s)?$" .string "Toss out how many\n{STR_VAR_1}(s)?$"
gUnknown_085E8EF9:: @ 85E8EF9 gText_ThrewAwayVar2Var1s:: @ 85E8EF9
.string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$" .string "Threw away {STR_VAR_2}\n{STR_VAR_1}(s).$"
gUnknown_085E8F0E:: @ 85E8F0E gText_ConfirmTossItems:: @ 85E8F0E
.string "Is it okay to\nthrow away {STR_VAR_2}\n{STR_VAR_1}(s)?$" .string "Is it okay to\nthrow away {STR_VAR_2}\n{STR_VAR_1}(s)?$"
gUnknown_085E8F31:: @ 85E8F31 gText_DadsAdvice:: @ 85E8F31
.string "DAD’s advice…\n{PLAYER}, there’s a time and place for\leverything!{PAUSE_UNTIL_PRESS}$" .string "DAD’s advice…\n{PLAYER}, there’s a time and place for\leverything!{PAUSE_UNTIL_PRESS}$"
gUnknown_085E8F6E:: @ 85E8F6E gText_CantDismountBike:: @ 85E8F6E
.string "You can’t dismount your BIKE here.{PAUSE_UNTIL_PRESS}$" .string "You can’t dismount your BIKE here.{PAUSE_UNTIL_PRESS}$"
gUnknown_085E8F93:: @ 85E8F93 gText_ItemFinderNearby:: @ 85E8F93
.string "Huh?\nThe ITEMFINDER’s responding!\pThere’s an item buried around here!{PAUSE_UNTIL_PRESS}$" .string "Huh?\nThe ITEMFINDER’s responding!\pThere’s an item buried around here!{PAUSE_UNTIL_PRESS}$"
gUnknown_085E8FDB:: @ 85E8FDB gText_ItemFinderOnTop:: @ 85E8FDB
.string "Oh!\nThe ITEMFINDER’s shaking wildly!{PAUSE_UNTIL_PRESS}$" .string "Oh!\nThe ITEMFINDER’s shaking wildly!{PAUSE_UNTIL_PRESS}$"
gUnknown_085E9002:: @ 85E9002 gText_ItemFinderNothing:: @ 85E9002
.string "… … … …Nope!\nThere’s no response.{PAUSE_UNTIL_PRESS}$" .string "… … … …Nope!\nThere’s no response.{PAUSE_UNTIL_PRESS}$"
gUnknown_085E9026:: @ 85E9026 gText_CoinCase:: @ 85E9026
.string "Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}$" .string "Your COINS:\n{STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
gUnknown_085E9037:: @ 85E9037 gText_BootedUpTM:: @ 85E9037
.string "Booted up a TM.$" .string "Booted up a TM.$"
gUnknown_085E9047:: @ 85E9047 gText_BootedUpHM:: @ 85E9047
.string "Booted up an HM.$" .string "Booted up an HM.$"
gUnknown_085E9058:: @ 85E9058 gText_TMHMContainedVar1:: @ 85E9058
.string "It contained\n{STR_VAR_1}.\pTeach {STR_VAR_1}\nto a POKéMON?$" .string "It contained\n{STR_VAR_1}.\pTeach {STR_VAR_1}\nto a POKéMON?$"
gUnknown_085E9080:: @ 85E9080 gText_PlayerUsedVar2:: @ 85E9080
.string "{PLAYER} used the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$" .string "{PLAYER} used the\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}$"
gUnknown_085E9092:: @ 85E9092 gText_RepelEffectsLingered:: @ 85E9092
.string "But the effects of a REPEL\nlingered from earlier.{PAUSE_UNTIL_PRESS}$" .string "But the effects of a REPEL\nlingered from earlier.{PAUSE_UNTIL_PRESS}$"
gUnknown_085E90C6:: @ 85E90C6 gText_UsedVar2WildLured:: @ 85E90C6
.string "{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be lured.{PAUSE_UNTIL_PRESS}$" .string "{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be lured.{PAUSE_UNTIL_PRESS}$"
gUnknown_085E90F4:: @ 85E90F4 gText_UsedVar2WildRepelled:: @ 85E90F4
.string "{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be repelled.{PAUSE_UNTIL_PRESS}$" .string "{PLAYER} used the\n{STR_VAR_2}.\pWild POKéMON will be repelled.{PAUSE_UNTIL_PRESS}$"
gUnknown_085E9125:: @ 85E9125 gText_BoxFull:: @ 85E9125
.string "The BOX is full.{PAUSE_UNTIL_PRESS}$" .string "The BOX is full.{PAUSE_UNTIL_PRESS}$"
gUnknown_085E9138:: @ 85E9138 gText_PowderQty:: @ 85E9138
.string "POWDER QTY: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" .string "POWDER QTY: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
gUnknown_085E9149:: @ 85E9149 gText_TheField:: @ 85E9149
.string "the field$" .string "the field$"
gUnknown_085E9153:: @ 85E9153 gText_TheBattle:: @ 85E9153
.string "the battle$" .string "the battle$"
gUnknown_085E915E:: @ 85E915E gText_ThePokemonList:: @ 85E915E
.string "the POKéMON LIST$" .string "the POKéMON LIST$"
gUnknown_085E916F:: @ 85E916F gText_TheShop:: @ 85E916F
.string "the shop$" .string "the shop$"
gUnknown_085E9178:: @ 85E9178 gText_ThePC:: @ 85E9178
.string "the PC$" .string "the PC$"
.align 2 .align 2
gUnknown_085E9180:: @ 85E9180 gUnknown_085E9180:: @ 85E9180
.4byte gUnknown_085E9149 .4byte gText_TheField
.4byte gUnknown_085E9153 .4byte gText_TheBattle
.4byte gUnknown_085E915E .4byte gText_ThePokemonList
.4byte gUnknown_085E916F .4byte gText_TheShop
.4byte gUnknown_085E9149 .4byte gText_TheField
.4byte gUnknown_085E9149 .4byte gText_TheField
.4byte gUnknown_085E9178 .4byte gText_ThePC
.4byte gUnknown_085E9149 .4byte gText_TheField
.4byte gUnknown_085E9149 .4byte gText_TheField
.4byte gUnknown_085E9149 .4byte gText_TheField
.4byte gUnknown_085E9153 .4byte gText_TheBattle
.4byte gUnknown_085E9178 .4byte gText_ThePC
.align 2 .align 2
gUnknown_085E91B0:: @ 85E91B0 gUnknown_085E91B0:: @ 85E91B0
.4byte gUnknown_085E9149 .4byte gText_TheField
.4byte gUnknown_085E9153 .4byte gText_TheBattle
.4byte gUnknown_085E915E .4byte gText_ThePokemonList
.4byte gUnknown_085E9149 .4byte gText_TheField
.align 2 .align 2
gUnknown_085E91C0:: @ 85E91C0 gText_ReturnToVar1:: @ 85E91C0
.string "Return to\n{STR_VAR_1}.$" .string "Return to\n{STR_VAR_1}.$"
gUnknown_085E91CE:: @ 85E91CE gText_ItemsPocket:: @ 85E91CE
.string "ITEMS$" .string "ITEMS$"
gUnknown_085E91D4:: @ 85E91D4 gText_PokeBallsPocket:: @ 85E91D4
.string "POKé BALLS$" .string "POKé BALLS$"
gUnknown_085E91DF:: @ 85E91DF gText_TMHMPocket:: @ 85E91DF
.string "TMs & HMs$" .string "TMs & HMs$"
gUnknown_085E91E9:: @ 85E91E9 gText_BerriesPocket:: @ 85E91E9
.string "BERRIES$" .string "BERRIES$"
gUnknown_085E91F1:: @ 85E91F1 gText_KeyItemsPocket:: @ 85E91F1
.string "KEY ITEMS$" .string "KEY ITEMS$"
.align 2 .align 2
gUnknown_085E91FC:: @ 85E91FC gPocketNames:: @ 85E91FC
.4byte gUnknown_085E91CE .4byte gText_ItemsPocket
.4byte gUnknown_085E91D4 .4byte gText_PokeBallsPocket
.4byte gUnknown_085E91DF .4byte gText_TMHMPocket
.4byte gUnknown_085E91E9 .4byte gText_BerriesPocket
.4byte gUnknown_085E91F1 .4byte gText_KeyItemsPocket
.align 2 .align 2
gUnknown_085E9210:: @ 85E9210 gUnknown_085E9210:: @ 85E9210

4
src/coins.c
View File

@ -14,14 +14,14 @@ extern void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority
extern void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, s16 tileStart, s8 palette); extern void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, s16 tileStart, s8 palette);
extern void sub_819746C(u8 windowId, bool8 copyToVram); extern void sub_819746C(u8 windowId, bool8 copyToVram);
extern const u8 gOtherText_Coins2[]; extern const u8 gText_Coins[];
void PrintCoinsString(u32 coinAmount) void PrintCoinsString(u32 coinAmount)
{ {
u32 xAlign; u32 xAlign;
ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4);
StringExpandPlaceholders(gStringVar4, gOtherText_Coins2); StringExpandPlaceholders(gStringVar4, gText_Coins);
xAlign = GetStringRightAlignXOffset(1, gStringVar4, 0x40); xAlign = GetStringRightAlignXOffset(1, gStringVar4, 0x40);
PrintTextOnWindow(sCoinsWindowId, 1, gStringVar4, xAlign, 1, 0, NULL); PrintTextOnWindow(sCoinsWindowId, 1, gStringVar4, xAlign, 1, 0, NULL);