pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
This commit is contained in:
Rangi 2018-02-03 18:21:53 -05:00
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

680
audio/engine.asm
View File

File diff suppressed because it is too large Load Diff

10
charmap.asm
View File

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

8
constants/audio_constants.asm
View File

@ -66,23 +66,23 @@ NUM_CHANNELS EQU const_value
const NOTE_REST ; 5 const NOTE_REST ; 5
const NOTE_VIBRATO_OVERRIDE ; 6 const NOTE_VIBRATO_OVERRIDE ; 6
; Volume: ; wVolume
VOLUME_SO1_F EQU 3 VOLUME_SO1_F EQU 3
VOLUME_SO2_F EQU 7 VOLUME_SO2_F EQU 7
VOLUME_SO1_LEVEL EQU %00000111 VOLUME_SO1_LEVEL EQU %00000111
VOLUME_SO2_LEVEL EQU %01110000 VOLUME_SO2_LEVEL EQU %01110000
MAX_VOLUME EQU $77 MAX_VOLUME EQU $77
; SoundInput: ; wSoundInput
SOUND_INPUT_CH1_F EQU 0 SOUND_INPUT_CH1_F EQU 0
SOUND_INPUT_CH2_F EQU 1 SOUND_INPUT_CH2_F EQU 1
SOUND_INPUT_CH3_F EQU 2 SOUND_INPUT_CH3_F EQU 2
SOUND_INPUT_CH4_F EQU 3 SOUND_INPUT_CH4_F EQU 3
SOUND_INPUT_GLOBAL_F EQU 7 SOUND_INPUT_GLOBAL_F EQU 7
; Danger: ; wLowHealthAlarm
DANGER_PITCH_F EQU 4 DANGER_PITCH_F EQU 4
DANGER_ON_F EQU 7 DANGER_ON_F EQU 7
; MusicFade: ; wMusicFade
MUSIC_FADE_IN_F EQU 7 MUSIC_FADE_IN_F EQU 7

20
constants/battle_constants.asm
View File

@ -27,7 +27,7 @@ EFFECTIVE EQU 10
NOT_VERY_EFFECTIVE EQU 05 NOT_VERY_EFFECTIVE EQU 05
NO_EFFECT EQU 00 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) ; GetStatName arguments (see data/battle/stat_names.asm)
const_def const_def
const ATTACK const ATTACK
@ -53,7 +53,7 @@ MOVE_LENGTH EQU const_value
; stat constants ; stat constants
; indexes for: ; indexes for:
; - PlayerStats and EnemyStats (see wram.asm) ; - wPlayerStats and wEnemyStats (see wram.asm)
; - party_struct and battle_struct members (see macros/wram.asm) ; - party_struct and battle_struct members (see macros/wram.asm)
const_def 1 const_def 1
const STAT_HP const STAT_HP
@ -80,7 +80,7 @@ SPDSPCDV_SHINY EQU $AA
const WILD_BATTLE const WILD_BATTLE
const TRAINER_BATTLE const TRAINER_BATTLE
; battle types (BattleType values) ; battle types (wBattleType values)
const_def const_def
const BATTLETYPE_NORMAL const BATTLETYPE_NORMAL
const BATTLETYPE_CANLOSE const BATTLETYPE_CANLOSE
@ -159,7 +159,7 @@ SLP EQU %111 ; 0-7 turns
ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP 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_start 7, -1
enum SUBSTATUS_IN_LOVE enum SUBSTATUS_IN_LOVE
enum SUBSTATUS_ROLLOUT enum SUBSTATUS_ROLLOUT
@ -170,10 +170,10 @@ ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
enum SUBSTATUS_CURSE enum SUBSTATUS_CURSE
enum SUBSTATUS_NIGHTMARE enum SUBSTATUS_NIGHTMARE
; PlayerSubStatus2 or EnemySubStatus2 bit flags ; wPlayerSubStatus2 or wEnemySubStatus2 bit flags
SUBSTATUS_CURLED EQU 0 SUBSTATUS_CURLED EQU 0
; PlayerSubStatus3 or EnemySubStatus3 bit flags ; wPlayerSubStatus3 or wEnemySubStatus3 bit flags
enum_start 7, -1 enum_start 7, -1
enum SUBSTATUS_CONFUSED enum SUBSTATUS_CONFUSED
enum SUBSTATUS_FLYING enum SUBSTATUS_FLYING
@ -184,7 +184,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_RAMPAGE enum SUBSTATUS_RAMPAGE
enum SUBSTATUS_BIDE enum SUBSTATUS_BIDE
; PlayerSubStatus4 or EnemySubStatus4 bit flags ; wPlayerSubStatus4 or wEnemySubStatus4 bit flags
enum_start 7, -1 enum_start 7, -1
enum SUBSTATUS_LEECH_SEED enum SUBSTATUS_LEECH_SEED
enum SUBSTATUS_RAGE enum SUBSTATUS_RAGE
@ -195,7 +195,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_MIST enum SUBSTATUS_MIST
enum SUBSTATUS_X_ACCURACY enum SUBSTATUS_X_ACCURACY
; PlayerSubStatus5 or EnemySubStatus5 bit flags ; wPlayerSubStatus5 or wEnemySubStatus5 bit flags
enum_start 7, -1 enum_start 7, -1
enum SUBSTATUS_CANT_RUN enum SUBSTATUS_CANT_RUN
enum SUBSTATUS_DESTINY_BOND enum SUBSTATUS_DESTINY_BOND
@ -206,7 +206,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_UNKNOWN_3 enum SUBSTATUS_UNKNOWN_3
enum SUBSTATUS_TOXIC enum SUBSTATUS_TOXIC
; PlayerScreens or EnemyScreens bit flags ; wPlayerScreens or wEnemyScreens bit flags
enum_start 4, -1 enum_start 4, -1
enum SCREENS_REFLECT enum SCREENS_REFLECT
enum SCREENS_LIGHT_SCREEN enum SCREENS_LIGHT_SCREEN
@ -214,7 +214,7 @@ SUBSTATUS_CURLED EQU 0
enum SCREENS_UNUSED enum SCREENS_UNUSED
enum SCREENS_SPIKES enum SCREENS_SPIKES
; Weather values ; values in wBattleWeather
const_def const_def
const WEATHER_NONE const WEATHER_NONE
const WEATHER_RAIN const WEATHER_RAIN

2
constants/event_flags.asm
View File

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

2
constants/gfx_constants.asm
View File

@ -38,7 +38,7 @@ HP_RED EQU 2
const SPRITEOAMSTRUCT_TILE_ID ; 2 const SPRITEOAMSTRUCT_TILE_ID ; 2
const SPRITEOAMSTRUCT_ATTRIBUTES ; 3 const SPRITEOAMSTRUCT_ATTRIBUTES ; 3
SPRITEOAMSTRUCT_LENGTH EQU const_value SPRITEOAMSTRUCT_LENGTH EQU const_value
NUM_SPRITE_OAM_STRUCTS EQU 40 ; see Sprites NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM
; PokeAnims indexes (see engine/pic_animation.asm) ; PokeAnims indexes (see engine/pic_animation.asm)

2
constants/map_data_constants.asm
View File

@ -59,7 +59,7 @@ MAP_NONE EQU 0
const SOUTH_F const SOUTH_F
const NORTH_F const NORTH_F
; MapConnections ; wMapConnections
const_def const_def
shift_const EAST shift_const EAST
shift_const WEST shift_const WEST

2
constants/map_object_constants.asm
View File

@ -35,7 +35,7 @@
const OBJECT_RANGE ; 20 const OBJECT_RANGE ; 20
; 21-27 are not used ; 21-27 are not used
OBJECT_STRUCT_LENGTH EQU 40 OBJECT_STRUCT_LENGTH EQU 40
NUM_OBJECT_STRUCTS EQU 13 ; see ObjectStructs NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
; object_struct OBJECT_FACING values ; object_struct OBJECT_FACING values
OW_DOWN EQU DOWN << 2 OW_DOWN EQU DOWN << 2

116
constants/pokemon_data_constants.asm
View File

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

6
constants/script_constants.asm
View File

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

2
constants/sprite_constants.asm
View File

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

33
constants/wram_constants.asm
View File

@ -1,4 +1,4 @@
; InputType:: ; c2c7 ; wInputType:: ; c2c7
AUTO_INPUT EQU $ff AUTO_INPUT EQU $ff
; wCurrentDexMode:: ; c7d4 ; wCurrentDexMode:: ; c7d4
@ -8,7 +8,7 @@ AUTO_INPUT EQU $ff
const DEXMODE_ABC const DEXMODE_ABC
const DEXMODE_UNOWN const DEXMODE_UNOWN
; MonType:: ; cf5f ; wMonType:: ; cf5f
const_def const_def
const PARTYMON ; 0 const PARTYMON ; 0
const OTPARTYMON ; 1 const OTPARTYMON ; 1
@ -20,18 +20,19 @@ AUTO_INPUT EQU $ff
GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
GAMETIMERPAUSE_MOBILE_7_F EQU 7 GAMETIMERPAUSE_MOBILE_7_F EQU 7
; Options:: ; cfcc ; wOptions:: (bits 4-7) ; cfcc
const_def 4 const_def 4
const NO_TEXT_SCROLL ; 4 const NO_TEXT_SCROLL ; 4
const STEREO ; 5 const STEREO ; 5
const BATTLE_SHIFT ; 6 const BATTLE_SHIFT ; 6
const BATTLE_SCENE ; 7 const BATTLE_SCENE ; 7
; wOptions:: (bits 0-2) ; cfcc
TEXT_DELAY_FAST EQU 1 TEXT_DELAY_FAST EQU 1
TEXT_DELAY_MED EQU 3 TEXT_DELAY_MED EQU 3
TEXT_DELAY_SLOW EQU 5 TEXT_DELAY_SLOW EQU 5
; TextBoxFrame:: ; cfce ; wTextBoxFrame:: ; cfce
const_def const_def
const FRAME_1 ; 0 const FRAME_1 ; 0
const FRAME_2 ; 1 const FRAME_2 ; 1
@ -43,23 +44,23 @@ TEXT_DELAY_SLOW EQU 5
const FRAME_8 ; 7 const FRAME_8 ; 7
NUM_FRAMES EQU const_value NUM_FRAMES EQU const_value
; TextBoxFlags:: ; cfcf ; wTextBoxFlags:: ; cfcf
const_def const_def
const FAST_TEXT_DELAY_F ; 0 const FAST_TEXT_DELAY_F ; 0
const NO_TEXT_DELAY_F ; 1 const NO_TEXT_DELAY_F ; 1
; GBPrinter:: ; cfd0 ; wGBPrinter:: ; cfd0
GBPRINTER_LIGHTEST EQU $00 GBPRINTER_LIGHTEST EQU $00
GBPRINTER_LIGHTER EQU $20 GBPRINTER_LIGHTER EQU $20
GBPRINTER_NORMAL EQU $40 GBPRINTER_NORMAL EQU $40
GBPRINTER_DARKER EQU $60 GBPRINTER_DARKER EQU $60
GBPRINTER_DARKEST EQU $7f GBPRINTER_DARKEST EQU $7f
; Options2:: ; cfd1 ; wOptions2:: ; cfd1
const_def const_def
const MENU_ACCOUNT ; 0 const MENU_ACCOUNT ; 0
; WalkingDirection:: ; d043 ; wWalkingDirection:: ; d043
const_def -1 const_def -1
const STANDING ; -1 const STANDING ; -1
const DOWN ; 0 const DOWN ; 0
@ -73,7 +74,7 @@ UP_MASK EQU 1 << UP
LEFT_MASK EQU 1 << LEFT LEFT_MASK EQU 1 << LEFT
RIGHT_MASK EQU 1 << RIGHT RIGHT_MASK EQU 1 << RIGHT
; FacingDirection:: ; d044 ; wFacingDirection:: ; d044
FACE_CURRENT EQU 0 FACE_CURRENT EQU 0
FACE_DOWN EQU 8 FACE_DOWN EQU 8
FACE_UP EQU 4 FACE_UP EQU 4
@ -93,7 +94,7 @@ INIT_OTHER_ITEM_LIST EQU 3
INIT_PLAYEROT_LIST EQU 4 INIT_PLAYEROT_LIST EQU 4
INIT_MON_LIST EQU 5 INIT_MON_LIST EQU 5
; TimeOfDay:: ; d269 ; wTimeOfDay:: ; d269
const_def const_def
const MORN_F ; 0 const MORN_F ; 0
const DAY_F ; 1 const DAY_F ; 1
@ -118,10 +119,10 @@ PLAYERSPRITESETUP_RESET_ACTION_F EQU 7
; wPlayerGender:: ; d472 ; wPlayerGender:: ; d472
PLAYERGENDER_FEMALE_F EQU 0 PLAYERGENDER_FEMALE_F EQU 0
; ScriptFlags:: ; d434 ; wScriptFlags:: ; d434
SCRIPT_RUNNING EQU 2 SCRIPT_RUNNING EQU 2
; ScriptMode:: ; d437 ; wScriptMode:: ; d437
SCRIPT_OFF EQU 0 SCRIPT_OFF EQU 0
SCRIPT_READ EQU 1 SCRIPT_READ EQU 1
SCRIPT_WAIT_MOVEMENT EQU 2 SCRIPT_WAIT_MOVEMENT EQU 2
@ -131,7 +132,7 @@ SCRIPT_WAIT EQU 3
SPAWN_LANCE EQU 1 SPAWN_LANCE EQU 1
SPAWN_RED EQU 2 SPAWN_RED EQU 2
; CurDay:: ; d4cb ; wCurDay:: ; d4cb
const_def const_def
const SUNDAY ; 0 const SUNDAY ; 0
const MONDAY ; 1 const MONDAY ; 1
@ -141,7 +142,7 @@ SPAWN_RED EQU 2
const FRIDAY ; 5 const FRIDAY ; 5
const SATURDAY ; 6 const SATURDAY ; 6
; MapObjects:: ; d71e ; wMapObjects:: ; d71e
PLAYER_OBJECT EQU 0 PLAYER_OBJECT EQU 0
NUM_OBJECTS EQU $10 NUM_OBJECTS EQU $10
@ -209,11 +210,11 @@ NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES
POKEGEAR_OBTAINED_F EQU 7 POKEGEAR_OBTAINED_F EQU 7
; WhichRegisteredItem:: ; d95b ; wWhichRegisteredItem:: ; d95b
REGISTERED_POCKET EQU %11000000 REGISTERED_POCKET EQU %11000000
REGISTERED_NUMBER EQU %00111111 REGISTERED_NUMBER EQU %00111111
; PlayerState:: ; d95d ; wPlayerState:: ; d95d
PLAYER_NORMAL EQU 0 PLAYER_NORMAL EQU 0
PLAYER_BIKE EQU 1 PLAYER_BIKE EQU 1
PLAYER_SKATE EQU 2 PLAYER_SKATE EQU 2

10
data/default_options.asm
View File

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

16
data/maps/attributes.asm
View File

@ -26,39 +26,39 @@ connection: MACRO
if "\1" == "north" if "\1" == "north"
map_id \3 map_id \3
dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5 dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5
dw OverworldMap + \4 + 3 dw wOverworldMap + \4 + 3
db \6 db \6
db \3_WIDTH db \3_WIDTH
db \3_HEIGHT * 2 - 1 db \3_HEIGHT * 2 - 1
db (\4 - \5) * -2 db (\4 - \5) * -2
dw OverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1 dw wOverworldMap + \3_HEIGHT * (\3_WIDTH + 6) + 1
elif "\1" == "south" elif "\1" == "south"
map_id \3 map_id \3
dw \2_Blocks + \5 dw \2_Blocks + \5
dw OverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3 dw wOverworldMap + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3
db \6 db \6
db \3_WIDTH db \3_WIDTH
db 0 db 0
db (\4 - \5) * -2 db (\4 - \5) * -2
dw OverworldMap + \3_WIDTH + 7 dw wOverworldMap + \3_WIDTH + 7
elif "\1" == "west" elif "\1" == "west"
map_id \3 map_id \3
dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3 dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3
dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3) dw wOverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3)
db \6 db \6
db \3_WIDTH db \3_WIDTH
db (\4 - \5) * -2 db (\4 - \5) * -2
db \3_WIDTH * 2 - 1 db \3_WIDTH * 2 - 1
dw OverworldMap + \3_WIDTH * 2 + 6 dw wOverworldMap + \3_WIDTH * 2 + 6
elif "\1" == "east" elif "\1" == "east"
map_id \3 map_id \3
dw \2_Blocks + (\3_WIDTH * \5) dw \2_Blocks + (\3_WIDTH * \5)
dw OverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3 dw wOverworldMap + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3
db \6 db \6
db \3_WIDTH db \3_WIDTH
db (\4 - \5) * -2 db (\4 - \5) * -2
db 0 db 0
dw OverworldMap + \3_WIDTH + 7 dw wOverworldMap + \3_WIDTH + 7
endc endc
ENDM ENDM

4
data/phone/text/bill.asm
View File

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

148
data/phone/text/extra.asm
View File

@ -310,7 +310,7 @@ UnknownText_0x648dc: ; 0x648dc
ArnieLovesTheCuteText: ; 0x649dc ArnieLovesTheCuteText: ; 0x649dc
text "I'm always with my" text "I'm always with my"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
para "It's so cute!" para "It's so cute!"
@ -323,7 +323,7 @@ UnknownText_0x64a13: ; 0x64a13
line "here, I saw this" line "here, I saw this"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " for the" text " for the"
line "first time." line "first time."
@ -336,7 +336,7 @@ UnknownText_0x64a71: ; 0x64a71
text "I was wondering," text "I was wondering,"
line "do you happen to" line "do you happen to"
cont "have @" cont "have @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "?" text "?"
para "I can't seem to" para "I can't seem to"
@ -359,7 +359,7 @@ UnknownText_0x64ada: ; 0x64ada
para "I'll be here on" para "I'll be here on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x64b48 ; 0x64b48
@ -376,12 +376,12 @@ UnknownText_0x64b5f: ; 0x64b5f
para "A whole bunch of" para "A whole bunch of"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " have" text " have"
para "appeared around" para "appeared around"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
para "You have to see" para "You have to see"
@ -406,7 +406,7 @@ UnknownText_0x64c13: ; 0x64c13
para "Let's battle. I'll" para "Let's battle. I'll"
line "be waiting for you" line "be waiting for you"
cont "on @" cont "on @"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x64c5a ; 0x64c5a
@ -425,7 +425,7 @@ UnknownText_0x64c5a: ; 0x64c5a
AlanGettingStrongerText: ; 0x64cbd AlanGettingStrongerText: ; 0x64cbd
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s" text "'s"
line "getting stronger," line "getting stronger,"
@ -439,7 +439,7 @@ UnknownText_0x64cf3: ; 0x64cf3
line "knocked out a wild" line "knocked out a wild"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " just" text " just"
line "the other day." line "the other day."
@ -451,7 +451,7 @@ UnknownText_0x64cf3: ; 0x64cf3
UnknownText_0x64d4f: ; 0x64d4f UnknownText_0x64d4f: ; 0x64d4f
text "By the way, a wild" text "By the way, a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " escaped" text " escaped"
cont "on me yesterday." cont "on me yesterday."
@ -469,7 +469,7 @@ UnknownText_0x64da4: ; 0x64da4
para "I'm hanging out on" para "I'm hanging out on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "Can you come down" para "Can you come down"
@ -490,7 +490,7 @@ UnknownText_0x64e2f: ; 0x64e2f
line "Why don't you come" line "Why don't you come"
para "to @" para "to @"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text_start text_start
line "and pick it up?" line "and pick it up?"
done done
@ -512,7 +512,7 @@ UnknownText_0x64ed4: ; 0x64ed4
para "I'm waiting on" para "I'm waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x64f1a ; 0x64f1a
@ -526,14 +526,14 @@ UnknownText_0x64f1a: ; 0x64f1a
para "I'm waiting on" para "I'm waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x64f74 ; 0x64f74
UnknownText_0x64f74: ; 0x64f74 UnknownText_0x64f74: ; 0x64f74
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " is" text " is"
line "getting prettier!" line "getting prettier!"
@ -546,7 +546,7 @@ UnknownText_0x64fb2: ; 0x64fb2
text "It took only an" text "It took only an"
line "instant to KO a" line "instant to KO a"
cont "wild @" cont "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "It must be because" para "It must be because"
@ -560,7 +560,7 @@ UnknownText_0x64fb2: ; 0x64fb2
UnknownText_0x6501c: ; 0x6501c UnknownText_0x6501c: ; 0x6501c
text "You know what?" text "You know what?"
line "A wild @" line "A wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "got away from me" para "got away from me"
line "again." line "again."
@ -576,7 +576,7 @@ UnknownText_0x6501c: ; 0x6501c
UnknownText_0x65091: ; 0x65091 UnknownText_0x65091: ; 0x65091
text "Right now, I'm on" text "Right now, I'm on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "If you're close" para "If you're close"
@ -604,7 +604,7 @@ UnknownText_0x650ec: ; 0x650ec
para "it! I'm waiting on" para "it! I'm waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x65161 ; 0x65161
@ -630,7 +630,7 @@ UnknownText_0x651bf: ; 0x651bf
para "I'm waiting on" para "I'm waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x6520f ; 0x6520f
@ -646,7 +646,7 @@ UnknownText_0x6520f: ; 0x6520f
para "I'm waiting on" para "I'm waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x65271 ; 0x65271
@ -655,7 +655,7 @@ ChadObservingWildText: ; 0x65271
text "I recently began" text "I recently began"
line "observing wild" line "observing wild"
cont "@" cont "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "I've been learning" para "I've been learning"
@ -677,7 +677,7 @@ UnknownText_0x65318: ; 0x65318
line "to knock out a" line "to knock out a"
para "wild @" para "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " a" text " a"
line "while back." line "while back."
@ -694,7 +694,7 @@ UnknownText_0x65399: ; 0x65399
line "close to catching" line "close to catching"
para "a wild @" para "a wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "," text ","
line "but it got away." line "but it got away."
@ -703,7 +703,7 @@ UnknownText_0x65399: ; 0x65399
para "wanting to observe" para "wanting to observe"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text ". Rats…" text ". Rats…"
done done
; 0x65419 ; 0x65419
@ -717,7 +717,7 @@ UnknownText_0x65419: ; 0x65419
para "I'll be on" para "I'll be on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x65471 ; 0x65471
@ -906,7 +906,7 @@ UnknownText_0x65a63: ; 0x65a63
para "The place is" para "The place is"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "Hurry over--I'm" para "Hurry over--I'm"
@ -917,7 +917,7 @@ UnknownText_0x65a63: ; 0x65a63
DerekCheekPincherText: ; 0x65ab2 DerekCheekPincherText: ; 0x65ab2
text "Listen to this." text "Listen to this."
line "My @" line "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "grins happily when" para "grins happily when"
line "I pinch its cheek." line "I pinch its cheek."
@ -933,11 +933,11 @@ UnknownText_0x65b29: ; 0x65b29
text "Oh, and recently," text "Oh, and recently,"
line "my PIKACHU beat a" line "my PIKACHU beat a"
cont "wild @" cont "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
para "A wild @" para "A wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "," text ","
line "I tell you!" line "I tell you!"
@ -955,7 +955,7 @@ UnknownText_0x65b29: ; 0x65b29
UnknownText_0x65bc8: ; 0x65bc8 UnknownText_0x65bc8: ; 0x65bc8
text "Oh, and I saw a" text "Oh, and I saw a"
line "wild @" line "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " a" text " a"
cont "little while ago." cont "little while ago."
@ -1020,7 +1020,7 @@ UnknownText_0x65da6: ; 0x65da6
para "I'm waiting on" para "I'm waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "Come pick this up" para "Come pick this up"
@ -1030,7 +1030,7 @@ UnknownText_0x65da6: ; 0x65da6
TullyGrownText: ; 0x65de4 TullyGrownText: ; 0x65de4
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " has" text " has"
line "grown again." line "grown again."
@ -1045,7 +1045,7 @@ TullyGrownText: ; 0x65de4
UnknownText_0x65e42: ; 0x65e42 UnknownText_0x65e42: ; 0x65e42
text "Oh yeah, I KO'd a" text "Oh yeah, I KO'd a"
line "wild @" line "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "It was huge, like" para "It was huge, like"
@ -1060,7 +1060,7 @@ UnknownText_0x65e42: ; 0x65e42
UnknownText_0x65eac: ; 0x65eac UnknownText_0x65eac: ; 0x65eac
text "Oh yeah, I lost a" text "Oh yeah, I lost a"
line "wild @" line "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "It was huge, like" para "It was huge, like"
@ -1078,7 +1078,7 @@ UnknownText_0x65f17: ; 0x65f17
para "I'll be fishing on" para "I'll be fishing on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "Swing by if you" para "Swing by if you"
@ -1102,7 +1102,7 @@ UnknownText_0x65f88: ; 0x65f88
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x65ff2 ; 0x65ff2
@ -1126,7 +1126,7 @@ UnknownText_0x66043: ; 0x66043
para "Our battle will be" para "Our battle will be"
line "on @" line "on @"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x66087 ; 0x66087
@ -1137,7 +1137,7 @@ UnknownText_0x66087: ; 0x66087
para "Hustle over to" para "Hustle over to"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x660be ; 0x660be
@ -1162,7 +1162,7 @@ UnknownText_0x6613c: ; 0x6613c
line "down this wild" line "down this wild"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
line "It wasn't rare" line "It wasn't rare"
@ -1202,7 +1202,7 @@ UnknownText_0x66214: ; 0x66214
para "You know where--" para "You know where--"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x662a9 ; 0x662a9
@ -1318,14 +1318,14 @@ UnknownText_0x66579: ; 0x66579
para "Hurry over to" para "Hurry over to"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x665ad ; 0x665ad
UnknownText_0x665ad: ; 0x665ad UnknownText_0x665ad: ; 0x665ad
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s" text "'s"
line "adorable, don't" line "adorable, don't"
@ -1342,7 +1342,7 @@ UnknownText_0x66605: ; 0x66605
line "battle a wild" line "battle a wild"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " a while" text " a while"
line "ago…" line "ago…"
@ -1353,7 +1353,7 @@ UnknownText_0x66605: ; 0x66605
para "I hate those nasty" para "I hate those nasty"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
done done
; 0x66688 ; 0x66688
@ -1363,7 +1363,7 @@ UnknownText_0x66688: ; 0x66688
line "battle a wild" line "battle a wild"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " a while" text " a while"
line "ago…" line "ago…"
@ -1389,13 +1389,13 @@ UnknownText_0x66730: ; 0x66730
para "I'll be waiting" para "I'll be waiting"
line "with CLEFAIRY on" line "with CLEFAIRY on"
cont "@" cont "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x66796 ; 0x66796
TiffanyItsAwfulText: ; 0x66796 TiffanyItsAwfulText: ; 0x66796
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
para "It's awful." para "It's awful."
@ -1428,7 +1428,7 @@ UnknownText_0x66801: ; 0x66801
para "Come collect it on" para "Come collect it on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x66882 ; 0x66882
@ -1451,7 +1451,7 @@ UnknownText_0x668a3: ; 0x668a3
para "Please hurry to" para "Please hurry to"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x6691d ; 0x6691d
@ -1466,14 +1466,14 @@ UnknownText_0x6691d: ; 0x6691d
para "Please hurry to" para "Please hurry to"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x66980 ; 0x66980
VanceLiftoffText: ; 0x66980 VanceLiftoffText: ; 0x66980
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s" text "'s"
line "become tougher." line "become tougher."
@ -1485,7 +1485,7 @@ VanceLiftoffText: ; 0x66980
UnknownText_0x669b2: ; 0x669b2 UnknownText_0x669b2: ; 0x669b2
text "We can easily beat" text "We can easily beat"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
para "…Huh? You too?" para "…Huh? You too?"
@ -1496,7 +1496,7 @@ UnknownText_0x669b2: ; 0x669b2
UnknownText_0x669ed: ; 0x669ed UnknownText_0x669ed: ; 0x669ed
text "But get this, a" text "But get this, a"
line "wild @" line "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "just barely eluded" para "just barely eluded"
line "us." line "us."
@ -1509,7 +1509,7 @@ UnknownText_0x669ed: ; 0x669ed
UnknownText_0x66a3a: ; 0x66a3a UnknownText_0x66a3a: ; 0x66a3a
text "Right now, I'm on" text "Right now, I'm on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "You know, where I" para "You know, where I"
@ -1537,7 +1537,7 @@ VanceHurryHurryText: ; 0x66ad1
line "Hurry, hurry!" line "Hurry, hurry!"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
line "FLY over now!" line "FLY over now!"
done done
@ -1545,7 +1545,7 @@ VanceHurryHurryText: ; 0x66ad1
WiltonGrownText: ; 0x66afc WiltonGrownText: ; 0x66afc
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s" text "'s"
line "grown impressive!" line "grown impressive!"
@ -1557,7 +1557,7 @@ WiltonGrownText: ; 0x66afc
UnknownText_0x66b3e: ; 0x66b3e UnknownText_0x66b3e: ; 0x66b3e
text "We beat a wild" text "We beat a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "…" text "…"
para "You know, I have" para "You know, I have"
@ -1574,7 +1574,7 @@ UnknownText_0x66b8f: ; 0x66b8f
para "to landing a wild" para "to landing a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "I tell you, it was" para "I tell you, it was"
@ -1585,7 +1585,7 @@ UnknownText_0x66b8f: ; 0x66b8f
UnknownText_0x66bf3: ; 0x66bf3 UnknownText_0x66bf3: ; 0x66bf3
text "I'm fishing on" text "I'm fishing on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "," text ","
para "but nothing's" para "but nothing's"
@ -1608,7 +1608,7 @@ UnknownText_0x66c6b: ; 0x66c6b
para "Come pick it up on" para "Come pick it up on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x66ca7 ; 0x66ca7
@ -1631,7 +1631,7 @@ WiltonNotBitingText: ; 0x66cf7
para "like before on" para "like before on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "…" text "…"
para "You have to come" para "You have to come"
@ -1647,7 +1647,7 @@ WiltonWantThisText: ; 0x66d45
line "know where?" line "know where?"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "…" text "…"
line "Just head from" line "Just head from"
@ -1730,7 +1730,7 @@ UnknownText_0x66f52: ; 0x66f52
ParryNoMatchText: ; 0x66f9f ParryNoMatchText: ; 0x66f9f
text "Nothing can match" text "Nothing can match"
line "my @" line "my @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " now." text " now."
done done
; 0x66fc0 ; 0x66fc0
@ -1738,7 +1738,7 @@ ParryNoMatchText: ; 0x66f9f
UnknownText_0x66fc0: ; 0x66fc0 UnknownText_0x66fc0: ; 0x66fc0
text "Yeah, we KO'd a" text "Yeah, we KO'd a"
line "wild @" line "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
para "That was OK, but I" para "That was OK, but I"
@ -1751,7 +1751,7 @@ UnknownText_0x67001: ; 0x67001
line "spotted a wild" line "spotted a wild"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
line "We were debating" line "We were debating"
@ -1775,7 +1775,7 @@ UnknownText_0x67096: ; 0x67096
para "Yep! We'll meet on" para "Yep! We'll meet on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x670eb ; 0x670eb
@ -1795,7 +1795,7 @@ ParryBattleWithMeText: ; 0x67106
ParryHaventYouGottenToText: ; 0x6712a ParryHaventYouGottenToText: ; 0x6712a
text "Haven't you gotten" text "Haven't you gotten"
line "to @" line "to @"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "?" text "?"
para "Waiting here isn't" para "Waiting here isn't"
@ -1805,9 +1805,9 @@ ParryHaventYouGottenToText: ; 0x6712a
; 0x6717a ; 0x6717a
UnknownText_0x6717a: ; 0x6717a UnknownText_0x6717a: ; 0x6717a
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "'s @" text "'s @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
line "is much stronger" line "is much stronger"
cont "than before!" cont "than before!"
@ -1818,7 +1818,7 @@ UnknownText_0x671a4: ; 0x671a4
text "And, and…" text "And, and…"
line "I just battled and" line "I just battled and"
cont "beat @" cont "beat @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
para "I've raised my" para "I've raised my"
@ -1830,7 +1830,7 @@ UnknownText_0x671eb: ; 0x671eb
text "But, but…" text "But, but…"
para "A wild @" para "A wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
line "got away from me" line "got away from me"
@ -1848,7 +1848,7 @@ UnknownText_0x6722e: ; 0x6722e
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x67281 ; 0x67281
@ -1874,7 +1874,7 @@ ErinComeBattleText: ; 0x672d5
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x67308 ; 0x67308

