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

8
constants/audio_constants.asm
View File

@ -66,23 +66,23 @@ NUM_CHANNELS EQU const_value
const NOTE_REST ; 5
const NOTE_VIBRATO_OVERRIDE ; 6
; Volume:
; wVolume
VOLUME_SO1_F EQU 3
VOLUME_SO2_F EQU 7
VOLUME_SO1_LEVEL EQU %00000111
VOLUME_SO2_LEVEL EQU %01110000
MAX_VOLUME EQU $77
; SoundInput:
; wSoundInput
SOUND_INPUT_CH1_F EQU 0
SOUND_INPUT_CH2_F EQU 1
SOUND_INPUT_CH3_F EQU 2
SOUND_INPUT_CH4_F EQU 3
SOUND_INPUT_GLOBAL_F EQU 7
; Danger:
; wLowHealthAlarm
DANGER_PITCH_F EQU 4
DANGER_ON_F EQU 7
; MusicFade:
; wMusicFade
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
NO_EFFECT EQU 00
; PlayerStatLevels and EnemyStatLevels indexes (see wram.asm)
; wPlayerStatLevels and wEnemyStatLevels indexes (see wram.asm)
; GetStatName arguments (see data/battle/stat_names.asm)
const_def
const ATTACK
@ -53,7 +53,7 @@ MOVE_LENGTH EQU const_value
; stat constants
; indexes for:
; - PlayerStats and EnemyStats (see wram.asm)
; - wPlayerStats and wEnemyStats (see wram.asm)
; - party_struct and battle_struct members (see macros/wram.asm)
const_def 1
const STAT_HP
@ -80,7 +80,7 @@ SPDSPCDV_SHINY EQU $AA
const WILD_BATTLE
const TRAINER_BATTLE
; battle types (BattleType values)
; battle types (wBattleType values)
const_def
const BATTLETYPE_NORMAL
const BATTLETYPE_CANLOSE
@ -159,7 +159,7 @@ SLP EQU %111 ; 0-7 turns
ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
; PlayerSubStatus1 or EnemySubStatus1 bit flags
; wPlayerSubStatus1 or wEnemySubStatus1 bit flags
enum_start 7, -1
enum SUBSTATUS_IN_LOVE
enum SUBSTATUS_ROLLOUT
@ -170,10 +170,10 @@ ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP
enum SUBSTATUS_CURSE
enum SUBSTATUS_NIGHTMARE
; PlayerSubStatus2 or EnemySubStatus2 bit flags
; wPlayerSubStatus2 or wEnemySubStatus2 bit flags
SUBSTATUS_CURLED EQU 0
; PlayerSubStatus3 or EnemySubStatus3 bit flags
; wPlayerSubStatus3 or wEnemySubStatus3 bit flags
enum_start 7, -1
enum SUBSTATUS_CONFUSED
enum SUBSTATUS_FLYING
@ -184,7 +184,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_RAMPAGE
enum SUBSTATUS_BIDE
; PlayerSubStatus4 or EnemySubStatus4 bit flags
; wPlayerSubStatus4 or wEnemySubStatus4 bit flags
enum_start 7, -1
enum SUBSTATUS_LEECH_SEED
enum SUBSTATUS_RAGE
@ -195,7 +195,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_MIST
enum SUBSTATUS_X_ACCURACY
; PlayerSubStatus5 or EnemySubStatus5 bit flags
; wPlayerSubStatus5 or wEnemySubStatus5 bit flags
enum_start 7, -1
enum SUBSTATUS_CANT_RUN
enum SUBSTATUS_DESTINY_BOND
@ -206,7 +206,7 @@ SUBSTATUS_CURLED EQU 0
enum SUBSTATUS_UNKNOWN_3
enum SUBSTATUS_TOXIC
; PlayerScreens or EnemyScreens bit flags
; wPlayerScreens or wEnemyScreens bit flags
enum_start 4, -1
enum SCREENS_REFLECT
enum SCREENS_LIGHT_SCREEN
@ -214,7 +214,7 @@ SUBSTATUS_CURLED EQU 0
enum SCREENS_UNUSED
enum SCREENS_SPIKES
; Weather values
; values in wBattleWeather
const_def
const WEATHER_NONE
const WEATHER_RAIN

