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
78b8f05fb7
pokecrystal-board/engine/battle/core.asm

8914 lines
140 KiB
NASM
Raw Normal View History

split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Core components of the battle engine.
Note which labels are only needed for locating banks (relevant to issue #485)
2018-06-12 20:29:15 -07:00
Remove all address comments
2018-06-24 07:09:41 -07:00
DoBattle:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
more battle core labels
2015-11-07 18:04:54 -08:00
ld [wBattleParticipantsNotFainted], a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wBattleParticipantsIncludingFainted], a
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleEnded], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Rename the variable at D264
2016-08-07 15:14:20 -07:00
ld [wBattleHasJustStarted], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1HP
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, PARTYMON_STRUCT_LENGTH - 1
ld d, BATTLEACTION_SWITCH1 - 1
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc d
ld a, [hli]
or [hl]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .alive
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.alive
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld [wBattleAction], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_INTERNAL_CLOCK
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .wild
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld [wEnemySwitchMonIndex], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
call BreakAttraction
more battle core labels
2015-11-07 18:04:54 -08:00
call EnemySwitch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.wild
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld c, 40
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_2
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call CheckPlayerPartyForFitMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
and a
jp z, LostBattle
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
changed more labels
2015-09-09 16:27:07 -07:00
cp BATTLETYPE_DEBUG
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .tutorial_debug
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .tutorial_debug
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.loop2
Battle animation annotations
2016-03-01 19:31:21 -08:00
call CheckIfCurPartyMonIsFitToFight
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .alive2
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wCurPartyMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc [hl]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.alive2
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wLastPlayerMon], a
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartySpecies - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartySpecies], a
ld [wTempBattleMonSpecies], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 5
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld a, 9
call SlideBattlePicOut
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
more battle core labels
2015-11-07 18:04:54 -08:00
call ResetBattleParticipants
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call SendOutMonText
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewBattleMonStatus
call BreakAttraction
Pokemon animations
2015-11-07 06:48:32 -08:00
call SendOutPlayerMon
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked_2
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_INTERNAL_CLOCK
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .not_linked_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld [wEnemySwitchMonIndex], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
call BreakAttraction
more battle core labels
2015-11-07 18:04:54 -08:00
call EnemySwitch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked_2
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
jp BattleTurn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.tutorial_debug
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
WildFled_EnemyFled_LinkBattleCanceled:
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
and BATTLERESULT_BITMASK
add DRAW
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
change more labelss
2015-08-24 16:56:30 -07:00
ld hl, BattleText_WildFled
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
jr z, .print_text
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
and BATTLERESULT_BITMASK
ld [wBattleResult], a ; WIN
change more labelss
2015-08-24 16:56:30 -07:00
ld hl, BattleText_EnemyFled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
.print_text
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
.skip_text
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_RUN
call PlaySFX
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
.skip_sfx
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleEnded], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleTurn:
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.loop
More battle core labels
2015-11-08 10:27:26 -08:00
call CheckContestBattleOver
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp c, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wPlayerIsSwitching], a
ld [wEnemyIsSwitching], a
Rename the variable at D264
2016-08-07 15:14:20 -07:00
ld [wBattleHasJustStarted], a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld [wPlayerJustGotFrozen], a
ld [wEnemyJustGotFrozen], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurDamage], a
ld [wCurDamage + 1], a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
call HandleBerserkGene
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleMonInParty
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall AIChooseMove
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
call CheckPlayerLockedIn
More battle core labels
2015-11-08 10:27:26 -08:00
jr c, .skip_iteration
.loop1
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call BattleMenu
jr c, .quit
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleEnded]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld a, [wForcedSwitch] ; roared/whirlwinded/teleported
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
More battle core labels
2015-11-08 10:27:26 -08:00
.skip_iteration
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
call ParsePlayerAction
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .loop1
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
call EnemyTriesToFlee
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr c, .quit
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
call DetermineMoveOrder
More battle core labels
2015-11-08 10:27:26 -08:00
jr c, .false
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
call Battle_EnemyFirst
More battle core labels
2015-11-08 10:27:26 -08:00
jr .proceed
.false
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
call Battle_PlayerFirst
More battle core labels
2015-11-08 10:27:26 -08:00
.proceed
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld a, [wForcedSwitch]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleEnded]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleBetweenTurnEffects
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleEnded]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
jp .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleBetweenTurnEffects:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
So very jumb
2015-10-19 13:49:29 -07:00
jr z, .CheckEnemyFirst
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleFutureSight
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call HandleWeather
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleWrap
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
More battle core labels
2015-11-08 10:27:26 -08:00
call HandlePerishSong
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
So very jumb
2015-10-19 13:49:29 -07:00
jr .NoMoreFaintingConditions
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.CheckEnemyFirst:
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleFutureSight
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call HandleWeather
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleWrap
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
More battle core labels
2015-11-08 10:27:26 -08:00
call HandlePerishSong
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.NoMoreFaintingConditions:
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleLeftovers
call HandleMysteryberry
HanleDefrost -> HandleDefrost
2018-04-05 02:41:06 -07:00
call HandleDefrost
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call HandleSafeguard
call HandleScreens
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleStatBoostingHeldItems
call HandleHealingItems
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleMonInParty
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
link and seer labels
2015-11-23 13:04:53 -08:00
jp HandleEncore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckFaint_PlayerThenEnemy:
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
; BUG: Perish Song and Spikes can leave a Pokemon with 0 HP and not faint (see docs/bugs_and_glitches.md)
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .PlayerNotFainted
call HandlePlayerMonFaint
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleEnded]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PlayerNotFainted:
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleContinues
call HandleEnemyMonFaint
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleEnded]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.BattleContinues:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.BattleIsOver:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckFaint_EnemyThenPlayer:
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
; BUG: Perish Song and Spikes can leave a Pokemon with 0 HP and not faint (see docs/bugs_and_glitches.md)
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .EnemyNotFainted
call HandleEnemyMonFaint
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleEnded]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.EnemyNotFainted:
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleContinues
call HandlePlayerMonFaint
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleEnded]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.BattleContinues:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.BattleIsOver:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleBerserkGene:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
jr z, .reverse
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
call .player
jr .enemy
.reverse
call .enemy
; fallthrough
2018-08-26 19:34:59 -07:00
; fallthrough
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
.player
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wPartyMon1Item
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
jr .go
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
.enemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wOTPartyMon1Item
ld a, [wCurOTMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
; fallthrough
2018-08-26 19:34:59 -07:00
; fallthrough
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
.go
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
push bc
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetUserItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
sub BERSERK_GENE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
ret nz
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld h, d
ld l, e
ld a, b
call GetPartyLocation
xor a
ld [hl], a
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
; BUG: Berserk Gene's confusion lasts for 256 turns or the previous Pokémon's confusion count (see docs/bugs_and_glitches.md)
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
ld a, BATTLE_VARS_SUBSTATUS3
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
set SUBSTATUS_CONFUSED, [hl]
ld a, BATTLE_VARS_MOVE_ANIM
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push af
xor a
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wAttackMissed], a
ld [wEffectFailed], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall BattleCommand_AttackUp2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
pop hl
ld [hl], a
call GetItemName
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UsersStringBuffer1Activated
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar BattleCommand_StatUpMessage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
bit SUBSTATUS_CONFUSED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_CONFUSED
more battle core labels
2015-11-07 18:04:54 -08:00
call Call_PlayBattleAnim_OnlyIfVisible
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BecameConfusedText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
EnemyTriesToFlee:
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_FORFEIT
jr z, .forfeit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.forfeit
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
DetermineMoveOrder:
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .use_move
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
Identify BATTLEACTION_D and _E (thanks, ax6)
2018-10-20 21:52:10 -07:00
cp BATTLEACTION_STRUGGLE
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .use_move
Identify BATTLEACTION_D and _E (thanks, ax6)
2018-10-20 21:52:10 -07:00
cp BATTLEACTION_SKIPTURN
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .use_move
sub BATTLEACTION_SWITCH1
jr c, .use_move
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattlePlayerAction]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
cp BATTLEPLAYERACTION_SWITCH
Some battle labels
2015-11-05 16:13:09 -08:00
jr nz, .switch
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_INTERNAL_CLOCK
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_2
Some battle labels
2015-11-05 16:13:09 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
Consistent "X percent [+/- Y]" order
2018-02-04 18:21:34 -08:00
cp 50 percent + 1
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .player_first
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
Consistent "X percent [+/- Y]" order
2018-02-04 18:21:34 -08:00
cp 50 percent + 1
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .enemy_first
jp .player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Some battle labels
2015-11-05 16:13:09 -08:00
.switch
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar AI_Switch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.use_move
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattlePlayerAction]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
and a ; BATTLEPLAYERACTION_USEMOVE?
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .player_first
comment move priority functions
2013-12-30 20:32:37 -08:00
call CompareMovePriority
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .equal_priority
jp c, .player_first ; player goes first
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.equal_priority
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetUserItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetOpponentItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
ld a, d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_QUICK_CLAW
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .player_no_quick_claw
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_QUICK_CLAW
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .both_have_quick_claw
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp e
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nc, .speed_check
jp .player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_no_quick_claw
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_QUICK_CLAW
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .speed_check
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nc, .speed_check
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.both_have_quick_claw
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_INTERNAL_CLOCK
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_2b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp e
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .player_first
jr .speed_check
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_2b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp e
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .enemy_first
jr .speed_check
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.speed_check
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonSpeed
ld hl, wEnemyMonSpeed
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld c, 2
StringCmp → CompareBytes; CompareLong → CompareBytesLong hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
2018-07-22 21:25:53 -07:00
call CompareBytes
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .speed_tie
jp nc, .player_first
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.speed_tie
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_INTERNAL_CLOCK
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_2c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
Consistent "X percent [+/- Y]" order
2018-02-04 18:21:34 -08:00
cp 50 percent + 1
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .player_first
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_2c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
Consistent "X percent [+/- Y]" order
2018-02-04 18:21:34 -08:00
cp 50 percent + 1
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .enemy_first
.player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckContestBattleOver:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
cp BATTLETYPE_CONTEST
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .contest_not_over
ld a, [wParkBallsRemaining]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .contest_not_over
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
and BATTLERESULT_BITMASK
add DRAW
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
More battle core labels
2015-11-08 10:27:26 -08:00
.contest_not_over
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckPlayerLockedIn:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerSubStatus4]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << SUBSTATUS_RECHARGE
jp nz, .quit
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_FLINCHED, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_FLINCHED, [hl]
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << SUBSTATUS_CHARGED | 1 << SUBSTATUS_RAMPAGE
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jp nz, .quit
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus1
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ROLLOUT, [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jp nz, .quit
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ParsePlayerAction:
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
call CheckPlayerLockedIn
jp c, .locked_in
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr z, .not_encored
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wLastPlayerMove]
ld [wCurPlayerMove], a
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr .encored
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.not_encored
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattlePlayerAction]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
cp BATTLEPLAYERACTION_SWITCH
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr z, .reset_rage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr nz, .reset_bide
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerSubStatus3]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << SUBSTATUS_BIDE
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr nz, .locked_in
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
link and seer labels
2015-11-23 13:04:53 -08:00
ld [wMoveSelectionMenuType], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
inc a ; POUND
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wFXAnimID], a
changed name of some labels
2015-10-10 04:45:39 -07:00
call MoveSelectionScreen
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleHuds
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPlayerMove]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp STRUGGLE
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr z, .struggle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlayClickSFX
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.struggle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret nz
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.encored
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar UpdateMoveData
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
more battle core labels
2015-11-07 18:04:54 -08:00
ld [wPlayerCharging], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wPlayerMoveStruct + MOVE_EFFECT]
cp EFFECT_FURY_CUTTER
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr z, .continue_fury_cutter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerFuryCutterCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.continue_fury_cutter
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wPlayerMoveStruct + MOVE_EFFECT]
cp EFFECT_RAGE
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr z, .continue_rage
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus4
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wPlayerRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.continue_rage
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wPlayerMoveStruct + MOVE_EFFECT]
cp EFFECT_PROTECT
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr z, .continue_protect
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
cp EFFECT_ENDURE
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr z, .continue_protect
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerProtectCount], a
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
jr .continue_protect
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.reset_bide
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_BIDE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.locked_in
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerFuryCutterCount], a
ld [wPlayerProtectCount], a
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wPlayerRageCounter], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.continue_protect
call ParseEnemyAction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
.reset_rage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerFuryCutterCount], a
ld [wPlayerProtectCount], a
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wPlayerRageCounter], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleEncore:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .player_1
call .do_player
jr .do_enemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.player_1
call .do_enemy
.do_player
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerEncoreCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerEncoreCount], a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .end_player_encore
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonPP
ld a, [wCurMoveNum]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
Use maskbits some more
2018-01-11 09:00:01 -08:00
and PP_MASK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
link and seer labels
2015-11-23 13:04:53 -08:00
.end_player_encore
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
res SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_TargetsEncoreEnded
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.do_enemy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyEncoreCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyEncoreCount], a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .end_enemy_encore
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonPP
ld a, [wCurEnemyMoveNum]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
Use maskbits some more
2018-01-11 09:00:01 -08:00
and PP_MASK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
link and seer labels
2015-11-23 13:04:53 -08:00
.end_enemy_encore
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
res SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_TargetsEncoreEnded
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
TryEnemyFlee:
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr nz, .Stay
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerSubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_CANT_RUN, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .Stay
More battle core labels
2015-11-08 10:27:26 -08:00
ld a, [wEnemyWrapCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .Stay
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonStatus]
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-17 19:25:56 -07:00
and 1 << FRZ | SLP_MASK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .Stay
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, 1
fleemons are global
2013-12-24 14:19:39 -08:00
ld hl, AlwaysFleeMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsInArray
jr c, .Flee
call BattleRandom
ld b, a
Consistent "X percent [+/- Y]" order
2018-02-04 18:21:34 -08:00
cp 50 percent + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .Stay
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, 1
fleemons are global
2013-12-24 14:19:39 -08:00
ld hl, OftenFleeMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsInArray
pop bc
jr c, .Flee
ld a, b
Consistent "X percent [+/- Y]" order
2018-02-04 18:21:34 -08:00
cp 10 percent + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .Stay
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, 1
fleemons are global
2013-12-24 14:19:39 -08:00
ld hl, SometimesFleeMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsInArray
jr c, .Flee
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Stay:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Flee:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Split battle/ into data/ and engine/ components
2017-12-26 14:47:05 -08:00
INCLUDE "data/wild/flee_mons.asm"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CompareMovePriority:
comment move priority functions
2013-12-30 20:32:37 -08:00
; Compare the priority of the player and enemy's moves.
; Return carry if the player goes first, or z if they match.
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPlayerMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetMovePriority
ld b, a
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurEnemyMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetMovePriority
pop bc
cp b
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetMovePriority:
comment move priority functions
2013-12-30 20:32:37 -08:00
; Return the priority (0-3) of move a.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
comment move priority functions
2013-12-30 20:32:37 -08:00
Document one more bug/oversight Move FleeMons table into data/
2017-12-14 21:05:53 -08:00
; Vital Throw goes last.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp VITAL_THROW
ld a, 0
ret z
comment move priority functions
2013-12-30 20:32:37 -08:00
call GetMoveEffect
ld hl, MoveEffectPriorities
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.loop
ld a, [hli]
cp b
comment move priority functions
2013-12-30 20:32:37 -08:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
comment move priority functions
2013-12-30 20:32:37 -08:00
cp -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .loop
comment move priority functions
2013-12-30 20:32:37 -08:00
More comments Fix some constants
2018-01-09 12:39:48 -08:00
ld a, BASE_PRIORITY
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
comment move priority functions
2013-12-30 20:32:37 -08:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
ret
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
INCLUDE "data/moves/effects_priorities.asm"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
GetMoveEffect:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
dec a
label more pointers to Moves
2013-12-30 20:22:27 -08:00
ld hl, Moves + MOVE_EFFECT
Use constants for move struct positioning. This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:23:55 -07:00
ld bc, MOVE_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
label more pointers to Moves
2013-12-30 20:22:27 -08:00
ld a, BANK(Moves)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetFarByte
ld b, a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
Battle_EnemyFirst:
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
more battle core labels
2015-11-07 18:04:54 -08:00
call TryEnemyFlee
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp c, WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
ld a, $1
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld [wEnemyGoesFirst], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar AI_SwitchOrTryItem
more battle core labels
2015-11-07 18:04:54 -08:00
jr c, .switch_item
call EnemyTurn_EndOpponentProtectEndureDestinyBond
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld a, [wForcedSwitch]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.switch_item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
more battle core labels
2015-11-07 18:04:54 -08:00
call PlayerTurn_EndOpponentProtectEndureDestinyBond
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld a, [wForcedSwitch]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
xor a ; BATTLEPLAYERACTION_USEMOVE
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
Battle_PlayerFirst:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld [wEnemyGoesFirst], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar AI_SwitchOrTryItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
more battle core labels
2015-11-07 18:04:54 -08:00
call PlayerTurn_EndOpponentProtectEndureDestinyBond
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld a, [wForcedSwitch]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
call SetPlayerTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
call RefreshBattleHuds
pop af
more battle core labels
2015-11-07 18:04:54 -08:00
jr c, .switched_or_used_item
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
more battle core labels
2015-11-07 18:04:54 -08:00
call TryEnemyFlee
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp c, WildFled_EnemyFled_LinkBattleCanceled
more battle core labels
2015-11-07 18:04:54 -08:00
call EnemyTurn_EndOpponentProtectEndureDestinyBond
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld a, [wForcedSwitch]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.switched_or_used_item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
xor a ; BATTLEPLAYERACTION_USEMOVE
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
PlayerTurn_EndOpponentProtectEndureDestinyBond:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
more battle core labels
2015-11-07 18:04:54 -08:00
call EndUserDestinyBond
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar DoPlayerTurn
more battle core labels
2015-11-07 18:04:54 -08:00
jp EndOpponentProtectEndureDestinyBond
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
EnemyTurn_EndOpponentProtectEndureDestinyBond:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
more battle core labels
2015-11-07 18:04:54 -08:00
call EndUserDestinyBond
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar DoEnemyTurn
more battle core labels
2015-11-07 18:04:54 -08:00
jp EndOpponentProtectEndureDestinyBond
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
EndOpponentProtectEndureDestinyBond:
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_PROTECT, [hl]
res SUBSTATUS_ENDURE, [hl]
ld a, BATTLE_VARS_SUBSTATUS5_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_DESTINY_BOND, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
EndUserDestinyBond:
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS5
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_DESTINY_BOND, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HasUserFainted:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, HasPlayerFainted
Remove all address comments
2018-06-24 07:09:41 -07:00
HasEnemyFainted:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
changed more labels
2015-09-09 16:27:07 -07:00
jr CheckIfHPIsZero
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
HasPlayerFainted:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckIfHPIsZero:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ResidualDamage:
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
; Return z if the user fainted before
; or as a result of residual damage.
; For Sandstorm damage, see HandleWeather.
call HasUserFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_STATUS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << PSN | 1 << BRN
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .did_psn_brn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, HurtByPoisonText
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_PSN
and 1 << BRN
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .got_anim
ld hl, HurtByBurnText
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_BRN
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.got_anim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
more battle core labels
2015-11-07 18:04:54 -08:00
call Call_PlayBattleAnim_OnlyIfVisible
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetEighthMaxHP
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wPlayerToxicCount
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .check_toxic
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyToxicCount
more battle core labels
2015-11-07 18:04:54 -08:00
.check_toxic
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TOXIC, a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .did_toxic
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call GetSixteenthMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
inc a
ld [de], a
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld hl, 0
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.add
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
dec a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr nz, .add
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, h
ld c, l
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.did_toxic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.did_psn_brn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasUserFainted
jp z, .fainted
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS4
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_LEECH_SEED, [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .not_seeded
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SAP
ld a, BATTLE_VARS_SUBSTATUS3_OPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
more battle core labels
2015-11-07 18:04:54 -08:00
call z, Call_PlayBattleAnim_OnlyIfVisible
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetEighthMaxHP
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Still more battle command labels
2015-11-06 19:36:06 -08:00
call RestoreHP
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, LeechSeedSapsText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
more battle core labels
2015-11-07 18:04:54 -08:00
.not_seeded
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasUserFainted
jr z, .fainted
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_NIGHTMARE, [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .not_nightmare
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_IN_NIGHTMARE
more battle core labels
2015-11-07 18:04:54 -08:00
call Call_PlayBattleAnim_OnlyIfVisible
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetQuarterMaxHP
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, HasANightmareText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
more battle core labels
2015-11-07 18:04:54 -08:00
.not_nightmare
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasUserFainted
jr z, .fainted
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_CURSE, [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .not_cursed
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_IN_NIGHTMARE
more battle core labels
2015-11-07 18:04:54 -08:00
call Call_PlayBattleAnim_OnlyIfVisible
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetQuarterMaxHP
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, HurtByCurseText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.not_cursed
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .check_fainted
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.check_fainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.fainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld c, 20
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
xor a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandlePerishSong:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .EnemyFirst
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
jp .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.EnemyFirst:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
.do_it
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerPerishCount
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .got_count
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyPerishCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.got_count
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_PERISH, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
dec [hl]
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wTextDecimalByte], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, PerishCountText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret nz
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_PERISH, [hl]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Prepare to merge
2016-01-17 21:39:01 -08:00
jr nz, .kill_enemy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hli], a
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1HP
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
xor a
ld [hli], a
ld [hl], a
ret
Prepare to merge
2016-01-17 21:39:01 -08:00
.kill_enemy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hli], a
ld [hl], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1HP
ld a, [wCurOTMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
xor a
ld [hli], a
ld [hl], a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleWrap:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .EnemyFirst
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
jp .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.EnemyFirst:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
.do_it
ld hl, wPlayerWrapCount
ld de, wPlayerTrappingMove
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .got_addrs
ld hl, wEnemyWrapCount
ld de, wEnemyTrappingMove
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.got_addrs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and a
ret z
More battle core labels
2015-11-08 10:27:26 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_SUBSTITUTE, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
More battle core labels
2015-11-08 10:27:26 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wFXAnimID], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetMoveName
dec [hl]
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .release_from_bounds
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .skip_anim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wFXAnimID + 1], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PlayBattleAnim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.skip_anim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call GetSixteenthMaxHP
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UsersHurtByStringBuffer1
Prepare to merge
2016-01-17 21:39:01 -08:00
jr .print_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.release_from_bounds
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UserWasReleasedFromStringBuffer1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prepare to merge
2016-01-17 21:39:01 -08:00
.print_text
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
SwitchTurnCore:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
xor 1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleLeftovers:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .DoEnemyFirst
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
jp .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.DoEnemyFirst:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
.do_it
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetUserItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetItemName
ld a, b
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
cp HELD_LEFTOVERS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
More battle core labels
2015-11-08 10:27:26 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .got_hp
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.got_hp
; Don't restore if we're already at max HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, a
ld a, [hli]
ld c, a
ld a, [hli]
cp b
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .restore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
cp c
ret z
More battle core labels
2015-11-08 10:27:26 -08:00
.restore
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call GetSixteenthMaxHP
call SwitchTurnCore
Still more battle command labels
2015-11-06 19:36:06 -08:00
call RestoreHP
Prepare to merge
2016-01-17 21:39:01 -08:00
ld hl, BattleText_TargetRecoveredWithItem
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleMysteryberry:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .DoEnemyFirst
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
jp .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.DoEnemyFirst:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
.do_it
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetUserItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp HELD_RESTORE_PP
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .quit
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1PP
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld d, h
ld e, l
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1Moves
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .wild
Pokedex labels
2015-11-29 18:34:59 -08:00
ld de, wWildMonPP
ld hl, wWildMonMoves
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .wild
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1PP
ld a, [wCurOTMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld d, h
ld e, l
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1Moves
ld a, [wCurOTMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
More battle core labels
2015-11-08 10:27:26 -08:00
.wild
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $0
More battle core labels
2015-11-08 10:27:26 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
Use maskbits some more
2018-01-11 09:00:01 -08:00
and PP_MASK
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .restore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
inc de
inc c
ld a, c
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp NUM_MOVES
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
More battle core labels
2015-11-08 10:27:26 -08:00
.restore
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
; lousy hack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp SKETCH
ld b, 1
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .sketch
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 5
More battle core labels
2015-11-08 10:27:26 -08:00
.sketch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
add b
ld [de], a
push bc
push bc
ld a, [hl]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld [wTempByteValue], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonMoves - 1
ld hl, wBattleMonPP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .player_pp
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonMoves - 1
ld hl, wEnemyMonPP
More battle core labels
2015-11-08 10:27:26 -08:00
.player_pp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc de
pop bc
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
push hl
ld h, d
ld l, e
add hl, bc
pop de
pop bc
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, [wTempByteValue]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .skip_checks
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerSubStatus5]
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .check_transform
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus5]
More battle core labels
2015-11-08 10:27:26 -08:00
.check_transform
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .skip_checks
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
add b
ld [de], a
More battle core labels
2015-11-08 10:27:26 -08:00
.skip_checks
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetUserItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hl], a
More battle core labels
2015-11-08 10:27:26 -08:00
call GetPartymonItem
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .consume_item
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .skip_consumption
call GetOTPartymonItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.consume_item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hl], a
More battle core labels
2015-11-08 10:27:26 -08:00
.skip_consumption
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetItemName
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
Still more battle command labels
2015-11-06 19:36:06 -08:00
call ItemRecoveryAnim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_UserRecoveredPPUsing
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleFutureSight:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
jp .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call .do_it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
.do_it
ld hl, wPlayerFutureSightCount
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .okay
ld hl, wEnemyFutureSightCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and a
ret z
dec a
ld [hl], a
cp $1
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
Prepare to merge
2016-01-17 21:39:01 -08:00
ld hl, BattleText_TargetWasHitByFutureSight
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, BATTLE_VARS_MOVE
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, FUTURE_SIGHT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar UpdateMoveData
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wAttackMissed], a
ld [wAlreadyDisobeyed], a
Fix some uses of EFFECTIVE
2018-03-09 13:09:03 -08:00
ld a, EFFECTIVE
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTypeModifier], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar DoMove
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurDamage], a
ld [wCurDamage + 1], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, BATTLE_VARS_MOVE
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ld [hl], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleMonInParty
jp UpdateEnemyMonInParty
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleDefrost:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .enemy_first
call .do_player_turn
jr .do_enemy_turn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.enemy_first
call .do_enemy_turn
.do_player_turn
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit FRZ, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld a, [wPlayerJustGotFrozen]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 10 percent
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleMonStatus], a
ld a, [wCurBattleMon]
ld hl, wPartyMon1Status
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld [hl], 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleHuds
call SetEnemyTurn
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, DefrostedOpponentText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.do_enemy_turn
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit FRZ, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld a, [wEnemyJustGotFrozen]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 10 percent
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyMonStatus], a
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Prepare to merge
2016-01-17 21:39:01 -08:00
jr z, .wild
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurOTMon]
ld hl, wOTPartyMon1Status
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld [hl], 0
Prepare to merge
2016-01-17 21:39:01 -08:00
.wild
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleHuds
call SetPlayerTurn
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, DefrostedOpponentText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleSafeguard:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
Prepare to merge
2016-01-17 21:39:01 -08:00
jr z, .player1
call .CheckPlayer
jr .CheckEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prepare to merge
2016-01-17 21:39:01 -08:00
.player1
call .CheckEnemy
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.CheckPlayer:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerScreens]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
bit SCREENS_SAFEGUARD, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSafeguardCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec [hl]
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SCREENS_SAFEGUARD, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerScreens], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prepare to merge
2016-01-17 21:39:01 -08:00
jr .print
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.CheckEnemy:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyScreens]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
bit SCREENS_SAFEGUARD, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySafeguardCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec [hl]
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SCREENS_SAFEGUARD, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyScreens], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Prepare to merge
2016-01-17 21:39:01 -08:00
.print
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_SafeguardFaded
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleScreens:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .Both
call .CheckPlayer
jr .CheckEnemy
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Both:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call .CheckEnemy
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.CheckPlayer:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
ld de, .Your
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
call .Copy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerScreens
ld de, wPlayerLightScreenCount
Prepare to merge
2016-01-17 21:39:01 -08:00
jr .TickScreens
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.CheckEnemy:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
ld de, .Enemy
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
call .Copy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyScreens
ld de, wEnemyLightScreenCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.TickScreens:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit SCREENS_LIGHT_SCREEN, [hl]
Prepare to merge
2016-01-17 21:39:01 -08:00
call nz, .LightScreenTick
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit SCREENS_REFLECT, [hl]
Prepare to merge
2016-01-17 21:39:01 -08:00
call nz, .ReflectTick
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Copy:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wStringBuffer1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp CopyName2
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Your:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "Your@"
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Enemy:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "Enemy@"
Remove all address comments
2018-06-24 07:09:41 -07:00
.LightScreenTick:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
dec a
ld [de], a
ret nz
res SCREENS_LIGHT_SCREEN, [hl]
push hl
push de
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_MonsLightScreenFell
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
pop hl
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.ReflectTick:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc de
ld a, [de]
dec a
ld [de], a
ret nz
res SCREENS_REFLECT, [hl]
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_MonsReflectFaded
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleWeather:
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattleWeather]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp WEATHER_NONE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wWeatherCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ended
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, .WeatherMessages
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call .PrintWeatherMessage
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattleWeather]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp WEATHER_SANDSTORM
ret nz
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Comment, remove, or revise many unreferenced labels
2020-10-26 12:45:57 -07:00
; player first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call .SandstormDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr .SandstormDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call .SandstormDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.SandstormDamage:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
bit SUBSTATUS_UNDERGROUND, a
ret nz
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonType1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonType1
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
cp ROCK
ret z
cp GROUND
ret z
cp STEEL
ret z
ld a, [hl]
cp ROCK
ret z
cp GROUND
ret z
cp STEEL
ret z
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_IN_SANDSTORM
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetEighthMaxHP
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, SandstormHitsText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ended
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, .WeatherEndedMessages
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call .PrintWeatherMessage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattleWeather], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PrintWeatherMessage:
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattleWeather]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld c, a
ld b, 0
add hl, bc
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
add hl, bc
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld h, [hl]
ld l, a
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.WeatherMessages:
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
; entries correspond to WEATHER_* constants
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
dw BattleText_RainContinuesToFall
dw BattleText_TheSunlightIsStrong
dw BattleText_TheSandstormRages
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.WeatherEndedMessages:
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
; entries correspond to WEATHER_* constants
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
dw BattleText_TheRainStopped
dw BattleText_TheSunlightFaded
dw BattleText_TheSandstormSubsided
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
SubtractHPFromTarget:
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHP
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 05:05:57 -08:00
jp UpdateHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
SubtractHPFromUser:
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
; Subtract HP from mon
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHP
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 05:05:57 -08:00
jp UpdateHPBarBattleHuds
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
SubtractHP:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sub c
ld [hld], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer2 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sbc b
ld [hl], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
changed more labels
2015-09-09 16:27:07 -07:00
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld a, [wHPBuffer2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld a, [wHPBuffer2 + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
xor a
ld [hli], a
ld [hl], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3], a
ld [wHPBuffer3 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetSixteenthMaxHP:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetQuarterMaxHP
Fix some comments and inmediates
2020-02-21 06:56:47 -08:00
; quarter result
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl c
srl c
Fix some comments and inmediates
2020-02-21 06:56:47 -08:00
; at least 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc c
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetEighthMaxHP:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; output: bc
call GetQuarterMaxHP
; assumes nothing can have 1024 or more hp
; halve result
srl c
Fix some comments and inmediates
2020-02-21 06:56:47 -08:00
; at least 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
jr nz, .end
inc c
.end
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetQuarterMaxHP:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; output: bc
call GetMaxHP
; quarter result
srl b
rr c
srl b
rr c
; assumes nothing can have 1024 or more hp
Fix some comments and inmediates
2020-02-21 06:56:47 -08:00
; at least 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
jr nz, .end
inc c
.end
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetHalfMaxHP:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; output: bc
call GetMaxHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; halve result
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl b
rr c
Fix some comments and inmediates
2020-02-21 06:56:47 -08:00
; at least 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
or b
jr nz, .end
inc c
.end
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetMaxHP:
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
; output: bc, wHPBuffer1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonMaxHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMaxHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer1 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ret
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 13:27:43 -07:00
GetHalfHP: ; unreferenced
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, a
ld a, [hli]
ld c, a
srl b
rr c
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer1 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckUserHasEnoughHP:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP + 1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP + 1
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
sub [hl]
dec hl
ld a, b
sbc [hl]
ret
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
RestoreHP:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMaxHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonMaxHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer1 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec hl
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add c
ld [hld], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer2 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
adc b
ld [hli], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3 + 1], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld a, [wHPBuffer1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ld a, [hld]
sub c
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld a, [wHPBuffer1 + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld a, [hl]
sbc b
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
jr c, .overflow
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
ld [hli], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
ld [hl], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3], a
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
.overflow
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 05:05:57 -08:00
call UpdateHPBarBattleHuds
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jp SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdateHPBarBattleHuds:
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 05:05:57 -08:00
call UpdateHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp UpdateBattleHuds
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdateHPBar:
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 10, 9
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .ok
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 15:11:55 -08:00
ld [wWhichHPBar], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef AnimateHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleEnemyMonFaint:
So very jumb
2015-10-19 13:49:29 -07:00
call FaintEnemyPokemon
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
So very jumb
2015-10-19 13:49:29 -07:00
call z, FaintYourPokemon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wWhichMonFaintedFirst], a
call UpdateBattleStateAndExperienceAfterEnemyFaint
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call CheckPlayerPartyForFitMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
and a
jp z, LostBattle
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call nz, UpdatePlayerHUD
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld c, 60
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .trainer
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleEnded], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
So very jumb
2015-10-19 13:49:29 -07:00
.trainer
call CheckEnemyTrainerDefeated
jp z, WinTrainerBattle
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr nz, .player_mon_not_fainted
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
more battle core labels
2015-11-07 18:04:54 -08:00
call AskUseNextPokemon
jr nc, .dont_flee
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleEnded], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
more battle core labels
2015-11-07 18:04:54 -08:00
.dont_flee
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call ForcePlayerMonChoice
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, BATTLEPLAYERACTION_USEITEM
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call HandleEnemySwitch
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp z, WildFled_EnemyFled_LinkBattleCanceled
link and seer labels
2015-11-23 13:04:53 -08:00
jr DoubleSwitch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.player_mon_not_fainted
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, BATTLEPLAYERACTION_USEITEM
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call HandleEnemySwitch
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp z, WildFled_EnemyFled_LinkBattleCanceled
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
xor a ; BATTLEPLAYERACTION_USEMOVE
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
DoubleSwitch:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr z, .player_1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call PlayerPartyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call EnemyPartyMonEntrance
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.player_1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
ld a, $1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call EnemyPartyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call PlayerPartyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.done
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
xor a ; BATTLEPLAYERACTION_USEMOVE
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdateBattleStateAndExperienceAfterEnemyFaint:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleMonInParty
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr z, .wild
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurOTMon]
ld hl, wOTPartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
xor a
ld [hli], a
ld [hl], a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.wild
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus3
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
res SUBSTATUS_IN_LOOP, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyDamageTaken
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
ld [hl], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call BreakAttraction
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr z, .wild2
jr .trainer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.wild2
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattleLowHealthAlarm], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.trainer
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr nz, .player_mon_did_not_faint
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld a, [wWhichMonFaintedFirst]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr nz, .player_mon_did_not_faint
Rename PlayerMonFaintHappinessMod Seriously, mini-rant here: we were three to spend a couple hours trying to find something in this function that was completely unrelated to happiness... and apparently there's been far worse. :') Props to you guys for having been through this =D
2019-03-03 14:55:24 -08:00
call UpdateFaintedPlayerMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.player_mon_did_not_faint
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call CheckPlayerPartyForFitMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
and a
ret z
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
changed more labels
2015-09-09 16:27:07 -07:00
call z, PlayVictoryMusic
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
and BATTLERESULT_BITMASK
ld [wBattleResult], a ; WIN
More WRAM tidying
2016-01-12 09:46:18 -08:00
call IsAnyMonHoldingExpShare
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr z, .skip_exp
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonBaseStats
ld b, wEnemyMonEnd - wEnemyMonBaseStats
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl [hl]
inc hl
dec b
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.skip_exp
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonBaseStats
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld de, wBackupEnemyMonBaseStats
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld bc, wEnemyMonEnd - wEnemyMonBaseStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
xor a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wGivingExperienceToExpShareHolders], a
changed more labels
2015-09-09 16:27:07 -07:00
call GiveExperiencePoints
More WRAM tidying
2016-01-12 09:46:18 -08:00
call IsAnyMonHoldingExpShare
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
more battle core labels
2015-11-07 18:04:54 -08:00
ld a, [wBattleParticipantsNotFainted]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
ld a, d
more battle core labels
2015-11-07 18:04:54 -08:00
ld [wBattleParticipantsNotFainted], a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld hl, wBackupEnemyMonBaseStats
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonBaseStats
ld bc, wEnemyMonEnd - wEnemyMonBaseStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
ld a, $1
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wGivingExperienceToExpShareHolders], a
changed more labels
2015-09-09 16:27:07 -07:00
call GiveExperiencePoints
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
more battle core labels
2015-11-07 18:04:54 -08:00
ld [wBattleParticipantsNotFainted], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
IsAnyMonHoldingExpShare:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld c, 1
ld d, 0
more battle core labels
2015-11-07 18:04:54 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push bc
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld bc, MON_HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hli]
or [hl]
pop bc
pop hl
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .next
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push bc
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld bc, MON_ITEM
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
pop bc
ld a, [hl]
pop hl
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EXP_SHARE
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .next
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
or c
ld d, a
more battle core labels
2015-11-07 18:04:54 -08:00
.next
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla c
push de
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld de, PARTYMON_STRUCT_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
pop de
dec b
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .loop
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld e, 0
ld b, PARTY_LENGTH
more battle core labels
2015-11-07 18:04:54 -08:00
.loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl a
more battle core labels
2015-11-07 18:04:54 -08:00
jr nc, .okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc e
more battle core labels
2015-11-07 18:04:54 -08:00
.okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec b
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, e
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
StopDangerSound:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wLowHealthAlarm], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
FaintYourPokemon:
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitSFX
ld a, $f0
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCryTracks], a
ld a, [wBattleMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
So very jumb
2015-10-19 13:49:29 -07:00
call PlayerMonFaintedAnimation
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 9, 7
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_MonFainted
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
FaintEnemyPokemon:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitSFX
ld de, SFX_KINESIS
call PlaySFX
So very jumb
2015-10-19 13:49:29 -07:00
call EnemyMonFaintedAnimation
Macro update, roam mon annotations Updated map and mapgroup macros to get around an rgbds bug. Legendary beast locale handling annotated and relabeled. Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function. This will make it easier for modders to add or remove engine flags.
2015-07-25 11:25:37 -07:00
ld de, SFX_FAINT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaySFX
hlcoord 1, 0
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_EnemyMonFainted
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckEnemyTrainerDefeated:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOTPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1HP
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld de, PARTYMON_STRUCT_LENGTH
So very jumb
2015-10-19 13:49:29 -07:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or [hl]
inc hl
or [hl]
dec hl
add hl, de
dec b
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleEnemySwitch:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyHPPal
More PartyMon labels for relative addressing.
2014-06-23 12:45:30 -07:00
ld e, HP_BAR_LENGTH_PX
link and seer labels
2015-11-23 13:04:53 -08:00
call UpdateHPPal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall EnemySwitch_TrainerHud
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked
changed more labels
2015-09-09 16:27:07 -07:00
link and seer labels
2015-11-23 13:04:53 -08:00
call LinkBattleSendReceiveAction
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_FORFEIT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
changed more labels
2015-09-09 16:27:07 -07:00
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
ld a, $0
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr nz, EnemyPartyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
EnemyPartyMonEntrance:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
xor a
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld [wEnemySwitchMonIndex], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
and a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nz, .set
more battle core labels
2015-11-07 18:04:54 -08:00
call EnemySwitch
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr .done_switch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.set
more battle core labels
2015-11-07 18:04:54 -08:00
call EnemySwitch_SetMode
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.done_switch
more battle core labels
2015-11-07 18:04:54 -08:00
call ResetBattleParticipants
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wEnemyMoveStruct + MOVE_ANIM], a
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
WinTrainerBattle:
changed more labels
2015-09-09 16:27:07 -07:00
; Player won the battle
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattleLowHealthAlarm], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleEnded], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ld a, b
changed more labels
2015-09-09 16:27:07 -07:00
call z, PlayVictoryMusic
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar Battle_GetTrainerName
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_EnemyWasDefeated
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
changed more labels
2015-09-09 16:27:07 -07:00
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
call BattleWinSlideInEnemyTrainerFrontpic
ld c, 40
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
Resolve some "???" comments
2020-11-17 08:09:02 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_CANLOSE
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr nz, .skip_heal
Labels for the heal machine; spriteface constants.
2015-06-26 23:24:55 -07:00
predef HealParty
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.skip_heal
Resolve some "???" comments
2020-11-17 08:09:02 -08:00
wMonStatusFlags -> wDebugFlags
2018-09-15 17:15:55 -07:00
ld a, [wDebugFlags]
bit DEBUG_BATTLE_F, a
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
jr nz, .skip_win_loss_text
call PrintWinLossText
.skip_win_loss_text
Resolve some "???" comments
2020-11-17 08:09:02 -08:00
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
jp .give_coins
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
.give_coins
trade animation
2015-11-22 21:21:21 -08:00
ld a, [wAmuletCoin]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
trade animation
2015-11-22 21:21:21 -08:00
call nz, .DoubleReward
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
call .CheckMaxedOutMomCoins
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
More engine bit flag constants
2018-01-22 10:57:44 -08:00
ld a, FALSE
trade animation
2015-11-22 21:21:21 -08:00
jr nc, .okay
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld a, [wMomSavingCoins]
and MOM_SAVING_COINS_MASK
cp (1 << MOM_SAVING_SOME_COINS_F) | (1 << MOM_SAVING_HALF_COINS_F)
trade animation
2015-11-22 21:21:21 -08:00
jr nz, .okay
More engine bit flag constants
2018-01-22 10:57:44 -08:00
inc a ; TRUE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
trade animation
2015-11-22 21:21:21 -08:00
.okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
More engine bit flag constants
2018-01-22 10:57:44 -08:00
ld c, 4
trade animation
2015-11-22 21:21:21 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
and a
trade animation
2015-11-22 21:21:21 -08:00
jr z, .loop2
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
call .AddCoinsToMom
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec c
dec b
trade animation
2015-11-22 21:21:21 -08:00
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
trade animation
2015-11-22 21:21:21 -08:00
.loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
trade animation
2015-11-22 21:21:21 -08:00
jr z, .done
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
call .AddCoinsToWallet
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec c
trade animation
2015-11-22 21:21:21 -08:00
jr .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
trade animation
2015-11-22 21:21:21 -08:00
.done
call .DoubleReward
call .DoubleReward
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Labels for "sent some to mom" text.
2015-06-11 09:57:45 -07:00
jr nc, .KeepItAll
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld a, [wMomSavingCoins]
and MOM_SAVING_COINS_MASK
Labels for "sent some to mom" text.
2015-06-11 09:57:45 -07:00
jr z, .KeepItAll
trade animation
2015-11-22 21:21:21 -08:00
ld hl, .SentToMomTexts
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld c, a
ld b, 0
add hl, bc
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
add hl, bc
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld h, [hl]
ld l, a
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.KeepItAll:
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld hl, GotCoinsForWinningText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
.AddCoinsToMom:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
trade animation
2015-11-22 21:21:21 -08:00
ld hl, wBattleReward + 2
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld de, wMomsCoins + 2
call AddBattleCoinsToAccount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
.AddCoinsToWallet:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
trade animation
2015-11-22 21:21:21 -08:00
ld hl, wBattleReward + 2
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld de, wCoins + 2
call AddBattleCoinsToAccount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.DoubleReward:
trade animation
2015-11-22 21:21:21 -08:00
ld hl, wBattleReward + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla [hl]
dec hl
rl [hl]
dec hl
rl [hl]
ret nc
ld a, $ff
ld [hli], a
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
ld [hli], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.SentToMomTexts:
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
; entries correspond to MOM_SAVING_* constants
dw SentSomeToMomText
dw SentHalfToMomText
dw SentAllToMomText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
.CheckMaxedOutMomCoins:
ld hl, wMomsCoins + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
cp LOW(MAX_COINS)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
sbc HIGH(MAX_COINS) ; mid
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
sbc HIGH(MAX_COINS >> 8)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
AddBattleCoinsToAccount:
More engine bit flag constants
2018-01-22 10:57:44 -08:00
ld c, 3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
push de
push hl
push bc
ld b, h
ld c, l
pop bc
pop hl
trade animation
2015-11-22 21:21:21 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
adc [hl]
ld [de], a
dec de
dec hl
dec c
trade animation
2015-11-22 21:21:21 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
ld a, [hld]
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
cp LOW(MAX_COINS)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
sbc HIGH(MAX_COINS) ; mid
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
sbc HIGH(MAX_COINS >> 8)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld [hl], HIGH(MAX_COINS >> 8)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld [hl], HIGH(MAX_COINS) ; mid
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld [hl], LOW(MAX_COINS)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
PlayVictoryMusic:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
ld de, MUSIC_NONE
call PlayMusic
call DelayFrame
ld de, MUSIC_WILD_VICTORY
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .trainer_victory
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
More WRAM tidying
2016-01-12 09:46:18 -08:00
call IsAnyMonHoldingExpShare
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .play_music
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld hl, wPayDayCoins
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .play_music
ld a, [wBattleParticipantsNotFainted]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .lost
jr .play_music
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.trainer_victory
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, MUSIC_GYM_VICTORY
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
call IsGymLeader
more battle core labels
2015-11-07 18:04:54 -08:00
jr c, .play_music
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, MUSIC_TRAINER_VICTORY
more battle core labels
2015-11-07 18:04:54 -08:00
.play_music
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlayMusic
more battle core labels
2015-11-07 18:04:54 -08:00
.lost
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
ret
Remove even more address comments That should be all of them this time
2018-06-24 17:10:37 -07:00
IsKantoGymLeader:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, KantoGymLeaders
jr IsGymLeaderCommon
Remove even more address comments That should be all of them this time
2018-06-24 17:10:37 -07:00
IsGymLeader:
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
ld hl, GymLeaders
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
IsGymLeaderCommon:
push de
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOtherTrainerClass]
More engine bit flag constants
2018-01-22 10:57:44 -08:00
ld de, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsInArray
pop de
ret
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
INCLUDE "data/trainers/leaders.asm"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
HandlePlayerMonFaint:
So very jumb
2015-10-19 13:49:29 -07:00
call FaintYourPokemon
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
So very jumb
2015-10-19 13:49:29 -07:00
call z, FaintEnemyPokemon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wWhichMonFaintedFirst], a
Rename PlayerMonFaintHappinessMod Seriously, mini-rant here: we were three to spend a couple hours trying to find something in this function that was completely unrelated to happiness... and apparently there's been far worse. :') Props to you guys for having been through this =D
2019-03-03 14:55:24 -08:00
call UpdateFaintedPlayerMon
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call CheckPlayerPartyForFitMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
and a
jp z, LostBattle
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .notfainted
More WRAM tidying
2016-01-12 09:46:18 -08:00
call UpdateBattleStateAndExperienceAfterEnemyFaint
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .trainer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleEnded], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
So very jumb
2015-10-19 13:49:29 -07:00
.trainer
call CheckEnemyTrainerDefeated
jp z, WinTrainerBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
So very jumb
2015-10-19 13:49:29 -07:00
.notfainted
more battle core labels
2015-11-07 18:04:54 -08:00
call AskUseNextPokemon
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr nc, .switch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleEnded], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.switch
call ForcePlayerMonChoice
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
ret nz
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, BATTLEPLAYERACTION_USEITEM
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call HandleEnemySwitch
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp z, WildFled_EnemyFled_LinkBattleCanceled
link and seer labels
2015-11-23 13:04:53 -08:00
jp DoubleSwitch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Rename PlayerMonFaintHappinessMod Seriously, mini-rant here: we were three to spend a couple hours trying to find something in this function that was completely unrelated to happiness... and apparently there's been far worse. :') Props to you guys for having been through this =D
2019-03-03 14:55:24 -08:00
UpdateFaintedPlayerMon:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, wBattleParticipantsNotFainted
trade animation
2015-11-22 21:21:21 -08:00
ld b, RESET_FLAG
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef SmallFarFlagAction
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus3
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
res SUBSTATUS_IN_LOOP, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wLowHealthAlarm], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerDamageTaken
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleMonStatus], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleMonInParty
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
ld c, HAPPINESS_FAINTED
; If TheirLevel > (YourLevel + 30), use a different parameter
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonLevel]
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
add 30
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonLevel]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr c, .got_param
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
ld c, HAPPINESS_BEATENBYSTRONGFOE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.got_param
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wCurPartyMon], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar ChangeHappiness
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
and BATTLERESULT_BITMASK
add LOSE
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld a, [wWhichMonFaintedFirst]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
Resolve some "???" comments
2020-11-17 08:09:02 -08:00
; code was probably dummied out here
ret
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
AskUseNextPokemon:
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
more battle core labels
2015-11-07 18:04:54 -08:00
; We don't need to be here if we're in a Trainer battle,
; as that decision is made for us.
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
dec a
ret nz
more battle core labels
2015-11-07 18:04:54 -08:00
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_UseNextMon
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
more battle core labels
2015-11-07 18:04:54 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
lb bc, 1, 7
call PlaceYesNoBox
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
more battle core labels
2015-11-07 18:04:54 -08:00
jr c, .pressed_b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
more battle core labels
2015-11-07 18:04:54 -08:00
.pressed_b
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
more battle core labels
2015-11-07 18:04:54 -08:00
cp $1 ; YES
jr z, .loop
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1Speed
ld de, wEnemyMonSpeed
changed more labels
2015-09-09 16:27:07 -07:00
jp TryToRunAwayFromBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
ForcePlayerMonChoice:
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 13:08:43 -08:00
call LoadStandardMenuHeader
Comment, remove, or revise many unreferenced labels
2020-10-26 12:45:57 -07:00
call SetUpBattlePartyMenu
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ForcePickPartyMonInBattle
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .skip_link
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, BATTLEPLAYERACTION_USEITEM
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
link and seer labels
2015-11-23 13:04:53 -08:00
call LinkBattleSendReceiveAction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.skip_link
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
xor a ; BATTLEPLAYERACTION_USEMOVE
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr nz, .send_out_pokemon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
More splits; map setup labels
2015-11-11 20:38:57 -08:00
call ClearBGPalettes
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadHPBar
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
call GetMemCGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld c, a
ret
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.send_out_pokemon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wLastPlayerMon], a
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
more battle core labels
2015-11-07 18:04:54 -08:00
call AddBattleParticipant
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearPalettes
call DelayFrame
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadHPBar
writebackup --> closewindow; game corner prize vendors; others
2015-12-24 19:58:42 -08:00
call CloseWindow
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
call GetMemCGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call SendOutMonText
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewBattleMonStatus
call BreakAttraction
Pokemon animations
2015-11-07 06:48:32 -08:00
call SendOutPlayerMon
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
and a
ld c, a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
PlayerPartyMonEntrance:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wLastPlayerMon], a
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
more battle core labels
2015-11-07 18:04:54 -08:00
call AddBattleParticipant
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call SendOutMonText
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewBattleMonStatus
call BreakAttraction
Pokemon animations
2015-11-07 06:48:32 -08:00
call SendOutPlayerMon
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Comment, remove, or revise many unreferenced labels
2020-10-26 12:45:57 -07:00
SetUpBattlePartyMenu:
More splits; map setup labels
2015-11-11 20:38:57 -08:00
call ClearBGPalettes
Comment, remove, or revise many unreferenced labels
2020-10-26 12:45:57 -07:00
SetUpBattlePartyMenu_Loop: ; switch to fullscreen menu?
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall LoadPartyMenuGFX
farcall InitPartyMenuWithCancel
farcall InitPartyMenuBGPal7
farcall InitPartyMenuGFX
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
JumpToPartyMenuAndPrintText:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall WritePartyMenuTilemap
Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)
2023-08-11 03:28:14 -07:00
farcall PlacePartyMenuText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrame
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
SelectBattleMon:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall PartyMenuSelect
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
PickPartyMonInBattle:
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.loop
Label all of PARTYMENUACTION_* It's pretty clear what it's used for. PartyMenuActionText is used for two things: 1) Storing what kind of action we're going to do (<$10) 2) Storing the text for some kind of healing stuff I'm not entirely sure (>=$f0) In the former case, if GetPartyMenuTilemapPointers is ran, it will be used to pick a sequence of actions that should be done, specified in the table, and it'll print the corresponding string using the PartyMenuStrings table. The items in the sequence of actions that should be done are in WritePartyMenuTilemap. Strangely enough, one possible value is left completely unused: PARTYMENUACTION_GIVE_MON_FEMALE. It works in the exact same way as it's male counterpart, and as such I don't believe it was used in the japanese version either, since it doesn't matter which gender your 'mon is when you put 'em in the daycare.
2017-11-30 11:27:25 -08:00
ld a, PARTYMENUACTION_SWITCH ; Which PKMN?
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPartyMenuActionText], a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call JumpToPartyMenuAndPrintText
call SelectBattleMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Battle animation annotations
2016-03-01 19:31:21 -08:00
call CheckIfCurPartyMonIsFitToFight
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
SwitchMonAlreadyOut:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wCurBattleMon
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr nz, .notout
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_MonIsAlreadyOut
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.notout
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ForcePickPartyMonInBattle:
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
; Can't back out.
.pick
call PickPartyMonInBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_WRONG
call PlaySFX
call WaitSFX
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr .pick
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
PickSwitchMonInBattle:
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.pick
call PickPartyMonInBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SwitchMonAlreadyOut
jr c, .pick
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ForcePickSwitchMonInBattle:
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
; Can't back out.
.pick
call ForcePickPartyMonInBattle
call SwitchMonAlreadyOut
jr c, .pick
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
LostBattle:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleEnded], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp BATTLETYPE_CANLOSE
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr nz, .not_canlose
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Remove the enemy from the screen.
hlcoord 0, 0
So very jumb
2015-10-19 13:49:29 -07:00
lb bc, 8, 21
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
call BattleWinSlideInEnemyTrainerFrontpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, 40
call DelayFrames
wMonStatusFlags -> wDebugFlags
2018-09-15 17:15:55 -07:00
ld a, [wDebugFlags]
bit DEBUG_BATTLE_F, a
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
jr nz, .skip_win_loss_text
call PrintWinLossText
.skip_win_loss_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.not_canlose
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .LostLinkBattle
grey -> gray
2020-12-08 11:34:54 -08:00
; Grayscale
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
ld b, CGB_BATTLE_GRAYSCALE
call GetCGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .end
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.LostLinkBattle:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateEnemyMonInParty
So very jumb
2015-10-19 13:49:29 -07:00
call CheckEnemyTrainerDefeated
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr nz, .not_tied
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, TiedAgainstText
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
and BATTLERESULT_BITMASK
add DRAW
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr .text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.not_tied
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, LostAgainstText
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.text
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.end
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
EnemyMonFaintedAnimation:
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 5
decoord 12, 6
So very jumb
2015-10-19 13:49:29 -07:00
jp MonFaintedAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
PlayerMonFaintedAnimation:
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 10
decoord 1, 11
So very jumb
2015-10-19 13:49:29 -07:00
jp MonFaintedAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
MonFaintedAnimation:
Identify more WRAM labels, and start a <X>_DummyFunction label convention
2020-10-28 10:35:39 -07:00
ld a, [wJoypadDisable]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Identify more WRAM labels, and start a <X>_DummyFunction label convention
2020-10-28 10:35:39 -07:00
set JOYPAD_DISABLE_MON_FAINT_F, a
ld [wJoypadDisable], a
So very jumb
2015-10-19 13:49:29 -07:00
ld b, 7
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.OuterLoop:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push de
push hl
So very jumb
2015-10-19 13:49:29 -07:00
ld b, 6
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.InnerLoop:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
push de
So very jumb
2015-10-19 13:49:29 -07:00
ld bc, 7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
pop de
pop hl
So very jumb
2015-10-19 13:49:29 -07:00
ld bc, -SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
push hl
ld h, d
ld l, e
add hl, bc
ld d, h
ld e, l
pop hl
pop bc
dec b
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .InnerLoop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, 20
add hl, bc
ld de, .Spaces
call PlaceString
ld c, 2
call DelayFrames
pop hl
pop de
pop bc
dec b
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .OuterLoop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Identify more WRAM labels, and start a <X>_DummyFunction label convention
2020-10-28 10:35:39 -07:00
ld [wJoypadDisable], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Spaces:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db " @"
Remove all address comments
2018-06-24 07:09:41 -07:00
SlideBattlePicOut:
Remove "Buffer" suffix from two HRAM labels
2020-12-23 13:54:28 -08:00
ldh [hMapObjectIndex], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
ld b, $7
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
.loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
call .DoFrame
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
dec b
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
jr nz, .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, 2
call DelayFrames
pop hl
pop bc
dec c
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.DoFrame:
Remove "Buffer" suffix from two HRAM labels
2020-12-23 13:54:28 -08:00
ldh a, [hMapObjectIndex]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
cp $8
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .back
.forward
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [hld], a
dec hl
dec c
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .forward
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.back
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld [hli], a
inc hl
dec c
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .back
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ForceEnemySwitch:
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call ResetEnemyBattleVars
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld a, [wEnemySwitchMonIndex]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld b, a
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call LoadEnemyMonToSwitchTo
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call ClearEnemyMonBox
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
Update battle anim bg function comments, and identify more unnamed labels
2020-10-06 15:09:33 -07:00
call ShowSetEnemyMonAndSendOutAnimation
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BreakAttraction
more battle core labels
2015-11-07 18:04:54 -08:00
call ResetBattleParticipants
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
EnemySwitch:
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call CheckWhetherToAskSwitch
more battle core labels
2015-11-07 18:04:54 -08:00
jr nc, EnemySwitch_SetMode
; Shift Mode
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call ResetEnemyBattleVars
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call CheckWhetherSwitchmonIsPredetermined
more battle core labels
2015-11-07 18:04:54 -08:00
jr c, .skip
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call FindMonInOTPartyToSwitchIntoBattle
more battle core labels
2015-11-07 18:04:54 -08:00
.skip
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
; 'b' contains the PartyNr of the mon the AI will switch to
call LoadEnemyMonToSwitchTo
more battle core labels
2015-11-07 18:04:54 -08:00
call OfferSwitch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call ClearEnemyMonBox
Update battle anim bg function comments, and identify more unnamed labels
2020-10-06 15:09:33 -07:00
call ShowBattleTextEnemySentOut
call ShowSetEnemyMonAndSendOutAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret c
more battle core labels
2015-11-07 18:04:54 -08:00
; If we're here, then we're switching too
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
more battle core labels
2015-11-07 18:04:54 -08:00
ld [wBattleParticipantsNotFainted], a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wBattleParticipantsIncludingFainted], a
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wEnemyIsSwitching], a
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
more battle core labels
2015-11-07 18:04:54 -08:00
jp PlayerSwitch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
EnemySwitch_SetMode:
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call ResetEnemyBattleVars
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call CheckWhetherSwitchmonIsPredetermined
more battle core labels
2015-11-07 18:04:54 -08:00
jr c, .skip
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call FindMonInOTPartyToSwitchIntoBattle
more battle core labels
2015-11-07 18:04:54 -08:00
.skip
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
; 'b' contains the PartyNr of the mon the AI will switch to
call LoadEnemyMonToSwitchTo
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, 1
ld [wEnemyIsSwitching], a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call ClearEnemyMonBox
Update battle anim bg function comments, and identify more unnamed labels
2020-10-06 15:09:33 -07:00
call ShowBattleTextEnemySentOut
jp ShowSetEnemyMonAndSendOutAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckWhetherSwitchmonIsPredetermined:
Resolve some "???" comments
2020-11-17 08:09:02 -08:00
; returns the enemy switchmon index in b, or
; returns carry if the index is not yet determined.
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
sub BATTLEACTION_SWITCH1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .return_carry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld a, [wEnemySwitchMonIndex]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Rename the variable at D264
2016-08-07 15:14:20 -07:00
jr z, .check_wBattleHasJustStarted
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld b, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .return_carry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Rename the variable at D264
2016-08-07 15:14:20 -07:00
.check_wBattleHasJustStarted
ld a, [wBattleHasJustStarted]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Resolve some "???" comments
2020-11-17 08:09:02 -08:00
ld b, 0
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .return_carry
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.return_carry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ResetEnemyBattleVars:
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
; and draw empty Textbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wLastPlayerCounterMove], a
ld [wLastEnemyCounterMove], a
ld [wLastEnemyMove], a
ld [wCurEnemyMove], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wEnemyItemState], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
More battle core labels
2015-11-08 10:27:26 -08:00
ld [wPlayerWrapCount], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 18, 0
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld a, 8
call SlideBattlePicOut
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 13:08:43 -08:00
jp LoadStandardMenuHeader
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
ResetBattleParticipants:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
more battle core labels
2015-11-07 18:04:54 -08:00
ld [wBattleParticipantsNotFainted], a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wBattleParticipantsIncludingFainted], a
Remove all address comments
2018-06-24 07:09:41 -07:00
AddBattleParticipant:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, wBattleParticipantsNotFainted
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld b, SET_FLAG
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef SmallFarFlagAction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld hl, wBattleParticipantsIncludingFainted
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef_jump SmallFarFlagAction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
FindMonInOTPartyToSwitchIntoBattle:
Meaningful $ff values
2018-02-25 16:50:48 -08:00
ld b, -1
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
ld a, %000001
ld [wEnemyEffectivenessVsPlayerMons], a
ld [wPlayerEffectivenessVsEnemyMons], a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
ld hl, wEnemyEffectivenessVsPlayerMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla [hl]
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
inc hl ; wPlayerEffectivenessVsEnemyMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla [hl]
inc b
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOTPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jp z, ScoreMonTypeMatchups
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurOTMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr z, .discourage
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld a, b
call GetPartyLocation
ld a, [hli]
ld c, a
ld a, [hl]
or c
pop bc
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr z, .discourage
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LookUpTheEffectivenessOfEveryMove
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call IsThePlayerMonTypesEffectiveAgainstOTMon
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.discourage
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
ld hl, wPlayerEffectivenessVsEnemyMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
set 0, [hl]
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
LookUpTheEffectivenessOfEveryMove:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1Moves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
call GetPartyLocation
pop bc
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld e, NUM_MOVES + 1
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec e
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
and a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
dec a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, Moves
Use constants for move struct positioning. This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:23:55 -07:00
ld bc, MOVE_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, wEnemyMoveStruct
label more pointers to Moves
2013-12-30 20:22:27 -08:00
ld a, BANK(Moves)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call FarCopyBytes
call SetEnemyTurn
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar BattleCheckTypeMatchup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, [wTypeMatchup]
cp EFFECTIVE + 1
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr c, .loop
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
ld hl, wEnemyEffectivenessVsPlayerMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
set 0, [hl]
ret
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
IsThePlayerMonTypesEffectiveAgainstOTMon:
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
; Calculates the effectiveness of the types of the PlayerMon
; against the OTMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
inc a
ld c, a
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
dec a
Add member constants for the base data struct, same as most other structs
2017-12-11 14:35:35 -08:00
ld hl, BaseData + BASE_TYPES
ld bc, BASE_DATA_SIZE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonType
Misc fixes for the usage of constants Several improvements that will make it easier to edit some data structures for everyone.
2017-12-19 12:28:06 -08:00
ld bc, BASE_CATCH_RATE - BASE_TYPES
even more battle labels
2014-01-05 04:28:55 -08:00
ld a, BANK(BaseData)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call FarCopyBytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonType1]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wPlayerMoveStruct + MOVE_TYPE], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar BattleCheckTypeMatchup
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, [wTypeMatchup]
cp EFFECTIVE + 1
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nc, .super_effective
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonType2]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wPlayerMoveStruct + MOVE_TYPE], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar BattleCheckTypeMatchup
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, [wTypeMatchup]
cp EFFECTIVE + 1
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nc, .super_effective
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.super_effective
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
ld hl, wEnemyEffectivenessVsPlayerMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 0, [hl]
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nz, .reset
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
inc hl ; wPlayerEffectivenessVsEnemyMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
set 0, [hl]
ret
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.reset
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
res 0, [hl]
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ScoreMonTypeMatchups:
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop1
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
ld hl, wEnemyEffectivenessVsPlayerMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla [hl]
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
inc hl ; wPlayerEffectivenessVsEnemyMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla [hl]
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nc, .loop1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOTPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld c, [hl]
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla c
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nc, .okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec b
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr z, .loop5
jr .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.okay
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
ld a, [wEnemyEffectivenessVsPlayerMons]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr z, .okay2
Meaningful $ff values
2018-02-25 16:50:48 -08:00
ld b, -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc b
sla c
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nc, .loop3
jr .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.okay2
Meaningful $ff values
2018-02-25 16:50:48 -08:00
ld b, -1
Identify some more uses of wBuffer1-6
2020-11-03 19:45:12 -08:00
ld a, [wPlayerEffectivenessVsEnemyMons]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc b
sla c
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr c, .loop4
jr .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop5
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOTPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
call BattleRandom
and $7
cp b
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nc, .loop5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurOTMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr z, .loop5
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld a, b
call GetPartyLocation
pop bc
ld a, [hli]
ld c, a
ld a, [hl]
or c
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr z, .loop5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
LoadEnemyMonToSwitchTo:
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
; 'b' contains the PartyNr of the mon the AI will switch to
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
ld hl, wOTPartyMon1Level
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyLevel], a
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTempEnemyMonSpecies], a
ld [wCurPartySpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call LoadEnemyMon
changed more labels
2015-09-09 16:27:07 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartySpecies]
Growth rate data.
2014-03-05 02:42:09 -08:00
cp UNOWN
engine/link.asm
2015-11-09 20:55:39 -08:00
jr nz, .skip_unown
Pokedex labels
2015-11-29 18:34:59 -08:00
ld a, [wFirstUnownSeen]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
engine/link.asm
2015-11-09 20:55:39 -08:00
jr nz, .skip_unown
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonDVs
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetUnownLetter
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wUnownLetter]
Pokedex labels
2015-11-29 18:34:59 -08:00
ld [wFirstUnownSeen], a
engine/link.asm
2015-11-09 20:55:39 -08:00
.skip_unown
changed more labels
2015-09-09 16:27:07 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld [wEnemyHPAtTimeOfPlayerSwitch], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld [wEnemyHPAtTimeOfPlayerSwitch + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckWhetherToAskSwitch:
Rename the variable at D264
2016-08-07 15:14:20 -07:00
ld a, [wBattleHasJustStarted]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jp z, .return_nc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jp z, .return_nc
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jp nz, .return_nc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOptions]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit BATTLE_SHIFT, a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr nz, .return_nc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wCurPartyMon], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall CheckCurPartyMonFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ld a, b
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jr c, .return_nc
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.return_nc
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
OfferSwitch:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar Battle_GetTrainerName
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
lb bc, 1, 7
call PlaceYesNoBox
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .said_no
Comment, remove, or revise many unreferenced labels
2020-10-26 12:45:57 -07:00
call SetUpBattlePartyMenu
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call PickSwitchMonInBattle
more battle core labels
2015-11-07 18:04:54 -08:00
jr c, .canceled_switch
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wLastPlayerMon], a
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearPalettes
call DelayFrame
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurEnemyMove], a
ld [wCurPlayerMove], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
more battle core labels
2015-11-07 18:04:54 -08:00
.canceled_switch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearPalettes
call DelayFrame
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.said_no
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ClearEnemyMonBox:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call WaitBGMap
Some work on battle animations
2015-11-09 13:41:09 -08:00
jp FinishBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Update battle anim bg function comments, and identify more unnamed labels
2020-10-06 15:09:33 -07:00
ShowBattleTextEnemySentOut:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar Battle_GetTrainerName
changed labels and added comments
2015-08-23 06:09:56 -07:00
ld hl, BattleText_EnemySentOut
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp WaitBGMap
Update battle anim bg function comments, and identify more unnamed labels
2020-10-06 15:09:33 -07:00
ShowSetEnemyMonAndSendOutAnimation:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
ld [wCurPartySpecies], a
ld [wCurSpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld a, OTPARTYMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
predef CopyMonToTempMon
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call GetEnemyMonFrontpic
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
More battle anims and bg effects
2015-12-23 17:46:23 -08:00
ld [wBattleAnimParam], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call BattleCheckEnemyShininess
Pokemon animations
2015-11-07 06:48:32 -08:00
jr nc, .not_shiny
Consistent formatting in Function_SetEnemyMonAndSendOutAnimation and BattleStartMessage
2019-01-06 19:11:57 -08:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld a, 1 ; shiny anim
More battle anims and bg effects
2015-12-23 17:46:23 -08:00
ld [wBattleAnimParam], a
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
Consistent formatting in Function_SetEnemyMonAndSendOutAnimation and BattleStartMessage
2019-01-06 19:11:57 -08:00
.not_shiny
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld bc, wTempMonSpecies
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall CheckFaintedFrzSlp
Pokemon animations
2015-11-07 06:48:32 -08:00
jr c, .skip_cry
Consistent formatting in Function_SetEnemyMonAndSendOutAnimation and BattleStartMessage
2019-01-06 19:11:57 -08:00
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall CheckBattleScene
Pokemon animations
2015-11-07 06:48:32 -08:00
jr c, .cry_no_anim
Consistent formatting in Function_SetEnemyMonAndSendOutAnimation and BattleStartMessage
2019-01-06 19:11:57 -08:00
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, $0
Pokemon animations
2015-11-07 06:48:32 -08:00
ld e, ANIM_MON_SLOW
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef AnimateFrontpic
Pokemon animations
2015-11-07 06:48:32 -08:00
jr .skip_cry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Pokemon animations
2015-11-07 06:48:32 -08:00
.cry_no_anim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $f
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCryTracks], a
ld a, [wTempEnemyMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Pokemon animations
2015-11-07 06:48:32 -08:00
.skip_cry
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call UpdateEnemyHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
NewEnemyMonStatus:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wLastPlayerCounterMove], a
ld [wLastEnemyCounterMove], a
ld [wLastEnemyMove], a
ld hl, wEnemySubStatus1
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyDisableCount], a
ld [wEnemyFuryCutterCount], a
ld [wEnemyProtectCount], a
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wEnemyRageCounter], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyDisabledMove], a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld [wEnemyMinimized], a
More battle core labels
2015-11-08 10:27:26 -08:00
ld [wPlayerWrapCount], a
ld [wEnemyWrapCount], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyTurnsTaken], a
ld hl, wPlayerSubStatus5
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
res SUBSTATUS_CANT_RUN, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ResetEnemyStatLevels:
More battle command labels
2015-11-06 17:55:16 -08:00
ld a, BASE_STAT_LEVEL
ld b, NUM_LEVEL_STATS
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyStatLevels
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
dec b
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckPlayerPartyForFitMon:
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
; Has the player any mon in his Party that can fight?
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, a
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1HP
Fewer uses of 'Thing2 - Thing1' for sizeof(Thing)
2018-07-16 12:58:07 -07:00
ld bc, PARTYMON_STRUCT_LENGTH - 1
Battle animation annotations
2016-03-01 19:31:21 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or [hl]
Fewer uses of 'Thing2 - Thing1' for sizeof(Thing)
2018-07-16 12:58:07 -07:00
inc hl ; + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or [hl]
add hl, bc
dec e
Battle animation annotations
2016-03-01 19:31:21 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckIfCurPartyMonIsFitToFight:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
ld hl, wPartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld a, [hli]
or [hl]
ret nz
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
Rename the variable at D264
2016-08-07 15:14:20 -07:00
ld a, [wBattleHasJustStarted]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Battle animation annotations
2016-03-01 19:31:21 -08:00
jr nz, .finish_fail
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartySpecies
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ld b, 0
add hl, bc
ld a, [hl]
cp EGG
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_AnEGGCantBattle
Battle animation annotations
2016-03-01 19:31:21 -08:00
jr z, .print_textbox
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_TheresNoWillToBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Battle animation annotations
2016-03-01 19:31:21 -08:00
.print_textbox
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Battle animation annotations
2016-03-01 19:31:21 -08:00
.finish_fail
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
TryToRunAwayFromBattle:
changed more labels
2015-09-09 16:27:07 -07:00
; Run away from battle, with or without item
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
changed more labels
2015-09-09 16:27:07 -07:00
cp BATTLETYPE_DEBUG
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .can_escape
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
cp BATTLETYPE_CONTEST
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .can_escape
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TRAP
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .cant_escape
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_CELEBI
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .cant_escape
Sync with pokecrystal up to 8873506b1
2023-07-26 17:50:16 -07:00
cp BATTLETYPE_FORCESHINY
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .cant_escape
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_SUICUNE
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .cant_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .can_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .cant_run_from_trainer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus5]
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
bit SUBSTATUS_CANT_RUN, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .cant_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
ld a, [wPlayerWrapCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .cant_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonItem]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetItemHeldEffect
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_ESCAPE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
pop hl
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .no_flee_item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
call GetItemName
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UserFledUsingAStringBuffer1
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp .can_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.no_flee_item
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wNumFleeAttempts]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
link and seer labels
2015-11-23 13:04:53 -08:00
ld [wNumFleeAttempts], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
inc de
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hEnemyMonSpeed + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hEnemyMonSpeed + 1], a
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ld de, hMultiplicand + 1
StringCmp → CompareBytes; CompareLong → CompareBytesLong hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
2018-07-22 21:25:53 -07:00
ld hl, hEnemyMonSpeed
ld c, 2
call CompareBytes
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nc, .can_escape
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh [hMultiplicand + 0], a
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, 32
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplier], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Multiply
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 2]
ldh [hDividend + 0], a
ldh a, [hProduct + 3]
ldh [hDividend + 1], a
ldh a, [hEnemyMonSpeed + 0]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hEnemyMonSpeed + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl b
rr a
srl b
rr a
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .can_escape
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDivisor], a
Prepare to merge
2016-01-17 21:39:01 -08:00
ld b, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .can_escape
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wNumFleeAttempts]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .cant_escape_2
link and seer labels
2015-11-23 13:04:53 -08:00
ld b, 30
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add b
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh [hQuotient + 3], a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr c, .can_escape
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.cant_escape_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
ld b, a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nc, .can_escape
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, BATTLEPLAYERACTION_USEITEM
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_CantEscape2
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .print_inescapable_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.cant_escape
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_CantEscape
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .print_inescapable_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.cant_run_from_trainer
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_TheresNoEscapeFromTrainerBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.print_inescapable_text
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, TRUE
link and seer labels
2015-11-23 13:04:53 -08:00
ld [wFailedToFlee], a
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.can_escape
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, DRAW
jr z, .fled
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
xor a ; BATTLEPLAYERACTION_USEMOVE
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
$f -> BATTLEACTION_FORFEIT (thanks, Vulcandth)
2022-09-23 20:10:24 -07:00
ld a, BATTLEACTION_FORFEIT
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurMoveNum], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPlayerMove], a
link and seer labels
2015-11-23 13:04:53 -08:00
call LinkBattleSendReceiveAction
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; Got away safely
ld a, [wBattleAction]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_FORFEIT
ld a, DRAW
jr z, .fled
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
dec a ; LOSE
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.fled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
and BATTLERESULT_BITMASK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add b
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
ld de, SFX_RUN
call WaitPlaySFX
pop de
call WaitSFX
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_GotAwaySafely
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitSFX
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
InitBattleMon:
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_SPECIES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonSpecies
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, MON_ID
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Move MON_* parentheses to the EQUS declaration
2015-11-07 10:05:58 -08:00
ld bc, MON_DVS - MON_ID
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonDVs
MON_PKRUS -> MON_POKERUS
2021-06-07 17:00:21 -07:00
ld bc, MON_POKERUS - MON_DVS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
inc hl
Labeled every function in ROM0 that's referenced in the source
2016-05-10 09:31:49 -07:00
inc hl
inc hl
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonLevel
Move MON_* parentheses to the EQUS declaration
2015-11-07 10:05:58 -08:00
ld bc, PARTYMON_STRUCT_LENGTH - MON_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonSpecies]
ld [wTempBattleMonSpecies], a
ld [wCurPartySpecies], a
ld [wCurSpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBaseType1]
ld [wBattleMonType1], a
ld a, [wBaseType2]
ld [wBattleMonType2], a
ld hl, wPartyMonNicknames
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SkipNames
Consistent labels for each nickname in RAM
2021-03-17 13:16:02 -07:00
ld de, wBattleMonNickname
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 09:25:55 -08:00
ld bc, MON_NAME_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonAttack
ld de, wPlayerStats
Move MON_* parentheses to the EQUS declaration
2015-11-07 10:05:58 -08:00
ld bc, PARTYMON_STRUCT_LENGTH - MON_ATK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
more battle core labels
2015-11-07 18:04:54 -08:00
call ApplyStatusEffectOnPlayerStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BadgeStatBoosts
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleCheckPlayerShininess:
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call GetPartyMonDVs
jr BattleCheckShininess
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleCheckEnemyShininess:
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call GetEnemyMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleCheckShininess:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, h
ld c, l
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CheckShininess
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetPartyMonDVs:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonDVs
ld a, [wPlayerSubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1DVs
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp GetPartyLocation
Remove all address comments
2018-06-24 07:09:41 -07:00
GetEnemyMonDVs:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonDVs
ld a, [wEnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Pokegear
2016-01-10 14:44:09 -08:00
ld hl, wEnemyBackupDVs
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1DVs
ld a, [wCurOTMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp GetPartyLocation
Remove all address comments
2018-06-24 07:09:41 -07:00
ResetPlayerStatLevels:
More battle command labels
2015-11-06 17:55:16 -08:00
ld a, BASE_STAT_LEVEL
ld b, NUM_LEVEL_STATS
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerStatLevels
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
dec b
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
InitEnemyMon:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
ld hl, wOTPartyMon1Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonSpecies
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, MON_ID
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Move MON_* parentheses to the EQUS declaration
2015-11-07 10:05:58 -08:00
ld bc, MON_DVS - MON_ID
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonDVs
MON_PKRUS -> MON_POKERUS
2021-06-07 17:00:21 -07:00
ld bc, MON_POKERUS - MON_DVS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
inc hl
Labeled every function in ROM0 that's referenced in the source
2016-05-10 09:31:49 -07:00
inc hl
inc hl
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonLevel
Move MON_* parentheses to the EQUS declaration
2015-11-07 10:05:58 -08:00
ld bc, PARTYMON_STRUCT_LENGTH - MON_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonSpecies]
ld [wCurSpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMonNicknames
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SkipNames
Consistent labels for each nickname in RAM
2021-03-17 13:16:02 -07:00
ld de, wEnemyMonNickname
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 09:25:55 -08:00
ld bc, MON_NAME_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonAttack
ld de, wEnemyStats
Move MON_* parentheses to the EQUS declaration
2015-11-07 10:05:58 -08:00
ld bc, PARTYMON_STRUCT_LENGTH - MON_ATK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
more battle core labels
2015-11-07 18:04:54 -08:00
call ApplyStatusEffectOnEnemyStats
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBaseType1
ld de, wEnemyMonType1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
Identify why five of six enemy mon base stats are copied (#866) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-01-08 10:42:40 -08:00
; The enemy mon's base Sp. Def isn't needed since its base
; Sp. Atk is also used to calculate Sp. Def stat experience.
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBaseStats
ld de, wEnemyMonBaseStats
Identify why five of six enemy mon base stats are copied (#866) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-01-08 10:42:40 -08:00
ld b, NUM_STATS - 1
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [de], a
inc de
dec b
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nz, .loop
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
ld [wCurOTMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
SwitchPlayerMon:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wLastPlayerMon], a
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
more battle core labels
2015-11-07 18:04:54 -08:00
call AddBattleParticipant
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
call NewBattleMonStatus
call BreakAttraction
Pokemon animations
2015-11-07 06:48:32 -08:00
call SendOutPlayerMon
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
SendOutPlayerMon:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonDVs
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetUnownLetter
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 5
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld b, 7
ld c, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call WaitBGMap
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call GetBattleMonBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hGraphicStartTile], a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wBattleMenuCursorPosition], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurMoveNum], a
ld [wTypeModifier], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wPlayerMoveStruct + MOVE_ANIM], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wLastPlayerCounterMove], a
ld [wLastEnemyCounterMove], a
ld [wLastPlayerMove], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call CheckAmuletCoin
Some work on battle animations
2015-11-09 13:41:09 -08:00
call FinishBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
More battle core labels
2015-11-08 10:27:26 -08:00
ld [wEnemyWrapCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
More battle anims and bg effects
2015-12-23 17:46:23 -08:00
ld [wBattleAnimParam], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call BattleCheckPlayerShininess
Pokemon animations
2015-11-07 06:48:32 -08:00
jr nc, .not_shiny
More battle anims and bg effects
2015-12-23 17:46:23 -08:00
ld a, 1
ld [wBattleAnimParam], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Pokemon animations
2015-11-07 06:48:32 -08:00
.not_shiny
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_SPECIES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld b, h
ld c, l
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall CheckFaintedFrzSlp
Pokemon animations
2015-11-07 06:48:32 -08:00
jr c, .statused
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $f0
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCryTracks], a
ld a, [wCurPartySpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Pokemon animations
2015-11-07 06:48:32 -08:00
.statused
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call UpdatePlayerHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
NewBattleMonStatus:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wLastPlayerCounterMove], a
ld [wLastEnemyCounterMove], a
ld [wLastPlayerMove], a
ld hl, wPlayerSubStatus1
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerUsedMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Labeled every function in ROM0 that's referenced in the source
2016-05-10 09:31:49 -07:00
ld [hli], a
ld [hli], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerDisableCount], a
ld [wPlayerFuryCutterCount], a
ld [wPlayerProtectCount], a
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wPlayerRageCounter], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wDisabledMove], a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld [wPlayerMinimized], a
More battle core labels
2015-11-08 10:27:26 -08:00
ld [wEnemyWrapCount], a
ld [wPlayerWrapCount], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPlayerTurnsTaken], a
ld hl, wEnemySubStatus5
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
res SUBSTATUS_CANT_RUN, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BreakAttraction:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
res SUBSTATUS_IN_LOVE, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
res SUBSTATUS_IN_LOVE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
SpikesDamage:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerScreens
ld de, wBattleMonType
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
ld bc, UpdatePlayerHUD
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr z, .ok
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyScreens
ld de, wEnemyMonType
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
ld bc, UpdateEnemyHUD
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
bit SCREENS_SPIKES, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
; Flying-types aren't affected by Spikes.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
cp FLYING
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
inc de
ld a, [de]
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
cp FLYING
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UserHurtBySpikes ; "hurt by SPIKES!"
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetEighthMaxHP
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromTarget
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call .hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp WaitBGMap
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.hl
Replace ‘jp [hl]’ with ‘jp hl’ The former is arguably misleading (as you don’t access the memory location in hl to retrieve the jump location), and is consequently deprecated in newer versions of rgbds. This fix silences these deprecation warnings.
2017-06-09 14:01:10 -07:00
jp hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
PursuitSwitch:
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, BATTLE_VARS_MOVE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
ld b, a
comment move priority functions
2013-12-30 20:32:37 -08:00
call GetMoveEffect
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
cp EFFECT_PURSUIT
Some battle labels
2015-11-05 16:13:09 -08:00
jr nz, .done
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, DoPlayerTurn
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Some battle labels
2015-11-05 16:13:09 -08:00
jr z, .do_turn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, DoEnemyTurn
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wLastPlayerMon]
ld [wCurBattleMon], a
Some battle labels
2015-11-05 16:13:09 -08:00
.do_turn
Say "BANK(Foo) ; aka BANK(Bar)" to clarify that Foo and Bar share a bank
2019-01-12 12:17:20 -08:00
ld a, BANK(DoPlayerTurn) ; aka BANK(DoEnemyTurn)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rst FarCall
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, BATTLE_VARS_MOVE
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $ff
ld [hl], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurBattleMon], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Some battle labels
2015-11-05 16:13:09 -08:00
jr z, .check_enemy_fainted
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wLastPlayerMon]
Move radio code to its own file
2015-07-20 22:52:46 -07:00
call UpdateBattleMon
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
Some battle labels
2015-11-05 16:13:09 -08:00
jr nz, .done
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
; BUG: A Pokémon that fainted from Pursuit will have its old status condition when revived (see docs/bugs_and_glitches.md)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $f0
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCryTracks], a
ld a, [wBattleMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wLastPlayerMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, wBattleParticipantsNotFainted
ld b, RESET_FLAG
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef SmallFarFlagAction
So very jumb
2015-10-19 13:49:29 -07:00
call PlayerMonFaintedAnimation
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_MonFainted
Some battle labels
2015-11-05 16:13:09 -08:00
jr .done_fainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Some battle labels
2015-11-05 16:13:09 -08:00
.check_enemy_fainted
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
Some battle labels
2015-11-05 16:13:09 -08:00
jr nz, .done
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_KINESIS
call PlaySFX
call WaitSFX
Macro update, roam mon annotations Updated map and mapgroup macros to get around an rgbds bug. Legendary beast locale handling annotated and relabeled. Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function. This will make it easier for modders to add or remove engine flags.
2015-07-25 11:25:37 -07:00
ld de, SFX_FAINT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaySFX
call WaitSFX
So very jumb
2015-10-19 13:49:29 -07:00
call EnemyMonFaintedAnimation
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_EnemyMonFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Some battle labels
2015-11-05 16:13:09 -08:00
.done_fainted
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Some battle labels
2015-11-05 16:13:09 -08:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
RecallPlayerMon:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_RETURN_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleHealingItems:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleHPHealingItem
Still more battle command labels
2015-11-06 19:36:06 -08:00
call UseHeldStatusHealingItem
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
call UseConfusionHealingItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleHPHealingItem
Still more battle command labels
2015-11-06 19:36:06 -08:00
call UseHeldStatusHealingItem
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
jp UseConfusionHealingItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleHPHealingItem
Still more battle command labels
2015-11-06 19:36:06 -08:00
call UseHeldStatusHealingItem
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
call UseConfusionHealingItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle core labels
2015-11-08 10:27:26 -08:00
call HandleHPHealingItem
Still more battle command labels
2015-11-06 19:36:06 -08:00
call UseHeldStatusHealingItem
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
jp UseConfusionHealingItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleHPHealingItem:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetOpponentItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Replace two numbers with constants (found by pfero)
2017-12-14 09:19:26 -08:00
cp HELD_BERRY
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonHP + 1
ld hl, wEnemyMonMaxHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .go
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonHP + 1
ld hl, wBattleMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.go
Battle animation annotations
2016-03-01 19:31:21 -08:00
; If, and only if, Pokemon's HP is less than half max, use the item.
; Store current HP in Buffer 3/4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld a, [de]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add a
ld c, a
dec de
ld a, [de]
inc de
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer2 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
adc a
ld b, a
ld a, b
cp [hl]
ld a, c
pop bc
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .equal
jr c, .less
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
More battle core labels
2015-11-08 10:27:26 -08:00
.equal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
cp [hl]
dec hl
ret nc
More battle core labels
2015-11-08 10:27:26 -08:00
.less
Still more battle command labels
2015-11-06 19:36:06 -08:00
call ItemRecoveryAnim
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
; store max HP in wHPBuffer1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer1 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
add c
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
dec de
ld a, [de]
Sync code with wiki
2018-02-04 10:16:40 -08:00
adc 0
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld a, [hld]
cp c
ld a, [hl]
sbc b
More battle core labels
2015-11-08 10:27:26 -08:00
jr nc, .okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld [wHPBuffer3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.okay
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld a, [wHPBuffer3 + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
inc de
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-03 20:25:22 -08:00
ld a, [wHPBuffer3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 15:11:55 -08:00
ld [wWhichHPBar], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 2
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .got_hp_bar_coords
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 10, 9
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle core labels
2015-11-08 10:27:26 -08:00
.got_hp_bar_coords
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 15:11:55 -08:00
ld [wWhichHPBar], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef AnimateHPBar
Still more battle command labels
2015-11-06 19:36:06 -08:00
UseOpponentItem:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetOpponentItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetItemName
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar ConsumeHeldItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, RecoveredUsingText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
ItemRecoveryAnim:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, RECOVER
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wFXAnimID], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wFXAnimID + 1], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PlayBattleAnim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
UseHeldStatusHealingItem:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetOpponentItem
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
ld hl, HeldStatusHealingEffects
Still more battle command labels
2015-11-06 19:36:06 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
cp $ff
ret z
inc hl
cp b
Still more battle command labels
2015-11-06 19:36:06 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec hl
ld b, [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_STATUS_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and b
ret z
xor a
ld [hl], a
push bc
call UpdateOpponentInParty
pop bc
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS5_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_TOXIC, [hl]
ld a, BATTLE_VARS_SUBSTATUS1_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_NIGHTMARE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More battle core labels
2015-11-08 10:27:26 -08:00
cp ALL_STATUS
Still more battle command labels
2015-11-06 19:36:06 -08:00
jr nz, .skip_confuse
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_CONFUSED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Still more battle command labels
2015-11-06 19:36:06 -08:00
.skip_confuse
More battle command labels
2015-11-06 17:55:16 -08:00
ld hl, CalcEnemyStats
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Still more battle command labels
2015-11-06 19:36:06 -08:00
jr z, .got_pointer
More battle command labels
2015-11-06 17:55:16 -08:00
ld hl, CalcPlayerStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Still more battle command labels
2015-11-06 19:36:06 -08:00
.got_pointer
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
Say "BANK(Foo) ; aka BANK(Bar)" to clarify that Foo and Bar share a bank
2019-01-12 12:17:20 -08:00
ld a, BANK(CalcPlayerStats) ; aka BANK(CalcEnemyStats)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rst FarCall
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
Still more battle command labels
2015-11-06 19:36:06 -08:00
call ItemRecoveryAnim
call UseOpponentItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
and a
ret
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
INCLUDE "data/battle/held_heal_status.asm"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
UseConfusionHealingItem:
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_CONFUSED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetOpponentItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_HEAL_CONFUSION
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .heal_status
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_HEAL_STATUS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
More battle core labels
2015-11-08 10:27:26 -08:00
.heal_status
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_CONFUSED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetItemName
Still more battle command labels
2015-11-06 19:36:06 -08:00
call ItemRecoveryAnim
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld hl, BattleText_ItemHealedConfusion
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .do_partymon
call GetOTPartymonItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [bc], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ret z
ld [hl], $0
ret
More battle core labels
2015-11-08 10:27:26 -08:00
.do_partymon
call GetPartymonItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [bc], a
ld [hl], a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
HandleStatBoostingHeldItems:
More battle core labels
2015-11-08 10:27:26 -08:00
; The effects handled here are not used in-game.
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_1
More battle core labels
2015-11-08 10:27:26 -08:00
call .DoPlayer
jp .DoEnemy
Fix inverted labels for HandleStatBoostingHeldItems
2016-10-28 17:03:10 -07:00
.player_1
call .DoEnemy
jp .DoPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.DoPlayer:
More battle core labels
2015-11-08 10:27:26 -08:00
call GetPartymonItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $0
More battle core labels
2015-11-08 10:27:26 -08:00
jp .HandleItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.DoEnemy:
More battle core labels
2015-11-08 10:27:26 -08:00
call GetOTPartymonItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Remove all address comments
2018-06-24 07:09:41 -07:00
.HandleItem:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, h
ld e, l
push de
push bc
ld a, [bc]
ld b, a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetItemHeldEffect
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
ld hl, HeldStatUpItems
More battle core labels
2015-11-08 10:27:26 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
cp -1
More battle core labels
2015-11-08 10:27:26 -08:00
jr z, .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
inc hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
More battle core labels
2015-11-08 10:27:26 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ld a, [bc]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
dec hl
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
dec hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld h, [hl]
ld l, a
BattleCommand labels copied from macros
2015-11-06 11:45:10 -08:00
ld a, BANK(BattleCommand_AttackUp)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rst FarCall
pop bc
pop de
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wFailedMessage]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
xor a
ld [bc], a
ld [de], a
call GetItemName
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UsersStringBuffer1Activated
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar BattleCommand_StatUpMessage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
More battle core labels
2015-11-08 10:27:26 -08:00
.finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
ret
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
INCLUDE "data/battle/held_stat_up.asm"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
GetPartymonItem:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1Item
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld bc, wBattleMonItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetOTPartymonItem:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1Item
ld a, [wCurOTMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld bc, wEnemyMonItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdateBattleHUDs:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
call DrawPlayerHUD
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerHPPal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetHPPal
call CheckDanger
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
call DrawEnemyHUD
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyHPPal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetHPPal
pop bc
pop de
pop hl
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdatePlayerHUD::
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
call DrawPlayerHUD
call UpdatePlayerHPPal
call CheckDanger
pop bc
pop de
pop hl
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
DrawPlayerHUD:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; Clear the area
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 9, 7
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall DrawPlayerHUDBorder
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 18, 9
ld [hl], $73 ; vertical bar
call PrintPlayerHUD
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; HP bar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 10, 9
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
ld b, 1
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef DrawPlayerHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; Exp bar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld hl, wPartyMon1Exp + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld d, h
ld e, l
hlcoord 10, 11
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempMonLevel]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call FillInExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdatePlayerHPPal:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerHPPal
link and seer labels
2015-11-23 13:04:53 -08:00
jp UpdateHPPal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckDanger:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .no_danger
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattleLowHealthAlarm]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .done
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerHPPal]
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
cp HP_RED
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .danger
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.no_danger
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld hl, wLowHealthAlarm
Ad some more constants for meaningful audio WRAM bits
2017-12-15 21:50:03 -08:00
res DANGER_ON_F, [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.danger
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld hl, wLowHealthAlarm
Ad some more constants for meaningful audio WRAM bits
2017-12-15 21:50:03 -08:00
set DANGER_ON_F, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
PrintPlayerHUD:
Consistent labels for each nickname in RAM
2021-03-17 13:16:02 -07:00
ld de, wBattleMonNickname
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 10, 7
Identify more WRAM labels, and start a <X>_DummyFunction label convention
2020-10-28 10:35:39 -07:00
call Battle_DummyFunction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaceString
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld hl, wPartyMon1DVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wTempMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonLevel
ld de, wTempMonLevel
$11 = wTempMonStructEnd - wTempMonLevel
2021-03-15 12:40:48 -07:00
ld bc, wTempMonStructEnd - wTempMonLevel
call CopyBytes ; battle_struct and party_struct end with the same data
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld hl, wPartyMon1Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartySpecies], a
ld [wCurSpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
pop hl
dec hl
Name all printer functions
2016-05-11 14:16:03 -07:00
ld a, TEMPMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
callfar GetGender
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, " "
Prepare to merge
2016-01-17 21:39:01 -08:00
jr c, .got_gender_char
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, "♂"
Prepare to merge
2016-01-17 21:39:01 -08:00
jr nz, .got_gender_char
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, "♀"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prepare to merge
2016-01-17 21:39:01 -08:00
.got_gender_char
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 17, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 14, 8
Prepare to merge
2016-01-17 21:39:01 -08:00
push af ; back up gender
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonStatus
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PlaceNonFaintStatus
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
pop bc
ret nz
ld a, b
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
cp " "
Prepare to merge
2016-01-17 21:39:01 -08:00
jr nz, .copy_level ; male or female
dec hl ; genderless
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prepare to merge
2016-01-17 21:39:01 -08:00
.copy_level
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonLevel]
ld [wTempMonLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp PrintLevel
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdateEnemyHUD::
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
call DrawEnemyHUD
call UpdateEnemyHPPal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
DrawEnemyHUD:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
lb bc, 4, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall DrawEnemyHUDBorder
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
ld [wCurSpecies], a
ld [wCurPartySpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
Consistent labels for each nickname in RAM
2021-03-17 13:16:02 -07:00
ld de, wEnemyMonNickname
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
Identify more WRAM labels, and start a <X>_DummyFunction label convention
2020-10-28 10:35:39 -07:00
call Battle_DummyFunction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaceString
ld h, b
ld l, c
dec hl
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonDVs
ld de, wTempMonDVs
ld a, [wEnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
jr z, .ok
Pokegear
2016-01-10 14:44:09 -08:00
ld hl, wEnemyBackupDVs
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Name all printer functions
2016-05-11 14:16:03 -07:00
ld a, TEMPMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
callfar GetGender
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, " "
link and seer labels
2015-11-23 13:04:53 -08:00
jr c, .got_gender
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, "♂"
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .got_gender
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, "♀"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.got_gender
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 9, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 6, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
push hl
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonStatus
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PlaceNonFaintStatus
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
pop bc
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .skip_level
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
cp " "
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .print_level
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec hl
link and seer labels
2015-11-23 13:04:53 -08:00
.print_level
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonLevel]
ld [wTempMonLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintLevel
link and seer labels
2015-11-23 13:04:53 -08:00
.skip_level
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or [hl]
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .not_fainted
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ld e, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld d, HP_BAR_LENGTH
link and seer labels
2015-11-23 13:04:53 -08:00
jp .draw_bar
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
link and seer labels
2015-11-23 13:04:53 -08:00
.not_fainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh [hMultiplicand + 0], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, HP_BAR_LENGTH_PX
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplier], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Multiply
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, a
ld a, [hl]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplier], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
and a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .less_than_256_max
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hMultiplier]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl b
rr a
srl b
rr a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDivisor], a
ldh a, [hProduct + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
srl b
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rr a
srl b
rr a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hProduct + 3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hProduct + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.less_than_256_max
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 2]
ldh [hDividend + 0], a
ldh a, [hProduct + 3]
ldh [hDividend + 1], a
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
call Divide
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, HP_BAR_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
ld c, a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
link and seer labels
2015-11-23 13:04:53 -08:00
.draw_bar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 15:11:55 -08:00
ld [wWhichHPBar], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 2
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
ld b, 0
AI and player items, withdraw/deposit
2015-11-08 07:59:28 -08:00
call DrawBattleHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdateEnemyHPPal:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyHPPal
link and seer labels
2015-11-23 13:04:53 -08:00
call UpdateHPPal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
UpdateHPPal:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, [hl]
call SetHPPal
ld a, [hl]
cp b
ret z
Some work on battle animations
2015-11-09 13:41:09 -08:00
jp FinishBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Identify more WRAM labels, and start a <X>_DummyFunction label convention
2020-10-28 10:35:39 -07:00
Battle_DummyFunction:
; called before placing either battler's nickname in the HUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleMenu:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTempTilemapToTilemap
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
changed more labels
2015-09-09 16:27:07 -07:00
cp BATTLETYPE_DEBUG
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .ok
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .ok
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleHuds
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.ok
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.loop
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
cp BATTLETYPE_CONTEST
jr nz, .not_contest
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall ContestBattleMenu
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr .next
.not_contest
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
; Auto input: choose "ITEM"
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wInputType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .skip_dude_pack_select
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall _DudeAutoInput_DownA
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.skip_dude_pack_select
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call LoadBattleMenu2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.next
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld a, [wBattleMenuCursorPosition]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Fight
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $3
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Pack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_PKMN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $4
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Run
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleMenu_Fight:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
link and seer labels
2015-11-23 13:04:53 -08:00
ld [wNumFleeAttempts], a
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
LoadBattleMenu2:
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall LoadBattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleMenu_Pack:
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jp nz, .ItemsCantBeUsed
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 13:08:43 -08:00
call LoadStandardMenuHeader
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .tutorial
cp BATTLETYPE_CONTEST
jr z, .contest
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall BattlePack
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattlePlayerAction]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
and a ; BATTLEPLAYERACTION_USEMOVE?
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .didnt_use_item
jr .got_item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.tutorial
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall TutorialPack
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, POKE_BALL
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurItem], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DoItemEffect
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr .got_item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.contest
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, PARK_BALL
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurItem], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DoItemEffect
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.got_item
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
call .UseItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.didnt_use_item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearPalettes
call DelayFrame
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadBattleFontsHPBar
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call GetBattleMonBackpic
call GetEnemyMonFrontpic
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
Some work on battle animations
2015-11-09 13:41:09 -08:00
call FinishBattleAnim
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.ItemsCantBeUsed:
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_ItemsCantBeUsedHere
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.UseItem:
new and updated music macros
2015-12-07 08:28:58 -08:00
ld a, [wWildMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jr nz, .run
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CheckItemPocket
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld a, [wItemAttributeValue]
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
cp BALL
jr z, .ball
More splits; map setup labels
2015-11-11 20:38:57 -08:00
call ClearBGPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
.ball
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadBattleFontsHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jr z, .tutorial2
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call GetBattleMonBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
.tutorial2
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call GetEnemyMonFrontpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Menu
2015-12-15 15:59:49 -08:00
ld [wMenuCursorY], a
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
More battle core labels
2015-11-08 10:27:26 -08:00
call UpdateBattleHUDs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)
2023-08-11 03:28:14 -07:00
call ClearMenuAndWindowData
Some work on battle animations
2015-11-09 13:41:09 -08:00
call FinishBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
.run
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
new and updated music macros
2015-12-07 08:28:58 -08:00
ld [wWildMon], a
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
and BATTLERESULT_BITMASK
ld [wBattleResult], a ; WIN
Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)
2023-08-11 03:28:14 -07:00
call ClearMenuAndWindowData
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleMenu_PKMN:
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 13:08:43 -08:00
call LoadStandardMenuHeader
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
BattleMenuPKMN_ReturnFromStats:
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 13:08:43 -08:00
call LoadStandardMenuHeader
More splits; map setup labels
2015-11-11 20:38:57 -08:00
call ClearBGPalettes
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
BattleMenuPKMN_Loop:
Comment, remove, or revise many unreferenced labels
2020-10-26 12:45:57 -07:00
call SetUpBattlePartyMenu_Loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wPartyMenuActionText], a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call JumpToPartyMenuAndPrintText
call SelectBattleMon
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jr c, .Cancel
.loop
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall FreezeMonIcons
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
call .GetMenu
jr c, .PressedB
More menu stuff
2015-12-17 19:31:16 -08:00
call PlaceHollowCursor
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
cp $1 ; SWITCH
jp z, TryPlayerSwitch
cp $2 ; STATS
jr z, .Stats
cp $3 ; CANCEL
jr z, .Cancel
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PressedB:
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jr BattleMenuPKMN_Loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Stats:
Finish stats screen function labels
2015-12-23 06:12:29 -08:00
call Battle_StatsScreen
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jp BattleMenuPKMN_ReturnFromStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Cancel:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
call ClearPalettes
call DelayFrame
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadHPBar
writebackup --> closewindow; game corner prize vendors; others
2015-12-24 19:58:42 -08:00
call CloseWindow
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
call GetMemCGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.GetMenu:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall BattleMonMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
Battle_StatsScreen:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DisableLCD
Some mystery gift functions
2016-06-07 05:08:51 -07:00
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld hl, vTiles2 tile $31
ld de, vTiles0
Some mystery gift functions
2016-06-07 05:08:51 -07:00
ld bc, $11 tiles
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Some mystery gift functions
2016-06-07 05:08:51 -07:00
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld hl, vTiles2
ld de, vTiles0 tile $11
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
ld bc, $31 tiles
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Some mystery gift functions
2016-06-07 05:08:51 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call EnableLCD
Some mystery gift functions
2016-06-07 05:08:51 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
call LowVolume
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall BattleStatsScreenInit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call MaxVolume
Some mystery gift functions
2016-06-07 05:08:51 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DisableLCD
Some mystery gift functions
2016-06-07 05:08:51 -07:00
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld hl, vTiles0
ld de, vTiles2 tile $31
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
ld bc, $11 tiles
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Some mystery gift functions
2016-06-07 05:08:51 -07:00
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld hl, vTiles0 tile $11
ld de, vTiles2
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
ld bc, $31 tiles
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Some mystery gift functions
2016-06-07 05:08:51 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call EnableLCD
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
TryPlayerSwitch:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp d
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jr nz, .check_trapped
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_MonIsAlreadyOut
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jp BattleMenuPKMN_Loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
.check_trapped
More battle core labels
2015-11-08 10:27:26 -08:00
ld a, [wPlayerWrapCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jr nz, .trapped
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_CANT_RUN, a
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jr z, .try_switch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
.trapped
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_MonCantBeRecalled
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jp BattleMenuPKMN_Loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
.try_switch
Battle animation annotations
2016-03-01 19:31:21 -08:00
call CheckIfCurPartyMonIsFitToFight
More work interpreting the sprite engine
2015-12-02 10:24:18 -08:00
jp z, BattleMenuPKMN_Loop
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wLastPlayerMon], a
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, BATTLEPLAYERACTION_SWITCH
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wBattlePlayerAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearPalettes
call DelayFrame
call ClearSprites
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadHPBar
writebackup --> closewindow; game corner prize vendors; others
2015-12-24 19:58:42 -08:00
call CloseWindow
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
call GetMemCGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
Remove all address comments
2018-06-24 07:09:41 -07:00
PlayerSwitch:
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, 1
ld [wPlayerIsSwitching], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .not_linked
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 13:08:43 -08:00
call LoadStandardMenuHeader
link and seer labels
2015-11-23 13:04:53 -08:00
call LinkBattleSendReceiveAction
writebackup --> closewindow; game corner prize vendors; others
2015-12-24 19:58:42 -08:00
call CloseWindow
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.not_linked
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
call ParseEnemyAction
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .linked
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.switch
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
more battle core labels
2015-11-07 18:04:54 -08:00
.linked
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
Identify BATTLEACTION_D and _E (thanks, ax6)
2018-10-20 21:52:10 -07:00
cp BATTLEACTION_STRUGGLE
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .switch
Identify BATTLEACTION_D and _E (thanks, ax6)
2018-10-20 21:52:10 -07:00
cp BATTLEACTION_SKIPTURN
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .switch
cp BATTLEACTION_SWITCH1
jp c, .switch
cp BATTLEACTION_FORFEIT
jr nz, .dont_run
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.dont_run
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hSerialConnectionStatus]
Use hSerialConnectionStatus constants elsewhere
2018-01-19 16:31:45 -08:00
cp USING_EXTERNAL_CLOCK
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
call EnemyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_1
call EnemyMonEntrance
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
EnemyMonEntrance:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar AI_Switch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleMonEntrance:
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call WithdrawMonText
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld c, 50
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus4
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
Some battle labels
2015-11-05 16:13:09 -08:00
call PursuitSwitch
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
jr c, .ok
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call RecallPlayerMon
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
.ok
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
hlcoord 9, 7
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wCurPartyMon], a
more battle core labels
2015-11-07 18:04:54 -08:00
call AddBattleParticipant
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
call SendOutMonText
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewBattleMonStatus
call BreakAttraction
Pokemon animations
2015-11-07 06:48:32 -08:00
call SendOutPlayerMon
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $2
Menu
2015-12-15 15:59:49 -08:00
ld [wMenuCursorY], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
PassedBattleMonEntrance:
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld c, 50
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
hlcoord 9, 7
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
ld [wCurBattleMon], a
more battle core labels
2015-11-07 18:04:54 -08:00
call AddBattleParticipant
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
xor a ; FALSE
ld [wApplyStatLevelMultipliersToEnemy], a
changed more labels
2015-09-09 16:27:07 -07:00
call ApplyStatLevelMultiplierOnAllStats
Pokemon animations
2015-11-07 06:48:32 -08:00
call SendOutPlayerMon
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleMenu_Run:
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $3
Menu
2015-12-15 15:59:49 -08:00
ld [wMenuCursorY], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonSpeed
ld de, wEnemyMonSpeed
changed more labels
2015-09-09 16:27:07 -07:00
call TryToRunAwayFromBattle
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, FALSE
link and seer labels
2015-11-23 13:04:53 -08:00
ld [wFailedToFlee], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattlePlayerAction]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
and a ; BATTLEPLAYERACTION_USEMOVE?
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckAmuletCoin:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonItem]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetItemHeldEffect
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_AMULET_COIN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
trade animation
2015-11-22 21:21:21 -08:00
ld [wAmuletCoin], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
MoveSelectionScreen:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMoves
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wMoveSelectionMenuType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .got_menu_type
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .ether_elixer_menu
call CheckPlayerHasUsableMoves
ret z ; use Struggle
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonMoves
link and seer labels
2015-11-23 13:04:53 -08:00
jr .got_menu_type
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.ether_elixer_menu
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
link and seer labels
2015-11-23 13:04:53 -08:00
.got_menu_type
Battle intro animation function
2015-10-17 14:18:52 -07:00
ld de, wListMoves_MoveIndicesBuffer
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
hlcoord 4, 17 - NUM_MOVES - 1
ld b, 4
ld c, 14
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wMoveSelectionMenuType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .got_dims
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
hlcoord 4, 17 - NUM_MOVES - 1 - 4
ld b, 4
ld c, 14
link and seer labels
2015-11-23 13:04:53 -08:00
.got_dims
Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)
2023-08-11 03:28:14 -07:00
call Textbox1bpp
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
hlcoord 6, 17 - NUM_MOVES
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wMoveSelectionMenuType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .got_start_coord
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
hlcoord 6, 17 - NUM_MOVES - 4
link and seer labels
2015-11-23 13:04:53 -08:00
.got_start_coord
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, SCREEN_WIDTH
Identify more uses of wBuffer1-6
2020-11-03 16:53:07 -08:00
ld [wListMovesLineSpacing], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef ListMoves
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 5
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wMoveSelectionMenuType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, 17 - NUM_MOVES
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .got_default_coord
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 5
ld a, 17 - NUM_MOVES - 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.got_default_coord
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld [w2DMenuCursorInitY], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld [w2DMenuCursorInitX], a
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wMoveSelectionMenuType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .skip_inc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurMoveNum]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
link and seer labels
2015-11-23 13:04:53 -08:00
.skip_inc
Menu
2015-12-15 15:59:49 -08:00
ld [wMenuCursorY], a
Use battle menu flags
2018-12-31 11:25:53 -08:00
ld a, 1
Menu
2015-12-15 15:59:49 -08:00
ld [wMenuCursorX], a
More work on animations
2015-12-04 05:46:11 -08:00
ld a, [wNumMoves]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld [w2DMenuNumRows], a
Use battle menu flags
2018-12-31 11:25:53 -08:00
ld a, 1
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld [w2DMenuNumCols], a
Use battle menu flags
2018-12-31 11:25:53 -08:00
ld c, STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wMoveSelectionMenuType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Battle animation annotations
2016-03-01 19:31:21 -08:00
ld b, D_DOWN | D_UP | A_BUTTON
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Battle animation annotations
2016-03-01 19:31:21 -08:00
ld b, D_DOWN | D_UP | A_BUTTON | B_BUTTON
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .okay
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .okay
Battle animation annotations
2016-03-01 19:31:21 -08:00
ld b, D_DOWN | D_UP | A_BUTTON | B_BUTTON | SELECT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Menu joy flags; started with link address space
2015-12-20 09:54:08 -08:00
ld [wMenuJoypadFilter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld [w2DMenuFlags1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld [w2DMenuFlags2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $10
More link trade shenanigans
2015-12-21 11:10:16 -08:00
ld [w2DMenuCursorOffsets], a
link and seer labels
2015-11-23 13:04:53 -08:00
.menu_loop
ld a, [wMoveSelectionMenuType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .battle_player_moves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .interpret_joypad
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 11, 14
pushd/popd are bash-only
2020-06-20 19:44:01 -07:00
ld de, .empty_string
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaceString
link and seer labels
2015-11-23 13:04:53 -08:00
jr .interpret_joypad
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.battle_player_moves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call MoveInfoBox
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld a, [wSwappingMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .interpret_joypad
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 5, 13
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
call AddNTimes
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld [hl], "▷"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.interpret_joypad
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Menu
2015-12-15 15:59:49 -08:00
call ScrollingMenuJoypad
link and seer labels
2015-11-23 13:04:53 -08:00
bit D_UP_F, a
jp nz, .pressed_up
bit D_DOWN_F, a
jp nz, .pressed_down
bit SELECT_F, a
jp nz, .pressed_select
bit B_BUTTON_F, a
Battle animation annotations
2016-03-01 19:31:21 -08:00
; A button
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wSwappingMove], a
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Menu
2015-12-15 15:59:49 -08:00
ld [wMenuCursorY], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
link and seer labels
2015-11-23 13:04:53 -08:00
ld a, [wMoveSelectionMenuType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .not_enemy_moves_process_b
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret
link and seer labels
2015-11-23 13:04:53 -08:00
.not_enemy_moves_process_b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld a, b
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurMoveNum], a
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .use_move
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret
link and seer labels
2015-11-23 13:04:53 -08:00
.use_move
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret nz
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonPP
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
Use maskbits some more
2018-01-11 09:00:01 -08:00
and PP_MASK
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .no_pp_left
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerDisableCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
swap a
and $f
dec a
cp c
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .move_disabled
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld a, [wUnusedPlayerLockedMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .skip2
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
link and seer labels
2015-11-23 13:04:53 -08:00
.skip2
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPlayerMove], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
link and seer labels
2015-11-23 13:04:53 -08:00
.move_disabled
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_TheMoveIsDisabled
link and seer labels
2015-11-23 13:04:53 -08:00
jr .place_textbox_start_over
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.no_pp_left
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_TheresNoPPLeftForThisMove
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.place_textbox_start_over
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
changed name of some labels
2015-10-10 04:45:39 -07:00
jp MoveSelectionScreen
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pushd/popd are bash-only
2020-06-20 19:44:01 -07:00
.empty_string
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "@"
link and seer labels
2015-11-23 13:04:53 -08:00
.pressed_up
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
link and seer labels
2015-11-23 13:04:53 -08:00
jp nz, .menu_loop
More work on animations
2015-12-04 05:46:11 -08:00
ld a, [wNumMoves]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Menu
2015-12-15 15:59:49 -08:00
ld [wMenuCursorY], a
link and seer labels
2015-11-23 13:04:53 -08:00
jp .menu_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.pressed_down
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
More work on animations
2015-12-04 05:46:11 -08:00
ld a, [wNumMoves]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
inc a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
link and seer labels
2015-11-23 13:04:53 -08:00
jp nz, .menu_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Menu
2015-12-15 15:59:49 -08:00
ld [wMenuCursorY], a
link and seer labels
2015-11-23 13:04:53 -08:00
jp .menu_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.pressed_select
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld a, [wSwappingMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .start_swap
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonMoves
link and seer labels
2015-11-23 13:04:53 -08:00
call .swap_bytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonPP
link and seer labels
2015-11-23 13:04:53 -08:00
call .swap_bytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerDisableCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
swap a
and $f
ld b, a
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .not_swapping_disabled_move
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and $f
ld b, a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld a, [wSwappingMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
swap a
add b
ld [hl], a
link and seer labels
2015-11-23 13:04:53 -08:00
jr .swap_moves_in_party_struct
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.not_swapping_disabled_move
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld a, [wSwappingMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .swap_moves_in_party_struct
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and $f
ld b, a
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
swap a
add b
ld [hl], a
link and seer labels
2015-11-23 13:04:53 -08:00
.swap_moves_in_party_struct
; Fixes the COOLTRAINER glitch
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerSubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .transformed
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartyMon1Moves
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
push hl
link and seer labels
2015-11-23 13:04:53 -08:00
call .swap_bytes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
Move MON_* parentheses to the EQUS declaration
2015-11-07 10:05:58 -08:00
ld bc, MON_PP - MON_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
link and seer labels
2015-11-23 13:04:53 -08:00
call .swap_bytes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.transformed
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wSwappingMove], a
changed name of some labels
2015-10-10 04:45:39 -07:00
jp MoveSelectionScreen
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.swap_bytes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld a, [wSwappingMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld c, a
ld b, 0
add hl, bc
ld d, h
ld e, l
pop hl
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld c, a
ld b, 0
add hl, bc
ld a, [de]
ld b, [hl]
ld [hl], a
ld a, b
ld [de], a
ret
link and seer labels
2015-11-23 13:04:53 -08:00
.start_swap
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wSwappingMove], a
changed name of some labels
2015-10-10 04:45:39 -07:00
jp MoveSelectionScreen
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
MoveInfoBox:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 0, 8
ld b, 3
ld c, 9
Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)
2023-08-11 03:28:14 -07:00
call Textbox1bpp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerDisableCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .not_disabled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
swap a
and $f
ld b, a
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .not_disabled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 1, 10
ld de, .Disabled
call PlaceString
jr .done
link and seer labels
2015-11-23 13:04:53 -08:00
.not_disabled
Menu
2015-12-15 15:59:49 -08:00
ld hl, wMenuCursorY
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec [hl]
call SetPlayerTurn
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonMoves
Menu
2015-12-15 15:59:49 -08:00
ld a, [wMenuCursorY]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ld b, 0
add hl, bc
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPlayerMove], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
ld [wCurPartyMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, WILDMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetMaxPPOfMove
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Menu
2015-12-15 15:59:49 -08:00
ld hl, wMenuCursorY
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, [hl]
inc [hl]
ld b, 0
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
Use maskbits some more
2018-01-11 09:00:01 -08:00
and PP_MASK
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wStringBuffer1], a
link and seer labels
2015-11-23 13:04:53 -08:00
call .PrintPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 1, 9
ld de, .Type
call PlaceString
hlcoord 7, 11
ld [hl], "/"
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar UpdateMoveData
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wPlayerMoveStruct + MOVE_ANIM]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
hlcoord 2, 10
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PrintMoveType
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.done
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Disabled:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "Disabled!@"
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Type:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "TYPE/@"
Remove all address comments
2018-06-24 07:09:41 -07:00
.PrintPP:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 5, 11
push hl
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wStringBuffer1
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 1, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
pop hl
inc hl
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
inc hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], "/"
inc hl
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld de, wNamedObjectIndex
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 1, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckPlayerHasUsableMoves:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, STRUGGLE
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPlayerMove], a
ld a, [wPlayerDisableCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonPP
link and seer labels
2015-11-23 13:04:53 -08:00
jr nz, .disabled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
inc hl
or [hl]
inc hl
or [hl]
Use maskbits some more
2018-01-11 09:00:01 -08:00
and PP_MASK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
link and seer labels
2015-11-23 13:04:53 -08:00
jr .force_struggle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.disabled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
swap a
and $f
ld b, a
Document more bugs
2017-12-12 19:58:20 -08:00
ld d, NUM_MOVES + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
link and seer labels
2015-11-23 13:04:53 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec d
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, [hl]
inc hl
dec b
link and seer labels
2015-11-23 13:04:53 -08:00
jr z, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or c
link and seer labels
2015-11-23 13:04:53 -08:00
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
link and seer labels
2015-11-23 13:04:53 -08:00
.done
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
; BUG: A Disabled but PP Up–enhanced move may not trigger Struggle (see docs/bugs_and_glitches.md)
and a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
link and seer labels
2015-11-23 13:04:53 -08:00
.force_struggle
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_MonHasNoMovesLeft
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, 60
call DelayFrames
xor a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ParseEnemyAction:
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyIsSwitching]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .not_linked
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld a, [wBattlePlayerAction]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
and a ; BATTLEPLAYERACTION_USEMOVE?
link and seer labels
2015-11-23 13:04:53 -08:00
call z, LinkBattleSendReceiveAction
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
Identify BATTLEACTION_D and _E (thanks, ax6)
2018-10-20 21:52:10 -07:00
cp BATTLEACTION_STRUGGLE
more battle core labels
2015-11-07 18:04:54 -08:00
jp z, .struggle
Identify BATTLEACTION_D and _E (thanks, ax6)
2018-10-20 21:52:10 -07:00
cp BATTLEACTION_SKIPTURN
jp z, .skip_turn
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_SWITCH1
changed more labels
2015-09-09 16:27:07 -07:00
jp nc, ResetVarsForSubstatusRage
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurEnemyMoveNum], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus1]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ROLLOUT, a
more battle core labels
2015-11-07 18:04:54 -08:00
jp nz, .skip_load
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus3]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << SUBSTATUS_CHARGED | 1 << SUBSTATUS_RAMPAGE | 1 << SUBSTATUS_BIDE
more battle core labels
2015-11-07 18:04:54 -08:00
jp nz, .skip_load
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wLastEnemyMove]
more battle core labels
2015-11-07 18:04:54 -08:00
jp nz, .finish
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMoves
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
jp .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.not_linked
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .skip_encore
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wLastEnemyMove]
more battle core labels
2015-11-07 18:04:54 -08:00
jp .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.skip_encore
Battle animation annotations
2016-03-01 19:31:21 -08:00
call CheckEnemyLockedIn
changed more labels
2015-09-09 16:27:07 -07:00
jp nz, ResetVarsForSubstatusRage
more battle core labels
2015-11-07 18:04:54 -08:00
jr .continue
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Identify BATTLEACTION_D and _E (thanks, ax6)
2018-10-20 21:52:10 -07:00
.skip_turn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $ff
more battle core labels
2015-11-07 18:04:54 -08:00
jr .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.continue
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMoves
ld de, wEnemyMonPP
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, NUM_MOVES
more battle core labels
2015-11-07 18:04:54 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jp z, .struggle
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyDisabledMove]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .disabled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
Use maskbits some more
2018-01-11 09:00:01 -08:00
and PP_MASK
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .enough_pp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.disabled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
inc de
dec b
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .loop
jr .struggle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.enough_pp
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .skip_load
; wild
.loop2
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
Avoid "+- 1" at every maskbits
2018-01-16 14:27:50 -08:00
maskbits NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyDisableCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
swap a
and $f
dec a
cp c
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .loop2
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld b, a
ld a, [hl]
Use maskbits some more
2018-01-11 09:00:01 -08:00
and PP_MASK
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurEnemyMoveNum], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
more battle core labels
2015-11-07 18:04:54 -08:00
.finish
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurEnemyMove], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.skip_load
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar UpdateMoveData
Battle animation annotations
2016-03-01 19:31:21 -08:00
call CheckEnemyLockedIn
More battle command labels
2015-11-06 17:55:16 -08:00
jr nz, .raging
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
more battle core labels
2015-11-07 18:04:54 -08:00
ld [wEnemyCharging], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle command labels
2015-11-06 17:55:16 -08:00
.raging
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_FURY_CUTTER
More battle command labels
2015-11-06 17:55:16 -08:00
jr z, .fury_cutter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyFuryCutterCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle command labels
2015-11-06 17:55:16 -08:00
.fury_cutter
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_RAGE
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .no_rage
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus4
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wEnemyRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.no_rage
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_PROTECT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_ENDURE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyProtectCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
more battle core labels
2015-11-07 18:04:54 -08:00
.struggle
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld a, STRUGGLE
more battle core labels
2015-11-07 18:04:54 -08:00
jr .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
ResetVarsForSubstatusRage:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyFuryCutterCount], a
ld [wEnemyProtectCount], a
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wEnemyRageCounter], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus4
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckEnemyLockedIn:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus4]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
and 1 << SUBSTATUS_RECHARGE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
changed more labels
2015-09-09 16:27:07 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << SUBSTATUS_CHARGED | 1 << SUBSTATUS_RAMPAGE | 1 << SUBSTATUS_BIDE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
changed more labels
2015-09-09 16:27:07 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemySubStatus1
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ROLLOUT, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
LinkBattleSendReceiveAction:
Remove Mobile, Battle Tower, Mystery Gift, and Odd Egg (#1)
2023-07-24 12:13:11 -07:00
call .StageForSend
ld [wLinkBattleSentAction], a
farcall PlaceWaitingText
call .LinkBattle_SendReceiveAction
ret
.StageForSend:
ld a, [wBattlePlayerAction]
and a ; BATTLEPLAYERACTION_USEMOVE?
jr nz, .switch
ld a, [wCurPlayerMove]
ld b, BATTLEACTION_STRUGGLE
cp STRUGGLE
jr z, .struggle
ld b, BATTLEACTION_SKIPTURN
cp $ff
jr z, .struggle
ld a, [wCurMoveNum]
jr .use_move
.switch
ld a, [wCurPartyMon]
add BATTLEACTION_SWITCH1
jr .use_move
.struggle
ld a, b
.use_move
and $0f
ret
.LinkBattle_SendReceiveAction:
ld a, [wLinkBattleSentAction]
ld [wPlayerLinkAction], a
ld a, $ff
ld [wOtherPlayerLinkAction], a
.waiting
call LinkTransfer
call DelayFrame
ld a, [wOtherPlayerLinkAction]
inc a
jr z, .waiting
vc_hook Wireless_end_exchange
vc_patch Wireless_net_delay_3
if DEF(_CRYSTAL11_VC)
ld b, 26
else
ld b, 10
endc
vc_patch_end
.receive
call DelayFrame
call LinkTransfer
dec b
jr nz, .receive
if DEF(_CRYSTAL11_VC)
ld b, 26
else
ld b, 10
endc
vc_patch_end
.acknowledge
call DelayFrame
call LinkDataReceived
dec b
jr nz, .acknowledge
vc_hook Wireless_end_send_zero_bytes
ld a, [wOtherPlayerLinkAction]
ld [wBattleAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
LoadEnemyMon:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Initialize enemy monster parameters
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
; To do this we pull the species from wTempEnemyMonSpecies
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Notes:
; BattleRandom is used to ensure sync between Game Boys
Fix comment/style issues caused from w-izing.
2018-01-30 11:05:25 -08:00
; Clear the whole enemy mon struct (wEnemyMon)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonSpecies
ld bc, wEnemyMonEnd - wEnemyMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ByteFill
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; We don't need to be here if we're in a link battle
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jp nz, InitEnemyMon
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Make sure everything knows what species we're working with
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
ld [wEnemyMonSpecies], a
ld [wCurSpecies], a
ld [wCurPartySpecies], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Grab the BaseData for this species
call GetBaseData
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Let's get the item:
; Is the item predetermined?
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr z, .WildItem
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a trainer battle, the item is in the party struct
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
ld hl, wOTPartyMon1Item
call GetPartyLocation ; bc = PartyMon[wCurPartyMon] - wPartyMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
jr .UpdateItem
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.WildItem:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; In a wild battle, we pull from the item slots in BaseData
; Force Item1
; Used for Ho-Oh, Lugia and Snorlax encounters
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp BATTLETYPE_FORCEITEM
Make reviewed fixes; standardize on " + "
2018-07-28 22:40:23 -07:00
ld a, [wBaseItem1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .UpdateItem
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Failing that, it's all up to chance
; Effective chances:
; 75% None
; 23% Item1
; 2% Item2
; 25% chance of getting an item
call BattleRandom
Consistent "X percent [+/- Y]" order
2018-02-04 18:21:34 -08:00
cp 75 percent + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, NO_ITEM
jr c, .UpdateItem
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; From there, an 8% chance for Item2
call BattleRandom
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp 8 percent ; 8% of 25% = 2% Item2
Make reviewed fixes; standardize on " + "
2018-07-28 22:40:23 -07:00
ld a, [wBaseItem1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .UpdateItem
Make reviewed fixes; standardize on " + "
2018-07-28 22:40:23 -07:00
ld a, [wBaseItem2]
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.UpdateItem:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyMonItem], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Initialize DVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a trainer battle, DVs are predetermined
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr z, .InitDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .InitDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Unknown
Pokegear
2016-01-10 14:44:09 -08:00
ld hl, wEnemyBackupDVs
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
jp .Happiness
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.InitDVs:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Trainer DVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; All trainers have preset DVs, determined by class
; See GetTrainerDVs for more on that
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall GetTrainerDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; These are the DVs we'll use if we're actually in a trainer battle
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr nz, .UpdateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Wild DVs
; Here's where the fun starts
; Roaming monsters (Entei, Raikou) work differently
; They have their own structs, which are shorter than normal
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp BATTLETYPE_ROAMING
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .NotRoaming
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Grab HP
call GetRoamMonHP
ld a, [hl]
; Check if the HP has been initialized
and a
; We'll do something with the result in a minute
push af
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Grab DVs
call GetRoamMonDVs
inc hl
ld a, [hld]
ld c, a
ld b, [hl]
; Get back the result of our check
pop af
; If the RoamMon struct has already been initialized, we're done
jr nz, .UpdateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If it hasn't, we need to initialize the DVs
; (HP is initialized at the end of the battle)
call GetRoamMonDVs
inc hl
call BattleRandom
ld [hld], a
ld c, a
call BattleRandom
ld [hl], a
ld b, a
; We're done with DVs
jr .UpdateDVs
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.NotRoaming:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
; Register a contains wBattleType
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Forced shiny battle type
; Used by Red Gyarados at Lake of Rage
Sync with pokecrystal up to 8873506b1
2023-07-26 17:50:16 -07:00
cp BATTLETYPE_FORCESHINY
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .GenerateDVs
ld b, ATKDEFDV_SHINY ; $ea
ld c, SPDSPCDV_SHINY ; $aa
jr .UpdateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.GenerateDVs:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Generate new random DVs
call BattleRandom
ld b, a
call BattleRandom
ld c, a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.UpdateDVs:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Input DVs in register bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
ld [hli], a
ld [hl], c
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; We've still got more to do if we're dealing with a wild monster
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr nz, .Happiness
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Species-specfic:
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Unown
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp UNOWN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .Magikarp
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get letter based on DVs
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonDVs
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetUnownLetter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Can't use any letters that haven't been unlocked
; If combined with forced shiny battletype, causes an infinite loop
call CheckUnownLetter
jr c, .GenerateDVs ; try again
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Magikarp:
More constants and documentation in slot machines
2017-12-28 10:38:15 -08:00
; These filters are untranslated.
Update Magikarp length documentation
2017-12-28 07:42:57 -08:00
; They expect at wMagikarpLength a 2-byte value in mm,
More constants and documentation in slot machines
2017-12-28 10:38:15 -08:00
; but the value is in feet and inches (one byte each).
Update Magikarp length documentation
2017-12-28 07:42:57 -08:00
; The first filter is supposed to make very large Magikarp even rarer,
Reword Magikarp length comments
2018-01-02 08:50:08 -08:00
; by targeting those 1600 mm (= 5'3") or larger.
More constants and documentation in slot machines
2017-12-28 10:38:15 -08:00
; After the conversion to feet, it is unable to target any,
Reword Magikarp length comments
2018-01-02 08:50:08 -08:00
; since the largest possible Magikarp is 5'3", and $0503 = 1283 mm.
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp MAGIKARP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .Happiness
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get Magikarp's length
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
; BUG: Magikarp length limits have a unit conversion error (see docs/bugs_and_glitches.md)
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonDVs
ld bc, wPlayerID
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CalcMagikarpLength
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
More clarification
2018-01-02 08:53:06 -08:00
; No reason to keep going if length > 1536 mm (i.e. if HIGH(length) > 6 feet)
More WRAM cleanup
2017-12-09 16:41:03 -08:00
ld a, [wMagikarpLength]
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
cp HIGH(1536)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .CheckMagikarpArea
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
; 5% chance of skipping both size checks
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Random
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
cp 5 percent
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .CheckMagikarpArea
Update documentation: - Apply more edits from #595 - Move music ID behavior from the wiki to docs - Move assembly programming links from docs to the wiki - Describe why the TM item gaps exist
2019-02-17 10:18:38 -08:00
; Try again if length >= 1616 mm (i.e. if LOW(length) >= 4 inches)
More WRAM cleanup
2017-12-09 16:41:03 -08:00
ld a, [wMagikarpLength + 1]
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
cp LOW(1616)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .GenerateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 20% chance of skipping this check
call Random
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
cp 20 percent - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .CheckMagikarpArea
Update documentation: - Apply more edits from #595 - Move music ID behavior from the wiki to docs - Move assembly programming links from docs to the wiki - Describe why the TM item gaps exist
2019-02-17 10:18:38 -08:00
; Try again if length >= 1600 mm (i.e. if LOW(length) >= 3 inches)
More WRAM cleanup
2017-12-09 16:41:03 -08:00
ld a, [wMagikarpLength + 1]
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
cp LOW(1600)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .GenerateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.CheckMagikarpArea:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 40% chance of not flooring
call Random
Clean up some percentage values
2020-05-07 08:09:41 -07:00
cp 39 percent + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .Happiness
More clarification
2018-01-02 08:53:06 -08:00
; Try again if length < 1024 mm (i.e. if HIGH(length) < 3 feet)
More WRAM cleanup
2017-12-09 16:41:03 -08:00
ld a, [wMagikarpLength]
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
cp HIGH(1024)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .GenerateDVs ; try again
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Finally done with DVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Happiness:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Set happiness
ld a, BASE_HAPPINESS
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyMonHappiness], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Set level
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyLevel]
ld [wEnemyMonLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Fill stats
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonMaxHP
More link trade shenanigans
2015-12-21 11:10:16 -08:00
ld b, FALSE
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld hl, wEnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1)
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
predef CalcMonStats
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a trainer battle,
; get the rest of the parameters from the party struct
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp TRAINER_BATTLE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .OpponentParty
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a wild battle, check wild-specific stuff
and a
jr z, .TreeMon
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nz, .Moves
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.TreeMon:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're headbutting trees, some monsters enter battle asleep
call CheckSleepingTreeMon
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
ld a, TREEMON_SLEEP_TURNS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .UpdateStatus
; Otherwise, no status
xor a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.UpdateStatus:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonStatus
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Unused byte
xor a
ld [hli], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
link and seer labels
2015-11-23 13:04:53 -08:00
; Full HP..
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonMaxHP]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonMaxHP + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
link and seer labels
2015-11-23 13:04:53 -08:00
; ..unless it's a RoamMon
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp BATTLETYPE_ROAMING
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .Moves
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Grab HP
call GetRoamMonHP
ld a, [hl]
; Check if it's been initialized again
and a
jr z, .InitRoamHP
; Update from the struct if it has
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyMonHP + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .Moves
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.InitRoamHP:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; HP only uses the lo byte in the RoamMon struct since
fix-various-little-things A compilation of suggestions from the discord that don't deserve separate commits and are not questionable at all™.
2018-05-05 00:19:04 -07:00
; Raikou and Entei will have < 256 hp at level 40
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonHP + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
jr .Moves
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.OpponentParty:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get HP from the party struct
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, (wOTPartyMon1HP + 1)
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld a, [hld]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyMonHP + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyMonHP], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Make sure everything knows which monster the opponent is using
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
ld [wCurOTMon], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get status from the party struct
dec hl
ld a, [hl] ; OTPartyMonStatus
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyMonStatus], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Moves:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBaseType1
ld de, wEnemyMonType1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get moves
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Are we in a trainer battle?
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp TRAINER_BATTLE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .WildMoves
; Then copy moves from the party struct
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1Moves
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld bc, NUM_MOVES
call CopyBytes
jr .PP
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.WildMoves:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
; Clear wEnemyMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld h, d
ld l, e
ld [hli], a
Labeled every function in ROM0 that's referenced in the source
2016-05-10 09:31:49 -07:00
ld [hli], a
ld [hli], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Identify more uses of wBuffer1-6
2020-11-03 16:53:07 -08:00
ld [wSkipMovesBeforeLevelUp], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Fill moves based on level
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef FillMoves
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PP:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Trainer battle?
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp TRAINER_BATTLE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .TrainerPP
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Fill wild PP
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMoves
ld de, wEnemyMonPP
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef FillPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .Finish
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.TrainerPP:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Copy PP from the party struct
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPartyMon1PP
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wEnemyMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, NUM_MOVES
call CopyBytes
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Finish:
Identify why five of six enemy mon base stats are copied (#866) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-01-08 10:42:40 -08:00
; Copy the first five base stats (the enemy mon's base Sp. Atk
; is also used to calculate Sp. Def stat experience)
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBaseStats
ld de, wEnemyMonBaseStats
Identify why five of six enemy mon base stats are copied (#866) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-01-08 10:42:40 -08:00
ld b, NUM_STATS - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.loop
ld a, [hli]
ld [de], a
inc de
dec b
jr nz, .loop
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBaseCatchRate]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
inc de
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBaseExp]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wNamedObjectIndex], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPokemonName
; Did we catch it?
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
Use {interpolation} to generate sequences of RAM labels This makes the table_width/assert_table_length usages unnecessary, and also keeps the labels automatically up to date if the length constants change.
2021-04-27 09:11:39 -07:00
; Update enemy nickname
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wStringBuffer1
Consistent labels for each nickname in RAM
2021-03-17 13:16:02 -07:00
ld de, wEnemyMonNickname
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 09:25:55 -08:00
ld bc, MON_NAME_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Pokedex labels
2015-11-29 18:34:59 -08:00
; Saw this mon
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld c, a
trade animation
2015-11-22 21:21:21 -08:00
ld b, SET_FLAG
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPokedexSeen
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef SmallFarFlagAction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonStats
ld de, wEnemyStats
Identify more unnamed labels
2020-06-29 09:25:58 -07:00
ld bc, NUM_EXP_STATS * 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Bug: PRZ and BRN stat reductions don't apply to switched Pokémon (#1021) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-12-01 13:54:01 -08:00
; BUG: PRZ and BRN stat reductions don't apply to switched Pokémon (see docs/bugs_and_glitches.md)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckSleepingTreeMon:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Return carry if species is in the list
; for the current time of day
; Don't do anything if this isn't a tree encounter
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-09 21:06:20 -08:00
cp BATTLETYPE_TREE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .NotSleeping
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get list for the time of day
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
ld hl, AsleepTreeMonsMorn
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTimeOfDay]
Document macros/map.asm Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events) Prefix FLOOR to the `elevfloor` constants
2017-12-10 22:02:28 -08:00
cp DAY_F
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .Check
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
ld hl, AsleepTreeMonsDay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .Check
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
ld hl, AsleepTreeMonsNite
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Check:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, 1 ; length of species id
call IsInArray
; If it's a match, the opponent is asleep
ret c
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.NotSleeping:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
INCLUDE "data/wild/treemons_asleep.asm"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckUnownLetter:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Return carry if the Unown letter hasn't been unlocked yet
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Prefix engine_flags wram addresses with w
2017-12-28 04:15:46 -08:00
ld a, [wUnlockedUnowns]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ld de, 0
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.loop
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Don't check this set unless it's been unlocked
srl c
jr nc, .next
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Is our letter in the set?
wUnlockedUnowns engine flag constants Use local labels for "End"ings
2018-01-22 10:00:35 -08:00
ld hl, UnlockedUnownLetterSets
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wUnownLetter]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, 1
push bc
call IsInArray
pop bc
pop de
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .match
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.next
; Make sure we haven't gone past the end of the table
inc e
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
inc e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, e
wUnlockedUnowns engine_flag constants (#1025)
2022-12-26 10:14:10 -08:00
cp NUM_UNLOCKED_UNOWN_SETS * 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .loop
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Hasn't been unlocked, or the letter is invalid
scf
ret
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.match
; Valid letter
and a
ret
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
wUnlockedUnowns engine flag constants Use local labels for "End"ings
2018-01-22 10:00:35 -08:00
INCLUDE "data/wild/unlocked_unowns.asm"
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 13:27:43 -07:00
SwapBattlerLevels: ; unreferenced
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonLevel]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonLevel]
ld [wBattleMonLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wEnemyMonLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleWinSlideInEnemyTrainerFrontpic:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTempEnemyMonSpecies], a
Some work on battle animations
2015-11-09 13:41:09 -08:00
call FinishBattleAnim
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOtherTrainerClass]
ld [wTrainerClass], a
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld de, vTiles2
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
callfar GetTrainerPic
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 19, 0
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld c, 0
So very jumb
2015-10-19 13:49:29 -07:00
.outer_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc c
ld a, c
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
cp 7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
ldh [hBGMapThird], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, $0
push bc
push hl
So very jumb
2015-10-19 13:49:29 -07:00
.inner_loop
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
call .CopyColumn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld a, 7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add d
ld d, a
dec c
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .inner_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld c, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
pop hl
pop bc
dec hl
So very jumb
2015-10-19 13:49:29 -07:00
jr .outer_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.CopyColumn:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld e, 7
So very jumb
2015-10-19 13:49:29 -07:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], d
So very jumb
2015-10-19 13:49:29 -07:00
ld bc, SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
inc d
dec e
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ApplyStatusEffectOnPlayerStats:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, 1
more battle core labels
2015-11-07 18:04:54 -08:00
jr ApplyStatusEffectOnStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
ApplyStatusEffectOnEnemyStats:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Remove all address comments
2018-06-24 07:09:41 -07:00
ApplyStatusEffectOnStats:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
More battle command labels
2015-11-06 17:55:16 -08:00
call ApplyPrzEffectOnSpeed
jp ApplyBrnEffectOnAttack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
ApplyPrzEffectOnSpeed:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .enemy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << PAR
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonSpeed + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
srl a
rr b
ld [hli], a
or b
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .player_ok
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld b, $1 ; min speed
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.player_ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], b
ret
more battle core labels
2015-11-07 18:04:54 -08:00
.enemy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << PAR
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonSpeed + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
srl a
rr b
ld [hli], a
or b
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .enemy_ok
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld b, $1 ; min speed
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.enemy_ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], b
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ApplyBrnEffectOnAttack:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .enemy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << BRN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonAttack + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
ld [hli], a
or b
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .player_ok
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld b, $1 ; min attack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.player_ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], b
ret
more battle core labels
2015-11-07 18:04:54 -08:00
.enemy
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << BRN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonAttack + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
ld [hli], a
or b
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .enemy_ok
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld b, $1 ; min attack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.enemy_ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], b
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ApplyStatLevelMultiplierOnAllStats:
changed more labels
2015-09-09 16:27:07 -07:00
; Apply StatLevelMultipliers on all 5 Stats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, 0
more battle core labels
2015-11-07 18:04:54 -08:00
.stat_loop
changed more labels
2015-09-09 16:27:07 -07:00
call ApplyStatLevelMultiplier
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc c
ld a, c
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
cp NUM_BATTLE_STATS
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .stat_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ApplyStatLevelMultiplier:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push bc
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, [wApplyStatLevelMultipliersToEnemy]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ld a, c
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonAttack
ld de, wPlayerStats
ld bc, wPlayerAtkLevel
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .got_pointers
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonAttack
ld de, wEnemyStats
ld bc, wEnemyAtkLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.got_pointers
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add c
ld c, a
more battle core labels
2015-11-07 18:04:54 -08:00
jr nc, .okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc b
more battle core labels
2015-11-07 18:04:54 -08:00
.okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [bc]
pop bc
ld b, a
push bc
sla c
ld b, 0
add hl, bc
ld a, c
add e
ld e, a
more battle core labels
2015-11-07 18:04:54 -08:00
jr nc, .okay2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc d
more battle core labels
2015-11-07 18:04:54 -08:00
.okay2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
push hl
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
ld hl, StatLevelMultipliers_Applied
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec b
sla b
ld c, b
ld b, 0
add hl, bc
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc de
ld a, [de]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplier], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Multiply
ld a, [hl]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDivisor], a
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld b, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
pop hl
; Cap at 999.
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
sub LOW(MAX_STAT_VALUE)
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 2]
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
sbc HIGH(MAX_STAT_VALUE)
more battle core labels
2015-11-07 18:04:54 -08:00
jp c, .okay3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
ld a, HIGH(MAX_STAT_VALUE)
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hQuotient + 2], a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ld a, LOW(MAX_STAT_VALUE)
ldh [hQuotient + 3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.okay3
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
ld b, a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
or b
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .okay4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
.okay4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
More battle data in data/battle/
2018-01-25 18:34:42 -08:00
INCLUDE "data/battle/stat_multipliers_2.asm"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
BadgeStatBoosts:
Fix comment/style issues caused from w-izing.
2018-01-30 11:05:25 -08:00
; Raise the stats of the battle mon in wBattleMon
; depending on which badges have been obtained.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Every other badge boosts a stat, starting from the first.
Document Special Defense badge boost glitch (#651) Document Special Defense badge boost glitch
2019-10-20 15:25:34 -07:00
; GlacierBadge also boosts Special Defense, although the relevant code is buggy (see below).
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; ZephyrBadge: Attack
; PlainBadge: Speed
; MineralBadge: Defense
Document Special Defense badge boost glitch (#651) Document Special Defense badge boost glitch
2019-10-20 15:25:34 -07:00
; GlacierBadge: Special Attack and Special Defense
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; The boosted stats are in order, except PlainBadge and MineralBadge's boosts are swapped.
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Prefix engine_flags wram addresses with w
2017-12-28 04:15:46 -08:00
ld a, [wJohtoBadges]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
ld d, a
more battle core labels
2015-11-07 18:04:54 -08:00
and (1 << PLAINBADGE)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add a
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
add a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld a, d
more battle core labels
2015-11-07 18:04:54 -08:00
and (1 << MINERALBADGE)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rrca
rrca
ld c, a
ld a, d
more battle core labels
2015-11-07 18:04:54 -08:00
and ((1 << ZEPHYRBADGE) | (1 << HIVEBADGE) | (1 << FOGBADGE) | (1 << STORMBADGE) | (1 << GLACIERBADGE) | (1 << RISINGBADGE))
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or b
or c
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wBattleMonAttack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, 4
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.CheckBadge:
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
; BUG: Glacier Badge may not boost Special Defense depending on the value of Special Attack (see docs/bugs_and_glitches.md)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
srl b
call c, BoostStat
inc hl
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
inc hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Check every other badge.
srl b
dec c
jr nz, .CheckBadge
srl a
call c, BoostStat
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BoostStat:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Raise stat at hl by 1/8.
ld a, [hli]
ld d, a
ld e, [hl]
srl d
rr e
srl d
rr e
srl d
rr e
ld a, [hl]
add e
ld [hld], a
ld a, [hl]
adc d
ld [hli], a
; Cap at 999.
ld a, [hld]
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
sub LOW(MAX_STAT_VALUE)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
sbc HIGH(MAX_STAT_VALUE)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
ld a, HIGH(MAX_STAT_VALUE)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
ld a, LOW(MAX_STAT_VALUE)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hld], a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
_LoadBattleFontsHPBar:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar LoadBattleFontsHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
_LoadHPBar:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar LoadHPBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 13:27:43 -07:00
LoadHPExpBarGFX: ; unreferenced
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
ld de, EnemyHPBarBorderGFX
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld hl, vTiles2 tile $6c
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
lb bc, BANK(EnemyHPBarBorderGFX), 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Get1bpp
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
ld de, HPExpBarBorderGFX
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld hl, vTiles2 tile $73
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
lb bc, BANK(HPExpBarBorderGFX), 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Get1bpp
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld de, ExpBarGFX
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld hl, vTiles2 tile $55
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
lb bc, BANK(ExpBarGFX), 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Get2bpp
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
EmptyBattleTextbox:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, .empty
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp BattleTextbox
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
.empty:
text_end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
_BattleRandom::
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If the normal RNG is used in a link battle it'll desync.
; To circumvent this a shared PRNG is used instead.
; But if we're in a non-link battle we're safe to use it
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jp z, Random
; The PRNG operates in streams of 10 values.
; Which value are we trying to pull?
push hl
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wLinkBattleRNCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ld b, 0
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wLinkBattleRNs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
inc a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wLinkBattleRNCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we haven't hit the end yet, we're good
cp 10 - 1 ; Exclude last value. See the closing comment
ld a, [hl]
pop bc
pop hl
ret c
; If we have, we have to generate new pseudorandom data
; Instead of having multiple PRNGs, ten seeds are used
push hl
push bc
push af
; Reset count to 0
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wLinkBattleRNCount], a
ld hl, wLinkBattleRNs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, 10 ; number of seeds
; Generate next number in the sequence for each seed
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
; a[n+1] = (a[n] * 5 + 1) % 256
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.loop
; get last #
ld a, [hl]
; a * 5 + 1
ld c, a
add a
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
add a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add c
inc a
; update #
ld [hli], a
dec b
jr nz, .loop
; This has the side effect of pulling the last value first,
; then wrapping around. As a result, when we check to see if
; we've reached the end, we check the one before it.
pop af
pop bc
pop hl
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
Call_PlayBattleAnim_OnlyIfVisible:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret nz
Remove all address comments
2018-06-24 07:09:41 -07:00
Call_PlayBattleAnim:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, e
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wFXAnimID], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wFXAnimID + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef_jump PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
FinishBattleAnim:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
push bc
push de
push hl
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
ld b, CGB_BATTLE_COLORS
call GetCGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrame
pop hl
pop de
pop bc
pop af
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GiveExperiencePoints:
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
; Give experience.
Remove Mobile, Battle Tower, Mystery Gift, and Odd Egg (#1)
2023-07-24 12:13:11 -07:00
; Don't give experience if linked.
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
change more labelss
2015-08-24 16:56:30 -07:00
More WRAM tidying
2016-01-12 09:46:18 -08:00
call .EvenlyDivideExpAmongParticipants
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
ld bc, wPartyMon1Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.loop
ld hl, MON_HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hli]
or [hl]
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jp z, .next_mon ; fainted
more battle core labels
2015-11-07 18:04:54 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, wBattleParticipantsNotFainted
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
more battle core labels
2015-11-07 18:04:54 -08:00
ld b, CHECK_FLAG
PHONE_DISPLAY_HEIGHT is 4, the number of visible phone entries
2020-01-19 11:10:10 -08:00
ld d, 0
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef SmallFarFlagAction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
pop bc
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jp z, .next_mon
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
More WRAM tidying
2016-01-12 09:46:18 -08:00
; give stat exp
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, MON_STAT_EXP + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld d, h
ld e, l
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonBaseStats - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Replace more hex values with constants or decimal
2018-07-11 12:40:09 -07:00
ld c, NUM_EXP_STATS
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.stat_exp_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
ld a, [de]
add [hl]
ld [de], a
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr nc, .no_carry_stat_exp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec de
ld a, [de]
inc a
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr z, .stat_exp_maxed_out
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
inc de
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.no_carry_stat_exp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push bc
MON_PKRUS -> MON_POKERUS
2021-06-07 17:00:21 -07:00
ld a, MON_POKERUS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld a, [hl]
and a
pop bc
pop hl
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr z, .stat_exp_awarded
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
add [hl]
ld [de], a
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr nc, .stat_exp_awarded
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec de
ld a, [de]
inc a
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr z, .stat_exp_maxed_out
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
inc de
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr .stat_exp_awarded
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.stat_exp_maxed_out
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $ff
ld [de], a
inc de
ld [de], a
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.stat_exp_awarded
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc de
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
inc de
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec c
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr nz, .stat_exp_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 0], a
ldh [hMultiplicand + 1], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonBaseExp]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 2], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonLevel]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplier], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Multiply
more battle core labels
2015-11-07 18:04:54 -08:00
ld a, 7
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDivisor], a
more battle core labels
2015-11-07 18:04:54 -08:00
ld b, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
More WRAM tidying
2016-01-12 09:46:18 -08:00
; Boost Experience for traded Pokemon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, MON_ID
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerID]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .boosted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerID + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
ld a, 0
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .no_boost
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.boosted
engine/mart.asm
2015-11-11 11:12:46 -08:00
call BoostExp
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
ld a, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.no_boost
More WRAM tidying
2016-01-12 09:46:18 -08:00
; Boost experience for a Trainer Battle
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wStringBuffer2 + 2], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
engine/mart.asm
2015-11-11 11:12:46 -08:00
call nz, BoostExp
More WRAM tidying
2016-01-12 09:46:18 -08:00
; Boost experience for Lucky Egg
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_ITEM
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld a, [hl]
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
cp LUCKY_EGG
engine/mart.asm
2015-11-11 11:12:46 -08:00
call z, BoostExp
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wStringBuffer2 + 1], a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 2]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wStringBuffer2], a
ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames
Consistent labels for each nickname in RAM
2021-03-17 13:16:02 -07:00
call GetNickname
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, Text_MonGainedExpPoint
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call BattleTextbox
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wStringBuffer2 + 1]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh [hQuotient + 3], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wStringBuffer2]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh [hQuotient + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
More WRAM tidying
2016-01-12 09:46:18 -08:00
call AnimateExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
MON_STAT_EXP - 1 → MON_EXP + 2
2018-07-24 11:14:04 -07:00
ld hl, MON_EXP + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld d, [hl]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add d
ld [hld], a
ld d, [hl]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
adc d
ld [hl], a
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr nc, .no_exp_overflow
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec hl
inc [hl]
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr nz, .no_exp_overflow
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $ff
ld [hli], a
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
ld [hli], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.no_exp_overflow
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, a
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
ld d, 0
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPartySpecies
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurSpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
push bc
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld d, MAX_LEVEL
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CalcExpAtLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
MON_STAT_EXP - 1 → MON_EXP + 2
2018-07-24 11:14:04 -07:00
ld hl, MON_EXP + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
push bc
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hQuotient + 1]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ld b, a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hQuotient + 2]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ld c, a
ldh a, [hQuotient + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
ld a, [hld]
sub d
ld a, [hld]
sbc c
ld a, [hl]
sbc b
Mobile trade animations, pokepic animations
2015-12-17 10:49:26 -08:00
jr c, .not_max_exp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
ld [hli], a
ld a, c
ld [hli], a
ld a, d
ld [hld], a
Mobile trade animations, pokepic animations
2015-12-17 10:49:26 -08:00
.not_max_exp
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
; Check if the mon leveled up
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
predef CopyMonToTempMon
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CalcLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld hl, MON_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
cp MAX_LEVEL
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jp nc, .next_mon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp d
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jp z, .next_mon
more battle core labels
2015-11-07 18:04:54 -08:00
; <NICKNAME> grew to level ##!
Mobile trade animations, pokepic animations
2015-12-17 10:49:26 -08:00
ld [wTempLevel], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyLevel]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
ld a, d
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld hl, MON_SPECIES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurSpecies], a
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld [wTempSpecies], a ; unused?
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, MON_MAXHP + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hld]
ld e, a
ld d, [hl]
push de
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, MON_MAXHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld d, h
ld e, l
More link trade shenanigans
2015-12-21 11:10:16 -08:00
ld hl, MON_STAT_EXP - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
push bc
More link trade shenanigans
2015-12-21 11:10:16 -08:00
ld b, TRUE
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
predef CalcMonStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, MON_MAXHP + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hld]
sub e
ld e, a
ld a, [hl]
sbc d
ld d, a
dec hl
ld a, [hl]
add e
ld [hld], a
ld a, [hl]
adc d
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp d
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr nz, .skip_active_mon_update
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [de], a
inc de
ld a, [hli]
ld [de], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wBattleMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
more battle core labels
2015-11-07 18:04:54 -08:00
ld bc, PARTYMON_STRUCT_LENGTH - MON_MAXHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
pop bc
more battle core labels
2015-11-07 18:04:54 -08:00
ld hl, MON_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleMonLevel], a
ld a, [wPlayerSubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .transformed
ld hl, MON_ATK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wPlayerStats
more battle core labels
2015-11-07 18:04:54 -08:00
ld bc, PARTYMON_STRUCT_LENGTH - MON_ATK
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
more battle core labels
2015-11-07 18:04:54 -08:00
.transformed
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
xor a ; FALSE
ld [wApplyStatLevelMultipliersToEnemy], a
changed more labels
2015-09-09 16:27:07 -07:00
call ApplyStatLevelMultiplierOnAllStats
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar ApplyStatusEffectOnPlayerStats
callfar BadgeStatBoosts
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
callfar UpdatePlayerHUD
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.skip_active_mon_update
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall LevelUpHappinessMod
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr z, .skip_exp_bar_animation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_HIT_END_OF_EXP_BAR
call PlaySFX
call WaitSFX
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_StringBuffer1GrewToLevel
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call LoadTilemapToTempTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.skip_exp_bar_animation
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
predef CopyMonToTempMon
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 9, 0
Replace more hex values with constants or decimal
2018-07-11 12:40:09 -07:00
ld b, 10
ld c, 9
Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)
2023-08-11 03:28:14 -07:00
call Textbox1bpp
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 11, 1
Mobile trade animations, pokepic animations
2015-12-17 10:49:26 -08:00
ld bc, 4
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PrintTempMonStats
Replace more hex values with constants or decimal
2018-07-11 12:40:09 -07:00
ld c, 30
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
call WaitPressAorB_BlinkCursor
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
ld a, [wCurSpecies]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld [wTempSpecies], a ; unused?
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyLevel]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
ld c, a
Mobile trade animations, pokepic animations
2015-12-17 10:49:26 -08:00
ld a, [wTempLevel]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
more battle core labels
2015-11-07 18:04:54 -08:00
.level_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc b
ld a, b
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef LearnLevelMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ld a, b
cp c
more battle core labels
2015-11-07 18:04:54 -08:00
jr nz, .level_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyLevel], a
ld hl, wEvolvableFlags
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
trade animation
2015-11-22 21:21:21 -08:00
ld b, SET_FLAG
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef SmallFarFlagAction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.next_mon
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartyMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
cp b
more battle core labels
2015-11-07 18:04:54 -08:00
jr z, .done
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_SPECIES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld b, h
ld c, l
more battle core labels
2015-11-07 18:04:54 -08:00
jp .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
more battle core labels
2015-11-07 18:04:54 -08:00
.done
jp ResetBattleParticipants
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.EvenlyDivideExpAmongParticipants:
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
; count number of battle participants
more battle core labels
2015-11-07 18:04:54 -08:00
ld a, [wBattleParticipantsNotFainted]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld c, PARTY_LENGTH
ld d, 0
More WRAM tidying
2016-01-12 09:46:18 -08:00
.count_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
srl b
adc d
ld d, a
dec c
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr nz, .count_loop
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
cp 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld [wTempByteValue], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonBaseStats
ld c, wEnemyMonEnd - wEnemyMonBaseStats
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
.base_stat_division_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDividend + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDividend + 1], a
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 16:27:34 -07:00
ld a, [wTempByteValue]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDivisor], a
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld b, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
dec c
Fix issue #581 (random stuff ax6 noticed)
2018-12-23 00:45:41 -08:00
jr nz, .base_stat_division_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BoostExp:
engine/mart.asm
2015-11-11 11:12:46 -08:00
; Multiply experience by 1.5x
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
engine/mart.asm
2015-11-11 11:12:46 -08:00
; load experience value
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
engine/mart.asm
2015-11-11 11:12:46 -08:00
; halve it
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl b
rr c
engine/mart.asm
2015-11-11 11:12:46 -08:00
; add it back to the whole exp value
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add c
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hProduct + 3], a
ldh a, [hProduct + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
adc b
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hProduct + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
Text_MonGainedExpPoint:
text_jump → text_far The previous name for this was rather misleading. It isn't an actual jump like you'd expect the `jp` instruction to behave as. Instead, it behaves more like a `farcall`. This also makes it consistent with its current command ID name of `TX_FAR`.
2018-10-28 09:16:55 -07:00
text_far Text_Gained
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_asm
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ld hl, ExpPointsText
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wStringBuffer2 + 2] ; IsTradedMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
changed more labels
2015-09-09 16:27:07 -07:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ld hl, BoostedExpPointsText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
BoostedExpPointsText:
text_far _BoostedExpPointsText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ExpPointsText:
text_far _ExpPointsText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
AnimateExpBar:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wCurPartyMon
ld a, [wCurBattleMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jp nz, .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonLevel]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp MAX_LEVEL
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
jp nc, .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 3]
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld [wExperienceGained + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 2]
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld [wExperienceGained + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
xor a
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld [wExperienceGained], a
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wMonType], a
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
predef CopyMonToTempMon
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempMonLevel]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld e, a
push de
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wTempMonExp + 2
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
call CalcExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wTempMonExp + 2
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld a, [wExperienceGained + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add [hl]
ld [hld], a
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld a, [wExperienceGained + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
adc [hl]
ld [hld], a
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr nc, .NoOverflow
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc [hl]
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr nz, .NoOverflow
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $ff
ld [hli], a
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
ld [hli], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.NoOverflow:
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld d, MAX_LEVEL
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CalcExpAtLevel
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hProduct + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wTempMonExp + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
sub d
ld a, [hld]
sbc c
ld a, [hl]
sbc b
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr c, .AlreadyAtMaxExp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
ld [hli], a
ld a, c
ld [hli], a
ld a, d
ld [hld], a
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.AlreadyAtMaxExp:
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CalcLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
pop bc
pop de
ld d, a
cp e
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr nc, .LoopLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, e
ld d, a
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.LoopLevels:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, e
Growth rate data.
2014-03-05 02:42:09 -08:00
cp MAX_LEVEL
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr nc, .FinishExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp d
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr z, .FinishExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTempMonLevel], a
ld [wCurPartyLevel], a
ld [wBattleMonLevel], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
More WRAM tidying
2016-01-12 09:46:18 -08:00
call .PlayExpBarSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $40
More WRAM tidying
2016-01-12 09:46:18 -08:00
call .LoopBarAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintPlayerHUD
Consistent labels for each nickname in RAM
2021-03-17 13:16:02 -07:00
ld hl, wBattleMonNickname
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wStringBuffer1
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 09:25:55 -08:00
ld bc, MON_NAME_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
More WRAM tidying
2016-01-12 09:46:18 -08:00
call TerminateExpBarSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_HIT_END_OF_EXP_BAR
call PlaySFX
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall AnimateEndOfExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitSFX
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_StringBuffer1GrewToLevel
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
inc e
ld b, $0
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr .LoopLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.FinishExpBar:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld b, d
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wTempMonExp + 2
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
call CalcExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
pop bc
ld c, a
More WRAM tidying
2016-01-12 09:46:18 -08:00
call .PlayExpBarSound
call .LoopBarAnimation
call TerminateExpBarSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hProduct + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hProduct + 3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
.finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PlayExpBarSound:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
call WaitSFX
ld de, SFX_EXP_BAR
call PlaySFX
ld c, 10
call DelayFrames
pop bc
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.LoopBarAnimation:
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld d, 3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec b
More WRAM tidying
2016-01-12 09:46:18 -08:00
.anim_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc b
push bc
push de
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 17, 11
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
call PlaceExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, d
call DelayFrames
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ld a, c
cp b
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr z, .end_animation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc b
push bc
push de
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 17, 11
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
call PlaceExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, d
call DelayFrames
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec d
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr nz, .min_number_of_frames
ld d, 1
.min_number_of_frames
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ld a, c
cp b
More WRAM tidying
2016-01-12 09:46:18 -08:00
jr nz, .anim_loop
.end_animation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
SendOutMonText:
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .not_linked
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
Identify more uses of wBuffer1-6
2020-11-03 16:53:07 -08:00
; If we're in a LinkBattle print just "Go <PlayerMon>"
; unless DoBattle already set [wBattleHasJustStarted]
ld hl, GoMonText
ld a, [wBattleHasJustStarted]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr nz, .skip_to_textbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.not_linked
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
; Depending on the HP of the enemy mon, the game prints a different text
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
ld hl, GoMonText
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .skip_to_textbox
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 14:12:02 -07:00
; BUG: Switching out or switching against a Pokémon with max HP below 4 freezes the game (see docs/bugs_and_glitches.md)
Better comments for enemy health percentage code
2022-01-10 18:25:43 -08:00
; compute enemy health remaining as a percentage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 0], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld [wEnemyHPAtTimeOfPlayerSwitch], a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld [wEnemyHPAtTimeOfPlayerSwitch + 1], a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 2], a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld a, 25
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplier], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Multiply
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, [hl]
srl a
rr b
srl a
rr b
ld a, b
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld b, 4
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
ld hl, GoMonText
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
cp 70
jr nc, .skip_to_textbox
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
ld hl, DoItMonText
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
cp 40
jr nc, .skip_to_textbox
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
ld hl, GoForItMonText
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
cp 10
jr nc, .skip_to_textbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
ld hl, YourFoesWeakGetmMonText
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.skip_to_textbox
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp BattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
GoMonText:
text_far _GoMonText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_asm
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
jr PrepareBattleMonNicknameText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
DoItMonText:
text_far _DoItMonText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_asm
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
jr PrepareBattleMonNicknameText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
GoForItMonText:
text_far _GoForItMonText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_asm
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
jr PrepareBattleMonNicknameText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
YourFoesWeakGetmMonText:
text_far _YourFoesWeakGetmMonText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_asm
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
PrepareBattleMonNicknameText:
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ld hl, BattleMonNicknameText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
BattleMonNicknameText:
text_far _BattleMonNicknameText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
WithdrawMonText:
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, .WithdrawMonText
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp BattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
.WithdrawMonText:
Identify some more labels, and make some more consistent
2020-11-01 09:36:38 -08:00
text_far _BattleMonNickCommaText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_asm
Better comments for enemy health percentage code
2022-01-10 18:25:43 -08:00
; Depending on the HP lost since the enemy mon was sent out, the game prints a different text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
push bc
Better comments for enemy health percentage code
2022-01-10 18:25:43 -08:00
; compute enemy health lost as a percentage
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonHP + 1
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld de, wEnemyHPAtTimeOfPlayerSwitch + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, [hl]
dec hl
ld a, [de]
sub b
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec de
ld b, [hl]
ld a, [de]
sbc b
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplicand + 1], a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld a, 25
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplier], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Multiply
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, [hl]
srl a
rr b
srl a
rr b
ld a, b
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld b, 4
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
pop bc
pop de
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ld hl, ThatsEnoughComeBackText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
changed more labels
2015-09-09 16:27:07 -07:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ld hl, ComeBackText
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
cp 30
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
changed more labels
2015-09-09 16:27:07 -07:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ld hl, OKComeBackText
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
cp 70
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
changed more labels
2015-09-09 16:27:07 -07:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ld hl, GoodComeBackText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ThatsEnoughComeBackText:
text_far _ThatsEnoughComeBackText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
OKComeBackText:
text_far _OKComeBackText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
GoodComeBackText:
text_far _GoodComeBackText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 13:27:43 -07:00
TextJump_ComeBack: ; unreferenced
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ld hl, ComeBackText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 15:24:17 -07:00
ComeBackText:
text_far _ComeBackText
Resolve issue #575: Rename text commands
2018-11-17 10:33:03 -08:00
text_end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 13:27:43 -07:00
HandleSafariAngerEatingStatus: ; unreferenced
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld hl, wSafariMonEating
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .angry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec [hl]
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_WildMonIsEating
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.angry
Use more assertions to ensure correct code and data
2020-10-26 19:24:38 -07:00
dec hl
assert wSafariMonEating - 1 == wSafariMonAngerCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and a
ret z
dec [hl]
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 08:13:29 -08:00
ld hl, BattleText_WildMonIsAngry
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr nz, .finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonSpecies]
ld [wCurSpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBaseCatchRate]
ld [wEnemyMonCatchRate], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call SafeLoadTempTilemapToTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
jp StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
FillInExpBar:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
call CalcExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld de, 7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jp PlaceExpBar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
CalcExpBar:
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
; Calculate the percent exp between this level and the next
; Level in b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
ld d, b
push de
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CalcExpAtLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
; exp at current level gets pushed to the stack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, hMultiplicand
ld a, [hli]
push af
ld a, [hli]
push af
ld a, [hl]
push af
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
; next level
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc d
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar CalcExpAtLevel
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
; back up the next level exp, and subtract the two levels
ld hl, hMultiplicand + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMathBuffer + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
sub b
ld [hld], a
ld a, [hl]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMathBuffer + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
sbc b
ld [hld], a
ld a, [hl]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMathBuffer], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
sbc b
ld [hl], a
pop de
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld hl, hMultiplicand + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
push af
ld a, [hl]
push af
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
; get the amount of exp remaining to the next level
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
dec de
ld c, a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hMathBuffer + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sub c
ld [hld], a
ld a, [de]
dec de
ld b, a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hMathBuffer + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sbc b
ld [hld], a
ld a, [de]
ld c, a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hMathBuffer]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sbc c
ld [hld], a
xor a
ld [hl], a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ld a, 64
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMultiplier], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Multiply
pop af
ld c, a
pop af
ld b, a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
and a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl b
rr c
ld hl, hProduct
srl [hl]
inc hl
rr [hl]
inc hl
rr [hl]
inc hl
rr [hl]
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hDivisor], a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld b, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 10:49:38 -07:00
ldh a, [hQuotient + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld a, $40
sub b
ld b, a
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
PlaceExpBar:
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld c, $8 ; number of tiles
.loop1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
sub $8
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr c, .next
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld a, $6a ; full bar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hld], a
dec c
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .finish
jr .loop1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.next
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add $8
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr z, .loop2
add $54 ; tile to the left of small exp bar tile
jr .skip
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.loop2
ld a, $62 ; empty bar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.skip
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hld], a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld a, $62 ; empty bar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec c
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
jr nz, .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
.finish
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetBattleMonBackpic:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPlayerSubStatus4]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_SUBSTITUTE, a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld hl, BattleAnimCmd_RaiseSub
Fix issue #345: - GetMonFrontpic → GetEnemyMonFrontpic - GetMonBackpic → GetBattleMonBackpic - FrontpicPredef → GetAnimatedFrontpicPredef - GetFrontpic → GetMonFrontpic - GetBackpic → GetMonBackpic - CutAndPasteMap → PadMapForHDMATransfer
2017-12-24 12:03:20 -08:00
jr nz, GetBattleMonBackpic_DoAnim ; substitute
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
Remove all address comments
2018-06-24 07:09:41 -07:00
DropPlayerSub:
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld a, [wPlayerMinimized]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld hl, BattleAnimCmd_MinimizeOpp
Fix issue #345: - GetMonFrontpic → GetEnemyMonFrontpic - GetMonBackpic → GetBattleMonBackpic - FrontpicPredef → GetAnimatedFrontpicPredef - GetFrontpic → GetMonFrontpic - GetBackpic → GetMonBackpic - CutAndPasteMap → PadMapForHDMATransfer
2017-12-24 12:03:20 -08:00
jr nz, GetBattleMonBackpic_DoAnim
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartySpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleMonSpecies]
ld [wCurPartySpecies], a
ld hl, wBattleMonDVs
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetUnownLetter
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld de, vTiles2 tile $31
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetMonBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartySpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetBattleMonBackpic_DoAnim:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, BANK(BattleAnimCommands)
rst FarCall
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetEnemyMonFrontpic:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemySubStatus4]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_SUBSTITUTE, a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld hl, BattleAnimCmd_RaiseSub
Fix issue #345: - GetMonFrontpic → GetEnemyMonFrontpic - GetMonBackpic → GetBattleMonBackpic - FrontpicPredef → GetAnimatedFrontpicPredef - GetFrontpic → GetMonFrontpic - GetBackpic → GetMonBackpic - CutAndPasteMap → PadMapForHDMATransfer
2017-12-24 12:03:20 -08:00
jr nz, GetEnemyMonFrontpic_DoAnim
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
Remove all address comments
2018-06-24 07:09:41 -07:00
DropEnemySub:
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld a, [wEnemyMinimized]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 13:53:37 -08:00
ld hl, BattleAnimCmd_MinimizeOpp
Fix issue #345: - GetMonFrontpic → GetEnemyMonFrontpic - GetMonBackpic → GetBattleMonBackpic - FrontpicPredef → GetAnimatedFrontpicPredef - GetFrontpic → GetMonFrontpic - GetBackpic → GetMonBackpic - CutAndPasteMap → PadMapForHDMATransfer
2017-12-24 12:03:20 -08:00
jr nz, GetEnemyMonFrontpic_DoAnim
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartySpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonSpecies]
ld [wCurSpecies], a
ld [wCurPartySpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBaseData
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonDVs
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetUnownLetter
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld de, vTiles2
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetAnimatedFrontpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartySpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetEnemyMonFrontpic_DoAnim:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hBattleTurn]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
call SetEnemyTurn
ld a, BANK(BattleAnimCommands)
rst FarCall
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
StartBattle:
About time I got to these functions
2015-10-24 07:34:19 -07:00
; This check prevents you from entering a battle without any Pokemon.
; Those using walk-through-walls to bypass getting a Pokemon experience
; the effects of this check.
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
About time I got to these functions
2015-10-24 07:34:19 -07:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTimeOfDayPal]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
found the sliding animation at the start of battle
2015-11-10 17:18:49 -08:00
call BattleIntro
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
call DoBattle
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
call ExitBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTimeOfDayPal], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 13:27:43 -07:00
CallDoBattle: ; unreferenced
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
call DoBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleIntro:
About time I got to these functions
2015-10-24 07:34:19 -07:00
call LoadTrainerOrWildMonPic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTempBattleMonSpecies], a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wBattleMenuCursorPosition], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMapAnims], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall PlayBattleMusic
farcall ShowLinkBattleParticipants
farcall FindFirstAliveMonAndStartBattle
About time I got to these functions
2015-10-24 07:34:19 -07:00
call DisableSpriteUpdates
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall ClearBattleRAM
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitEnemy
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
call BackUpBGMap2
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
ld b, CGB_BATTLE_GRAYSCALE
call GetCGBLayout
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, rLCDC
Remove some more raw addresses
2020-06-21 09:21:47 -07:00
res rLCDC_WINDOW_TILEMAP, [hl] ; select vBGMap0/vBGMap2
found the sliding animation at the start of battle
2015-11-10 17:18:49 -08:00
call InitBattleDisplay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleStartMessage
ld hl, rLCDC
Remove some more raw addresses
2020-06-21 09:21:47 -07:00
set rLCDC_WINDOW_TILEMAP, [hl] ; select vBGMap1/vBGMap3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call EmptyBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 9, 7
Some battle labels
2015-11-05 16:13:09 -08:00
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
hlcoord 1, 0
Some battle labels
2015-11-05 16:13:09 -08:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call ClearSprites
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
Pokedex labels
2015-11-29 18:34:59 -08:00
cp WILD_BATTLE
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
call z, UpdateEnemyHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
LoadTrainerOrWildMonPic:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOtherTrainerClass]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
About time I got to these functions
2015-10-24 07:34:19 -07:00
jr nz, .Trainer
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempWildMonSpecies]
ld [wCurPartySpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Trainer:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTempEnemyMonSpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
InitEnemy:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wOtherTrainerClass]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jp nz, InitEnemyTrainer ; trainer
jp InitEnemyWildmon ; wild
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Remove all address comments
2018-06-24 07:09:41 -07:00
BackUpBGMap2:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [rSVBK]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Use BANK for all hardcoded banks with BANK in comments.
2018-01-02 13:46:40 -08:00
ld a, BANK(wDecompressScratch)
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rSVBK], a
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld hl, wDecompressScratch
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld bc, $40 tiles ; vBGMap3 - vBGMap2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $2
call ByteFill
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [rVBK]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rVBK], a
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld de, wDecompressScratch
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
hlbgcoord 0, 0 ; vBGMap2
lb bc, BANK(BackUpBGMap2), $40
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Request2bpp
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rVBK], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rSVBK], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
InitEnemyTrainer:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTrainerClass], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTempEnemyMonSpecies], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar GetTrainerAttributes
callfar ReadTrainerParty
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
Comment on RIVAL1 item
2018-01-18 09:03:58 -08:00
; RIVAL1's first mon has no held item
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTrainerClass]
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
cp RIVAL1
jr nz, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wOTPartyMon1Item], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
.ok
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld de, vTiles2
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
callfar GetTrainerPic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hGraphicStartTile], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
More WRAM tidying
2016-01-12 09:46:18 -08:00
ld [wEnemyItemState], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 0
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
lb bc, 7, 7
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PlaceGraphic
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, -1
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurOTMon], a
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
ld a, TRAINER_BATTLE
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld [wBattleMode], a
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
Move battle engine data into data/ IsJohtoGymLeader → IsGymLeader
2018-01-09 12:12:49 -08:00
call IsGymLeader
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
jr nc, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurPartyMon], a
ld a, [wPartyCount]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
.partyloop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld a, [hli]
or [hl]
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
jr z, .skipfaintedmon
ld c, HAPPINESS_GYMBATTLE
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar ChangeHappiness
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
.skipfaintedmon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
dec b
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
jr z, .done
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wCurPartyMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc [hl]
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
jr .partyloop
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
InitEnemyWildmon:
Pokedex labels
2015-11-29 18:34:59 -08:00
ld a, WILD_BATTLE
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld [wBattleMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call LoadEnemyMon
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMoves
Pokedex labels
2015-11-29 18:34:59 -08:00
ld de, wWildMonMoves
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonPP
Pokedex labels
2015-11-29 18:34:59 -08:00
ld de, wWildMonPP
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonDVs
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetUnownLetter
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurPartySpecies]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp UNOWN
engine/link.asm
2015-11-09 20:55:39 -08:00
jr nz, .skip_unown
Pokedex labels
2015-11-29 18:34:59 -08:00
ld a, [wFirstUnownSeen]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
engine/link.asm
2015-11-09 20:55:39 -08:00
jr nz, .skip_unown
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wUnownLetter]
Pokedex labels
2015-11-29 18:34:59 -08:00
ld [wFirstUnownSeen], a
engine/link.asm
2015-11-09 20:55:39 -08:00
.skip_unown
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld de, vTiles2
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef GetAnimatedFrontpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wTrainerClass], a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hGraphicStartTile], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 0
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
lb bc, 7, 7
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PlaceGraphic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Identify more unnamed labels
2020-10-05 13:15:57 -07:00
FillEnemyMovesFromMoveIndicesBuffer: ; unreferenced
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wEnemyMonMoves
Battle intro animation function
2015-10-17 14:18:52 -07:00
ld de, wListMoves_MoveIndicesBuffer
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, NUM_MOVES
even more battle labels
2014-01-05 04:28:55 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
inc de
ld [hli], a
and a
even more battle labels
2014-01-05 04:28:55 -08:00
jr z, .clearpp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
even more battle labels
2014-01-05 04:28:55 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
dec a
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, Moves + MOVE_PP
Use constants for move struct positioning. This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:23:55 -07:00
ld bc, MOVE_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
even more battle labels
2014-01-05 04:28:55 -08:00
ld a, BANK(Moves)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetFarByte
pop hl
even more battle labels
2014-01-05 04:28:55 -08:00
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld bc, wEnemyMonPP - (wEnemyMonMoves + 1)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld [hl], a
even more battle labels
2014-01-05 04:28:55 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
pop bc
even more battle labels
2014-01-05 04:28:55 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec b
even more battle labels
2014-01-05 04:28:55 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
even more battle labels
2014-01-05 04:28:55 -08:00
.clear
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hli], a
even more battle labels
2014-01-05 04:28:55 -08:00
.clearpp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld bc, wEnemyMonPP - (wEnemyMonMoves + 1)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
xor a
ld [hl], a
pop hl
pop bc
dec b
even more battle labels
2014-01-05 04:28:55 -08:00
jr nz, .clear
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ExitBattle:
Item effects, post-battle, and decoration flags
2015-12-29 13:44:37 -08:00
call .HandleEndOfBattle
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
call CleanUpBattleRAM
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.HandleEndOfBattle:
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
About time I got to these functions
2015-10-24 07:34:19 -07:00
jr z, .not_linked
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
call ShowLinkBattleParticipantsAfterEnd
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld c, 150
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
DetermineMobileBattleResult -> DisplayLinkBattleResult Changed this function's name, because it confusingly only calls DetermineLinkBattleResult when linked through mobile. It does absolutely nothing with determining the battle result in a regular link battle, and is only responsible for displaying the battle result and counting stats.
2017-11-19 02:54:34 -08:00
call DisplayLinkBattleResult
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
About time I got to these functions
2015-10-24 07:34:19 -07:00
.not_linked
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $f
ret nz
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
call CheckPayDay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Renaming sections, further dissolving main.asm
2015-11-28 12:13:40 -08:00
ld [wForceEvolution], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef EvolveAfterBattle
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall GivePokerusAndConvertBerries
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CleanUpBattleRAM:
Item effects, post-battle, and decoration flags
2015-12-29 13:44:37 -08:00
call BattleEnd_HandleRoamMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 13:45:34 -08:00
ld [wLowHealthAlarm], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld [wBattleMode], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wBattleType], a
ld [wAttackMissed], a
ld [wTempWildMonSpecies], a
ld [wOtherTrainerClass], a
link and seer labels
2015-11-23 13:04:53 -08:00
ld [wFailedToFlee], a
ld [wNumFleeAttempts], a
Attempting to decode AI switching
2015-11-08 16:09:36 -08:00
ld [wForcedSwitch], a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wPartyMenuCursor], a
Address comments on PR 322
2015-10-24 16:49:19 -07:00
ld [wKeyItemsPocketCursor], a
ld [wItemsPocketCursor], a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 13:29:30 -08:00
ld [wBattleMenuCursorPosition], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCurMoveNum], a
Address comments on PR 322
2015-10-24 16:49:19 -07:00
ld [wBallsPocketCursor], a
link and seer labels
2015-11-23 13:04:53 -08:00
ld [wLastPocket], a
ld [wMenuScrollPosition], a
ld [wKeyItemsPocketScrollPosition], a
ld [wItemsPocketScrollPosition], a
ld [wBallsPocketScrollPosition], a
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wPlayerSubStatus1
ld b, wEnemyFuryCutterCount - wPlayerSubStatus1
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
dec b
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitSFX
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CheckPayDay:
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld hl, wPayDayCoins
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
inc hl
or [hl]
ret z
trade animation
2015-11-22 21:21:21 -08:00
ld a, [wAmuletCoin]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
jr z, .okay
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld hl, wPayDayCoins + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla [hl]
dec hl
rl [hl]
dec hl
rl [hl]
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
jr nc, .okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $ff
ld [hli], a
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
ld [hli], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
.okay
Rename the concept of Money to Coins (#7)
2023-09-02 14:16:35 -07:00
ld hl, wPayDayCoins + 2
ld de, wCoins + 2
call AddBattleCoinsToAccount
ld hl, BattleText_PlayerPickedUpPayDayCoins
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ShowLinkBattleParticipantsAfterEnd:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wCurOTMon]
ld hl, wOTPartyMon1Status
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonStatus]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call ClearTilemap
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall _ShowLinkBattleParticipants
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
DisplayLinkBattleResult:
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $f
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
cp LOSE
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
jr c, .win ; WIN
jr z, .lose ; LOSE
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
; DRAW
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Draw
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
jr .store_result
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
.win
ld de, .YouWin
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
jr .store_result
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
.lose
ld de, .YouLose
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
jr .store_result
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
.store_result
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 6, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaceString
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
ld c, 200
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
soft reset
2015-10-04 11:14:51 -07:00
ld a, BANK(sLinkBattleStats)
Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM) To do: engine/{menus, overworld}
2020-06-17 14:03:38 -07:00
call OpenSRAM
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
call AddLastLinkBattleToLinkRecord
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call ReadAndPrintLinkBattleRecord
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CloseSRAM
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
call WaitPressAorB_BlinkCursor
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call ClearTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
.YouWin:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "YOU WIN@"
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
.YouLose:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "YOU LOSE@"
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Draw:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db " DRAW@"
Remove all address comments
2018-06-24 07:09:41 -07:00
_DisplayLinkRecord:
Add labels for link battle scores.
2015-08-19 21:21:38 -07:00
ld a, BANK(sLinkBattleStats)
Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM) To do: engine/{menus, overworld}
2020-06-17 14:03:38 -07:00
call OpenSRAM
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call ReadAndPrintLinkBattleRecord
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CloseSRAM
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
hlcoord 0, 0, wAttrmap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Various annotations Annotated the SGB functions in predef/sgb.asm, and some of the map scripts. Renamed several functions in home. Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 12:57:02 -07:00
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ByteFill
Card Flip
2015-12-11 13:59:40 -08:00
call WaitBGMap2
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
ld b, CGB_DIPLOMA
call GetCGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld c, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
Added w3 and w5 labels for misc/mobile_40.asm
2015-11-10 20:23:28 -08:00
call WaitPressAorB_BlinkCursor
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
ReadAndPrintLinkBattleRecord:
Standardize on lowercase Tilemap and Attrmap We used to have a mixture of TileMap and and Tilemap, as well as the similar AttrMap. Standardize on one.
2020-02-13 09:30:13 -08:00
call ClearTilemap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .PrintBattleRecord
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 0, 8
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld b, NUM_LINK_BATTLE_RECORDS
Identify some more labels (a few link-related)
2020-10-21 21:53:54 -07:00
ld de, sLinkBattleRecord1Name
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
push de
ld a, [de]
and a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr z, .PrintFormatString
Split up bank 2; other relabelings
2015-10-16 10:35:43 -07:00
ld a, [wSavedAtLeastOnce]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr z, .PrintFormatString
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push hl
ld h, d
ld l, e
Identify some more labels (a few link-related)
2020-10-21 21:53:54 -07:00
ld de, wLinkBattleRecordName
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, NAME_LENGTH - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld a, "@"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
Identify some more labels (a few link-related)
2020-10-21 21:53:54 -07:00
inc de ; wLinkBattleRecordWins
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld bc, 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Identify some more labels (a few link-related)
2020-10-21 21:53:54 -07:00
ld de, wLinkBattleRecordName
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
call PlaceString
pop hl
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld de, 26
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
push hl
Identify some more labels (a few link-related)
2020-10-21 21:53:54 -07:00
ld de, wLinkBattleRecordWins
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
pop hl
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld de, 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
push hl
Identify some more labels (a few link-related)
2020-10-21 21:53:54 -07:00
ld de, wLinkBattleRecordLosses
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
pop hl
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld de, 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
Identify some more labels (a few link-related)
2020-10-21 21:53:54 -07:00
ld de, wLinkBattleRecordDraws
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr .next
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PrintFormatString:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Format
call PlaceString
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.next
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld d, h
ld e, l
pop hl
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld bc, 2 * SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
pop bc
dec b
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PrintBattleRecord:
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Record
call PlaceString
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 0, 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Result
call PlaceString
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 0, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Total
call PlaceString
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 6, 4
Add labels for link battle scores.
2015-08-19 21:21:38 -07:00
ld de, sLinkBattleWins
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .PrintZerosIfNoSaveFileExists
jr c, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 11, 4
Add labels for link battle scores.
2015-08-19 21:21:38 -07:00
ld de, sLinkBattleLosses
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .PrintZerosIfNoSaveFileExists
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 16, 4
Add labels for link battle scores.
2015-08-19 21:21:38 -07:00
ld de, sLinkBattleDraws
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .PrintZerosIfNoSaveFileExists
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PrintZerosIfNoSaveFileExists:
Split up bank 2; other relabelings
2015-10-16 10:35:43 -07:00
ld a, [wSavedAtLeastOnce]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
ld de, .Scores
call PlaceString
scf
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Scores:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db " 0 0 0@"
Remove all address comments
2018-06-24 07:09:41 -07:00
.Format:
Fix misnamed character codes Some character codes were erroneously named after their text command counterparts. This has caused a lot of confusion with naming their functions and with other things. I've also removed the `dict2` macro and expanded the `dict` macro. This really isn't something we should be doing for macros but I can't deny it looks a lot neater than repeated code.
2018-07-17 14:08:04 -07:00
db " --- <LF>"
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
db " - - -@"
Remove all address comments
2018-06-24 07:09:41 -07:00
.Record:
Split up bank 2; other relabelings
2015-10-16 10:35:43 -07:00
db "<PLAYER>'s RECORD@"
Remove all address comments
2018-06-24 07:09:41 -07:00
.Result:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "RESULT WIN LOSE DRAW@"
Remove all address comments
2018-06-24 07:09:41 -07:00
.Total:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "TOTAL WIN LOSE DRAW@"
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleEnd_HandleRoamMons:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp BATTLETYPE_ROAMING
Item effects, post-battle, and decoration flags
2015-12-29 13:44:37 -08:00
jr nz, .not_roaming
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $f
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
jr z, .caught_or_defeated_roam_mon ; WIN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetRoamMonHP
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wEnemyMonHP + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Item effects, post-battle, and decoration flags
2015-12-29 13:44:37 -08:00
jr .update_roam_mons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Item effects, post-battle, and decoration flags
2015-12-29 13:44:37 -08:00
.caught_or_defeated_roam_mon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetRoamMonHP
Meaningful $ff values
2018-02-25 16:50:48 -08:00
ld [hl], 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetRoamMonMapGroup
Meaningful $ff values
2018-02-25 16:50:48 -08:00
ld [hl], GROUP_N_A
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetRoamMonMapNumber
Meaningful $ff values
2018-02-25 16:50:48 -08:00
ld [hl], MAP_N_A
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetRoamMonSpecies
Meaningful $ff values
2018-02-25 16:50:48 -08:00
ld [hl], 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Item effects, post-battle, and decoration flags
2015-12-29 13:44:37 -08:00
.not_roaming
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
and $f
ret nz
Item effects, post-battle, and decoration flags
2015-12-29 13:44:37 -08:00
.update_roam_mons
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
callfar UpdateRoamMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetRoamMonMapGroup:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon1Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1MapGroup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon2Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2MapGroup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3MapGroup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetRoamMonMapNumber:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon1Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1MapNumber
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon2Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2MapNumber
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3MapNumber
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetRoamMonHP:
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
; output: hl = wRoamMonHP
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon1Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon2Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetRoamMonDVs:
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
; output: hl = wRoamMonDVs
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon1Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1DVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon2Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2DVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3DVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetRoamMonSpecies:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wTempEnemyMonSpecies]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
AddLastLinkBattleToLinkRecord:
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPlayerID
ld de, wStringBuffer1
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
ld bc, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wOTPlayerName
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld bc, NAME_LENGTH - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld hl, sLinkBattleStats - (LINK_BATTLE_RECORD_LENGTH - 6)
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .StoreResult
ld hl, sLinkBattleRecord
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld d, NUM_LINK_BATTLE_RECORDS
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
inc hl
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
inc hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
dec hl
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
dec hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
jr z, .copy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH - 6
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld de, wStringBuffer1
StringCmp → CompareBytes; CompareLong → CompareBytesLong hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
2018-07-22 21:25:53 -07:00
call CompareBytesLong
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
pop hl
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
jr c, .done
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
dec d
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
jr nz, .loop
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, -LINK_BATTLE_RECORD_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
push hl
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
.copy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, h
ld e, l
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld hl, wStringBuffer1
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH - 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
ld b, 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
.loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
inc de
dec b
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
jr nz, .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
.done
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .StoreResult
call .FindOpponentAndAppendRecord
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
Remove all address comments
2018-06-24 07:09:41 -07:00
.StoreResult:
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $f
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
cp LOSE
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, (sLinkBattleRecord1Wins - sLinkBattleRecord1) + 1
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
jr c, .okay ; WIN
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, (sLinkBattleRecord1Losses - sLinkBattleRecord1) + 1
Use constants for bit/set/res more
2018-04-05 08:44:02 -07:00
jr z, .okay ; LOSE
; DRAW
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, (sLinkBattleRecord1Draws - sLinkBattleRecord1) + 1
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
.okay
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .CheckOverflow
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
inc [hl]
ret nz
dec hl
inc [hl]
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.CheckOverflow:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec hl
ld a, [hl]
inc hl
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
cp HIGH(MAX_LINK_RECORD)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
ld a, [hl]
Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff`
2017-12-25 10:40:10 -08:00
cp LOW(MAX_LINK_RECORD)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.FindOpponentAndAppendRecord:
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld b, NUM_LINK_BATTLE_RECORDS
ld hl, sLinkBattleRecord1End - 1
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld de, wLinkBattleRecordBuffer
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push de
push hl
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .LoadPointer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
ld a, e
pop de
ld [de], a
inc de
ld a, b
ld [de], a
inc de
ld a, c
ld [de], a
inc de
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
pop bc
dec b
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nz, .loop3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $0
ld c, $1
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.loop4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
add b
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
add b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, a
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld d, 0
ld hl, wLinkBattleRecordBuffer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
push hl
ld a, c
add c
jumptable macro repurposed
2015-12-26 18:59:03 -08:00
add c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, a
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld d, 0
ld hl, wLinkBattleRecordBuffer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
ld d, h
ld e, l
pop hl
push bc
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld c, 3
StringCmp → CompareBytes; CompareLong → CompareBytesLong hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
2018-07-22 21:25:53 -07:00
call CompareBytes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
jr z, .equal
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nc, .done2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
.equal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc c
ld a, c
cp $5
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nz, .loop4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc b
ld c, b
inc c
ld a, b
cp $4
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nz, .loop4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.done2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld a, b
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld hl, sLinkBattleRecord
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
push hl
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld de, wLinkBattleRecordBuffer
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
pop hl
pop bc
push hl
ld a, c
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
ld hl, sLinkBattleRecord
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
pop de
push hl
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Identify the remaining (non-mobile) uses of another WRAM union
2020-10-29 11:45:40 -07:00
ld hl, wLinkBattleRecordBuffer
Miscellaneous updates and corrections
2020-04-23 13:10:46 -07:00
ld bc, LINK_BATTLE_RECORD_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
call CopyBytes
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.LoadPointer:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, $0
ld a, [hld]
ld c, a
ld a, [hld]
ld b, a
ld a, [hld]
add c
ld c, a
ld a, [hld]
adc b
ld b, a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
jr nc, .okay2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc e
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
.okay2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
add c
ld c, a
ld a, [hl]
adc b
ld b, a
ret nc
inc e
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
InitBattleDisplay:
found the sliding animation at the start of battle
2015-11-10 17:18:49 -08:00
call .InitBackPic
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 0, 12
Sprite movement function labels
2015-11-06 13:42:38 -08:00
ld b, 4
ld c, 18
Use overworld textbox in text printing functions, differentiating between 1bpp and 2bpp text (#10)
2023-08-11 03:28:14 -07:00
call Textbox1bpp
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 5
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 06:38:48 -08:00
lb bc, 3, 7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
home/copy.asm completely labeled
2015-11-04 13:14:27 -08:00
call LoadStandardFont
No more DefaultFlypoint
2015-11-10 16:51:13 -08:00
call _LoadBattleFontsHPBar
found the sliding animation at the start of battle
2015-11-10 17:18:49 -08:00
call .BlankBGMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hMapAnims], a
ldh [hSCY], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $90
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hWY], a
ldh [rWY], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall BattleIntroSlidingPics
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBGMapMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $31
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hGraphicStartTile], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 6
Sprite movement function labels
2015-11-06 13:42:38 -08:00
lb bc, 6, 6
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PlaceGraphic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hWY], a
Improved Virtual Console patch identifiers (#907)
2022-06-06 14:22:48 -07:00
vc_hook Unknown_InitBattleDisplay
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rWY], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
call HideSprites
Further remove unnecessary DMG/SGB checking (#7) and remove SGB layouts and palette data (#1)
2023-07-26 08:01:20 -07:00
ld b, CGB_BATTLE_COLORS
call GetCGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $90
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hWY], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hSCX], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.BlankBGMap:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [rSVBK]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
2018-01-03 16:12:45 -08:00
ld a, BANK(wDecompressScratch)
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rSVBK], a
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld hl, wDecompressScratch
Comment, remove, or revise many unreferenced labels
2020-10-26 12:45:57 -07:00
ld bc, BG_MAP_WIDTH * BG_MAP_HEIGHT
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
ld a, " "
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ByteFill
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 11:48:30 -08:00
ld de, wDecompressScratch
bgcoord
2015-11-20 08:47:52 -08:00
hlbgcoord 0, 0
Comment, remove, or revise many unreferenced labels
2020-10-26 12:45:57 -07:00
lb bc, BANK(@), (BG_MAP_WIDTH * BG_MAP_HEIGHT) / LEN_2BPP_TILE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Request2bpp
Resolve s1 addresses in battle/core.asm
2015-11-10 15:17:04 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rSVBK], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.InitBackPic:
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call GetTrainerBackpic
call CopyBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
GetTrainerBackpic:
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
; Load the player character's backpic (6x6) into VRAM starting from vTiles2 tile $31.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Special exception for Dude.
ld b, BANK(DudeBackpic)
ld hl, DudeBackpic
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp BATTLETYPE_TUTORIAL
jr z, .Decompress
; What gender are we?
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wPlayerSpriteSetupFlags]
More engine flag constants
2018-01-22 11:34:55 -08:00
bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .Chris
Prefix engine_flags wram addresses with w
2017-12-28 04:15:46 -08:00
ld a, [wPlayerGender]
More engine flag constants
2018-01-22 11:34:55 -08:00
bit PLAYERGENDER_FEMALE_F, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .Chris
; It's a girl.
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall GetKrisBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Chris:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; It's a boy.
ld b, BANK(ChrisBackpic)
ld hl, ChrisBackpic
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.Decompress:
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld de, vTiles2 tile $31
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
ld c, 7 * 7
predef DecompressGet2bpp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
CopyBackpic:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [rSVBK]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
2018-01-03 16:12:45 -08:00
ld a, BANK(wDecompressScratch)
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rSVBK], a
Lowercase v for VRAM addresses
2017-12-28 04:32:33 -08:00
ld hl, vTiles0
ld de, vTiles2 tile $31
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh a, [hROMBank]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 16:32:36 -07:00
ld c, 7 * 7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Get2bpp
pop af
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [rSVBK], a
Finish function labels in battle core
2016-01-12 21:39:41 -08:00
call .LoadTrainerBackpicAsOAM
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $31
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hGraphicStartTile], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 6
Sprite movement function labels
2015-11-06 13:42:38 -08:00
lb bc, 6, 6
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef PlaceGraphic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
.LoadTrainerBackpicAsOAM:
wVirtualOAM -> wShadowOAM and hTransferVirtualOAM -> hTransferShadowOAM (#971)
2022-07-09 14:18:22 -07:00
ld hl, wShadowOAMSprite00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Remove "Buffer" suffix from two HRAM labels
2020-12-23 13:54:28 -08:00
ldh [hMapObjectIndex], a
Resolve #461
2018-01-10 10:47:57 -08:00
ld b, 6
ld e, (SCREEN_WIDTH + 1) * TILE_WIDTH
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.outer_loop
Resolve #461
2018-01-10 10:47:57 -08:00
ld c, 3
ld d, 8 * TILE_WIDTH
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.inner_loop
Resolve #461
2018-01-10 10:47:57 -08:00
ld [hl], d ; y
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Resolve #461
2018-01-10 10:47:57 -08:00
ld [hl], e ; x
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Remove "Buffer" suffix from two HRAM labels
2020-12-23 13:54:28 -08:00
ldh a, [hMapObjectIndex]
Resolve #461
2018-01-10 10:47:57 -08:00
ld [hli], a ; tile id
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Remove "Buffer" suffix from two HRAM labels
2020-12-23 13:54:28 -08:00
ldh [hMapObjectIndex], a
Resolve #461
2018-01-10 10:47:57 -08:00
ld a, PAL_BATTLE_OB_PLAYER
ld [hli], a ; attributes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
Resolve #461
2018-01-10 10:47:57 -08:00
add 1 * TILE_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
dec c
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr nz, .inner_loop
Remove "Buffer" suffix from two HRAM labels
2020-12-23 13:54:28 -08:00
ldh a, [hMapObjectIndex]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add $3
Remove "Buffer" suffix from two HRAM labels
2020-12-23 13:54:28 -08:00
ldh [hMapObjectIndex], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, e
Resolve #461
2018-01-10 10:47:57 -08:00
add 1 * TILE_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, a
dec b
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr nz, .outer_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Remove all address comments
2018-06-24 07:09:41 -07:00
BattleStartMessage:
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr z, .wild
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_SHINE
call PlaySFX
call WaitSFX
ld c, 20
call DelayFrames
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall Battle_GetTrainerName
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, WantsToBattleText
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr .PlaceBattleStartText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.wild
call BattleCheckEnemyShininess
jr nc, .not_shiny
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Battle Anim Object struct constants
2015-12-23 11:00:29 -08:00
ld [wNumHits], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, 1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 11:28:22 -07:00
ldh [hBattleTurn], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, 1
More battle anims and bg effects
2015-12-23 17:46:23 -08:00
ld [wBattleAnimParam], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.not_shiny
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall CheckSleepingTreeMon
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr c, .skip_cry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall CheckBattleScene
Pokemon animations
2015-11-07 06:48:32 -08:00
jr c, .cry_no_anim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 12, 0
ld d, $0
Pokemon animations
2015-11-07 06:48:32 -08:00
ld e, ANIM_MON_NORMAL
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 11:30:10 -08:00
predef AnimateFrontpic
Pack
2015-12-13 11:15:16 -08:00
jr .skip_cry ; cry is played during the animation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Pokemon animations
2015-11-07 06:48:32 -08:00
.cry_no_anim
ANIM_MON_UNUSED → ANIM_MON_HOF
2018-07-22 20:42:50 -07:00
ld a, $f
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld [wCryTracks], a
ld a, [wTempEnemyMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.skip_cry
Prefix wram labels with w, part 2.
2018-01-23 14:39:09 -08:00
ld a, [wBattleType]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp BATTLETYPE_FISH
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr nz, .NotFishing
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, HookedPokemonAttackedText
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr .PlaceBattleStartText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.NotFishing:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, PokemonFellFromTreeText
cp BATTLETYPE_TREE
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr z, .PlaceBattleStartText
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld hl, WildCelebiAppearedText
cp BATTLETYPE_CELEBI
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr z, .PlaceBattleStartText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, WildPokemonAppearedText
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 11:42:14 -07:00
.PlaceBattleStartText:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
callba/callab → farcall/callfar
2017-12-24 09:47:30 -08:00
farcall BattleStart_TrainerHuds
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
TextBox -> Textbox Homogenizing names.
2019-04-08 05:15:10 -07:00
call StdBattleTextbox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Reference in New Issue Copy Permalink