172
data/phone/text/extra2.asm
View File

@ -21,7 +21,7 @@ UnknownText_0x174000: ; 0x174000
JackIntelligenceText: ; 0x1740c0 JackIntelligenceText: ; 0x1740c0
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s" text "'s"
line "intelligence keeps" line "intelligence keeps"
@ -35,7 +35,7 @@ JackDefeatedMonText: ; 0x174106
text "The other day, I" text "The other day, I"
line "easily defeated a" line "easily defeated a"
cont "@" cont "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "I think swapping" para "I think swapping"
@ -49,7 +49,7 @@ UnknownText_0x174165: ; 0x174165
line "I missed catching" line "I missed catching"
para "a @" para "a @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " by" text " by"
line "just a tiny bit." line "just a tiny bit."
@ -70,7 +70,7 @@ UnknownText_0x1741e1: ; 0x1741e1
para "I'll be in" para "I'll be in"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "Give me a shout if" para "Give me a shout if"
@ -226,7 +226,7 @@ UnknownText_0x174638: ; 0x174638
para "I'll be at" para "I'll be at"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x174688 ; 0x174688
@ -234,7 +234,7 @@ UnknownText_0x174638: ; 0x174638
UnknownText_0x174688: ; 0x174688 UnknownText_0x174688: ; 0x174688
text "I fancied up my" text "I fancied up my"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " and" text " and"
para "made it even cuter" para "made it even cuter"
@ -266,7 +266,7 @@ UnknownText_0x174734: ; 0x174734
line "showed it was" line "showed it was"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text ". I was" text ". I was"
line "quite miffed." line "quite miffed."
done done
@ -290,7 +290,7 @@ BeverlyFoundNuggetText: ; 0x1747cc
para "I'll be at" para "I'll be at"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "Please come see me" para "Please come see me"
@ -315,7 +315,7 @@ UnknownText_0x174895: ; 0x174895
line "hurry. Come see me" line "hurry. Come see me"
para "in @" para "in @"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text_start text_start
line "when you can." line "when you can."
done done
@ -329,7 +329,7 @@ UnknownText_0x1748ea: ; 0x1748ea
line "last time!" line "last time!"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "'s" text "'s"
line "where I'm waiting" line "where I'm waiting"
@ -361,7 +361,7 @@ UnknownText_0x1749c7: ; 0x1749c7
cont "about our battle!" cont "about our battle!"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
para "Hustle over quick!" para "Hustle over quick!"
@ -371,14 +371,14 @@ UnknownText_0x1749c7: ; 0x1749c7
GavenGreaterText: ; 0x174a24 GavenGreaterText: ; 0x174a24
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
line "might be greater" line "might be greater"
cont "than I imagined." cont "than I imagined."
para "I doubt I'll see a" para "I doubt I'll see a"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " that's" text " that's"
cont "better than mine." cont "better than mine."
done done
@ -389,13 +389,13 @@ UnknownText_0x174a80: ; 0x174a80
line "to barely defeat" line "to barely defeat"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " the" text " the"
line "other day." line "other day."
para "I've never seen a" para "I've never seen a"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " get" text " get"
cont "that strong…" cont "that strong…"
@ -412,7 +412,7 @@ UnknownText_0x174b2d: ; 0x174b2d
text "And a while back," text "And a while back,"
line "I tried to catch a" line "I tried to catch a"
cont "wild @" cont "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "But it managed to" para "But it managed to"
@ -431,7 +431,7 @@ UnknownText_0x174bc5: ; 0x174bc5
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "Give me a shout" para "Give me a shout"
@ -457,7 +457,7 @@ UnknownText_0x174c49: ; 0x174c49
para "I'll take you down" para "I'll take you down"
line "with @" line "with @"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x174c7f ; 0x174c7f
@ -465,11 +465,11 @@ UnknownText_0x174c49: ; 0x174c49
UnknownText_0x174c7f: ; 0x174c7f UnknownText_0x174c7f: ; 0x174c7f
text "Do you remember my" text "Do you remember my"
line "sweet @" line "sweet @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "?" text "?"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " runs" text " runs"
line "very fast." line "very fast."
@ -484,7 +484,7 @@ UnknownText_0x174c7f: ; 0x174c7f
UnknownText_0x174cf6: ; 0x174cf6 UnknownText_0x174cf6: ; 0x174cf6
text "Oh, have you ever" text "Oh, have you ever"
line "seen a @" line "seen a @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
cont "before?" cont "before?"
@ -505,7 +505,7 @@ UnknownText_0x174cf6: ; 0x174cf6
UnknownText_0x174d86: ; 0x174d86 UnknownText_0x174d86: ; 0x174d86
text "Oh, I just saw a" text "Oh, I just saw a"
line "wild @" line "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "I was trying to" para "I was trying to"
@ -535,7 +535,7 @@ UnknownText_0x174e4e: ; 0x174e4e
line "for you around" line "for you around"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
line "Look for me, OK?" line "Look for me, OK?"
done done
@ -560,7 +560,7 @@ BethForgetDealText: ; 0x174ee2
line "deal?" line "deal?"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "That's where I'm" para "That's where I'm"
@ -571,7 +571,7 @@ BethForgetDealText: ; 0x174ee2
JoseAromaText: ; 0x174f2f JoseAromaText: ; 0x174f2f
text "Hey listen, my" text "Hey listen, my"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s stick" text "'s stick"
para "has this really" para "has this really"
@ -586,7 +586,7 @@ UnknownText_0x174f90: ; 0x174f90
text "A while ago, my" text "A while ago, my"
line "FARFETCH'D KO'd" line "FARFETCH'D KO'd"
cont "this @" cont "this @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "You should have" para "You should have"
@ -600,7 +600,7 @@ UnknownText_0x174f90: ; 0x174f90
UnknownText_0x174ffd: ; 0x174ffd UnknownText_0x174ffd: ; 0x174ffd
text "I ran into a wild" text "I ran into a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "…" text "…"
para "I was trying to" para "I was trying to"
@ -625,7 +625,7 @@ UnknownText_0x17507d: ; 0x17507d
line "raring to go." line "raring to go."
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "'s" text "'s"
line "where I'm at." line "where I'm at."
@ -649,7 +649,7 @@ JoseFoundSomethingText: ; 0x175116
para "Catch up to me on" para "Catch up to me on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "," text ","
para "and I'll let you" para "and I'll let you"
@ -684,7 +684,7 @@ UnknownText_0x17520a: ; 0x17520a
line "stick!" line "stick!"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
para "Please come as" para "Please come as"
@ -700,7 +700,7 @@ UnknownText_0x17529c: ; 0x17529c
para "Catch up to me on" para "Catch up to me on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "," text ","
para "and I'll let you" para "and I'll let you"
@ -713,12 +713,12 @@ UnknownText_0x1752f5: ; 0x1752f5
para "Do you recall my" para "Do you recall my"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "?" text "?"
para "Yes, exactly. That" para "Yes, exactly. That"
line "lovely @" line "lovely @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "Wouldn't you agree" para "Wouldn't you agree"
@ -730,13 +730,13 @@ UnknownText_0x1752f5: ; 0x1752f5
UnknownText_0x17536b: ; 0x17536b UnknownText_0x17536b: ; 0x17536b
text "Have I ever faced" text "Have I ever faced"
line "a wild @" line "a wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "?" text "?"
para "You need to ask?" para "You need to ask?"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " I've" text " I've"
line "beaten on numerous" line "beaten on numerous"
cont "occasions!" cont "occasions!"
@ -754,7 +754,7 @@ UnknownText_0x1753c5: ; 0x1753c5
line "to catch a wild" line "to catch a wild"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "…" text "…"
line "Oh! Never mind!" line "Oh! Never mind!"
done done
@ -766,7 +766,7 @@ UnknownText_0x17543a: ; 0x17543a
para "The place shall be" para "The place shall be"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
para "Don't make me" para "Don't make me"
@ -798,7 +798,7 @@ UnknownText_0x1754e5: ; 0x1754e5
line "the place was" line "the place was"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
line "Don't try to run!" line "Don't try to run!"
done done
@ -806,7 +806,7 @@ UnknownText_0x1754e5: ; 0x1754e5
JoeySharperText: ; 0x175530 JoeySharperText: ; 0x175530
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s" text "'s"
line "looking sharper" line "looking sharper"
cont "than before!" cont "than before!"
@ -822,7 +822,7 @@ JoeySharperText: ; 0x175530
UnknownText_0x175591: ; 0x175591 UnknownText_0x175591: ; 0x175591
text "Oh yeah, I took" text "Oh yeah, I took"
line "down a @" line "down a @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "in the wild the" para "in the wild the"
line "other day." line "other day."
@ -838,7 +838,7 @@ UnknownText_0x175591: ; 0x175591
UnknownText_0x175611: ; 0x175611 UnknownText_0x175611: ; 0x175611
text "Oh yeah, I saw a" text "Oh yeah, I saw a"
line "wild @" line "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
para "I thought about" para "I thought about"
@ -860,7 +860,7 @@ UnknownText_0x175693: ; 0x175693
line "will be different!" line "will be different!"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "'s" text "'s"
line "where I'll be." line "where I'll be."
@ -877,7 +877,7 @@ UnknownText_0x17570a: ; 0x17570a
UnknownText_0x17571d: ; 0x17571d UnknownText_0x17571d: ; 0x17571d
text "I'm checking out" text "I'm checking out"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s moves" text "'s moves"
para "and devising some" para "and devising some"
@ -898,7 +898,7 @@ UnknownText_0x175786: ; 0x175786
para "I'm waiting on" para "I'm waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x1757d4 ; 0x1757d4
@ -914,7 +914,7 @@ WadeAreYouGrowingText: ; 0x1757d4
line "It's overwhelming!" line "It's overwhelming!"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "'s grow-" text "'s grow-"
line "ing especially" line "ing especially"
@ -926,7 +926,7 @@ WadeAreYouGrowingText: ; 0x1757d4
UnknownText_0x175869: ; 0x175869 UnknownText_0x175869: ; 0x175869
text "Oh yeah, we KO'd a" text "Oh yeah, we KO'd a"
line "wild @" line "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "with one hit a" para "with one hit a"
line "while back." line "while back."
@ -942,7 +942,7 @@ UnknownText_0x175869: ; 0x175869
UnknownText_0x1758e4: ; 0x1758e4 UnknownText_0x1758e4: ; 0x1758e4
text "Oh yeah, a wild" text "Oh yeah, a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " got" text " got"
para "away from me at" para "away from me at"
@ -967,7 +967,7 @@ UnknownText_0x175976: ; 0x175976
line "last time!" line "last time!"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "'s" text "'s"
line "where I'll be." line "where I'll be."
@ -1005,7 +1005,7 @@ WadeFoundBerryText: ; 0x175a60
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x175abe ; 0x175abe
@ -1027,7 +1027,7 @@ UnknownText_0x175b1e: ; 0x175b1e
line "already!" line "already!"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text " is" text " is"
line "where I am." line "where I am."
@ -1041,7 +1041,7 @@ UnknownText_0x175b6d: ; 0x175b6d
line "not here yet?" line "not here yet?"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text " is" text " is"
line "where I am." line "where I am."
@ -1055,7 +1055,7 @@ RalphNeglectingKidsText: ; 0x175bc4
line "more time with my" line "more time with my"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " than I" text " than I"
line "have with my kids." line "have with my kids."
@ -1067,7 +1067,7 @@ RalphNeglectingKidsText: ; 0x175bc4
UnknownText_0x175c24: ; 0x175c24 UnknownText_0x175c24: ; 0x175c24
text "I just beat a wild" text "I just beat a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "I told my kid, but" para "I told my kid, but"
@ -1084,7 +1084,7 @@ UnknownText_0x175c24: ; 0x175c24
UnknownText_0x175c9f: ; 0x175c9f UnknownText_0x175c9f: ; 0x175c9f
text "Yesterday a wild" text "Yesterday a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " slipped" text " slipped"
para "away from me, in" para "away from me, in"
@ -1112,7 +1112,7 @@ UnknownText_0x175d40: ; 0x175d40
line "quite agreeable." line "quite agreeable."
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text " is" text " is"
line "the spot!" line "the spot!"
done done
@ -1129,7 +1129,7 @@ UnknownText_0x175dd9: ; 0x175dd9
para "Uh, sorry! See," para "Uh, sorry! See,"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " are" text " are"
para "biting like there" para "biting like there"
@ -1137,7 +1137,7 @@ UnknownText_0x175dd9: ; 0x175dd9
para "over here on" para "over here on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
para "Aiyee! Ouch!" para "Aiyee! Ouch!"
@ -1172,7 +1172,7 @@ UnknownText_0x175f11: ; 0x175f11
para "you to show up on" para "you to show up on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "You shouldn't make" para "You shouldn't make"
@ -1198,7 +1198,7 @@ UnknownText_0x175fda: ; 0x175fda
line "hear this." line "hear this."
para "My @" para "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " is" text " is"
line "so adorable!" line "so adorable!"
@ -1212,7 +1212,7 @@ UnknownText_0x17602d: ; 0x17602d
para "We beat a wild" para "We beat a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " with" text " with"
para "just one hit a" para "just one hit a"
@ -1229,7 +1229,7 @@ UnknownText_0x176095: ; 0x176095
para "We just saw a" para "We just saw a"
line "really gorgeous" line "really gorgeous"
cont "@" cont "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "But I was on the" para "But I was on the"
@ -1252,7 +1252,7 @@ UnknownText_0x17610a: ; 0x17610a
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "Let me know when" para "Let me know when"
@ -1450,13 +1450,13 @@ UnknownText_0x176816: ; 0x176816
para "I saw a beautiful" para "I saw a beautiful"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
para "I wish I could" para "I wish I could"
line "become a beautiful" line "become a beautiful"
cont "@" cont "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " too." text " too."
done done
; 0x17686d ; 0x17686d
@ -1475,7 +1475,7 @@ UnknownText_0x1768b0: ; 0x1768b0
text "Listen, listen!" text "Listen, listen!"
para "My @" para "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "…" text "…"
line "it… so pretty…" line "it… so pretty…"
@ -1515,7 +1515,7 @@ UnknownText_0x1769da: ; 0x1769da
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x176a2f ; 0x176a2f
@ -1525,7 +1525,7 @@ AnthonyAteBerriesText: ; 0x176a2f
line "was watching my" line "was watching my"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " eat" text " eat"
line "some BERRIES." line "some BERRIES."
@ -1548,7 +1548,7 @@ UnknownText_0x176aef: ; 0x176aef
line "running across" line "running across"
para "wild @" para "wild @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
line "quite often." line "quite often."
@ -1562,7 +1562,7 @@ UnknownText_0x176b45: ; 0x176b45
line "battling this" line "battling this"
para "@" para "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " the" text " the"
line "other day…" line "other day…"
@ -1583,7 +1583,7 @@ UnknownText_0x176bee: ; 0x176bee
line "battle right now!" line "battle right now!"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text " is" text " is"
line "where I am." line "where I am."
@ -1604,20 +1604,20 @@ UnknownText_0x176c61: ; 0x176c61
para "I took a hike in" para "I took a hike in"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text_start text_start
cont "yesterday, see?" cont "yesterday, see?"
para "Well, there were" para "Well, there were"
line "tons of @" line "tons of @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "around! You have" para "around! You have"
line "to see it!" line "to see it!"
para "I get this feeling" para "I get this feeling"
line "that @" line "that @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "may be timid." para "may be timid."
line "I didn't see any" line "I didn't see any"
@ -1646,7 +1646,7 @@ UnknownText_0x176d85: ; 0x176d85
line "you?" line "you?"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
line "I'm waiting!" line "I'm waiting!"
done done
@ -1671,7 +1671,7 @@ UnknownText_0x176dd1: ; 0x176dd1
ToddLooksCuteLikeMeText: ; 0x176e5d ToddLooksCuteLikeMeText: ; 0x176e5d
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " is" text " is"
line "looking more and" line "looking more and"
@ -1685,7 +1685,7 @@ UnknownText_0x176e9c: ; 0x176e9c
para "Now we can KO" para "Now we can KO"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " easily." text " easily."
para "I should challenge" para "I should challenge"
@ -1698,7 +1698,7 @@ UnknownText_0x176eee: ; 0x176eee
line "We just failed to" line "We just failed to"
para "beat @" para "beat @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " by" text " by"
line "a tiny margin." line "a tiny margin."
@ -1722,7 +1722,7 @@ UnknownText_0x176f60: ; 0x176f60
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x176fdb ; 0x176fdb
@ -1776,7 +1776,7 @@ UnknownText_0x177138: ; 0x177138
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
done done
; 0x17717c ; 0x17717c
@ -1798,7 +1798,7 @@ UnknownText_0x17717c: ; 0x17717c
UnknownText_0x1771fd: ; 0x1771fd UnknownText_0x1771fd: ; 0x1771fd
text "My @" text "My @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " and" text " and"
line "I are getting more" line "I are getting more"
@ -1810,7 +1810,7 @@ UnknownText_0x1771fd: ; 0x1771fd
UnknownText_0x177237: ; 0x177237 UnknownText_0x177237: ; 0x177237
text "We battled a wild" text "We battled a wild"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " and" text " and"
para "managed to drop it" para "managed to drop it"
@ -1826,7 +1826,7 @@ UnknownText_0x177297: ; 0x177297
para "I still haven't" para "I still haven't"
line "caught @" line "caught @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
para "It's getting past" para "It's getting past"
@ -1841,7 +1841,7 @@ UnknownText_0x1772e2: ; 0x1772e2
para "I'll be waiting on" para "I'll be waiting on"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "." text "."
para "…Could you take it" para "…Could you take it"
@ -1880,7 +1880,7 @@ UnknownText_0x1773e7: ; 0x1773e7
line "it, won't you?" line "it, won't you?"
para "@" para "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text " is" text " is"
line "where I am." line "where I am."
done done
@ -1907,7 +1907,7 @@ UnknownText_0x1774c1: ; 0x1774c1
para "Don't forget," para "Don't forget,"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x17750e ; 0x17750e
@ -1921,7 +1921,7 @@ UnknownText_0x17750e: ; 0x17750e
para "Hurry over to" para "Hurry over to"
line "@" line "@"
text_from_ram StringBuffer5 text_from_ram wStringBuffer5
text "!" text "!"
done done
; 0x177561 ; 0x177561

