summaryrefslogtreecommitdiff
path: root/engine/pokemon
diff options
context:
space:
mode:
Diffstat (limited to 'engine/pokemon')
-rw-r--r--engine/pokemon/bills_pc_top.asm12
-rw-r--r--engine/pokemon/breeding.asm22
-rw-r--r--engine/pokemon/caught_data.asm2
-rw-r--r--engine/pokemon/evolve.asm8
-rw-r--r--engine/pokemon/knows_move.asm2
-rw-r--r--engine/pokemon/learn.asm16
-rw-r--r--engine/pokemon/mail.asm14
-rw-r--r--engine/pokemon/mon_menu.asm40
-rw-r--r--engine/pokemon/move_mon.asm2
-rw-r--r--engine/pokemon/party_menu.asm20
10 files changed, 69 insertions, 69 deletions
diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm
index 1f8c8390e..a213bc79a 100644
--- a/engine/pokemon/bills_pc_top.asm
+++ b/engine/pokemon/bills_pc_top.asm
@@ -17,7 +17,7 @@ _BillsPC:
.Text_GottaHavePokemon:
; You gotta have #MON to call!
text_far UnknownText_0x1c1006
- db "@"
+ text_end
.LogIn:
xor a
@@ -38,7 +38,7 @@ _BillsPC:
.Text_What:
; What?
text_far UnknownText_0x1c1024
- db "@"
+ text_end
.LogOut:
call CloseSubmenu
@@ -131,7 +131,7 @@ BillsPC_MovePKMNMenu:
.Text_MonHoldingMail:
; There is a #MON holding MAIL. Please remove the MAIL.
text_far UnknownText_0x1c102b
- db "@"
+ text_end
BillsPC_DepositMenu:
call LoadStandardMenuHeader
@@ -166,12 +166,12 @@ Unreferenced_Functione512:
.Text_NoMon:
; You don't have a single #MON!
text_far UnknownText_0x1c1062
- db "@"
+ text_end
.Text_ItsYourLastMon:
; You can't deposit your last #MON!
text_far UnknownText_0x1c1080
- db "@"
+ text_end
CheckCurPartyMonFainted:
ld hl, wPartyMon1HP
@@ -227,7 +227,7 @@ Unreferenced_Functione56d:
UnknownText_0xe57e:
; You can't take any more #MON.
text_far UnknownText_0x1c10a2
- db "@"
+ text_end
BillsPC_ChangeBoxMenu:
farcall _ChangeBox
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index 697ed2855..2598ddd3e 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -357,7 +357,7 @@ HatchEggs:
.Text_HatchEgg:
; Huh? @ @
text_far UnknownText_0x1c0db0
- start_asm
+ text_asm
ld hl, wVramState
res 0, [hl]
push hl
@@ -379,17 +379,17 @@ HatchEggs:
.ClearTextbox:
;
text_far UnknownText_0x1c0db8
- db "@"
+ text_end
.CameOutOfItsEgg:
; came out of its EGG!@ @
text_far UnknownText_0x1c0dba
- db "@"
+ text_end
.Text_NicknameHatchling:
; Give a nickname to @ ?
text_far UnknownText_0x1c0dd8
- db "@"
+ text_end
InitEggMoves:
call GetHeritableMoves
@@ -896,12 +896,12 @@ DayCareMonCursor:
DayCareMon2Text:
; It's @ that was left with the DAY-CARE LADY.
text_far UnknownText_0x1c0df3
- db "@"
+ text_end
DayCareMon1Text:
; It's @ that was left with the DAY-CARE MAN.
text_far UnknownText_0x1c0e24
- db "@"
+ text_end
DayCareMonCompatibilityText:
push bc
@@ -931,27 +931,27 @@ DayCareMonCompatibilityText:
.AllAlone:
; It's brimming with energy.
text_far UnknownText_0x1c0e54
- db "@"
+ text_end
.Incompatible:
; It has no interest in @ .
text_far UnknownText_0x1c0e6f
- db "@"
+ text_end
.HighCompatibility:
; It appears to care for @ .
text_far UnknownText_0x1c0e8d
- db "@"
+ text_end
.ModerateCompatibility:
; It's friendly with @ .
text_far UnknownText_0x1c0eac
- db "@"
+ text_end
.SlightCompatibility:
; It shows interest in @ .
text_far UnknownText_0x1c0ec6
- db "@"
+ text_end
Unreferenced_DayCareMonPrintEmptyString:
ld hl, .string
diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm
index 3d232c7c1..fe34f197d 100644
--- a/engine/pokemon/caught_data.asm
+++ b/engine/pokemon/caught_data.asm
@@ -159,7 +159,7 @@ GiveANickname_YesNo:
TextJump_GiveANickname:
; Give a nickname to the @ you received?
text_far UnknownText_0x1c12fc
- db "@"
+ text_end
SetCaughtData:
ld a, [wPartyCount]
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index d026b33f0..9b6dd4cb5 100644
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -397,22 +397,22 @@ IsMonHoldingEverstone:
Text_CongratulationsYourPokemon:
; Congratulations! Your @ @
text_far UnknownText_0x1c4b92
- db "@"
+ text_end
Text_EvolvedIntoPKMN:
; evolved into @ !
text_far UnknownText_0x1c4baf
- db "@"
+ text_end
Text_StoppedEvolving:
; Huh? @ stopped evolving!
text_far UnknownText_0x1c4bc5
- db "@"
+ text_end
Text_WhatEvolving:
; What? @ is evolving!
text_far UnknownText_0x1c4be3
- db "@"
+ text_end
LearnLevelMoves:
ld a, [wTempSpecies]
diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm
index 85ae3f032..523d13968 100644
--- a/engine/pokemon/knows_move.asm
+++ b/engine/pokemon/knows_move.asm
@@ -22,4 +22,4 @@ KnowsMove:
.Text_knows:
; knows @ .
text_far UnknownText_0x1c5ea8
- db "@"
+ text_end
diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm
index dfeb7f97f..55e673ecc 100644
--- a/engine/pokemon/learn.asm
+++ b/engine/pokemon/learn.asm
@@ -203,32 +203,32 @@ ForgetMove:
Text_LearnedMove:
; <MON> learned <MOVE>!
text_far UnknownText_0x1c5660
- db "@"
+ text_end
Text_ForgetWhich:
; Which move should be forgotten?
text_far UnknownText_0x1c5678
- db "@"
+ text_end
Text_StopLearning:
; Stop learning <MOVE>?
text_far UnknownText_0x1c5699
- db "@"
+ text_end
Text_DidNotLearn:
; <MON> did not learn <MOVE>.
text_far UnknownText_0x1c56af
- db "@"
+ text_end
Text_TryingToLearn:
; <MON> is trying to learn <MOVE>. But <MON> can't learn more than
; four moves. Delete an older move to make room for <MOVE>?
text_far UnknownText_0x1c56c9
- db "@"
+ text_end
Text_1_2_and_Poof:
text_far UnknownText_0x1c5740 ; 1, 2 and…
- start_asm
+ text_asm
push de
ld de, SFX_SWITCH_POKEMON
call PlaySFX
@@ -239,9 +239,9 @@ Text_1_2_and_Poof:
.PoofForgot:
; Poof! <MON> forgot <MOVE>. And…
text_far UnknownText_0x1c574e
- db "@"
+ text_end
Text_CantForgetHM:
; HM moves can't be forgotten now.
text_far UnknownText_0x1c5772
- db "@"
+ text_end
diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm
index 6576153dc..91026d2a2 100644
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -311,7 +311,7 @@ _PlayerMailBoxMenu:
.EmptyMailboxText:
text_far _EmptyMailboxText
- db "@"
+ text_end
InitMail:
; initialize wMailboxCount and beyond with incrementing values, one per mail
@@ -454,15 +454,15 @@ MailboxPC:
.PutAwayText:
text_far ClearedMailPutAwayText
- db "@"
+ text_end
.PackFullText:
text_far MailPackFullText
- db "@"
+ text_end
.MessageLostText:
text_far MailMessageLostText
- db "@"
+ text_end
.GetMailType:
push af
@@ -522,15 +522,15 @@ MailboxPC:
.HoldingMailText:
text_far MailAlreadyHoldingItemText
- db "@"
+ text_end
.EggText:
text_far MailEggText
- db "@"
+ text_end
.MailMovedText:
text_far MailMovedFromBoxText
- db "@"
+ text_end
.Cancel:
ret
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm
index 9f982277f..0d71412b6 100644
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -64,17 +64,17 @@ TossItemFromPC:
.TossHowMany:
; Toss out how many @ (S)?
text_far UnknownText_0x1c1a90
- db "@"
+ text_end
.ConfirmToss:
; Throw away @ @ (S)?
text_far UnknownText_0x1c1aad
- db "@"
+ text_end
.TossedThisMany:
; Discarded @ (S).
text_far UnknownText_0x1c1aca
- db "@"
+ text_end
.CantToss:
ld hl, .TooImportantToToss
@@ -84,7 +84,7 @@ TossItemFromPC:
.TooImportantToToss:
; That's too impor- tant to toss out!
text_far UnknownText_0x1c1adf
- db "@"
+ text_end
CantUseItem:
ld hl, CantUseItemText
@@ -93,7 +93,7 @@ CantUseItem:
CantUseItemText:
text_far UnknownText_0x1c1b03
- db "@"
+ text_end
PartyMonItemName:
ld a, [wCurItem]
@@ -392,35 +392,35 @@ GiveTakeItemMenuData:
TookAndMadeHoldText:
text_far UnknownText_0x1c1b2c
- db "@"
+ text_end
MadeHoldText:
text_far UnknownText_0x1c1b57
- db "@"
+ text_end
PleaseRemoveMailText:
text_far UnknownText_0x1c1b6f
- db "@"
+ text_end
IsntHoldingAnythingText:
text_far UnknownText_0x1c1b8e
- db "@"
+ text_end
ItemStorageIsFullText:
text_far UnknownText_0x1c1baa
- db "@"
+ text_end
TookFromText:
text_far UnknownText_0x1c1bc4
- db "@"
+ text_end
SwitchAlreadyHoldingText:
text_far UnknownText_0x1c1bdc
- db "@"
+ text_end
CantBeHeldText:
text_far UnknownText_0x1c1c09
- db "@"
+ text_end
GetPartyItemLocation:
push af
@@ -563,32 +563,32 @@ MonMailAction:
.mailwilllosemessagetext
; The MAIL will lose its message. OK?
text_far UnknownText_0x1c1c22
- db "@"
+ text_end
.tookmailfrommontext
; MAIL detached from <POKEMON>.
text_far UnknownText_0x1c1c47
- db "@"
+ text_end
.bagfulltext
; There's no space for removing MAIL.
text_far UnknownText_0x1c1c62
- db "@"
+ text_end
.sendmailtopctext
; Send the removed MAIL to your PC?
text_far UnknownText_0x1c1c86
- db "@"
+ text_end
.mailboxfulltext
; Your PC's MAILBOX is full.
text_far UnknownText_0x1c1ca9
- db "@"
+ text_end
.sentmailtopctext
; The MAIL was sent to your PC.
text_far UnknownText_0x1c1cc4
- db "@"
+ text_end
OpenPartyStats:
call LoadStandardMenuHeader
@@ -750,7 +750,7 @@ MonMenu_Softboiled_MilkDrink:
.Text_NotEnoughHP:
; Not enough HP!
text_far UnknownText_0x1c1ce3
- db "@"
+ text_end
.CheckMonHasEnoughHP:
; Need to have at least (MaxHP / 5) HP left.
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index e6e108516..9ed86447a 100644
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -1801,7 +1801,7 @@ GivePoke::
TextJump_WasSentToBillsPC:
; was sent to BILL's PC.
text_far Text_WasSentToBillsPC
- db "@"
+ text_end
InitNickname:
push de
diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm
index ebc75e1b2..617039db8 100644
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -806,52 +806,52 @@ PrintPartyMenuActionText:
.Text_RecoveredSomeHP:
; recovered @ HP!
text_far UnknownText_0x1bc0a2
- db "@"
+ text_end
.Text_CuredOfPoison:
; 's cured of poison.
text_far UnknownText_0x1bc0bb
- db "@"
+ text_end
.Text_RidOfParalysis:
; 's rid of paralysis.
text_far UnknownText_0x1bc0d2
- db "@"
+ text_end
.Text_BurnWasHealed:
; 's burn was healed.
text_far UnknownText_0x1bc0ea
- db "@"
+ text_end
.Text_Defrosted:
; was defrosted.
text_far UnknownText_0x1bc101
- db "@"
+ text_end
.Text_WokeUp:
; woke up.
text_far UnknownText_0x1bc115
- db "@"
+ text_end
.Text_HealthReturned:
; 's health returned.
text_far UnknownText_0x1bc123
- db "@"
+ text_end
.Text_Revitalized:
; is revitalized.
text_far UnknownText_0x1bc13a
- db "@"
+ text_end
.Text_GrewToLevel:
; grew to level @ !@ @
text_far UnknownText_0x1bc14f
- db "@"
+ text_end
.Text_CameToItsSenses:
; came to its senses.
text_far UnknownText_0x1bc16e
- db "@"
+ text_end
.PrintText:
ld e, a
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 09:12:30 +0000