summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-27 14:34:34 -0500
committerGitHub <noreply@github.com>2020-05-27 14:34:34 -0500
commit6119945fca16189ca0573e990b78c7f8edd1bf95 (patch)
tree34d5eeb9810b3594d140624f885bcaa687873a6b
parentd29d0224e5ccd04f65f1e636d7d86d824b0fefea (diff)
parent39f0bcb987ca573d86a2a22a8391236fe6534587 (diff)
Merge pull request #241 from Nog-Frog/Fix-Sent-To-Box
Change "Set to box" to "Sent to box"
-rwxr-xr-xengine/give_pokemon.asm6
-rw-r--r--text.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm
index 49596782..241975c3 100755
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -33,7 +33,7 @@ _GivePokemon:
.next
ld [hli], a
ld [hl], "@"
- ld hl, SetToBoxText
+ ld hl, SentToBoxText
call PrintText
scf
ret
@@ -73,8 +73,8 @@ GotMonText:
TX_SFX_ITEM_1
db "@"
-SetToBoxText:
- TX_FAR _SetToBoxText
+SentToBoxText:
+ TX_FAR _SentToBoxText
db "@"
BoxIsFullText:
diff --git a/text.asm b/text.asm
index 5a760a8e..ff87054a 100644
--- a/text.asm
+++ b/text.asm
@@ -2730,7 +2730,7 @@ _GotMonText::
TX_RAM wcd6d
text "!@@"
-_SetToBoxText::
+_SentToBoxText::
text "There's no more"
line "room for #MON!"
cont "@"