4
data/phone/text/gaven_overworld.asm
View File

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

2
data/phone/text/jose_overworld.asm
View File

@ -1,6 +1,6 @@
JoseAskNumber1Text: JoseAskNumber1Text:
text "If my @" text "If my @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
line "sees anything" line "sees anything"

16
data/phone/text/mom.asm
View File

@ -8,12 +8,12 @@ MomPhoneGreetingText: ; 0x1b4000
MomPhoneLandmarkText: ; 0x1b4021 MomPhoneLandmarkText: ; 0x1b4021
text "Oh, so you're in" text "Oh, so you're in"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "…" text "…"
para "Isn't that where" para "Isn't that where"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "is? Did you go" para "is? Did you go"
line "take a look?" line "take a look?"
@ -22,7 +22,7 @@ MomPhoneLandmarkText: ; 0x1b4021
MomPhoneGenericAreaText: ; 0x1b406b MomPhoneGenericAreaText: ; 0x1b406b
text "Really, you're in" text "Really, you're in"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "?" text "?"
para "I've never gone" para "I've never gone"
@ -33,7 +33,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
MomPhoneNewBarkText: ; 0x1b40b1 MomPhoneNewBarkText: ; 0x1b40b1
text "What? You're in" text "What? You're in"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "?" text "?"
para "Come see your MOM" para "Come see your MOM"
@ -43,7 +43,7 @@ MomPhoneNewBarkText: ; 0x1b40b1
MomPhoneCherrygroveText: ; 0x1b40e4 MomPhoneCherrygroveText: ; 0x1b40e4
text "You're visiting" text "You're visiting"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "?" text "?"
para "How about coming" para "How about coming"
@ -53,7 +53,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
MomOtherAreaText: ; 0x1b411c MomOtherAreaText: ; 0x1b411c
text "Wow, you're in" text "Wow, you're in"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "?" text "?"
para "Good luck on your" para "Good luck on your"
@ -74,7 +74,7 @@ MomDeterminedText: ; 0x1b4150
MomCheckBalanceText: ; 0x1b41a7 MomCheckBalanceText: ; 0x1b41a7
text "By the way, you've" text "By the way, you've"
line "saved up ¥@" line "saved up ¥@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "." text "."
para "Do you want to" para "Do you want to"
@ -97,7 +97,7 @@ MomYoureNotSavingText: ; 0x1b420d
MomYouveSavedText: ; 0x1b4249 MomYouveSavedText: ; 0x1b4249
text "By the way, you've" text "By the way, you've"
line "saved up ¥@" line "saved up ¥@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "." text "."
para "Want to start" para "Want to start"

364
data/phone/text/trainers1.asm
View File

File diff suppressed because it is too large Load Diff

2
data/special_pointers.asm
View File

@ -1,5 +1,5 @@
; Special routines can be used with the "special" map script command. ; Special routines can be used with the "special" map script command.
; They often use ScriptVar for arguments and return values. ; They often use wScriptVar for arguments and return values.
add_special: MACRO add_special: MACRO
\1Special:: \1Special::

98
data/text/battle.asm
View File

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

124
data/text/common_1.asm
View File

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

140
data/text/common_2.asm
View File

@ -27,7 +27,7 @@ UnknownText_0x1c00a0::
UnknownText_0x1c00cd:: UnknownText_0x1c00cd::
text "Hm… @" text "Hm… @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "…" text "…"
line "That's a fairly" line "That's a fairly"
cont "decent name." cont "decent name."
@ -60,13 +60,13 @@ UnknownText_0x1c019e::
UnknownText_0x1c01be:: UnknownText_0x1c01be::
text "Hm… @" text "Hm… @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "?" text "?"
line "What a great name!" line "What a great name!"
cont "It's perfect." cont "It's perfect."
para "Treat @" para "Treat @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text_start text_start
line "with loving care." line "with loving care."
done done
@ -90,26 +90,26 @@ UnknownText_0x1c0272::
text "All right. This" text "All right. This"
line "#MON is now" line "#MON is now"
cont "named @" cont "named @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt
Text_Gained:: Text_Gained::
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " gained@@" text " gained@@"
Text_ABoostedStringBuffer2ExpPoints:: Text_ABoostedStringBuffer2ExpPoints::
text_start text_start
line "a boosted" line "a boosted"
cont "@" cont "@"
deciram StringBuffer2, 2, 4 deciram wStringBuffer2, 2, 4
text " EXP. Points!" text " EXP. Points!"
prompt prompt
Text_StringBuffer2ExpPoints:: Text_StringBuffer2ExpPoints::
text_start text_start
line "@" line "@"
deciram StringBuffer2, 2, 4 deciram wStringBuffer2, 2, 4
text " EXP. Points!" text " EXP. Points!"
prompt prompt
@ -128,12 +128,12 @@ Text_YourFoesWeakGetmPkmn::
line "Get'm, @@" line "Get'm, @@"
Text_BattleMonNick01:: Text_BattleMonNick01::
text_from_ram BattleMonNick text_from_ram wBattleMonNick
text "!" text "!"
done done
Text_BattleMonNickComma:: Text_BattleMonNickComma::
text_from_ram BattleMonNick text_from_ram wBattleMonNick
text ",@@" text ",@@"
Text_ThatsEnoughComeBack:: Text_ThatsEnoughComeBack::
@ -164,26 +164,26 @@ UnknownText_0x1c0384::
UnknownText_0x1c0396:: UnknownText_0x1c0396::
text "It contained" text "It contained"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "." text "."
para "Teach @" para "Teach @"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text_start text_start
line "to a #MON?" line "to a #MON?"
done done
UnknownText_0x1c03c2:: UnknownText_0x1c03c2::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " is" text " is"
line "not compatible" line "not compatible"
cont "with @" cont "with @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
para "It can't learn" para "It can't learn"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "." text "."
prompt prompt
@ -191,14 +191,14 @@ UnknownText_0x1c03fa::
text "You have no room" text "You have no room"
line "for any more" line "for any more"
cont "@" cont "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "S." text "S."
prompt prompt
UnknownText_0x1c0421:: UnknownText_0x1c0421::
text "You received" text "You received"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -236,7 +236,7 @@ UnknownText_0x1c04e9::
text_from_ram wMysteryGiftPartnerName text_from_ram wMysteryGiftPartnerName
text " sent" text " sent"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt
@ -244,7 +244,7 @@ UnknownText_0x1c04fa::
text_from_ram wMysteryGiftPartnerName text_from_ram wMysteryGiftPartnerName
text " sent" text " sent"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text_start text_start
cont "to @" cont "to @"
text_from_ram wMysteryGiftPlayerName text_from_ram wMysteryGiftPlayerName
@ -292,7 +292,7 @@ UnknownText_0x1c05c8::
prompt prompt
UnknownText_0x1c05dd:: UnknownText_0x1c05dd::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " used" text " used"
line "CUT!" line "CUT!"
prompt prompt
@ -309,7 +309,7 @@ UnknownText_0x1c0609::
db "@@" db "@@"
_UsedSurfText:: _UsedSurfText::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " used" text " used"
line "SURF!" line "SURF!"
done done
@ -330,7 +330,7 @@ _AskSurfText::
done done
UnknownText_0x1c068e:: UnknownText_0x1c068e::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " used" text " used"
line "WATERFALL!" line "WATERFALL!"
done done
@ -346,7 +346,7 @@ UnknownText_0x1c06bf::
done done
UnknownText_0x1c06de:: UnknownText_0x1c06de::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " used" text " used"
line "DIG!" line "DIG!"
done done
@ -379,13 +379,13 @@ UnknownText_0x1c0751::
prompt prompt
UnknownText_0x1c0774:: UnknownText_0x1c0774::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " used" text " used"
line "STRENGTH!" line "STRENGTH!"
done done
UnknownText_0x1c0788:: UnknownText_0x1c0788::
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " can" text " can"
line "move boulders." line "move boulders."
prompt prompt
@ -409,7 +409,7 @@ UnknownText_0x1c07f4::
done done
UnknownText_0x1c0816:: UnknownText_0x1c0816::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " used" text " used"
line "WHIRLPOOL!" line "WHIRLPOOL!"
prompt prompt
@ -431,7 +431,7 @@ UnknownText_0x1c0864::
done done
UnknownText_0x1c0897:: UnknownText_0x1c0897::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " did a" text " did a"
line "HEADBUTT!" line "HEADBUTT!"
prompt prompt
@ -449,7 +449,7 @@ UnknownText_0x1c08bc::
done done
UnknownText_0x1c08f0:: UnknownText_0x1c08f0::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text " used" text " used"
line "ROCK SMASH!" line "ROCK SMASH!"
prompt prompt
@ -489,14 +489,14 @@ UnknownText_0x1c099a::
UnknownText_0x1c09b2:: UnknownText_0x1c09b2::
text "<PLAYER> got on the" text "<PLAYER> got on the"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "." text "."
done done
UnknownText_0x1c09c7:: UnknownText_0x1c09c7::
text "<PLAYER> got off" text "<PLAYER> got off"
line "the @" line "the @"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "." text "."
done done
@ -515,7 +515,7 @@ UnknownText_0x1c0a05::
UnknownText_0x1c0a1c:: UnknownText_0x1c0a1c::
text "<PLAYER> found" text "<PLAYER> found"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "!" text "!"
done done
@ -545,7 +545,7 @@ UnknownText_0x1c0aa9::
prompt prompt
UnknownText_0x1c0acc:: UnknownText_0x1c0acc::
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text_start text_start
line "fainted!" line "fainted!"
prompt prompt
@ -559,7 +559,7 @@ UnknownText_0x1c0ada::
prompt prompt
UnknownText_0x1c0b03:: UnknownText_0x1c0b03::
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text " used" text " used"
line "SWEET SCENT!" line "SWEET SCENT!"
done done
@ -601,14 +601,14 @@ UnknownText_0x1c0bbb::
deciram wItemQuantityChangeBuffer, 1, 2 deciram wItemQuantityChangeBuffer, 1, 2
text_start text_start
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "(S)?" text "(S)?"
done done
UnknownText_0x1c0bd8:: UnknownText_0x1c0bd8::
text "Threw away" text "Threw away"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "(S)." text "(S)."
prompt prompt
@ -626,7 +626,7 @@ Text_YouDontHaveAPkmn::
UnknownText_0x1c0c2e:: UnknownText_0x1c0c2e::
text "Registered the" text "Registered the"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "." text "."
prompt prompt
@ -657,7 +657,7 @@ Text_AreYouABoyOrAreYouAGirl::
UnknownText_0x1c0cc6:: UnknownText_0x1c0cc6::
text "<USER>'s" text "<USER>'s"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
db "@@" db "@@"
UnknownText_0x1c0cd0:: UnknownText_0x1c0cd0::
@ -672,7 +672,7 @@ UnknownText_0x1c0ce0::
UnknownText_0x1c0ceb:: UnknownText_0x1c0ceb::
text "<TARGET>'s" text "<TARGET>'s"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
db "@@" db "@@"
UnknownText_0x1c0cf5:: UnknownText_0x1c0cf5::
@ -733,7 +733,7 @@ _UsedInsteadText::
cont "@@" cont "@@"
_MoveNameText:: _MoveNameText::
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
db "@@" db "@@"
_EndUsedMove1Text:: _EndUsedMove1Text::
@ -766,7 +766,7 @@ UnknownText_0x1c0db8::
done done
UnknownText_0x1c0dba:: UnknownText_0x1c0dba::
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " came" text " came"
line "out of its EGG!@" line "out of its EGG!@"
sound_caught_mon sound_caught_mon
@ -776,7 +776,7 @@ UnknownText_0x1c0dba::
UnknownText_0x1c0dd8:: UnknownText_0x1c0dd8::
text "Give a nickname to" text "Give a nickname to"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "?" text "?"
done done
@ -804,28 +804,28 @@ UnknownText_0x1c0e54::
UnknownText_0x1c0e6f:: UnknownText_0x1c0e6f::
text "It has no interest" text "It has no interest"
line "in @" line "in @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt
UnknownText_0x1c0e8d:: UnknownText_0x1c0e8d::
text "It appears to care" text "It appears to care"
line "for @" line "for @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt
UnknownText_0x1c0eac:: UnknownText_0x1c0eac::
text "It's friendly with" text "It's friendly with"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt
UnknownText_0x1c0ec6:: UnknownText_0x1c0ec6::
text "It shows interest" text "It shows interest"
line "in @" line "in @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt
@ -874,10 +874,10 @@ UnknownText_0x1c0fb8::
UnknownText_0x1c0fbc:: UnknownText_0x1c0fbc::
deciram wcf64, 1, 3 deciram wcf64, 1, 3
text " @" text " @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text_start text_start
line "Animation type @" line "Animation type @"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
db "@@" db "@@"
UnknownText_0x1c0fdd:: UnknownText_0x1c0fdd::
@ -885,7 +885,7 @@ UnknownText_0x1c0fdd::
done done
Text_WasSentToBillsPC:: Text_WasSentToBillsPC::
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " was" text " was"
line "sent to BILL's PC." line "sent to BILL's PC."
prompt prompt
@ -924,7 +924,7 @@ UnknownText_0x1c10a2::
UnknownText_0x1c10c0:: UnknownText_0x1c10c0::
text "Caught @" text "Caught @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "!" text "!"
prompt prompt
@ -935,7 +935,7 @@ UnknownText_0x1c10cf::
UnknownText_0x1c10dd:: UnknownText_0x1c10dd::
text "You already caught" text "You already caught"
line "a @" line "a @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt
@ -950,7 +950,7 @@ ContestJudging_FirstPlaceText::
text "," text ","
line "who caught a" line "who caught a"
cont "@" cont "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "!@@" text "!@@"
ContestJudging_FirstPlaceScoreText:: ContestJudging_FirstPlaceScoreText::
@ -970,7 +970,7 @@ ContestJudging_SecondPlaceText::
para "who caught a" para "who caught a"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "!@@" text "!@@"
ContestJudging_SecondPlaceScoreText:: ContestJudging_SecondPlaceScoreText::
@ -990,7 +990,7 @@ ContestJudging_ThirdPlaceText::
para "who caught a" para "who caught a"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "!@@" text "!@@"
ContestJudging_ThirdPlaceScoreText:: ContestJudging_ThirdPlaceScoreText::
@ -1008,7 +1008,7 @@ UnknownText_0x1c1203::
para "…Hm, it measures" para "…Hm, it measures"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt
@ -1016,7 +1016,7 @@ UnknownText_0x1c123a::
text "CURRENT RECORD" text "CURRENT RECORD"
para "@" para "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " caught by" text " caught by"
line "@" line "@"
text_from_ram wMagikarpRecordHoldersName text_from_ram wMagikarpRecordHoldersName
@ -1030,7 +1030,7 @@ UnknownText_0x1c1261::
line "with the ID number" line "with the ID number"
para "of @" para "of @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " in" text " in"
line "your party." line "your party."
prompt prompt
@ -1042,7 +1042,7 @@ UnknownText_0x1c12ae::
line "with the ID number" line "with the ID number"
para "of @" para "of @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " in" text " in"
line "your PC BOX." line "your PC BOX."
prompt prompt
@ -1050,7 +1050,7 @@ UnknownText_0x1c12ae::
UnknownText_0x1c12fc:: UnknownText_0x1c12fc::
text "Give a nickname to" text "Give a nickname to"
line "the @" line "the @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " you" text " you"
cont "received?" cont "received?"
done done
@ -1081,7 +1081,7 @@ _PlayersPCWithdrewItemsText::
deciram wItemQuantityChangeBuffer, 1, 2 deciram wItemQuantityChangeBuffer, 1, 2
text_start text_start
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "(S)." text "(S)."
prompt prompt
@ -1104,7 +1104,7 @@ _PlayersPCDepositItemsText::
deciram wItemQuantityChangeBuffer, 1, 2 deciram wItemQuantityChangeBuffer, 1, 2
text_start text_start
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "(S)." text "(S)."
prompt prompt
@ -1161,10 +1161,10 @@ _OakPCText2::
prompt prompt
_OakPCText3:: _OakPCText3::
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text " #MON seen" text " #MON seen"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text " #MON owned" text " #MON owned"
para "PROF.OAK's" para "PROF.OAK's"
@ -1352,7 +1352,7 @@ UnknownText_0x1c1a6c::
UnknownText_0x1c1a90:: UnknownText_0x1c1a90::
text "Toss out how many" text "Toss out how many"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "(S)?" text "(S)?"
done done
@ -1361,14 +1361,14 @@ UnknownText_0x1c1aad::
deciram wItemQuantityChangeBuffer, 1, 2 deciram wItemQuantityChangeBuffer, 1, 2
text_start text_start
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "(S)?" text "(S)?"
done done
UnknownText_0x1c1aca:: UnknownText_0x1c1aca::
text "Discarded" text "Discarded"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "(S)." text "(S)."
prompt prompt
@ -1388,12 +1388,12 @@ UnknownText_0x1c1b2c::
text_from_ram wMonOrItemNameBuffer text_from_ram wMonOrItemNameBuffer
text "'s" text "'s"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text " and" text " and"
para "made it hold" para "made it hold"
line "@" line "@"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "." text "."
prompt prompt
@ -1402,7 +1402,7 @@ UnknownText_0x1c1b57::
text_from_ram wMonOrItemNameBuffer text_from_ram wMonOrItemNameBuffer
text_start text_start
line "hold @" line "hold @"
text_from_ram StringBuffer2 text_from_ram wStringBuffer2
text "." text "."
prompt prompt
@ -1424,7 +1424,7 @@ UnknownText_0x1c1baa::
UnknownText_0x1c1bc4:: UnknownText_0x1c1bc4::
text "Took @" text "Took @"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text_start text_start
line "from @" line "from @"
text_from_ram wMonOrItemNameBuffer text_from_ram wMonOrItemNameBuffer
@ -1437,7 +1437,7 @@ UnknownText_0x1c1bdc::
line "already holding" line "already holding"
para "@" para "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
line "Switch items?" line "Switch items?"
done done
@ -1455,7 +1455,7 @@ UnknownText_0x1c1c22::
UnknownText_0x1c1c47:: UnknownText_0x1c1c47::
text "MAIL detached from" text "MAIL detached from"
line "@" line "@"
text_from_ram StringBuffer1 text_from_ram wStringBuffer1
text "." text "."
prompt prompt

88
data/text/common_3.asm
View File

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

14
data/text/std_text.asm
View File

@ -231,18 +231,18 @@ ContestResults_ReadyToJudgeText:
ContestResults_PlayerWonAPrizeText: ContestResults_PlayerWonAPrizeText:
text "<PLAYER>, the No.@" text "<PLAYER>, the No.@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text_start text_start
line "finisher, wins" line "finisher, wins"
cont "@" cont "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "!" text "!"
done done
ReceivedItemText: ReceivedItemText:
text "<PLAYER> received" text "<PLAYER> received"
line "@" line "@"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text "." text "."
done done
@ -279,14 +279,14 @@ ContestResults_PartyFullText:
done done
GymStatue_CityGymText: GymStatue_CityGymText:
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text_start text_start
line "#MON GYM" line "#MON GYM"
done done
GymStatue_WinningTrainersText: GymStatue_WinningTrainersText:
text "LEADER: @" text "LEADER: @"
text_from_ram StringBuffer4 text_from_ram wStringBuffer4
text_start text_start
para "WINNING TRAINERS:" para "WINNING TRAINERS:"
line "<PLAYER>" line "<PLAYER>"
@ -376,13 +376,13 @@ HappinessText1:
RegisteredNumber1Text: RegisteredNumber1Text:
text "<PLAYER> registered" text "<PLAYER> registered"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "'s number." text "'s number."
done done
RegisteredNumber2Text: RegisteredNumber2Text:
text "<PLAYER> registered" text "<PLAYER> registered"
line "@" line "@"
text_from_ram StringBuffer3 text_from_ram wStringBuffer3
text "'s number." text "'s number."
done done

52
data/text/unused_gen1_trainer_names.asm
View File

@ -3,50 +3,50 @@ Gen1TrainerClassNames: ; 50a42
dw .Youngster dw .Youngster
dw .BugCatcher dw .BugCatcher
dw .Lass dw .Lass
dw OTClassName ; sailor dw wOTClassName ; sailor
dw .JrTrainerM dw .JrTrainerM
dw .JrTrainerF dw .JrTrainerF
dw .Pokemaniac dw .Pokemaniac
dw .SuperNerd dw .SuperNerd
dw OTClassName ; hiker dw wOTClassName ; hiker
dw OTClassName ; biker dw wOTClassName ; biker
dw .Burglar dw .Burglar
dw .Engineer dw .Engineer
dw .Jack dw .Jack
dw OTClassName ; fisher dw wOTClassName ; fisher
dw .Swimmer dw .Swimmer
dw OTClassName ; cue ball dw wOTClassName ; cue ball
dw OTClassName ; gambler dw wOTClassName ; gambler
dw .Beauty dw .Beauty
dw OTClassName ; psychic dw wOTClassName ; psychic
dw .Rocker dw .Rocker
dw .Juggler dw .Juggler
dw OTClassName ; tamer dw wOTClassName ; tamer
dw OTClassName ; bird keeper dw wOTClassName ; bird keeper
dw .Blackbelt dw .Blackbelt
dw OTClassName ; rival1 dw wOTClassName ; rival1
dw .ProfOak dw .ProfOak
dw .Chief dw .Chief
dw .Scientist dw .Scientist
dw OTClassName ; giovanni dw wOTClassName ; giovanni
dw .Rocket dw .Rocket
dw .CooltrainerM dw .CooltrainerM
dw .CooltrainerF dw .CooltrainerF
dw OTClassName ; bruno dw wOTClassName ; bruno
dw OTClassName ; brock dw wOTClassName ; brock
dw OTClassName ; misty dw wOTClassName ; misty
dw OTClassName ; lt.surge dw wOTClassName ; lt.surge
dw OTClassName ; erika dw wOTClassName ; erika
dw OTClassName ; koga dw wOTClassName ; koga
dw OTClassName ; blaine dw wOTClassName ; blaine
dw OTClassName ; sabrina dw wOTClassName ; sabrina
dw OTClassName ; gentleman dw wOTClassName ; gentleman
dw OTClassName ; rival2 dw wOTClassName ; rival2
dw OTClassName ; rival3 dw wOTClassName ; rival3
dw OTClassName ; lorelei dw wOTClassName ; lorelei
dw OTClassName ; channeler dw wOTClassName ; channeler
dw OTClassName ; agatha dw wOTClassName ; agatha
dw OTClassName ; lance dw wOTClassName ; lance
.Youngster: db "たんパン@" .Youngster: db "たんパン@"
.BugCatcher: db "むしとり@" .BugCatcher: db "むしとり@"

14
data/text_buffers.asm
View File

@ -1,9 +1,9 @@
StringBufferPointers:: ; 24000 StringBufferPointers:: ; 24000
; entries correspond to arguments for text_buffer (TX_STRINGBUFFER) ; entries correspond to arguments for text_buffer (TX_STRINGBUFFER)
dw StringBuffer3 ; 0 dw wStringBuffer3 ; 0
dw StringBuffer4 ; 1 dw wStringBuffer4 ; 1
dw StringBuffer5 ; 2 dw wStringBuffer5 ; 2
dw StringBuffer2 ; 3 dw wStringBuffer2 ; 3
dw StringBuffer1 ; 4 dw wStringBuffer1 ; 4
dw EnemyMonNick ; 5 dw wEnemyMonNick ; 5
dw BattleMonNick ; 6 dw wBattleMonNick ; 6

2
data/trainers/palettes.asm
View File

@ -1,7 +1,7 @@
TrainerPalettes: ; b0ce TrainerPalettes: ; b0ce
; entries correspond to trainer classes ; entries correspond to trainer classes
PlayerPalette: ; Chris uses the same colors as Cal wPlayerPalette: ; Chris uses the same colors as Cal
INCLUDE "gfx/trainers/cal.pal" INCLUDE "gfx/trainers/cal.pal"
KrisPalette: ; Kris shares Falkner's palette KrisPalette: ; Kris shares Falkner's palette
INCLUDE "gfx/trainers/falkner.pal" INCLUDE "gfx/trainers/falkner.pal"

108
engine/battle/ai/items.asm
View File

