summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/collision_permissions.asm261
-rwxr-xr-xdata/events/collision_stdscripts.asm13
-rw-r--r--data/pokemon/egg_moves.asm4
-rw-r--r--data/pokemon/evos_attacks.asm6
-rwxr-xr-xdata/predef_pointers.asm79
-rwxr-xr-x[-rw-r--r--]data/text/battle.asm110
-rwxr-xr-x[-rw-r--r--]data/text/common_1.asm242
-rw-r--r--data/text/common_2.asm200
-rw-r--r--data/text/common_3.asm74
9 files changed, 670 insertions, 319 deletions
diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm
new file mode 100755
index 00000000..82ebb770
--- /dev/null
+++ b/data/collision_permissions.asm
@@ -0,0 +1,261 @@
+NONTALKABLE EQUS "db"
+TALKABLE EQUS "db TALK +"
+
+TileCollisionTable::
+; entries correspond to COLL_* constants
+ NONTALKABLE LANDTILE ; COLL_FLOOR
+ NONTALKABLE LANDTILE ; COLL_01
+ NONTALKABLE LANDTILE ; 02
+ NONTALKABLE LANDTILE ; COLL_03
+ NONTALKABLE LANDTILE ; COLL_04
+ NONTALKABLE LANDTILE ; 05
+ NONTALKABLE LANDTILE ; 06
+ NONTALKABLE WALLTILE ; COLL_WALL
+ NONTALKABLE LANDTILE ; COLL_CUT_08
+ NONTALKABLE LANDTILE ; 09
+ NONTALKABLE LANDTILE ; 0a
+ NONTALKABLE LANDTILE ; 0b
+ NONTALKABLE LANDTILE ; 0c
+ NONTALKABLE LANDTILE ; 0d
+ NONTALKABLE LANDTILE ; 0e
+ NONTALKABLE WALLTILE ; 0f
+ NONTALKABLE LANDTILE ; COLL_TALL_GRASS_10
+ NONTALKABLE LANDTILE ; 11
+ TALKABLE WALLTILE ; COLL_CUT_TREE
+ NONTALKABLE LANDTILE ; 13
+ NONTALKABLE LANDTILE ; COLL_LONG_GRASS
+ TALKABLE WALLTILE ; COLL_HEADBUTT_TREE
+ NONTALKABLE LANDTILE ; 16
+ NONTALKABLE LANDTILE ; 17
+ NONTALKABLE LANDTILE ; COLL_TALL_GRASS
+ NONTALKABLE LANDTILE ; 19
+ TALKABLE WALLTILE ; COLL_CUT_TREE_1A
+ NONTALKABLE LANDTILE ; 1b
+ NONTALKABLE LANDTILE ; COLL_LONG_GRASS_1C
+ TALKABLE WALLTILE ; COLL_HEADBUTT_TREE_1D
+ NONTALKABLE LANDTILE ; 1e
+ NONTALKABLE LANDTILE ; 1f
+ NONTALKABLE WATERTILE ; 20
+ NONTALKABLE WATERTILE ; COLL_WATER_21
+ TALKABLE WATERTILE ; 22
+ NONTALKABLE LANDTILE ; COLL_ICE
+ TALKABLE WATERTILE ; COLL_WHIRLPOOL
+ NONTALKABLE WATERTILE ; 25
+ NONTALKABLE WATERTILE ; 26
+ NONTALKABLE WALLTILE ; COLL_BUOY
+ NONTALKABLE WATERTILE ; COLL_CUT_28
+ NONTALKABLE WATERTILE ; COLL_WATER
+ TALKABLE WATERTILE ; 2a
+ NONTALKABLE LANDTILE ; COLL_ICE_2B
+ TALKABLE WATERTILE ; COLL_WHIRLPOOL_2C
+ NONTALKABLE WATERTILE ; 2d
+ NONTALKABLE WATERTILE ; 2e
+ NONTALKABLE WALLTILE ; 2f
+ NONTALKABLE WATERTILE ; COLL_WATERFALL_RIGHT
+ NONTALKABLE WATERTILE ; COLL_WATERFALL_LEFT
+ NONTALKABLE WATERTILE ; COLL_WATERFALL_UP
+ NONTALKABLE WATERTILE ; COLL_WATERFALL
+ NONTALKABLE WATERTILE ; 34
+ NONTALKABLE WATERTILE ; 35
+ NONTALKABLE WATERTILE ; 36
+ NONTALKABLE WATERTILE ; 37
+ NONTALKABLE WATERTILE ; COLL_CURRENT_RIGHT
+ NONTALKABLE WATERTILE ; COLL_CURRENT_LEFT
+ NONTALKABLE WATERTILE ; COLL_CURRENT_UP
+ NONTALKABLE WATERTILE ; COLL_CURRENT_DOWN
+ NONTALKABLE WATERTILE ; 3c
+ NONTALKABLE WATERTILE ; 3d
+ NONTALKABLE WATERTILE ; 3e
+ NONTALKABLE WATERTILE ; 3f
+ NONTALKABLE LANDTILE ; COLL_BRAKE
+ NONTALKABLE LANDTILE ; COLL_WALK_RIGHT
+ NONTALKABLE LANDTILE ; COLL_WALK_LEFT
+ NONTALKABLE LANDTILE ; COLL_WALK_UP
+ NONTALKABLE LANDTILE ; COLL_WALK_DOWN
+ NONTALKABLE LANDTILE ; COLL_BRAKE_45
+ NONTALKABLE LANDTILE ; COLL_BRAKE_46
+ NONTALKABLE LANDTILE ; COLL_BRAKE_47
+ NONTALKABLE LANDTILE ; COLL_GRASS_48
+ NONTALKABLE LANDTILE ; COLL_GRASS_49
+ NONTALKABLE LANDTILE ; COLL_GRASS_4A
+ NONTALKABLE LANDTILE ; COLL_GRASS_4B
+ NONTALKABLE LANDTILE ; COLL_GRASS_4C
+ NONTALKABLE LANDTILE ; 4d
+ NONTALKABLE LANDTILE ; 4e
+ NONTALKABLE LANDTILE ; 4f
+ NONTALKABLE LANDTILE ; COLL_WALK_RIGHT_ALT
+ NONTALKABLE LANDTILE ; COLL_WALK_LEFT_ALT
+ NONTALKABLE LANDTILE ; COLL_WALK_UP_ALT
+ NONTALKABLE LANDTILE ; COLL_WALK_DOWN_ALT
+ NONTALKABLE LANDTILE ; COLL_BRAKE_ALT
+ NONTALKABLE LANDTILE ; COLL_BRAKE_55
+ NONTALKABLE LANDTILE ; COLL_BRAKE_56
+ NONTALKABLE LANDTILE ; COLL_BRAKE_57
+ NONTALKABLE LANDTILE ; 58
+ NONTALKABLE LANDTILE ; 59
+ NONTALKABLE LANDTILE ; 5a
+ NONTALKABLE LANDTILE ; COLL_5B
+ NONTALKABLE LANDTILE ; 5c
+ NONTALKABLE LANDTILE ; 5d
+ NONTALKABLE LANDTILE ; 5e
+ NONTALKABLE LANDTILE ; 5f
+ NONTALKABLE LANDTILE ; COLL_PIT
+ NONTALKABLE LANDTILE ; COLL_VIRTUAL_BOY
+ NONTALKABLE WALLTILE ; 62
+ NONTALKABLE LANDTILE ; 63
+ NONTALKABLE LANDTILE ; COLL_64
+ NONTALKABLE LANDTILE ; COLL_65
+ NONTALKABLE LANDTILE ; 66
+ NONTALKABLE LANDTILE ; 67
+ NONTALKABLE LANDTILE ; COLL_PIT_68
+ NONTALKABLE LANDTILE ; 69
+ NONTALKABLE WALLTILE ; 6a
+ NONTALKABLE LANDTILE ; 6b
+ NONTALKABLE LANDTILE ; 6c
+ NONTALKABLE LANDTILE ; 6d
+ NONTALKABLE LANDTILE ; 6e
+ NONTALKABLE LANDTILE ; 6f
+ NONTALKABLE LANDTILE ; COLL_WARP_CARPET_DOWN
+ NONTALKABLE LANDTILE ; COLL_DOOR
+ NONTALKABLE LANDTILE ; COLL_LADDER
+ NONTALKABLE LANDTILE ; COLL_STAIRCASE_73
+ NONTALKABLE LANDTILE ; COLL_CAVE_74
+ NONTALKABLE LANDTILE ; COLL_DOOR_75
+ NONTALKABLE LANDTILE ; COLL_WARP_CARPET_LEFT
+ NONTALKABLE LANDTILE ; COLL_WARP_77
+ NONTALKABLE LANDTILE ; COLL_WARP_CARPET_UP
+ NONTALKABLE LANDTILE ; COLL_DOOR_79
+ NONTALKABLE LANDTILE ; COLL_STAIRCASE
+ NONTALKABLE LANDTILE ; COLL_CAVE
+ NONTALKABLE LANDTILE ; COLL_WARP_PANEL
+ NONTALKABLE LANDTILE ; COLL_DOOR_7D
+ NONTALKABLE LANDTILE ; COLL_WARP_CARPET_RIGHT
+ NONTALKABLE LANDTILE ; COLL_WARP_7F
+ NONTALKABLE WALLTILE ; 80
+ NONTALKABLE WALLTILE ; 81
+ NONTALKABLE WALLTILE ; 82
+ NONTALKABLE WALLTILE ; 83
+ NONTALKABLE WALLTILE ; 84
+ NONTALKABLE LANDTILE ; 85
+ NONTALKABLE LANDTILE ; 86
+ NONTALKABLE LANDTILE ; 87
+ NONTALKABLE WALLTILE ; 88
+ NONTALKABLE WALLTILE ; 89
+ NONTALKABLE WALLTILE ; 8a
+ NONTALKABLE WALLTILE ; 8b
+ NONTALKABLE WALLTILE ; 8c
+ NONTALKABLE LANDTILE ; 8d
+ NONTALKABLE LANDTILE ; 8e
+ NONTALKABLE LANDTILE ; 8f
+ NONTALKABLE WALLTILE ; COLL_COUNTER
+ NONTALKABLE WALLTILE ; COLL_BOOKSHELF
+ NONTALKABLE WALLTILE ; 92
+ NONTALKABLE WALLTILE ; COLL_PC
+ NONTALKABLE WALLTILE ; COLL_RADIO
+ NONTALKABLE WALLTILE ; COLL_TOWN_MAP
+ NONTALKABLE WALLTILE ; COLL_MART_SHELF
+ NONTALKABLE WALLTILE ; COLL_TV
+ NONTALKABLE WALLTILE ; COLL_COUNTER_98
+ NONTALKABLE WALLTILE ; 99
+ NONTALKABLE WALLTILE ; 9a
+ NONTALKABLE WALLTILE ; 9b
+ NONTALKABLE WALLTILE ; COLL_9C
+ NONTALKABLE WALLTILE ; COLL_WINDOW
+ NONTALKABLE WALLTILE ; 9e
+ NONTALKABLE WALLTILE ; COLL_INCENSE_BURNER
+ NONTALKABLE LANDTILE ; COLL_HOP_RIGHT
+ NONTALKABLE LANDTILE ; COLL_HOP_LEFT
+ NONTALKABLE LANDTILE ; COLL_HOP_UP
+ NONTALKABLE LANDTILE ; COLL_HOP_DOWN
+ NONTALKABLE LANDTILE ; COLL_HOP_DOWN_RIGHT
+ NONTALKABLE LANDTILE ; COLL_HOP_DOWN_LEFT
+ NONTALKABLE LANDTILE ; COLL_HOP_UP_RIGHT
+ NONTALKABLE LANDTILE ; COLL_HOP_UP_LEFT
+ NONTALKABLE LANDTILE ; a8
+ NONTALKABLE LANDTILE ; a9
+ NONTALKABLE LANDTILE ; aa
+ NONTALKABLE LANDTILE ; ab
+ NONTALKABLE LANDTILE ; ac
+ NONTALKABLE LANDTILE ; ad
+ NONTALKABLE LANDTILE ; ae
+ NONTALKABLE LANDTILE ; af
+ NONTALKABLE LANDTILE ; COLL_RIGHT_WALL
+ NONTALKABLE LANDTILE ; COLL_LEFT_WALL
+ NONTALKABLE LANDTILE ; COLL_UP_WALL
+ NONTALKABLE LANDTILE ; COLL_DOWN_WALL
+ NONTALKABLE LANDTILE ; COLL_DOWN_RIGHT_WALL
+ NONTALKABLE LANDTILE ; COLL_DOWN_LEFT_WALL
+ NONTALKABLE LANDTILE ; COLL_UP_RIGHT_WALL
+ NONTALKABLE LANDTILE ; COLL_UP_LEFT_WALL
+ NONTALKABLE LANDTILE ; b8
+ NONTALKABLE LANDTILE ; b9
+ NONTALKABLE LANDTILE ; ba
+ NONTALKABLE LANDTILE ; bb
+ NONTALKABLE LANDTILE ; bc
+ NONTALKABLE LANDTILE ; bd
+ NONTALKABLE LANDTILE ; be
+ NONTALKABLE LANDTILE ; bf
+ NONTALKABLE WATERTILE ; COLL_RIGHT_BUOY
+ NONTALKABLE WATERTILE ; COLL_LEFT_BUOY
+ NONTALKABLE WATERTILE ; COLL_UP_BUOY
+ NONTALKABLE WATERTILE ; COLL_DOWN_BUOY
+ NONTALKABLE WATERTILE ; COLL_DOWN_RIGHT_BUOY
+ NONTALKABLE WATERTILE ; COLL_DOWN_LEFT_BUOY
+ NONTALKABLE WATERTILE ; COLL_UP_RIGHT_BUOY
+ NONTALKABLE WATERTILE ; COLL_UP_LEFT_BUOY
+ NONTALKABLE WATERTILE ; c8
+ NONTALKABLE WATERTILE ; c9
+ NONTALKABLE WATERTILE ; ca
+ NONTALKABLE WATERTILE ; cb
+ NONTALKABLE WATERTILE ; cc
+ NONTALKABLE WATERTILE ; cd
+ NONTALKABLE WATERTILE ; ce
+ NONTALKABLE WATERTILE ; cf
+ NONTALKABLE LANDTILE ; d0
+ NONTALKABLE LANDTILE ; d1
+ NONTALKABLE LANDTILE ; d2
+ NONTALKABLE LANDTILE ; d3
+ NONTALKABLE LANDTILE ; d4
+ NONTALKABLE LANDTILE ; d5
+ NONTALKABLE LANDTILE ; d6
+ NONTALKABLE LANDTILE ; d7
+ NONTALKABLE LANDTILE ; d8
+ NONTALKABLE LANDTILE ; d9
+ NONTALKABLE LANDTILE ; da
+ NONTALKABLE LANDTILE ; db
+ NONTALKABLE LANDTILE ; dc
+ NONTALKABLE LANDTILE ; dd
+ NONTALKABLE LANDTILE ; de
+ NONTALKABLE LANDTILE ; df
+ NONTALKABLE LANDTILE ; e0
+ NONTALKABLE LANDTILE ; e1
+ NONTALKABLE LANDTILE ; e2
+ NONTALKABLE LANDTILE ; e3
+ NONTALKABLE LANDTILE ; e4
+ NONTALKABLE LANDTILE ; e5
+ NONTALKABLE LANDTILE ; e6
+ NONTALKABLE LANDTILE ; e7
+ NONTALKABLE LANDTILE ; e8
+ NONTALKABLE LANDTILE ; e9
+ NONTALKABLE LANDTILE ; ea
+ NONTALKABLE LANDTILE ; eb
+ NONTALKABLE LANDTILE ; ec
+ NONTALKABLE LANDTILE ; ed
+ NONTALKABLE LANDTILE ; ee
+ NONTALKABLE LANDTILE ; ef
+ NONTALKABLE LANDTILE ; f0
+ NONTALKABLE LANDTILE ; f1
+ NONTALKABLE LANDTILE ; f2
+ NONTALKABLE LANDTILE ; f3
+ NONTALKABLE LANDTILE ; f4
+ NONTALKABLE LANDTILE ; f5
+ NONTALKABLE LANDTILE ; f6
+ NONTALKABLE LANDTILE ; f7
+ NONTALKABLE LANDTILE ; f8
+ NONTALKABLE LANDTILE ; f9
+ NONTALKABLE LANDTILE ; fa
+ NONTALKABLE LANDTILE ; fb
+ NONTALKABLE LANDTILE ; fc
+ NONTALKABLE LANDTILE ; fd
+ NONTALKABLE LANDTILE ; fe
+ NONTALKABLE WALLTILE ; COLL_FF
diff --git a/data/events/collision_stdscripts.asm b/data/events/collision_stdscripts.asm
new file mode 100755
index 00000000..7e208d2f
--- /dev/null
+++ b/data/events/collision_stdscripts.asm
@@ -0,0 +1,13 @@
+; stdscripts associated with tile collisions
+
+TileCollisionStdScripts:
+ ; collision type, stdscript
+ dbw COLL_BOOKSHELF, magazinebookshelf
+ dbw COLL_PC, pcscript
+ dbw COLL_RADIO, radio1
+ dbw COLL_TOWN_MAP, townmap
+ dbw COLL_MART_SHELF, merchandiseshelf
+ dbw COLL_TV, tv
+ dbw COLL_WINDOW, window
+ dbw COLL_INCENSE_BURNER, incenseburner
+ db -1 ; end \ No newline at end of file
diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm
index 6145e560..3e353ba4 100644
--- a/data/pokemon/egg_moves.asm
+++ b/data/pokemon/egg_moves.asm
@@ -1,5 +1,5 @@
-INCLUDE "includes.asm"
-
+INCLUDE "contents.asm"
+INCLUDE "constants.asm"
SECTION "Egg Moves", ROMX, BANK[EGG_MOVES]
diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm
index ab181be8..8fc93897 100644
--- a/data/pokemon/evos_attacks.asm
+++ b/data/pokemon/evos_attacks.asm
@@ -1,12 +1,10 @@
-INCLUDE "includes.asm"
-
+INCLUDE "contents.asm"
+INCLUDE "constants.asm"
SECTION "Evolutions and Attacks", ROMX, BANK[EVOS_ATTACKS]
-
INCLUDE "data/pokemon/evos_attacks_pointers.asm"
-
EvosAttacks::
BulbasaurEvosAttacks:
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
new file mode 100755
index 00000000..8e4dac0f
--- /dev/null
+++ b/data/predef_pointers.asm
@@ -0,0 +1,79 @@
+; Predef routines can be used with the "predef" and "predef_jump" macros.
+; This preserves registers bc, de, hl and f.
+
+add_predef: MACRO
+\1Predef::
+ dab \1
+ENDM
+
+PredefPointers::
+ add_predef LearnMove ; $0
+ add_predef DummyPredef1
+ add_predef HealParty ; this is both a special and a predef
+ add_predef SmallFarFlagAction
+ add_predef ComputeHPBarPixels
+ add_predef FillPP
+ add_predef TryAddMonToParty
+ add_predef AddTempmonToParty
+ add_predef SendGetMonIntoFromBox
+ add_predef SendMonIntoBox
+ add_predef GiveEgg
+ add_predef AnimateHPBar
+ add_predef CalcMonStats
+ add_predef CalcMonStatC
+ add_predef CanLearnTMHMMove
+ add_predef GetTMHMMove
+ add_predef LinkTextboxAtHL ; $ 10
+ add_predef PrintMoveDesc
+ add_predef UpdatePlayerHUD
+ add_predef PlaceGraphic
+ add_predef CheckPlayerPartyForFitMon
+ add_predef UpdateEnemyHUD
+ add_predef StartBattle
+ add_predef FillInExpBar
+ add_predef GetBattleMonBackpic ; $18
+ add_predef GetEnemyMonFrontpic
+ add_predef LearnLevelMoves
+ add_predef FillMoves
+ add_predef EvolveAfterBattle
+ add_predef TradeAnimationPlayer2
+ add_predef TradeAnimation
+ add_predef CopyMonToTempMon
+ add_predef ListMoves ; $20
+ add_predef PlaceNonFaintStatus
+ add_predef Unused_PlaceEnemyHPLevel
+ add_predef ListMovePP
+ add_predef GetGender
+ add_predef StatsScreenInit
+ add_predef DrawPlayerHP
+ add_predef DrawEnemyHP
+ add_predef PrintTempMonStats ; $28
+ add_predef GetTypeName
+ add_predef PrintMoveType
+ add_predef PrintType
+ add_predef PrintMonTypes
+ add_predef GetUnownLetter
+ add_predef LoadPoisonBGPals
+ add_predef DummyPredef2F
+ add_predef InitSGBBorder ; $30
+ add_predef LoadSGBLayout
+ add_predef Pokedex_GetArea
+ add_predef Unused_CheckShininess
+ add_predef DoBattleTransition
+ add_predef DummyPredef35
+ add_predef DummyPredef36
+ add_predef PlayBattleAnim
+ add_predef DummyPredef38 ; $38
+ add_predef DummyPredef39
+ add_predef DummyPredef3A
+ add_predef PartyMonItemName
+ add_predef GetMonFrontpic
+ add_predef GetMonBackpic
+ add_predef GetTrainerPic
+ add_predef DecompressGet2bpp
+ add_predef CheckTypeMatchup ; $40
+ add_predef ConvertMon_1to2
+ add_predef NewPokedexEntry
+ add_predef FrontpicPredef
+ add_predef UpdateTimePredef
+ dbw -1, InexplicablyEmptyFunction ; ???
diff --git a/data/text/battle.asm b/data/text/battle.asm
index 0f21e800..a222cac5 100644..100755
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -3,13 +3,13 @@ BattleText:: ; used only for BANK(BattleText)
BattleText_PlayerPickedUpPayDayMoney:
text "<PLAYER> picked up"
line "¥@"
- deciram wPayDayMoney, 3, 6
+ text_decimal wPayDayMoney, 3, 6
text "!"
prompt
WildPokemonAppearedText:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@@ -17,13 +17,13 @@ WildPokemonAppearedText:
HookedPokemonAttackedText:
text "The hooked"
line "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
cont "attacked!"
prompt
PokemonFellFromTreeText:
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text " fell"
line "out of the tree!"
prompt
@@ -35,14 +35,14 @@ WantsToBattleText::
BattleText_WildFled:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fled!"
prompt
BattleText_EnemyFled:
text "Enemy @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fled!"
prompt
@@ -80,7 +80,7 @@ SandstormHitsText:
PerishCountText:
text "<USER>'s"
line "PERISH count is @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -88,7 +88,7 @@ BattleText_TargetRecoveredWithItem:
text "<TARGET>"
line "recovered with"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -96,7 +96,7 @@ BattleText_UserRecoveredPPUsing:
text "<USER>"
line "recovered PP using"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -112,13 +112,13 @@ BattleText_SafeguardFaded:
prompt
BattleText_MonsLightScreenFell:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " #MON's"
line "LIGHT SCREEN fell!"
prompt
BattleText_MonsReflectFaded:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " #MON's"
line "REFLECT faded!"
prompt
@@ -154,14 +154,14 @@ BattleText_TheSandstormSubsided:
BattleText_EnemyMonFainted:
text "Enemy @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "fainted!"
prompt
GotMoneyForWinningText:
text "<PLAYER> got ¥@"
- deciram wBattleReward, 3, 6
+ text_decimal wBattleReward, 3, 6
text_start
line "for winning!"
prompt
@@ -178,7 +178,7 @@ TiedAgainstText:
SentSomeToMomText:
text "<PLAYER> got ¥@"
- deciram wBattleReward, 3, 6
+ text_decimal wBattleReward, 3, 6
text_start
line "for winning!"
cont "Sent some to MOM!"
@@ -199,7 +199,7 @@ BattleText_0x80a4f:
prompt
BattleText_MonFainted:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "fainted!"
prompt
@@ -223,7 +223,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
text "<ENEMY>"
line "is about to use"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "."
para "Will <PLAYER>"
@@ -234,7 +234,7 @@ BattleText_EnemySentOut:
text "<ENEMY>"
line "sent out"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
done
@@ -266,7 +266,7 @@ BattleText_UserFledUsingAStringBuffer1:
text "<USER>"
line "fled using a"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -283,14 +283,14 @@ RecoveredUsingText:
text "<TARGET>"
line "recovered using a"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
BattleText_UsersStringBuffer1Activated:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "activated!"
prompt
@@ -301,13 +301,13 @@ BattleText_ItemsCantBeUsedHere:
prompt
BattleText_MonIsAlreadyOut:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "is already out."
prompt
BattleText_MonCantBeRecalled:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "can't be recalled!"
prompt
@@ -323,7 +323,7 @@ BattleText_TheMoveIsDisabled:
prompt
BattleText_MonHasNoMovesLeft:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text_start
line "has no moves left!"
done
@@ -334,24 +334,24 @@ BattleText_TargetsEncoreEnded:
prompt
BattleText_StringBuffer1GrewToLevel:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " grew to"
line "level @"
- deciram wCurPartyLevel, 1, 3
+ text_decimal wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
db "@"
BattleText_WildMonIsEating:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "is eating!"
prompt
BattleText_WildMonIsAngry:
text "Wild @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "is angry!"
prompt
@@ -409,7 +409,7 @@ BecameConfusedText:
BattleText_ItemHealedConfusion: ; ItemHealedConfusion
text "A @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " rid"
line "<TARGET>"
cont "of its confusion."
@@ -424,7 +424,7 @@ BattleText_UsersHurtByStringBuffer1:
text "<USER>'s"
line "hurt by"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -432,7 +432,7 @@ BattleText_UserWasReleasedFromStringBuffer1:
text "<USER>"
line "was released from"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -473,7 +473,7 @@ HungOnText:
text "<TARGET>"
line "hung on with"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -497,43 +497,43 @@ InfatuationText:
DisabledMoveText:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " is"
cont "DISABLED!"
prompt
LoafingAroundText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " is"
line "loafing around."
prompt
BeganToNapText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " began"
line "to nap!"
prompt
WontObeyText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " won't"
line "obey!"
prompt
TurnedAwayText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " turned"
line "away!"
prompt
IgnoredOrdersText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " ignored"
line "orders!"
prompt
IgnoredSleepingText:
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text " ignored"
line "orders…sleeping!"
prompt
@@ -547,7 +547,7 @@ HasNoPPLeftText:
text "<USER>"
line "has no PP left for"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "!"
prompt
@@ -641,7 +641,7 @@ SketchedText:
text "<USER>"
line "SKETCHED"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -654,10 +654,10 @@ DestinyBondEffectText:
SpiteEffectText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
cont "reduced by @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -719,7 +719,7 @@ WasFrozenText:
WontRiseAnymoreText:
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " won't"
cont "rise anymore!"
prompt
@@ -727,7 +727,7 @@ WontRiseAnymoreText:
WontDropAnymoreText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " won't"
cont "drop anymore!"
prompt
@@ -749,13 +749,13 @@ BlownAwayText:
PlayerHitTimesText:
text "Hit @"
- deciram wPlayerDamageTaken, 1, 1
+ text_decimal wPlayerDamageTaken, 1, 1
text " times!"
prompt
EnemyHitTimesText:
text "Hit @"
- deciram wEnemyDamageTaken, 1, 1
+ text_decimal wEnemyDamageTaken, 1, 1
text " times!"
prompt
@@ -770,7 +770,7 @@ ProtectedByMistText:
prompt
GettingPumpedText:
- interpret_data
+ text_pause
text "<USER>'s"
line "getting pumped!"
prompt
@@ -810,7 +810,7 @@ LearnedMoveText:
text "<USER>"
line "learned"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -827,7 +827,7 @@ EvadedText:
WasDisabledText:
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
cont "DISABLED!"
prompt
@@ -841,7 +841,7 @@ TransformedTypeText:
text "<USER>"
line "transformed into"
cont "the @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "-type!"
prompt
@@ -854,7 +854,7 @@ TransformedText:
text "<USER>"
line "TRANSFORMED into"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -921,7 +921,7 @@ ProtectedByText:
text "<TARGET>'s"
line "protected by"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -933,7 +933,7 @@ MirrorMoveFailedText:
StoleText:
text "<USER>"
line "stole @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "from its foe!"
prompt
@@ -1017,7 +1017,7 @@ SafeguardProtectText:
MagnitudeText:
text "Magnitude @"
- deciram wDeciramBuffer, 1, 1
+ text_decimal wDeciramBuffer, 1, 1
text "!"
prompt
@@ -1067,7 +1067,7 @@ ForesawAttackText:
prompt
BeatUpAttackText:
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "attack!"
done
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index 6012cdbc..40f4bb79 100644..100755
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -6,14 +6,14 @@ _FruitBearingTreeText::
_HeyItsFruitText::
text "Hey! It's"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
_ObtainedFruitText::
text "Obtained"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
@@ -28,67 +28,67 @@ _NothingHereText::
done
UnknownText_0x1bc0a2::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "recovered @"
- deciram wLinkBuffer, 2, 3
+ text_decimal wLinkBuffer, 2, 3
text "HP!"
done
UnknownText_0x1bc0bb::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "cured of poison."
done
UnknownText_0x1bc0d2::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "rid of paralysis."
done
UnknownText_0x1bc0ea::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "burn was healed."
done
UnknownText_0x1bc101::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "was defrosted."
done
UnknownText_0x1bc115::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "woke up."
done
UnknownText_0x1bc123::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "health returned."
done
UnknownText_0x1bc13a::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "is revitalized."
done
UnknownText_0x1bc14f::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " grew to"
line "level @"
- deciram wCurPartyLevel, 1, 3
+ text_decimal wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
- text_waitbutton
+ text_promptbutton
db "@"
UnknownText_0x1bc16e::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " came"
line "to its senses."
done
@@ -153,17 +153,17 @@ Text_EnemyWithdrew::
text "<ENEMY>"
line "withdrew"
cont "@"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
prompt
Text_EnemyUsedOn::
text "<ENEMY>"
line "used @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
cont "on @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "!"
prompt
@@ -179,7 +179,7 @@ Text_ThatItemCantBePutInThePack::
Text_TheItemWasPutInThePack::
text "The @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "was put in the"
cont "PACK."
@@ -206,7 +206,7 @@ UnknownText_0x1bd05e::
UnknownText_0x1bd07f::
text "Will you play with"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -223,7 +223,7 @@ Text_BreedingIsNotPossible::
UnknownText_0x1bd0d8::
text "The compatibility"
line "is @"
- deciram wTempNumBuffer, 1, 3
+ text_decimal wTempNumBuffer, 1, 3
text "."
cont "Should they breed?"
done
@@ -241,7 +241,7 @@ UnknownText_0x1bd11c::
UnknownText_0x1bd131::
text "Test event"
line "@"
- deciram wStringBuffer2, 1, 2
+ text_decimal wStringBuffer2, 1, 2
text "?"
done
@@ -298,7 +298,7 @@ UnknownText_0x1bc4b2::
UnknownText_0x1bc4d7::
text "Put away the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
@@ -310,19 +310,19 @@ UnknownText_0x1bc4ec::
UnknownText_0x1bc509::
text "Set up the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
UnknownText_0x1bc51c::
text "Put away the"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
para "and set up the"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
prompt
@@ -353,7 +353,7 @@ UnknownText_0x1bc5b3::
UnknownText_0x1bc5d7::
text "It's an adorable"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
@@ -394,10 +394,10 @@ UnknownText_0x1bc6c7::
done
UnknownText_0x1bc6e9::
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text " was"
line "sent to @"
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text "."
done
@@ -406,53 +406,53 @@ UnknownText_0x1bc701::
done
UnknownText_0x1bc703::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " bids"
line "farewell to"
done
UnknownText_0x1bc719::
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc71f::
text "Take good care of"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc739::
text "For @"
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text ","
done
UnknownText_0x1bc74c::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " sends"
line "@"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
text "."
done
UnknownText_0x1bc75e::
- text_from_ram wOTTrademonSenderName
+ text_ram wOTTrademonSenderName
text " will"
line "trade @"
- text_from_ram wOTTrademonSpeciesName
+ text_ram wOTTrademonSpeciesName
db "@@"
UnknownText_0x1bc774::
text "for @"
- text_from_ram wPlayerTrademonSenderName
+ text_ram wPlayerTrademonSenderName
text "'s"
line "@"
- text_from_ram wPlayerTrademonSpeciesName
+ text_ram wPlayerTrademonSpeciesName
text "."
done
@@ -476,7 +476,7 @@ _OPT_IntroText3::
_OPT_OakText1::
text_start
line "OAK: @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
db "@@"
_OPT_OakText2::
@@ -487,14 +487,14 @@ _OPT_OakText2::
_OPT_OakText3::
text_start
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
done
_OPT_MaryText1::
text_start
line "MARY: @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
done
@@ -665,7 +665,7 @@ _OPT_PokemonChannelText::
_PokedexShowText::
text_start
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
db "@"
; Pokémon Music Channel / Pokémusic
@@ -698,7 +698,7 @@ _FernIntroText2::
_BenFernText1::
text_start
line "Today's @"
- current_day
+ text_today
text ","
done
@@ -762,8 +762,8 @@ _LC_Text7::
_LC_Text8::
text_start
line "Number is @"
- interpret_data
- text_from_ram wStringBuffer1
+ text_pause
+ text_ram wStringBuffer1
text "!"
done
@@ -812,9 +812,9 @@ _PnP_Text3::
_PnP_Text4::
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
db "@@"
_PnP_cute::
@@ -900,7 +900,7 @@ _PnP_odd::
_PnP_Text5::
text_start
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
db "@@"
_RocketRadioText1::
@@ -936,28 +936,28 @@ _RocketRadioText6::
_RocketRadioText7::
text_start
line "GIOVANNI! @"
- interpret_data
+ text_pause
text "Can you"
done
_RocketRadioText8::
text_start
line "hear?@"
- interpret_data
+ text_pause
text " We did it!"
done
_RocketRadioText9::
text_start
line "@"
- interpret_data
+ text_pause
text "Where is our Boss?"
done
_RocketRadioText10::
text_start
line "@"
- interpret_data
+ text_pause
text "Is he listening?"
done
@@ -965,30 +965,30 @@ UnknownText_0x1bd2bc::
text "Which floor?"
done
-UnknownText_0x1bd2ca::
+_BugCatchingContestTimeUpText::
text "ANNOUNCER: BEEEP!"
para "Time's up!"
done
-UnknownText_0x1bd2e7::
+_BugCatchingContestIsOverText::
text "ANNOUNCER: The"
line "Contest is over!"
done
-UnknownText_0x1bd308::
+_RepelWoreOffText::
text "REPEL's effect"
line "wore off."
done
-UnknownText_0x1bd321::
+_PlayerFoundItemText::
text "<PLAYER> found"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
done
-UnknownText_0x1bd331::
+_ButNoSpaceText::
text "But <PLAYER> has"
line "no space left…"
done
@@ -996,10 +996,10 @@ UnknownText_0x1bd331::
UnknownText_0x1bd34b::
text "I just saw some"
line "rare @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "I'll call you if I"
@@ -1013,13 +1013,13 @@ UnknownText_0x1bd39e::
done
ReceivedMysteryGiftText_::
- text_from_ram wPlayerName
+ text_ram wPlayerName
text " received"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!@"
sound_item
- text_waitbutton
+ text_promptbutton
db "@"
NoCoinsText_::
@@ -1039,27 +1039,27 @@ UnknownText_0x1bd407::
UnknownText_0x1bd429::
text "<PLAYER> traded"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " for"
cont "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text ".@@"
UnknownText_0x1bd445::
sound_dex_fanfare_80_109
- interpret_data
+ text_pause
db "@"
UnknownText_0x1bd449::
text "I collect #MON."
line "Do you have"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1071,7 +1071,7 @@ UnknownText_0x1bd48c::
UnknownText_0x1bd4aa::
text "Huh? That's not"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text ". "
cont "What a letdown…"
done
@@ -1079,7 +1079,7 @@ UnknownText_0x1bd4aa::
UnknownText_0x1bd4d2::
text "Yay! I got myself"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
cont "Thanks!"
done
@@ -1087,7 +1087,7 @@ UnknownText_0x1bd4d2::
UnknownText_0x1bd4f4::
text "Hi, how's my old"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " doing?"
done
@@ -1097,12 +1097,12 @@ UnknownText_0x1bd512::
para "If you have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text ", would"
para "you trade it for"
line "my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1117,7 +1117,7 @@ UnknownText_0x1bd565::
UnknownText_0x1bd5a1::
text "You don't have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "? That's"
cont "too bad, then."
done
@@ -1127,31 +1127,31 @@ UnknownText_0x1bd5cc::
para "I finally got"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
done
UnknownText_0x1bd5f4::
text "Hi! The @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "you traded me is"
cont "doing great!"
done
UnknownText_0x1bd621::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s cute,"
line "but I don't have"
para "it. Do you have"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
@@ -1163,7 +1163,7 @@ UnknownText_0x1bd673::
UnknownText_0x1bd696::
text "That's not"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "Please trade with"
@@ -1174,19 +1174,19 @@ UnknownText_0x1bd6cd::
text "Wow! Thank you!"
line "I always wanted"
cont "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "!"
done
UnknownText_0x1bd6f5::
text "How is that"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " I"
cont "traded you doing?"
para "Your @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s"
line "so cute!"
done
@@ -1396,7 +1396,7 @@ _LastHealthyMonText::
_IllRaiseYourMonText::
text "OK. I'll raise"
line "your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -1409,25 +1409,25 @@ _AreWeGeniusesText::
text "Are we geniuses or"
line "what? Want to see"
cont "your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
_YourMonHasGrownText::
text "Your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "has grown a lot."
para "By level, it's"
line "grown by @"
- deciram wStringBuffer2 + 1, 1, 3
+ text_decimal wStringBuffer2 + 1, 1, 3
text "."
para "If you want your"
line "#MON back, it"
cont "will cost ¥@"
- deciram wStringBuffer2 + 2, 3, 4
+ text_decimal wStringBuffer2 + 2, 3, 4
text "."
done
@@ -1439,14 +1439,14 @@ _PerfectHeresYourMonText::
_GotBackMonText::
text "<PLAYER> got back"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
_BackAlreadyText::
text "Huh? Back already?"
line "Your @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
para "needs a little"
line "more time with us."
@@ -1563,7 +1563,7 @@ UnknownText_0x1c00a0::
UnknownText_0x1c00cd::
text "Hm… @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "…"
line "That's a fairly"
cont "decent name."
@@ -1595,13 +1595,13 @@ UnknownText_0x1c019e::
done
text "Hm… @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
line "What a great name!"
cont "It's perfect."
para "Treat @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "with loving care."
done
@@ -1625,57 +1625,57 @@ UnknownText_0x1c0272::
text "All right. This"
line "#MON is now"
cont "named @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
Text_Gained::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " gained@@"
Text_ABoostedStringBuffer2ExpPoints::
text_start
line "a boosted"
cont "@"
- deciram wStringBuffer2, 2, 4
+ text_decimal wStringBuffer2, 2, 4
text " EXP. Points!"
prompt
Text_StringBuffer2ExpPoints::
text_start
line "@"
- deciram wStringBuffer2, 2, 4
+ text_decimal wStringBuffer2, 2, 4
text " EXP. Points!"
prompt
Text_GoMon::
text "Go! @"
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text "!"
done
Text_DoItMon::
text "Do it! @"
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text "!"
done
Text_GoForItMon::
text "Go for it,"
line "@"
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text "!"
done
Text_YourFoesWeakGetmMon::
text "Your foe's weak!"
line "Get'm, @"
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text "!"
done
Text_ThatsEnoughComeBack::
- text_from_ram wBattleMonNick
+ text_ram wBattleMonNick
text ",@@"
text " that's"
line "enough! Come back!"
@@ -1699,7 +1699,7 @@ Text_ComeBack::
BattleText_PlayerPickedUpPayDayMoney:
text "<PLAYER> picked up"
line "¥@"
- deciram wPayDayMoney, 3, 6
+ text_decimal wPayDayMoney, 3, 6
text "!"
prompt
@@ -1714,26 +1714,26 @@ UnknownText_0x1c0384::
UnknownText_0x1c0396::
text "It contained"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "Teach @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "to a #MON?"
done
UnknownText_0x1c03c2::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " is"
line "not compatible"
cont "with @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "It can't learn"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -1741,14 +1741,14 @@ UnknownText_0x1c03fa::
text "You have no room"
line "for any more"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "S."
prompt
UnknownText_0x1c0421::
text "You received"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -1783,21 +1783,21 @@ UnknownText_0x1c04c6::
prompt
UnknownText_0x1c04e9::
- text_from_ram wMysteryGiftPartnerName
+ text_ram wMysteryGiftPartnerName
text " sent"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c04fa::
- text_from_ram wMysteryGiftPartnerName
+ text_ram wMysteryGiftPartnerName
text " sent"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
cont "to @"
- text_from_ram wMysteryGiftPlayerName
+ text_ram wMysteryGiftPlayerName
text "'s home."
prompt
@@ -1812,7 +1812,7 @@ CantUseFieldMoveHereText_::
prompt
Text_UsedCut_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "CUT!"
prompt
@@ -1825,11 +1825,11 @@ Text_NothingToCut_::
Text_UsedFlash_::
text "A blinding FLASH"
line "lights the area!@"
- text_waitbutton
+ text_promptbutton
db "@@"
UsedSurfText_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "SURF!"
- done
+ done \ No newline at end of file
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 4bffc8ed..c8b243be 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -14,7 +14,7 @@ AskSurfText_::
done
Text_UsedWaterfall_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "WATERFALL!"
done
@@ -30,7 +30,7 @@ Text_AskUseWaterfall_::
done
Text_UsedDig_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "DIG!"
done
@@ -63,13 +63,13 @@ Text_AlreadyUsingStrength_::
prompt
Text_UsedStrength_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "STRENGTH!"
done
Text_AllowedToMoveBoulders_::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " can"
line "move boulders."
prompt
@@ -93,7 +93,7 @@ Text_MonMayBeAbleToMove_::
done
Text_UsedWhirlpool_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "WHIRLPOOL!"
prompt
@@ -115,7 +115,7 @@ Text_AskWhirlpool_::
done
Text_DidAHeadbutt_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " did a"
line "HEADBUTT!"
prompt
@@ -133,7 +133,7 @@ Text_AskHeadbutt_::
done
Text_UsedRockSmash_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " used"
line "ROCK SMASH!"
prompt
@@ -173,14 +173,14 @@ Text_CantGetOffBike_::
Text_GotOnTheBike_::
text "<PLAYER> got on the"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
Text_GotOffTheBike_::
text "<PLAYER> got off"
line "the @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
@@ -196,14 +196,14 @@ Text_MonCanCutThis_::
line "CUT!"
done
-UnknownText_0x1c0a1c::
+_FoundItemText::
text "<PLAYER> found"
line "@"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "!"
done
-UnknownText_0x1c0a2c::
+_CantCarryItemText::
text "But <PLAYER> can't"
line "carry any more"
cont "items!"
@@ -229,7 +229,7 @@ UnknownText_0x1c0aa9::
prompt
UnknownText_0x1c0acc::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "fainted!"
prompt
@@ -243,7 +243,7 @@ UnknownText_0x1c0ada::
prompt
UnknownText_0x1c0b03::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " used"
line "SWEET SCENT!"
done
@@ -282,17 +282,17 @@ Text_ThrowAwayHowMany_::
Text_ConfirmThrowAway_::
text "Throw away @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
Text_ThrewAway_::
text "Threw away"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -310,7 +310,7 @@ Text_YouDontHaveAMon::
Text_RegisteredTheItem_::
text "Registered the"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -349,7 +349,7 @@ _UsedInsteadText::
cont "@@"
_MoveNameText::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
db "@@"
_EndUsedMove1Text::
@@ -375,11 +375,11 @@ _EndUsedMove5Text::
UnknownText_0x1c0cc6::
text "<USER>'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
db "@@"
UnknownText_0x1c0cd0::
- interpret_data
+ text_pause
text "<SCROLL>went way up!"
prompt
@@ -390,11 +390,11 @@ UnknownText_0x1c0ce0::
UnknownText_0x1c0ceb::
text "<TARGET>'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
db "@@"
UnknownText_0x1c0cf5::
- interpret_data
+ text_pause
text "<SCROLL>sharply fell!"
prompt
@@ -445,23 +445,23 @@ UnknownText_0x1c0db8::
done
UnknownText_0x1c0dba::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " came"
line "out of its EGG!@"
sound_caught_mon
- text_waitbutton
+ text_promptbutton
db "@"
UnknownText_0x1c0dd8::
text "Give a nickname to"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
UnknownText_0x1c0df3::
text "It's @"
- text_from_ram wBreedMon2Nick
+ text_ram wBreedMon2Nick
text_start
line "that was left with"
cont "the DAY-CARE LADY."
@@ -469,7 +469,7 @@ UnknownText_0x1c0df3::
UnknownText_0x1c0e24::
text "It's @"
- text_from_ram wDayCareMan + 1
+ text_ram wDayCareMan + 1
text_start
line "that was left with"
cont "the DAY-CARE MAN."
@@ -483,28 +483,28 @@ UnknownText_0x1c0e54::
UnknownText_0x1c0e6f::
text "It has no interest"
line "in @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0e8d::
text "It appears to care"
line "for @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0eac::
text "It's friendly with"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
UnknownText_0x1c0ec6::
text "It shows interest"
line "in @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -543,7 +543,7 @@ MailMovedFromBoxText::
prompt
Text_WasSentToBillsPC::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " was"
line "sent to BILL's PC."
prompt
@@ -582,7 +582,7 @@ Text_CantTakeAnyMorePokemon_::
Text_CaughtBugMon_::
text "Caught @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
prompt
@@ -593,22 +593,22 @@ UnknownText_0x1c10cf::
UnknownText_0x1c10dd::
text "You already caught"
line "a @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
ContestJudging_FirstPlaceText::
text "This Bug-Catching"
line "Contest winner is@"
- interpret_data
+ text_pause
text "…"
para "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
line "who caught a"
cont "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!@@"
ContestJudging_FirstPlaceScoreText::
@@ -616,19 +616,19 @@ ContestJudging_FirstPlaceScoreText::
para "The winning score"
line "was @"
- deciram wBugContestFirstPlaceScore, 2, 3
+ text_decimal wBugContestFirstPlaceScore, 2, 3
text " points!"
prompt
ContestJudging_SecondPlaceText::
text "Placing second was"
line "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
para "who caught a"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!@@"
ContestJudging_SecondPlaceScoreText::
@@ -636,19 +636,19 @@ ContestJudging_SecondPlaceScoreText::
para "The score was"
line "@"
- deciram wBugContestSecondPlaceScore, 2, 3
+ text_decimal wBugContestSecondPlaceScore, 2, 3
text " points!"
prompt
ContestJudging_ThirdPlaceText::
text "Placing third was"
line "@"
- text_from_ram wBugContestWinnerName
+ text_ram wBugContestWinnerName
text ","
para "who caught a"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!@@"
ContestJudging_ThirdPlaceScoreText::
@@ -656,7 +656,7 @@ ContestJudging_ThirdPlaceScoreText::
para "The score was"
line "@"
- deciram wBugContestThirdPlaceScore, 2, 3
+ text_decimal wBugContestThirdPlaceScore, 2, 3
text " points!"
prompt
@@ -666,7 +666,7 @@ UnknownText_0x1c1203::
para "…Hm, it measures"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -674,11 +674,11 @@ UnknownText_0x1c123a::
text "CURRENT RECORD"
para "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " caught by"
line "@"
- text_from_ram wMagikarpRecordHoldersName
- text_waitbutton
+ text_ram wMagikarpRecordHoldersName
+ text_promptbutton
db "@"
UnknownText_0x1c1261::
@@ -688,7 +688,7 @@ UnknownText_0x1c1261::
line "with the ID number"
para "of @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
line "your party."
prompt
@@ -700,7 +700,7 @@ UnknownText_0x1c12ae::
line "with the ID number"
para "of @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
line "your PC BOX."
prompt
@@ -708,7 +708,7 @@ UnknownText_0x1c12ae::
UnknownText_0x1c12fc::
text "Give a nickname to"
line "the @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " you"
cont "received?"
done
@@ -736,10 +736,10 @@ _PlayersPCHowManyWithdrawText::
_PlayersPCWithdrewItemsText::
text "Withdrew @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -759,10 +759,10 @@ _PlayersPCHowManyDepositText::
_PlayersPCDepositItemsText::
text "Deposited @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
prompt
@@ -819,10 +819,10 @@ _OakPCText2::
prompt
_OakPCText3::
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text " #MON seen"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text " #MON owned"
para "PROF.OAK's"
@@ -989,23 +989,23 @@ UnknownText_0x1c1a6c::
UnknownText_0x1c1a90::
text "Toss out how many"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c1aad::
text "Throw away @"
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text_start
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)?"
done
UnknownText_0x1c1aca::
text "Discarded"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "(S)."
prompt
@@ -1022,24 +1022,24 @@ UnknownText_0x1c1b03::
UnknownText_0x1c1b2c::
text "Took @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "'s"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " and"
para "made it hold"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c1b57::
text "Made @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "hold @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -1049,7 +1049,7 @@ UnknownText_0x1c1b6f::
prompt
UnknownText_0x1c1b8e::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " isn't"
line "holding anything."
prompt
@@ -1061,20 +1061,20 @@ UnknownText_0x1c1baa::
UnknownText_0x1c1bc4::
text "Took @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text_start
line "from @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text "."
prompt
UnknownText_0x1c1bdc::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " is"
line "already holding"
para "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
line "Switch items?"
done
@@ -1092,7 +1092,7 @@ UnknownText_0x1c1c22::
UnknownText_0x1c1c47::
text "MAIL detached from"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
prompt
@@ -1152,7 +1152,7 @@ _OakText2::
cont "#MON.@@"
_OakText3::
- text_waitbutton
+ text_promptbutton
db "@"
_OakText4::
@@ -1247,17 +1247,17 @@ UnknownText_0x1c41b1::
UnknownText_0x1c41e6::
text "Your friend's"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " appears"
cont "to be abnormal!"
prompt
UnknownText_0x1c4212::
text "Trade @"
- text_from_ram wTemporaryBuffer
+ text_ram wTemporaryBuffer
text_start
line "for @"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
@@ -1334,23 +1334,23 @@ CoordinatesEventText_::
UnknownText_0x1c4719::
text "<PLAYER> received"
line "@"
- text_from_ram wStringBuffer4
+ text_ram wStringBuffer4
text "."
done
UnknownText_0x1c472c::
text "<PLAYER> put the"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " in"
cont "the @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text "."
prompt
UnknownText_0x1c474b::
text "The @"
- text_from_ram wStringBuffer3
+ text_ram wStringBuffer3
text_start
line "is full…"
prompt
@@ -1358,7 +1358,7 @@ UnknownText_0x1c474b::
UnknownText_0x1c4b92::
text "Congratulations!"
line "Your @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
db "@@"
UnknownText_0x1c4baf::
@@ -1366,20 +1366,20 @@ UnknownText_0x1c4baf::
para "evolved into"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "!"
done
UnknownText_0x1c4bc5::
text "Huh? @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "stopped evolving!"
prompt
UnknownText_0x1c4be3::
text "What? @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text_start
line "is evolving!"
done
@@ -1389,12 +1389,12 @@ UnknownText_0x1c4bfd::
done
UnknownText_0x1c4c08::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will be ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -1418,12 +1418,12 @@ UnknownText_0x1c4ca3::
done
UnknownText_0x1c4cae::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will be ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -1459,10 +1459,10 @@ UnknownText_0x1c4d47::
done
UnknownText_0x1c4db0::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " costs"
line "¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text ". Want it?"
done
@@ -1501,12 +1501,12 @@ UnknownText_0x1c4e7e::
done
UnknownText_0x1c4e89::
- deciram wItemQuantityChangeBuffer, 1, 2
+ text_decimal wItemQuantityChangeBuffer, 1, 2
text " @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)"
line "will cost ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
done
@@ -1541,7 +1541,7 @@ UnknownText_0x1c4f33::
UnknownText_0x1c4f3e::
text "I can pay you"
line "¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text "."
para "Is that OK?"
@@ -1583,14 +1583,14 @@ UnknownText_0x1c500d::
UnknownText_0x1c502e::
text "Got ¥@"
- deciram hMoneyTemp, 3, 6
+ text_decimal hMoneyTemp, 3, 6
text " for"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "(S)."
done
UnknownText_0x1c5049::
text "Bet how many"
line "coins?"
- done
+ done \ No newline at end of file
diff --git a/data/text/common_3.asm b/data/text/common_3.asm
index 7f21819a..503d5a76 100644
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@@ -19,7 +19,7 @@ UnknownText_0x1c5092::
UnknownText_0x1c509f::
text "lined up!"
line "Won @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " coins!"
done
@@ -28,7 +28,7 @@ UnknownText_0x1c50bb::
done
UnknownText_0x1c5821::
- current_day
+ text_today
db "@"
UnknownText_0x1c5824::
@@ -111,13 +111,13 @@ UnknownText_0x1c564a::
done
Text_LearnedMove_::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " learned"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "!@"
sound_dex_fanfare_50_79
- text_waitbutton
+ text_promptbutton
db "@"
Text_ForgetWhich_::
@@ -128,29 +128,29 @@ Text_ForgetWhich_::
Text_StopLearning_::
text "Stop learning"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
Text_DidNotLearn_::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "did not learn"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
Text_TryingToLearn_::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " is"
line "trying to learn"
cont "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
para "But @"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text_start
line "can't learn more"
cont "than four moves."
@@ -158,25 +158,25 @@ Text_TryingToLearn_::
para "Delete an older"
line "move to make room"
cont "for @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "?"
done
Text_1_2_and_Poof_::
text "1, 2 and…@"
- interpret_data
+ text_pause
db "@@"
Text_PoofForgot_::
text " Poof!@"
- interpret_data
+ text_pause
text_start
para "@"
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " forgot"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "."
para "And…"
@@ -257,43 +257,43 @@ Text_ShootItWasSoCloseToo_::
Text_GotchaMonWasCaught_::
text "Gotcha! @"
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text_start
line "was caught!@"
sound_caught_mon
db "@@"
-Text_Waitbutton_2::
- text_waitbutton
+Text_Promptbutton_2::
+ text_promptbutton
db "@"
Text_SentToBillsPC_::
- text_from_ram wMonOrItemNameBuffer
+ text_ram wMonOrItemNameBuffer
text " was"
line "sent to BILL's PC."
prompt
Text_MonNewlyAddedToPokedex_::
- text_from_ram wEnemyMonNick
+ text_ram wEnemyMonNick
text "'s data"
line "was newly added to"
cont "the #DEX.@"
sound_slot_machine_start
- text_waitbutton
+ text_promptbutton
db "@"
Text_AskNicknameNewlyCaughtMon_::
text "Give a nickname to"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
Text_StatRoseFromVitamin_::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "'s"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text " rose."
prompt
@@ -324,13 +324,13 @@ Text_AllSleepingMonWokeUp_::
Text_PlayedThePokeFlute_::
text "<PLAYER> played the"
line "# FLUTE.@"
- text_waitbutton
+ text_promptbutton
db "@@"
Text_CoinCase_::
text "Coins:"
line "@"
- deciram wCoins, 2, 4
+ text_decimal wCoins, 2, 4
done
Text_RaiseThePPOfWhichMove_::
@@ -344,13 +344,13 @@ Text_RestoreThePPOfWhichMove_::
done
Text_PPIsMaxedOut_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "'s PP"
line "is maxed out."
prompt
Text_PPsIncreased_::
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "'s PP"
line "increased."
prompt
@@ -366,7 +366,7 @@ Text_TrophyInside_::
text_start
para "@"
- text_from_ram wPlayerName
+ text_ram wPlayerName
text " sent the"
line "trophy home."
prompt
@@ -413,7 +413,7 @@ Text_CyclingIsntAllowed_::
Text_CantGetOnYourItemNow_::
text "Can't get on your"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " now."
prompt
@@ -426,14 +426,14 @@ Text_CantUseBallBoxIsFull_::
Text_UsedItem_::
text "<PLAYER> used the"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
done
Text_GotOnItem_::
text "<PLAYER> got on the@"
text_low
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -441,15 +441,15 @@ Text_GotOffItem_::
text "<PLAYER> got off@"
text_low
text "the @"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
Text_KnowsMove_::
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text " knows"
line "@"
- text_from_ram wStringBuffer2
+ text_ram wStringBuffer2
text "."
prompt
@@ -461,7 +461,7 @@ UnknownText_0x1c5eba::
UnknownText_0x1c5eda::
text "Oh, make it forget"
line "@"
- text_from_ram wStringBuffer1
+ text_ram wStringBuffer1
text "?"
done
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 06:33:14 +0000