summaryrefslogtreecommitdiff
path: root/engine/overworld
diff options
context:
space:
mode:
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/decorations.asm28
-rw-r--r--engine/overworld/scripting.asm6
-rw-r--r--engine/overworld/select_menu.asm2
-rw-r--r--engine/overworld/wildmons.asm2
4 files changed, 19 insertions, 19 deletions
diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm
index 6eacb0e00..74abf56ee 100644
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@@ -385,7 +385,7 @@ PopulateDecoCategoryMenu:
.Text_nothing_to_choose:
; There's nothing to choose.
text_far UnknownText_0x1bc471
- db "@"
+ text_end
.NonscrollingMenuHeader:
db MENU_BACKUP_TILES ; flags
@@ -807,7 +807,7 @@ DecoAction_SetItUp_Ornament:
UnknownText_0x26e41:
; Which side do you want to put it on?
text_far UnknownText_0x1bc48c
- db "@"
+ text_end
DecoAction_PutItAway_Ornament:
ld a, [wSelectedDecoration]
@@ -833,7 +833,7 @@ DecoAction_PutItAway_Ornament:
DecoText_WhichSide:
; Which side do you want to put away?
text_far UnknownText_0x1bc4b2
- db "@"
+ text_end
DecoAction_AskWhichSide:
call MenuTextBox
@@ -886,27 +886,27 @@ MenuData_0x26eb3:
DecoText_PutAwayTheDeco:
; Put away the @ .
text_far UnknownText_0x1bc4d7
- db "@"
+ text_end
DecoText_NothingToPutAway:
; There's nothing to put away.
text_far UnknownText_0x1bc4ec
- db "@"
+ text_end
DecoText_SetUpTheDeco:
; Set up the @ .
text_far UnknownText_0x1bc509
- db "@"
+ text_end
DecoText_PutAwayAndSetUp:
; Put away the @ and set up the @ .
text_far UnknownText_0x1bc51c
- db "@"
+ text_end
DecoText_AlreadySetUp:
; That's already set up.
text_far UnknownText_0x1bc546
- db "@"
+ text_end
GetDecorationName_c_de:
ld a, c
@@ -1014,7 +1014,7 @@ DecorationDesc_TownMapPoster:
.TownMapText:
; It's the TOWN MAP.
text_far UnknownText_0x1bc55d
- db "@"
+ text_end
DecorationDesc_PikachuPoster:
jumptext .PikaPosterText
@@ -1022,7 +1022,7 @@ DecorationDesc_PikachuPoster:
.PikaPosterText:
; It's a poster of a cute PIKACHU.
text_far UnknownText_0x1bc570
- db "@"
+ text_end
DecorationDesc_ClefairyPoster:
jumptext .ClefairyPosterText
@@ -1030,7 +1030,7 @@ DecorationDesc_ClefairyPoster:
.ClefairyPosterText:
; It's a poster of a cute CLEFAIRY.
text_far UnknownText_0x1bc591
- db "@"
+ text_end
DecorationDesc_JigglypuffPoster:
jumptext .JigglypuffPosterText
@@ -1038,7 +1038,7 @@ DecorationDesc_JigglypuffPoster:
.JigglypuffPosterText:
; It's a poster of a cute JIGGLYPUFF.
text_far UnknownText_0x1bc5b3
- db "@"
+ text_end
DecorationDesc_NullPoster:
end
@@ -1069,7 +1069,7 @@ DecorationDesc_OrnamentOrConsole:
.OrnamentConsoleText:
; It's an adorable @ .
text_far UnknownText_0x1bc5d7
- db "@"
+ text_end
DecorationDesc_GiantOrnament:
ld b, BANK(.BigDollScript)
@@ -1082,7 +1082,7 @@ DecorationDesc_GiantOrnament:
.BigDollText:
; A giant doll! It's fluffy and cuddly.
text_far UnknownText_0x1bc5ef
- db "@"
+ text_end
ToggleMaptileDecorations:
; tile coordinates work the same way as for changeblock
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 0e36c30e2..5b72bd83d 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -537,7 +537,7 @@ GiveItemScript:
ReceivedItemText:
text_far UnknownText_0x1c4719
- db "@"
+ text_end
Script_verbosegiveitem2:
; script command 0x9f
@@ -629,11 +629,11 @@ CurItemName:
PutItemInPocketText:
text_far UnknownText_0x1c472c
- db "@"
+ text_end
PocketIsFullText:
text_far UnknownText_0x1c474b
- db "@"
+ text_end
Script_pokemart:
; script command 0x94
diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm
index 46c207ae7..9cc2ba149 100644
--- a/engine/overworld/select_menu.asm
+++ b/engine/overworld/select_menu.asm
@@ -13,7 +13,7 @@ SelectMenu::
ItemMayBeRegisteredText:
text_far UnknownText_0x1c1cf3
- db "@"
+ text_end
CheckRegisteredItem:
ld a, [wWhichRegisteredItem]
diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm
index ea92b3fa5..ad4a2a02d 100644
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -835,7 +835,7 @@ RandomUnseenWildMon:
.SawRareMonText:
; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK?
text_far UnknownText_0x1bd34b
- db "@"
+ text_end
RandomPhoneWildMon:
farcall GetCallerLocation