@ -12,7 +12,7 @@ AI_SwitchOrTryItem: ; 38000
farcall CheckEnemyLockedIn farcall CheckEnemyLockedIn
ret nz ret nz
ld a, [PlayerSubStatus5] ld a, [wPlayerSubStatus5]
bit SUBSTATUS_CANT_RUN, a bit SUBSTATUS_CANT_RUN, a
jr nz, DontSwitch jr nz, DontSwitch
@ -21,11 +21,11 @@ AI_SwitchOrTryItem: ; 38000
jr nz, DontSwitch jr nz, DontSwitch
ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH
ld a, [InBattleTowerBattle] ; Load always the first TrainerClass for BattleTower-Trainers ld a, [wInBattleTowerBattle] ; always load the first trainer class in wTrainerClass for BattleTower-Trainers
and a and a
jr nz, .ok jr nz, .ok
ld a, [TrainerClass] ld a, [wTrainerClass]
dec a dec a
ld bc, NUM_TRAINER_ATTRIBUTES ld bc, NUM_TRAINER_ATTRIBUTES
call AddNTimes call AddNTimes
@ -151,7 +151,7 @@ SwitchSometimes: ; 380c1
CheckSubstatusCantRun: ; 380ff CheckSubstatusCantRun: ; 380ff
ld a, [EnemySubStatus5] ld a, [wEnemySubStatus5]
bit SUBSTATUS_CANT_RUN, a bit SUBSTATUS_CANT_RUN, a
ret ret
; 38105 ; 38105
@ -159,7 +159,7 @@ CheckSubstatusCantRun: ; 380ff
AI_TryItem: ; 38105 AI_TryItem: ; 38105
; items are not allowed in the BattleTower ; items are not allowed in the BattleTower
ld a, [InBattleTowerBattle] ld a, [wInBattleTowerBattle]
and a and a
ret nz ret nz
@ -172,7 +172,7 @@ AI_TryItem: ; 38105
call .IsHighestLevel call .IsHighestLevel
ret nc ret nc
ld a, [TrainerClass] ld a, [wTrainerClass]
dec a dec a
ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH
ld bc, NUM_TRAINER_ATTRIBUTES ld bc, NUM_TRAINER_ATTRIBUTES
@ -226,29 +226,29 @@ AI_TryItem: ; 38105
inc a inc a
ld [wEnemyGoesFirst], a ld [wEnemyGoesFirst], a
ld hl, EnemySubStatus3 ld hl, wEnemySubStatus3
res SUBSTATUS_BIDE, [hl] res SUBSTATUS_BIDE, [hl]
xor a xor a
ld [EnemyFuryCutterCount], a ld [wEnemyFuryCutterCount], a
ld [EnemyProtectCount], a ld [wEnemyProtectCount], a
ld [wEnemyRageCounter], a ld [wEnemyRageCounter], a
ld hl, EnemySubStatus4 ld hl, wEnemySubStatus4
res SUBSTATUS_RAGE, [hl] res SUBSTATUS_RAGE, [hl]
xor a xor a
ld [LastEnemyCounterMove], a ld [wLastEnemyCounterMove], a
scf scf
ret ret
.IsHighestLevel: ; 38170 .IsHighestLevel: ; 38170
ld a, [OTPartyCount] ld a, [wOTPartyCount]
ld d, a ld d, a
ld e, 0 ld e, 0
ld hl, OTPartyMon1Level ld hl, wOTPartyMon1Level
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
.next .next
ld a, [hl] ld a, [hl]
@ -260,8 +260,8 @@ AI_TryItem: ; 38105
dec d dec d
jr nz, .next jr nz, .next
ld a, [CurOTMon] ld a, [wCurOTMon]
ld hl, OTPartyMon1Level ld hl, wOTPartyMon1Level
call AddNTimes call AddNTimes
ld a, [hl] ld a, [hl]
cp e cp e
@ -302,7 +302,7 @@ AI_Items: ; 39196
; 381ca ; 381ca
.Status: ; 381ca (e:41ca) .Status: ; 381ca (e:41ca)
ld a, [EnemyMonStatus] ld a, [wEnemyMonStatus]
and a and a
jp z, .DontUse jp z, .DontUse
@ -318,17 +318,17 @@ AI_Items: ; 39196
jp .DontUse jp .DontUse
.StatusCheckContext: .StatusCheckContext:
ld a, [EnemySubStatus5] ld a, [wEnemySubStatus5]
bit SUBSTATUS_TOXIC, a bit SUBSTATUS_TOXIC, a
jr z, .FailToxicCheck jr z, .FailToxicCheck
ld a, [EnemyToxicCount] ld a, [wEnemyToxicCount]
cp 4 cp 4
jr c, .FailToxicCheck jr c, .FailToxicCheck
call Random call Random
cp 1 + 50 percent cp 1 + 50 percent
jp c, .Use jp c, .Use
.FailToxicCheck: .FailToxicCheck:
ld a, [EnemyMonStatus] ld a, [wEnemyMonStatus]
and 1 << FRZ | SLP and 1 << FRZ | SLP
jp z, .DontUse jp z, .DontUse
jp .Use jp .Use
@ -419,8 +419,8 @@ AI_Items: ; 39196
callfar AICheckEnemyMaxHP callfar AICheckEnemyMaxHP
jr c, .dont_use jr c, .dont_use
push bc push bc
ld de, EnemyMonMaxHP + 1 ld de, wEnemyMonMaxHP + 1
ld hl, EnemyMonHP + 1 ld hl, wEnemyMonHP + 1
ld a, [de] ld a, [de]
sub [hl] sub [hl]
jr z, .check_40_percent jr z, .check_40_percent
@ -509,7 +509,7 @@ AI_Items: ; 39196
; 3834d ; 3834d
.XItem: ; 3834d (e:434d) .XItem: ; 3834d (e:434d)
ld a, [EnemyTurnsTaken] ld a, [wEnemyTurnsTaken]
and a and a
jr nz, .notfirstturnout jr nz, .notfirstturnout
ld a, [bc] ld a, [bc]
@ -571,37 +571,37 @@ EnemyUsedFullHeal: ; 383a3 (e:43a3)
EnemyUsedMaxPotion: ; 383ae (e:43ae) EnemyUsedMaxPotion: ; 383ae (e:43ae)
ld a, MAX_POTION ld a, MAX_POTION
ld [CurEnemyItem], a ld [wCurEnemyItem], a
jr FullRestoreContinue jr FullRestoreContinue
EnemyUsedFullRestore: ; 383b5 (e:43b5) EnemyUsedFullRestore: ; 383b5 (e:43b5)
call AI_HealStatus call AI_HealStatus
ld a, FULL_RESTORE ld a, FULL_RESTORE
ld [CurEnemyItem], a ld [wCurEnemyItem], a
ld hl, EnemySubStatus3 ld hl, wEnemySubStatus3
res SUBSTATUS_CONFUSED, [hl] res SUBSTATUS_CONFUSED, [hl]
xor a xor a
ld [EnemyConfuseCount], a ld [wEnemyConfuseCount], a
FullRestoreContinue: ; 383c6 FullRestoreContinue: ; 383c6
ld de, wCurHPAnimOldHP ld de, wCurHPAnimOldHP
ld hl, EnemyMonHP + 1 ld hl, wEnemyMonHP + 1
ld a, [hld] ld a, [hld]
ld [de], a ld [de], a
inc de inc de
ld a, [hl] ld a, [hl]
ld [de], a ld [de], a
inc de inc de
ld hl, EnemyMonMaxHP + 1 ld hl, wEnemyMonMaxHP + 1
ld a, [hld] ld a, [hld]
ld [de], a ld [de], a
inc de inc de
ld [wCurHPAnimMaxHP], a ld [wCurHPAnimMaxHP], a
ld [EnemyMonHP + 1], a ld [wEnemyMonHP + 1], a
ld a, [hl] ld a, [hl]
ld [de], a ld [de], a
ld [wCurHPAnimMaxHP + 1], a ld [wCurHPAnimMaxHP + 1], a
ld [EnemyMonHP], a ld [wEnemyMonHP], a
jr EnemyPotionFinish jr EnemyPotionFinish
; 383e8 (e:43e8) ; 383e8 (e:43e8)
@ -620,8 +620,8 @@ EnemyUsedHyperPotion: ; 383f4 (e:43f4)
ld b, 200 ld b, 200
EnemyPotionContinue: ; 383f8 EnemyPotionContinue: ; 383f8
ld [CurEnemyItem], a ld [wCurEnemyItem], a
ld hl, EnemyMonHP + 1 ld hl, wEnemyMonHP + 1
ld a, [hl] ld a, [hl]
ld [wCurHPAnimOldHP], a ld [wCurHPAnimOldHP], a
add b add b
@ -638,7 +638,7 @@ EnemyPotionContinue: ; 383f8
inc hl inc hl
ld a, [hld] ld a, [hld]
ld b, a ld b, a
ld de, EnemyMonMaxHP + 1 ld de, wEnemyMonMaxHP + 1
ld a, [de] ld a, [de]
dec de dec de
ld [wCurHPAnimMaxHP], a ld [wCurHPAnimMaxHP], a
@ -671,9 +671,9 @@ EnemyPotionFinish: ; 38436
AI_TrySwitch: ; 3844b AI_TrySwitch: ; 3844b
; Determine whether the AI can switch based on how many Pokemon are still alive. ; Determine whether the AI can switch based on how many Pokemon are still alive.
; If it can switch, it will. ; If it can switch, it will.
ld a, [OTPartyCount] ld a, [wOTPartyCount]
ld c, a ld c, a
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
ld d, 0 ld d, 0
.SwitchLoop: .SwitchLoop:
ld a, [hli] ld a, [hli]
@ -701,20 +701,20 @@ AI_Switch: ; 3846c
ld a, $1 ld a, $1
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
ld [wEnemyGoesFirst], a ld [wEnemyGoesFirst], a
ld hl, EnemySubStatus4 ld hl, wEnemySubStatus4
res SUBSTATUS_RAGE, [hl] res SUBSTATUS_RAGE, [hl]
xor a xor a
ld [hBattleTurn], a ld [hBattleTurn], a
callfar PursuitSwitch callfar PursuitSwitch
push af push af
ld a, [CurOTMon] ld a, [wCurOTMon]
ld hl, OTPartyMon1Status ld hl, wOTPartyMon1Status
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
ld e, l ld e, l
ld hl, EnemyMonStatus ld hl, wEnemyMonStatus
ld bc, MON_MAXHP - MON_STATUS ld bc, MON_MAXHP - MON_STATUS
call CopyBytes call CopyBytes
pop af pop af
@ -728,7 +728,7 @@ AI_Switch: ; 3846c
ld [wBattleHasJustStarted], a ld [wBattleHasJustStarted], a
callfar NewEnemyMonStatus callfar NewEnemyMonStatus
callfar ResetEnemyStatLevels callfar ResetEnemyStatLevels
ld hl, PlayerSubStatus1 ld hl, wPlayerSubStatus1
res SUBSTATUS_IN_LOVE, [hl] res SUBSTATUS_IN_LOVE, [hl]
farcall EnemySwitch farcall EnemySwitch
farcall ResetBattleParticipants farcall ResetBattleParticipants
@ -754,25 +754,25 @@ Function384d5: ; This appears to be unused
; 384e0 ; 384e0
AI_HealStatus: ; 384e0 AI_HealStatus: ; 384e0
ld a, [CurOTMon] ld a, [wCurOTMon]
ld hl, OTPartyMon1Status ld hl, wOTPartyMon1Status
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
xor a xor a
ld [hl], a ld [hl], a
ld [EnemyMonStatus], a ld [wEnemyMonStatus], a
; Bug: this should reset SUBSTATUS_NIGHTMARE too ; Bug: this should reset SUBSTATUS_NIGHTMARE too
; Uncomment the lines below to fix ; Uncomment the lines below to fix
; ld hl, EnemySubStatus1 ; ld hl, wEnemySubStatus1
; res SUBSTATUS_NIGHTMARE, [hl] ; res SUBSTATUS_NIGHTMARE, [hl]
ld hl, EnemySubStatus5 ld hl, wEnemySubStatus5
res SUBSTATUS_TOXIC, [hl] res SUBSTATUS_TOXIC, [hl]
ret ret
; 384f7 ; 384f7
EnemyUsedXAccuracy: ; 384f7 EnemyUsedXAccuracy: ; 384f7
call AIUsedItemSound call AIUsedItemSound
ld hl, EnemySubStatus4 ld hl, wEnemySubStatus4
set SUBSTATUS_X_ACCURACY, [hl] set SUBSTATUS_X_ACCURACY, [hl]
ld a, X_ACCURACY ld a, X_ACCURACY
jp PrintText_UsedItemOn_AND_AIUpdateHUD jp PrintText_UsedItemOn_AND_AIUpdateHUD
@ -780,7 +780,7 @@ EnemyUsedXAccuracy: ; 384f7
EnemyUsedGuardSpec: ; 38504 EnemyUsedGuardSpec: ; 38504
call AIUsedItemSound call AIUsedItemSound
ld hl, EnemySubStatus4 ld hl, wEnemySubStatus4
set SUBSTATUS_MIST, [hl] set SUBSTATUS_MIST, [hl]
ld a, GUARD_SPEC ld a, GUARD_SPEC
jp PrintText_UsedItemOn_AND_AIUpdateHUD jp PrintText_UsedItemOn_AND_AIUpdateHUD
@ -788,7 +788,7 @@ EnemyUsedGuardSpec: ; 38504
EnemyUsedDireHit: ; 38511 EnemyUsedDireHit: ; 38511
call AIUsedItemSound call AIUsedItemSound
ld hl, EnemySubStatus4 ld hl, wEnemySubStatus4
set SUBSTATUS_FOCUS_ENERGY, [hl] set SUBSTATUS_FOCUS_ENERGY, [hl]
ld a, DIRE_HIT ld a, DIRE_HIT
jp PrintText_UsedItemOn_AND_AIUpdateHUD jp PrintText_UsedItemOn_AND_AIUpdateHUD
@ -796,7 +796,7 @@ EnemyUsedDireHit: ; 38511
Function3851e: ; This appears to be unused Function3851e: ; This appears to be unused
ld [hDivisor], a ld [hDivisor], a
ld hl, EnemyMonMaxHP ld hl, wEnemyMonMaxHP
ld a, [hli] ld a, [hli]
ld [hDividend], a ld [hDividend], a
ld a, [hl] ld a, [hl]
@ -807,7 +807,7 @@ Function3851e: ; This appears to be unused
ld c, a ld c, a
ld a, [hQuotient + 1] ld a, [hQuotient + 1]
ld b, a ld b, a
ld hl, EnemyMonHP + 1 ld hl, wEnemyMonHP + 1
ld a, [hld] ld a, [hld]
ld e, a ld e, a
ld a, [hl] ld a, [hl]
@ -847,7 +847,7 @@ EnemyUsedXSpecial: ; 38553
; a = ITEM_CONSTANT ; a = ITEM_CONSTANT
; b = BATTLE_CONSTANT (ATTACK, DEFENSE, SPEED, SP_ATTACK, SP_DEFENSE, ACCURACY, EVASION) ; b = BATTLE_CONSTANT (ATTACK, DEFENSE, SPEED, SP_ATTACK, SP_DEFENSE, ACCURACY, EVASION)
EnemyUsedXItem: EnemyUsedXItem:
ld [CurEnemyItem], a ld [wCurEnemyItem], a
push bc push bc
call PrintText_UsedItemOn call PrintText_UsedItemOn
pop bc pop bc
@ -859,16 +859,16 @@ EnemyUsedXItem:
; Parameter ; Parameter
; a = ITEM_CONSTANT ; a = ITEM_CONSTANT
PrintText_UsedItemOn_AND_AIUpdateHUD: ; 38568 PrintText_UsedItemOn_AND_AIUpdateHUD: ; 38568
ld [CurEnemyItem], a ld [wCurEnemyItem], a
call PrintText_UsedItemOn call PrintText_UsedItemOn
jp AIUpdateHUD jp AIUpdateHUD
; 38571 ; 38571
PrintText_UsedItemOn: ; 38571 PrintText_UsedItemOn: ; 38571
ld a, [CurEnemyItem] ld a, [wCurEnemyItem]
ld [wd265], a ld [wd265], a
call GetItemName call GetItemName
ld hl, StringBuffer1 ld hl, wStringBuffer1
ld de, wMonOrItemNameBuffer ld de, wMonOrItemNameBuffer
ld bc, ITEM_NAME_LENGTH ld bc, ITEM_NAME_LENGTH
call CopyBytes call CopyBytes

38
engine/battle/ai/move.asm
View File

@ -1,5 +1,5 @@
AIChooseMove: ; 440ce AIChooseMove: ; 440ce
; Score each move in EnemyMonMoves starting from Buffer1. Lower is better. ; Score each move in wEnemyMonMoves starting from wBuffer1. Lower is better.
; Pick the move with the lowest score. ; Pick the move with the lowest score.
; Wildmons attack at random. ; Wildmons attack at random.
@ -18,18 +18,18 @@ AIChooseMove: ; 440ce
; The default score is 20. Unusable moves are given a score of 80. ; The default score is 20. Unusable moves are given a score of 80.
ld a, 20 ld a, 20
ld hl, Buffer1 ld hl, wBuffer1
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
; Don't pick disabled moves. ; Don't pick disabled moves.
ld a, [EnemyDisabledMove] ld a, [wEnemyDisabledMove]
and a and a
jr z, .CheckPP jr z, .CheckPP
ld hl, EnemyMonMoves ld hl, wEnemyMonMoves
ld c, 0 ld c, 0
.CheckDisabledMove: .CheckDisabledMove:
cp [hl] cp [hl]
@ -38,20 +38,20 @@ AIChooseMove: ; 440ce
inc hl inc hl
jr .CheckDisabledMove jr .CheckDisabledMove
.ScoreDisabledMove: .ScoreDisabledMove:
ld hl, Buffer1 ld hl, wBuffer1
ld b, 0 ld b, 0
add hl, bc add hl, bc
ld [hl], 80 ld [hl], 80
; Don't pick moves with 0 PP. ; Don't pick moves with 0 PP.
.CheckPP: .CheckPP:
ld hl, Buffer1 - 1 ld hl, wBuffer1 - 1
ld de, EnemyMonPP ld de, wEnemyMonPP
ld b, 0 ld b, 0
.CheckMovePP: .CheckMovePP:
inc b inc b
ld a, b ld a, b
cp EnemyMonMovesEnd - EnemyMonMoves + 1 cp wEnemyMonMovesEnd - wEnemyMonMoves + 1
jr z, .ApplyLayers jr z, .ApplyLayers
inc hl inc hl
ld a, [de] ld a, [de]
@ -66,13 +66,13 @@ AIChooseMove: ; 440ce
.ApplyLayers: .ApplyLayers:
ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
; If we have a battle in BattleTower just load the Attributes of the first TrainerClass (Falkner) ; If we have a battle in BattleTower just load the Attributes of the first trainer class in wTrainerClass (Falkner)
; so we have always the same AI, regardless of the loaded class of trainer ; so we have always the same AI, regardless of the loaded class of trainer
ld a, [InBattleTowerBattle] ld a, [wInBattleTowerBattle]
bit 0, a bit 0, a
jr nz, .battle_tower_skip jr nz, .battle_tower_skip
ld a, [TrainerClass] ld a, [wTrainerClass]
dec a dec a
ld bc, 7 ; Trainer2AI - Trainer1AI ld bc, 7 ; Trainer2AI - Trainer1AI
call AddNTimes call AddNTimes
@ -119,9 +119,9 @@ AIChooseMove: ; 440ce
; Decrement the scores of all moves one by one until one reaches 0. ; Decrement the scores of all moves one by one until one reaches 0.
.DecrementScores: .DecrementScores:
ld hl, Buffer1 ld hl, wBuffer1
ld de, EnemyMonMoves ld de, wEnemyMonMoves
ld c, EnemyMonMovesEnd - EnemyMonMoves ld c, wEnemyMonMovesEnd - wEnemyMonMoves
.DecrementNextScore: .DecrementNextScore:
; If the enemy has no moves, this will infinite. ; If the enemy has no moves, this will infinite.
@ -154,8 +154,8 @@ AIChooseMove: ; 440ce
cp NUM_MOVES + 1 cp NUM_MOVES + 1
jr nz, .move_loop jr nz, .move_loop
ld hl, Buffer1 ld hl, wBuffer1
ld de, EnemyMonMoves ld de, wEnemyMonMoves
ld c, NUM_MOVES ld c, NUM_MOVES
; Give a score of 0 to a blank move ; Give a score of 0 to a blank move
@ -184,7 +184,7 @@ AIChooseMove: ; 440ce
; Randomly choose one of the moves with a score of 1 ; Randomly choose one of the moves with a score of 1
.ChooseMove: .ChooseMove:
ld hl, Buffer1 ld hl, wBuffer1
call Random call Random
maskbits NUM_MOVES maskbits NUM_MOVES
ld c, a ld c, a
@ -194,9 +194,9 @@ AIChooseMove: ; 440ce
and a and a
jr z, .ChooseMove jr z, .ChooseMove
ld [CurEnemyMove], a ld [wCurEnemyMove], a
ld a, c ld a, c
ld [CurEnemyMoveNum], a ld [wCurEnemyMoveNum], a
ret ret
; 441af ; 441af

52
engine/battle/ai/redundant.asm
View File

@ -47,95 +47,95 @@ AI_Redundant: ; 2c41a
db -1 db -1
.LightScreen: ; 2c487 .LightScreen: ; 2c487
ld a, [EnemyScreens] ld a, [wEnemyScreens]
bit SCREENS_LIGHT_SCREEN, a bit SCREENS_LIGHT_SCREEN, a
ret ret
.Mist: ; 2c48d .Mist: ; 2c48d
ld a, [EnemySubStatus4] ld a, [wEnemySubStatus4]
bit SUBSTATUS_MIST, a bit SUBSTATUS_MIST, a
ret ret
.FocusEnergy: ; 2c493 .FocusEnergy: ; 2c493
ld a, [EnemySubStatus4] ld a, [wEnemySubStatus4]
bit SUBSTATUS_FOCUS_ENERGY, a bit SUBSTATUS_FOCUS_ENERGY, a
ret ret
.Confuse: ; 2c499 .Confuse: ; 2c499
ld a, [PlayerSubStatus3] ld a, [wPlayerSubStatus3]
bit SUBSTATUS_CONFUSED, a bit SUBSTATUS_CONFUSED, a
ret nz ret nz
ld a, [PlayerScreens] ld a, [wPlayerScreens]
bit SCREENS_SAFEGUARD, a bit SCREENS_SAFEGUARD, a
ret ret
.Transform: ; 2c4a5 .Transform: ; 2c4a5
ld a, [EnemySubStatus5] ld a, [wEnemySubStatus5]
bit SUBSTATUS_TRANSFORMED, a bit SUBSTATUS_TRANSFORMED, a
ret ret
.Reflect: ; 2c4ab .Reflect: ; 2c4ab
ld a, [EnemyScreens] ld a, [wEnemyScreens]
bit SCREENS_REFLECT, a bit SCREENS_REFLECT, a
ret ret
.Substitute: ; 2c4b1 .Substitute: ; 2c4b1
ld a, [EnemySubStatus4] ld a, [wEnemySubStatus4]
bit SUBSTATUS_SUBSTITUTE, a bit SUBSTATUS_SUBSTITUTE, a
ret ret
.LeechSeed: ; 2c4b7 .LeechSeed: ; 2c4b7
ld a, [PlayerSubStatus4] ld a, [wPlayerSubStatus4]
bit SUBSTATUS_LEECH_SEED, a bit SUBSTATUS_LEECH_SEED, a
ret ret
.Disable: ; 2c4bd .Disable: ; 2c4bd
ld a, [PlayerDisableCount] ld a, [wPlayerDisableCount]
and a and a
ret ret
.Encore: ; 2c4c2 .Encore: ; 2c4c2
ld a, [PlayerSubStatus5] ld a, [wPlayerSubStatus5]
bit SUBSTATUS_ENCORED, a bit SUBSTATUS_ENCORED, a
ret ret
.Snore: .Snore:
.SleepTalk: ; 2c4c8 .SleepTalk: ; 2c4c8
ld a, [EnemyMonStatus] ld a, [wEnemyMonStatus]
and SLP and SLP
jr z, .Redundant jr z, .Redundant
jr .NotRedundant jr .NotRedundant
.MeanLook: ; 2c4d1 .MeanLook: ; 2c4d1
ld a, [EnemySubStatus5] ld a, [wEnemySubStatus5]
bit SUBSTATUS_CANT_RUN, a bit SUBSTATUS_CANT_RUN, a
ret ret
.Nightmare: ; 2c4d7 .Nightmare: ; 2c4d7
ld a, [BattleMonStatus] ld a, [wBattleMonStatus]
and a and a
jr z, .Redundant jr z, .Redundant
ld a, [PlayerSubStatus1] ld a, [wPlayerSubStatus1]
bit SUBSTATUS_NIGHTMARE, a bit SUBSTATUS_NIGHTMARE, a
ret ret
.Spikes: ; 2c4e3 .Spikes: ; 2c4e3
ld a, [PlayerScreens] ld a, [wPlayerScreens]
bit SCREENS_SPIKES, a bit SCREENS_SPIKES, a
ret ret
.Foresight: ; 2c4e9 .Foresight: ; 2c4e9
ld a, [PlayerSubStatus1] ld a, [wPlayerSubStatus1]
bit SUBSTATUS_IDENTIFIED, a bit SUBSTATUS_IDENTIFIED, a
ret ret
.PerishSong: ; 2c4ef .PerishSong: ; 2c4ef
ld a, [PlayerSubStatus1] ld a, [wPlayerSubStatus1]
bit SUBSTATUS_PERISH, a bit SUBSTATUS_PERISH, a
ret ret
.Sandstorm: ; 2c4f5 .Sandstorm: ; 2c4f5
ld a, [Weather] ld a, [wBattleWeather]
cp WEATHER_SANDSTORM cp WEATHER_SANDSTORM
jr z, .Redundant jr z, .Redundant
jr .NotRedundant jr .NotRedundant
@ -143,40 +143,40 @@ AI_Redundant: ; 2c41a
.Attract: ; 2c4fe .Attract: ; 2c4fe
farcall CheckOppositeGender farcall CheckOppositeGender
jr c, .Redundant jr c, .Redundant
ld a, [PlayerSubStatus1] ld a, [wPlayerSubStatus1]
bit SUBSTATUS_IN_LOVE, a bit SUBSTATUS_IN_LOVE, a
ret ret
.Safeguard: ; 2c50c .Safeguard: ; 2c50c
ld a, [EnemyScreens] ld a, [wEnemyScreens]
bit SCREENS_SAFEGUARD, a bit SCREENS_SAFEGUARD, a
ret ret
.RainDance: ; 2c512 .RainDance: ; 2c512
ld a, [Weather] ld a, [wBattleWeather]
cp WEATHER_RAIN cp WEATHER_RAIN
jr z, .Redundant jr z, .Redundant
jr .NotRedundant jr .NotRedundant
.SunnyDay: ; 2c51b .SunnyDay: ; 2c51b
ld a, [Weather] ld a, [wBattleWeather]
cp WEATHER_SUN cp WEATHER_SUN
jr z, .Redundant jr z, .Redundant
jr .NotRedundant jr .NotRedundant
.DreamEater: ; 2c524 .DreamEater: ; 2c524
ld a, [BattleMonStatus] ld a, [wBattleMonStatus]
and SLP and SLP
jr z, .Redundant jr z, .Redundant
jr .NotRedundant jr .NotRedundant
.Swagger: ; 2c52d .Swagger: ; 2c52d
ld a, [PlayerSubStatus3] ld a, [wPlayerSubStatus3]
bit SUBSTATUS_CONFUSED, a bit SUBSTATUS_CONFUSED, a
ret ret
.FutureSight: ; 2c533 .FutureSight: ; 2c533
ld a, [EnemyScreens] ld a, [wEnemyScreens]
bit 5, a bit 5, a
ret ret