2
constants/event_flags.asm
View File

@ -1,4 +1,4 @@
; EventFlags bit flags
; wEventFlags bit flags
const_def
; The first eight flags are reset upon reloading the map
const EVENT_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_ATTRIBUTES ; 3
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)

2
constants/map_data_constants.asm
View File

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

2
constants/map_object_constants.asm
View File

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

116
constants/pokemon_data_constants.asm
View File

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

6
constants/script_constants.asm
View File

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

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_2 ; e1
; VariableSprites indexes (see wram.asm)
; wVariableSprites indexes (see wram.asm)
const_def $f0
SPRITE_VARS EQU const_value
const SPRITE_CONSOLE ; f0

33
constants/wram_constants.asm
View File

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

10
data/default_options.asm
View File

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

16
data/maps/attributes.asm
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

98
data/text/battle.asm
View File

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

124
data/text/common_1.asm
View File

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

140
data/text/common_2.asm
View File

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

88
data/text/common_3.asm
View File

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

14
data/text/std_text.asm
View File

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

52
data/text/unused_gen1_trainer_names.asm
View File

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

14
data/text_buffers.asm
View File

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

2
data/trainers/palettes.asm
View File

@ -1,7 +1,7 @@
TrainerPalettes: ; b0ce
; 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"
KrisPalette: ; Kris shares Falkner's palette
INCLUDE "gfx/trainers/falkner.pal"

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

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

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

@ -1,5 +1,5 @@
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.
; Wildmons attack at random.
@ -18,18 +18,18 @@ AIChooseMove: ; 440ce
; The default score is 20. Unusable moves are given a score of 80.
ld a, 20
ld hl, Buffer1
ld hl, wBuffer1
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
; Don't pick disabled moves.
ld a, [EnemyDisabledMove]
ld a, [wEnemyDisabledMove]
and a
jr z, .CheckPP
ld hl, EnemyMonMoves
ld hl, wEnemyMonMoves
ld c, 0
.CheckDisabledMove:
cp [hl]
@ -38,20 +38,20 @@ AIChooseMove: ; 440ce
inc hl
jr .CheckDisabledMove
.ScoreDisabledMove:
ld hl, Buffer1
ld hl, wBuffer1
ld b, 0
add hl, bc
ld [hl], 80
; Don't pick moves with 0 PP.
.CheckPP:
ld hl, Buffer1 - 1
ld de, EnemyMonPP
ld hl, wBuffer1 - 1
ld de, wEnemyMonPP
ld b, 0
.CheckMovePP:
inc b
ld a, b
cp EnemyMonMovesEnd - EnemyMonMoves + 1
cp wEnemyMonMovesEnd - wEnemyMonMoves + 1
jr z, .ApplyLayers
inc hl
ld a, [de]
@ -66,13 +66,13 @@ AIChooseMove: ; 440ce
.ApplyLayers:
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
ld a, [InBattleTowerBattle]
ld a, [wInBattleTowerBattle]
bit 0, a
jr nz, .battle_tower_skip
ld a, [TrainerClass]
ld a, [wTrainerClass]
dec a
ld bc, 7 ; Trainer2AI - Trainer1AI
call AddNTimes
@ -119,9 +119,9 @@ AIChooseMove: ; 440ce
; Decrement the scores of all moves one by one until one reaches 0.
.DecrementScores:
ld hl, Buffer1
ld de, EnemyMonMoves
ld c, EnemyMonMovesEnd - EnemyMonMoves
ld hl, wBuffer1
ld de, wEnemyMonMoves
ld c, wEnemyMonMovesEnd - wEnemyMonMoves
.DecrementNextScore:
; If the enemy has no moves, this will infinite.
@ -154,8 +154,8 @@ AIChooseMove: ; 440ce
cp NUM_MOVES + 1
jr nz, .move_loop
ld hl, Buffer1
ld de, EnemyMonMoves
ld hl, wBuffer1
ld de, wEnemyMonMoves
ld c, NUM_MOVES
; 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
.ChooseMove:
ld hl, Buffer1
ld hl, wBuffer1
call Random
maskbits NUM_MOVES
ld c, a
@ -194,9 +194,9 @@ AIChooseMove: ; 440ce
and a
jr z, .ChooseMove
ld [CurEnemyMove], a
ld [wCurEnemyMove], a
ld a, c
ld [CurEnemyMoveNum], a
ld [wCurEnemyMoveNum], a
ret
; 441af

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

