Prefix wram labels with w, part 2.

This commit is contained in:
luckytyphlosion 2018-01-23 17:39:09 -05:00
parent 79bd48f85c
commit a1951cefc0
323 changed files with 8581 additions and 8581 deletions

File diff suppressed because it is too large Load Diff

View File

@ -7,10 +7,10 @@
charmap "<LNBRK>", $22
charmap "<POKE>", $24 ; "<PO><KE>"
charmap "%", $25 ; soft linebreak in landmark names
charmap "<RED>", $38 ; RedsName
charmap "<GREEN>", $39 ; GreensName
charmap "<RED>", $38 ; wRedsName
charmap "<GREEN>", $39 ; wGreensName
charmap "<ENEMY>", $3f
charmap "<MOM>", $49 ; MomsName
charmap "<MOM>", $49 ; wMomsName
charmap "<PKMN>", $4a ; "<PK><MN>"
charmap "<_CONT>", $4b ; implements "<CONT>"
charmap "<SCROLL>", $4c
@ -18,8 +18,8 @@
charmap "<LINE>", $4f
charmap "@", $50 ; string terminator
charmap "<PARA>", $51
charmap "<PLAYER>", $52 ; PlayerName
charmap "<RIVAL>", $53 ; RivalName
charmap "<PLAYER>", $52 ; wPlayerName
charmap "<RIVAL>", $53 ; wRivalName
charmap "#", $54 ; "POKé"
charmap "<CONT>", $55
charmap "<……>", $56 ; "……"

View File

@ -73,7 +73,7 @@ VOLUME_SO1_LEVEL EQU %00000111
VOLUME_SO2_LEVEL EQU %01110000
MAX_VOLUME EQU $77
; SoundInput
; wSoundInput
SOUND_INPUT_CH1_F EQU 0
SOUND_INPUT_CH2_F EQU 1
SOUND_INPUT_CH3_F EQU 2
@ -84,5 +84,5 @@ SOUND_INPUT_GLOBAL_F EQU 7
DANGER_PITCH_F EQU 4
DANGER_ON_F EQU 7
; MusicFade
; wMusicFade
MUSIC_FADE_IN_F EQU 7

View File

@ -27,7 +27,7 @@ EFFECTIVE EQU 10
NOT_VERY_EFFECTIVE EQU 05
NO_EFFECT EQU 00
; PlayerStatLevels and EnemyStatLevels indexes (see wram.asm)
; wPlayerStatLevels and wEnemyStatLevels indexes (see wram.asm)
; GetStatName arguments (see data/battle/stat_names.asm)
const_def
const ATTACK
@ -53,7 +53,7 @@ MOVE_LENGTH EQU const_value
; stat constants
; indexes for:
; - PlayerStats and EnemyStats (see wram.asm)
; - wPlayerStats and wEnemyStats (see wram.asm)
; - party_struct and battle_struct members (see macros/wram.asm)
const_value set 1
const STAT_HP
@ -80,7 +80,7 @@ const_value set 1
const WILD_BATTLE
const TRAINER_BATTLE
; battle types (BattleType values)
; battle types (wBattleType values)
const_def
const BATTLETYPE_NORMAL
const BATTLETYPE_CANLOSE
@ -159,7 +159,7 @@ const_value set 3
ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
; PlayerSubStatus1 or EnemySubStatus1 bit flags
; wPlayerSubStatus1 or wEnemySubStatus1 bit flags
enum_start 7, -1
enum SUBSTATUS_IN_LOVE
enum SUBSTATUS_ROLLOUT
@ -170,10 +170,10 @@ ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
enum SUBSTATUS_CURSE
enum SUBSTATUS_NIGHTMARE
; PlayerSubStatus2 or EnemySubStatus2 bit flags
; wPlayerSubStatus2 or wEnemySubStatus2 bit flags
SUBSTATUS_CURLED EQU 0
; PlayerSubStatus3 or EnemySubStatus3 bit flags
; wPlayerSubStatus3 or wEnemySubStatus3 bit flags
enum_start 7, -1
enum SUBSTATUS_CONFUSED
enum SUBSTATUS_FLYING
@ -184,7 +184,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_RAMPAGE
enum SUBSTATUS_BIDE
; PlayerSubStatus4 or EnemySubStatus4 bit flags
; wPlayerSubStatus4 or wEnemySubStatus4 bit flags
enum_start 7, -1
enum SUBSTATUS_LEECH_SEED
enum SUBSTATUS_RAGE
@ -195,7 +195,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_MIST
enum SUBSTATUS_X_ACCURACY
; PlayerSubStatus5 or EnemySubStatus5 bit flags
; wPlayerSubStatus5 or wEnemySubStatus5 bit flags
enum_start 7, -1
enum SUBSTATUS_CANT_RUN
enum SUBSTATUS_DESTINY_BOND
@ -206,7 +206,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_UNKNOWN_3
enum SUBSTATUS_TOXIC
; PlayerScreens or EnemyScreens bit flags
; wPlayerScreens or wEnemyScreens bit flags
enum_start 4, -1
enum SCREENS_REFLECT
enum SCREENS_LIGHT_SCREEN

View File

@ -1,4 +1,4 @@
; EventFlags bit flags
; wEventFlags bit flags
const_def
; The first eight flags are reset upon reloading the map
const EVENT_GAVE_KURT_APRICORNS ; 000

View File

@ -60,7 +60,7 @@ const_value set 1
const SOUTH_F
const NORTH_F
; MapConnections
; wMapConnections
const_def
shift_const EAST
shift_const WEST
@ -170,7 +170,7 @@ MAPOBJECT_SCREEN_WIDTH EQU 12
const OBJECT_RANGE ; 20
; 21-27 are not used
OBJECT_STRUCT_LENGTH EQU 40
NUM_OBJECT_STRUCTS EQU 13 ; see ObjectStructs
NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
; object_struct OBJECT_FACING values
OW_DOWN EQU DOWN << 2

View File