388
engine/battle/ai/scoring.asm
View File

File diff suppressed because it is too large Load Diff

66
engine/battle/ai/switch.asm
View File

@ -7,7 +7,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
push bc push bc
ld a, 10 ld a, 10
ld [wEnemyAISwitchScore], a ld [wEnemyAISwitchScore], a
ld hl, PlayerUsedMoves ld hl, wPlayerUsedMoves
ld a, [hl] ld a, [hl]
and a and a
jr z, .unknown_moves jr z, .unknown_moves
@ -27,7 +27,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, EnemyMonType ld hl, wEnemyMonType
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
@ -70,16 +70,16 @@ CheckPlayerMoveTypeMatchups: ; 3484e
jr .done jr .done
.unknown_moves .unknown_moves
ld a, [BattleMonType1] ld a, [wBattleMonType1]
ld b, a ld b, a
ld hl, EnemyMonType1 ld hl, wEnemyMonType1
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr c, .ok jr c, .ok
call .DecreaseScore call .DecreaseScore
.ok .ok
ld a, [BattleMonType2] ld a, [wBattleMonType2]
cp b cp b
jr z, .ok2 jr z, .ok2
call CheckTypeMatchup call CheckTypeMatchup
@ -99,7 +99,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
.CheckEnemyMoveMatchups: ; 348de .CheckEnemyMoveMatchups: ; 348de
ld de, EnemyMonMoves ld de, wEnemyMonMoves
ld b, NUM_MOVES + 1 ld b, NUM_MOVES + 1
ld c, 0 ld c, 0
@ -122,7 +122,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BattleMonType1 ld hl, wBattleMonType1
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
@ -183,11 +183,11 @@ CheckAbleToSwitch: ; 34941
call FindAliveEnemyMons call FindAliveEnemyMons
ret c ret c
ld a, [EnemySubStatus1] ld a, [wEnemySubStatus1]
bit SUBSTATUS_PERISH, a bit SUBSTATUS_PERISH, a
jr z, .no_perish jr z, .no_perish
ld a, [EnemyPerishCount] ld a, [wEnemyPerishCount]
cp 1 cp 1
jr nz, .no_perish jr nz, .no_perish
@ -229,7 +229,7 @@ CheckAbleToSwitch: ; 34941
cp 11 cp 11
ret nc ret nc
ld a, [LastPlayerCounterMove] ld a, [wLastPlayerCounterMove]
and a and a
jr z, .no_last_counter_move jr z, .no_last_counter_move
@ -296,7 +296,7 @@ CheckAbleToSwitch: ; 34941
FindAliveEnemyMons: ; 349f4 FindAliveEnemyMons: ; 349f4
ld a, [OTPartyCount] ld a, [wOTPartyCount]
cp 2 cp 2
jr c, .only_one jr c, .only_one
@ -304,10 +304,10 @@ FindAliveEnemyMons: ; 349f4
ld e, 0 ld e, 0
ld b, 1 << (PARTY_LENGTH - 1) ld b, 1 << (PARTY_LENGTH - 1)
ld c, 0 ld c, 0
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
.loop .loop
ld a, [CurOTMon] ld a, [wCurOTMon]
cp e cp e
jr z, .next jr z, .next
@ -348,8 +348,8 @@ FindAliveEnemyMons: ; 349f4
FindEnemyMonsImmuneToLastCounterMove: ; 34a2a FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
ld hl, OTPartyMon1 ld hl, wOTPartyMon1
ld a, [OTPartyCount] ld a, [wOTPartyCount]
ld b, a ld b, a
ld c, 1 << (PARTY_LENGTH - 1) ld c, 1 << (PARTY_LENGTH - 1)
ld d, 0 ld d, 0
@ -357,7 +357,7 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
ld [wEnemyAISwitchScore], a ld [wEnemyAISwitchScore], a
.loop .loop
ld a, [CurOTMon] ld a, [wCurOTMon]
cp d cp d
push hl push hl
jr z, .next jr z, .next
@ -375,11 +375,11 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
jr z, .next jr z, .next
ld a, [hl] ld a, [hl]
ld [CurSpecies], a ld [wCurSpecies], a
call GetBaseData call GetBaseData
; the player's last move is damaging... ; the player's last move is damaging...
ld a, [LastPlayerCounterMove] ld a, [wLastPlayerCounterMove]
dec a dec a
ld hl, Moves + MOVE_POWER ld hl, Moves + MOVE_POWER
call GetMoveAttr call GetMoveAttr
@ -389,7 +389,7 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
; and the Pokemon is immune to it... ; and the Pokemon is immune to it...
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BaseType ld hl, wBaseType
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
and a and a
@ -417,9 +417,9 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
FindAliveEnemyMonsWithASuperEffectiveMove: ; 34a85 FindAliveEnemyMonsWithASuperEffectiveMove: ; 34a85
push bc push bc
ld a, [OTPartyCount] ld a, [wOTPartyCount]
ld e, a ld e, a
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
ld b, 1 << (PARTY_LENGTH - 1) ld b, 1 << (PARTY_LENGTH - 1)
ld c, 0 ld c, 0
.loop .loop
@ -434,7 +434,7 @@ FindAliveEnemyMonsWithASuperEffectiveMove: ; 34a85
.next .next
srl b srl b
push bc push bc
ld bc, PartyMon2HP - (PartyMon1HP + 1) ld bc, wPartyMon2HP - (wPartyMon1HP + 1)
add hl, bc add hl, bc
pop bc pop bc
dec e dec e
@ -449,7 +449,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
ld a, -1 ld a, -1
ld [wEnemyAISwitchScore], a ld [wEnemyAISwitchScore], a
ld hl, OTPartyMon1Moves ld hl, wOTPartyMon1Moves
ld b, 1 << (PARTY_LENGTH - 1) ld b, 1 << (PARTY_LENGTH - 1)
ld d, 0 ld d, 0
ld e, 0 ld e, 0
@ -480,7 +480,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
; check type matchups ; check type matchups
inc hl inc hl
call GetMoveByte call GetMoveByte
ld hl, BattleMonType1 ld hl, wBattleMonType1
call CheckTypeMatchup call CheckTypeMatchup
; if immune or not very effective: continue ; if immune or not very effective: continue
@ -556,7 +556,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
FindEnemyMonsThatResistPlayer: ; 34b20 FindEnemyMonsThatResistPlayer: ; 34b20
push bc push bc
ld hl, OTPartySpecies ld hl, wOTPartySpecies
ld b, 1 << (PARTY_LENGTH - 1) ld b, 1 << (PARTY_LENGTH - 1)
ld c, 0 ld c, 0
@ -566,9 +566,9 @@ FindEnemyMonsThatResistPlayer: ; 34b20
jr z, .done jr z, .done
push hl push hl
ld [CurSpecies], a ld [wCurSpecies], a
call GetBaseData call GetBaseData
ld a, [LastPlayerCounterMove] ld a, [wLastPlayerCounterMove]
and a and a
jr z, .skip_move jr z, .skip_move
@ -583,16 +583,16 @@ FindEnemyMonsThatResistPlayer: ; 34b20
jr .check_type jr .check_type
.skip_move .skip_move
ld a, [BattleMonType1] ld a, [wBattleMonType1]
ld hl, BaseType ld hl, wBaseType
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 cp 10 + 1
jr nc, .dont_choose_mon jr nc, .dont_choose_mon
ld a, [BattleMonType2] ld a, [wBattleMonType2]
.check_type .check_type
ld hl, BaseType ld hl, wBaseType
call CheckTypeMatchup call CheckTypeMatchup
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
cp 10 + 1 cp 10 + 1
@ -618,10 +618,10 @@ FindEnemyMonsThatResistPlayer: ; 34b20
FindEnemyMonsWithAtLeastQuarterMaxHP: ; 34b77 FindEnemyMonsWithAtLeastQuarterMaxHP: ; 34b77
push bc push bc
ld de, OTPartySpecies ld de, wOTPartySpecies
ld b, 1 << (PARTY_LENGTH - 1) ld b, 1 << (PARTY_LENGTH - 1)
ld c, 0 ld c, 0
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
.loop .loop
ld a, [de] ld a, [de]

8
engine/battle/anim_hp_bar.asm
View File

@ -275,10 +275,10 @@ HPBarAnim_UpdateHPRemaining: ; d784
ld [hld], a ld [hld], a
dec hl dec hl
ld a, [wCurHPAnimOldHP] ld a, [wCurHPAnimOldHP]
ld [StringBuffer2 + 1], a ld [wStringBuffer2 + 1], a
ld a, [wCurHPAnimOldHP + 1] ld a, [wCurHPAnimOldHP + 1]
ld [StringBuffer2], a ld [wStringBuffer2], a
ld de, StringBuffer2 ld de, wStringBuffer2
lb bc, 2, 3 lb bc, 2, 3
call PrintNum call PrintNum
pop hl pop hl
@ -311,7 +311,7 @@ HPBarAnim_BGMapUpdate: ; d7c9
jr z, .load_0 jr z, .load_0
cp $1 cp $1
jr z, .load_1 jr z, .load_1
ld a, [CurPartyMon] ld a, [wCurPartyMon]
cp $3 cp $3
jr nc, .bottom_half_of_screen jr nc, .bottom_half_of_screen
ld c, $0 ld c, $0

30
engine/battle/battle_transition.asm
View File

@ -198,12 +198,12 @@ BattleTransitionJumptable: ; 8c314
StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365) StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
; The screen flashes a different number of times depending on the level of ; The screen flashes a different number of times depending on the level of
; your lead Pokemon relative to the opponent's. ; your lead Pokemon relative to the opponent's.
; BUG: BattleMonLevel and EnemyMonLevel are not set at this point, so whatever ; BUG: wBattleMonLevel and wEnemyMonLevel are not set at this point, so whatever
; values happen to be there will determine the animation. ; values happen to be there will determine the animation.
ld de, 0 ld de, 0
ld a, [BattleMonLevel] ld a, [wBattleMonLevel]
add 3 add 3
ld hl, EnemyMonLevel ld hl, wEnemyMonLevel
cp [hl] cp [hl]
jr nc, .okay jr nc, .okay
set 0, e set 0, e
@ -298,7 +298,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8) StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8)
farcall Function5602 farcall Function5602
ld a, BANK(LYOverrides) ld a, BANK(wLYOverrides)
ld [rSVBK], a ld [rSVBK], a
call StartTrainerBattle_NextScene call StartTrainerBattle_NextScene
@ -334,8 +334,8 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
ld d, [hl] ld d, [hl]
add [hl] add [hl]
ld [hl], a ld [hl], a
ld a, LYOverridesEnd - LYOverrides ld a, wLYOverridesEnd - wLYOverrides
ld bc, LYOverrides ld bc, wLYOverrides
ld e, $0 ld e, $0
.loop .loop
@ -356,7 +356,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408)
StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d) StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d)
farcall Function5602 farcall Function5602
ld a, BANK(LYOverrides) ld a, BANK(wLYOverrides)
ld [rSVBK], a ld [rSVBK], a
call StartTrainerBattle_NextScene call StartTrainerBattle_NextScene
xor a xor a
@ -498,7 +498,7 @@ ENDM
StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578) StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
farcall Function5602 farcall Function5602
ld a, BANK(LYOverrides) ld a, BANK(wLYOverrides)
ld [rSVBK], a ld [rSVBK], a
call StartTrainerBattle_NextScene call StartTrainerBattle_NextScene
ld a, $10 ld a, $10
@ -566,13 +566,13 @@ StartTrainerBattle_SpeckleToBlack: ; 8c58f (23:458f)
ret ret
StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ld a, [OtherTrainerClass] ld a, [wOtherTrainerClass]
and a and a
jp z, .nextscene ; don't need to be here if wild jp z, .nextscene ; don't need to be here if wild
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
hlcoord 0, 0, AttrMap hlcoord 0, 0, wAttrMap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
inc b inc b
inc c inc c
@ -639,7 +639,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
.cgb .cgb
ld hl, .daypals ld hl, .daypals
ld a, [TimeOfDayPal] ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES maskbits NUM_DAYTIMES
cp DARKNESS_F cp DARKNESS_F
jr nz, .daytime jr nz, .daytime
@ -699,7 +699,7 @@ INCLUDE "gfx/overworld/trainer_battle_nite.pal"
; 8c6b1 ; 8c6b1
.loadpokeballgfx .loadpokeballgfx
ld a, [OtherTrainerClass] ld a, [wOtherTrainerClass]
ld de, PokeBallTransition ld de, PokeBallTransition
ret ret
@ -724,12 +724,12 @@ PokeBallTransition:
WipeLYOverrides: ; 8c6d8 WipeLYOverrides: ; 8c6d8
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, BANK(LYOverrides) ld a, BANK(wLYOverrides)
ld [rSVBK], a ld [rSVBK], a
ld hl, LYOverrides ld hl, wLYOverrides
call .wipe call .wipe
ld hl, LYOverridesBackup ld hl, wLYOverridesBackup
call .wipe call .wipe
pop af pop af

2
engine/battle/checkbattlescene.asm
View File

@ -7,7 +7,7 @@ CheckBattleScene: ; 4ea44
cp LINK_MOBILE cp LINK_MOBILE
jr z, .mobile jr z, .mobile
ld a, [Options] ld a, [wOptions]
bit BATTLE_SCENE, a bit BATTLE_SCENE, a
jr nz, .off jr nz, .off

12
engine/battle/consumehelditem.asm
View File

@ -4,13 +4,13 @@ ConsumeHeldItem: ; 27192
push bc push bc
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
ld hl, OTPartyMon1Item ld hl, wOTPartyMon1Item
ld de, EnemyMonItem ld de, wEnemyMonItem
ld a, [CurOTMon] ld a, [wCurOTMon]
jr z, .theirturn jr z, .theirturn
ld hl, PartyMon1Item ld hl, wPartyMon1Item
ld de, BattleMonItem ld de, wBattleMonItem
ld a, [CurBattleMon] ld a, [wCurBattleMon]
.theirturn .theirturn
push hl push hl

1609
engine/battle/core.asm
View File

File diff suppressed because it is too large Load Diff

946
engine/battle/effect_commands.asm
View File

File diff suppressed because it is too large Load Diff

4
engine/battle/hidden_power.asm
View File

@ -1,11 +1,11 @@
HiddenPowerDamage: ; fbced HiddenPowerDamage: ; fbced
; Override Hidden Power's type and power based on the user's DVs. ; Override Hidden Power's type and power based on the user's DVs.
ld hl, BattleMonDVs ld hl, wBattleMonDVs
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_dvs jr z, .got_dvs
ld hl, EnemyMonDVs ld hl, wEnemyMonDVs
.got_dvs .got_dvs

14
engine/battle/link_result.asm
View File

@ -1,9 +1,9 @@
DetermineLinkBattleResult: ; 2b930 DetermineLinkBattleResult: ; 2b930
farcall UpdateEnemyMonInParty farcall UpdateEnemyMonInParty
ld hl, PartyMon1HP ld hl, wPartyMon1HP
call .CountMonsRemaining call .CountMonsRemaining
push bc push bc
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
call .CountMonsRemaining call .CountMonsRemaining
ld a, c ld a, c
pop bc pop bc
@ -20,10 +20,10 @@ DetermineLinkBattleResult: ; 2b930
jr z, .victory jr z, .victory
cp $2 cp $2
jr z, .defeat jr z, .defeat
ld hl, PartyMon1HP ld hl, wPartyMon1HP
call .CalcPercentHPRemaining call .CalcPercentHPRemaining
push de push de
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
call .CalcPercentHPRemaining call .CalcPercentHPRemaining
pop hl pop hl
ld a, d ld a, d
@ -118,16 +118,16 @@ DetermineLinkBattleResult: ; 2b930
ret ret
.BothSides_CheckNumberMonsAtFullHealth: ; 2b9e1 .BothSides_CheckNumberMonsAtFullHealth: ; 2b9e1
ld hl, PartyMon1HP ld hl, wPartyMon1HP
call .CheckFaintedOrFullHealth call .CheckFaintedOrFullHealth
jr nz, .finish ; we have a pokemon that's neither fainted nor at full health jr nz, .finish ; we have a pokemon that's neither fainted nor at full health
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
call .CheckFaintedOrFullHealth call .CheckFaintedOrFullHealth
ld e, $1 ld e, $1
ret ret
.finish .finish
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
call .CheckFaintedOrFullHealth call .CheckFaintedOrFullHealth
ld e, $0 ld e, $0
ret nz ; we both have pokemon that are neither fainted nor at full health ret nz ; we both have pokemon that are neither fainted nor at full health

18
engine/battle/misc.asm
View File

@ -53,7 +53,7 @@ GetPlayerBackpicCoords: ; fbd9d (3e:7d9d)
DoWeatherModifiers: ; fbda4 DoWeatherModifiers: ; fbda4
ld de, WeatherTypeModifiers ld de, WeatherTypeModifiers
ld a, [Weather] ld a, [wBattleWeather]
ld b, a ld b, a
ld a, [wd265] ; move type ld a, [wd265] ; move type
ld c, a ld c, a
@ -105,7 +105,7 @@ DoWeatherModifiers: ; fbda4
.ApplyModifier: .ApplyModifier:
xor a xor a
ld [hMultiplicand + 0], a ld [hMultiplicand + 0], a
ld hl, CurDamage ld hl, wCurDamage
ld a, [hli] ld a, [hli]
ld [hMultiplicand + 1], a ld [hMultiplicand + 1], a
ld a, [hl] ld a, [hl]
@ -138,9 +138,9 @@ DoWeatherModifiers: ; fbda4
.Update: .Update:
ld a, b ld a, b
ld [CurDamage], a ld [wCurDamage], a
ld a, c ld a, c
ld [CurDamage + 1], a ld [wCurDamage + 1], a
.done .done
ret ret
@ -153,7 +153,7 @@ DoBadgeTypeBoosts: ; fbe24
and a and a
ret nz ret nz
ld a, [InBattleTowerBattle] ld a, [wInBattleTowerBattle]
and a and a
ret nz ret nz
@ -189,10 +189,10 @@ DoBadgeTypeBoosts: ; fbe24
jr .CheckBadge jr .CheckBadge
.ApplyBoost: .ApplyBoost:
ld a, [CurDamage] ld a, [wCurDamage]
ld h, a ld h, a
ld d, a ld d, a
ld a, [CurDamage + 1] ld a, [wCurDamage + 1]
ld l, a ld l, a
ld e, a ld e, a
@ -216,9 +216,9 @@ DoBadgeTypeBoosts: ; fbe24
.Update: .Update:
ld a, h ld a, h
ld [CurDamage], a ld [wCurDamage], a
ld a, l ld a, l
ld [CurDamage + 1], a ld [wCurDamage + 1], a
.done .done
pop bc pop bc

24
engine/battle/move_effects/attract.asm
View File

@ -1,6 +1,6 @@
BattleCommand_Attract: ; 377ce BattleCommand_Attract: ; 377ce
; attract ; attract
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed
call CheckOppositeGender call CheckOppositeGender
@ -28,12 +28,12 @@ CheckOppositeGender: ; 377f5
ld a, MON_SPECIES ld a, MON_SPECIES
call BattlePartyAttr call BattlePartyAttr
ld a, [hl] ld a, [hl]
ld [CurPartySpecies], a ld [wCurPartySpecies], a
ld a, [CurBattleMon] ld a, [wCurBattleMon]
ld [CurPartyMon], a ld [wCurPartyMon], a
xor a xor a
ld [MonType], a ld [wMonType], a
farcall GetGender farcall GetGender
jr c, .genderless_samegender jr c, .genderless_samegender
@ -44,20 +44,20 @@ CheckOppositeGender: ; 377f5
.got_gender .got_gender
push bc push bc
ld a, [TempEnemyMonSpecies] ld a, [wTempEnemyMonSpecies]
ld [CurPartySpecies], a ld [wCurPartySpecies], a
ld hl, EnemyMonDVs ld hl, wEnemyMonDVs
ld a, [EnemySubStatus5] ld a, [wEnemySubStatus5]
bit SUBSTATUS_TRANSFORMED, a bit SUBSTATUS_TRANSFORMED, a
jr z, .not_transformed jr z, .not_transformed
ld hl, wEnemyBackupDVs ld hl, wEnemyBackupDVs
.not_transformed .not_transformed
ld a, [hli] ld a, [hli]
ld [TempMonDVs], a ld [wTempMonDVs], a
ld a, [hl] ld a, [hl]
ld [TempMonDVs + 1], a ld [wTempMonDVs + 1], a
ld a, 3 ld a, 3
ld [MonType], a ld [wMonType], a
farcall GetGender farcall GetGender
pop bc pop bc
jr c, .genderless_samegender jr c, .genderless_samegender

26
engine/battle/move_effects/baton_pass.asm
View File