@ -47,95 +47,95 @@ AI_Redundant: ; 2c41a
db -1
.LightScreen: ; 2c487
ld a, [EnemyScreens]
ld a, [wEnemyScreens]
bit SCREENS_LIGHT_SCREEN, a
ret
.Mist: ; 2c48d
ld a, [EnemySubStatus4]
ld a, [wEnemySubStatus4]
bit SUBSTATUS_MIST, a
ret
.FocusEnergy: ; 2c493
ld a, [EnemySubStatus4]
ld a, [wEnemySubStatus4]
bit SUBSTATUS_FOCUS_ENERGY, a
ret
.Confuse: ; 2c499
ld a, [PlayerSubStatus3]
ld a, [wPlayerSubStatus3]
bit SUBSTATUS_CONFUSED, a
ret nz
ld a, [PlayerScreens]
ld a, [wPlayerScreens]
bit SCREENS_SAFEGUARD, a
ret
.Transform: ; 2c4a5
ld a, [EnemySubStatus5]
ld a, [wEnemySubStatus5]
bit SUBSTATUS_TRANSFORMED, a
ret
.Reflect: ; 2c4ab
ld a, [EnemyScreens]
ld a, [wEnemyScreens]
bit SCREENS_REFLECT, a
ret
.Substitute: ; 2c4b1
ld a, [EnemySubStatus4]
ld a, [wEnemySubStatus4]
bit SUBSTATUS_SUBSTITUTE, a
ret
.LeechSeed: ; 2c4b7
ld a, [PlayerSubStatus4]
ld a, [wPlayerSubStatus4]
bit SUBSTATUS_LEECH_SEED, a
ret
.Disable: ; 2c4bd
ld a, [PlayerDisableCount]
ld a, [wPlayerDisableCount]
and a
ret
.Encore: ; 2c4c2
ld a, [PlayerSubStatus5]
ld a, [wPlayerSubStatus5]
bit SUBSTATUS_ENCORED, a
ret
.Snore:
.SleepTalk: ; 2c4c8
ld a, [EnemyMonStatus]
ld a, [wEnemyMonStatus]
and SLP
jr z, .Redundant
jr .NotRedundant
.MeanLook: ; 2c4d1
ld a, [EnemySubStatus5]
ld a, [wEnemySubStatus5]
bit SUBSTATUS_CANT_RUN, a
ret
.Nightmare: ; 2c4d7
ld a, [BattleMonStatus]
ld a, [wBattleMonStatus]
and a
jr z, .Redundant
ld a, [PlayerSubStatus1]
ld a, [wPlayerSubStatus1]
bit SUBSTATUS_NIGHTMARE, a
ret
.Spikes: ; 2c4e3
ld a, [PlayerScreens]
ld a, [wPlayerScreens]
bit SCREENS_SPIKES, a
ret
.Foresight: ; 2c4e9
ld a, [PlayerSubStatus1]
ld a, [wPlayerSubStatus1]
bit SUBSTATUS_IDENTIFIED, a
ret
.PerishSong: ; 2c4ef
ld a, [PlayerSubStatus1]
ld a, [wPlayerSubStatus1]
bit SUBSTATUS_PERISH, a
ret
.Sandstorm: ; 2c4f5
ld a, [Weather]
ld a, [wBattleWeather]
cp WEATHER_SANDSTORM
jr z, .Redundant
jr .NotRedundant
@ -143,40 +143,40 @@ AI_Redundant: ; 2c41a
.Attract: ; 2c4fe
farcall CheckOppositeGender
jr c, .Redundant
ld a, [PlayerSubStatus1]
ld a, [wPlayerSubStatus1]
bit SUBSTATUS_IN_LOVE, a
ret
.Safeguard: ; 2c50c
ld a, [EnemyScreens]
ld a, [wEnemyScreens]
bit SCREENS_SAFEGUARD, a
ret
.RainDance: ; 2c512
ld a, [Weather]
ld a, [wBattleWeather]
cp WEATHER_RAIN
jr z, .Redundant
jr .NotRedundant
.SunnyDay: ; 2c51b
ld a, [Weather]
ld a, [wBattleWeather]
cp WEATHER_SUN
jr z, .Redundant
jr .NotRedundant
.DreamEater: ; 2c524
ld a, [BattleMonStatus]
ld a, [wBattleMonStatus]
and SLP
jr z, .Redundant
jr .NotRedundant
.Swagger: ; 2c52d
ld a, [PlayerSubStatus3]
ld a, [wPlayerSubStatus3]
bit SUBSTATUS_CONFUSED, a
ret
.FutureSight: ; 2c533
ld a, [EnemyScreens]
ld a, [wEnemyScreens]
bit 5, a
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
ld a, 10
ld [wEnemyAISwitchScore], a
ld hl, PlayerUsedMoves
ld hl, wPlayerUsedMoves
ld a, [hl]
and a
jr z, .unknown_moves
@ -27,7 +27,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
inc hl
call GetMoveByte
ld hl, EnemyMonType
ld hl, wEnemyMonType
call CheckTypeMatchup
ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1
@ -70,16 +70,16 @@ CheckPlayerMoveTypeMatchups: ; 3484e
jr .done
.unknown_moves
ld a, [BattleMonType1]
ld a, [wBattleMonType1]
ld b, a
ld hl, EnemyMonType1
ld hl, wEnemyMonType1
call CheckTypeMatchup
ld a, [wTypeMatchup]
cp 10 + 1 ; 1.0 + 0.1
jr c, .ok
call .DecreaseScore
.ok
ld a, [BattleMonType2]
ld a, [wBattleMonType2]
cp b
jr z, .ok2
call CheckTypeMatchup
@ -99,7 +99,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
.CheckEnemyMoveMatchups: ; 348de
ld de, EnemyMonMoves
ld de, wEnemyMonMoves
ld b, NUM_MOVES + 1
ld c, 0
@ -122,7 +122,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e
inc hl
call GetMoveByte
ld hl, BattleMonType1
ld hl, wBattleMonType1
call CheckTypeMatchup
ld a, [wTypeMatchup]
@ -183,11 +183,11 @@ CheckAbleToSwitch: ; 34941
call FindAliveEnemyMons
ret c
ld a, [EnemySubStatus1]
ld a, [wEnemySubStatus1]
bit SUBSTATUS_PERISH, a
jr z, .no_perish
ld a, [EnemyPerishCount]
ld a, [wEnemyPerishCount]
cp 1
jr nz, .no_perish
@ -229,7 +229,7 @@ CheckAbleToSwitch: ; 34941
cp 11
ret nc
ld a, [LastPlayerCounterMove]
ld a, [wLastPlayerCounterMove]
and a
jr z, .no_last_counter_move
@ -296,7 +296,7 @@ CheckAbleToSwitch: ; 34941
FindAliveEnemyMons: ; 349f4
ld a, [OTPartyCount]
ld a, [wOTPartyCount]
cp 2
jr c, .only_one
@ -304,10 +304,10 @@ FindAliveEnemyMons: ; 349f4
ld e, 0
ld b, 1 << (PARTY_LENGTH - 1)
ld c, 0
ld hl, OTPartyMon1HP
ld hl, wOTPartyMon1HP
.loop
ld a, [CurOTMon]
ld a, [wCurOTMon]
cp e
jr z, .next
@ -348,8 +348,8 @@ FindAliveEnemyMons: ; 349f4
FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
ld hl, OTPartyMon1
ld a, [OTPartyCount]
ld hl, wOTPartyMon1
ld a, [wOTPartyCount]
ld b, a
ld c, 1 << (PARTY_LENGTH - 1)
ld d, 0
@ -357,7 +357,7 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
ld [wEnemyAISwitchScore], a
.loop
ld a, [CurOTMon]
ld a, [wCurOTMon]
cp d
push hl
jr z, .next
@ -375,11 +375,11 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
jr z, .next
ld a, [hl]
ld [CurSpecies], a
ld [wCurSpecies], a
call GetBaseData
; the player's last move is damaging...
ld a, [LastPlayerCounterMove]
ld a, [wLastPlayerCounterMove]
dec a
ld hl, Moves + MOVE_POWER
call GetMoveAttr
@ -389,7 +389,7 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
; and the Pokemon is immune to it...
inc hl
call GetMoveByte
ld hl, BaseType
ld hl, wBaseType
call CheckTypeMatchup
ld a, [wTypeMatchup]
and a
@ -417,9 +417,9 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a
FindAliveEnemyMonsWithASuperEffectiveMove: ; 34a85
push bc
ld a, [OTPartyCount]
ld a, [wOTPartyCount]
ld e, a
ld hl, OTPartyMon1HP
ld hl, wOTPartyMon1HP
ld b, 1 << (PARTY_LENGTH - 1)
ld c, 0
.loop
@ -434,7 +434,7 @@ FindAliveEnemyMonsWithASuperEffectiveMove: ; 34a85
.next
srl b
push bc
ld bc, PartyMon2HP - (PartyMon1HP + 1)
ld bc, wPartyMon2HP - (wPartyMon1HP + 1)
add hl, bc
pop bc
dec e
@ -449,7 +449,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
ld a, -1
ld [wEnemyAISwitchScore], a
ld hl, OTPartyMon1Moves
ld hl, wOTPartyMon1Moves
ld b, 1 << (PARTY_LENGTH - 1)
ld d, 0
ld e, 0
@ -480,7 +480,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
; check type matchups
inc hl
call GetMoveByte
ld hl, BattleMonType1
ld hl, wBattleMonType1
call CheckTypeMatchup
; if immune or not very effective: continue
@ -556,7 +556,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7
FindEnemyMonsThatResistPlayer: ; 34b20
push bc
ld hl, OTPartySpecies
ld hl, wOTPartySpecies
ld b, 1 << (PARTY_LENGTH - 1)
ld c, 0
@ -566,9 +566,9 @@ FindEnemyMonsThatResistPlayer: ; 34b20
jr z, .done
push hl
ld [CurSpecies], a
ld [wCurSpecies], a
call GetBaseData
ld a, [LastPlayerCounterMove]
ld a, [wLastPlayerCounterMove]
and a
jr z, .skip_move
@ -583,16 +583,16 @@ FindEnemyMonsThatResistPlayer: ; 34b20
jr .check_type
.skip_move
ld a, [BattleMonType1]
ld hl, BaseType
ld a, [wBattleMonType1]
ld hl, wBaseType
call CheckTypeMatchup
ld a, [wTypeMatchup]
cp 10 + 1
jr nc, .dont_choose_mon
ld a, [BattleMonType2]
ld a, [wBattleMonType2]
.check_type
ld hl, BaseType
ld hl, wBaseType
call CheckTypeMatchup
ld a, [wTypeMatchup]
cp 10 + 1
@ -618,10 +618,10 @@ FindEnemyMonsThatResistPlayer: ; 34b20
FindEnemyMonsWithAtLeastQuarterMaxHP: ; 34b77
push bc
ld de, OTPartySpecies
ld de, wOTPartySpecies
ld b, 1 << (PARTY_LENGTH - 1)
ld c, 0
ld hl, OTPartyMon1HP
ld hl, wOTPartyMon1HP
.loop
ld a, [de]

