Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pokecrystal/engine/battle/effect_commands.asm

6780 lines
104 KiB
NASM
Raw Normal View History

Remove all address comments
2018-06-24 14:09:41 +00:00
DoPlayerTurn:
Move effect commands dump
2013-03-27 00:39:44 +00:00
call SetPlayerTurn
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 21:45:34 +00:00
ld a, [wBattlePlayerAction]
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 23:27:34 +00:00
and a ; BATTLEPLAYERACTION_USEMOVE?
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
jr DoTurn
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
DoEnemyTurn:
Move effect commands dump
2013-03-27 00:39:44 +00:00
call SetEnemyTurn
Move battle start animation functions to its own file
2015-10-19 14:23:58 +00:00
ld a, [wLinkMode]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, DoTurn
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-14 04:18:14 +00:00
ld a, [wBattleAction]
Identify BATTLEACTION_D and _E (thanks, ax6)
2018-10-21 04:52:10 +00:00
cp BATTLEACTION_STRUGGLE
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, DoTurn
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
cp BATTLEACTION_SWITCH1
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nc
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
DoTurn:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Read in and execute the user's move effects for this turn.
xor a
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld [wTurnEnded], a
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; Effect command checkturn is called for every move.
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CheckTurn
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld a, [wTurnEnded]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret nz
call UpdateMoveData
Remove all address comments
2018-06-24 14:09:41 +00:00
DoMove:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Get the user's move effect.
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, a
ld b, 0
ld hl, MoveEffectsPointers
add hl, bc
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
add hl, bc
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BANK(MoveEffectsPointers)
Rename GetFarHalfword to GetFarWord Fixes #796
2021-01-09 20:16:05 +00:00
call GetFarWord
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld de, wBattleScriptBuffer
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.GetMoveEffect:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BANK(MoveEffects)
call GetFarByte
inc hl
ld [de], a
inc de
Miscellaneous fixes in the use of _command constants.
2018-06-01 07:04:36 +00:00
cp endmove_command
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr nz, .GetMoveEffect
; Start at the first command.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleScriptBuffer
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, l
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wBattleScriptBufferAddress], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, h
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wBattleScriptBufferAddress + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.ReadMoveEffectCommand:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
; ld a, [wBattleScriptBufferAddress++]
ld a, [wBattleScriptBufferAddress]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld l, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBattleScriptBufferAddress + 1]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld h, a
ld a, [hli]
push af
ld a, l
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wBattleScriptBufferAddress], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, h
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wBattleScriptBufferAddress + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop af
Enumerate the move effect command macros.
2015-04-14 04:39:54 +00:00
; endturn_command (-2) is used to terminate branches without ending the read cycle.
cp endturn_command
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nc
; The rest of the commands (01-af) are read from BattleCommandPointers.
push bc
dec a
ld c, a
ld b, 0
ld hl, BattleCommandPointers
add hl, bc
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
add hl, bc
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop bc
ld a, BANK(BattleCommandPointers)
Rename GetFarHalfword to GetFarWord Fixes #796
2021-01-09 20:16:05 +00:00
call GetFarWord
Move effect commands dump
2013-03-27 00:39:44 +00:00
call .DoMoveEffectCommand
jr .ReadMoveEffectCommand
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 18:42:14 +00:00
.DoMoveEffectCommand:
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 21:01:10 +00:00
jp hl
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
CheckTurn:
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_CheckTurn:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Repurposed as hardcoded turn handling. Useless as a command.
; Move $ff immediately ends the turn.
ld a, BATTLE_VARS_MOVE
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc a
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp z, EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wAttackMissed], a
ld [wEffectFailed], a
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wAlreadyDisobeyed], a
ld [wAlreadyFailed], a
Split base stats
2016-01-09 21:28:22 +00:00
ld [wSomeoneIsRampaging], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
ld a, EFFECTIVE
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wTypeModifier], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jp nz, CheckEnemyTurn
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
; check player turn
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00: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-14 04:18:14 +00:00
bit SUBSTATUS_RECHARGE, [hl]
jr z, .no_recharge
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
res SUBSTATUS_RECHARGE, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, MustRechargeText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.no_recharge
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonStatus
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
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-14 04:18:14 +00:00
jr z, .not_asleep
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wBattleMonStatus], a
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
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-14 04:18:14 +00:00
jr z, .woke_up
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
battle animation constants
2013-12-19 09:47:39 +00:00
ld de, ANIM_SLP
Move effect commands dump
2013-03-27 00:39:44 +00:00
call FarPlayBattleAnimation
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-14 04:18:14 +00:00
jr .fast_asleep
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.woke_up
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, WokeUpText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
bank 0 battle functions
2013-05-03 04:22:28 +00:00
call UpdateBattleMonInParty
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
ld hl, UpdatePlayerHUD
rename CallBankF -> CallBattleCore
2013-12-31 08:25:38 +00:00
call CallBattleCore
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hBGMapMode], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerSubStatus1
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-14 04:18:14 +00:00
res SUBSTATUS_NIGHTMARE, [hl]
jr .not_asleep
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.fast_asleep
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, FastAsleepText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; Snore and Sleep Talk bypass sleep.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurPlayerMove]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp SNORE
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-14 04:18:14 +00:00
jr z, .not_asleep
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp SLEEP_TALK
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-14 04:18:14 +00:00
jr z, .not_asleep
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_asleep
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonStatus
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-14 04:18:14 +00:00
bit FRZ, [hl]
jr z, .not_frozen
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; Flame Wheel and Sacred Fire thaw the user.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurPlayerMove]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp FLAME_WHEEL
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-14 04:18:14 +00:00
jr z, .not_frozen
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp SACRED_FIRE
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-14 04:18:14 +00:00
jr z, .not_frozen
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, FrozenSolidText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_frozen
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00: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-14 04:18:14 +00:00
bit SUBSTATUS_FLINCHED, [hl]
jr z, .not_flinched
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
res SUBSTATUS_FLINCHED, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, FlinchedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_flinched
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerDisableCount
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
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-14 04:18:14 +00:00
jr z, .not_disabled
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec a
ld [hl], a
and $f
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-14 04:18:14 +00:00
jr nz, .not_disabled
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wDisabledMove], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, DisabledNoMoreText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_disabled
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerSubStatus3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
add 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-14 04:18:14 +00:00
jr nc, .not_confused
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerConfuseCount
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
jr nz, .confused
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00: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-14 04:18:14 +00:00
res SUBSTATUS_CONFUSED, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, ConfusedNoMoreText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
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-14 04:18:14 +00:00
jr .not_confused
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.confused
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, IsConfusedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld de, ANIM_CONFUSED
call FarPlayBattleAnimation
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-14 04:18:14 +00:00
; 50% chance of hitting itself
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp 50 percent + 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-14 04:18:14 +00:00
jr nc, .not_confused
Move effect commands dump
2013-03-27 00:39:44 +00:00
Fix typos in comments.
2015-09-09 21:05:19 +00:00
; clear confusion-dependent substatus
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerSubStatus3
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [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-14 04:18:14 +00:00
and 1 << SUBSTATUS_CONFUSED
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
call HitConfusion
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_confused
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerSubStatus1]
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-14 04:18:14 +00:00
add a ; bit SUBSTATUS_ATTRACT
jr nc, .not_infatuated
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, InLoveWithText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
battle animation constants
2013-12-19 09:47:39 +00:00
ld de, ANIM_IN_LOVE
Move effect commands dump
2013-03-27 00:39:44 +00:00
call FarPlayBattleAnimation
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-14 04:18:14 +00:00
; 50% chance of infatuation
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp 50 percent + 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-14 04:18:14 +00:00
jr c, .not_infatuated
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, InfatuationText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_infatuated
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; We can't disable a move that doesn't exist.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wDisabledMove]
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
jr z, .no_disabled_move
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; Are we using the disabled move?
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurPlayerMove
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp [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-14 04:18:14 +00:00
jr nz, .no_disabled_move
Move effect commands dump
2013-03-27 00:39:44 +00:00
call MoveDisabled
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.no_disabled_move
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonStatus
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-14 04:18:14 +00:00
bit PAR, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; 25% chance to be fully paralyzed
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp 25 percent
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nc
ld hl, FullyParalyzedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CantMove:
Move effect commands dump
2013-03-27 00:39:44 +00: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 07:34:57 +00:00
call GetBattleVarAddr
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 19:52:32 +00:00
res SUBSTATUS_ROLLOUT, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00: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 07:34:57 +00:00
call GetBattleVarAddr
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
Use ~X instead of $ff ^ X
2021-11-24 01:37:18 +00:00
and ~(1 << SUBSTATUS_BIDE | 1 << SUBSTATUS_RAMPAGE | 1 << SUBSTATUS_CHARGED)
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
call ResetFuryCutterCount
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp FLY
Still more battle command labels
2015-11-07 03:36:06 +00:00
jr z, .fly_dig
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
cp DIG
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Still more battle command labels
2015-11-07 03:36:06 +00:00
.fly_dig
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-14 04:18:14 +00:00
res SUBSTATUS_UNDERGROUND, [hl]
res SUBSTATUS_FLYING, [hl]
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp AppearUserRaiseSub
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
OpponentCantMove:
changed name of some labels
2015-10-10 11:45:39 +00:00
call BattleCommand_SwitchTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
changed name of some labels
2015-10-10 11:45:39 +00:00
jp BattleCommand_SwitchTurn
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckEnemyTurn:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemySubStatus4
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-14 04:18:14 +00:00
bit SUBSTATUS_RECHARGE, [hl]
jr z, .no_recharge
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
res SUBSTATUS_RECHARGE, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, MustRechargeText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.no_recharge
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonStatus
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
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-14 04:18:14 +00:00
jr z, .not_asleep
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wEnemyMonStatus], a
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
jr z, .woke_up
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, FastAsleepText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
battle animation constants
2013-12-19 09:47:39 +00:00
ld de, ANIM_SLP
Move effect commands dump
2013-03-27 00:39:44 +00:00
call FarPlayBattleAnimation
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-14 04:18:14 +00:00
jr .fast_asleep
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.woke_up
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, WokeUpText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
bank 0 battle functions
2013-05-03 04:22:28 +00:00
call UpdateEnemyMonInParty
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
ld hl, UpdateEnemyHUD
rename CallBankF -> CallBattleCore
2013-12-31 08:25:38 +00:00
call CallBattleCore
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hBGMapMode], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemySubStatus1
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-14 04:18:14 +00:00
res SUBSTATUS_NIGHTMARE, [hl]
jr .not_asleep
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.fast_asleep
; Snore and Sleep Talk bypass sleep.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurEnemyMove]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp SNORE
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-14 04:18:14 +00:00
jr z, .not_asleep
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp SLEEP_TALK
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-14 04:18:14 +00:00
jr z, .not_asleep
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_asleep
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonStatus
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-14 04:18:14 +00:00
bit FRZ, [hl]
jr z, .not_frozen
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
; Flame Wheel and Sacred Fire thaw the user.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurEnemyMove]
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-14 04:18:14 +00:00
cp FLAME_WHEEL
jr z, .not_frozen
cp SACRED_FIRE
jr z, .not_frozen
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, FrozenSolidText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_frozen
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00: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-14 04:18:14 +00:00
bit SUBSTATUS_FLINCHED, [hl]
jr z, .not_flinched
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
res SUBSTATUS_FLINCHED, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, FlinchedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_flinched
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyDisableCount
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
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-14 04:18:14 +00:00
jr z, .not_disabled
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec a
ld [hl], a
and $f
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-14 04:18:14 +00:00
jr nz, .not_disabled
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wEnemyDisabledMove], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, DisabledNoMoreText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_disabled
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [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-14 04:18:14 +00:00
add a ; bit SUBSTATUS_CONFUSED
jr nc, .not_confused
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyConfuseCount
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
jr nz, .confused
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00: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-14 04:18:14 +00:00
res SUBSTATUS_CONFUSED, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, ConfusedNoMoreText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
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-14 04:18:14 +00:00
jr .not_confused
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.confused
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, IsConfusedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld de, ANIM_CONFUSED
call FarPlayBattleAnimation
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-14 04:18:14 +00:00
; 50% chance of hitting itself
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Consistent "X percent [+/- Y]" order
2018-02-05 02:21:34 +00:00
cp 50 percent + 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-14 04:18:14 +00:00
jr nc, .not_confused
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; clear confusion-dependent substatus
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemySubStatus3
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [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-14 04:18:14 +00:00
and 1 << SUBSTATUS_CONFUSED
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
ld hl, HurtItselfText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
More consistent formatting
2019-03-04 00:55:28 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
call HitSelfInConfusion
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
call BattleCommand_DamageCalc
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_LowerSub
More consistent formatting
2019-03-04 00:55:28 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00: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-14 04:18:14 +00:00
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
Move effect commands dump
2013-03-27 00:39:44 +00:00
call z, PlayFXAnimID
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
ld c, TRUE
call DoEnemyDamage
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_RaiseSub
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_confused
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemySubStatus1]
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-14 04:18:14 +00:00
add a ; bit SUBSTATUS_ATTRACT
jr nc, .not_infatuated
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, InLoveWithText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
battle animation constants
2013-12-19 09:47:39 +00:00
ld de, ANIM_IN_LOVE
Move effect commands dump
2013-03-27 00:39:44 +00:00
call FarPlayBattleAnimation
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-14 04:18:14 +00:00
; 50% chance of infatuation
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Consistent "X percent [+/- Y]" order
2018-02-05 02:21:34 +00:00
cp 50 percent + 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-14 04:18:14 +00:00
jr c, .not_infatuated
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, InfatuationText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.not_infatuated
; We can't disable a move that doesn't exist.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemyDisabledMove]
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
jr z, .no_disabled_move
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; Are we using the disabled move?
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurEnemyMove
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp [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-14 04:18:14 +00:00
jr nz, .no_disabled_move
Move effect commands dump
2013-03-27 00:39:44 +00:00
call MoveDisabled
call CantMove
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp EndTurn
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
.no_disabled_move
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonStatus
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-14 04:18:14 +00:00
bit PAR, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; 25% chance to be fully paralyzed
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp 25 percent
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nc
ld hl, FullyParalyzedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CantMove
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
EndTurn:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, $1
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld [wTurnEnded], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp ResetDamage
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
MoveDisabled:
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-14 04:18:14 +00:00
; Make sure any charged moves fail
Move effect commands dump
2013-03-27 00:39:44 +00: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 07:34:57 +00: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-14 04:18:14 +00:00
res SUBSTATUS_CHARGED, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 21:29:30 +00:00
ld [wNamedObjectIndex], a
more move effect cleanup
2013-05-03 06:43:44 +00:00
call GetMoveName
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, DisabledMoveText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
HitConfusion:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, HurtItselfText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCriticalHit], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
call HitSelfInConfusion
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
call BattleCommand_DamageCalc
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_LowerSub
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00: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-14 04:18:14 +00:00
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
Move effect commands dump
2013-03-27 00:39:44 +00:00
call z, PlayFXAnimID
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
ld hl, UpdatePlayerHUD
rename CallBankF -> CallBattleCore
2013-12-31 08:25:38 +00:00
call CallBattleCore
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hBGMapMode], a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
ld c, TRUE
call DoPlayerDamage
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jp BattleCommand_RaiseSub
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_CheckObedience:
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-14 04:18:14 +00:00
; Enemy can't disobey
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret nz
Some work on battle animations
2015-11-09 21:41:09 +00:00
call CheckUserIsCharging
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; If we've already checked this turn
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAlreadyDisobeyed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret nz
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wAlreadyDisobeyed], a
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; No obedience in link battles
; (since no handling exists for enemy)
Move battle start animation functions to its own file
2015-10-19 14:23:58 +00:00
ld a, [wLinkMode]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret nz
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wInBattleTowerBattle]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
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-14 04:18:14 +00:00
; If the monster's id doesn't match the player's,
; some conditions need to be met.
Replace party struct relative values with EQUS constants
2015-11-04 16:19:58 +00:00
ld a, MON_ID
Move effect commands dump
2013-03-27 00:39:44 +00:00
call BattlePartyAttr
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerID]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp [hl]
jr nz, .obeylevel
inc hl
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerID + 1]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp [hl]
ret z
.obeylevel
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-14 04:18:14 +00:00
; The maximum obedience level is constrained by owned badges:
Prefix engine_flags wram addresses with w
2017-12-28 12:15:46 +00:00
ld hl, wJohtoBadges
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
; risingbadge
more battle core labels
2015-11-08 02:04:54 +00:00
bit RISINGBADGE, [hl]
LOW(MAX_LEVEL + 1) would still fail for MAX_LEVEL = 255, so don't try supporting it here
2017-12-25 21:21:31 +00:00
ld a, MAX_LEVEL + 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr nz, .getlevel
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-14 04:18:14 +00:00
; stormbadge
more battle core labels
2015-11-08 02:04:54 +00:00
bit STORMBADGE, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 70
jr nz, .getlevel
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-14 04:18:14 +00:00
; fogbadge
more battle core labels
2015-11-08 02:04:54 +00:00
bit FOGBADGE, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 50
jr nz, .getlevel
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-14 04:18:14 +00:00
; hivebadge
more battle core labels
2015-11-08 02:04:54 +00:00
bit HIVEBADGE, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 30
jr nz, .getlevel
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-14 04:18:14 +00:00
; no badges
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 10
.getlevel
; c = obedience level
; d = monster level
; b = c + d
ld b, a
ld c, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBattleMonLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld d, a
add b
ld b, a
; No overflow (this should never happen)
jr nc, .checklevel
ld b, $ff
.checklevel
; If the monster's level is lower than the obedience level, it will obey.
ld a, c
cp d
ret nc
; Random number from 0 to obedience level + monster level
.rand1
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
swap a
cp b
jr nc, .rand1
; The higher above the obedience level the monster is,
; the more likely it is to disobey.
cp c
ret c
; Sleep-only moves have separate handling, and a higher chance of
; being ignored. Lazy monsters like their sleep.
call IgnoreSleepOnly
ret c
; Another random number from 0 to obedience level + monster level
.rand2
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
jr nc, .rand2
; A second chance.
cp c
jr c, .UseInstead
; No hope of using a move now.
; b = number of levels the monster is above the obedience level
ld a, d
sub c
ld b, a
; The chance of napping is the difference out of 256.
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
swap a
sub b
jr c, .Nap
; The chance of not hitting itself is the same.
cp b
jr nc, .DoNothing
ld hl, WontObeyText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call HitConfusion
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jp .EndDisobedience
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Nap:
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
add a
swap a
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .Nap
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wBattleMonStatus], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, BeganToNapText
jr .Print
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 18:42:14 +00:00
.DoNothing:
Use maskbits some more
2018-01-11 17:00:01 +00:00
; 4 random choices
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Use maskbits some more
2018-01-11 17:00:01 +00:00
and %11
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, LoafingAroundText
Use maskbits some more
2018-01-11 17:00:01 +00:00
and a ; 0
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .Print
ld hl, WontObeyText
Use maskbits some more
2018-01-11 17:00:01 +00:00
dec a ; 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .Print
ld hl, TurnedAwayText
Use maskbits some more
2018-01-11 17:00:01 +00:00
dec a ; 2
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .Print
ld hl, IgnoredOrdersText
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 18:42:14 +00:00
.Print:
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jp .EndDisobedience
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.UseInstead:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Can't use another move if the monster only has one!
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBattleMonMoves + 1]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .DoNothing
; Don't bother trying to handle Disable.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wDisabledMove]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr nz, .DoNothing
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonPP
ld de, wBattleMonMoves
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, 0
ld c, NUM_MOVES
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 18:42:14 +00:00
.GetTotalPP:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
Use maskbits some more
2018-01-11 17:00:01 +00:00
and PP_MASK
Move effect commands dump
2013-03-27 00:39:44 +00:00
add b
ld b, a
dec c
jr z, .CheckMovePP
; Stop at undefined moves.
inc de
ld a, [de]
and a
jr nz, .GetTotalPP
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 18:42:14 +00:00
.CheckMovePP:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonPP
ld a, [wCurMoveNum]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld e, a
ld d, 0
add hl, de
; Can't use another move if only one move has PP.
ld a, [hl]
Use maskbits some more
2018-01-11 17:00:01 +00:00
and PP_MASK
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
jr z, .DoNothing
; Make sure we can actually use the move once we get there.
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wAlreadyDisobeyed], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
More work on slots; WRAM cleanup, Move Deleter
2015-12-19 19:48:30 +00:00
ld a, [w2DMenuNumRows]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
; Save the move we originally picked for afterward.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurMoveNum]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, a
push af
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 18:42:14 +00:00
.RandomMove:
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Avoid "+- 1" at every maskbits
2018-01-16 22:27:50 +00:00
maskbits NUM_MOVES
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
jr nc, .RandomMove
; Not the move we were trying to use.
cp c
jr z, .RandomMove
; Make sure it has PP.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCurMoveNum], a
ld hl, wBattleMonPP
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld e, a
ld d, 0
add hl, de
ld a, [hl]
Use maskbits some more
2018-01-11 17:00:01 +00:00
and PP_MASK
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .RandomMove
; Use it.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurMoveNum]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, a
ld b, 0
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonMoves
Move effect commands dump
2013-03-27 00:39:44 +00:00
add hl, bc
ld a, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCurPlayerMove], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
call SetPlayerTurn
call UpdateMoveData
call DoMove
; Restore original move choice.
pop af
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCurMoveNum], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.EndDisobedience:
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wLastPlayerMove], a
ld [wLastPlayerCounterMove], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
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 19:52:32 +00:00
; Break Encore too.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00: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 19:52:32 +00:00
res SUBSTATUS_ENCORED, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wPlayerEncoreCount], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp EndMoveEffect
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
IgnoreSleepOnly:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
; Snore and Sleep Talk bypass sleep.
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp SNORE
jr z, .CheckSleep
cp SLEEP_TALK
jr z, .CheckSleep
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 18:42:14 +00:00
.CheckSleep:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_STATUS
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
; 'ignored orders…sleeping!'
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, IgnoredSleepingText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
call EndMoveEffect
scf
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_UsedMoveText:
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall DisplayUsedMoveText
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckUserIsCharging:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
more battle core labels
2015-11-08 02:04:54 +00:00
ld a, [wPlayerCharging] ; player
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .end
more battle core labels
2015-11-08 02:04:54 +00:00
ld a, [wEnemyCharging] ; enemy
Move effect commands dump
2013-03-27 00:39:44 +00:00
.end
and a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DoTurn:
Some work on battle animations
2015-11-09 21:41:09 +00:00
call CheckUserIsCharging
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonPP
ld de, wPlayerSubStatus3
ld bc, wPlayerTurnsTaken
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Labeling of AI item and wild encounter functions
2015-10-08 01:27:32 +00:00
jr z, .proceed
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonPP
ld de, wEnemySubStatus3
ld bc, wEnemyTurnsTaken
Move effect commands dump
2013-03-27 00:39:44 +00:00
Labeling of AI item and wild encounter functions
2015-10-08 01:27:32 +00:00
.proceed
Better trainer AI comments and finish off trainer attributes.
2014-08-14 02:44:56 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
; If we've gotten this far, this counts as a turn.
ld a, [bc]
inc a
ld [bc], a
ld a, BATTLE_VARS_MOVE
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp STRUGGLE
ret z
ld a, [de]
Better trainer AI comments and finish off trainer attributes.
2014-08-14 02:44:56 +00:00
and 1 << SUBSTATUS_IN_LOOP | 1 << SUBSTATUS_RAMPAGE | 1 << SUBSTATUS_BIDE
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
More battle command labels
2015-11-07 01:55:16 +00:00
call .consume_pp
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, b
and a
jp nz, EndMoveEffect
Better trainer AI comments and finish off trainer attributes.
2014-08-14 02:44:56 +00:00
; SubStatus5
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc de
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
inc de
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [de]
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-14 04:18:14 +00:00
bit SUBSTATUS_TRANSFORMED, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPartyMon1PP
ld a, [wCurBattleMon]
More battle command labels
2015-11-07 01:55:16 +00:00
jr z, .player
Move effect commands dump
2013-03-27 00:39:44 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
; mimic this part entirely if wildbattle
Move battle start animation functions to its own file
2015-10-19 14:23:58 +00:00
ld a, [wBattleMode]
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec a
More battle command labels
2015-11-07 01:55:16 +00:00
jr z, .wild
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wOTPartyMon1PP
ld a, [wCurOTMon]
Move effect commands dump
2013-03-27 00:39:44 +00:00
More battle command labels
2015-11-07 01:55:16 +00:00
.player
Move effect commands dump
2013-03-27 00:39:44 +00:00
call GetPartyLocation
push hl
Some work on battle animations
2015-11-09 21:41:09 +00:00
call CheckMimicUsed
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop hl
ret c
More battle command labels
2015-11-07 01:55:16 +00:00
.consume_pp
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurMoveNum]
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
jr z, .okay
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurEnemyMoveNum]
Move effect commands dump
2013-03-27 00:39:44 +00:00
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
.okay
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
ld b, 0
Move effect commands dump
2013-03-27 00:39:44 +00:00
add hl, bc
ld a, [hl]
Use maskbits some more
2018-01-11 17:00:01 +00:00
and PP_MASK
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .out_of_pp
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
ld b, 0
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
More battle command labels
2015-11-07 01:55:16 +00:00
.wild
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonMoves
ld a, [wCurEnemyMoveNum]
Move effect commands dump
2013-03-27 00:39:44 +00: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-14 04:18:14 +00:00
ld b, 0
Move effect commands dump
2013-03-27 00:39:44 +00:00
add hl, bc
ld a, [hl]
cp MIMIC
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
jr z, .mimic
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld hl, wWildMonMoves
Move effect commands dump
2013-03-27 00:39:44 +00:00
add hl, bc
ld a, [hl]
cp MIMIC
ret z
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
.mimic
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld hl, wWildMonPP
More battle command labels
2015-11-07 01:55:16 +00:00
call .consume_pp
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Some work on battle animations
2015-11-09 21:41:09 +00:00
.out_of_pp
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
call BattleCommand_MoveDelay
Move effect commands dump
2013-03-27 00:39:44 +00:00
; get move effect
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
; continuous?
ld hl, .continuousmoves
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ld de, 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
call IsInArray
; 'has no pp left for [move]'
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, HasNoPPLeftText
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr c, .print
; 'but no pp is left for the move'
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, NoPPLeftText
Move effect commands dump
2013-03-27 00:39:44 +00:00
.print
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
more effect constants
2013-04-27 21:12:23 +00:00
ld b, 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.continuousmoves
more effect constants
2013-04-27 21:12:23 +00:00
db EFFECT_RAZOR_WIND
db EFFECT_SKY_ATTACK
db EFFECT_SKULL_BASH
db EFFECT_SOLARBEAM
db EFFECT_FLY
db EFFECT_ROLLOUT
db EFFECT_BIDE
db EFFECT_RAMPAGE
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
db -1
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckMimicUsed:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurMoveNum]
More battle command labels
2015-11-07 01:55:16 +00:00
jr z, .player
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurEnemyMoveNum]
Move effect commands dump
2013-03-27 00:39:44 +00:00
More battle command labels
2015-11-07 01:55:16 +00:00
.player
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, a
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld a, MON_MOVES
more move effect cleanup
2013-05-03 06:43:44 +00:00
call UserPartyAttr
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp MIMIC
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .mimic
Adding 0 is pointless in CheckMimicUsed
2020-06-15 12:43:40 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, 0
add hl, bc
ld a, [hl]
cp MIMIC
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr nz, .mimic
Move effect commands dump
2013-03-27 00:39:44 +00:00
scf
ret
Some work on battle animations
2015-11-09 21:41:09 +00:00
.mimic
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Critical:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Determine whether this attack's hit will be critical.
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCriticalHit], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_POWER
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret z
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonItem
ld a, [wEnemyMonSpecies]
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr nz, .Item
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonItem
ld a, [wBattleMonSpecies]
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Item:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, 0
cp CHANSEY
jr nz, .Farfetchd
ld a, [hl]
cp LUCKY_PUNCH
jr nz, .FocusEnergy
; +2 critical level
ld c, 2
jr .Tally
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 18:42:14 +00:00
.Farfetchd:
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp FARFETCH_D
jr nz, .FocusEnergy
ld a, [hl]
cp STICK
jr nz, .FocusEnergy
; +2 critical level
ld c, 2
jr .Tally
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 18:42:14 +00:00
.FocusEnergy:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS4
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
bit SUBSTATUS_FOCUS_ENERGY, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .CheckCritical
; +1 critical level
inc 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 18:42:14 +00:00
.CheckCritical:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld de, 1
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
ld hl, CriticalHitMoves
Move effect commands dump
2013-03-27 00:39:44 +00:00
push bc
call IsInArray
pop bc
jr nc, .ScopeLens
; +2 critical level
inc c
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
inc c
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.ScopeLens:
Move effect commands dump
2013-03-27 00:39:44 +00:00
push bc
call GetUserItem
ld a, b
use constants for berserk gene, kings rock, scope lens effects
2014-01-20 05:07:51 +00:00
cp HELD_CRITICAL_UP ; Increased critical chance. Only Scope Lens has this.
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop bc
jr nz, .Tally
; +1 critical level
inc 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 18:42:14 +00:00
.Tally:
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
ld hl, CriticalHitChances
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, 0
add hl, bc
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp [hl]
ret nc
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCriticalHit], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Miscellaneous reorganization fixes
2018-07-04 06:42:11 +00:00
INCLUDE "data/moves/critical_hit_moves.asm"
INCLUDE "data/battle/critical_hit_chances.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/triple_kick.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Stab:
changed more labels
2015-09-09 23:27:07 +00:00
; STAB = Same Type Attack Bonus
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp STRUGGLE
ret z
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonType1
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonType1
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld d, a
ld e, [hl]
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
changed more labels
2015-09-09 23:27:07 +00:00
jr z, .go ; Who Attacks and who Defends
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonType1
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonType1
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld d, a
ld e, [hl]
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
.go
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_TYPE
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 07:34:57 +00:00
call GetBattleVarAddr
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 23:27:34 +00:00
ld [wCurType], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
push hl
push de
push bc
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall DoWeatherModifiers
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop bc
pop de
pop hl
push de
push bc
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall DoBadgeTypeBoosts
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop bc
pop de
Add meaningful aliases for wd265 Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-28 23:27:34 +00:00
ld a, [wCurType]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
jr z, .stab
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp c
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
jr z, .stab
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr .SkipStab
Move effect commands dump
2013-03-27 00:39:44 +00:00
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
.stab
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage + 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hld]
ld h, [hl]
ld l, a
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, h
ld c, l
srl b
rr c
add hl, bc
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, h
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCurDamage], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, l
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCurDamage + 1], a
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wTypeModifier
Move effect commands dump
2013-03-27 00:39:44 +00:00
set 7, [hl]
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00: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 18:42:14 +00:00
.SkipStab:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_TYPE
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Split battle/ into data/ and engine/ components
2017-12-26 22:47:05 +00:00
ld hl, TypeMatchups
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00: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 18:42:14 +00:00
.TypesLoop:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp -1
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
jr z, .end
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-14 04:18:14 +00:00
; foresight
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp -2
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr nz, .SkipForesightCheck
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS1_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00: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-14 04:18:14 +00:00
bit SUBSTATUS_IDENTIFIED, a
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
jr nz, .end
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr .TypesLoop
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00: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 18:42:14 +00:00
.SkipForesightCheck:
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr nz, .SkipType
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
cp d
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr z, .GotMatchup
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp e
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr z, .GotMatchup
jr .SkipType
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00: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 18:42:14 +00:00
.GotMatchup:
Move effect commands dump
2013-03-27 00:39:44 +00:00
push hl
push bc
inc hl
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTypeModifier]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and %10000000
ld b, a
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
; If the target is immune to the move, treat it as a miss and calculate the damage as 0
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
and a
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr nz, .NotImmune
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wAttackMissed], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor 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 18:42:14 +00:00
.NotImmune:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hMultiplier], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
add b
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wTypeModifier], a
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 0], a
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 2], a
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
more move effect cleanup
2013-05-03 06:43:44 +00:00
call Multiply
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00: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 18:28:22 +00:00
ldh a, [hProduct + 1]
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hProduct + 2]
Move effect commands dump
2013-03-27 00:39:44 +00:00
or b
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 18:28:22 +00:00
ldh a, [hProduct + 3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
or b
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr z, .ok ; This is a very convoluted way to get back that we've essentially dealt no damage.
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
; Take the product and divide it by 10.
ld a, 10
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hDivisor], a
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
ld b, 4
more move effect cleanup
2013-05-03 06:43:44 +00:00
call Divide
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hQuotient + 2]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ld b, a
ldh a, [hQuotient + 3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
or b
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr nz, .ok
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 2], a
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
.ok
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hMultiplicand + 1]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hli], 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 18:28:22 +00:00
ldh a, [hMultiplicand + 2]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
pop bc
pop hl
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00: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 18:42:14 +00:00
.SkipType:
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
inc hl
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr .TypesLoop
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
.end
More battle command labels
2015-11-07 01:55:16 +00:00
call BattleCheckTypeMatchup
ld a, [wTypeMatchup]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTypeModifier]
More battle command labels
2015-11-07 01:55:16 +00:00
and %10000000
Move effect commands dump
2013-03-27 00:39:44 +00:00
or b
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wTypeModifier], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCheckTypeMatchup:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonType1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
jr z, CheckTypeMatchup
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonType1
Fix some whitespace
2022-08-07 04:38:08 +00:00
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckTypeMatchup:
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: AI makes a false assumption about CheckTypeMatchup (see docs/bugs_and_glitches.md)
Move effect commands dump
2013-03-27 00:39:44 +00:00
push hl
push de
push bc
more move effect cleanup
2013-05-03 06:43:44 +00:00
ld a, BATTLE_VARS_MOVE_TYPE
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld d, a
ld b, [hl]
inc hl
ld c, [hl]
More EFFECTIVEness.
2021-08-16 20:44:57 +00:00
ld a, EFFECTIVE
More battle command labels
2015-11-07 01:55:16 +00:00
ld [wTypeMatchup], a
Split battle/ into data/ and engine/ components
2017-12-26 22:47:05 +00:00
ld hl, TypeMatchups
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 18:42:14 +00:00
.TypesLoop:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp -1
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr z, .End
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp -2
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr nz, .Next
more move effect cleanup
2013-05-03 06:43:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS1_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_IDENTIFIED, a
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr nz, .End
jr .TypesLoop
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00: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 18:42:14 +00:00
.Next:
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp d
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr nz, .Nope
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
cp b
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr z, .Yup
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp c
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr z, .Yup
jr .Nope2
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00: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 18:42:14 +00:00
.Nope:
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
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 18:42:14 +00:00
.Nope2:
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr .TypesLoop
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00: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 18:42:14 +00:00
.Yup:
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hDividend + 0], a
ldh [hMultiplicand + 0], a
ldh [hMultiplicand + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 2], a
More battle command labels
2015-11-07 01:55:16 +00:00
ld a, [wTypeMatchup]
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hMultiplier], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
call Multiply
Better trainer AI comments and finish off trainer attributes.
2014-08-14 02:44:56 +00:00
ld a, 10
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hDivisor], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
push bc
Better trainer AI comments and finish off trainer attributes.
2014-08-14 02:44:56 +00:00
ld b, 4
Move effect commands dump
2013-03-27 00:39:44 +00:00
call Divide
pop bc
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 3]
More battle command labels
2015-11-07 01:55:16 +00:00
ld [wTypeMatchup], a
More labels, including fns responsible for partymon generation
2015-10-07 17:19:41 +00:00
jr .TypesLoop
Better trainer AI comments and finish off trainer attributes.
2014-08-14 02:44:56 +00: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 18:42:14 +00:00
.End:
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop bc
pop de
pop hl
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ResetTypeMatchup:
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 13:05:57 +00:00
; Reset the type matchup multiplier to 1.0, if the type matchup is not 0.
; If there is immunity in play, the move automatically misses.
More battle command labels
2015-11-07 01:55:16 +00:00
call BattleCheckTypeMatchup
ld a, [wTypeMatchup]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
More EFFECTIVEness.
2021-08-16 20:44:57 +00:00
ld a, EFFECTIVE
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 13:05:57 +00:00
jr nz, .reset
Move effect commands dump
2013-03-27 00:39:44 +00:00
call ResetDamage
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wTypeModifier], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wAttackMissed], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
More battle command labels
2015-11-07 01:55:16 +00:00
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 13:05:57 +00:00
.reset
More battle command labels
2015-11-07 01:55:16 +00:00
ld [wTypeMatchup], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Split battle/ into data/ and engine/ components
2017-12-26 22:47:05 +00:00
INCLUDE "engine/battle/ai/switch.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move type data to data/types/
2018-01-22 21:23:34 +00:00
INCLUDE "data/types/type_matchups.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DamageVariation:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Modify the damage spread between 85% and 100%.
; Because of the method of division the probability distribution
; is not consistent. This makes the highest damage multipliers
; rarer than normal.
; No point in reducing 1 or 0 damage.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
and a
jr nz, .go
ld a, [hl]
cp 2
ret c
.go
; Start with the maximum damage.
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 18:28:22 +00:00
ldh [hMultiplicand + 0], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec hl
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 18:28:22 +00:00
ldh [hMultiplicand + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 2], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Multiply by 85-100%...
.loop
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
rrca
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp 85 percent + 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr c, .loop
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hMultiplier], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
call Multiply
; ...divide by 100%...
Label some mobile addresses, and revise some comments
2020-06-13 22:48:26 +00:00
ld a, 100 percent
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hDivisor], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, $4
call Divide
; ...to get .85-1.00x damage.
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 2]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hli], a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_CheckHit:
Move effect commands dump
2013-03-27 00:39:44 +00:00
call .DreamEater
jp z, .Miss
call .Protect
jp nz, .Miss
call .DrainSub
jp z, .Miss
call .LockOn
ret nz
call .FlyDigMoves
jp nz, .Miss
call .ThunderRain
ret z
Better trainer AI comments and finish off trainer attributes.
2014-08-14 02:44:56 +00:00
call .XAccuracy
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
; Perfect-accuracy moves
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_ALWAYS_HIT
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
call .StatModifiers
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-13 01:32:42 +00:00
ld a, [wPlayerMoveStruct + MOVE_ACC]
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .BrightPowder
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-13 01:32:42 +00:00
ld a, [wEnemyMoveStruct + MOVE_ACC]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, 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 18:42:14 +00:00
.BrightPowder:
Move effect commands dump
2013-03-27 00:39:44 +00:00
push bc
call GetOpponentItem
ld a, b
move effect cleanup
2013-05-03 05:29:57 +00:00
cp HELD_BRIGHTPOWDER
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, c ; % miss
pop bc
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nz, .skip_brightpowder
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, a
ld a, b
sub c
ld b, a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nc, .skip_brightpowder
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, 0
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.skip_brightpowder
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, b
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp -1
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .Hit
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
jr nc, .Miss
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 18:42:14 +00:00
.Hit:
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Miss:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Keep the damage value intact if we're using (Hi) Jump Kick.
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_JUMP_KICK
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .Missed
call ResetDamage
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 18:42:14 +00:00
.Missed:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wAttackMissed], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.DreamEater:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Return z if we're trying to eat the dream of
; a monster that isn't sleeping.
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_DREAM_EATER
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
ld a, BATTLE_VARS_STATUS_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Protect:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Return nz if the opponent is protected.
ld a, BATTLE_VARS_SUBSTATUS1_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_PROTECT, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
ld c, 40
call DelayFrames
; 'protecting itself!'
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, ProtectingItselfText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, 40
call DelayFrames
ld a, 1
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 18:42:14 +00:00
.LockOn:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Return nz if we are locked-on and aren't trying to use Earthquake,
; Fissure or Magnitude on a monster that is flying.
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 07:34:57 +00:00
call GetBattleVarAddr
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_LOCK_ON, [hl]
res SUBSTATUS_LOCK_ON, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
ld a, BATTLE_VARS_SUBSTATUS3_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_FLYING, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .LockedOn
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp EARTHQUAKE
ret z
cp FISSURE
ret z
cp MAGNITUDE
ret z
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 18:42:14 +00:00
.LockedOn:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 1
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 18:42:14 +00:00
.DrainSub:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Return z if using an HP drain move on a substitute.
more move effect cleanup
2013-05-03 06:43:44 +00:00
call CheckSubstituteOpp
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .not_draining_sub
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_LEECH_HIT
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_DREAM_EATER
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.not_draining_sub
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 1
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 18:42:14 +00:00
.FlyDigMoves:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Check for moves that can hit underground/flying opponents.
; Return z if the current move can hit the opponent.
ld a, BATTLE_VARS_SUBSTATUS3_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_FLYING, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr z, .DigMoves
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp GUST
ret z
cp WHIRLWIND
ret z
cp THUNDER
ret z
cp TWISTER
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 18:42:14 +00:00
.DigMoves:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp EARTHQUAKE
ret z
cp FISSURE
ret z
cp MAGNITUDE
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 18:42:14 +00:00
.ThunderRain:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Return z if the current move always hits in rain, and it is raining.
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_THUNDER
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 21:45:34 +00:00
ld a, [wBattleWeather]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp WEATHER_RAIN
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 18:42:14 +00:00
.XAccuracy:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS4
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Better trainer AI comments and finish off trainer attributes.
2014-08-14 02:44:56 +00:00
bit SUBSTATUS_X_ACCURACY, a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.StatModifiers:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Prepare to merge
2016-01-18 05:39:01 +00:00
; load the user's accuracy into b and the opponent's evasion into c.
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-13 01:32:42 +00:00
ld hl, wPlayerMoveStruct + MOVE_ACC
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerAccLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemyEvaLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .got_acc_eva
Move effect commands dump
2013-03-27 00:39:44 +00: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-13 01:32:42 +00:00
ld hl, wEnemyMoveStruct + MOVE_ACC
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemyAccLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerEvaLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld c, a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.got_acc_eva
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
Prepare to merge
2016-01-18 05:39:01 +00:00
jr c, .skip_foresight_check
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prepare to merge
2016-01-18 05:39:01 +00:00
; if the target's evasion is greater than the user's accuracy,
; check the target's foresight status
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS1_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_IDENTIFIED, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Prepare to merge
2016-01-18 05:39:01 +00:00
.skip_foresight_check
; subtract evasion from 14
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
ld a, MAX_STAT_LEVEL + 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
sub c
ld c, a
Prepare to merge
2016-01-18 05:39:01 +00:00
; store the base move accuracy for math ops
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 0], a
ldh [hMultiplicand + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 2], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
push hl
Prepare to merge
2016-01-18 05:39:01 +00:00
ld d, 2 ; do this twice, once for the user's accuracy and once for the target's evasion
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.accuracy_loop
Prepare to merge
2016-01-18 05:39:01 +00:00
; look up the multiplier from the table
Move effect commands dump
2013-03-27 00:39:44 +00:00
push bc
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
ld hl, AccuracyLevelMultipliers
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec b
sla b
ld c, b
ld b, 0
add hl, bc
pop bc
Prepare to merge
2016-01-18 05:39:01 +00:00
; multiply by the first byte in that row...
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplier], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
call Multiply
Prepare to merge
2016-01-18 05:39:01 +00:00
; ... and divide by the second byte
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hDivisor], a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
ld b, 4
Move effect commands dump
2013-03-27 00:39:44 +00:00
call Divide
Prepare to merge
2016-01-18 05:39:01 +00:00
; minimum accuracy is $0001
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 2]
Move effect commands dump
2013-03-27 00:39:44 +00:00
or b
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nz, .min_accuracy
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hQuotient + 2], a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ld a, 1
ldh [hQuotient + 3], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.min_accuracy
Prepare to merge
2016-01-18 05:39:01 +00:00
; do the same thing to the target's evasion
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, c
dec d
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nz, .accuracy_loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prepare to merge
2016-01-18 05:39:01 +00:00
; if the result is more than 2 bytes, max out at 100%
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hQuotient + 2]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
and a
ldh a, [hQuotient + 3]
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .finish_accuracy
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, $ff
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.finish_accuracy
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop hl
ld [hl], a
ret
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
INCLUDE "data/battle/accuracy_multipliers.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_EffectChance:
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wEffectFailed], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CheckSubstituteOpp
Identify more move effect commands
2013-03-27 05:52:04 +00:00
jr nz, .failed
Move effect commands dump
2013-03-27 00:39:44 +00:00
push hl
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-13 01:32:42 +00:00
ld hl, wPlayerMoveStruct + MOVE_CHANCE
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .got_move_chance
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-13 01:32:42 +00:00
ld hl, wEnemyMoveStruct + MOVE_CHANCE
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.got_move_chance
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: Moves with a 100% secondary effect chance will not trigger it in 1/256 uses (see docs/bugs_and_glitches.md)
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp [hl]
pop hl
ret c
Identify more move effect commands
2013-03-27 05:52:04 +00:00
.failed
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wEffectFailed], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_LowerSub:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS4
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_SUBSTITUTE, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
ld a, BATTLE_VARS_SUBSTATUS3
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_CHARGED, a
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr nz, .already_charged
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_RAZOR_WIND
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .charge_turn
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_SKY_ATTACK
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .charge_turn
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_SKULL_BASH
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .charge_turn
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_SOLARBEAM
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .charge_turn
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_FLY
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .charge_turn
Move effect commands dump
2013-03-27 00:39:44 +00:00
Sprite movement function labels
2015-11-06 21:42:38 +00:00
.already_charged
Move effect commands dump
2013-03-27 00:39:44 +00:00
call .Rampage
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .charge_turn
Move effect commands dump
2013-03-27 00:39:44 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
call CheckUserIsCharging
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Sprite movement function labels
2015-11-06 21:42:38 +00:00
.charge_turn
Still more battle command labels
2015-11-07 03:36:06 +00:00
call _CheckBattleScene
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr c, .mimic_anims
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc a
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
ld a, SUBSTITUTE
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp LoadAnim
Move effect commands dump
2013-03-27 00:39:44 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
.mimic_anims
Still more battle command labels
2015-11-07 03:36:06 +00:00
call BattleCommand_LowerSubNoAnim
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
jp BattleCommand_MoveDelay
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Rampage:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_ROLLOUT
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .rollout_rampage
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_RAMPAGE
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .rollout_rampage
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 1
and a
ret
Sprite movement function labels
2015-11-06 21:42:38 +00:00
.rollout_rampage
Split base stats
2016-01-09 21:28:22 +00:00
ld a, [wSomeoneIsRampaging]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ld a, 0
Split base stats
2016-01-09 21:28:22 +00:00
ld [wSomeoneIsRampaging], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_MoveAnim:
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_LowerSub
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
call BattleCommand_MoveAnimNoSub
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jp BattleCommand_RaiseSub
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_MoveAnimNoSub:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
jp nz, BattleCommand_MoveDelay
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld de, wPlayerRolloutCount
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld a, BATTLEANIM_ENEMY_DAMAGE
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 13:05:57 +00:00
jr z, .got_rollout_count
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld de, wEnemyRolloutCount
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld a, BATTLEANIM_PLAYER_DAMAGE
Move effect commands dump
2013-03-27 00:39:44 +00:00
battle/ai/switch.asm and more battle/effect_commands.asm
2015-11-07 13:05:57 +00:00
.got_rollout_count
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
implement move effect constants
2013-04-25 08:26:37 +00:00
cp EFFECT_MULTI_HIT
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .alternate_anim
implement move effect constants
2013-04-25 08:26:37 +00:00
cp EFFECT_CONVERSION
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .alternate_anim
implement move effect constants
2013-04-25 08:26:37 +00:00
cp EFFECT_DOUBLE_HIT
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .alternate_anim
Clean up labels in battle/moves/move_effects.asm There were a lot of unused labels in there, and a few confusing misnomers around move_effects_pointers.asm. They now match up exactly with the names in battle_constants.asm. Also renamed a few effects, to make their purpose clearer, and to match up with their respective event script commands: EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT EFFECT_HAZE -> EFFECT_RESET_STATS EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH EFFECT_BIND -> EFFECT_TRAP_TARGET EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 15:36:13 +00:00
cp EFFECT_POISON_MULTI_HIT
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .alternate_anim
implement move effect constants
2013-04-25 08:26:37 +00:00
cp EFFECT_TRIPLE_KICK
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, .triplekick
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Sprite movement function labels
2015-11-06 21:42:38 +00:00
.triplekick
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld e, a
ld d, 0
call PlayFXAnimID
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp FLY
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .clear_sprite
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp DIG
ret nz
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.clear_sprite
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp AppearUserLowerSub
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.alternate_anim
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld a, [wBattleAnimParam]
more move effect cleanup
2013-05-03 06:43:44 +00:00
and 1
xor 1
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [de]
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
push af
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld e, a
more move effect cleanup
2013-05-03 06:43:44 +00:00
ld d, 0
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop af
jp z, PlayFXAnimID
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp PlayFXAnimID
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatUpAnim:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
jp nz, BattleCommand_MoveDelay
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr BattleCommand_StatUpDownAnim
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatDownAnim:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
jp nz, BattleCommand_MoveDelay
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld a, BATTLEANIM_ENEMY_STAT_DOWN
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jr z, BattleCommand_StatUpDownAnim
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld a, BATTLEANIM_WOBBLE
Move effect commands dump
2013-03-27 00:39:44 +00:00
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatUpDownAnim:
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld e, a
ld d, 0
jp PlayFXAnimID
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SwitchTurn:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Identify more move effect commands
2013-03-27 05:52:04 +00: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 18:28:22 +00:00
ldh [hBattleTurn], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_RaiseSub:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS4
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_SUBSTITUTE, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Still more battle command labels
2015-11-07 03:36:06 +00:00
call _CheckBattleScene
jp c, BattleCommand_RaiseSubNoAnim
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, $2
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
ld a, SUBSTITUTE
Some work on battle animations
2015-11-09 21:41:09 +00:00
jp LoadAnim
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_FailureText:
Some work on battle animations
2015-11-09 21:41:09 +00:00
; If the move missed or failed, load the appropriate
; text, and end the effects of multi-turn or multi-
; hit moves.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret z
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
call GetFailureResultText
Move effect commands dump
2013-03-27 00:39:44 +00:00
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 07:34:57 +00:00
call GetBattleVarAddr
Identify more move effect commands
2013-03-27 05:52:04 +00:00
cp FLY
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .fly_dig
Identify more move effect commands
2013-03-27 05:52:04 +00:00
cp DIG
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .fly_dig
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Moves that don't make sense are actually effect ids
2013-03-27 21:33:29 +00:00
; Move effect:
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
ld a, [hl]
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: Beat Up may fail to raise Substitute (see docs/bugs_and_glitches.md)
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_MULTI_HIT
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .multihit
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_DOUBLE_HIT
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .multihit
Clean up labels in battle/moves/move_effects.asm There were a lot of unused labels in there, and a few confusing misnomers around move_effects_pointers.asm. They now match up exactly with the names in battle_constants.asm. Also renamed a few effects, to make their purpose clearer, and to match up with their respective event script commands: EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT EFFECT_HAZE -> EFFECT_RESET_STATS EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH EFFECT_BIND -> EFFECT_TRAP_TARGET EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 15:36:13 +00:00
cp EFFECT_POISON_MULTI_HIT
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .multihit
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp EndMoveEffect
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
.multihit
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_RaiseSub
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp EndMoveEffect
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
.fly_dig
Move effect commands dump
2013-03-27 00:39:44 +00: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 07:34:57 +00:00
call GetBattleVarAddr
more move effect cleanup
2013-05-03 06:43:44 +00:00
res SUBSTATUS_UNDERGROUND, [hl]
res SUBSTATUS_FLYING, [hl]
Some work on battle animations
2015-11-09 21:41:09 +00:00
call AppearUserRaiseSub
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp EndMoveEffect
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ApplyDamage:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS1_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_ENDURE, a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jr z, .focus_band
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
call BattleCommand_FalseSwipe
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
ld b, 0
jr nc, .damage
ld b, 1
jr .damage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
.focus_band
Move effect commands dump
2013-03-27 00:39:44 +00:00
call GetOpponentItem
ld a, b
move effect cleanup
2013-05-03 05:29:57 +00:00
cp HELD_FOCUS_BAND
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
ld b, 0
jr nz, .damage
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp c
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jr nc, .damage
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
call BattleCommand_FalseSwipe
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
ld b, 0
jr nc, .damage
ld b, 2
.damage
Move effect commands dump
2013-03-27 00:39:44 +00:00
push bc
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
call .update_damage_taken
ld c, FALSE
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr nz, .damage_player
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
call DoEnemyDamage
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr .done_damage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
.damage_player
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
call DoPlayerDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
.done_damage
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop bc
ld a, b
and a
ret z
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jr nz, .focus_band_text
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, EnduredText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
.focus_band_text
Move effect commands dump
2013-03-27 00:39:44 +00:00
call GetOpponentItem
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 21:29:30 +00:00
ld [wNamedObjectIndex], a
move effect cleanup
2013-05-03 05:29:57 +00:00
call GetItemName
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, HungOnText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
.update_damage_taken
move effect cleanup
2013-05-03 05:29:57 +00:00
ld a, BATTLE_VARS_SUBSTATUS4_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
move effect cleanup
2013-05-03 05:29:57 +00:00
bit SUBSTATUS_SUBSTITUTE, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
move effect cleanup
2013-05-03 05:29:57 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld de, wPlayerDamageTaken + 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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jr nz, .got_damage_taken
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld de, wEnemyDamageTaken + 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
.got_damage_taken
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurDamage + 1]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
ld a, [de]
add b
ld [de], a
dec de
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurDamage]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
ld a, [de]
adc b
ld [de], a
ret nc
ld a, $ff
ld [de], a
inc de
ld [de], a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetFailureResultText:
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, DoesntAffectText
ld de, DoesntAffectText
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTypeModifier]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and $7f
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .got_text
more move effect cleanup
2013-05-03 06:43:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_FUTURE_SIGHT
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, ButItFailedText
ld de, ItFailedText
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .got_text
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, AttackMissedText
ld de, AttackMissed2Text
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCriticalHit]
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp -1
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr nz, .got_text
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, UnaffectedText
Some work on battle animations
2015-11-09 21:41:09 +00:00
.got_text
call FailText_CheckOpponentProtect
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCriticalHit], a
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
more move effect cleanup
2013-05-03 06:43:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_JUMP_KICK
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Some work on battle animations
2015-11-09 21:41:09 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTypeModifier]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and $7f
ret z
Some work on battle animations
2015-11-09 21:41:09 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, [hl]
'rept' is not indented
2018-05-06 16:16:57 +00:00
rept 3
Move effect commands dump
2013-03-27 00:39:44 +00:00
srl a
rr b
'rept' is not indented
2018-05-06 16:16:57 +00:00
endr
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], b
dec hl
ld [hli], a
or b
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr nz, .do_at_least_1_damage
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc a
ld [hl], a
Some work on battle animations
2015-11-09 21:41:09 +00:00
.do_at_least_1_damage
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, CrashedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, $1
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Some work on battle animations
2015-11-09 21:41:09 +00:00
call LoadMoveAnim
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
ld c, TRUE
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jp nz, DoEnemyDamage
jp DoPlayerDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
FailText_CheckOpponentProtect:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS1_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_PROTECT, a
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .not_protected
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld h, d
ld l, e
Some work on battle animations
2015-11-09 21:41:09 +00:00
.not_protected
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_BideFailText:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret z
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTypeModifier]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and $7f
jp z, PrintDoesntAffect
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
jp PrintButItFailed
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_CriticalText:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Prints the message for critical hits or one-hit KOs.
; If there is no message to be printed, wait 20 frames.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCriticalHit]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .wait
dec a
add a
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
ld hl, .texts
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, 0
ld c, a
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCriticalHit], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
.wait
ld c, 20
jp DelayFrames
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
.texts
dw CriticalHitText
dw OneHitKOText
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StartLoop:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerRolloutCount
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
jr z, .ok
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyRolloutCount
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
.ok
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
ld [hl], a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SuperEffectiveLoopText:
Move effect commands dump
2013-03-27 00:39:44 +00: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 07:34:57 +00:00
call GetBattleVarAddr
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
bit SUBSTATUS_IN_LOOP, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SuperEffectiveText:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTypeModifier]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and $7f
Use EFFECTIVE constant for 1.0× battle damage.
2021-08-16 20:42:45 +00:00
cp EFFECTIVE
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
ld hl, SuperEffectiveText
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr nc, .print
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 19:47:07 +00:00
ld hl, NotVeryEffectiveText
Move effect commands dump
2013-03-27 00:39:44 +00:00
.print
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
CheckDestinyBond -> CheckFaint Its main function is fainting the opponent and ending the move effect. Updated the comment accordingly.
2018-08-17 18:16:37 +00:00
BattleCommand_CheckFaint:
; Faint the opponent if its HP reached zero
; and faint the user along with it if it used Destiny Bond.
; Ends the move effect if the opponent faints.
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .got_hp
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonHP
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.got_hp
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
or [hl]
ret nz
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS5_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_DESTINY_BOND, a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .no_dbond
Identify more move effect commands
2013-03-27 05:52:04 +00:00
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, TookDownWithItText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
more effect constants
2013-04-27 21:12:23 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonMaxHP + 1
more effect constants
2013-04-27 21:12:23 +00:00
bccoord 2, 2 ; hp bar
ld a, 0
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nz, .got_max_hp
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonMaxHP + 1
more effect constants
2013-04-27 21:12:23 +00:00
bccoord 10, 9 ; hp bar
ld a, 1
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.got_max_hp
ld [wWhichHPBar], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hld]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hld]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer1 + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer2], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
ld [hld], a
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer2 + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
ld [hl], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3], a
ld [wHPBuffer3 + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld h, b
ld l, c
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
predef AnimateHPBar
bank 0 battle functions
2013-05-03 04:22:28 +00:00
call RefreshBattleHuds
Identify more move effect commands
2013-03-27 05:52:04 +00:00
changed name of some labels
2015-10-10 11:45:39 +00:00
call BattleCommand_SwitchTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc a
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
More battle command labels
2015-11-07 01:55:16 +00:00
ld a, DESTINY_BOND
Some work on battle animations
2015-11-09 21:41:09 +00:00
call LoadAnim
changed name of some labels
2015-10-10 11:45:39 +00:00
call BattleCommand_SwitchTurn
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr .finish
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.no_dbond
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_MULTI_HIT
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .multiple_hit_raise_sub
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_DOUBLE_HIT
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .multiple_hit_raise_sub
Clean up labels in battle/moves/move_effects.asm There were a lot of unused labels in there, and a few confusing misnomers around move_effects_pointers.asm. They now match up exactly with the names in battle_constants.asm. Also renamed a few effects, to make their purpose clearer, and to match up with their respective event script commands: EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT EFFECT_HAZE -> EFFECT_RESET_STATS EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH EFFECT_BIND -> EFFECT_TRAP_TARGET EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 15:36:13 +00:00
cp EFFECT_POISON_MULTI_HIT
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .multiple_hit_raise_sub
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_TRIPLE_KICK
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .multiple_hit_raise_sub
more effect constants
2013-04-27 21:12:23 +00:00
cp EFFECT_BEAT_UP
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nz, .finish
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.multiple_hit_raise_sub
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_RaiseSub
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.finish
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp EndMoveEffect
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_BuildOpponentRage:
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp .start
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
.start
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret nz
Identify more move effect commands
2013-03-27 05:52:04 +00:00
ld a, BATTLE_VARS_SUBSTATUS4_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
bit SUBSTATUS_RAGE, a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Some battle labels
2015-11-06 00:13:09 +00:00
ld de, wEnemyRageCounter
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Some battle labels
2015-11-06 00:13:09 +00:00
jr z, .player
ld de, wPlayerRageCounter
.player
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [de]
inc a
ret z
ld [de], a
Identify more move effect commands
2013-03-27 05:52:04 +00:00
changed name of some labels
2015-10-10 11:45:39 +00:00
call BattleCommand_SwitchTurn
More battletexts
2013-03-27 21:07:00 +00:00
ld hl, RageBuildingText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
changed name of some labels
2015-10-10 11:45:39 +00:00
jp BattleCommand_SwitchTurn
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_RageDamage:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurDamage]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld h, a
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurDamage + 1]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld l, a
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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Some battle labels
2015-11-06 00:13:09 +00:00
ld a, [wPlayerRageCounter]
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .rage_loop
Some battle labels
2015-11-06 00:13:09 +00:00
ld a, [wEnemyRageCounter]
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.rage_loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .done
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec a
add hl, bc
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nc, .rage_loop
More battle data in data/battle/
2018-01-26 02:34:42 +00:00
ld hl, $ffff
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.done
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, h
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCurDamage], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, l
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCurDamage + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
EndMoveEffect:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBattleScriptBufferAddress]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld l, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBattleScriptBufferAddress + 1]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld h, a
Use LOAD/ENDL for OAM DMA code in HRAM (requires rgbds 0.4.1)
2020-07-21 23:43:56 +00:00
ld a, endmove_command
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hli], a
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
ld [hli], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
DittoMetalPowder:
Replace party struct relative values with EQUS constants
2015-11-04 16:19:58 +00:00
ld a, MON_SPECIES
Move effect commands dump
2013-03-27 00:39:44 +00:00
call BattlePartyAttr
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ld a, [hl]
Identify SwitchItemsInBag labels Thanks to FIQ for having done so in Polished Crystal
2020-10-21 19:39:15 +00:00
jr nz, .got_species
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTempEnemyMonSpecies]
Move effect commands dump
2013-03-27 00:39:44 +00:00
Identify SwitchItemsInBag labels Thanks to FIQ for having done so in Polished Crystal
2020-10-21 19:39:15 +00:00
.got_species
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp DITTO
ret nz
push bc
call GetOpponentItem
ld a, [hl]
cp METAL_POWDER
pop bc
ret nz
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: Metal Powder can increase damage taken with boosted (Special) Defense (see docs/bugs_and_glitches.md)
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, c
srl a
add c
ld c, a
ret nc
srl b
ld a, b
and a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nz, .done
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc b
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
.done
Move effect commands dump
2013-03-27 00:39:44 +00:00
scf
rr c
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DamageStats:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jp nz, EnemyAttackDamage
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
PlayerAttackDamage:
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Return move power d, player level e, enemy defense c and player attack b.
Move effect commands dump
2013-03-27 00:39:44 +00:00
call ResetDamage
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Finish labels in engine/namingscreen.asm
2016-01-10 00:34:14 +00:00
ld hl, wPlayerMoveStructPower
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
and a
ld d, a
ret z
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
explicitly define type categories
2014-01-05 13:24:27 +00:00
cp SPECIAL
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr nc, .special
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
; physical
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonDefense
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemyScreens]
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-14 04:18:14 +00:00
bit SCREENS_REFLECT, a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr z, .physicalcrit
Move effect commands dump
2013-03-27 00:39:44 +00:00
sla c
rl b
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.physicalcrit
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonAttack
GetDamageStatsCritical -> CheckDamageStatsCritical Clarified its usage, as the comments surrounding it were factually wrong.
2018-08-16 14:11:28 +00:00
call CheckDamageStatsCritical
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr c, .thickclub
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyDefense
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerAttack
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr .thickclub
.special
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonSpclDef
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemyScreens]
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-14 04:18:14 +00:00
bit SCREENS_LIGHT_SCREEN, a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr z, .specialcrit
Move effect commands dump
2013-03-27 00:39:44 +00:00
sla c
rl b
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.specialcrit
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonSpclAtk
GetDamageStatsCritical -> CheckDamageStatsCritical Clarified its usage, as the comments surrounding it were factually wrong.
2018-08-16 14:11:28 +00:00
call CheckDamageStatsCritical
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr c, .lightball
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemySpDef
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerSpAtk
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.lightball
; Note: Returns player special attack at hl in hl.
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
call LightBallBoost
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr .done
.thickclub
; Note: Returns player attack at hl in hl.
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
call ThickClubBoost
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.done
Some work on battle animations
2015-11-09 21:41:09 +00:00
call TruncateHL_BC
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBattleMonLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld e, a
call DittoMetalPowder
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 1
and a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
TruncateHL_BC:
Some work on battle animations
2015-11-09 21:41:09 +00:00
.loop
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Truncate 16-bit values hl and bc to 8-bit values b and c respectively.
; b = hl, c = bc
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, h
or b
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .finish
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
srl b
rr c
srl b
rr c
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, c
or b
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr nz, .done_bc
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc c
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
.done_bc
Move effect commands dump
2013-03-27 00:39:44 +00:00
srl h
rr l
srl h
rr l
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, l
or h
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr nz, .finish
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc l
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
.finish
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: Reflect and Light Screen can make (Special) Defense wrap around above 1024 (see docs/bugs_and_glitches.md)
Move battle start animation functions to its own file
2015-10-19 14:23:58 +00:00
ld a, [wLinkMode]
Crystal fixed TruncateHL_BC in single player
2018-07-27 22:45:33 +00:00
cp LINK_COLOSSEUM
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr z, .done
More annotations of HP bar animations, including an oversight by GameFreak resulting in super-slow HP bars for Pokemon with over 48 HP
2016-03-09 00:54:06 +00:00
; If we go back to the loop point,
; it's the same as doing this exact
; same check twice.
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, h
or b
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr nz, .loop
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.done
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, l
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
GetDamageStatsCritical -> CheckDamageStatsCritical Clarified its usage, as the comments surrounding it were factually wrong.
2018-08-16 14:11:28 +00:00
CheckDamageStatsCritical:
; Return carry if boosted stats should be used in damage calculations.
; Unboosted stats should be used if the attack is a critical hit,
; and the stage of the opponent's defense is higher than the user's attack.
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCriticalHit]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
scf
ret z
push hl
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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr nz, .enemy
Finish labels in engine/namingscreen.asm
2016-01-10 00:34:14 +00:00
ld a, [wPlayerMoveStructType]
explicitly define type categories
2014-01-05 13:24:27 +00:00
cp SPECIAL
Move effect commands dump
2013-03-27 00:39:44 +00:00
; special
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerSAtkLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemySDefLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr nc, .end
; physical
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerAtkLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemyDefLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr .end
.enemy
Finish labels in engine/namingscreen.asm
2016-01-10 00:34:14 +00:00
ld a, [wEnemyMoveStructType]
explicitly define type categories
2014-01-05 13:24:27 +00:00
cp SPECIAL
Move effect commands dump
2013-03-27 00:39:44 +00:00
; special
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemySAtkLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerSDefLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
jr nc, .end
; physical
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemyAtkLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerDefLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
.end
cp b
pop bc
pop hl
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
ThickClubBoost:
Clarify species-item boost functions
2013-04-20 06:29:39 +00:00
; Return in hl the stat value at hl.
Move effect commands dump
2013-03-27 00:39:44 +00:00
; If the attacking monster is Cubone or Marowak and
Clarify species-item boost functions
2013-04-20 06:29:39 +00:00
; it's holding a Thick Club, double it.
Move effect commands dump
2013-03-27 00:39:44 +00:00
push bc
push de
ld b, CUBONE
ld c, MAROWAK
ld d, THICK_CLUB
call SpeciesItemBoost
pop de
pop bc
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
LightBallBoost:
Clarify species-item boost functions
2013-04-20 06:29:39 +00:00
; Return in hl the stat value at hl.
Move effect commands dump
2013-03-27 00:39:44 +00:00
; If the attacking monster is Pikachu and it's
Clarify species-item boost functions
2013-04-20 06:29:39 +00:00
; holding a Light Ball, double it.
Move effect commands dump
2013-03-27 00:39:44 +00:00
push bc
push de
ld b, PIKACHU
ld c, PIKACHU
ld d, LIGHT_BALL
call SpeciesItemBoost
pop de
pop bc
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
SpeciesItemBoost:
Clarify species-item boost functions
2013-04-20 06:29:39 +00:00
; Return in hl the stat value at hl.
Move effect commands dump
2013-03-27 00:39:44 +00:00
; If the attacking monster is species b or c and
Clarify species-item boost functions
2013-04-20 06:29:39 +00:00
; it's holding item d, double it.
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld l, [hl]
ld h, a
push hl
Replace party struct relative values with EQUS constants
2015-11-04 16:19:58 +00:00
ld a, MON_SPECIES
Move effect commands dump
2013-03-27 00:39:44 +00:00
call BattlePartyAttr
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ld a, [hl]
jr z, .CompareSpecies
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTempEnemyMonSpecies]
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 18:42:14 +00:00
.CompareSpecies:
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop hl
cp b
Move some gfx files around, also clock reset fn
2015-11-10 16:05:26 +00:00
jr z, .GetItemHeldEffect
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp c
ret nz
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 18:42:14 +00:00
.GetItemHeldEffect:
Move effect commands dump
2013-03-27 00:39:44 +00:00
push hl
call GetUserItem
ld a, [hl]
pop hl
cp d
ret nz
; Double the stat
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: Thick Club and Light Ball can make (Special) Attack wrap around above 1024 (see docs/bugs_and_glitches.md)
Move effect commands dump
2013-03-27 00:39:44 +00:00
sla l
rl h
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
EnemyAttackDamage:
Move effect commands dump
2013-03-27 00:39:44 +00:00
call ResetDamage
; No damage dealt with 0 power.
Finish labels in engine/namingscreen.asm
2016-01-10 00:34:14 +00:00
ld hl, wEnemyMoveStructPower
ld a, [hli] ; hl = wEnemyMoveStructType
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld d, a
and a
ret z
ld a, [hl]
explicitly define type categories
2014-01-05 13:24:27 +00:00
cp SPECIAL
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
jr nc, .special
Move effect commands dump
2013-03-27 00:39:44 +00:00
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
; physical
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonDefense
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerScreens]
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-14 04:18:14 +00:00
bit SCREENS_REFLECT, a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr z, .physicalcrit
Move effect commands dump
2013-03-27 00:39:44 +00:00
sla c
rl b
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.physicalcrit
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonAttack
GetDamageStatsCritical -> CheckDamageStatsCritical Clarified its usage, as the comments surrounding it were factually wrong.
2018-08-16 14:11:28 +00:00
call CheckDamageStatsCritical
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr c, .thickclub
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerDefense
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyAttack
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr .thickclub
Move effect commands dump
2013-03-27 00:39:44 +00:00
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
.special
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonSpclDef
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPlayerScreens]
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-14 04:18:14 +00:00
bit SCREENS_LIGHT_SCREEN, a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr z, .specialcrit
Move effect commands dump
2013-03-27 00:39:44 +00:00
sla c
rl b
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.specialcrit
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonSpclAtk
GetDamageStatsCritical -> CheckDamageStatsCritical Clarified its usage, as the comments surrounding it were factually wrong.
2018-08-16 14:11:28 +00:00
call CheckDamageStatsCritical
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr c, .lightball
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerSpDef
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld b, a
ld c, [hl]
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemySpAtk
Move effect commands dump
2013-03-27 00:39:44 +00:00
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.lightball
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
call LightBallBoost
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr .done
Move effect commands dump
2013-03-27 00:39:44 +00:00
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.thickclub
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
call ThickClubBoost
Move effect commands dump
2013-03-27 00:39:44 +00:00
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
.done
Some work on battle animations
2015-11-09 21:41:09 +00:00
call TruncateHL_BC
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEnemyMonLevel]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld e, a
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
call DittoMetalPowder
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 1
and a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/beat_up.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ClearMissDamage:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret z
changed more labels
2015-09-09 23:27:07 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp ResetDamage
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
HitSelfInConfusion:
Move effect commands dump
2013-03-27 00:39:44 +00:00
call ResetDamage
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonDefense
ld de, wPlayerScreens
ld a, [wBattleMonLevel]
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .got_it
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonDefense
ld de, wEnemyScreens
ld a, [wEnemyMonLevel]
Some work on battle animations
2015-11-09 21:41:09 +00:00
.got_it
Move effect commands dump
2013-03-27 00:39:44 +00:00
push af
ld a, [hli]
ld b, a
ld c, [hl]
ld a, [de]
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-14 04:18:14 +00:00
bit SCREENS_REFLECT, a
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr z, .mimic_screen
Move effect commands dump
2013-03-27 00:39:44 +00:00
sla c
rl b
Some work on battle animations
2015-11-09 21:41:09 +00:00
.mimic_screen
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec hl
Labeled every function in ROM0 that's referenced in the source
2016-05-10 16:31:49 +00:00
dec hl
dec hl
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld l, [hl]
ld h, a
Some work on battle animations
2015-11-09 21:41:09 +00:00
call TruncateHL_BC
Finish labels in engine/namingscreen.asm
2016-01-10 00:34:14 +00:00
ld d, 40
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop af
ld e, a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DamageCalc:
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Return a damage value for move power d, player level e, enemy defense c and player attack b.
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: Confusion damage is affected by type-boosting items and Explosion/Self-Destruct doubling (see docs/bugs_and_glitches.md)
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Selfdestruct and Explosion halve defense.
Clean up labels in battle/moves/move_effects.asm There were a lot of unused labels in there, and a few confusing misnomers around move_effects_pointers.asm. They now match up exactly with the names in battle_constants.asm. Also renamed a few effects, to make their purpose clearer, and to match up with their respective event script commands: EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT EFFECT_HAZE -> EFFECT_RESET_STATS EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH EFFECT_BIND -> EFFECT_TRAP_TARGET EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 15:36:13 +00:00
cp EFFECT_SELFDESTRUCT
jr nz, .dont_selfdestruct
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
srl c
Clean up labels in battle/moves/move_effects.asm There were a lot of unused labels in there, and a few confusing misnomers around move_effects_pointers.asm. They now match up exactly with the names in battle_constants.asm. Also renamed a few effects, to make their purpose clearer, and to match up with their respective event script commands: EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT EFFECT_HAZE -> EFFECT_RESET_STATS EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH EFFECT_BIND -> EFFECT_TRAP_TARGET EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 15:36:13 +00:00
jr nz, .dont_selfdestruct
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc c
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Clean up labels in battle/moves/move_effects.asm There were a lot of unused labels in there, and a few confusing misnomers around move_effects_pointers.asm. They now match up exactly with the names in battle_constants.asm. Also renamed a few effects, to make their purpose clearer, and to match up with their respective event script commands: EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT EFFECT_HAZE -> EFFECT_RESET_STATS EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH EFFECT_BIND -> EFFECT_TRAP_TARGET EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 15:36:13 +00:00
.dont_selfdestruct
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Variable-hit moves and Conversion can have a power of 0.
implement move effect constants
2013-04-25 08:26:37 +00:00
cp EFFECT_MULTI_HIT
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr z, .skip_zero_damage_check
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
implement move effect constants
2013-04-25 08:26:37 +00:00
cp EFFECT_CONVERSION
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr z, .skip_zero_damage_check
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; No damage if move power is 0.
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, d
and a
ret z
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.skip_zero_damage_check
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Minimum defense value is 1.
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, c
and a
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr nz, .not_dividing_by_zero
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
ld c, 1
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.not_dividing_by_zero
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
ld hl, hDividend
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hli], a
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
ld [hli], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Level * 2
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, e
add a
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr nc, .level_not_overflowing
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ld [hl], 1
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.level_not_overflowing
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
ld [hli], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; / 5
ld a, 5
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hld], a
push bc
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ld b, 4
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
call Divide
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop bc
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; + 2
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc [hl]
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
inc [hl]
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; * bp
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
ld [hl], d
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
call Multiply
; * Attack
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], b
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
call Multiply
; / Defense
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], c
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ld b, 4
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
call Divide
; / 50
ld [hl], 50
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, $4
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
call Divide
; Item boosts
Move effect commands dump
2013-03-27 00:39:44 +00:00
call GetUserItem
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, b
and a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr z, .DoneItem
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld hl, TypeBoostItems
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00: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 18:42:14 +00:00
.NextItem:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
Battle data goes in data/battle/ TreeMons, like fish groups, have constants
2018-01-10 22:30:27 +00:00
cp -1
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr z, .DoneItem
; Item effect
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
ld a, [hli]
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr nz, .NextItem
; Type
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
ld a, BATTLE_VARS_MOVE_TYPE
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr nz, .DoneItem
; * 100 + item effect amount
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, c
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
add 100
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hMultiplier], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
call Multiply
; / 100
ld a, 100
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hDivisor], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
ld b, 4
call Divide
No space between labels and bodies
2018-06-25 16:24:18 +00:00
.DoneItem:
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Critical hits
call .CriticalMultiplier
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
; Update wCurDamage. Max 999 (capped at 997, then add 2).
RGBDS syntax updates (#905) New MACRO and DEF syntax
2022-06-06 21:25:42 +00:00
DEF MAX_DAMAGE EQU 999
DEF MIN_DAMAGE EQU 2
DEF DAMAGE_CAP EQU MAX_DAMAGE - MIN_DAMAGE
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, [hl]
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh a, [hQuotient + 3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
add b
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh [hQuotient + 3], a
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr nc, .dont_cap_1
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh a, [hQuotient + 2]
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc a
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh [hQuotient + 2], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr z, .Cap
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.dont_cap_1
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh a, [hQuotient]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh a, [hQuotient + 1]
Move effect commands dump
2013-03-27 00:39:44 +00:00
or a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr nz, .Cap
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh a, [hQuotient + 2]
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
cp HIGH(DAMAGE_CAP + 1)
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr c, .dont_cap_2
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
cp HIGH(DAMAGE_CAP + 1) + 1
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr nc, .Cap
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh a, [hQuotient + 3]
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
cp LOW(DAMAGE_CAP + 1)
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr nc, .Cap
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.dont_cap_2
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh a, [hQuotient + 3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, [hl]
add b
ld [hld], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh a, [hQuotient + 2]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, [hl]
adc b
ld [hl], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr c, .Cap
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
cp HIGH(DAMAGE_CAP + 1)
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr c, .dont_cap_3
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
cp HIGH(DAMAGE_CAP + 1) + 1
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
jr nc, .Cap
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
ld a, [hld]
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
cp LOW(DAMAGE_CAP + 1)
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr c, .dont_cap_3
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00: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 18:42:14 +00:00
.Cap:
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
ld a, HIGH(DAMAGE_CAP)
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hli], a
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
ld a, LOW(DAMAGE_CAP)
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hld], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.dont_cap_3
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
; Add back MIN_DAMAGE (capping at 999).
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
ld a, [hl]
Terser damage calculation constants
2020-11-09 21:12:19 +00:00
add MIN_DAMAGE
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hld], a
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr nc, .dont_floor
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc [hl]
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.dont_floor
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
; Returns nz and nc.
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
ld a, 1
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.CriticalMultiplier:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCriticalHit]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret z
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; x2
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
add a
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh [hQuotient + 3], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 2]
Move effect commands dump
2013-03-27 00:39:44 +00:00
rl a
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh [hQuotient + 2], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
; Cap at $ffff.
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nc
ld a, $ff
Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc Also make .gitignore consistent with pokered
2020-07-05 19:09:12 +00:00
ldh [hQuotient + 2], a
ldh [hQuotient + 3], a
damagecalc is actually damagestats; itemmultiplier is actually damagecalc
2013-04-20 06:53:08 +00:00
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move type data to data/types/
2018-01-22 21:23:34 +00:00
INCLUDE "data/types/type_boost_items.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ConstantDamage:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonLevel
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr z, .got_turn
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonLevel
Move effect commands dump
2013-03-27 00:39:44 +00:00
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.got_turn
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_LEVEL_DAMAGE
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, [hl]
ld a, 0
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr z, .got_power
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_PSYWAVE
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr z, .psywave
Move effect commands dump
2013-03-27 00:39:44 +00:00
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_SUPER_FANG
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr z, .super_fang
Move effect commands dump
2013-03-27 00:39:44 +00:00
more move effect cleanup
2013-05-03 06:43:44 +00:00
cp EFFECT_REVERSAL
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr z, .reversal
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_POWER
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
ld a, $0
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr .got_power
Move effect commands dump
2013-03-27 00:39:44 +00:00
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.psywave
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, b
srl a
add b
ld b, a
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.psywave_loop
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .psywave_loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nc, .psywave_loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, 0
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr .got_power
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.super_fang
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .got_hp
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonHP
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.got_hp
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
srl a
ld b, a
ld a, [hl]
rr a
push af
ld a, b
pop bc
and a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nz, .got_power
Move effect commands dump
2013-03-27 00:39:44 +00:00
or b
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, 0
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr nz, .got_power
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, 1
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr .got_power
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.got_power
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hli], a
ld [hl], b
ret
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.reversal
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
jr z, .reversal_got_hp
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonHP
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.reversal_got_hp
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hDividend], a
ldh [hMultiplicand + 0], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 2], a
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ld a, 48
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hMultiplier], a
more move effect cleanup
2013-05-03 06:43:44 +00:00
call Multiply
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hDivisor], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, b
and a
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr z, .skip_to_divide
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hProduct + 4]
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hDivisor], a
ldh a, [hProduct + 2]
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hProduct + 3]
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hDividend + 3], a
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hDividend + 2], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.skip_to_divide
More battle data in data/battle/
2018-01-26 02:34:42 +00:00
ld b, 4
more move effect cleanup
2013-05-03 06:43:44 +00:00
call Divide
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 3]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
More battle data in data/battle/
2018-01-26 02:34:42 +00:00
ld hl, FlailReversalPower
Move effect commands dump
2013-03-27 00:39:44 +00:00
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.reversal_loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
cp b
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr nc, .break_loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc hl
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
jr .reversal_loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
Cleaning up static HRAM labels; movement stuff, route 38 trainers
2015-11-10 04:01:45 +00:00
.break_loop
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ld a, [hl]
changed more labels
2015-09-09 23:27:07 +00:00
jr nz, .notPlayersTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
Finish labels in engine/namingscreen.asm
2016-01-10 00:34:14 +00:00
ld hl, wPlayerMoveStructPower
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
push hl
call PlayerAttackDamage
changed more labels
2015-09-09 23:27:07 +00:00
jr .notEnemysTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
changed more labels
2015-09-09 23:27:07 +00:00
.notPlayersTurn
Finish labels in engine/namingscreen.asm
2016-01-10 00:34:14 +00:00
ld hl, wEnemyMoveStructPower
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
push hl
call EnemyAttackDamage
changed more labels
2015-09-09 23:27:07 +00:00
.notEnemysTurn
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
call BattleCommand_DamageCalc
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop hl
ld [hl], 1
ret
Move power data belongs in data/moves/
2018-01-26 16:01:15 +00:00
INCLUDE "data/moves/flail_reversal_power.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/counter.asm"
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/encore.asm"
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/pain_split.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/snore.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/conversion2.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/lock_on.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/sketch.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DefrostOpponent:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Thaw the opponent if frozen, and
; raise the user's Attack one stage.
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call AnimateCurrentMove
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVarAddr
call Defrost
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push hl
push af
ld a, EFFECT_ATTACK_UP
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hl], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_StatUp
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
pop af
pop hl
ld [hl], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/sleep_talk.asm"
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/destiny_bond.asm"
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/spite.asm"
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/false_swipe.asm"
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/heal_bell.asm"
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 19:52:32 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
FarPlayBattleAnimation:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; play animation de
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; fallthrough
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PlayFXAnimID:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, e
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFXAnimID], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, d
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFXAnimID + 1], a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld c, 3
call DelayFrames
callfar PlayBattleAnim
ret
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
DoEnemyDamage:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wCurDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, a
ld a, [hl]
or b
jr z, .did_no_damage
ld a, c
and a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jr nz, .ignore_substitute
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEnemySubStatus4]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
bit SUBSTATUS_SUBSTITUTE, a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jp nz, DoSubstituteDamage
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
.ignore_substitute
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
; Subtract wCurDamage from wEnemyMonHP.
; store original HP in little endian wHPBuffer2
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hld]
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEnemyMonHP + 1]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer2], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
sub b
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wEnemyMonHP + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hl]
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEnemyMonHP]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer2 + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
sbc b
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wEnemyMonHP], a
Disassemble the final English debug ROM
2020-07-13 17:05:05 +00:00
if DEF(_DEBUG)
push af
ld a, BANK(sSkipBattle)
call OpenSRAM
ld a, [sSkipBattle]
call CloseSRAM
or a
; If [sSkipBattle] is nonzero, skip the "jr nc, .no_underflow" check,
; so any attack deals maximum damage to the enemy.
jr nz, .debug_skip
pop af
jr nc, .no_underflow
push af
.debug_skip
pop af
else
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jr nc, .no_underflow
Disassemble the final English debug ROM
2020-07-13 17:05:05 +00:00
endc
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld a, [wHPBuffer2 + 1]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hli], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld a, [wHPBuffer2]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hl], a
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hli], a
ld [hl], a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
.no_underflow
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonMaxHP
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer1 + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer1], a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3 + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3], a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
hlcoord 2, 2
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
ld [wWhichHPBar], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
predef AnimateHPBar
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.did_no_damage
jp RefreshBattleHuds
More battletexts
2013-03-27 21:07:00 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
DoPlayerDamage:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wCurDamage
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hli]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
ld a, [hl]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
or b
jr z, .did_no_damage
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, c
and a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jr nz, .ignore_substitute
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wPlayerSubStatus4]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
bit SUBSTATUS_SUBSTITUTE, a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jp nz, DoSubstituteDamage
.ignore_substitute
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
; Subtract wCurDamage from wBattleMonHP.
; store original HP in little endian wHPBuffer2
; store new HP in little endian wHPBuffer3
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hld]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wBattleMonHP + 1]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer2], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
sub b
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wBattleMonHP + 1], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, [hl]
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wBattleMonHP]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer2 + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
sbc b
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wBattleMonHP], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3 + 1], a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
jr nc, .no_underflow
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld a, [wHPBuffer2 + 1]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hli], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld a, [wHPBuffer2]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hl], a
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wBattleMonHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hli], a
ld [hl], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld hl, wHPBuffer3
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hli], a
ld [hl], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
.no_underflow
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wBattleMonMaxHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer1 + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer1], a
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
hlcoord 10, 9
Rename some battle commands `hittarget` was misleading, as it doesn't actually "hit" the target, it only plays the animation. As such, I've renamed it to `moveanim`. `checkfaint` has nothing to do with checking if the user or target has fainted, instead, it applies wCurDamage onto the target's HP, hitting the substitute if applicable. I've renamed the command to `applydamage` and all of its subfunctions accordingly.
2018-04-04 21:27:40 +00:00
ld a, 1
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [wWhichHPBar], a
predef AnimateHPBar
.did_no_damage
jp RefreshBattleHuds
Remove all address comments
2018-06-24 14:09:41 +00:00
DoSubstituteDamage:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, SubTookDamageText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemySubstituteHP
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .got_hp
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wPlayerSubstituteHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_hp
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wCurDamage
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hli]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nz, .broke
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [de]
sub [hl]
ld [de], a
jr z, .broke
jr nc, .done
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.broke
ld a, BATTLE_VARS_SUBSTATUS4_OPP
call GetBattleVarAddr
res SUBSTATUS_SUBSTITUTE, [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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, SubFadedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_SwitchTurn
call BattleCommand_LowerSubNoAnim
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
call z, AppearUserLowerSub
call BattleCommand_SwitchTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr
cp EFFECT_MULTI_HIT
jr z, .ok
cp EFFECT_DOUBLE_HIT
jr z, .ok
cp EFFECT_POISON_MULTI_HIT
jr z, .ok
cp EFFECT_TRIPLE_KICK
jr z, .ok
cp EFFECT_BEAT_UP
jr z, .ok
xor a
ld [hl], a
.ok
call RefreshBattleHuds
.done
jp ResetDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
UpdateMoveData:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
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 07:34:57 +00:00
call GetBattleVarAddr
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld d, h
ld e, l
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE
call GetBattleVar
No wCurMove alias for wCurSpecies
2018-07-29 20:04:38 +00:00
ld [wCurSpecies], a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 21:29:30 +00:00
ld [wNamedObjectIndex], a
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
dec a
call GetMoveData
call GetMoveName
jp CopyName1
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SleepTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetOpponentItem
ld a, b
cp HELD_PREVENT_SLEEP
jr nz, .not_protected_by_item
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 21:29:30 +00:00
ld [wNamedObjectIndex], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetItemName
ld hl, ProtectedByText
jr .fail
.not_protected_by_item
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 07:34:57 +00:00
call GetBattleVarAddr
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld d, h
ld e, l
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [de]
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, AlreadyAsleepText
jr nz, .fail
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp nz, PrintDidntAffect2
Some work on battle animations
2015-11-09 21:41:09 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, DidntAffect1Text
call .CheckAIRandomFail
jr c, .fail
ld a, [de]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nz, .fail
call CheckSubstituteOpp
jr nz, .fail
Some work on battle animations
2015-11-09 21:41:09 +00:00
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateCurrentMove
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
ld b, SLP_MASK
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wInBattleTowerBattle]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .random_loop
More syncing with pokegold
2020-11-03 15:13:06 +00:00
ld b, %011
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.random_loop
call BattleRandom
and b
jr z, .random_loop
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
cp SLP_MASK
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .random_loop
inc a
ld [de], a
call UpdateOpponentInParty
call RefreshBattleHuds
ld hl, FellAsleepText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
farcall UseHeldStatusHealingItem
jp z, OpponentCantMove
ret
More battletexts
2013-03-27 21:07:00 +00:00
Some work on battle animations
2015-11-09 21:41:09 +00:00
.fail
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push hl
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateFailedMove
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
pop hl
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.CheckAIRandomFail:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Enemy turn
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .dont_fail
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Not in link battle
ld a, [wLinkMode]
and a
jr nz, .dont_fail
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wInBattleTowerBattle]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr nz, .dont_fail
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Not locked-on by the enemy
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wPlayerSubStatus5]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
bit SUBSTATUS_LOCK_ON, a
jr nz, .dont_fail
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleRandom
cp 25 percent + 1 ; 25% chance AI fails
ret c
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.dont_fail
xor a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_PoisonTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVarAddr
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wTypeModifier]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $7f
ret z
call CheckIfTargetIsPoisonType
ret z
call GetOpponentItem
ld a, b
cp HELD_PREVENT_POISON
ret z
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEffectFailed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
call SafeCheckSafeguard
ret nz
Some work on battle animations
2015-11-09 21:41:09 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call PoisonOpponent
ld de, ANIM_PSN
call PlayOpponentBattleAnim
call RefreshBattleHuds
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, WasPoisonedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
farcall UseHeldStatusHealingItem
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Poison:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, DoesntAffectText
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wTypeModifier]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $7f
jp z, .failed
call CheckIfTargetIsPoisonType
jp z, .failed
ld a, BATTLE_VARS_STATUS_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, a
ld hl, AlreadyPoisonedText
and 1 << PSN
jp nz, .failed
call GetOpponentItem
ld a, b
cp HELD_PREVENT_POISON
jr nz, .do_poison
Move effect commands dump
2013-03-27 00:39:44 +00: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 21:29:30 +00:00
ld [wNamedObjectIndex], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetItemName
ld hl, ProtectedByText
jr .failed
.do_poison
ld hl, DidntAffect1Text
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVar
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nz, .failed
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
Sync code with wiki
2018-02-04 18:16:40 +00:00
jr z, .dont_sample_failure
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [wLinkMode]
and a
Sync code with wiki
2018-02-04 18:16:40 +00:00
jr nz, .dont_sample_failure
Move effect commands dump
2013-03-27 00:39:44 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wInBattleTowerBattle]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
Sync code with wiki
2018-02-04 18:16:40 +00:00
jr nz, .dont_sample_failure
Move effect commands dump
2013-03-27 00:39:44 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wPlayerSubStatus5]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
bit SUBSTATUS_LOCK_ON, a
Sync code with wiki
2018-02-04 18:16:40 +00:00
jr nz, .dont_sample_failure
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleRandom
cp 25 percent + 1 ; 25% chance AI fails
jr c, .failed
Sync code with wiki
2018-02-04 18:16:40 +00:00
.dont_sample_failure
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckSubstituteOpp
jr nz, .failed
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nz, .failed
call .check_toxic
jr z, .toxic
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call .apply_poison
ld hl, WasPoisonedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr .finished
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.toxic
set SUBSTATUS_TOXIC, [hl]
xor a
ld [de], a
call .apply_poison
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, BadlyPoisonedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.finished
farcall UseHeldStatusHealingItem
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.failed
push hl
call AnimateFailedMove
pop hl
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.apply_poison
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateCurrentMove
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call PoisonOpponent
jp RefreshBattleHuds
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.check_toxic
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS5_OPP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetBattleVarAddr
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemyToxicCount
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .ok
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wPlayerToxicCount
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.ok
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_TOXIC
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckIfTargetIsPoisonType:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemyMonType1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .ok
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wBattleMonType1
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.ok
ld a, [de]
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc de
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp POISON
ret z
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [de]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp POISON
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PoisonOpponent:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 07:34:57 +00:00
call GetBattleVarAddr
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
set PSN, [hl]
jp UpdateOpponentInParty
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DrainTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call SapHealth
ld hl, SuckedHealthText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_EatDream:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call SapHealth
ld hl, DreamEatenText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
SapHealth:
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
; Divide damage by 2, store it in hDividend
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
srl 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 18:28:22 +00:00
ldh [hDividend], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
ld a, [hl]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
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 18:28:22 +00:00
ldh [hDividend + 1], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
or b
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
jr nz, .at_least_one
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 18:28:22 +00:00
ldh [hDividend + 1], a
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
.at_least_one
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wBattleMonHP
ld de, 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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .battlemonhp
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonHP
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemyMonMaxHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.battlemonhp
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
; Store current HP in little endian wHPBuffer2
ld bc, wHPBuffer2 + 1
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hli]
ld [bc], a
ld a, [hl]
dec bc
ld [bc], a
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
; Store max HP in little endian wHPBuffer1
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [de]
dec bc
ld [bc], a
inc de
ld a, [de]
dec bc
ld [bc], a
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
; Add hDividend to current HP and copy it to little endian wHPBuffer3
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hDividend + 1]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, [hl]
add b
ld [hld], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3], 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 18:28:22 +00:00
ldh a, [hDividend]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, [hl]
adc b
ld [hli], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3 + 1], a
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
jr c, .max_hp
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
; Subtract current HP from max HP (to see if we have more than max HP)
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hld]
ld b, a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [de]
dec de
Move effect commands dump
2013-03-27 00:39:44 +00:00
sub b
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hli]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [de]
inc de
Move effect commands dump
2013-03-27 00:39:44 +00:00
sbc b
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
jr nc, .finish
.max_hp
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
; Load max HP into current HP and copy it to little endian wHPBuffer3
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [de]
ld [hld], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
dec de
ld a, [de]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld [hli], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3 + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
inc de
Comment SapHealth Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 20:35:47 +00:00
.finish
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
hlcoord 10, 9
ld a, $1
jr z, .hp_bar
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 08:10:56 +00:00
hlcoord 2, 2
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.hp_bar
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
ld [wWhichHPBar], a
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
predef AnimateHPBar
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call RefreshBattleHuds
jp UpdateBattleMonInParty
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_BurnTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
xor a
ld [wNumHits], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVarAddr
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp nz, Defrost
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wTypeModifier]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $7f
ret z
call CheckMoveTypeMatchesTarget ; Don't burn a Fire-type
ret z
call GetOpponentItem
ld a, b
cp HELD_PREVENT_BURN
ret z
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEffectFailed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
ret nz
call SafeCheckSafeguard
ret nz
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVarAddr
set BRN, [hl]
call UpdateOpponentInParty
ld hl, ApplyBrnEffectOnAttack
call CallBattleCore
ld de, ANIM_BRN
call PlayOpponentBattleAnim
call RefreshBattleHuds
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, WasBurnedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
farcall UseHeldStatusHealingItem
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
Defrost:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hl]
and 1 << FRZ
ret z
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
xor a
ld [hl], a
More battletexts
2013-03-27 21:07:00 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wCurOTMon]
ld hl, wOTPartyMon1Status
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
jr z, .ok
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wPartyMon1Status
ld a, [wCurBattleMon]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
.ok
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetPartyLocation
xor a
ld [hl], a
call UpdateOpponentInParty
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, DefrostedOpponentText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_FreezeTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
xor a
ld [wNumHits], a
call CheckSubstituteOpp
ret nz
Move effect commands dump
2013-03-27 00:39:44 +00: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 07:34:57 +00:00
call GetBattleVarAddr
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTypeModifier]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $7f
ret z
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wBattleWeather]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp WEATHER_SUN
ret z
call CheckMoveTypeMatchesTarget ; Don't freeze an Ice-type
ret z
call GetOpponentItem
ld a, b
cp HELD_PREVENT_FREEZE
ret z
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wEffectFailed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
call SafeCheckSafeguard
ret nz
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVarAddr
set FRZ, [hl]
bank 0 battle functions
2013-05-03 04:22:28 +00:00
call UpdateOpponentInParty
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld de, ANIM_FRZ
call PlayOpponentBattleAnim
bank 0 battle functions
2013-05-03 04:22:28 +00:00
call RefreshBattleHuds
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, WasFrozenText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
More battletexts
2013-03-27 21:07:00 +00:00
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall UseHeldStatusHealingItem
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call OpponentCantMove
call EndRechargeOpp
ld hl, wEnemyJustGotFrozen
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .finish
ld hl, wPlayerJustGotFrozen
.finish
ld [hl], $1
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ParalyzeTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
xor a
ld [wNumHits], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
call CheckSubstituteOpp
ret nz
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 07:34:57 +00:00
call GetBattleVarAddr
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret nz
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTypeModifier]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and $7f
ret z
call GetOpponentItem
ld a, b
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp HELD_PREVENT_PARALYZE
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEffectFailed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret nz
Still more battle command labels
2015-11-07 03:36:06 +00:00
call SafeCheckSafeguard
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVarAddr
set PAR, [hl]
call UpdateOpponentInParty
ld hl, ApplyPrzEffectOnSpeed
call CallBattleCore
ld de, ANIM_PAR
call PlayOpponentBattleAnim
call RefreshBattleHuds
call PrintParalyze
ld hl, UseHeldStatusHealingItem
jp CallBattleCore
Still more battle command labels
2015-11-07 03:36:06 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AttackUp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, ATTACK
jr BattleCommand_StatUp
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DefenseUp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, DEFENSE
jr BattleCommand_StatUp
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpeedUp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, SPEED
jr BattleCommand_StatUp
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-14 04:18:14 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpecialAttackUp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, SP_ATTACK
jr BattleCommand_StatUp
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-14 04:18:14 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpecialDefenseUp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, SP_DEFENSE
jr BattleCommand_StatUp
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-14 04:18:14 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AccuracyUp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, ACCURACY
jr BattleCommand_StatUp
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-14 04:18:14 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_EvasionUp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, EVASION
jr BattleCommand_StatUp
changed more labels
2015-09-04 20:30:40 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AttackUp2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, $10 | ATTACK
jr BattleCommand_StatUp
changed more labels
2015-09-04 20:30:40 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DefenseUp2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, $10 | DEFENSE
jr BattleCommand_StatUp
changed more labels
2015-09-04 20:30:40 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpeedUp2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, $10 | SPEED
jr BattleCommand_StatUp
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpecialAttackUp2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, $10 | SP_ATTACK
jr BattleCommand_StatUp
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpecialDefenseUp2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, $10 | SP_DEFENSE
jr BattleCommand_StatUp
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AccuracyUp2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, $10 | ACCURACY
jr BattleCommand_StatUp
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_EvasionUp2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, $10 | EVASION
jr BattleCommand_StatUp
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatUp:
Fix some StatUp-related labels
2018-08-17 15:48:41 +00:00
call RaiseStat
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wFailedMessage]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
Fix some StatUp-related labels
2018-08-17 15:48:41 +00:00
jp MinimizeDropSub
changed more labels
2015-09-04 20:30:40 +00:00
Fix some StatUp-related labels
2018-08-17 15:48:41 +00:00
RaiseStat:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, b
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wLoweredStat], a
ld hl, wPlayerStatLevels
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .got_stat_levels
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyStatLevels
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_stat_levels
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp nz, .stat_raise_failed
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEffectFailed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jp nz, .stat_raise_failed
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f
ld c, a
ld b, 0
add hl, bc
ld b, [hl]
inc b
ld a, $d
cp b
jp c, .cant_raise_stat
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f0
jr z, .got_num_stages
inc b
ld a, $d
cp b
jr nc, .got_num_stages
ld b, a
.got_num_stages
ld [hl], b
push hl
ld a, c
cp $5
jr nc, .done_calcing_stats
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wBattleMonStats + 1
ld de, wPlayerStats
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .got_stats_pointer
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonStats + 1
ld de, wEnemyStats
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_stats_pointer
push bc
sla c
ld b, 0
add hl, bc
ld a, c
add e
ld e, a
jr nc, .no_carry
inc d
.no_carry
pop bc
ld a, [hld]
sub LOW(MAX_STAT_VALUE)
jr nz, .not_already_max
ld a, [hl]
sbc HIGH(MAX_STAT_VALUE)
jp z, .stats_already_max
.not_already_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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .calc_player_stats
call CalcEnemyStats
jr .done_calcing_stats
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 19:52:32 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.calc_player_stats
call CalcPlayerStats
.done_calcing_stats
pop hl
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
More battletexts
2013-03-27 21:07:00 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.stats_already_max
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop hl
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
dec [hl]
; fallthrough
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.cant_raise_stat
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $2
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $1
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wAttackMissed], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.stat_raise_failed
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $1
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Fix some StatUp-related labels
2018-08-17 15:48:41 +00:00
MinimizeDropSub:
; Lower the substitute if we're minimizing
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld bc, wPlayerMinimized
ld hl, DropPlayerSub
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .do_player
ld bc, wEnemyMinimized
ld hl, DropEnemySub
.do_player
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
cp MINIMIZE
ret nz
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $1
ld [bc], a
call _CheckBattleScene
ret nc
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 18:28:22 +00:00
ldh [hBGMapMode], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CallBattleCore
call WaitBGMap
jp BattleCommand_MoveDelay
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AttackDown:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, ATTACK
jr BattleCommand_StatDown
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DefenseDown:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, DEFENSE
jr BattleCommand_StatDown
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpeedDown:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, SPEED
jr BattleCommand_StatDown
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpecialAttackDown:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, SP_ATTACK
jr BattleCommand_StatDown
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpecialDefenseDown:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, SP_DEFENSE
jr BattleCommand_StatDown
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AccuracyDown:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, ACCURACY
jr BattleCommand_StatDown
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_EvasionDown:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, EVASION
jr BattleCommand_StatDown
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AttackDown2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $10 | ATTACK
jr BattleCommand_StatDown
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DefenseDown2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $10 | DEFENSE
jr BattleCommand_StatDown
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpeedDown2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $10 | SPEED
jr BattleCommand_StatDown
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpecialAttackDown2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $10 | SP_ATTACK
jr BattleCommand_StatDown
More battletexts
2013-03-27 21:07:00 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SpecialDefenseDown2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $10 | SP_DEFENSE
jr BattleCommand_StatDown
More battletexts
2013-03-27 21:07:00 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AccuracyDown2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $10 | ACCURACY
jr BattleCommand_StatDown
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_EvasionDown2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $10 | EVASION
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatDown:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wLoweredStat], a
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckMist
jp nz, .Mist
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyStatLevels
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .GetStatLevel
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerStatLevels
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.GetStatLevel:
; Attempt to lower the stat.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wLoweredStat]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and $f
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-14 04:18:14 +00:00
ld b, 0
Move effect commands dump
2013-03-27 00:39:44 +00:00
add hl, bc
ld b, [hl]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
dec b
jp z, .CantLower
; Sharply lower the stat if applicable.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wLoweredStat]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and $f0
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .ComputerMiss
dec b
jr nz, .ComputerMiss
Move effect commands dump
2013-03-27 00:39:44 +00:00
inc b
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.ComputerMiss:
; Computer opponents have a 25% chance of failing.
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .DidntMiss
ld a, [wLinkMode]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
comment statdown move command
2013-06-13 20:10:39 +00:00
jr nz, .DidntMiss
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wInBattleTowerBattle]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
comment statdown move command
2013-06-13 20:10:39 +00:00
jr nz, .DidntMiss
; Lock-On still always works.
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wPlayerSubStatus5]
comment statdown move command
2013-06-13 20:10:39 +00:00
bit SUBSTATUS_LOCK_ON, a
jr nz, .DidntMiss
; Attacking moves that also lower accuracy are unaffected.
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetBattleVar
cp EFFECT_ACCURACY_DOWN_HIT
jr z, .DidntMiss
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleRandom
cp 25 percent + 1 ; 25% chance AI fails
jr c, .Failed
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.DidntMiss:
call CheckSubstituteOpp
jr nz, .Failed
Move effect commands dump
2013-03-27 00:39:44 +00:00
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nz, .Failed
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-14 04:18:14 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEffectFailed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr nz, .Failed
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckHiddenOpponent
jr nz, .Failed
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Accuracy/Evasion reduction don't involve stats.
ld [hl], b
ld a, c
cp ACCURACY
jr nc, .Hit
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push hl
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonAttack + 1
ld de, wEnemyStats
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .do_enemy
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wBattleMonAttack + 1
ld de, wPlayerStats
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.do_enemy
call TryLowerStat
pop hl
jr z, .CouldntLower
.Hit:
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
.CouldntLower:
inc [hl]
.CantLower:
ld a, 3
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 1
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wAttackMissed], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.Failed:
ld a, 1
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
ld [wAttackMissed], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.Mist:
ld a, 2
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, 1
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wAttackMissed], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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-14 04:18:14 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckMist:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_ATTACK_DOWN
jr c, .dont_check_mist
cp EFFECT_EVASION_DOWN + 1
jr c, .check_mist
cp EFFECT_ATTACK_DOWN_2
jr c, .dont_check_mist
cp EFFECT_EVASION_DOWN_2 + 1
jr c, .check_mist
cp EFFECT_ATTACK_DOWN_HIT
jr c, .dont_check_mist
cp EFFECT_EVASION_DOWN_HIT + 1
jr c, .check_mist
.dont_check_mist
xor a
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.check_mist
ld a, BATTLE_VARS_SUBSTATUS4_OPP
call GetBattleVar
bit SUBSTATUS_MIST, a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatUpMessage:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wFailedMessage]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
ret nz
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
inc b
call GetStatName
ld hl, .stat
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp BattleTextbox
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.stat
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
text_far Text_BattleEffectActivate
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_asm
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleStatWentUpText
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f0
ret z
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleStatWentWayUpText
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleStatWentWayUpText:
text_far _BattleStatWentWayUpText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleStatWentUpText:
text_far _BattleStatWentUpText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatDownMessage:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wFailedMessage]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret nz
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f
ld b, a
inc b
call GetStatName
ld hl, .stat
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp BattleTextbox
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.stat
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
text_far Text_BattleFoeEffectActivate
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_asm
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleStatFellText
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f0
ret z
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleStatSharplyFellText
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleStatSharplyFellText:
text_far _BattleStatSharplyFellText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleStatFellText:
text_far _BattleStatFellText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
TryLowerStat:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Lower stat c from stat struct hl (buffer de).
push bc
sla c
ld b, 0
add hl, bc
; add de, c
ld a, c
Move effect commands dump
2013-03-27 00:39:44 +00:00
add e
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld e, a
jr nc, .no_carry
inc d
.no_carry
pop bc
; The lowest possible stat is 1.
ld a, [hld]
sub 1
jr nz, .not_min
ld a, [hl]
and a
ret z
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.not_min
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .Player
call BattleCommand_SwitchTurn
call CalcPlayerStats
call BattleCommand_SwitchTurn
jr .end
.Player:
call BattleCommand_SwitchTurn
call CalcEnemyStats
call BattleCommand_SwitchTurn
.end
ld a, 1
and a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatUpFailText:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wFailedMessage]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
ret z
push af
call BattleCommand_MoveDelay
pop af
dec a
jp z, TryPrintButItFailed
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f
ld b, a
inc b
call GetStatName
ld hl, WontRiseAnymoreText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_StatDownFailText:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wFailedMessage]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push af
call BattleCommand_MoveDelay
pop af
dec a
jp z, TryPrintButItFailed
dec a
ld hl, ProtectedByMistText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp z, StdBattleTextbox
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f
ld b, a
inc b
call GetStatName
ld hl, WontDropAnymoreText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetStatName:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, StatNames
ld c, "@"
.CheckName:
dec b
jr z, .Copy
.GetName:
ld a, [hli]
cp c
jr z, .CheckName
jr .GetName
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.Copy:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wStringBuffer2
Use STRING_BUFFER_LENGTH for the wStringBuffers
2020-11-25 01:11:17 +00:00
ld bc, STRING_BUFFER_LENGTH
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp CopyBytes
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "data/battle/stat_names.asm"
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "data/battle/stat_multipliers.asm"
More battletexts
2013-03-27 21:07:00 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_AllStatsUp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Attack
call ResetMiss
call BattleCommand_AttackUp
call BattleCommand_StatUpMessage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Defense
call ResetMiss
call BattleCommand_DefenseUp
call BattleCommand_StatUpMessage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Speed
call ResetMiss
call BattleCommand_SpeedUp
call BattleCommand_StatUpMessage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Special Attack
call ResetMiss
call BattleCommand_SpecialAttackUp
call BattleCommand_StatUpMessage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Special Defense
call ResetMiss
call BattleCommand_SpecialDefenseUp
jp BattleCommand_StatUpMessage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
ResetMiss:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wAttackMissed], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
LowerStat:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wLoweredStat], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wPlayerStatLevels
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .got_target
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyStatLevels
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_target
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f
ld c, a
ld b, 0
add hl, bc
ld b, [hl]
dec b
jr z, .cant_lower_anymore
Move effect commands dump
2013-03-27 00:39:44 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wLoweredStat]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $f0
jr z, .got_num_stages
dec b
jr nz, .got_num_stages
inc b
.got_num_stages
ld [hl], b
ld a, c
cp 5
jr nc, .accuracy_evasion
push hl
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wBattleMonStats + 1
ld de, wPlayerStats
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .got_target_2
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonStats + 1
ld de, wEnemyStats
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_target_2
call TryLowerStat
pop hl
jr z, .failed
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.accuracy_evasion
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .player
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CalcEnemyStats
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr .finish
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.player
call CalcPlayerStats
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.finish
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.failed
inc [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.cant_lower_anymore
ld a, 2
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wFailedMessage], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_TriStatusChance:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_EffectChance
.loop
; 1/3 chance of each status
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
swap a
Use maskbits some more
2018-01-11 17:00:01 +00:00
and %11
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .loop
dec a
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 21:29:30 +00:00
ld hl, .StatusCommands
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
rst JumpTable
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 21:29:30 +00:00
.StatusCommands:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
dw BattleCommand_ParalyzeTarget ; paralyze
dw BattleCommand_FreezeTarget ; freeze
dw BattleCommand_BurnTarget ; burn
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Curl:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS2
call GetBattleVarAddr
set SUBSTATUS_CURLED, [hl]
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_RaiseSubNoAnim:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, GetBattleMonBackpic
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .PlayerTurn
ld hl, GetEnemyMonFrontpic
.PlayerTurn:
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 18:28:22 +00:00
ldh [hBGMapMode], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CallBattleCore
jp WaitBGMap
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_LowerSubNoAnim:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, DropPlayerSub
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .PlayerTurn
ld hl, DropEnemySub
.PlayerTurn:
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 18:28:22 +00:00
ldh [hBGMapMode], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CallBattleCore
jp WaitBGMap
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CalcPlayerStats:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wPlayerAtkLevel
ld de, wPlayerStats
ld bc, wBattleMonAttack
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Use NUM_BATTLE_STATS instead of raw numbers
2022-03-31 00:44:58 +00:00
ld a, NUM_BATTLE_STATS
CalcStats -> CalcBattleStats Confusingly ambiguous name
2018-11-23 22:03:27 +00:00
call CalcBattleStats
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, BadgeStatBoosts
call CallBattleCore
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_SwitchTurn
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, ApplyPrzEffectOnSpeed
call CallBattleCore
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, ApplyBrnEffectOnAttack
call CallBattleCore
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp BattleCommand_SwitchTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CalcEnemyStats:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyAtkLevel
ld de, wEnemyStats
ld bc, wEnemyMonAttack
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
Use NUM_BATTLE_STATS instead of raw numbers
2022-03-31 00:44:58 +00:00
ld a, NUM_BATTLE_STATS
CalcStats -> CalcBattleStats Confusingly ambiguous name
2018-11-23 22:03:27 +00:00
call CalcBattleStats
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_SwitchTurn
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, ApplyPrzEffectOnSpeed
call CallBattleCore
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, ApplyBrnEffectOnAttack
call CallBattleCore
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp BattleCommand_SwitchTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
CalcStats -> CalcBattleStats Confusingly ambiguous name
2018-11-23 22:03:27 +00:00
CalcBattleStats:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.loop
push af
ld a, [hli]
push hl
push bc
more effect constants
2013-04-27 21:12:23 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld c, a
dec c
ld b, 0
ld hl, StatLevelMultipliers
add hl, bc
add hl, bc
more effect constants
2013-04-27 21:12:23 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 0], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 18:28:22 +00:00
ldh [hMultiplicand + 2], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
inc de
more effect constants
2013-04-27 21:12:23 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 18:28:22 +00:00
ldh [hMultiplier], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call Multiply
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 18:28:22 +00:00
ldh [hDivisor], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, 4
call Divide
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hQuotient + 2]
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ld b, a
ldh a, [hQuotient + 3]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
or b
jr nz, .check_maxed_out
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, 1
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh [hQuotient + 3], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr .not_maxed_out
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.check_maxed_out
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 3]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp LOW(MAX_STAT_VALUE)
ld a, b
sbc HIGH(MAX_STAT_VALUE)
jr c, .not_maxed_out
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, LOW(MAX_STAT_VALUE)
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh [hQuotient + 3], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, HIGH(MAX_STAT_VALUE)
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh [hQuotient + 2], a
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.not_maxed_out
pop bc
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 2]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [bc], a
inc bc
hQuotient is a four-byte buffer (fixes #558)
2018-08-26 17:49:38 +00:00
ldh a, [hQuotient + 3]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [bc], a
inc bc
pop hl
pop af
dec a
jr nz, .loop
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-14 04:18:14 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
changed more labels
2015-09-04 20:30:40 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/bide.asm"
changed more labels
2015-09-04 20:30:40 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_CheckRampage:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wPlayerRolloutCount
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .player
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemyRolloutCount
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.player
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 07:34:57 +00:00
call GetBattleVarAddr
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
bit SUBSTATUS_RAMPAGE, [hl]
ret z
ld a, [de]
dec a
ld [de], a
jr nz, .continue_rampage
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
res SUBSTATUS_RAMPAGE, [hl]
call BattleCommand_SwitchTurn
call SafeCheckSafeguard
push af
call BattleCommand_SwitchTurn
pop af
jr nz, .continue_rampage
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
set SUBSTATUS_CONFUSED, [hl]
call BattleRandom
and %00000001
inc a
inc a
inc de ; ConfuseCount
ld [de], a
.continue_rampage
ld b, rampage_command
jp SkipToBattleCommand
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Rampage:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; No rampage during Sleep Talk.
ld a, BATTLE_VARS_STATUS
call GetBattleVar
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
Move effect commands dump
2013-03-27 00:39:44 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wPlayerRolloutCount
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .ok
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemyRolloutCount
Move effect commands dump
2013-03-27 00:39:44 +00:00
.ok
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr
set SUBSTATUS_RAMPAGE, [hl]
; Rampage for 1 or 2 more turns
call BattleRandom
and %00000001
inc a
ld [de], a
ld a, 1
ld [wSomeoneIsRampaging], a
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/teleport.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
SetBattleDraw:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [wBattleResult]
Use constants for bit/set/res more
2018-04-05 15:44:02 +00:00
and BATTLERESULT_BITMASK
or DRAW
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [wBattleResult], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ForceSwitch:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wBattleType]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp BATTLETYPE_SHINY
jp z, .fail
cp BATTLETYPE_TRAP
jp z, .fail
cp BATTLETYPE_CELEBI
jp z, .fail
cp BATTLETYPE_SUICUNE
jp z, .fail
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp nz, .force_player_switch
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr nz, .missed
ld a, [wBattleMode]
dec a
jr nz, .trainer
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wCurPartyLevel]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wBattleMonLevel]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp b
jr nc, .wild_force_flee
add b
ld c, a
inc c
.random_loop_wild
call BattleRandom
cp c
jr nc, .random_loop_wild
srl b
srl b
cp b
jr nc, .wild_force_flee
.missed
jp .fail
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.wild_force_flee
call UpdateBattleMonInParty
xor a
ld [wNumHits], a
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 23:32:36 +00:00
inc a ; TRUE
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [wForcedSwitch], a
call SetBattleDraw
ld a, [wPlayerMoveStructAnimation]
jp .succeed
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.trainer
call FindAliveEnemyMons
jr c, .switch_fail
ld a, [wEnemyGoesFirst]
and a
jr z, .switch_fail
call UpdateEnemyMonInParty
ld a, $1
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call AnimateCurrentMove
ld c, $14
call DelayFrames
hlcoord 1, 0
lb bc, 4, 10
call ClearBox
ld c, 20
call DelayFrames
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wOTPartyCount]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wCurOTMon]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld c, a
; select a random enemy mon to switch to
.random_loop_trainer
call BattleRandom
and $7
cp b
jr nc, .random_loop_trainer
cp c
jr z, .random_loop_trainer
push af
push bc
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wOTPartyMon1HP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetPartyLocation
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
or [hl]
pop bc
pop de
jr z, .random_loop_trainer
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, d
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
inc a
ld [wEnemySwitchMonIndex], a
callfar ForceEnemySwitch
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, DraggedOutText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00: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-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, SpikesDamage
jp CallBattleCore
.switch_fail
jp .fail
.force_player_switch
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nz, .player_miss
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [wBattleMode]
dec a
jr nz, .vs_trainer
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wBattleMonLevel]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wCurPartyLevel]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp b
jr nc, .wild_succeed_playeristarget
add b
ld c, a
inc c
.wild_random_loop_playeristarget
call BattleRandom
cp c
jr nc, .wild_random_loop_playeristarget
srl b
srl b
cp b
jr nc, .wild_succeed_playeristarget
.player_miss
jr .fail
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.wild_succeed_playeristarget
call UpdateBattleMonInParty
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Harmonize engine/{battle, battle_anims, events, games} with pokegold
2020-06-16 23:32:36 +00:00
inc a ; TRUE
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [wForcedSwitch], a
call SetBattleDraw
ld a, [wEnemyMoveStructAnimation]
jr .succeed
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.vs_trainer
call CheckPlayerHasMonToSwitchTo
jr c, .fail
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [wEnemyGoesFirst]
cp $1
jr z, .switch_fail
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call UpdateBattleMonInParty
ld a, $1
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call AnimateCurrentMove
ld c, 20
call DelayFrames
hlcoord 9, 7
lb bc, 5, 11
call ClearBox
ld c, 20
call DelayFrames
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wPartyCount]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wCurBattleMon]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld c, a
.random_loop_trainer_playeristarget
call BattleRandom
and $7
cp b
jr nc, .random_loop_trainer_playeristarget
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp c
jr z, .random_loop_trainer_playeristarget
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push af
push bc
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wPartyMon1HP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetPartyLocation
ld a, [hli]
or [hl]
pop bc
pop de
jr z, .random_loop_trainer_playeristarget
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, d
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wCurPartyMon], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, SwitchPlayerMon
call CallBattleCore
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, DraggedOutText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, SpikesDamage
jp CallBattleCore
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.fail
call BattleCommand_LowerSub
call BattleCommand_MoveDelay
call BattleCommand_RaiseSub
jp PrintButItFailed
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.succeed
push af
call SetBattleDraw
ld a, $1
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call AnimateCurrentMove
ld c, 20
call DelayFrames
pop af
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, FledInFearText
cp ROAR
jr z, .do_text
ld hl, BlownAwayText
.do_text
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckPlayerHasMonToSwitchTo:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wPartyCount]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld d, a
ld e, 0
ld bc, PARTYMON_STRUCT_LENGTH
.loop
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wCurBattleMon]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp e
jr z, .next
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, e
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wPartyMon1HP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call AddNTimes
ld a, [hli]
or [hl]
jr nz, .not_fainted
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.next
inc e
dec d
jr nz, .loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
scf
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.not_fainted
and a
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_EndLoop:
`endloop` loops back to critical itself The comments seemed to specify that `endloop` loops back to the command before `critical` and executes that, which simply isn't true. It loops back to `critical` itself, and executes `critical`, before continuing on with the remaining commands.
2018-04-02 23:05:44 +00:00
; Loop back to 'critical'.
Move effect commands dump
2013-03-27 00:39:44 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wPlayerRolloutCount
ld bc, wPlayerDamageTaken
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .got_addrs
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemyRolloutCount
ld bc, wEnemyDamageTaken
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_addrs
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr
bit SUBSTATUS_IN_LOOP, [hl]
jp nz, .in_loop
set SUBSTATUS_IN_LOOP, [hl]
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr
ld a, [hl]
cp EFFECT_POISON_MULTI_HIT
jr z, .twineedle
cp EFFECT_DOUBLE_HIT
ld a, 1
jr z, .double_hit
ld a, [hl]
cp EFFECT_BEAT_UP
jr z, .beat_up
cp EFFECT_TRIPLE_KICK
jr nz, .not_triple_kick
.reject_triple_kick_sample
call BattleRandom
and $3
jr z, .reject_triple_kick_sample
dec a
jr nz, .double_hit
ld a, 1
ld [bc], a
jr .done_loop
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.beat_up
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nz, .check_ot_beat_up
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wPartyCount]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp 1
jp z, .only_one_beatup
dec a
jr .double_hit
Some work on battle animations
2015-11-09 21:41:09 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.check_ot_beat_up
ld a, [wBattleMode]
cp WILD_BATTLE
jp z, .only_one_beatup
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wOTPartyCount]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp 1
jp z, .only_one_beatup
dec a
jr .double_hit
.only_one_beatup
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: Beat Up works incorrectly with only one Pokémon in the party (see docs/bugs_and_glitches.md)
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr
res SUBSTATUS_IN_LOOP, [hl]
Label BattleCommand_BeatUpFailText
2018-04-03 10:00:24 +00:00
call BattleCommand_BeatUpFailText
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp EndMoveEffect
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.not_triple_kick
call BattleRandom
and $3
cp 2
jr c, .got_number_hits
call BattleRandom
and $3
.got_number_hits
inc a
.double_hit
ld [de], a
inc a
ld [bc], a
jr .loop_back_to_critical
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.twineedle
ld a, 1
jr .double_hit
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.in_loop
ld a, [de]
dec a
ld [de], a
jr nz, .loop_back_to_critical
.done_loop
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr
res SUBSTATUS_IN_LOOP, [hl]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, PlayerHitTimesText
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .got_hit_n_times_text
ld hl, EnemyHitTimesText
.got_hit_n_times_text
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push bc
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_BEAT_UP
jr z, .beat_up_2
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.beat_up_2
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
pop bc
xor a
ld [bc], a
ret
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.loop_back_to_critical
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wBattleScriptBufferAddress + 1]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld h, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wBattleScriptBufferAddress]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld l, a
.not_critical
ld a, [hld]
cp critical_command
jr nz, .not_critical
inc hl
ld a, h
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wBattleScriptBufferAddress + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, l
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wBattleScriptBufferAddress], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_FakeOut:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
ret nz
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckSubstituteOpp
jr nz, .fail
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVar
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and 1 << FRZ | SLP_MASK
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nz, .fail
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckOpponentWentFirst
jr z, FlinchTarget
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.fail
ld a, 1
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wAttackMissed], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_FlinchTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckSubstituteOpp
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_STATUS_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and 1 << FRZ | SLP_MASK
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckOpponentWentFirst
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEffectFailed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; fallthrough
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
FlinchTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVarAddr
set SUBSTATUS_FLINCHED, [hl]
jp EndRechargeOpp
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckOpponentWentFirst:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Returns a=0, z if user went first
; Returns a=1, nz if opponent went first
push bc
ld a, [wEnemyGoesFirst] ; 0 if player went first
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 18:28:22 +00:00
ldh a, [hBattleTurn] ; 0 if it's the player's turn
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
xor b ; 1 if opponent went first
pop bc
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_HeldFlinch:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; kingsrock
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret nz
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetUserItem
ld a, b
cp HELD_FLINCH
ret nz
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr
ld d, h
ld e, l
call GetUserItem
rename RNG to Random also fix 'Far' naming scheme for BattleRandom this was a long time coming
2013-08-31 02:59:40 +00:00
call BattleRandom
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp c
ret nc
call EndRechargeOpp
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVarAddr
set SUBSTATUS_FLINCHED, [hl]
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_OHKO:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call ResetDamage
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wTypeModifier]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $7f
jr z, .no_effect
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonLevel
ld de, wBattleMonLevel
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld bc, wPlayerMoveStruct + MOVE_ACC
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .got_move_accuracy
push hl
ld h, d
ld l, e
pop de
ld bc, wEnemyMoveStruct + MOVE_ACC
.got_move_accuracy
ld a, [de]
sub [hl]
jr c, .no_effect
add a
ld e, a
ld a, [bc]
add e
jr nc, .finish_ohko
ld a, $ff
.finish_ohko
ld [bc], a
call BattleCommand_CheckHit
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wCurDamage
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $ff
ld [hli], a
ld [hl], a
ld a, $2
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wCriticalHit], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
.no_effect
ld a, $ff
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wCriticalHit], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $1
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wAttackMissed], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_CheckCharge:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr
bit SUBSTATUS_CHARGED, [hl]
ret z
res SUBSTATUS_CHARGED, [hl]
res SUBSTATUS_UNDERGROUND, [hl]
res SUBSTATUS_FLYING, [hl]
ld b, charge_command
jp SkipToBattleCommand
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Charge:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_ClearText
ld a, BATTLE_VARS_STATUS
call GetBattleVar
Rename `SLP` to `SLP_MASK` (#918) Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
2022-06-18 02:25:56 +00:00
and SLP_MASK
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .awake
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_MoveDelay
call BattleCommand_RaiseSub
call PrintButItFailed
jp EndMoveEffect
Identify more move effect commands
2013-03-27 05:52:04 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.awake
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr
set SUBSTATUS_CHARGED, [hl]
ld hl, IgnoredOrders2Text
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAlreadyDisobeyed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call nz, StdBattleTextbox
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_LowerSub
xor a
ld [wNumHits], a
inc a
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call LoadMoveAnim
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp FLY
jr z, .flying
cp DIG
jr z, .flying
call BattleCommand_RaiseSub
jr .not_flying
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.flying
call DisappearUser
.not_flying
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 07:34:57 +00:00
call GetBattleVarAddr
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
ld b, a
cp FLY
jr z, .set_flying
cp DIG
jr nz, .dont_set_digging
set SUBSTATUS_UNDERGROUND, [hl]
jr .dont_set_digging
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.set_flying
set SUBSTATUS_FLYING, [hl]
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.dont_set_digging
call CheckUserIsCharging
jr nz, .mimic
ld a, BATTLE_VARS_LAST_COUNTER_MOVE
call GetBattleVarAddr
ld [hl], b
ld a, BATTLE_VARS_LAST_MOVE
call GetBattleVarAddr
ld [hl], b
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.mimic
call ResetDamage
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, .UsedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call BattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_SKULL_BASH
ld b, endturn_command
jp z, SkipToBattleCommand
jp EndMoveEffect
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.UsedText:
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
text_far Text_BattleUser ; "<USER>"
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_asm
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
cp RAZOR_WIND
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleMadeWhirlwindText
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .done
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp SOLARBEAM
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleTookSunlightText
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .done
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp SKULL_BASH
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleLoweredHeadText
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .done
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp SKY_ATTACK
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleGlowingText
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .done
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp FLY
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleFlewText
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .done
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp DIG
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .BattleDugText
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.done
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleMadeWhirlwindText:
text_far _BattleMadeWhirlwindText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleTookSunlightText:
text_far _BattleTookSunlightText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleLoweredHeadText:
text_far _BattleLoweredHeadText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleGlowingText:
text_far _BattleGlowingText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleFlewText:
text_far _BattleFlewText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.BattleDugText:
text_far _BattleDugText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
More syncing with pokegold
2020-11-03 15:13:06 +00:00
BattleCommand_Unused3C:
; effect0x3c
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_TrapTarget:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
ret nz
ld hl, wEnemyWrapCount
ld de, wEnemyTrappingMove
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .got_trap
ld hl, wPlayerWrapCount
ld de, wPlayerTrappingMove
more effect constants
2013-04-27 21:12:23 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_trap
ld a, [hl]
and a
ret nz
ld a, BATTLE_VARS_SUBSTATUS4_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
bit SUBSTATUS_SUBSTITUTE, a
ret nz
call BattleRandom
; trapped for 2-5 turns
and %11
inc a
inc a
inc a
ld [hl], a
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
ld [de], a
ld b, a
ld hl, .Traps
more effect constants
2013-04-27 21:12:23 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.find_trap_text
ld a, [hli]
cp b
jr z, .found_trap_text
inc hl
inc hl
jr .find_trap_text
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.found_trap_text
ld a, [hli]
ld h, [hl]
ld l, a
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
More battletexts
2013-03-27 21:07:00 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.Traps:
dbw BIND, UsedBindText ; 'used BIND on'
dbw WRAP, WrappedByText ; 'was WRAPPED by'
dbw FIRE_SPIN, FireSpinTrapText ; 'was trapped!'
dbw CLAMP, ClampedByText ; 'was CLAMPED by'
dbw WHIRLPOOL, WhirlpoolTrapText ; 'was trapped!'
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/mist.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/focus_energy.asm"
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Recoil:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .got_hp
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonMaxHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_hp
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
ld d, a
; get 1/4 damage or 1 HP, whichever is higher
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wCurDamage]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wCurDamage + 1]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld c, a
srl b
rr c
srl b
rr c
ld a, b
or c
jr nz, .min_damage
inc c
.min_damage
ld a, [hli]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer1 + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
dec hl
dec hl
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer2], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
sub c
ld [hld], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [hl]
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer2 + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
sbc b
ld [hl], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld [wHPBuffer3 + 1], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr nc, .dont_ko
xor a
ld [hli], a
ld [hl], a
Identify remaining uses of wBuffer1-6 as general-purpose HP buffers or mobile
2020-11-04 04:25:22 +00:00
ld hl, wHPBuffer3
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hli], a
ld [hl], a
.dont_ko
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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
ld a, 1
jr z, .animate_hp_bar
hlcoord 2, 2
xor a
.animate_hp_bar
ld [wWhichHPBar], a
predef AnimateHPBar
call RefreshBattleHuds
ld hl, RecoilText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ConfuseTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetOpponentItem
ld a, b
cp HELD_PREVENT_CONFUSE
ret z
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wEffectFailed]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
ret nz
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call SafeCheckSafeguard
ret nz
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVarAddr
bit SUBSTATUS_CONFUSED, [hl]
ret nz
jr BattleCommand_FinishConfusingTarget
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Confuse:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetOpponentItem
ld a, b
cp HELD_PREVENT_CONFUSE
jr nz, .no_item_protection
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 21:29:30 +00:00
ld [wNamedObjectIndex], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetItemName
call AnimateFailedMove
ld hl, ProtectedByText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.no_item_protection
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVarAddr
bit SUBSTATUS_CONFUSED, [hl]
jr z, .not_already_confused
call AnimateFailedMove
ld hl, AlreadyConfusedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.not_already_confused
call CheckSubstituteOpp
jr nz, BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr nz, BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_FinishConfusingTarget:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld bc, wEnemyConfuseCount
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .got_confuse_count
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld bc, wPlayerConfuseCount
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_confuse_count
set SUBSTATUS_CONFUSED, [hl]
; confused for 2-5 turns
call BattleRandom
and %11
inc a
inc a
ld [bc], a
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_CONFUSE_HIT
jr z, .got_effect
cp EFFECT_SNORE
jr z, .got_effect
cp EFFECT_SWAGGER
jr z, .got_effect
call AnimateCurrentMove
.got_effect
ld de, ANIM_CONFUSED
call PlayOpponentBattleAnim
ld hl, BecameConfusedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetOpponentItem
ld a, b
cp HELD_HEAL_STATUS
jr z, .heal_confusion
cp HELD_HEAL_CONFUSION
ret nz
.heal_confusion
ld hl, UseConfusionHealingItem
jp CallBattleCore
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Confuse_CheckSnore_Swagger_ConfuseHit:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_CONFUSE_HIT
ret z
cp EFFECT_SNORE
ret z
cp EFFECT_SWAGGER
ret z
jp PrintDidntAffect2
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Paralyze:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_STATUS_OPP
call GetBattleVar
bit PAR, a
jr nz, .paralyzed
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wTypeModifier]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and $7f
jr z, .didnt_affect
call GetOpponentItem
ld a, b
cp HELD_PREVENT_PARALYZE
jr nz, .no_item_protection
ld a, [hl]
Rename some labels - Remove "Buffer" suffix from some byte and word quantities - Change "Ptr" to "Pointer" Fixes #789
2020-12-23 21:29:30 +00:00
ld [wNamedObjectIndex], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call GetItemName
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateFailedMove
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, ProtectedByText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.no_item_protection
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .dont_sample_failure
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [wLinkMode]
and a
jr nz, .dont_sample_failure
Move effect commands dump
2013-03-27 00:39:44 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wInBattleTowerBattle]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr nz, .dont_sample_failure
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wPlayerSubStatus5]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
bit SUBSTATUS_LOCK_ON, a
jr nz, .dont_sample_failure
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleRandom
Sync code with wiki
2018-02-04 18:16:40 +00:00
cp 25 percent + 1 ; 25% chance AI fails
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr c, .failed
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.dont_sample_failure
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 07:34:57 +00:00
call GetBattleVarAddr
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr nz, .failed
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAttackMissed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr nz, .failed
call CheckSubstituteOpp
jr nz, .failed
ld c, 30
call DelayFrames
call AnimateCurrentMove
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh [hBGMapMode], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 07:34:57 +00:00
call GetBattleVarAddr
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
set PAR, [hl]
call UpdateOpponentInParty
ld hl, ApplyPrzEffectOnSpeed
call CallBattleCore
call UpdateBattleHuds
call PrintParalyze
ld hl, UseHeldStatusHealingItem
jp CallBattleCore
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.paralyzed
call AnimateFailedMove
ld hl, AlreadyParalyzedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.failed
jp PrintDidntAffect2
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.didnt_affect
call AnimateFailedMove
jp PrintDoesntAffect
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckMoveTypeMatchesTarget:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Compare move type to opponent type.
; Return z if matching the opponent type,
; unless the move is Normal (Tri Attack).
push hl
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyMonType1
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .ok
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wBattleMonType1
Move effect commands dump
2013-03-27 00:39:44 +00:00
.ok
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_MOVE_TYPE
call GetBattleVar
cp NORMAL
jr z, .normal
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
cp [hl]
jr z, .return
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
inc hl
cp [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.return
pop hl
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.normal
ld a, 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
pop hl
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/substitute.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_RechargeNextTurn:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVarAddr
set SUBSTATUS_RECHARGE, [hl]
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
EndRechargeOpp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push hl
ld a, BATTLE_VARS_SUBSTATUS4_OPP
call GetBattleVarAddr
res SUBSTATUS_RECHARGE, [hl]
pop hl
ret
comment arena trap move effect asm
2013-09-09 02:44:20 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/rage.asm"
comment arena trap move effect asm
2013-09-09 02:44:20 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DoubleFlyingDamage:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar
bit SUBSTATUS_FLYING, a
ret z
jr DoubleDamage
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DoubleUndergroundDamage:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar
bit SUBSTATUS_UNDERGROUND, a
ret z
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; fallthrough
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
DoubleDamage:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wCurDamage + 1
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
sla [hl]
dec hl
rl [hl]
jr nc, .quit
comment defrost move effect asm
2013-09-09 02:30:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, $ff
ld [hli], a
ld [hl], a
.quit
ret
comment defrost move effect asm
2013-09-09 02:30:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/mimic.asm"
comment defrost move effect asm
2013-09-09 02:30:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/leech_seed.asm"
comment defrost move effect asm
2013-09-09 02:30:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/splash.asm"
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/disable.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/pay_day.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/conversion.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ResetStats:
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
ld a, BASE_STAT_LEVEL
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wPlayerStatLevels
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call .Fill
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyStatLevels
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call .Fill
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push af
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call SetPlayerTurn
call CalcPlayerStats
call SetEnemyTurn
call CalcEnemyStats
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00: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 18:28:22 +00:00
ldh [hBattleTurn], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call AnimateCurrentMove
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, EliminatedStatsText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.Fill:
Comment, remove, or revise many unreferenced labels
2020-10-26 19:45:57 +00:00
ld b, NUM_LEVEL_STATS
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.next
ld [hli], a
dec b
jr nz, .next
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Heal:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wBattleMonHP
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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .got_hp
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemyMonHP
ld hl, wEnemyMonMaxHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_hp
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
ld b, a
push hl
push de
push bc
ld c, 2
StringCmp → CompareBytes; CompareLong → CompareBytesLong hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
2018-07-23 04:25:53 +00:00
call CompareBytes
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
pop bc
pop de
pop hl
jp z, .hp_full
ld a, b
cp REST
jr nz, .not_rest
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push hl
push de
push af
call BattleCommand_MoveDelay
ld a, BATTLE_VARS_SUBSTATUS5
call GetBattleVarAddr
res SUBSTATUS_TOXIC, [hl]
ld a, BATTLE_VARS_STATUS
call GetBattleVarAddr
ld a, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [hl], REST_SLEEP_TURNS + 1
ld hl, WentToSleepText
jr z, .no_status_to_heal
ld hl, RestedText
.no_status_to_heal
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr nz, .calc_enemy_stats
call CalcPlayerStats
jr .got_stats
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.calc_enemy_stats
call CalcEnemyStats
.got_stats
pop af
pop de
pop hl
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.not_rest
jr z, .restore_full_hp
ld hl, GetHalfMaxHP
call CallBattleCore
jr .finish
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.restore_full_hp
ld hl, GetMaxHP
call CallBattleCore
.finish
call AnimateCurrentMove
call BattleCommand_SwitchTurn
ld hl, RestoreHP
call CallBattleCore
call BattleCommand_SwitchTurn
call UpdateUserInParty
call RefreshBattleHuds
ld hl, RegainedHealthText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.hp_full
call AnimateFailedMove
ld hl, HPIsFullText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/transform.asm"
effect command cleanup -weather and badge type boosts
2013-04-19 07:50:45 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleEffect_ButItFailed:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call AnimateFailedMove
jp PrintButItFailed
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
ClearLastMove:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_LAST_COUNTER_MOVE
call GetBattleVarAddr
xor a
ld [hl], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_LAST_MOVE
call GetBattleVarAddr
xor a
ld [hl], a
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
ResetActorDisable:
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .player
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wEnemyDisableCount], a
ld [wEnemyDisabledMove], a
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.player
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wPlayerDisableCount], a
ld [wDisabledMove], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Screen:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPlayerScreens
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld bc, wPlayerLightScreenCount
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .got_screens_pointer
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyScreens
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld bc, wEnemyLightScreenCount
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_screens_pointer
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_LIGHT_SCREEN
jr nz, .Reflect
bit SCREENS_LIGHT_SCREEN, [hl]
jr nz, .failed
set SCREENS_LIGHT_SCREEN, [hl]
ld a, 5
ld [bc], a
ld hl, LightScreenEffectText
jr .good
.Reflect:
bit SCREENS_REFLECT, [hl]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
jr nz, .failed
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
set SCREENS_REFLECT, [hl]
; LightScreenCount -> ReflectCount
inc bc
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
ld a, 5
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld [bc], a
ld hl, ReflectEffectText
.good
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateCurrentMove
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
.failed
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateFailedMove
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
jp PrintButItFailed
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PrintDoesntAffect:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, DoesntAffectText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PrintNothingHappened:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, NothingHappenedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
TryPrintButItFailed:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld a, [wAlreadyFailed]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
ret nz
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; fallthrough
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PrintButItFailed:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, ButItFailedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
FailMove:
call AnimateFailedMove
; fallthrough
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
FailMimic:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, ButItFailedText ; 'but it failed!'
ld de, ItFailedText ; 'it failed!'
jp FailText_CheckOpponentProtect
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PrintDidntAffect:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, DidntAffect1Text
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PrintDidntAffect2:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call AnimateFailedMove
ld hl, DidntAffect1Text ; 'it didn't affect'
ld de, DidntAffect2Text ; 'it didn't affect'
jp FailText_CheckOpponentProtect
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PrintParalyze:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; 'paralyzed! maybe it can't attack!'
ld hl, ParalyzedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckSubstituteOpp:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_SUBSTATUS4_OPP
call GetBattleVar
bit SUBSTATUS_SUBSTITUTE, a
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/selfdestruct.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/mirror_move.asm"
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/metronome.asm"
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckUserMove:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Return z if the user has move a.
ld b, a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wBattleMonMoves
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .ok
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld de, wEnemyMonMoves
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.ok
ld c, NUM_MOVES
.loop
ld a, [de]
inc de
cp b
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
dec c
jr nz, .loop
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, 1
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
ret
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
ResetTurn:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld hl, wPlayerCharging
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .player
ld hl, wEnemyCharging
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.player
ld [hl], 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
xor a
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wAlreadyDisobeyed], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call DoMove
jp EndMoveEffect
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/thief.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ArenaTrap:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Doesn't work on an absent opponent.
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call CheckHiddenOpponent
jr nz, .failed
; Don't trap if the opponent is already trapped.
ld a, BATTLE_VARS_SUBSTATUS5
call GetBattleVarAddr
bit SUBSTATUS_CANT_RUN, [hl]
jr nz, .failed
; Otherwise trap the opponent.
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
set SUBSTATUS_CANT_RUN, [hl]
call AnimateCurrentMove
ld hl, CantEscapeNowText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.failed
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateFailedMove
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
jp PrintButItFailed
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/nightmare.asm"
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_Defrost:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Thaw the user.
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, BATTLE_VARS_STATUS
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 07:34:57 +00:00
call GetBattleVarAddr
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
bit FRZ, [hl]
ret z
res FRZ, [hl]
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
; Don't update the enemy's party struct in a wild battle.
comment and relabel more battle functions
2014-01-01 13:09:15 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
and a
jr z, .party
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, [wBattleMode]
dec a
jr z, .done
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.party
ld a, MON_STATUS
call UserPartyAttr
res FRZ, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.done
call RefreshBattleHuds
ld hl, WasDefrostedText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/curse.asm"
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/protect.asm"
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/endure.asm"
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/spikes.asm"
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/foresight.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/perish_song.asm"
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/sandstorm.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/rollout.asm"
More syncing with pokegold
2020-11-03 15:13:06 +00:00
BattleCommand_Unused5D:
; effect0x5d
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/fury_cutter.asm"
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-13 01:32:42 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/attract.asm"
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-13 01:32:42 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/return.asm"
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/present.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/frustration.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/safeguard.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
SafeCheckSafeguard:
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
push hl
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyScreens
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .got_turn
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wPlayerScreens
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_turn
bit SCREENS_SAFEGUARD, [hl]
pop hl
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_CheckSafeguard:
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wEnemyScreens
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jr z, .got_turn
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld hl, wPlayerScreens
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
.got_turn
bit SCREENS_SAFEGUARD, [hl]
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret z
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
ld a, 1
Merge branch 'master' of https://github.com/pret/pokecrystal # Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03 23:21:53 +00:00
ld [wAttackMissed], a
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
call BattleCommand_MoveDelay
ld hl, SafeguardProtectText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call StdBattleTextbox
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
jp EndMoveEffect
INCLUDE "engine/battle/move_effects/magnitude.asm"
INCLUDE "engine/battle/move_effects/baton_pass.asm"
INCLUDE "engine/battle/move_effects/pursuit.asm"
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/rapid_spin.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_HealMorn:
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-11 06:02:28 +00:00
ld b, MORN_F
More battle anims and bg effects
2015-12-24 01:46:23 +00:00
jr BattleCommand_TimeBasedHealContinue
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_HealDay:
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-11 06:02:28 +00:00
ld b, DAY_F
More battle anims and bg effects
2015-12-24 01:46:23 +00:00
jr BattleCommand_TimeBasedHealContinue
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_HealNite:
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-11 06:02:28 +00:00
ld b, NITE_F
Move effect commands dump
2013-03-27 00:39:44 +00:00
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_TimeBasedHealContinue:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Time- and weather-sensitive heal.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonMaxHP
ld de, 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 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .start
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonMaxHP
ld de, wEnemyMonHP
Move effect commands dump
2013-03-27 00:39:44 +00:00
.start
; Index for .Multipliers
; Default restores half max HP.
ld c, 2
; Don't bother healing if HP is already full.
push bc
StringCmp → CompareBytes; CompareLong → CompareBytesLong hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
2018-07-23 04:25:53 +00:00
call CompareBytes
Move effect commands dump
2013-03-27 00:39:44 +00:00
pop bc
jr z, .Full
; Don't factor in time of day in link battles.
Move battle start animation functions to its own file
2015-10-19 14:23:58 +00:00
ld a, [wLinkMode]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr nz, .Weather
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wTimeOfDay]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp b
jr z, .Weather
More battle anims and bg effects
2015-12-24 01:46:23 +00:00
dec c ; double
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Weather:
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 21:45:34 +00:00
ld a, [wBattleWeather]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .Heal
; x2 in sun
; /2 in rain/sandstorm
inc c
cp WEATHER_SUN
jr z, .Heal
dec c
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
dec c
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Heal:
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, 0
ld hl, .Multipliers
add hl, bc
jumptable macro repurposed
2015-12-27 02:59:03 +00:00
add hl, bc
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hli]
ld h, [hl]
ld l, a
ld a, BANK(GetMaxHP)
rst FarCall
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateCurrentMove
changed name of some labels
2015-10-10 11:45:39 +00:00
call BattleCommand_SwitchTurn
Move effect commands dump
2013-03-27 00:39:44 +00:00
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
callfar RestoreHP
Move effect commands dump
2013-03-27 00:39:44 +00:00
changed name of some labels
2015-10-10 11:45:39 +00:00
call BattleCommand_SwitchTurn
bank 0 battle functions
2013-05-03 04:22:28 +00:00
call UpdateUserInParty
Move effect commands dump
2013-03-27 00:39:44 +00:00
; 'regained health!'
ld hl, RegainedHealthText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Full:
comment and relabel more battle functions
2014-01-01 13:09:15 +00:00
call AnimateFailedMove
Move effect commands dump
2013-03-27 00:39:44 +00:00
; 'hp is full!'
ld hl, HPIsFullText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp StdBattleTextbox
Move effect commands dump
2013-03-27 00:39:44 +00: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 18:42:14 +00:00
.Multipliers:
Move effect commands dump
2013-03-27 00:39:44 +00:00
dw GetEighthMaxHP
dw GetQuarterMaxHP
dw GetHalfMaxHP
dw GetMaxHP
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/hidden_power.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/rain_dance.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/sunny_day.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/belly_drum.asm"
explicitly define type categories
2014-01-05 13:24:27 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/psych_up.asm"
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/mirror_coat.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_DoubleMinimizeDamage:
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 21:53:37 +00:00
ld hl, wEnemyMinimized
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
jr z, .ok
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 21:53:37 +00:00
ld hl, wPlayerMinimized
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
.ok
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, [hl]
and a
ret z
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wCurDamage + 1
Move effect commands dump
2013-03-27 00:39:44 +00:00
sla [hl]
dec hl
rl [hl]
ret nc
ld a, $ff
ld [hli], a
ld [hl], a
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_SkipSunCharge:
Some work on battle animations
2015-11-09 21:41:09 +00:00
; mimicsuncharge
Prefix wram labels with w, part 1. Handle edge cases first.
2018-01-23 21:45:34 +00:00
ld a, [wBattleWeather]
Move effect commands dump
2013-03-27 00:39:44 +00:00
cp WEATHER_SUN
ret nz
Enumerate the move effect command macros.
2015-04-14 04:39:54 +00:00
ld b, charge_command
Identify more move effect commands
2013-03-27 05:52:04 +00:00
jp SkipToBattleCommand
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/future_sight.asm"
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 16:36:00 +00:00
INCLUDE "engine/battle/move_effects/thunder.asm"
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckHiddenOpponent:
Clean up bugs commented in the source code (#912) Co-authored-by: Rangi <remy.oukaour+rangi42@gmail.com>
2022-07-09 21:12:02 +00:00
; BUG: Lock-On and Mind Reader don't always bypass Fly and Dig (see docs/bugs_and_glitches.md)
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-11 06:08:07 +00:00
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
Move effect commands dump
2013-03-27 00:39:44 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetUserItem:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Return the effect of the user's item in bc, and its id at hl.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonItem
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .go
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonItem
Move effect commands dump
2013-03-27 00:39:44 +00:00
.go
ld b, [hl]
Move some gfx files around, also clock reset fn
2015-11-10 16:05:26 +00:00
jp GetItemHeldEffect
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetOpponentItem:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Return the effect of the opponent's item in bc, and its id at hl.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wEnemyMonItem
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh a, [hBattleTurn]
Move effect commands dump
2013-03-27 00:39:44 +00:00
and a
jr z, .go
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wBattleMonItem
Move effect commands dump
2013-03-27 00:39:44 +00:00
.go
ld b, [hl]
Move some gfx files around, also clock reset fn
2015-11-10 16:05:26 +00:00
jp GetItemHeldEffect
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetItemHeldEffect:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Return the effect of item b in bc.
ld a, b
and a
ret z
push hl
Replace two numbers with constants (found by pfero)
2017-12-14 17:19:26 +00:00
ld hl, ItemAttributes + ITEMATTR_EFFECT
Move effect commands dump
2013-03-27 00:39:44 +00:00
dec a
ld c, a
ld b, 0
Document bugs and glitches
2017-12-13 01:15:07 +00:00
ld a, ITEMATTR_STRUCT_LENGTH
Move effect commands dump
2013-03-27 00:39:44 +00:00
call AddNTimes
dump item attributes
2013-04-30 06:01:54 +00:00
ld a, BANK(ItemAttributes)
Rename GetFarHalfword to GetFarWord Fixes #796
2021-01-09 20:16:05 +00:00
call GetFarWord
Move effect commands dump
2013-03-27 00:39:44 +00:00
ld b, l
ld c, h
pop hl
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
AnimateCurrentMoveEitherSide:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
push hl
push de
push bc
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld a, [wBattleAnimParam]
no more incbins in bank d
2013-03-27 20:19:51 +00:00
push af
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_LowerSub
no more incbins in bank d
2013-03-27 20:19:51 +00:00
pop af
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Some work on battle animations
2015-11-09 21:41:09 +00:00
call PlayDamageAnim
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_RaiseSub
no more incbins in bank d
2013-03-27 20:19:51 +00:00
pop bc
pop de
pop hl
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
AnimateCurrentMove:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
push hl
push de
push bc
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld a, [wBattleAnimParam]
no more incbins in bank d
2013-03-27 20:19:51 +00:00
push af
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_LowerSub
no more incbins in bank d
2013-03-27 20:19:51 +00:00
pop af
Remove wKickCounter and wPresentPower aliases for wBattleAnimParam
2020-08-30 00:35:49 +00:00
ld [wBattleAnimParam], a
Some work on battle animations
2015-11-09 21:41:09 +00:00
call LoadMoveAnim
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_RaiseSub
no more incbins in bank d
2013-03-27 20:19:51 +00:00
pop bc
pop de
pop hl
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PlayDamageAnim:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
xor a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID + 1], a
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
no more incbins in bank d
2013-03-27 20:19:51 +00:00
and a
ret z
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID], a
no more incbins in bank d
2013-03-27 20:19:51 +00: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 18:28:22 +00:00
ldh a, [hBattleTurn]
no more incbins in bank d
2013-03-27 20:19:51 +00:00
and a
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld a, BATTLEANIM_ENEMY_DAMAGE
More battle command labels
2015-11-07 01:55:16 +00:00
jr z, .player
Some work on battle animations
2015-11-09 21:41:09 +00:00
ld a, BATTLEANIM_PLAYER_DAMAGE
no more incbins in bank d
2013-03-27 20:19:51 +00:00
More battle command labels
2015-11-07 01:55:16 +00:00
.player
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
no more incbins in bank d
2013-03-27 20:19:51 +00:00
More battle command labels
2015-11-07 01:55:16 +00:00
jp PlayUserBattleAnim
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
LoadMoveAnim:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID + 1], a
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ld a, BATTLE_VARS_MOVE_ANIM
fix labels for and rename GetBattleVarPair to GetBattleVar
2013-10-11 07:04:21 +00:00
call GetBattleVar
no more incbins in bank d
2013-03-27 20:19:51 +00:00
and a
ret z
All local addresses in bank d have labels
2013-03-27 22:50:10 +00:00
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
LoadAnim:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID], a
no more incbins in bank d
2013-03-27 20:19:51 +00:00
; fallthrough
Remove all address comments
2018-06-24 14:09:41 +00:00
PlayUserBattleAnim:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
push hl
push de
push bc
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
callfar PlayBattleAnim
no more incbins in bank d
2013-03-27 20:19:51 +00:00
pop bc
pop de
pop hl
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
PlayOpponentBattleAnim:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ld a, e
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID], a
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ld a, d
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wFXAnimID + 1], a
no more incbins in bank d
2013-03-27 20:19:51 +00:00
xor a
Battle Anim Object struct constants
2015-12-23 19:00:29 +00:00
ld [wNumHits], a
no more incbins in bank d
2013-03-27 20:19:51 +00:00
push hl
push de
push bc
changed name of some labels
2015-10-10 11:45:39 +00:00
call BattleCommand_SwitchTurn
no more incbins in bank d
2013-03-27 20:19:51 +00:00
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 19:30:10 +00:00
callfar PlayBattleAnim
no more incbins in bank d
2013-03-27 20:19:51 +00:00
changed name of some labels
2015-10-10 11:45:39 +00:00
call BattleCommand_SwitchTurn
no more incbins in bank d
2013-03-27 20:19:51 +00:00
pop bc
pop de
pop hl
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CallBattleCore:
Note which labels are only needed for locating banks (relevant to issue #485)
2018-06-13 03:29:15 +00:00
ld a, BANK("Battle Core")
no more incbins in bank d
2013-03-27 20:19:51 +00:00
rst FarCall
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
AnimateFailedMove:
Sprite movement function labels
2015-11-06 21:42:38 +00:00
call BattleCommand_LowerSub
BattleCommand labels copied from macros
2015-11-06 19:45:10 +00:00
call BattleCommand_MoveDelay
Sprite movement function labels
2015-11-06 21:42:38 +00:00
jp BattleCommand_RaiseSub
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_MoveDelay:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Wait 40 frames.
ld c, 40
jp DelayFrames
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BattleCommand_ClearText:
Move effect commands dump
2013-03-27 00:39:44 +00:00
; Used in multi-hit moves.
ld hl, .text
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
jp BattleTextbox
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
.text:
text_end
Move effect commands dump
2013-03-27 00:39:44 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
SkipToBattleCommand:
Identify more move effect commands
2013-03-27 05:52:04 +00:00
; Skip over commands until reaching command b.
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBattleScriptBufferAddress + 1]
Identify more move effect commands
2013-03-27 05:52:04 +00:00
ld h, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBattleScriptBufferAddress]
Identify more move effect commands
2013-03-27 05:52:04 +00:00
ld l, a
Some work on battle animations
2015-11-09 21:41:09 +00:00
.loop
Identify more move effect commands
2013-03-27 05:52:04 +00:00
ld a, [hli]
cp b
Some work on battle animations
2015-11-09 21:41:09 +00:00
jr nz, .loop
Identify more move effect commands
2013-03-27 05:52:04 +00:00
ld a, h
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wBattleScriptBufferAddress + 1], a
Identify more move effect commands
2013-03-27 05:52:04 +00:00
ld a, l
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wBattleScriptBufferAddress], a
Identify more move effect commands
2013-03-27 05:52:04 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetMoveAttr:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
; Assuming hl = Moves + x, return attribute x of move a.
push bc
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-11 06:23:55 +00:00
ld bc, MOVE_LENGTH
no more incbins in bank d
2013-03-27 20:19:51 +00:00
call AddNTimes
call GetMoveByte
pop bc
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetMoveData:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
; Copy move struct a to de.
Move effect commands dump
2013-03-27 00:39:44 +00: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-11 06:23:55 +00:00
ld bc, MOVE_LENGTH
Move effect commands dump
2013-03-27 00:39:44 +00:00
call AddNTimes
Note which labels are only needed for locating banks (relevant to issue #485)
2018-06-13 03:29:15 +00:00
ld a, BANK(Moves)
Move effect commands dump
2013-03-27 00:39:44 +00:00
jp FarCopyBytes
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
GetMoveByte:
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ld a, BANK(Moves)
jp GetFarByte
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
DisappearUser:
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall _DisappearUser
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
AppearUserLowerSub:
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall _AppearUserLowerSub
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
AppearUserRaiseSub:
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall _AppearUserRaiseSub
no more incbins in bank d
2013-03-27 20:19:51 +00:00
ret
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 23:11:55 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
_CheckBattleScene:
Still more battle command labels
2015-11-07 03:36:06 +00:00
; Checks the options. Returns carry if battle animations are disabled.
no more incbins in bank d
2013-03-27 20:19:51 +00:00
push hl
push de
push bc
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall CheckBattleScene
no more incbins in bank d
2013-03-27 20:19:51 +00:00
pop bc
pop de
pop hl
ret