@ -90,7 +90,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
ret z ret z
ld a, 1 ld a, 1
ld [wPlayerAction], a ld [wBattlePlayerAction], a
call LoadStandardMenuHeader call LoadStandardMenuHeader
ld hl, LinkBattleSendReceiveAction ld hl, LinkBattleSendReceiveAction
@ -98,7 +98,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67
call CloseWindow call CloseWindow
xor a xor a
ld [wPlayerAction], a ld [wBattlePlayerAction], a
ret ret
; 37a82 ; 37a82
@ -113,7 +113,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
ld hl, LinkBattleSendReceiveAction ld hl, LinkBattleSendReceiveAction
call CallBattleCore call CallBattleCore
ld a, [OTPartyCount] ld a, [wOTPartyCount]
add BATTLEACTION_SWITCH1 add BATTLEACTION_SWITCH1
ld b, a ld b, a
ld a, [wBattleAction] ld a, [wBattleAction]
@ -123,7 +123,7 @@ BatonPass_LinkEnemySwitch: ; 37a82
jr c, .switch jr c, .switch
.baton_pass .baton_pass
ld a, [CurOTMon] ld a, [wCurOTMon]
add BATTLEACTION_SWITCH1 add BATTLEACTION_SWITCH1
ld [wBattleAction], a ld [wBattleAction], a
.switch .switch
@ -157,11 +157,11 @@ ResetBatonPassStatus: ; 37ab1
call ResetActorDisable call ResetActorDisable
; Attraction isn't passed. ; Attraction isn't passed.
ld hl, PlayerSubStatus1 ld hl, wPlayerSubStatus1
res SUBSTATUS_IN_LOVE, [hl] res SUBSTATUS_IN_LOVE, [hl]
ld hl, EnemySubStatus1 ld hl, wEnemySubStatus1
res SUBSTATUS_IN_LOVE, [hl] res SUBSTATUS_IN_LOVE, [hl]
ld hl, PlayerSubStatus5 ld hl, wPlayerSubStatus5
ld a, BATTLE_VARS_SUBSTATUS5 ld a, BATTLE_VARS_SUBSTATUS5
call GetBattleVarAddr call GetBattleVarAddr
@ -182,10 +182,10 @@ ResetBatonPassStatus: ; 37ab1
CheckAnyOtherAlivePartyMons: ; 37ae9 CheckAnyOtherAlivePartyMons: ; 37ae9
ld hl, PartyMon1HP ld hl, wPartyMon1HP
ld a, [PartyCount] ld a, [wPartyCount]
ld d, a ld d, a
ld a, [CurBattleMon] ld a, [wCurBattleMon]
ld e, a ld e, a
jr CheckAnyOtherAliveMons jr CheckAnyOtherAliveMons
@ -193,10 +193,10 @@ CheckAnyOtherAlivePartyMons: ; 37ae9
CheckAnyOtherAliveEnemyMons: ; 37af6 CheckAnyOtherAliveEnemyMons: ; 37af6
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
ld a, [OTPartyCount] ld a, [wOTPartyCount]
ld d, a ld d, a
ld a, [CurOTMon] ld a, [wCurOTMon]
ld e, a ld e, a
; fallthrough ; fallthrough

60
engine/battle/move_effects/beat_up.asm
View File

@ -5,27 +5,27 @@ BattleCommand_BeatUp: ; 35461
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jp nz, .enemy_beats_up jp nz, .enemy_beats_up
ld a, [PlayerSubStatus3] ld a, [wPlayerSubStatus3]
bit SUBSTATUS_IN_LOOP, a bit SUBSTATUS_IN_LOOP, a
jr nz, .next_mon jr nz, .next_mon
ld c, 20 ld c, 20
call DelayFrames call DelayFrames
xor a xor a
ld [PlayerRolloutCount], a ld [wPlayerRolloutCount], a
ld [wd002], a ld [wd002], a
ld [wBeatUpHitAtLeastOnce], a ld [wBeatUpHitAtLeastOnce], a
jr .got_mon jr .got_mon
.next_mon .next_mon
ld a, [PlayerRolloutCount] ld a, [wPlayerRolloutCount]
ld b, a ld b, a
ld a, [PartyCount] ld a, [wPartyCount]
sub b sub b
ld [wd002], a ld [wd002], a
.got_mon .got_mon
ld a, [wd002] ld a, [wd002]
ld hl, PartyMonNicknames ld hl, wPartyMonNicknames
call GetNick call GetNick
ld a, MON_HP ld a, MON_HP
call GetBeatupMonLocation call GetBeatupMonLocation
@ -34,11 +34,11 @@ BattleCommand_BeatUp: ; 35461
jp z, .beatup_fail ; fainted jp z, .beatup_fail ; fainted
ld a, [wd002] ld a, [wd002]
ld c, a ld c, a
ld a, [CurBattleMon] ld a, [wCurBattleMon]
; BUG: this can desynchronize link battles ; BUG: this can desynchronize link battles
; Change "cp [hl]" to "cp c" to fix ; Change "cp [hl]" to "cp c" to fix
cp [hl] cp [hl]
ld hl, BattleMonStatus ld hl, wBattleMonStatus
jr z, .active_mon jr z, .active_mon
ld a, MON_STATUS ld a, MON_STATUS
call GetBeatupMonLocation call GetBeatupMonLocation
@ -51,18 +51,18 @@ BattleCommand_BeatUp: ; 35461
ld [wBeatUpHitAtLeastOnce], a ld [wBeatUpHitAtLeastOnce], a
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextBox
ld a, [EnemyMonSpecies] ld a, [wEnemyMonSpecies]
ld [CurSpecies], a ld [wCurSpecies], a
call GetBaseData call GetBaseData
ld a, [BaseDefense] ld a, [wBaseDefense]
ld c, a ld c, a
push bc push bc
ld a, MON_SPECIES ld a, MON_SPECIES
call GetBeatupMonLocation call GetBeatupMonLocation
ld a, [hl] ld a, [hl]
ld [CurSpecies], a ld [wCurSpecies], a
call GetBaseData call GetBaseData
ld a, [BaseAttack] ld a, [wBaseAttack]
pop bc pop bc
ld b, a ld b, a
push bc push bc
@ -76,20 +76,20 @@ BattleCommand_BeatUp: ; 35461
ret ret
.enemy_beats_up .enemy_beats_up
ld a, [EnemySubStatus3] ld a, [wEnemySubStatus3]
bit SUBSTATUS_IN_LOOP, a bit SUBSTATUS_IN_LOOP, a
jr nz, .not_first_enemy_beatup jr nz, .not_first_enemy_beatup
xor a xor a
ld [EnemyRolloutCount], a ld [wEnemyRolloutCount], a
ld [wd002], a ld [wd002], a
ld [wBeatUpHitAtLeastOnce], a ld [wBeatUpHitAtLeastOnce], a
jr .enemy_continue jr .enemy_continue
.not_first_enemy_beatup .not_first_enemy_beatup
ld a, [EnemyRolloutCount] ld a, [wEnemyRolloutCount]
ld b, a ld b, a
ld a, [OTPartyCount] ld a, [wOTPartyCount]
sub b sub b
ld [wd002], a ld [wd002], a
.enemy_continue .enemy_continue
@ -101,14 +101,14 @@ BattleCommand_BeatUp: ; 35461
and a and a
jr nz, .link_or_tower jr nz, .link_or_tower
ld a, [InBattleTowerBattle] ld a, [wInBattleTowerBattle]
and a and a
jr nz, .link_or_tower jr nz, .link_or_tower
ld a, [wd002] ld a, [wd002]
ld c, a ld c, a
ld b, 0 ld b, 0
ld hl, OTPartySpecies ld hl, wOTPartySpecies
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
@ -117,10 +117,10 @@ BattleCommand_BeatUp: ; 35461
.link_or_tower .link_or_tower
ld a, [wd002] ld a, [wd002]
ld hl, OTPartyMonNicknames ld hl, wOTPartyMonNicknames
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call AddNTimes call AddNTimes
ld de, StringBuffer1 ld de, wStringBuffer1
call CopyBytes call CopyBytes
.got_enemy_nick .got_enemy_nick
ld a, MON_HP ld a, MON_HP
@ -130,9 +130,9 @@ BattleCommand_BeatUp: ; 35461
jp z, .beatup_fail jp z, .beatup_fail
ld a, [wd002] ld a, [wd002]
ld b, a ld b, a
ld a, [CurOTMon] ld a, [wCurOTMon]
cp b cp b
ld hl, EnemyMonStatus ld hl, wEnemyMonStatus
jr z, .active_enemy jr z, .active_enemy
ld a, MON_STATUS ld a, MON_STATUS
@ -147,7 +147,7 @@ BattleCommand_BeatUp: ; 35461
jr .finish_beatup jr .finish_beatup
.wild .wild
ld a, [EnemyMonSpecies] ld a, [wEnemyMonSpecies]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
@ -157,18 +157,18 @@ BattleCommand_BeatUp: ; 35461
.finish_beatup .finish_beatup
ld hl, BeatUpAttackText ld hl, BeatUpAttackText
call StdBattleTextBox call StdBattleTextBox
ld a, [BattleMonSpecies] ld a, [wBattleMonSpecies]
ld [CurSpecies], a ld [wCurSpecies], a
call GetBaseData call GetBaseData
ld a, [BaseDefense] ld a, [wBaseDefense]
ld c, a ld c, a
push bc push bc
ld a, MON_SPECIES ld a, MON_SPECIES
call GetBeatupMonLocation call GetBeatupMonLocation
ld a, [hl] ld a, [hl]
ld [CurSpecies], a ld [wCurSpecies], a
call GetBaseData call GetBaseData
ld a, [BaseAttack] ld a, [wBaseAttack]
pop bc pop bc
ld b, a ld b, a
push bc push bc
@ -207,9 +207,9 @@ GetBeatupMonLocation: ; 355bd
ld b, 0 ld b, 0
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
ld hl, PartyMon1Species ld hl, wPartyMon1Species
jr z, .got_species jr z, .got_species
ld hl, OTPartyMon1Species ld hl, wOTPartyMon1Species
.got_species .got_species
ld a, [wd002] ld a, [wd002]

2
engine/battle/move_effects/belly_drum.asm
View File

@ -4,7 +4,7 @@ BattleCommand_BellyDrum: ; 37c1a
; before checking that it has enough HP to use the move. ; before checking that it has enough HP to use the move.
; Swap the order of these two blocks to fix. ; Swap the order of these two blocks to fix.
call BattleCommand_AttackUp2 call BattleCommand_AttackUp2
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed

26
engine/battle/move_effects/bide.asm
View File

@ -6,11 +6,11 @@ BattleCommand_StoreEnergy: ; 36671
bit SUBSTATUS_BIDE, a bit SUBSTATUS_BIDE, a
ret z ret z
ld hl, PlayerRolloutCount ld hl, wPlayerRolloutCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .check_still_storing_energy jr z, .check_still_storing_energy
ld hl, EnemyRolloutCount ld hl, wEnemyRolloutCount
.check_still_storing_energy .check_still_storing_energy
dec [hl] dec [hl]
jr nz, .still_storing jr nz, .still_storing
@ -26,30 +26,30 @@ BattleCommand_StoreEnergy: ; 36671
call GetBattleVarAddr call GetBattleVarAddr
ld a, 1 ld a, 1
ld [hl], a ld [hl], a
ld hl, PlayerDamageTaken + 1 ld hl, wPlayerDamageTaken + 1
ld de, wPlayerCharging ; player ld de, wPlayerCharging ; player
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .player jr z, .player
ld hl, EnemyDamageTaken + 1 ld hl, wEnemyDamageTaken + 1
ld de, wEnemyCharging ; enemy ld de, wEnemyCharging ; enemy
.player .player
ld a, [hld] ld a, [hld]
add a add a
ld b, a ld b, a
ld [CurDamage + 1], a ld [wCurDamage + 1], a
ld a, [hl] ld a, [hl]
rl a rl a
ld [CurDamage], a ld [wCurDamage], a
jr nc, .not_maxed jr nc, .not_maxed
ld a, $ff ld a, $ff
ld [CurDamage], a ld [wCurDamage], a
ld [CurDamage + 1], a ld [wCurDamage + 1], a
.not_maxed .not_maxed
or b or b
jr nz, .built_up_something jr nz, .built_up_something
ld a, 1 ld a, 1
ld [AttackMissed], a ld [wAttackMissed], a
.built_up_something .built_up_something
xor a xor a
ld [hli], a ld [hli], a
@ -75,13 +75,13 @@ BattleCommand_StoreEnergy: ; 36671
BattleCommand_UnleashEnergy: ; 366e5 BattleCommand_UnleashEnergy: ; 366e5
; unleashenergy ; unleashenergy
ld de, PlayerDamageTaken ld de, wPlayerDamageTaken
ld bc, PlayerRolloutCount ld bc, wPlayerRolloutCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_damage jr z, .got_damage
ld de, EnemyDamageTaken ld de, wEnemyDamageTaken
ld bc, EnemyRolloutCount ld bc, wEnemyRolloutCount
.got_damage .got_damage
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr call GetBattleVarAddr

14
engine/battle/move_effects/conversion.asm
View File

@ -1,17 +1,17 @@
BattleCommand_Conversion: ; 3707f BattleCommand_Conversion: ; 3707f
; conversion ; conversion
ld hl, BattleMonMoves ld hl, wBattleMonMoves
ld de, BattleMonType1 ld de, wBattleMonType1
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_moves jr z, .got_moves
ld hl, EnemyMonMoves ld hl, wEnemyMonMoves
ld de, EnemyMonType1 ld de, wEnemyMonType1
.got_moves .got_moves
push de push de
ld c, 0 ld c, 0
ld de, StringBuffer1 ld de, wStringBuffer1
.loop .loop
push hl push hl
ld b, 0 ld b, 0
@ -41,7 +41,7 @@ BattleCommand_Conversion: ; 3707f
inc de inc de
ld [de], a ld [de], a
pop de pop de
ld hl, StringBuffer1 ld hl, wStringBuffer1
.loop2 .loop2
ld a, [hl] ld a, [hl]
cp -1 cp -1
@ -70,7 +70,7 @@ BattleCommand_Conversion: ; 3707f
maskbits NUM_MOVES maskbits NUM_MOVES
ld c, a ld c, a
ld b, 0 ld b, 0
ld hl, StringBuffer1 ld hl, wStringBuffer1
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
cp -1 cp -1

6
engine/battle/move_effects/conversion2.asm
View File

@ -1,14 +1,14 @@
BattleCommand_Conversion2: ; 359e6 BattleCommand_Conversion2: ; 359e6
; conversion2 ; conversion2
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed
ld hl, BattleMonType1 ld hl, wBattleMonType1
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_type jr z, .got_type
ld hl, EnemyMonType1 ld hl, wEnemyMonType1
.got_type .got_type
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar

12
engine/battle/move_effects/counter.asm
View File

@ -2,7 +2,7 @@ BattleCommand_Counter: ; 35813
; counter ; counter
ld a, 1 ld a, 1
ld [AttackMissed], a ld [wAttackMissed], a
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
and a and a
@ -25,18 +25,18 @@ BattleCommand_Counter: ; 35813
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
dec a dec a
ld de, StringBuffer1 ld de, wStringBuffer1
call GetMoveData call GetMoveData
ld a, [StringBuffer1 + MOVE_POWER] ld a, [wStringBuffer1 + MOVE_POWER]
and a and a
ret z ret z
ld a, [StringBuffer1 + MOVE_TYPE] ld a, [wStringBuffer1 + MOVE_TYPE]
cp SPECIAL cp SPECIAL
ret nc ret nc
ld hl, CurDamage ld hl, wCurDamage
ld a, [hli] ld a, [hli]
or [hl] or [hl]
ret z ret z
@ -54,7 +54,7 @@ BattleCommand_Counter: ; 35813
.capped .capped
xor a xor a
ld [AttackMissed], a ld [wAttackMissed], a
ret ret
; 35864 ; 35864

8
engine/battle/move_effects/curse.asm
View File

@ -1,13 +1,13 @@
BattleCommand_Curse: ; 37588 BattleCommand_Curse: ; 37588
; curse ; curse
ld de, BattleMonType1 ld de, wBattleMonType1
ld bc, PlayerStatLevels ld bc, wPlayerStatLevels
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .go jr z, .go
ld de, EnemyMonType1 ld de, wEnemyMonType1
ld bc, EnemyStatLevels ld bc, wEnemyStatLevels
.go .go

16
engine/battle/move_effects/disable.asm
View File

@ -1,17 +1,17 @@
BattleCommand_Disable: ; 36fed BattleCommand_Disable: ; 36fed
; disable ; disable
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed
ld de, EnemyDisableCount ld de, wEnemyDisableCount
ld hl, EnemyMonMoves ld hl, wEnemyMonMoves
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_moves jr z, .got_moves
ld de, PlayerDisableCount ld de, wPlayerDisableCount
ld hl, BattleMonMoves ld hl, wBattleMonMoves
.got_moves .got_moves
ld a, [de] ld a, [de]
@ -35,9 +35,9 @@ BattleCommand_Disable: ; 36fed
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
ld hl, EnemyMonPP ld hl, wEnemyMonPP
jr z, .got_pp jr z, .got_pp
ld hl, BattleMonPP ld hl, wBattleMonPP
.got_pp .got_pp
ld b, 0 ld b, 0
add hl, bc add hl, bc
@ -54,7 +54,7 @@ BattleCommand_Disable: ; 36fed
add c add c
ld [de], a ld [de], a
call AnimateCurrentMove call AnimateCurrentMove
ld hl, DisabledMove ld hl, wDisabledMove
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr nz, .got_disabled_move_pointer jr nz, .got_disabled_move_pointer

28
engine/battle/move_effects/encore.asm
View File

@ -1,13 +1,13 @@
BattleCommand_Encore: ; 35864 BattleCommand_Encore: ; 35864
; encore ; encore
ld hl, EnemyMonMoves ld hl, wEnemyMonMoves
ld de, EnemyEncoreCount ld de, wEnemyEncoreCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .ok jr z, .ok
ld hl, BattleMonMoves ld hl, wBattleMonMoves
ld de, PlayerEncoreCount ld de, wPlayerEncoreCount
.ok .ok
ld a, BATTLE_VARS_LAST_MOVE_OPP ld a, BATTLE_VARS_LAST_MOVE_OPP
call GetBattleVar call GetBattleVar
@ -26,12 +26,12 @@ BattleCommand_Encore: ; 35864
cp b cp b
jr nz, .got_move jr nz, .got_move
ld bc, BattleMonPP - BattleMonMoves - 1 ld bc, wBattleMonPP - wBattleMonMoves - 1
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
and PP_MASK and PP_MASK
jp z, .failed jp z, .failed
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jp nz, .failed jp nz, .failed
ld a, BATTLE_VARS_SUBSTATUS5_OPP ld a, BATTLE_VARS_SUBSTATUS5_OPP
@ -52,10 +52,10 @@ BattleCommand_Encore: ; 35864
jr z, .force_last_enemy_move jr z, .force_last_enemy_move
push hl push hl
ld a, [LastPlayerMove] ld a, [wLastPlayerMove]
ld b, a ld b, a
ld c, 0 ld c, 0
ld hl, BattleMonMoves ld hl, wBattleMonMoves
.find_player_move .find_player_move
ld a, [hli] ld a, [hli]
cp b cp b
@ -73,9 +73,9 @@ BattleCommand_Encore: ; 35864
.got_player_move .got_player_move
pop hl pop hl
ld a, c ld a, c
ld [CurMoveNum], a ld [wCurMoveNum], a
ld a, b ld a, b
ld [CurPlayerMove], a ld [wCurPlayerMove], a
dec a dec a
ld de, wPlayerMoveStruct ld de, wPlayerMoveStruct
call GetMoveData call GetMoveData
@ -83,10 +83,10 @@ BattleCommand_Encore: ; 35864
.force_last_enemy_move .force_last_enemy_move
push hl push hl
ld a, [LastEnemyMove] ld a, [wLastEnemyMove]
ld b, a ld b, a
ld c, 0 ld c, 0
ld hl, EnemyMonMoves ld hl, wEnemyMonMoves
.find_enemy_move .find_enemy_move
ld a, [hli] ld a, [hli]
cp b cp b
@ -104,9 +104,9 @@ BattleCommand_Encore: ; 35864
.got_enemy_move .got_enemy_move
pop hl pop hl
ld a, c ld a, c
ld [CurEnemyMoveNum], a ld [wCurEnemyMoveNum], a
ld a, b ld a, b
ld [CurEnemyMove], a ld [wCurEnemyMove], a
dec a dec a
ld de, wEnemyMoveStruct ld de, wEnemyMoveStruct
call GetMoveData call GetMoveData

10
engine/battle/move_effects/false_swipe.asm
View File

@ -1,13 +1,13 @@
BattleCommand_FalseSwipe: ; 35c94 BattleCommand_FalseSwipe: ; 35c94
; falseswipe ; falseswipe
ld hl, EnemyMonHP ld hl, wEnemyMonHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_hp jr z, .got_hp
ld hl, BattleMonHP ld hl, wBattleMonHP
.got_hp .got_hp
ld de, CurDamage ld de, wCurDamage
ld c, 2 ld c, 2
push hl push hl
push de push de
@ -28,11 +28,11 @@ BattleCommand_FalseSwipe: ; 35c94
dec a dec a
ld [de], a ld [de], a
.okay .okay
ld a, [CriticalHit] ld a, [wCriticalHit]
cp 2 cp 2
jr nz, .carry jr nz, .carry
xor a xor a
ld [CriticalHit], a ld [wCriticalHit], a
.carry .carry
scf scf
ret ret

2
engine/battle/move_effects/foresight.asm
View File

@ -1,7 +1,7 @@
BattleCommand_Foresight: ; 376a0 BattleCommand_Foresight: ; 376a0
; foresight ; foresight
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .failed jr nz, .failed

4
engine/battle/move_effects/frustration.asm
View File

@ -2,11 +2,11 @@ BattleCommand_FrustrationPower: ; 3790e
; frustrationpower ; frustrationpower
push bc push bc
ld hl, BattleMonHappiness ld hl, wBattleMonHappiness
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_happiness jr z, .got_happiness
ld hl, EnemyMonHappiness ld hl, wEnemyMonHappiness
.got_happiness .got_happiness
ld a, $ff ld a, $ff
sub [hl] sub [hl]

12
engine/battle/move_effects/fury_cutter.asm
View File

@ -1,14 +1,14 @@
BattleCommand_FuryCutter: ; 37792 BattleCommand_FuryCutter: ; 37792
; furycutter ; furycutter
ld hl, PlayerFuryCutterCount ld hl, wPlayerFuryCutterCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .go jr z, .go
ld hl, EnemyFuryCutterCount ld hl, wEnemyFuryCutterCount
.go .go
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jp nz, ResetFuryCutterCount jp nz, ResetFuryCutterCount
@ -26,7 +26,7 @@ BattleCommand_FuryCutter: ; 37792
ret z ret z
; Double the damage ; Double the damage
ld hl, CurDamage + 1 ld hl, wCurDamage + 1
sla [hl] sla [hl]
dec hl dec hl
rl [hl] rl [hl]
@ -45,11 +45,11 @@ ResetFuryCutterCount: ; 377be
push hl push hl
ld hl, PlayerFuryCutterCount ld hl, wPlayerFuryCutterCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .reset jr z, .reset
ld hl, EnemyFuryCutterCount ld hl, wEnemyFuryCutterCount
.reset .reset
xor a xor a

6
engine/battle/move_effects/future_sight.asm
View File

@ -19,9 +19,9 @@ BattleCommand_CheckFutureSight: ; 37d0d
ld [hl], 0 ld [hl], 0
ld a, [de] ld a, [de]
inc de inc de
ld [CurDamage], a ld [wCurDamage], a
ld a, [de] ld a, [de]
ld [CurDamage + 1], a ld [wCurDamage + 1], a
ld b, futuresight_command ld b, futuresight_command
jp SkipToBattleCommand jp SkipToBattleCommand
@ -64,7 +64,7 @@ BattleCommand_FutureSight: ; 37d34
jr z, .StoreDamage jr z, .StoreDamage
ld de, wEnemyFutureSightDamage ld de, wEnemyFutureSightDamage
.StoreDamage: .StoreDamage:
ld hl, CurDamage ld hl, wCurDamage
ld a, [hl] ld a, [hl]
ld [de], a ld [de], a
ld [hl], 0 ld [hl], 0

4
engine/battle/move_effects/heal_bell.asm
View File

@ -4,11 +4,11 @@ BattleCommand_HealBell: ; 35cc9
ld a, BATTLE_VARS_SUBSTATUS1 ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVarAddr call GetBattleVarAddr
res SUBSTATUS_NIGHTMARE, [hl] res SUBSTATUS_NIGHTMARE, [hl]
ld de, PartyMon1Status ld de, wPartyMon1Status
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_status jr z, .got_status
ld de, OTPartyMon1Status ld de, wOTPartyMon1Status
.got_status .got_status
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
call GetBattleVarAddr call GetBattleVarAddr

2
engine/battle/move_effects/hidden_power.asm
View File

@ -1,7 +1,7 @@
BattleCommand_HiddenPower: ; 37be8 BattleCommand_HiddenPower: ; 37be8
; hiddenpower ; hiddenpower
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
ret nz ret nz
farcall HiddenPowerDamage farcall HiddenPowerDamage

6
engine/battle/move_effects/leech_seed.asm
View File

@ -1,16 +1,16 @@
BattleCommand_LeechSeed: ; 36f9d BattleCommand_LeechSeed: ; 36f9d
; leechseed ; leechseed
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .evaded jr nz, .evaded
call CheckSubstituteOpp call CheckSubstituteOpp
jr nz, .evaded jr nz, .evaded
ld de, EnemyMonType1 ld de, wEnemyMonType1
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .ok jr z, .ok
ld de, BattleMonType1 ld de, wBattleMonType1
.ok .ok
ld a, [de] ld a, [de]

2
engine/battle/move_effects/lock_on.asm
View File

@ -4,7 +4,7 @@ BattleCommand_LockOn: ; 35a53
call CheckSubstituteOpp call CheckSubstituteOpp
jr nz, .fail jr nz, .fail
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .fail jr nz, .fail

8
engine/battle/move_effects/mimic.asm
View File