8
engine/battle/anim_hp_bar.asm
View File

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

30
engine/battle/battle_transition.asm
View File

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

2
engine/battle/checkbattlescene.asm
View File

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

12
engine/battle/consumehelditem.asm
View File

@ -4,13 +4,13 @@ ConsumeHeldItem: ; 27192
push bc
ld a, [hBattleTurn]
and a
ld hl, OTPartyMon1Item
ld de, EnemyMonItem
ld a, [CurOTMon]
ld hl, wOTPartyMon1Item
ld de, wEnemyMonItem
ld a, [wCurOTMon]
jr z, .theirturn
ld hl, PartyMon1Item
ld de, BattleMonItem
ld a, [CurBattleMon]
ld hl, wPartyMon1Item
ld de, wBattleMonItem
ld a, [wCurBattleMon]
.theirturn
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
; Override Hidden Power's type and power based on the user's DVs.
ld hl, BattleMonDVs
ld hl, wBattleMonDVs
ld a, [hBattleTurn]
and a
jr z, .got_dvs
ld hl, EnemyMonDVs
ld hl, wEnemyMonDVs
.got_dvs

14
engine/battle/link_result.asm
View File

@ -1,9 +1,9 @@
DetermineLinkBattleResult: ; 2b930
farcall UpdateEnemyMonInParty
ld hl, PartyMon1HP
ld hl, wPartyMon1HP
call .CountMonsRemaining
push bc
ld hl, OTPartyMon1HP
ld hl, wOTPartyMon1HP
call .CountMonsRemaining
ld a, c
pop bc
@ -20,10 +20,10 @@ DetermineLinkBattleResult: ; 2b930
jr z, .victory
cp $2
jr z, .defeat
ld hl, PartyMon1HP
ld hl, wPartyMon1HP
call .CalcPercentHPRemaining
push de
ld hl, OTPartyMon1HP
ld hl, wOTPartyMon1HP
call .CalcPercentHPRemaining
pop hl
ld a, d
@ -118,16 +118,16 @@ DetermineLinkBattleResult: ; 2b930
ret
.BothSides_CheckNumberMonsAtFullHealth: ; 2b9e1
ld hl, PartyMon1HP
ld hl, wPartyMon1HP
call .CheckFaintedOrFullHealth
jr nz, .finish ; we have a pokemon that's neither fainted nor at full health
ld hl, OTPartyMon1HP
ld hl, wOTPartyMon1HP
call .CheckFaintedOrFullHealth
ld e, $1
ret
.finish
ld hl, OTPartyMon1HP
ld hl, wOTPartyMon1HP
call .CheckFaintedOrFullHealth
ld e, $0
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
ld de, WeatherTypeModifiers
ld a, [Weather]
ld a, [wBattleWeather]
ld b, a
ld a, [wd265] ; move type
ld c, a
@ -105,7 +105,7 @@ DoWeatherModifiers: ; fbda4
.ApplyModifier:
xor a
ld [hMultiplicand + 0], a
ld hl, CurDamage
ld hl, wCurDamage
ld a, [hli]
ld [hMultiplicand + 1], a
ld a, [hl]
@ -138,9 +138,9 @@ DoWeatherModifiers: ; fbda4
.Update:
ld a, b
ld [CurDamage], a
ld [wCurDamage], a
ld a, c
ld [CurDamage + 1], a
ld [wCurDamage + 1], a
.done
ret
@ -153,7 +153,7 @@ DoBadgeTypeBoosts: ; fbe24
and a
ret nz
ld a, [InBattleTowerBattle]
ld a, [wInBattleTowerBattle]
and a
ret nz
@ -189,10 +189,10 @@ DoBadgeTypeBoosts: ; fbe24
jr .CheckBadge
.ApplyBoost:
ld a, [CurDamage]
ld a, [wCurDamage]
ld h, a
ld d, a
ld a, [CurDamage + 1]
ld a, [wCurDamage + 1]
ld l, a
ld e, a
@ -216,9 +216,9 @@ DoBadgeTypeBoosts: ; fbe24
.Update:
ld a, h
ld [CurDamage], a
ld [wCurDamage], a
ld a, l
ld [CurDamage + 1], a
ld [wCurDamage + 1], a
.done
pop bc

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -19,9 +19,9 @@ BattleCommand_CheckFutureSight: ; 37d0d
ld [hl], 0
ld a, [de]
inc de
ld [CurDamage], a
ld [wCurDamage], a
ld a, [de]
ld [CurDamage + 1], a
ld [wCurDamage + 1], a
ld b, futuresight_command
jp SkipToBattleCommand
@ -64,7 +64,7 @@ BattleCommand_FutureSight: ; 37d34
jr z, .StoreDamage
ld de, wEnemyFutureSightDamage
.StoreDamage:
ld hl, CurDamage
ld hl, wCurDamage
ld a, [hl]
ld [de], a
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
call GetBattleVarAddr
res SUBSTATUS_NIGHTMARE, [hl]
ld de, PartyMon1Status
ld de, wPartyMon1Status
ld a, [hBattleTurn]
and a
jr z, .got_status
ld de, OTPartyMon1Status
ld de, wOTPartyMon1Status
.got_status
ld a, BATTLE_VARS_STATUS
call GetBattleVarAddr

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -1,11 +1,11 @@
BattleCommand_HappinessPower: ; 3784b
; happinesspower
push bc
ld hl, BattleMonHappiness
ld hl, wBattleMonHappiness
ld a, [hBattleTurn]
and a
jr z, .ok
ld hl, EnemyMonHappiness
ld hl, wEnemyMonHappiness
.ok
xor 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
; checkcurl
ld de, PlayerRolloutCount
ld de, wPlayerRolloutCount
ld a, [hBattleTurn]
and a
jr z, .ok
ld de, EnemyRolloutCount
ld de, wEnemyRolloutCount
.ok
ld a, BATTLE_VARS_SUBSTATUS1
call GetBattleVar
@ -33,11 +33,11 @@ BattleCommand_RolloutPower: ; 37734
and SLP
ret nz
ld hl, PlayerRolloutCount
ld hl, wPlayerRolloutCount
ld a, [hBattleTurn]
and a
jr z, .got_rollout_count
ld hl, EnemyRolloutCount
ld hl, wEnemyRolloutCount
.got_rollout_count
ld a, [hl]
@ -47,7 +47,7 @@ BattleCommand_RolloutPower: ; 37734
ld [wSomeoneIsRampaging], a
.skip_set_rampage
ld a, [AttackMissed]
ld a, [wAttackMissed]
and a
jr z, .hit
@ -84,7 +84,7 @@ BattleCommand_RolloutPower: ; 37734
dec b
jr z, .done_damage
ld hl, CurDamage + 1
ld hl, wCurDamage + 1
sla [hl]
dec hl
rl [hl]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

22
engine/battle/read_trainer_attributes.asm
View File

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

4
engine/battle/read_trainer_dvs.asm
View File

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

78
engine/battle/read_trainer_party.asm
View File

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

2
engine/battle/returntobattle_useball.asm
View File

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

8
engine/battle/sliding_intro.asm
View File

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

38
engine/battle/start_battle.asm
View File

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

42
engine/battle/trainer_huds.asm
View File

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

4
engine/battle/updatebattlehuds.asm
View File

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

12
engine/battle/used_move_text.asm
View File

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

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