@ -1,29 +1,29 @@
; base data struct members (see data/pokemon/base_stats/*.asm)
BASE_DEX_NO EQUS "(BaseDexNo - CurBaseData)"
BASE_STATS EQUS "(BaseStats - CurBaseData)"
BASE_HP EQUS "(BaseHP - CurBaseData)"
BASE_ATK EQUS "(BaseAttack - CurBaseData)"
BASE_SPD EQUS "(BaseSpeed - CurBaseData)"
BASE_SAT EQUS "(BaseSpecialAttack - CurBaseData)"
BASE_SDF EQUS "(BaseSpecialDefense - CurBaseData)"
BASE_TYPES EQUS "(BaseType - CurBaseData)"
BASE_TYPE_1 EQUS "(BaseType1 - CurBaseData)"
BASE_TYPE_2 EQUS "(BaseType2 - CurBaseData)"
BASE_CATCH_RATE EQUS "(BaseCatchRate - CurBaseData)"
BASE_EXP EQUS "(BaseExp - CurBaseData)"
BASE_ITEMS EQUS "(BaseItems - CurBaseData)"
BASE_ITEM_1 EQUS "(BaseItem1 - CurBaseData)"
BASE_ITEM_2 EQUS "(BaseItem2 - CurBaseData)"
BASE_GENDER EQUS "(BaseGender - CurBaseData)"
BASE_UNKNOWN_1 EQUS "(BaseUnknown1 - CurBaseData)"
BASE_EGG_STEPS EQUS "(BaseEggSteps - CurBaseData)"
BASE_UNKNOWN_2 EQUS "(BaseUnknown2 - CurBaseData)"
BASE_PIC_SIZE EQUS "(BasePicSize - CurBaseData)"
BASE_PADDING EQUS "(BasePadding - CurBaseData)"
BASE_GROWTH_RATE EQUS "(BaseGrowthRate - CurBaseData)"
BASE_EGG_GROUPS EQUS "(BaseEggGroups - CurBaseData)"
BASE_TMHM EQUS "(BaseTMHM - CurBaseData)"
BASE_DATA_SIZE EQUS "(CurBaseDataEnd - CurBaseData)"
BASE_DEX_NO EQUS "(wBaseDexNo - wCurBaseData)"
BASE_STATS EQUS "(wBaseStats - wCurBaseData)"
BASE_HP EQUS "(wBaseHP - wCurBaseData)"
BASE_ATK EQUS "(wBaseAttack - wCurBaseData)"
BASE_SPD EQUS "(wBaseSpeed - wCurBaseData)"
BASE_SAT EQUS "(wBaseSpecialAttack - wCurBaseData)"
BASE_SDF EQUS "(wBaseSpecialDefense - wCurBaseData)"
BASE_TYPES EQUS "(wBaseType - wCurBaseData)"
BASE_TYPE_1 EQUS "(wBaseType1 - wCurBaseData)"
BASE_TYPE_2 EQUS "(wBaseType2 - wCurBaseData)"
BASE_CATCH_RATE EQUS "(wBaseCatchRate - wCurBaseData)"
BASE_EXP EQUS "(wBaseExp - wCurBaseData)"
BASE_ITEMS EQUS "(wBaseItems - wCurBaseData)"
BASE_ITEM_1 EQUS "(wBaseItem1 - wCurBaseData)"
BASE_ITEM_2 EQUS "(wBaseItem2 - wCurBaseData)"
BASE_GENDER EQUS "(wBaseGender - wCurBaseData)"
BASE_UNKNOWN_1 EQUS "(wBaseUnknown1 - wCurBaseData)"
BASE_EGG_STEPS EQUS "(wBaseEggSteps - wCurBaseData)"
BASE_UNKNOWN_2 EQUS "(wBaseUnknown2 - wCurBaseData)"
BASE_PIC_SIZE EQUS "(wBasePicSize - wCurBaseData)"
BASE_PADDING EQUS "(wBasePadding - wCurBaseData)"
BASE_GROWTH_RATE EQUS "(wBaseGrowthRate - wCurBaseData)"
BASE_EGG_GROUPS EQUS "(wBaseEggGroups - wCurBaseData)"
BASE_TMHM EQUS "(wBaseTMHM - wCurBaseData)"
BASE_DATA_SIZE EQUS "(wCurBaseDataEnd - wCurBaseData)"
; gender ratio constants
GENDER_F0 EQU 0 percent
@ -34,7 +34,7 @@ GENDER_F75 EQU 75 percent
GENDER_F100 EQU 254 ; 100 percent
GENDERLESS EQU 255
; BaseGrowthRate values
; wBaseGrowthRate values
; GrowthRates indexes (see data/growth_rates.asm)
const_def
const MEDIUM_FAST
@ -44,7 +44,7 @@ GENDERLESS EQU 255
const FAST
const SLOW
; BaseEggGroups values
; wBaseEggGroups values
const_value set 1
const MONSTER ; 1
const AMPHIBIAN ; 2
@ -68,37 +68,37 @@ NUM_DEX_ENTRY_BANKS EQU 4
; party_struct members (see macros/wram.asm)
MON_SPECIES EQUS "(PartyMon1Species - PartyMon1)"
MON_ITEM EQUS "(PartyMon1Item - PartyMon1)"
MON_MOVES EQUS "(PartyMon1Moves - PartyMon1)"
MON_ID EQUS "(PartyMon1ID - PartyMon1)"
MON_EXP EQUS "(PartyMon1Exp - PartyMon1)"
MON_STAT_EXP EQUS "(PartyMon1StatExp - PartyMon1)"
MON_HP_EXP EQUS "(PartyMon1HPExp - PartyMon1)"
MON_ATK_EXP EQUS "(PartyMon1AtkExp - PartyMon1)"
MON_DEF_EXP EQUS "(PartyMon1DefExp - PartyMon1)"
MON_SPD_EXP EQUS "(PartyMon1SpdExp - PartyMon1)"
MON_SPC_EXP EQUS "(PartyMon1SpcExp - PartyMon1)"
MON_DVS EQUS "(PartyMon1DVs - PartyMon1)"
MON_PP EQUS "(PartyMon1PP - PartyMon1)"
MON_HAPPINESS EQUS "(PartyMon1Happiness - PartyMon1)"
MON_PKRUS EQUS "(PartyMon1PokerusStatus - PartyMon1)"
MON_CAUGHTDATA EQUS "(PartyMon1CaughtData - PartyMon1)"
MON_CAUGHTLEVEL EQUS "(PartyMon1CaughtLevel - PartyMon1)"
MON_CAUGHTTIME EQUS "(PartyMon1CaughtTime - PartyMon1)"
MON_CAUGHTGENDER EQUS "(PartyMon1CaughtGender - PartyMon1)"
MON_CAUGHTLOCATION EQUS "(PartyMon1CaughtLocation - PartyMon1)"
MON_LEVEL EQUS "(PartyMon1Level - PartyMon1)"
MON_STATUS EQUS "(PartyMon1Status - PartyMon1)"
MON_HP EQUS "(PartyMon1HP - PartyMon1)"
MON_MAXHP EQUS "(PartyMon1MaxHP - PartyMon1)"
MON_ATK EQUS "(PartyMon1Attack - PartyMon1)"
MON_DEF EQUS "(PartyMon1Defense - PartyMon1)"
MON_SPD EQUS "(PartyMon1Speed - PartyMon1)"
MON_SAT EQUS "(PartyMon1SpclAtk - PartyMon1)"
MON_SDF EQUS "(PartyMon1SpclDef - PartyMon1)"
BOXMON_STRUCT_LENGTH EQUS "(PartyMon1End - PartyMon1)"
PARTYMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1)"
MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)"
MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)"
MON_MOVES EQUS "(wPartyMon1Moves - wPartyMon1)"
MON_ID EQUS "(wPartyMon1ID - wPartyMon1)"
MON_EXP EQUS "(wPartyMon1Exp - wPartyMon1)"
MON_STAT_EXP EQUS "(wPartyMon1StatExp - wPartyMon1)"
MON_HP_EXP EQUS "(wPartyMon1HPExp - wPartyMon1)"
MON_ATK_EXP EQUS "(wPartyMon1AtkExp - wPartyMon1)"
MON_DEF_EXP EQUS "(wPartyMon1DefExp - wPartyMon1)"
MON_SPD_EXP EQUS "(wPartyMon1SpdExp - wPartyMon1)"
MON_SPC_EXP EQUS "(wPartyMon1SpcExp - wPartyMon1)"
MON_DVS EQUS "(wPartyMon1DVs - wPartyMon1)"
MON_PP EQUS "(wPartyMon1PP - wPartyMon1)"
MON_HAPPINESS EQUS "(wPartyMon1Happiness - wPartyMon1)"
MON_PKRUS EQUS "(wPartyMon1PokerusStatus - wPartyMon1)"
MON_CAUGHTDATA EQUS "(wPartyMon1CaughtData - wPartyMon1)"
MON_CAUGHTLEVEL EQUS "(wPartyMon1CaughtLevel - wPartyMon1)"
MON_CAUGHTTIME EQUS "(wPartyMon1CaughtTime - wPartyMon1)"
MON_CAUGHTGENDER EQUS "(wPartyMon1CaughtGender - wPartyMon1)"
MON_CAUGHTLOCATION EQUS "(wPartyMon1CaughtLocation - wPartyMon1)"
MON_LEVEL EQUS "(wPartyMon1Level - wPartyMon1)"
MON_STATUS EQUS "(wPartyMon1Status - wPartyMon1)"
MON_HP EQUS "(wPartyMon1HP - wPartyMon1)"
MON_MAXHP EQUS "(wPartyMon1MaxHP - wPartyMon1)"
MON_ATK EQUS "(wPartyMon1Attack - wPartyMon1)"
MON_DEF EQUS "(wPartyMon1Defense - wPartyMon1)"
MON_SPD EQUS "(wPartyMon1Speed - wPartyMon1)"
MON_SAT EQUS "(wPartyMon1SpclAtk - wPartyMon1)"
MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)"
BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)"
PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)"
REDMON_STRUCT_LENGTH EQU 44

View File

@ -5,9 +5,9 @@ LAST_TALKED EQU -2
; memory constants
const_def
const MEM_BUFFER_0 ; use StringBuffer3
const MEM_BUFFER_1 ; use StringBuffer4
const MEM_BUFFER_2 ; use StringBuffer5
const MEM_BUFFER_0 ; use wStringBuffer3
const MEM_BUFFER_1 ; use wStringBuffer4
const MEM_BUFFER_2 ; use wStringBuffer5
NUM_MEM_BUFFERS EQU const_value

View File

@ -149,7 +149,7 @@ const_value set $e0
const SPRITE_DAY_CARE_MON_1 ; e0
const SPRITE_DAY_CARE_MON_2 ; e1
; VariableSprites indexes (see wram.asm)
; wVariableSprites indexes (see wram.asm)
const_value set $f0
SPRITE_VARS EQU const_value
const SPRITE_CONSOLE ; f0

View File

@ -1,4 +1,4 @@
; MonType: ; cf5f
; wMonType: ; cf5f
const_def
const PARTYMON ; 0
const OTPARTYMON ; 1
@ -6,19 +6,19 @@
const TEMPMON ; 3
const WILDMON ; 4
; Options: (bits) ; cfcc
; wOptions: (bits) ; cfcc
const_value set 4
const NO_TEXT_SCROLL ; 4
const STEREO ; 5
const BATTLE_SHIFT ; 6
const BATTLE_SCENE ; 7
; Options: (bits 0-2)
; wOptions: (bits 0-2)
TEXT_DELAY_FAST EQU 1
TEXT_DELAY_MED EQU 3
TEXT_DELAY_SLOW EQU 5
; TextBoxFrame: ; cfce
; wTextBoxFrame: ; cfce
const_def
const FRAME_1 ; 0
const FRAME_2 ; 1
@ -30,23 +30,23 @@ TEXT_DELAY_SLOW EQU 5
const FRAME_8 ; 7
NUM_FRAMES EQU const_value
; TextBoxFlags:
; wTextBoxFlags:
const_def
const FAST_TEXT_DELAY_F ; 0
const NO_TEXT_DELAY_F ; 1
; Options2:
; wOptions2:
const_def
const MENU_ACCOUNT ; 0
; GBPrinter:
; wGBPrinter:
GBPRINTER_LIGHTEST EQU $00
GBPRINTER_LIGHTER EQU $20
GBPRINTER_NORMAL EQU $40
GBPRINTER_DARKER EQU $60
GBPRINTER_DARKEST EQU $7f
; WalkingDirection: ; d043
; wWalkingDirection: ; d043
const_value set -1
const STANDING ; -1
const DOWN ; 0
@ -60,14 +60,14 @@ UP_MASK EQU 1 << UP
LEFT_MASK EQU 1 << LEFT
RIGHT_MASK EQU 1 << RIGHT
; FacingDirection: ; d044
; wFacingDirection: ; d044
FACE_CURRENT EQU 0
FACE_DOWN EQU 8
FACE_UP EQU 4
FACE_LEFT EQU 2
FACE_RIGHT EQU 1
; TimeOfDay: ; d269
; wTimeOfDay: ; d269
const_def
const MORN_F ; 0
const DAY_F ; 1
@ -82,16 +82,16 @@ DARKNESS EQU 1 << DARKNESS_F
ANYTIME EQU MORN | DAY | NITE
; ScriptFlags: ; d434
; wScriptFlags: ; d434
SCRIPT_RUNNING EQU 2
; ScriptMode: ; d437
; wScriptMode: ; d437
SCRIPT_OFF EQU 0
SCRIPT_READ EQU 1
SCRIPT_WAIT_MOVEMENT EQU 2
SCRIPT_WAIT EQU 3
; CurDay: ; d4cb
; wCurDay: ; d4cb
const_def
const SUNDAY ; 0
const MONDAY ; 1
@ -101,20 +101,20 @@ SCRIPT_WAIT EQU 3
const FRIDAY ; 5
const SATURDAY ; 6
; MapObjects: ; d71e
; wMapObjects: ; d71e
PLAYER_OBJECT EQU 0
NUM_OBJECTS EQU $10
; InputType: ; c2c7
; wInputType: ; c2c7
AUTO_INPUT EQU $ff
; WhichRegisteredItem: ; d95b
; wWhichRegisteredItem: ; d95b
REGISTERED_POCKET EQU %11000000
REGISTERED_NUMBER EQU %00111111
; PlayerState: ; d95d
; wPlayerState: ; d95d
PLAYER_NORMAL EQU 0
PLAYER_BIKE EQU 1
PLAYER_SKATE EQU 2

View File

@ -10,7 +10,7 @@ BattleText_PlayerPickedUpPayDayMoney: ; 0x80730
WildPokemonAppearedText: ; 0x80746
text "Wild @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@ -19,14 +19,14 @@ WildPokemonAppearedText: ; 0x80746
HookedPokemonAttackedText: ; 0x8075c
text "The hooked"
line "@"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
cont "attacked!"
prompt
; 0x80778
PokemonFellFromTreeText: ; 0x80778
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text " fell"
line "out of the tree!"
prompt
@ -34,7 +34,7 @@ PokemonFellFromTreeText: ; 0x80778
WildCelebiAppearedText: ; 0x80793
text "Wild @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
line "appeared!"
prompt
@ -48,7 +48,7 @@ WantsToBattleText:: ; 0x807a9
BattleText_WildFled: ; 0x807bd
text "Wild @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
line "fled!"
prompt
@ -56,7 +56,7 @@ BattleText_WildFled: ; 0x807bd
BattleText_EnemyFled: ; 0x807cf
text "Enemy @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
line "fled!"
prompt
@ -110,7 +110,7 @@ BattleText_TargetRecoveredWithItem: ; 0x80880
text "<TARGET>"
line "recovered with"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "."
prompt
; 0x80899
@ -119,7 +119,7 @@ BattleText_UserRecoveredPPUsing: ; 0x80899
text "<USER>"
line "recovered PP using"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "."
prompt
; 0x808b6
@ -138,14 +138,14 @@ BattleText_SafeguardFaded: ; 0x808d2
; 0x808e7
BattleText_PkmnLightScreenFell: ; 0x808e7
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " #MON's"
line "LIGHT SCREEN fell!"
prompt
; 0x80905
BattleText_PkmnReflectFaded: ; 0x80905
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " #MON's"
line "REFLECT faded!"
prompt
@ -188,7 +188,7 @@ BattleText_TheSandstormSubsided: ; 0x8098f
BattleText_EnemyPkmnFainted: ; 0x809a8
text "Enemy @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
line "fainted!"
prompt
@ -237,7 +237,7 @@ BattleText_0x80a4f: ; 0x80a4f
; 0x80a75
BattleText_PkmnFainted: ; 0x80a75
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text_start
line "fainted!"
prompt
@ -265,7 +265,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca
text "<ENEMY>"
line "is about to use"
cont "@"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text "."
para "Will <PLAYER>"
@ -277,7 +277,7 @@ BattleText_EnemySentOut: ; 0x80af8
text "<ENEMY>"
line "sent out"
cont "@"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text "!"
done
; 0x80b0b
@ -313,7 +313,7 @@ BattleText_UserFledUsingAStringBuffer1: ; 0x80b89
text "<USER>"
line "fled using a"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x80ba0
@ -333,7 +333,7 @@ RecoveredUsingText: ; 0x80bc2
text "<TARGET>"
line "recovered using a"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x80bde
@ -341,7 +341,7 @@ RecoveredUsingText: ; 0x80bc2
BattleText_UsersStringBuffer1Activated: ; 0x80bde
text "<USER>'s"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
cont "activated!"
prompt
@ -354,14 +354,14 @@ BattleText_ItemsCantBeUsedHere: ; 0x80bf3
; 0x80c0d
BattleText_PkmnIsAlreadyOut: ; 0x80c0d
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text_start
line "is already out."
prompt
; 0x80c22
BattleText_PkmnCantBeRecalled: ; 0x80c22
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text_start
line "can't be recalled!"
prompt
@ -380,7 +380,7 @@ BattleText_TheMoveIsDisabled: ; 0x80c5b
; 0x80c72
BattleText_PkmnHasNoMovesLeft: ; 0x80c72
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text_start
line "has no moves left!"
done
@ -393,10 +393,10 @@ BattleText_TargetsEncoreEnded: ; 0x80c8a
; 0x80c9c
BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " grew to"
line "level @"
deciram CurPartyLevel, 1, 3
deciram wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
db "@@"
@ -404,7 +404,7 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
BattleText_WildPkmnIsEating: ; 0x80cba
text "Wild @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
line "is eating!"
prompt
@ -412,7 +412,7 @@ BattleText_WildPkmnIsEating: ; 0x80cba
BattleText_WildPkmnIsAngry: ; 0x80cd1
text "Wild @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
line "is angry!"
prompt
@ -480,7 +480,7 @@ BecameConfusedText: ; 0x80d97
BattleText_ItemHealedConfusion: ; ItemHealedConfusion
text "A @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " rid"
line "<TARGET>"
cont "of its confusion."
@ -497,7 +497,7 @@ BattleText_UsersHurtByStringBuffer1: ; 0x80de2
text "<USER>'s"
line "hurt by"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x80df5
@ -506,7 +506,7 @@ BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5
text "<USER>"
line "was released from"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x80e11
@ -560,7 +560,7 @@ HungOnText: ; 0x80e99
text "<TARGET>"
line "hung on with"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x80eb0
@ -588,49 +588,49 @@ InfatuationText: ; 0x80eda
DisabledMoveText: ; 0x80f02
text "<USER>'s"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " is"
cont "DISABLED!"
prompt
; 0x80f19
LoafingAroundText: ; 0x80f19
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text " is"
line "loafing around."
prompt
; 0x80f31
BeganToNapText: ; 0x80f31
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text " began"
line "to nap!"
prompt
; 0x80f44
WontObeyText: ; 0x80f44
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text " won't"
line "obey!"
prompt
; 0x80f54
TurnedAwayText: ; 0x80f54
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text " turned"
line "away!"
prompt
; 0x80f66
IgnoredOrdersText: ; 0x80f66
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text " ignored"
line "orders!"
prompt
; 0x80f7b
IgnoredSleepingText: ; 0x80f7b
text_from_ram BattleMonNick
text_from_ram wBattleMonNick
text " ignored"
line "orders…sleeping!"
prompt
@ -646,7 +646,7 @@ HasNoPPLeftText: ; 0x80fba
text "<USER>"
line "has no PP left for"
cont "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "!"
prompt
; 0x80fd7
@ -758,7 +758,7 @@ SketchedText: ; 0x81143
text "<USER>"
line "SKETCHED"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x81156
@ -773,7 +773,7 @@ DestinyBondEffectText: ; 0x81156
SpiteEffectText: ; 0x8117f
text "<TARGET>'s"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " was"
cont "reduced by @"
deciram wd265, 1, 1
@ -850,7 +850,7 @@ WasFrozenText: ; 0x8125d
WontRiseAnymoreText: ; 0x81272
text "<USER>'s"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " won't"
cont "rise anymore!"
prompt
@ -859,7 +859,7 @@ WontRiseAnymoreText: ; 0x81272
WontDropAnymoreText: ; 0x8128f
text "<TARGET>'s"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " won't"
cont "drop anymore!"
prompt
@ -885,14 +885,14 @@ BlownAwayText: ; 0x812d2
PlayerHitTimesText: ; 0x812e5
text "Hit @"
deciram PlayerDamageTaken, 1, 1
deciram wPlayerDamageTaken, 1, 1
text " times!"
prompt
; 0x812f8
EnemyHitTimesText: ; 0x812f8
text "Hit @"
deciram EnemyDamageTaken, 1, 1
deciram wEnemyDamageTaken, 1, 1
text " times!"
prompt
; 0x8130b
@ -957,7 +957,7 @@ LearnedMoveText: ; 0x813e6
text "<USER>"
line "learned"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x813f8
@ -977,7 +977,7 @@ EvadedText: ; 0x81407
WasDisabledText: ; 0x8141d
text "<TARGET>'s"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " was"
cont "DISABLED!"
prompt
@ -993,7 +993,7 @@ TransformedTypeText: ; 0x81452
text "<USER>"
line "transformed into"
cont "the @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "-type!"
prompt
; 0x81476
@ -1008,7 +1008,7 @@ TransformedText: ; 0x81499
text "<USER>"
line "TRANSFORMED into"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x814b4
@ -1088,7 +1088,7 @@ ProtectedByText: ; 0x815a9
text "<TARGET>'s"
line "protected by"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
prompt
; 0x815c1
@ -1102,7 +1102,7 @@ MirrorMoveFailedText: ; 0x815c1
StoleText: ; 0x815da
text "<USER>"
line "stole @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
cont "from its foe!"
prompt
@ -1260,7 +1260,7 @@ ForesawAttackText: ; 0x81817
; 0x8182d
BeatUpAttackText: ; 0x8182d
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "'s"
line "attack!"
done

View File

@ -6,14 +6,14 @@ _FruitBearingTreeText::
_HeyItsFruitText::
text "Hey! It's"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "!"
done
_ObtainedFruitText::
text "Obtained"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "!"
done
@ -38,7 +38,7 @@ UnknownText_0x1bc089::
done
UnknownText_0x1bc0a2::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
line "recovered @"
deciram wd1f3, 2, 3
@ -46,59 +46,59 @@ UnknownText_0x1bc0a2::
done
UnknownText_0x1bc0bb::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "'s"
line "cured of poison."
done
UnknownText_0x1bc0d2::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "'s"
line "rid of paralysis."
done
UnknownText_0x1bc0ea::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "'s"
line "burn was healed."
done
UnknownText_0x1bc101::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
line "was defrosted."
done
UnknownText_0x1bc115::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
line "woke up."
done
UnknownText_0x1bc123::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "'s"
line "health returned."
done
UnknownText_0x1bc13a::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
line "is revitalized."
done
UnknownText_0x1bc14f::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " grew to"
line "level @"
deciram CurPartyLevel, 1, 3
deciram wCurPartyLevel, 1, 3
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
db "@@"
UnknownText_0x1bc16e::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " came"
line "to its senses."
done
@ -276,7 +276,7 @@ UnknownText_0x1bc4b2::
UnknownText_0x1bc4d7::
text "Put away the"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "."
prompt
@ -288,19 +288,19 @@ UnknownText_0x1bc4ec::
UnknownText_0x1bc509::
text "Set up the"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "."
prompt
UnknownText_0x1bc51c::
text "Put away the"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text_start
para "and set up the"
line "@"
text_from_ram StringBuffer4
text_from_ram wStringBuffer4
text "."
prompt
@ -331,7 +331,7 @@ UnknownText_0x1bc5b3::
UnknownText_0x1bc5d7::
text "It's an adorable"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "."
done
@ -517,14 +517,14 @@ _OPT_OakText2::
_OPT_OakText3::
text_start
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "."
done
_OPT_MaryText1::
text_start
line "MARY: @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "'s"
done
@ -695,7 +695,7 @@ _OPT_PokemonChannelText::
_PokedexShowText::
text_start
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
db "@@"
; Pokémon Music Channel / Pokémusic
@ -793,7 +793,7 @@ _LC_Text8::
text_start
line "Number is @"
interpret_data
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
done
@ -842,9 +842,9 @@ _PnP_Text3::
_PnP_Text4::
text_start
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
db "@@"
_PnP_cute::
@ -930,7 +930,7 @@ _PnP_odd::
_PnP_Text5::
text_start
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
db "@@"
_RocketRadioText1::
@ -1009,7 +1009,7 @@ _BuenaRadioText3::
_BuenaRadioText4::
text_start
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
done
@ -1085,7 +1085,7 @@ Text_EnemyWithdrew::
text "<ENEMY>"
line "withdrew"
cont "@"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text "!"
prompt
@ -1095,7 +1095,7 @@ Text_EnemyUsedOn::
text_from_ram wMonOrItemNameBuffer
text_start
cont "on @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text "!"
prompt
@ -1111,7 +1111,7 @@ Text_ThatItemCantBePutInThePack::
Text_TheItemWasPutInThePack::
text "The @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
line "was put in the"
cont "PACK."
@ -1138,7 +1138,7 @@ UnknownText_0x1bd05e::
UnknownText_0x1bd07f::
text "Will you play with"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "?"
done
@ -1173,7 +1173,7 @@ UnknownText_0x1bd11c::
UnknownText_0x1bd131::
text "Test event"
line "@"
deciram StringBuffer2, 1, 2
deciram wStringBuffer2, 1, 2
text "?"
done
@ -1205,7 +1205,7 @@ UnknownText_0x1bd188::
UnknownText_0x1bd19a::
text "A new CARD arrived"
line "from @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
done
@ -1215,10 +1215,10 @@ UnknownText_0x1bd1ba::
done
UnknownText_0x1bd1dd::
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "'s CARD was"
line "listed as no.@"
deciram StringBuffer1, 1, 2
deciram wStringBuffer1, 1, 2
text "."
prompt
@ -1251,10 +1251,10 @@ UnknownText_0x1bd266::
UnknownText_0x1bd286::
text "Trading @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text_start
line "for @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "…"
done
@ -1286,7 +1286,7 @@ UnknownText_0x1bd308::
UnknownText_0x1bd321::
text "<PLAYER> found"
line "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "!"
done
@ -1298,10 +1298,10 @@ UnknownText_0x1bd331::
UnknownText_0x1bd34b::
text "I just saw some"
line "rare @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " in"
cont "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
para "I'll call you if I"
@ -1315,10 +1315,10 @@ UnknownText_0x1bd39e::
done
UnknownText_0x1bd3be::
text_from_ram PlayerName
text_from_ram wPlayerName
text " received"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!@"
sound_item
text_waitbutton
@ -1344,7 +1344,7 @@ UnknownText_0x1bd429::
text_from_ram wMonOrItemNameBuffer
text " for"
cont "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text ".@@"
UnknownText_0x1bd445::
@ -1356,12 +1356,12 @@ UnknownText_0x1bd449::
text "I collect #MON."
line "Do you have"
cont "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "?"
done
@ -1373,7 +1373,7 @@ UnknownText_0x1bd48c::
UnknownText_0x1bd4aa::
text "Huh? That's not"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text ". "
cont "What a letdown…"
done
@ -1381,7 +1381,7 @@ UnknownText_0x1bd4aa::
UnknownText_0x1bd4d2::
text "Yay! I got myself"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
cont "Thanks!"
done
@ -1389,7 +1389,7 @@ UnknownText_0x1bd4d2::
UnknownText_0x1bd4f4::
text "Hi, how's my old"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " doing?"
done
@ -1399,12 +1399,12 @@ UnknownText_0x1bd512::
para "If you have"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text ", would"
para "you trade it for"
line "my @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "?"
done
@ -1419,7 +1419,7 @@ UnknownText_0x1bd565::
UnknownText_0x1bd5a1::
text "You don't have"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "? That's"
cont "too bad, then."
done
@ -1429,7 +1429,7 @@ UnknownText_0x1bd5cc::
para "I finally got"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "."
done
@ -1448,12 +1448,12 @@ UnknownText_0x1bd621::
para "it. Do you have"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "?"
para "Want to trade it"
line "for my @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "?"
done
@ -1465,7 +1465,7 @@ UnknownText_0x1bd673::
UnknownText_0x1bd696::
text "That's not"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "."
para "Please trade with"
@ -1483,7 +1483,7 @@ UnknownText_0x1bd6cd::
UnknownText_0x1bd6f5::
text "How is that"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " I"
cont "traded you doing?"
@ -1709,7 +1709,7 @@ UnknownText_0x1bdcff::
UnknownText_0x1bdd30::
text "OK. I'll raise"
line "your @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "."
prompt
@ -1722,25 +1722,25 @@ UnknownText_0x1bdd64::
text "Are we geniuses or"
line "what? Want to see"
cont "your @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "?"
done
UnknownText_0x1bdd96::
text "Your @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
line "has grown a lot."
para "By level, it's"
line "grown by @"
deciram StringBuffer2 + 1, 1, 3
deciram wStringBuffer2 + 1, 1, 3
text "."
para "If you want your"
line "#MON back, it"
cont "will cost ¥@"
deciram StringBuffer2 + 2, 3, 4
deciram wStringBuffer2 + 2, 3, 4
text "."
done
@ -1752,14 +1752,14 @@ UnknownText_0x1bde04::
UnknownText_0x1bde1f::
text "<PLAYER> got back"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "."
prompt
UnknownText_0x1bde32::
text "Huh? Back already?"
line "Your @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text_start
para "needs a little"
line "more time with us."

File diff suppressed because it is too large Load Diff

View File

@ -65,7 +65,7 @@ UnknownText_0x1c41b1::
UnknownText_0x1c41e6::
text "Your friend's"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " appears"
cont "to be abnormal!"
prompt
@ -75,7 +75,7 @@ UnknownText_0x1c4212::
text_from_ram wd004
text_start
line "for @"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "?"
done
@ -124,7 +124,7 @@ UnknownText_0x1c4298::
UnknownText_0x1c439c::
text "Today's remaining"
line "time is @"
deciram StringBuffer2, 1, 2
deciram wStringBuffer2, 1, 2
text " min."
para "Would you like to"
@ -133,7 +133,7 @@ UnknownText_0x1c439c::
UnknownText_0x1c43dc::
text "There are only @"
deciram StringBuffer2, 1, 2
deciram wStringBuffer2, 1, 2
text_start
line "min. left today."
@ -180,7 +180,7 @@ UnknownText_0x1c4508::
UnknownText_0x1c4525::
text "Today's remaining"
line "time is @"
deciram StringBuffer2, 1, 2
deciram wStringBuffer2, 1, 2
text " min."
done
@ -257,23 +257,23 @@ UnknownText_0x1c4706::
UnknownText_0x1c4719::
text "<PLAYER> received"
line "@"
text_from_ram StringBuffer4
text_from_ram wStringBuffer4
text "."
done
UnknownText_0x1c472c::
text "<PLAYER> put the"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " in"
cont "the @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text "."
prompt
UnknownText_0x1c474b::
text "The @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text_start
line "is full…"
prompt
@ -447,7 +447,7 @@ UnknownText_0x1c4ae5::
UnknownText_0x1c4b92::
text "Congratulations!"
line "Your @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
db "@@"
UnknownText_0x1c4baf::
@ -455,20 +455,20 @@ UnknownText_0x1c4baf::
para "evolved into"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "!"
done
UnknownText_0x1c4bc5::
text "Huh? @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text_start
line "stopped evolving!"
prompt
UnknownText_0x1c4be3::
text "What? @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text_start
line "is evolving!"
done
@ -480,7 +480,7 @@ UnknownText_0x1c4bfd::
UnknownText_0x1c4c08::
deciram wItemQuantityChangeBuffer, 1, 2
text " @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "(S)"
line "will be ¥@"
deciram hMoneyTemp, 3, 6
@ -509,7 +509,7 @@ UnknownText_0x1c4ca3::
UnknownText_0x1c4cae::
deciram wItemQuantityChangeBuffer, 1, 2
text " @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "(S)"
line "will be ¥@"
deciram hMoneyTemp, 3, 6
@ -548,7 +548,7 @@ UnknownText_0x1c4d47::
done
UnknownText_0x1c4db0::
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " costs"
line "¥@"
deciram hMoneyTemp, 3, 6
@ -592,7 +592,7 @@ UnknownText_0x1c4e7e::
UnknownText_0x1c4e89::
deciram wItemQuantityChangeBuffer, 1, 2
text " @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "(S)"
line "will cost ¥@"
deciram hMoneyTemp, 3, 6
@ -675,7 +675,7 @@ UnknownText_0x1c502e::
deciram hMoneyTemp, 3, 6
text " for"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "(S)."
done
@ -705,7 +705,7 @@ UnknownText_0x1c5092::
UnknownText_0x1c509f::
text "lined up!"
line "Won @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " coins!"
done
@ -935,7 +935,7 @@ UnknownText_0x1c5660::
text_from_ram wMonOrItemNameBuffer
text " learned"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "!@"
sound_dex_fanfare_50_79
text_waitbutton
@ -949,7 +949,7 @@ UnknownText_0x1c5678::
UnknownText_0x1c5699::
text "Stop learning"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "?"
done
@ -958,7 +958,7 @@ UnknownText_0x1c56af::
text_start
line "did not learn"
cont "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
prompt
@ -967,7 +967,7 @@ UnknownText_0x1c56c9::
text " is"
line "trying to learn"
cont "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
para "But @"
@ -979,7 +979,7 @@ UnknownText_0x1c56c9::
para "Delete an older"
line "move to make room"
cont "for @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "?"
done
@ -997,7 +997,7 @@ UnknownText_0x1c574e::
text_from_ram wMonOrItemNameBuffer
text " forgot"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "."
para "And…"
@ -1077,7 +1077,7 @@ UnknownText_0x1c589f::
done
UnknownText_0x1c58bc::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "?"
line "Is that right?"
done
@ -1148,7 +1148,7 @@ Text_OnlyThreePkmnMayBeEntered::
Text_ThePkmnMustAllBeDifferentKinds::
text "The @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " #MON"
line "must all be"
cont "different kinds."
@ -1158,7 +1158,7 @@ Text_ThePkmnMustAllBeDifferentKinds::
Text_ThePkmnMustNotHoldTheSameItems::
text "The @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " #MON"
line "must not hold the"
cont "same items."
@ -1208,7 +1208,7 @@ UnknownText_0x1c5afa::
UnknownText_0x1c5b17::
text "Gotcha! @"
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text_start
line "was caught!@"
sound_caught_mon
@ -1225,7 +1225,7 @@ UnknownText_0x1c5b38::
prompt
UnknownText_0x1c5b53::
text_from_ram EnemyMonNick
text_from_ram wEnemyMonNick
text "'s data"
line "was newly added to"
cont "the #DEX.@"
@ -1236,15 +1236,15 @@ UnknownText_0x1c5b53::
UnknownText_0x1c5b7f::
text "Give a nickname to"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "?"
done
UnknownText_0x1c5b9a::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "'s"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text " rose."
prompt
@ -1302,13 +1302,13 @@ Text_RestoreThePPOfWhichMove::
done
Text_PPIsMaxedOut::
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "'s PP"
line "is maxed out."
prompt
Text_PPsIncreased::
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "'s PP"
line "increased."
prompt
@ -1324,7 +1324,7 @@ UnknownText_0x1c5d03::
text_start
para "@"
text_from_ram PlayerName
text_from_ram wPlayerName
text " sent the"
line "trophy home."
prompt
@ -1371,7 +1371,7 @@ UnknownText_0x1c5e01::
UnknownText_0x1c5e1d::
text "Can't get on your"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " now."
prompt
@ -1384,14 +1384,14 @@ UnknownText_0x1c5e3a::
UnknownText_0x1c5e68::
text "<PLAYER> used the@"
text_low
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
done
UnknownText_0x1c5e7b::
text "<PLAYER> got on the@"
text_low
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
prompt
@ -1399,15 +1399,15 @@ UnknownText_0x1c5e90::
text "<PLAYER> got off@"
text_low
text "the @"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
prompt
UnknownText_0x1c5ea8::
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text " knows"
line "@"
text_from_ram StringBuffer2
text_from_ram wStringBuffer2
text "."
prompt
@ -1419,7 +1419,7 @@ UnknownText_0x1c5eba::
UnknownText_0x1c5eda::
text "Oh, make it forget"
line "@"
text_from_ram StringBuffer1
text_from_ram wStringBuffer1
text "?"
done

View File

@ -1,15 +1,15 @@
DefaultOptions: ; 14f7c
; Options: med text speed
; wOptions: med text speed
db TEXT_DELAY_MED
; wSaveFileExists: no
db $00
; TextBoxFrame: frame 1
; wTextBoxFrame: frame 1
db FRAME_1
; TextBoxFlags: use text speed
; wTextBoxFlags: use text speed
db 1 << FAST_TEXT_DELAY_F
; GBPrinter: normal brightness
; wGBPrinter: normal brightness
db GBPRINTER_NORMAL
; Options2: menu account on
; wOptions2: menu account on
db 1 << MENU_ACCOUNT
db $00

View File

@ -24,12 +24,12 @@ if "\1" == "north"
;\7: this map id
map \2
dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5
dw OverworldMap + \4 + 3
dw wOverworldMap + \4 + 3
db \6
db \2_WIDTH
db \2_HEIGHT * 2 - 1
db (\4 - \5) * -2
dw OverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
dw wOverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1
endc
if "\1" == "south"
@ -41,12 +41,12 @@ if "\1" == "south"
;\7: this map id
map \2
dw \3_Blocks + \5
dw OverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
dw wOverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3
db \6
db \2_WIDTH
db 0
db (\4 - \5) * -2
dw OverworldMap + \2_WIDTH + 7
dw wOverworldMap + \2_WIDTH + 7
endc
if "\1" == "west"
@ -58,12 +58,12 @@ if "\1" == "west"
;\7: this map id
map \2
dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3
dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3)
dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3)
db \6
db \2_WIDTH
db (\4 - \5) * -2
db \2_WIDTH * 2 - 1
dw OverworldMap + \2_WIDTH * 2 + 6
dw wOverworldMap + \2_WIDTH * 2 + 6
endc
if "\1" == "east"
@ -75,12 +75,12 @@ if "\1" == "east"
;\7: this map id
map \2
dw \3_Blocks + (\2_WIDTH * \5)
dw OverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3
db \6
db \2_WIDTH
db (\4 - \5) * -2
db 0
dw OverworldMap + \2_WIDTH + 7
dw wOverworldMap + \2_WIDTH + 7
endc
ENDM

View File

@ -44,7 +44,7 @@ BillPhoneNotFullText: ; 0x1b452a
para "<PLAY_G>, your BOX"
line "has room for @"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text_start
cont "more #MON."
@ -59,7 +59,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
para "<PLAY_G>, your BOX"
line "has room for only"
cont "@"
text_from_ram StringBuffer3
text_from_ram wStringBuffer3
text " more #MON."
para "Maybe you should"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -12,7 +12,7 @@ GavenAskNumber1Text:
line "again when I heal"
para "@"
text_from_ram StringBuffer4
text_from_ram wStringBuffer4
text " and the"
line "rest of my team."
done
@ -25,7 +25,7 @@ GavenAskNumber2Text:
line "again when I heal"
para "@"
text_from_ram StringBuffer4
text_from_ram wStringBuffer4
text " and the"
line "rest of my team."
done

Some files were not shown because too many files have changed in this diff Show More