@ -3,14 +3,14 @@ BattleCommand_Mimic: ; 36f46
call ClearLastMove call ClearLastMove
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .fail jr nz, .fail
ld hl, BattleMonMoves ld hl, wBattleMonMoves
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .player_turn jr z, .player_turn
ld hl, EnemyMonMoves ld hl, wEnemyMonMoves
.player_turn .player_turn
call CheckHiddenOpponent call CheckHiddenOpponent
jr nz, .fail jr nz, .fail
@ -38,7 +38,7 @@ BattleCommand_Mimic: ; 36f46
call GetBattleVar call GetBattleVar
ld [hl], a ld [hl], a
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
ld bc, BattleMonPP - BattleMonMoves ld bc, wBattleMonPP - wBattleMonMoves
add hl, bc add hl, bc
ld [hl], 5 ld [hl], 5
call GetMoveName call GetMoveName

12
engine/battle/move_effects/mirror_coat.asm
View File

@ -2,7 +2,7 @@ BattleCommand_MirrorCoat: ; 37c95
; mirrorcoat ; mirrorcoat
ld a, 1 ld a, 1
ld [AttackMissed], a ld [wAttackMissed], a
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
@ -26,18 +26,18 @@ BattleCommand_MirrorCoat: ; 37c95
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
dec a dec a
ld de, StringBuffer1 ld de, wStringBuffer1
call GetMoveData call GetMoveData
ld a, [StringBuffer1 + 2] ld a, [wStringBuffer1 + 2]
and a and a
ret z ret z
ld a, [StringBuffer1 + 3] ld a, [wStringBuffer1 + 3]
cp SPECIAL cp SPECIAL
ret c ret c
ld hl, CurDamage ld hl, wCurDamage
ld a, [hli] ld a, [hli]
or [hl] or [hl]
ret z ret z
@ -55,7 +55,7 @@ BattleCommand_MirrorCoat: ; 37c95
.capped .capped
xor a xor a
ld [AttackMissed], a ld [wAttackMissed], a
ret ret
; 37ce6 ; 37ce6

44
engine/battle/move_effects/pain_split.asm
View File

@ -1,28 +1,28 @@
BattleCommand_PainSplit: ; 35926 BattleCommand_PainSplit: ; 35926
; painsplit ; painsplit
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jp nz, .ButItFailed jp nz, .ButItFailed
call CheckSubstituteOpp call CheckSubstituteOpp
jp nz, .ButItFailed jp nz, .ButItFailed
call AnimateCurrentMove call AnimateCurrentMove
ld hl, BattleMonMaxHP + 1 ld hl, wBattleMonMaxHP + 1
ld de, EnemyMonMaxHP + 1 ld de, wEnemyMonMaxHP + 1
call .PlayerShareHP call .PlayerShareHP
ld a, $1 ld a, $1
ld [wWhichHPBar], a ld [wWhichHPBar], a
hlcoord 10, 9 hlcoord 10, 9
predef AnimateHPBar predef AnimateHPBar
ld hl, EnemyMonHP ld hl, wEnemyMonHP
ld a, [hli] ld a, [hli]
ld [Buffer4], a ld [wBuffer4], a
ld a, [hli] ld a, [hli]
ld [Buffer3], a ld [wBuffer3], a
ld a, [hli] ld a, [hli]
ld [Buffer2], a ld [wBuffer2], a
ld a, [hl] ld a, [hl]
ld [Buffer1], a ld [wBuffer1], a
call .EnemyShareHP call .EnemyShareHP
xor a xor a
ld [wWhichHPBar], a ld [wWhichHPBar], a
@ -36,28 +36,28 @@ BattleCommand_PainSplit: ; 35926
.PlayerShareHP: .PlayerShareHP:
ld a, [hld] ld a, [hld]
ld [Buffer1], a ld [wBuffer1], a
ld a, [hld] ld a, [hld]
ld [Buffer2], a ld [wBuffer2], a
ld a, [hld] ld a, [hld]
ld b, a ld b, a
ld [Buffer3], a ld [wBuffer3], a
ld a, [hl] ld a, [hl]
ld [Buffer4], a ld [wBuffer4], a
dec de dec de
dec de dec de
ld a, [de] ld a, [de]
dec de dec de
add b add b
ld [CurDamage + 1], a ld [wCurDamage + 1], a
ld b, [hl] ld b, [hl]
ld a, [de] ld a, [de]
adc b adc b
srl a srl a
ld [CurDamage], a ld [wCurDamage], a
ld a, [CurDamage + 1] ld a, [wCurDamage + 1]
rr a rr a
ld [CurDamage + 1], a ld [wCurDamage + 1], a
inc hl inc hl
inc hl inc hl
inc hl inc hl
@ -68,25 +68,25 @@ BattleCommand_PainSplit: ; 35926
.EnemyShareHP: ; 359ac .EnemyShareHP: ; 359ac
ld c, [hl] ld c, [hl]
dec hl dec hl
ld a, [CurDamage + 1] ld a, [wCurDamage + 1]
sub c sub c
ld b, [hl] ld b, [hl]
dec hl dec hl
ld a, [CurDamage] ld a, [wCurDamage]
sbc b sbc b
jr nc, .skip jr nc, .skip
ld a, [CurDamage] ld a, [wCurDamage]
ld b, a ld b, a
ld a, [CurDamage + 1] ld a, [wCurDamage + 1]
ld c, a ld c, a
.skip .skip
ld a, c ld a, c
ld [hld], a ld [hld], a
ld [Buffer5], a ld [wBuffer5], a
ld a, b ld a, b
ld [hli], a ld [hli], a
ld [Buffer6], a ld [wBuffer6], a
ret ret
; 359cd ; 359cd

6
engine/battle/move_effects/pay_day.asm
View File

@ -2,14 +2,14 @@ BattleCommand_PayDay: ; 3705c
; payday ; payday
xor a xor a
ld hl, StringBuffer1 ld hl, wStringBuffer1
ld [hli], a ld [hli], a
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
ld a, [BattleMonLevel] ld a, [wBattleMonLevel]
jr z, .ok jr z, .ok
ld a, [EnemyMonLevel] ld a, [wEnemyMonLevel]
.ok .ok
add a add a

8
engine/battle/move_effects/perish_song.asm
View File

@ -2,8 +2,8 @@ BattleCommand_PerishSong: ; 376c2
; perishsong ; perishsong
ld hl, PlayerSubStatus1 ld hl, wPlayerSubStatus1
ld de, EnemySubStatus1 ld de, wEnemySubStatus1
bit SUBSTATUS_PERISH, [hl] bit SUBSTATUS_PERISH, [hl]
jr z, .ok jr z, .ok
@ -17,7 +17,7 @@ BattleCommand_PerishSong: ; 376c2
set SUBSTATUS_PERISH, [hl] set SUBSTATUS_PERISH, [hl]
ld a, 4 ld a, 4
ld [PlayerPerishCount], a ld [wPlayerPerishCount], a
.enemy .enemy
ld a, [de] ld a, [de]
@ -27,7 +27,7 @@ BattleCommand_PerishSong: ; 376c2
set SUBSTATUS_PERISH, a set SUBSTATUS_PERISH, a
ld [de], a ld [de], a
ld a, 4 ld a, 4
ld [EnemyPerishCount], a ld [wEnemyPerishCount], a
.done .done
call AnimateCurrentMove call AnimateCurrentMove

2
engine/battle/move_effects/present.asm
View File

@ -20,7 +20,7 @@ BattleCommand_Present: ; 37874
ld a, [wTypeMatchup] ld a, [wTypeMatchup]
and a and a
jp z, AnimateFailedMove jp z, AnimateFailedMove
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jp nz, AnimateFailedMove jp nz, AnimateFailedMove

4
engine/battle/move_effects/protect.asm
View File

@ -16,11 +16,11 @@ BattleCommand_Protect: ; 37618
ProtectChance: ; 3762c ProtectChance: ; 3762c
ld de, PlayerProtectCount ld de, wPlayerProtectCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_37637 jr z, .asm_37637
ld de, EnemyProtectCount ld de, wEnemyProtectCount
.asm_37637 .asm_37637
call CheckOpponentWentFirst call CheckOpponentWentFirst

4
engine/battle/move_effects/psych_up.asm
View File

@ -1,8 +1,8 @@
BattleCommand_PsychUp: ; 37c55 BattleCommand_PsychUp: ; 37c55
; psychup ; psychup
ld hl, EnemyStatLevels ld hl, wEnemyStatLevels
ld de, PlayerStatLevels ld de, wPlayerStatLevels
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .pointers_correct jr z, .pointers_correct

2
engine/battle/move_effects/pursuit.asm
View File

@ -12,7 +12,7 @@ BattleCommand_Pursuit: ; 37b1d
and a and a
ret z ret z
ld hl, CurDamage + 1 ld hl, wCurDamage + 1
sla [hl] sla [hl]
dec hl dec hl
rl [hl] rl [hl]

4
engine/battle/move_effects/rain_dance.asm
View File

@ -1,9 +1,9 @@
BattleCommand_StartRain: ; 37bf4 BattleCommand_StartRain: ; 37bf4
; startrain ; startrain
ld a, WEATHER_RAIN ld a, WEATHER_RAIN
ld [Weather], a ld [wBattleWeather], a
ld a, 5 ld a, 5
ld [WeatherCount], a ld [wWeatherCount], a
call AnimateCurrentMove call AnimateCurrentMove
ld hl, DownpourText ld hl, DownpourText
jp StdBattleTextBox jp StdBattleTextBox

4
engine/battle/move_effects/rapid_spin.asm
View File

@ -10,12 +10,12 @@ BattleCommand_ClearHazards: ; 37b39
call StdBattleTextBox call StdBattleTextBox
.not_leeched .not_leeched
ld hl, PlayerScreens ld hl, wPlayerScreens
ld de, wPlayerWrapCount ld de, wPlayerWrapCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_screens_wrap jr z, .got_screens_wrap
ld hl, EnemyScreens ld hl, wEnemyScreens
ld de, wEnemyWrapCount ld de, wEnemyWrapCount
.got_screens_wrap .got_screens_wrap
bit SCREENS_SPIKES, [hl] bit SCREENS_SPIKES, [hl]

4
engine/battle/move_effects/return.asm
View File

@ -1,11 +1,11 @@
BattleCommand_HappinessPower: ; 3784b BattleCommand_HappinessPower: ; 3784b
; happinesspower ; happinesspower
push bc push bc
ld hl, BattleMonHappiness ld hl, wBattleMonHappiness
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .ok jr z, .ok
ld hl, EnemyMonHappiness ld hl, wEnemyMonHappiness
.ok .ok
xor a xor a
ld [hMultiplicand + 0], a ld [hMultiplicand + 0], a

12
engine/battle/move_effects/rollout.asm
View File

@ -4,11 +4,11 @@ MAX_ROLLOUT_COUNT EQU 5
BattleCommand_CheckCurl: ; 37718 BattleCommand_CheckCurl: ; 37718
; checkcurl ; checkcurl
ld de, PlayerRolloutCount ld de, wPlayerRolloutCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .ok jr z, .ok
ld de, EnemyRolloutCount ld de, wEnemyRolloutCount
.ok .ok
ld a, BATTLE_VARS_SUBSTATUS1 ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVar call GetBattleVar
@ -33,11 +33,11 @@ BattleCommand_RolloutPower: ; 37734
and SLP and SLP
ret nz ret nz
ld hl, PlayerRolloutCount ld hl, wPlayerRolloutCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_rollout_count jr z, .got_rollout_count
ld hl, EnemyRolloutCount ld hl, wEnemyRolloutCount
.got_rollout_count .got_rollout_count
ld a, [hl] ld a, [hl]
@ -47,7 +47,7 @@ BattleCommand_RolloutPower: ; 37734
ld [wSomeoneIsRampaging], a ld [wSomeoneIsRampaging], a
.skip_set_rampage .skip_set_rampage
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr z, .hit jr z, .hit
@ -84,7 +84,7 @@ BattleCommand_RolloutPower: ; 37734
dec b dec b
jr z, .done_damage jr z, .done_damage
ld hl, CurDamage + 1 ld hl, wCurDamage + 1
sla [hl] sla [hl]
dec hl dec hl
rl [hl] rl [hl]

8
engine/battle/move_effects/safeguard.asm
View File

@ -1,13 +1,13 @@
BattleCommand_Safeguard: ; 37939 BattleCommand_Safeguard: ; 37939
; safeguard ; safeguard
ld hl, PlayerScreens ld hl, wPlayerScreens
ld de, PlayerSafeguardCount ld de, wPlayerSafeguardCount
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .ok jr z, .ok
ld hl, EnemyScreens ld hl, wEnemyScreens
ld de, EnemySafeguardCount ld de, wEnemySafeguardCount
.ok .ok
bit SCREENS_SAFEGUARD, [hl] bit SCREENS_SAFEGUARD, [hl]
jr nz, .failed jr nz, .failed

6
engine/battle/move_effects/sandstorm.asm
View File

@ -1,14 +1,14 @@
BattleCommand_StartSandstorm: ; 376f8 BattleCommand_StartSandstorm: ; 376f8
; startsandstorm ; startsandstorm
ld a, [Weather] ld a, [wBattleWeather]
cp WEATHER_SANDSTORM cp WEATHER_SANDSTORM
jr z, .failed jr z, .failed
ld a, WEATHER_SANDSTORM ld a, WEATHER_SANDSTORM
ld [Weather], a ld [wBattleWeather], a
ld a, 5 ld a, 5
ld [WeatherCount], a ld [wWeatherCount], a
call AnimateCurrentMove call AnimateCurrentMove
ld hl, SandstormBrewedText ld hl, SandstormBrewedText
jp StdBattleTextBox jp StdBattleTextBox

6
engine/battle/move_effects/sketch.asm
View File

@ -26,11 +26,11 @@ BattleCommand_Sketch: ; 35a74
ld d, h ld d, h
ld e, l ld e, l
; Get the battle move structs. ; Get the battle move structs.
ld hl, BattleMonMoves ld hl, wBattleMonMoves
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .get_last_move jr z, .get_last_move
ld hl, EnemyMonMoves ld hl, wEnemyMonMoves
.get_last_move .get_last_move
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
@ -69,7 +69,7 @@ BattleCommand_Sketch: ; 35a74
ld hl, Moves + MOVE_PP ld hl, Moves + MOVE_PP
call GetMoveAttr call GetMoveAttr
pop hl pop hl
ld bc, BattleMonPP - BattleMonMoves ld bc, wBattleMonPP - wBattleMonMoves
add hl, bc add hl, bc
ld [hl], a ld [hl], a
pop bc pop bc

14
engine/battle/move_effects/sleep_talk.asm
View File

@ -2,17 +2,17 @@ BattleCommand_SleepTalk: ; 35b33
; sleeptalk ; sleeptalk
call ClearLastMove call ClearLastMove
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jr nz, .fail jr nz, .fail
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
ld hl, BattleMonMoves + 1 ld hl, wBattleMonMoves + 1
ld a, [DisabledMove] ld a, [wDisabledMove]
ld d, a ld d, a
jr z, .got_moves jr z, .got_moves
ld hl, EnemyMonMoves + 1 ld hl, wEnemyMonMoves + 1
ld a, [EnemyDisabledMove] ld a, [wEnemyDisabledMove]
ld d, a ld d, a
.got_moves .got_moves
ld a, BATTLE_VARS_STATUS ld a, BATTLE_VARS_STATUS
@ -79,10 +79,10 @@ BattleCommand_SleepTalk: ; 35b33
.check_has_usable_move .check_has_usable_move
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
ld a, [DisabledMove] ld a, [wDisabledMove]
jr z, .got_move_2 jr z, .got_move_2
ld a, [EnemyDisabledMove] ld a, [wEnemyDisabledMove]
.got_move_2 .got_move_2
ld b, a ld b, a
ld a, BATTLE_VARS_MOVE ld a, BATTLE_VARS_MOVE

2
engine/battle/move_effects/snore.asm
View File

@ -6,7 +6,7 @@ BattleCommand_Snore: ; 359d0
ret nz ret nz
call ResetDamage call ResetDamage
ld a, $1 ld a, $1
ld [AttackMissed], a ld [wAttackMissed], a
call FailMove call FailMove
jp EndMoveEffect jp EndMoveEffect

4
engine/battle/move_effects/spikes.asm
View File

@ -1,11 +1,11 @@
BattleCommand_Spikes: ; 37683 BattleCommand_Spikes: ; 37683
; spikes ; spikes
ld hl, EnemyScreens ld hl, wEnemyScreens
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3768e jr z, .asm_3768e
ld hl, PlayerScreens ld hl, wPlayerScreens
.asm_3768e .asm_3768e
; Fails if spikes are already down! ; Fails if spikes are already down!

8
engine/battle/move_effects/spite.asm
View File

@ -1,15 +1,15 @@
BattleCommand_Spite: ; 35c0f BattleCommand_Spite: ; 35c0f
; spite ; spite
ld a, [AttackMissed] ld a, [wAttackMissed]
and a and a
jp nz, .failed jp nz, .failed
ld bc, PARTYMON_STRUCT_LENGTH ; ???? ld bc, PARTYMON_STRUCT_LENGTH ; ????
ld hl, EnemyMonMoves ld hl, wEnemyMonMoves
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_moves jr z, .got_moves
ld hl, BattleMonMoves ld hl, wBattleMonMoves
.got_moves .got_moves
ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP ld a, BATTLE_VARS_LAST_COUNTER_MOVE_OPP
call GetBattleVar call GetBattleVar
@ -28,7 +28,7 @@ BattleCommand_Spite: ; 35c0f
dec hl dec hl
ld b, 0 ld b, 0
push bc push bc
ld c, BattleMonPP - BattleMonMoves ld c, wBattleMonPP - wBattleMonMoves
add hl, bc add hl, bc
pop bc pop bc
ld a, [hl] ld a, [hl]

10
engine/battle/move_effects/substitute.asm
View File

@ -2,13 +2,13 @@ BattleCommand_Substitute: ; 36e7c
; substitute ; substitute
call BattleCommand_MoveDelay call BattleCommand_MoveDelay
ld hl, BattleMonMaxHP ld hl, wBattleMonMaxHP
ld de, PlayerSubstituteHP ld de, wPlayerSubstituteHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .got_hp jr z, .got_hp
ld hl, EnemyMonMaxHP ld hl, wEnemyMonMaxHP
ld de, EnemySubstituteHP ld de, wEnemySubstituteHP
.got_hp .got_hp
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
@ -61,7 +61,7 @@ BattleCommand_Substitute: ; 36e7c
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld [FXAnimID + 1], a ld [wFXAnimID + 1], a
ld [wKickCounter], a ld [wKickCounter], a
ld a, SUBSTITUTE ld a, SUBSTITUTE
call LoadAnim call LoadAnim

4
engine/battle/move_effects/sunny_day.asm
View File

@ -1,9 +1,9 @@
BattleCommand_StartSun: ; 37c07 BattleCommand_StartSun: ; 37c07
; startsun ; startsun
ld a, WEATHER_SUN ld a, WEATHER_SUN
ld [Weather], a ld [wBattleWeather], a
ld a, 5 ld a, 5
ld [WeatherCount], a ld [wWeatherCount], a
call AnimateCurrentMove call AnimateCurrentMove
ld hl, SunGotBrightText ld hl, SunGotBrightText
jp StdBattleTextBox jp StdBattleTextBox

10
engine/battle/move_effects/teleport.asm
View File

@ -1,7 +1,7 @@
BattleCommand_Teleport: ; 36778 BattleCommand_Teleport: ; 36778
; teleport ; teleport
ld a, [BattleType] ld a, [wBattleType]
cp BATTLETYPE_SHINY cp BATTLETYPE_SHINY
jr z, .failed jr z, .failed
cp BATTLETYPE_TRAP cp BATTLETYPE_TRAP
@ -24,9 +24,9 @@ BattleCommand_Teleport: ; 36778
dec a dec a
jr nz, .failed jr nz, .failed
; If your level is greater than the opponent's, you run without fail. ; If your level is greater than the opponent's, you run without fail.
ld a, [CurPartyLevel] ld a, [wCurPartyLevel]
ld b, a ld b, a
ld a, [BattleMonLevel] ld a, [wBattleMonLevel]
cp b cp b
jr nc, .run_away jr nc, .run_away
; Generate a number between 0 and (YourLevel + TheirLevel). ; Generate a number between 0 and (YourLevel + TheirLevel).
@ -51,9 +51,9 @@ BattleCommand_Teleport: ; 36778
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
jr nz, .failed jr nz, .failed
ld a, [BattleMonLevel] ld a, [wBattleMonLevel]
ld b, a ld b, a
ld a, [CurPartyLevel] ld a, [wCurPartyLevel]
cp b cp b
jr nc, .run_away jr nc, .run_away
add b add b

8
engine/battle/move_effects/thief.asm
View File

@ -26,7 +26,7 @@ BattleCommand_Thief: ; 37492
farcall ItemIsMail farcall ItemIsMail
ret c ret c
ld a, [EffectFailed] ld a, [wEffectFailed]
and a and a
ret nz ret nz
@ -74,7 +74,7 @@ BattleCommand_Thief: ; 37492
farcall ItemIsMail farcall ItemIsMail
ret c ret c
ld a, [EffectFailed] ld a, [wEffectFailed]
and a and a
ret nz ret nz
@ -103,7 +103,7 @@ BattleCommand_Thief: ; 37492
call BattlePartyAttr call BattlePartyAttr
ld d, h ld d, h
ld e, l ld e, l
ld hl, BattleMonItem ld hl, wBattleMonItem
ret ret
.enemyitem .enemyitem
@ -111,6 +111,6 @@ BattleCommand_Thief: ; 37492
call OTPartyAttr call OTPartyAttr
ld d, h ld d, h
ld e, l ld e, l
ld hl, EnemyMonItem ld hl, wEnemyMonItem
ret ret
; 37517 ; 37517

2
engine/battle/move_effects/thunder.asm
View File

@ -4,7 +4,7 @@ BattleCommand_ThunderAccuracy: ; 37d94
ld a, BATTLE_VARS_MOVE_TYPE ld a, BATTLE_VARS_MOVE_TYPE
call GetBattleVarAddr call GetBattleVarAddr
inc hl inc hl
ld a, [Weather] ld a, [wBattleWeather]
cp WEATHER_RAIN cp WEATHER_RAIN
jr z, .rain jr z, .rain
cp WEATHER_SUN cp WEATHER_SUN

30
engine/battle/move_effects/transform.asm
View File

@ -11,7 +11,7 @@ BattleCommand_Transform: ; 371cd
jp nz, BattleEffect_ButItFailed jp nz, BattleEffect_ButItFailed
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld [FXAnimID + 1], a ld [wFXAnimID + 1], a
ld a, $1 ld a, $1
ld [wKickCounter], a ld [wKickCounter], a
ld a, BATTLE_VARS_SUBSTATUS4 ld a, BATTLE_VARS_SUBSTATUS4
@ -28,15 +28,15 @@ BattleCommand_Transform: ; 371cd
call GetBattleVarAddr call GetBattleVarAddr
set SUBSTATUS_TRANSFORMED, [hl] set SUBSTATUS_TRANSFORMED, [hl]
call ResetActorDisable call ResetActorDisable
ld hl, BattleMonSpecies ld hl, wBattleMonSpecies
ld de, EnemyMonSpecies ld de, wEnemyMonSpecies
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr nz, .got_mon_species jr nz, .got_mon_species
ld hl, EnemyMonSpecies ld hl, wEnemyMonSpecies
ld de, BattleMonSpecies ld de, wBattleMonSpecies
xor a xor a
ld [CurMoveNum], a ld [wCurMoveNum], a
.got_mon_species .got_mon_species
push hl push hl
ld a, [hli] ld a, [hli]
@ -64,7 +64,7 @@ BattleCommand_Transform: ; 371cd
ld [de], a ld [de], a
inc de inc de
; move pointer to stats ; move pointer to stats
ld bc, BattleMonStats - BattleMonPP ld bc, wBattleMonStats - wBattleMonPP
add hl, bc add hl, bc
push hl push hl
ld h, d ld h, d
@ -73,16 +73,16 @@ BattleCommand_Transform: ; 371cd
ld d, h ld d, h
ld e, l ld e, l
pop hl pop hl
ld bc, BattleMonStructEnd - BattleMonStats ld bc, wBattleMonStructEnd - wBattleMonStats
call CopyBytes call CopyBytes
; init the power points ; init the power points
ld bc, BattleMonMoves - BattleMonStructEnd ld bc, wBattleMonMoves - wBattleMonStructEnd
add hl, bc add hl, bc
push de push de
ld d, h ld d, h
ld e, l ld e, l
pop hl pop hl
ld bc, BattleMonPP - BattleMonStructEnd ld bc, wBattleMonPP - wBattleMonStructEnd
add hl, bc add hl, bc
ld b, NUM_MOVES ld b, NUM_MOVES
.pp_loop .pp_loop
@ -102,12 +102,12 @@ BattleCommand_Transform: ; 371cd
ld a, [hl] ld a, [hl]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetPokemonName call GetPokemonName
ld hl, EnemyStats ld hl, wEnemyStats
ld de, PlayerStats ld de, wPlayerStats
ld bc, 2 * 5 ld bc, 2 * 5
call BattleSideCopy call BattleSideCopy
ld hl, EnemyStatLevels ld hl, wEnemyStatLevels
ld de, PlayerStatLevels ld de, wPlayerStatLevels
ld bc, 8 ld bc, 8
call BattleSideCopy call BattleSideCopy
call _CheckBattleScene call _CheckBattleScene
@ -129,7 +129,7 @@ BattleCommand_Transform: ; 371cd
.after_anim .after_anim
xor a xor a
ld [wNumHits], a ld [wNumHits], a
ld [FXAnimID + 1], a ld [wFXAnimID + 1], a
ld a, $2 ld a, $2
ld [wKickCounter], a ld [wKickCounter], a
pop af pop af

2
engine/battle/move_effects/triple_kick.asm
View File

@ -4,7 +4,7 @@ BattleCommand_TripleKick: ; 346b2
ld a, [wKickCounter] ld a, [wKickCounter]
ld b, a ld b, a
inc b inc b
ld hl, CurDamage + 1 ld hl, wCurDamage + 1
ld a, [hld] ld a, [hld]
ld e, a ld e, a
ld a, [hli] ld a, [hli]

22
engine/battle/read_trainer_attributes.asm
View File

@ -1,18 +1,18 @@
GetTrainerClassName: ; 3952d GetTrainerClassName: ; 3952d
ld hl, RivalName ld hl, wRivalName
ld a, c ld a, c
cp RIVAL1 cp RIVAL1
jr z, .rival jr z, .rival
ld [CurSpecies], a ld [wCurSpecies], a
ld a, TRAINER_NAME ld a, TRAINER_NAME
ld [wNamedObjectTypeBuffer], a ld [wNamedObjectTypeBuffer], a
call GetName call GetName
ld de, StringBuffer1 ld de, wStringBuffer1
ret ret
.rival .rival
ld de, StringBuffer1 ld de, wStringBuffer1
push de push de
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
@ -20,35 +20,35 @@ GetTrainerClassName: ; 3952d
ret ret
GetOTName: ; 39550 GetOTName: ; 39550
ld hl, OTPlayerName ld hl, wOTPlayerName
ld a, [wLinkMode] ld a, [wLinkMode]
and a and a
jr nz, .ok jr nz, .ok
ld hl, RivalName ld hl, wRivalName
ld a, c ld a, c
cp RIVAL1 cp RIVAL1
jr z, .ok jr z, .ok
ld [CurSpecies], a ld [wCurSpecies], a
ld a, TRAINER_NAME ld a, TRAINER_NAME
ld [wNamedObjectTypeBuffer], a ld [wNamedObjectTypeBuffer], a
call GetName call GetName
ld hl, StringBuffer1 ld hl, wStringBuffer1
.ok .ok
ld bc, TRAINER_CLASS_NAME_LENGTH ld bc, TRAINER_CLASS_NAME_LENGTH
ld de, OTClassName ld de, wOTClassName
push de push de
call CopyBytes call CopyBytes
pop de pop de
ret ret
GetTrainerAttributes: ; 3957b GetTrainerAttributes: ; 3957b
ld a, [TrainerClass] ld a, [wTrainerClass]
ld c, a ld c, a
call GetOTName call GetOTName
ld a, [TrainerClass] ld a, [wTrainerClass]
dec a dec a
ld hl, TrainerClassAttributes + TRNATTR_ITEM1 ld hl, TrainerClassAttributes + TRNATTR_ITEM1
ld bc, NUM_TRAINER_ATTRIBUTES ld bc, NUM_TRAINER_ATTRIBUTES

4
engine/battle/read_trainer_dvs.asm
View File

@ -1,8 +1,8 @@
GetTrainerDVs: ; 270c4 GetTrainerDVs: ; 270c4
; Return the DVs of OtherTrainerClass in bc ; Return the DVs of wOtherTrainerClass in bc
push hl push hl
ld a, [OtherTrainerClass] ld a, [wOtherTrainerClass]
dec a dec a
ld c, a ld c, a
ld b, 0 ld b, 0

78
engine/battle/read_trainer_party.asm
View File

@ -1,5 +1,5 @@
ReadTrainerParty: ; 39771 ReadTrainerParty: ; 39771
ld a, [InBattleTowerBattle] ld a, [wInBattleTowerBattle]
bit 0, a bit 0, a
ret nz ret nz
@ -7,24 +7,24 @@ ReadTrainerParty: ; 39771
and a and a
ret nz ret nz
ld hl, OTPartyCount ld hl, wOTPartyCount
xor a xor a
ld [hli], a ld [hli], a
dec a dec a
ld [hl], a ld [hl], a
ld hl, OTPartyMons ld hl, wOTPartyMons
ld bc, OTPartyMonsEnd - OTPartyMons ld bc, wOTPartyMonsEnd - wOTPartyMons
xor a xor a
call ByteFill call ByteFill
ld a, [OtherTrainerClass] ld a, [wOtherTrainerClass]
cp CAL cp CAL
jr nz, .not_cal2 jr nz, .not_cal2
ld a, [OtherTrainerID] ld a, [wOtherTrainerID]
cp CAL2 cp CAL2
jr z, .cal2 jr z, .cal2
ld a, [OtherTrainerClass] ld a, [wOtherTrainerClass]
.not_cal2 .not_cal2
dec a dec a
@ -37,7 +37,7 @@ ReadTrainerParty: ; 39771
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, [OtherTrainerID] ld a, [wOtherTrainerID]
ld b, a ld b, a
.skip_trainer .skip_trainer
dec b dec b
@ -98,11 +98,11 @@ TrainerType1: ; 397eb
cp $ff cp $ff
ret z ret z
ld [CurPartyLevel], a ld [wCurPartyLevel], a
ld a, [hli] ld a, [hli]
ld [CurPartySpecies], a ld [wCurPartySpecies], a
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [wMonType], a
push hl push hl
predef TryAddMonToParty predef TryAddMonToParty
pop hl pop hl
@ -118,17 +118,17 @@ TrainerType2: ; 39806
cp $ff cp $ff
ret z ret z
ld [CurPartyLevel], a ld [wCurPartyLevel], a
ld a, [hli] ld a, [hli]
ld [CurPartySpecies], a ld [wCurPartySpecies], a
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [wMonType], a
push hl push hl
predef TryAddMonToParty predef TryAddMonToParty
ld a, [OTPartyCount] ld a, [wOTPartyCount]
dec a dec a
ld hl, OTPartyMon1Moves ld hl, wOTPartyMon1Moves
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
@ -145,9 +145,9 @@ TrainerType2: ; 39806
push hl push hl
ld a, [OTPartyCount] ld a, [wOTPartyCount]
dec a dec a
ld hl, OTPartyMon1Species ld hl, wOTPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
@ -195,16 +195,16 @@ TrainerType3: ; 39871
cp $ff cp $ff
ret z ret z
ld [CurPartyLevel], a ld [wCurPartyLevel], a
ld a, [hli] ld a, [hli]
ld [CurPartySpecies], a ld [wCurPartySpecies], a
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [wMonType], a
push hl push hl
predef TryAddMonToParty predef TryAddMonToParty
ld a, [OTPartyCount] ld a, [wOTPartyCount]
dec a dec a
ld hl, OTPartyMon1Item ld hl, wOTPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
@ -224,18 +224,18 @@ TrainerType4: ; 3989d
cp $ff cp $ff
ret z ret z
ld [CurPartyLevel], a ld [wCurPartyLevel], a
ld a, [hli] ld a, [hli]
ld [CurPartySpecies], a ld [wCurPartySpecies], a
ld a, OTPARTYMON ld a, OTPARTYMON
ld [MonType], a ld [wMonType], a
push hl push hl
predef TryAddMonToParty predef TryAddMonToParty
ld a, [OTPartyCount] ld a, [wOTPartyCount]
dec a dec a
ld hl, OTPartyMon1Item ld hl, wOTPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
@ -246,9 +246,9 @@ TrainerType4: ; 3989d
ld [de], a ld [de], a
push hl push hl
ld a, [OTPartyCount] ld a, [wOTPartyCount]
dec a dec a
ld hl, OTPartyMon1Moves ld hl, wOTPartyMon1Moves
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
@ -265,9 +265,9 @@ TrainerType4: ; 3989d
push hl push hl
ld a, [OTPartyCount] ld a, [wOTPartyCount]
dec a dec a
ld hl, OTPartyMon1 ld hl, wOTPartyMon1
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes call AddNTimes
ld d, h ld d, h
@ -315,7 +315,7 @@ ComputeTrainerReward: ; 3991b (e:591b)
ld [hli], a ld [hli], a
ld a, [wEnemyTrainerBaseReward] ld a, [wEnemyTrainerBaseReward]
ld [hli], a ld [hli], a
ld a, [CurPartyLevel] ld a, [wCurPartyLevel]
ld [hl], a ld [hl], a
call Multiply call Multiply
ld hl, wBattleReward ld hl, wBattleReward
@ -329,14 +329,14 @@ ComputeTrainerReward: ; 3991b (e:591b)
Battle_GetTrainerName:: ; 39939 Battle_GetTrainerName:: ; 39939
ld a, [InBattleTowerBattle] ld a, [wInBattleTowerBattle]
bit 0, a bit 0, a
ld hl, OTPlayerName ld hl, wOTPlayerName
jp nz, CopyTrainerName jp nz, CopyTrainerName
ld a, [OtherTrainerID] ld a, [wOtherTrainerID]
ld b, a ld b, a
ld a, [OtherTrainerClass] ld a, [wOtherTrainerClass]
ld c, a ld c, a
GetTrainerName:: ; 3994c GetTrainerName:: ; 3994c
@ -380,7 +380,7 @@ GetTrainerName:: ; 3994c
jr .loop jr .loop
CopyTrainerName: ; 39984 CopyTrainerName: ; 39984
ld de, StringBuffer1 ld de, wStringBuffer1
push de push de
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
call CopyBytes call CopyBytes
@ -390,7 +390,7 @@ CopyTrainerName: ; 39984
Function39990: ; 39990 Function39990: ; 39990
; This function is useless. ; This function is useless.
ld de, StringBuffer1 ld de, wStringBuffer1
push de push de
ld bc, NAME_LENGTH ld bc, NAME_LENGTH
pop de pop de

2
engine/battle/returntobattle_useball.asm
View File

@ -1,7 +1,7 @@
_ReturnToBattle_UseBall: ; 2715c _ReturnToBattle_UseBall: ; 2715c
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTileMap
ld a, [BattleType] ld a, [wBattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .gettutorialbackpic jr z, .gettutorialbackpic
farcall GetBattleMonBackpic farcall GetBattleMonBackpic

8
engine/battle/sliding_intro.asm
View File

@ -1,7 +1,7 @@
BattleIntroSlidingPics: ; 4e980 BattleIntroSlidingPics: ; 4e980
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, BANK(LYOverrides) ld a, BANK(wLYOverrides)
ld [rSVBK], a ld [rSVBK], a
call .subfunction1 call .subfunction1
ld a, rSCX - $ff00 ld a, rSCX - $ff00
@ -60,7 +60,7 @@ BattleIntroSlidingPics: ; 4e980
; 4e9d6 ; 4e9d6
.subfunction3 ; 4e9d6 .subfunction3 ; 4e9d6
ld hl, Sprite01XCoord ld hl, wVirtualOAMSprite00XCoord
ld c, $12 ; 18 ld c, $12 ; 18
ld de, SPRITEOAMSTRUCT_LENGTH ld de, SPRITEOAMSTRUCT_LENGTH
.loop3 .loop3
@ -73,7 +73,7 @@ BattleIntroSlidingPics: ; 4e980
; 4e9e5 ; 4e9e5
.subfunction4 ; 4e9e5 .subfunction4 ; 4e9e5
ld hl, LYOverrides ld hl, wLYOverrides
ld a, $90 ld a, $90
ld bc, SCREEN_HEIGHT_PX ld bc, SCREEN_HEIGHT_PX
call ByteFill call ByteFill
@ -81,7 +81,7 @@ BattleIntroSlidingPics: ; 4e980
; 4e9f1 ; 4e9f1
.subfunction5 ; 4e9f1 .subfunction5 ; 4e9f1
ld hl, LYOverrides ld hl, wLYOverrides
ld a, d ld a, d
ld c, $3e ; 62 ld c, $3e ; 62
.loop4 .loop4

38
engine/battle/start_battle.asm
View File

@ -17,7 +17,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f
ld [hMapAnims], a ld [hMapAnims], a
call DelayFrame call DelayFrame
ld b, 6 ld b, 6
ld hl, PartyMon1HP ld hl, wPartyMon1HP
ld de, PARTYMON_STRUCT_LENGTH - 1 ld de, PARTYMON_STRUCT_LENGTH - 1
.loop .loop
@ -32,7 +32,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f
ld de, MON_LEVEL - MON_HP ld de, MON_LEVEL - MON_HP
add hl, de add hl, de
ld a, [hl] ld a, [hl]
ld [BattleMonLevel], a ld [wBattleMonLevel], a
predef DoBattleTransition predef DoBattleTransition
farcall _LoadBattleFontsHPBar farcall _LoadBattleFontsHPBar
ld a, 1 ld a, 1
@ -52,13 +52,13 @@ PlayBattleMusic: ; 2ee6c
push bc push bc
xor a xor a
ld [MusicFade], a ld [wMusicFade], a
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
call DelayFrame call DelayFrame
call MaxVolume call MaxVolume
ld a, [BattleType] ld a, [wBattleType]
cp BATTLETYPE_SUICUNE cp BATTLETYPE_SUICUNE
ld de, MUSIC_SUICUNE_BATTLE ld de, MUSIC_SUICUNE_BATTLE
jp z, .done jp z, .done
@ -66,7 +66,7 @@ PlayBattleMusic: ; 2ee6c
jp z, .done jp z, .done
; Are we fighting a trainer? ; Are we fighting a trainer?
ld a, [OtherTrainerClass] ld a, [wOtherTrainerClass]
and a and a
jr nz, .trainermusic jr nz, .trainermusic
@ -76,7 +76,7 @@ PlayBattleMusic: ; 2ee6c
jr nz, .kantowild jr nz, .kantowild
ld de, MUSIC_JOHTO_WILD_BATTLE ld de, MUSIC_JOHTO_WILD_BATTLE
ld a, [TimeOfDay] ld a, [wTimeOfDay]
cp NITE_F cp NITE_F
jr nz, .done jr nz, .done
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
@ -111,13 +111,13 @@ PlayBattleMusic: ; 2ee6c
jr c, .done jr c, .done
ld de, MUSIC_RIVAL_BATTLE ld de, MUSIC_RIVAL_BATTLE
ld a, [OtherTrainerClass] ld a, [wOtherTrainerClass]
cp RIVAL1 cp RIVAL1
jr z, .done jr z, .done
cp RIVAL2 cp RIVAL2
jr nz, .othertrainer jr nz, .othertrainer
ld a, [OtherTrainerID] ld a, [wOtherTrainerID]
cp RIVAL2_2_CHIKORITA ; Rival in Indigo Plateau cp RIVAL2_2_CHIKORITA ; Rival in Indigo Plateau
jr c, .done jr c, .done
ld de, MUSIC_CHAMPION_BATTLE ld de, MUSIC_CHAMPION_BATTLE
@ -150,7 +150,7 @@ PlayBattleMusic: ; 2ee6c
ClearBattleRAM: ; 2ef18 ClearBattleRAM: ; 2ef18
xor a xor a
ld [wPlayerAction], a ld [wBattlePlayerAction], a
ld [wBattleResult], a ld [wBattleResult], a
ld hl, wPartyMenuCursor ld hl, wPartyMenuCursor
@ -160,25 +160,25 @@ ClearBattleRAM: ; 2ef18
ld [hl], a ld [hl], a
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
ld [CriticalHit], a ld [wCriticalHit], a
ld [BattleMonSpecies], a ld [wBattleMonSpecies], a
ld [wBattleParticipantsNotFainted], a ld [wBattleParticipantsNotFainted], a
ld [CurBattleMon], a ld [wCurBattleMon], a
ld [wForcedSwitch], a ld [wForcedSwitch], a
ld [TimeOfDayPal], a ld [wTimeOfDayPal], a
ld [PlayerTurnsTaken], a ld [wPlayerTurnsTaken], a
ld [EnemyTurnsTaken], a ld [wEnemyTurnsTaken], a
ld [EvolvableFlags], a ld [wEvolvableFlags], a
ld hl, PlayerHPPal ld hl, wPlayerHPPal
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld hl, BattleMonDVs ld hl, wBattleMonDVs
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld hl, EnemyMonDVs ld hl, wEnemyMonDVs
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a

42
engine/battle/trainer_huds.asm
View File

@ -18,8 +18,8 @@ EnemySwitch_TrainerHud: ; 2c012
ShowPlayerMonsRemaining: ; 2c01c ShowPlayerMonsRemaining: ; 2c01c
call DrawPlayerPartyIconHUDBorder call DrawPlayerPartyIconHUDBorder
ld hl, PartyMon1HP ld hl, wPartyMon1HP
ld de, PartyCount ld de, wPartyCount
call StageBallTilesData call StageBallTilesData
; ldpixel wPlaceBallsX, 12, 12 ; ldpixel wPlaceBallsX, 12, 12
ld a, 12 * 8 ld a, 12 * 8
@ -28,14 +28,14 @@ ShowPlayerMonsRemaining: ; 2c01c
ld [hl], a ld [hl], a
ld a, 8 ld a, 8
ld [wPlaceBallsDirection], a ld [wPlaceBallsDirection], a
ld hl, Sprite01 ld hl, wVirtualOAMSprite00
jp LoadTrainerHudOAM jp LoadTrainerHudOAM
; 2c03a ; 2c03a
ShowOTTrainerMonsRemaining: ; 2c03a ShowOTTrainerMonsRemaining: ; 2c03a
call DrawEnemyHUDBorder call DrawEnemyHUDBorder
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
ld de, OTPartyCount ld de, wOTPartyCount
call StageBallTilesData call StageBallTilesData
; ldpixel wPlaceBallsX, 9, 4 ; ldpixel wPlaceBallsX, 9, 4
ld hl, wPlaceBallsX ld hl, wPlaceBallsX
@ -44,14 +44,14 @@ ShowOTTrainerMonsRemaining: ; 2c03a
ld [hl], 4 * 8 ld [hl], 4 * 8
ld a, -8 ld a, -8
ld [wPlaceBallsDirection], a ld [wPlaceBallsDirection], a
ld hl, Sprite01 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
jp LoadTrainerHudOAM jp LoadTrainerHudOAM
; 2c059 ; 2c059
StageBallTilesData: ; 2c059 StageBallTilesData: ; 2c059
ld a, [de] ld a, [de]
push af push af
ld de, Buffer1 ld de, wBuffer1
ld c, PARTY_LENGTH ld c, PARTY_LENGTH
ld a, $34 ; empty slot ld a, $34 ; empty slot
.loop1 .loop1
@ -60,7 +60,7 @@ StageBallTilesData: ; 2c059
dec c dec c
jr nz, .loop1 jr nz, .loop1
pop af pop af
ld de, Buffer1 ld de, wBuffer1
.loop2 .loop2
push af push af
call .GetHUDTile call .GetHUDTile
@ -147,7 +147,7 @@ DrawEnemyHUDBorder: ; 2c0c5
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
ret nz ret nz
ld a, [TempEnemyMonSpecies] ld a, [wTempEnemyMonSpecies]
dec a dec a
call CheckCaughtMon call CheckCaughtMon
ret z ret z
@ -167,25 +167,25 @@ PlaceHUDBorderTiles: ; 2c0f1
ld [hl], a ld [hl], a
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
add hl, bc add hl, bc
ld a, [StartFlypoint] ld a, [wStartFlypoint]
ld [hl], a ld [hl], a
ld b, $8 ld b, $8
.loop .loop
add hl, de add hl, de
ld a, [MovementBuffer] ld a, [wMovementBuffer]
ld [hl], a ld [hl], a
dec b dec b
jr nz, .loop jr nz, .loop
add hl, de add hl, de
ld a, [EndFlypoint] ld a, [wEndFlypoint]
ld [hl], a ld [hl], a
ret ret
; 2c10d ; 2c10d
LinkBattle_TrainerHuds: ; 2c10d LinkBattle_TrainerHuds: ; 2c10d
call LoadBallIconGFX call LoadBallIconGFX
ld hl, PartyMon1HP ld hl, wPartyMon1HP
ld de, PartyCount ld de, wPartyCount
call StageBallTilesData call StageBallTilesData
ld hl, wPlaceBallsX ld hl, wPlaceBallsX
ld a, 10 * 8 ld a, 10 * 8
@ -193,22 +193,22 @@ LinkBattle_TrainerHuds: ; 2c10d
ld [hl], 8 * 8 ld [hl], 8 * 8
ld a, $8 ld a, $8
ld [wPlaceBallsDirection], a ld [wPlaceBallsDirection], a
ld hl, Sprite01 ld hl, wVirtualOAMSprite00
call LoadTrainerHudOAM call LoadTrainerHudOAM
ld hl, OTPartyMon1HP ld hl, wOTPartyMon1HP
ld de, OTPartyCount ld de, wOTPartyCount
call StageBallTilesData call StageBallTilesData
ld hl, wPlaceBallsX ld hl, wPlaceBallsX
ld a, 10 * 8 ld a, 10 * 8
ld [hli], a ld [hli], a
ld [hl], 13 * 8 ld [hl], 13 * 8
ld hl, Sprite01 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
jp LoadTrainerHudOAM jp LoadTrainerHudOAM
; 2c143 ; 2c143
LoadTrainerHudOAM: ; 2c143 LoadTrainerHudOAM: ; 2c143
ld de, Buffer1 ld de, wBuffer1
ld c, PARTY_LENGTH ld c, PARTY_LENGTH
.loop .loop
ld a, [wPlaceBallsY] ld a, [wPlaceBallsY]
@ -250,10 +250,10 @@ _ShowLinkBattleParticipants: ; 2c1b2
ld c, 14 ld c, 14
call TextBox call TextBox
hlcoord 4, 5 hlcoord 4, 5
ld de, PlayerName ld de, wPlayerName
call PlaceString call PlaceString
hlcoord 4, 10 hlcoord 4, 10
ld de, OTPlayerName ld de, wOTPlayerName
call PlaceString call PlaceString
hlcoord 9, 8 hlcoord 9, 8
ld a, "<BOLD_V>" ld a, "<BOLD_V>"

4
engine/battle/updatebattlehuds.asm
View File

@ -1,9 +1,9 @@
_UpdateBattleHUDs: _UpdateBattleHUDs:
farcall DrawPlayerHUD farcall DrawPlayerHUD
ld hl, PlayerHPPal ld hl, wPlayerHPPal
call SetHPPal call SetHPPal
farcall DrawEnemyHUD farcall DrawEnemyHUD
ld hl, EnemyHPPal ld hl, wEnemyHPPal
call SetHPPal call SetHPPal
farcall FinishBattleAnim farcall FinishBattleAnim
ret ret

12
engine/battle/used_move_text.asm
View File

@ -46,7 +46,7 @@ UsedMoveText: ; 105db9
; everything except 'instead' made redundant in localization ; everything except 'instead' made redundant in localization
; check obedience ; check obedience
ld a, [AlreadyDisobeyed] ld a, [wAlreadyDisobeyed]
and a and a
ld hl, UsedMove2Text ld hl, UsedMove2Text
ret nz ret nz
@ -71,7 +71,7 @@ UsedMove2Text: ; 105e0b
start_asm start_asm
UsedMoveText_CheckObedience: ; 105e10 UsedMoveText_CheckObedience: ; 105e10
; check obedience ; check obedience
ld a, [AlreadyDisobeyed] ld a, [wAlreadyDisobeyed]
and a and a
jr z, .GetMoveNameText jr z, .GetMoveNameText
; print "instead," ; print "instead,"
@ -184,11 +184,11 @@ INCLUDE "data/moves/grammar.asm"
UpdateUsedMoves: ; 105ed0 UpdateUsedMoves: ; 105ed0
; append move a to PlayerUsedMoves unless it has already been used ; append move a to wPlayerUsedMoves unless it has already been used
push bc push bc
; start of list ; start of list
ld hl, PlayerUsedMoves ld hl, wPlayerUsedMoves
; get move id ; get move id
ld b, a ld b, a
; next count ; next count
@ -210,7 +210,7 @@ UpdateUsedMoves: ; 105ed0
; if the list is full and the move hasn't already been used ; if the list is full and the move hasn't already been used
; shift the list back one byte, deleting the first move used ; shift the list back one byte, deleting the first move used
; this can occur with struggle or a new learned move ; this can occur with struggle or a new learned move
ld hl, PlayerUsedMoves + 1 ld hl, wPlayerUsedMoves + 1
; 1 = 2 ; 1 = 2
ld a, [hld] ld a, [hld]
ld [hli], a ld [hli], a
@ -224,7 +224,7 @@ UpdateUsedMoves: ; 105ed0
ld [hl], a ld [hl], a
; 4 = new move ; 4 = new move
ld a, b ld a, b
ld [PlayerUsedMoves + 3], a ld [wPlayerUsedMoves + 3], a
jr .quit jr .quit
.add .add

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